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-02 18:02:45 +05:30
parent 9c0569ee2d 21ce1282ca
commit 7e37b00d0a
9 changed files with 116 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -255,6 +255,7 @@ patch_list = [
"patches.1311.p05_website_brand_html",
"patches.1311.p06_fix_report_columns",
"execute:webnotes.delete_doc('DocType', 'Documentation Tool')",
"execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29",
"execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')",
"execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')",
]