From 7dc2f95932c980402307b3765d46f1fa674e2ad0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 11 Oct 2021 10:02:31 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20v12=20migrate=20error=20-=20unknown=20co?= =?UTF-8?q?lumn=20=E2=80=98mandatory=5Fdepends=5Fon=E2=80=99=20(backport?= =?UTF-8?q?=20#27897)=20(#27900)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897) * fix: v12 doesn't have mandatory_depends_on field * fix: move update_vehicle_no_reqd_condition to v13 * fix: move update_vehicle_no_reqd_condition to v13 * fix: file name missing .py * refactor!: add back empty line * fix: linters issue (cherry picked from commit 7acdcc70ad4741fb0fd14750ab76630b15cb4440) # Conflicts: # erpnext/patches.txt * fix: resolve conflicts Co-authored-by: Dany Robert Co-authored-by: Ankush Menat --- .../consolidated_financial_statement.py | 3 ++- erpnext/patches.txt | 2 +- .../{v12_0 => v13_0}/update_vehicle_no_reqd_condition.py | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename erpnext/patches/{v12_0 => v13_0}/update_vehicle_no_reqd_condition.py (100%) diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py index e093f9618b4..a600ead9e54 100644 --- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py @@ -3,12 +3,13 @@ from __future__ import unicode_literals +from collections import defaultdict + import frappe from frappe import _ from frappe.utils import cint, flt, getdate import erpnext -from collections import defaultdict from erpnext.accounts.report.balance_sheet.balance_sheet import ( get_chart_data, get_provisional_profit_loss, diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 7f52e118c7b..1ce922c10e4 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -262,7 +262,7 @@ erpnext.patches.v13_0.update_payment_terms_outstanding erpnext.patches.v12_0.add_state_code_for_ladakh erpnext.patches.v13_0.item_reposting_for_incorrect_sl_and_gl erpnext.patches.v13_0.delete_old_bank_reconciliation_doctypes -erpnext.patches.v12_0.update_vehicle_no_reqd_condition +erpnext.patches.v13_0.update_vehicle_no_reqd_condition erpnext.patches.v12_0.add_einvoice_status_field #2021-03-17 erpnext.patches.v12_0.add_einvoice_summary_report_permissions erpnext.patches.v13_0.setup_fields_for_80g_certificate_and_donation diff --git a/erpnext/patches/v12_0/update_vehicle_no_reqd_condition.py b/erpnext/patches/v13_0/update_vehicle_no_reqd_condition.py similarity index 100% rename from erpnext/patches/v12_0/update_vehicle_no_reqd_condition.py rename to erpnext/patches/v13_0/update_vehicle_no_reqd_condition.py