From b120520aa871ba349cbbc091421a907532c53d83 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 18 Feb 2015 11:54:08 +0530 Subject: [PATCH] fixed patches --- .../production_plan_sales_order.json | 13 ++++++++++--- erpnext/patches.txt | 6 ++++-- erpnext/patches/v5_0/rename_customer_issue.py | 2 +- erpnext/patches/v5_0/rename_table_fieldnames.py | 1 - erpnext/patches/v5_0/rename_total_fields.py | 5 +++-- ...med_fields_in_custom_script_and_print_formats.py | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json index 2b6c39314d..39634feb80 100644 --- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json +++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -1,6 +1,6 @@ { "autoname": "PP/.SO/.#####", - "creation": "2013-02-22 01:27:49.000000", + "creation": "2013-02-22 01:27:49", "docstatus": 0, "doctype": "DocType", "fields": [ @@ -28,6 +28,12 @@ "read_only": 1, "width": "120px" }, + { + "fieldname": "col_break1", + "fieldtype": "Column Break", + "permlevel": 0, + "precision": "" + }, { "fieldname": "customer", "fieldtype": "Link", @@ -53,9 +59,10 @@ ], "idx": 1, "istable": 1, - "modified": "2013-12-20 19:23:25.000000", + "modified": "2015-02-17 14:29:14.479541", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Sales Order", - "owner": "Administrator" + "owner": "Administrator", + "permissions": [] } \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 147525e2cb..5fcf8bfe8b 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -97,6 +97,8 @@ execute:frappe.db.sql("update `tabItem` i set apply_warehouse_wise_reorder_level execute:frappe.rename_doc("DocType", "Support Ticket", "Issue", force=True) erpnext.patches.v5_0.set_default_company_in_bom erpnext.patches.v5_0.capacity_planning +execute:frappe.reload_doc('crm', 'doctype', 'lead') +execute:frappe.reload_doc('crm', 'doctype', 'opportunity') erpnext.patches.v5_0.rename_table_fieldnames execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''") erpnext.patches.v4_2.party_model @@ -108,6 +110,6 @@ erpnext.patches.v5_0.remove_shopping_cart_app erpnext.patches.v5_0.update_companywise_payment_account erpnext.patches.v5_0.remove_birthday_events erpnext.patches.v5_0.update_item_name_in_bom -execute:frappe.reload_doc('crm', 'doctype', 'lead') -execute:frappe.reload_doc('crm', 'doctype', 'opportunity') erpnext.patches.v5_0.rename_customer_issue +erpnext.patches.v5_0.rename_total_fields +erpnext.patches.v5_0.replace_renamed_fields_in_custom_script_and_print_formats diff --git a/erpnext/patches/v5_0/rename_customer_issue.py b/erpnext/patches/v5_0/rename_customer_issue.py index c3c38a7d8b..68bab3f906 100644 --- a/erpnext/patches/v5_0/rename_customer_issue.py +++ b/erpnext/patches/v5_0/rename_customer_issue.py @@ -2,4 +2,4 @@ import frappe def execute(): if frappe.db.table_exists("tabCustomer Issue"): - frappe.rename_doc("DocType", "Customer Issue", "Warrany Claim") + frappe.rename_doc("DocType", "Customer Issue", "Warranty Claim") diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py index eed4c1ce7b..5514a00314 100644 --- a/erpnext/patches/v5_0/rename_table_fieldnames.py +++ b/erpnext/patches/v5_0/rename_table_fieldnames.py @@ -105,7 +105,6 @@ rename_map = { ["experience_in_company_details", "internal_work_history"] ], "Event": [ - ["event_individuals", "users"], ["event_roles", "roles"] ], "Expense Claim": [ diff --git a/erpnext/patches/v5_0/rename_total_fields.py b/erpnext/patches/v5_0/rename_total_fields.py index 946ad21089..d9465fa207 100644 --- a/erpnext/patches/v5_0/rename_total_fields.py +++ b/erpnext/patches/v5_0/rename_total_fields.py @@ -8,7 +8,7 @@ from frappe.modules import scrub, get_doctype_module selling_doctypes = ("Quotation", "Sales Order", "Delivery Note", "Sales Invoice") -selling_doctypes = ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice") +buying_doctypes = ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice") selling_renamed_fields = ( ("net_total", "base_net_total"), @@ -47,4 +47,5 @@ def execute(): rename_field(dt, f[0], f[1]) # Added new field "total_taxes_and_charges" in buying cycle, updating value - frappe.db.sql("update `tab{0}` set total_taxes_and_charges=round(base_total_taxes_and_charges/conversion_rate), 2") + frappe.db.sql("""update `tab{0}` + set total_taxes_and_charges = round(base_total_taxes_and_charges/conversion_rate, 2)""".format(dt)) diff --git a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_script_and_print_formats.py b/erpnext/patches/v5_0/replace_renamed_fields_in_custom_script_and_print_formats.py index 46bb221ac6..f8775c12f3 100644 --- a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_script_and_print_formats.py +++ b/erpnext/patches/v5_0/replace_renamed_fields_in_custom_script_and_print_formats.py @@ -43,7 +43,7 @@ def get_all_renamed_fields(): ) for fields in rename_map.values(): - renamed_fields += fields + renamed_fields += tuple(fields) return renamed_fields