nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +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-08-21 17:49:26 +05:30
parent 9b09c95d83 72c9aa083a
commit f68d563a68
19 changed files with 340 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -259,4 +259,5 @@ patch_list = [
"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
"execute:webnotes.delete_doc('DocType', 'Stock Ledger')",
"patches.august_2013.p06_deprecate_cancelled_sl_entry",
"patches.august_2013.p06_fix_sle_against_stock_entry",
]