schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] [minor] merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-12-18 13:32:37 +05:30
parent 2678ed181a 649660d9f0
commit 2d0e31b479
52 changed files with 639 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
patches/patch_list.py
View File

@@ -256,7 +256,10 @@ patch_list = [
"patches.1311.p06_fix_report_columns",
"execute:webnotes.delete_doc('DocType', 'Documentation Tool')",
"execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29",
"patches.1312.p01_delete_old_stock_reports",
"execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')",
"execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')",
"patches.1311.p07_scheduler_errors_digest",
"patches.1311.p08_email_digest_recipients",
"execute:webnotes.delete_doc('DocType', 'Warehouse Type')",
]