From fe2ced7bee1713067912787b3e238269adf451ac Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 25 Feb 2022 16:57:59 +0530 Subject: [PATCH 1/4] fix: Regional print format addition --- erpnext/regional/india/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py index e835690969..2df52a204b 100644 --- a/erpnext/regional/india/setup.py +++ b/erpnext/regional/india/setup.py @@ -111,7 +111,7 @@ def add_permissions(): def add_print_formats(): frappe.reload_doc("regional", "print_format", "gst_tax_invoice") - frappe.reload_doc("accounts", "print_format", "gst_pos_invoice") + frappe.reload_doc("selling", "print_format", "gst_pos_invoice") frappe.reload_doc("accounts", "print_format", "GST E-Invoice") frappe.db.set_value("Print Format", "GST POS Invoice", "disabled", 0) From 36c76c40350cbc030cc2b27a84c1bfebbcad67c3 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 25 Feb 2022 17:15:57 +0530 Subject: [PATCH 2/4] fix: Failing setup wizard test --- erpnext/hr/doctype/department/department.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py index ed0bfcf0d5..ecc025a6e3 100644 --- a/erpnext/hr/doctype/department/department.py +++ b/erpnext/hr/doctype/department/department.py @@ -32,7 +32,7 @@ class Department(NestedSet): return new def on_update(self): - if not frappe.local.flags.ignore_update_nsm: + if not frappe.local.flags.ignore_update_nsm or frappe.flags.in_setup_wizard: super(Department, self).on_update() def on_trash(self): From 3e573e9838ef82a5e1b89c3d1dcbd6ce67c361b9 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 25 Feb 2022 17:18:53 +0530 Subject: [PATCH 3/4] fix: Condition --- erpnext/hr/doctype/department/department.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/department/department.py b/erpnext/hr/doctype/department/department.py index ecc025a6e3..71300c40b0 100644 --- a/erpnext/hr/doctype/department/department.py +++ b/erpnext/hr/doctype/department/department.py @@ -32,7 +32,7 @@ class Department(NestedSet): return new def on_update(self): - if not frappe.local.flags.ignore_update_nsm or frappe.flags.in_setup_wizard: + if not (frappe.local.flags.ignore_update_nsm or frappe.flags.in_setup_wizard): super(Department, self).on_update() def on_trash(self): From 4f463943990057e8ef43eac07e02dc75b9ff8580 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 25 Feb 2022 21:18:22 +0530 Subject: [PATCH 4/4] fix: Add parent to department --- erpnext/hr/doctype/department/test_records.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/department/test_records.json b/erpnext/hr/doctype/department/test_records.json index 654925ef93..e3421f28b8 100644 --- a/erpnext/hr/doctype/department/test_records.json +++ b/erpnext/hr/doctype/department/test_records.json @@ -1,4 +1,4 @@ [ - {"doctype":"Department", "department_name":"_Test Department", "company": "_Test Company"}, - {"doctype":"Department", "department_name":"_Test Department 1", "company": "_Test Company"} + {"doctype":"Department", "department_name":"_Test Department", "company": "_Test Company", "parent_department": "All Departments"}, + {"doctype":"Department", "department_name":"_Test Department 1", "company": "_Test Company", "parent_department": "All Departments"} ] \ No newline at end of file