nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-11-26 11:21:07 +05:30
parent ec0da0b177 d3e7a6d57a
commit 60ae96d588
50 changed files with 322 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/patch_list.py
View File

@@ -245,10 +245,12 @@ patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'comment') #2013-11-15",
"patches.1311.p02_index_singles",
"patches.1311.p01_make_gl_entries_for_si",
"patches.1311.p03_update_reqd_report_fields",
"patches.1311.p03_update_reqd_report_fields",
"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap_config') #2013-11-20",
"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap') #2013-11-20",
"execute:webnotes.bean('Style Settings').save() #2013-11-20",
"execute:webnotes.get_module('website.doctype.website_sitemap_config.website_sitemap_config').rebuild_website_sitemap_config()",
"patches.1311.p04_update_year_end_date_of_fiscal_year",
"patches.1311.p04_update_comments",
"patches.1311.p05_website_brand_html",
]