nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 04:28: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

1
patches/patch_list.py
View File

@@ -253,4 +253,5 @@ patch_list = [
"execute:webnotes.bean('Selling Settings').save() #2013-07-29",
"patches.august_2013.p01_hr_settings",
"patches.august_2013.p02_rename_price_list",
"patches.august_2013.p03_pos_setting_replace_customer_account",
]