CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
This commit is contained in:
Anand Doshi
2013-07-11 18:29:32 +05:30
parent 946e0de0cf cfecd2bc16
commit 34736c8d87
42 changed files with 304 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/doctype/company/test_company.py
View File

@@ -6,11 +6,13 @@ test_records = [
"company_name": "_Test Company",
"abbr": "_TC",
"default_currency": "INR",
"domain": "Manufacturing"
}],
[{
"doctype": "Company",
"company_name": "_Test Company 1",
"abbr": "_TC1",
"default_currency": "USD",
"domain": "Retail"
}],
]

6
setup/doctype/sales_person/test_sales_person.py
View File

@@ -3,21 +3,21 @@ test_records = [
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person",
"parent_sales_person": "All Sales Persons",
"parent_sales_person": "Sales Team",
"is_group": "No",
"employee": "_T-Employee-0001",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 1",
"parent_sales_person": "All Sales Persons",
"parent_sales_person": "Sales Team",
"is_group": "No",
"employee": "_T-Employee-0002",
}],
[{
"doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 2",
"parent_sales_person": "All Sales Persons",
"parent_sales_person": "Sales Team",
"is_group": "No",
"employee": "_T-Employee-0003",
}]