From 7acdcc70ad4741fb0fd14750ab76630b15cb4440 Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Mon, 11 Oct 2021 15:05:55 +0530 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(#27897)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .../consolidated_financial_statement.py | 3 ++- erpnext/patches.txt | 4 ++-- .../{v12_0 => v13_0}/update_vehicle_no_reqd_condition.py | 0 3 files changed, 4 insertions(+), 3 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 22a63139942..c55fb0abd1b 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -246,7 +246,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.v13_0.setup_fields_for_80g_certificate_and_donation erpnext.patches.v13_0.rename_membership_settings_to_non_profit_settings erpnext.patches.v13_0.setup_gratuity_rule_for_india_and_uae @@ -302,4 +302,4 @@ erpnext.patches.v13_0.create_custom_field_for_finance_book erpnext.patches.v13_0.modify_invalid_gain_loss_gl_entries erpnext.patches.v13_0.fix_additional_cost_in_mfg_stock_entry erpnext.patches.v13_0.set_status_in_maintenance_schedule_table -erpnext.patches.v13_0.add_default_interview_notification_templates \ No newline at end of file +erpnext.patches.v13_0.add_default_interview_notification_templates 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