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

Merge remote-tracking branch 'upstream/wsgi' into HEAD

Browse Source 
Conflicts:
	public/js/complete_setup.js
	setup/doctype/setup_control/setup_control.py
This commit is contained in:
Pratik Vyas
2013-10-25 14:07:48 +05:30
parent 96333b6bc7 fe44d27d7f
commit 297041ed3e
313 changed files with 3813 additions and 3018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/patch_list.py
View File

@@ -3,10 +3,8 @@
from __future__ import unicode_literals
patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'doctype', force=True) #2013-07-15",
"execute:webnotes.reload_doc('core', 'doctype', 'docfield', force=True) #2013-07-15",
"execute:webnotes.reload_doc('core', 'doctype', 'doctype', force=True) #2013-07-16",
"execute:webnotes.reload_doc('core', 'doctype', 'docfield', force=True) #2013-07-16",
"execute:webnotes.reload_doc('core', 'doctype', 'doctype', force=True) #2013-10-15",
"execute:webnotes.reload_doc('core', 'doctype', 'docfield', force=True) #2013-10-15",
"execute:webnotes.reload_doc('core', 'doctype', 'docperm') #2013-07-16",
"execute:webnotes.reload_doc('core', 'doctype', 'page') #2013-07-16",
"execute:webnotes.reload_doc('core', 'doctype', 'report') #2013-07-16",
@@ -220,8 +218,17 @@ patch_list = [
"patches.september_2013.p04_unsubmit_serial_nos",
"patches.september_2013.p05_fix_customer_in_pos",
"patches.october_2013.fix_is_cancelled_in_sle",
"patches.october_2013.p01_update_delivery_note_prevdocs",
"patches.october_2013.p02_set_communication_status",
"patches.october_2013.p03_crm_update_status",
"execute:webnotes.delete_doc('DocType', 'Setup Control')",
"patches.october_2013.p04_wsgi_migration",
"patches.october_2013.p05_server_custom_script_to_file",
"patches.october_2013.repost_ordered_qty",
"patches.october_2013.repost_planned_qty",
"patches.october_2013.p06_rename_packing_list_doctype",
"execute:webnotes.delete_doc('DocType', 'Sales Common')",
"patches.october_2013.p09_update_naming_series_settings",
"patches.october_2013.p02_update_price_list_and_item_details_in_item_price",
"execute:webnotes.delete_doc('Report', 'Item-wise Price List')",
"patches.october_2013.p03_remove_sales_and_purchase_return_tool",