From 55399f2e5837b424a5489823fd73e376e9cfbad6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 20 Jul 2022 18:59:36 +0530 Subject: [PATCH 1/3] fix: Patch to make accounting dimension in orders (cherry picked from commit d46e406db78ef490f461dbe01918fd02fffbb5fd) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 6 ++++++ .../v13_0/create_accounting_dimensions_in_orders.py | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8e8e2b25299..f77ad02c95f 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -363,7 +363,13 @@ erpnext.patches.v13_0.copy_custom_field_filters_to_website_item erpnext.patches.v13_0.set_available_for_use_date_if_missing erpnext.patches.v13_0.education_deprecation_warning erpnext.patches.v13_0.requeue_recoverable_reposts +<<<<<<< HEAD erpnext.patches.v13_0.create_accounting_dimensions_in_orders +======= +erpnext.patches.v14_0.discount_accounting_separation +erpnext.patches.v14_0.delete_employee_transfer_property_doctype +erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1 +>>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders) erpnext.patches.v13_0.set_per_billed_in_return_delivery_note erpnext.patches.v13_0.update_employee_advance_status erpnext.patches.v13_0.job_card_status_on_hold diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py index 7e6e8200852..8e6bce66fe4 100644 --- a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py +++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py @@ -33,7 +33,10 @@ def execute(): "insert_after": insert_after_field, } - create_custom_field(doctype, df, ignore_validate=True) - frappe.clear_cache(doctype=doctype) + try: + create_custom_field(doctype, df, ignore_validate=True) + frappe.clear_cache(doctype=doctype) + except Exception as e: + pass count += 1 From 45e25b2d56452d01334cc7ee53bcec05bf7b927f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 20 Jul 2022 19:01:14 +0530 Subject: [PATCH 2/3] chore: do not re run patch (cherry picked from commit cad2035e07ea332e59cdd4707586435536a54666) # Conflicts: # erpnext/patches.txt --- erpnext/patches.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index f77ad02c95f..44c66c6f527 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -368,8 +368,12 @@ erpnext.patches.v13_0.create_accounting_dimensions_in_orders ======= erpnext.patches.v14_0.discount_accounting_separation erpnext.patches.v14_0.delete_employee_transfer_property_doctype +<<<<<<< HEAD erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1 >>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders) +======= +erpnext.patches.v13_0.create_accounting_dimensions_in_orders +>>>>>>> cad2035e07 (chore: do not re run patch) erpnext.patches.v13_0.set_per_billed_in_return_delivery_note erpnext.patches.v13_0.update_employee_advance_status erpnext.patches.v13_0.job_card_status_on_hold From e36c74ac444726d910550d241e6ac2a34dc8cefc Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 20 Jul 2022 19:39:18 +0530 Subject: [PATCH 3/3] chore: resolve conflicts --- erpnext/patches.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 44c66c6f527..8e8e2b25299 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -363,17 +363,7 @@ erpnext.patches.v13_0.copy_custom_field_filters_to_website_item erpnext.patches.v13_0.set_available_for_use_date_if_missing erpnext.patches.v13_0.education_deprecation_warning erpnext.patches.v13_0.requeue_recoverable_reposts -<<<<<<< HEAD erpnext.patches.v13_0.create_accounting_dimensions_in_orders -======= -erpnext.patches.v14_0.discount_accounting_separation -erpnext.patches.v14_0.delete_employee_transfer_property_doctype -<<<<<<< HEAD -erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1 ->>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders) -======= -erpnext.patches.v13_0.create_accounting_dimensions_in_orders ->>>>>>> cad2035e07 (chore: do not re run patch) erpnext.patches.v13_0.set_per_billed_in_return_delivery_note erpnext.patches.v13_0.update_employee_advance_status erpnext.patches.v13_0.job_card_status_on_hold