nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 15:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master

Browse Source 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-08-12 20:00:33 +05:30
parent 8441a63121 44b2e23eba
commit 9e59aff54e
4 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/doctype/pos_setting/pos_setting.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
"modified": "2013-08-09 14:45:28",
"modified": "2013-08-09 16:35:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -131,12 +131,12 @@
},
{
"doctype": "DocField",
"fieldname": "customer_account",
"fieldname": "customer",
"fieldtype": "Link",
"label": "Customer Account",
"label": "Customer",
"oldfieldname": "customer_account",
"oldfieldtype": "Link",
"options": "Account",
"options": "Customer",
"read_only": 0,
"reqd": 0
},