From dd7a7232141c1aa8a6bddfd8928a72897d84e7d7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 10 Jul 2017 16:41:49 +0530 Subject: [PATCH] minor fixes while upgrading an old instance --- .../doctype/production_order/production_order.json | 2 +- .../doctype/production_order_item/production_order_item.json | 2 +- erpnext/patches/v8_0/merge_student_batch_and_student_group.py | 4 ++-- erpnext/patches/v8_1/setup_gst_india.py | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json index ee033c427d8..e56e5a1251f 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.json +++ b/erpnext/manufacturing/doctype/production_order/production_order.json @@ -1358,7 +1358,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-06-13 14:29:00.457874", + "modified": "2017-07-10 14:29:00.457874", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order", diff --git a/erpnext/manufacturing/doctype/production_order_item/production_order_item.json b/erpnext/manufacturing/doctype/production_order_item/production_order_item.json index 06a7876d40a..00e3adf13be 100644 --- a/erpnext/manufacturing/doctype/production_order_item/production_order_item.json +++ b/erpnext/manufacturing/doctype/production_order_item/production_order_item.json @@ -353,7 +353,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-05-15 17:37:20.212361", + "modified": "2017-07-10 17:37:20.212361", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order Item", diff --git a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py index 7cfdf603030..c5654eb3acc 100644 --- a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py +++ b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py @@ -9,8 +9,8 @@ from frappe.model.mapper import get_mapped_doc def execute(): # for converting student batch into student group - for doctype in ["Student Group", "Student Group Student", "Student Group Instructor", "Student Attendance"]: - frappe.reload_doc("schools", "doctype", doctype) + for doctype in ["Student Group", "Student Group Student", "Student Group Instructor", "Student Attendance", "Student"]: + frappe.reload_doc("schools", "doctype", frappe.scrub(doctype)) if frappe.db.table_exists("Student Batch"): student_batches = frappe.db.sql('''select name as student_group_name, student_batch_name as batch, diff --git a/erpnext/patches/v8_1/setup_gst_india.py b/erpnext/patches/v8_1/setup_gst_india.py index ce27d371b75..566069369c5 100644 --- a/erpnext/patches/v8_1/setup_gst_india.py +++ b/erpnext/patches/v8_1/setup_gst_india.py @@ -5,6 +5,7 @@ def execute(): frappe.reload_doc('regional', 'doctype', 'gst_settings') frappe.reload_doc('regional', 'doctype', 'gst_hsn_code') frappe.reload_doc('stock', 'doctype', 'item') + frappe.reload_doc("stock", "doctype", "customs_tariff_number") for report_name in ('GST Sales Register', 'GST Purchase Register', 'GST Itemised Sales Register', 'GST Itemised Purchase Register'):