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

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-05 10:56:44 +05:30
parent 4e8216696f 2162fee396
commit a653cd3608
67 changed files with 872 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patch_list.py
View File

@@ -259,6 +259,8 @@ patch_list = [
"patches.august_2013.p06_deprecate_is_cancelled",
"patches.august_2013.p06_fix_sle_against_stock_entry",
"execute:webnotes.bean('Style Settings').save() #2013-08-20",
"patches.september_2013.p01_add_user_defaults_from_pos_setting",
"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-09-02",
"patches.september_2013.p01_fix_buying_amount_gl_entries",
"patches.september_2013.p01_update_communication",
"patches.september_2013.p02_fix_serial_no_status",