nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 08:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
This commit is contained in:
Anand Doshi
2012-01-03 11:45:11 +05:30
parent 9fdee387ea 685564f71d
commit 6ac1d4bb44
10 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/features_setup/features_setup.txt
View File

@@ -319,4 +319,4 @@
'fieldtype': 'Check',
'label': 'More Info'
}
]
]