Merge pull request #40931 from cogk/fix-dont-call-get_fiscal_year-before-setup-is-done
fix: Don't call get_fiscal_year if setup is not done yet
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index c494eec..d74224c 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -182,6 +182,7 @@
and self.company == dimension.company
and dimension.mandatory_for_pl
and not dimension.disabled
+ and not self.is_cancelled
):
if not self.get(dimension.fieldname):
frappe.throw(
@@ -195,6 +196,7 @@
and self.company == dimension.company
and dimension.mandatory_for_bs
and not dimension.disabled
+ and not self.is_cancelled
):
if not self.get(dimension.fieldname):
frappe.throw(
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 2edf519..65ba9af 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -1723,6 +1723,7 @@
)
ref_doc.set_status(update=True)
+ ref_doc.notify_update()
def delink_original_entry(pl_entry, partial_cancel=False):
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 3ecef85..66097ce 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1032,10 +1032,10 @@
"transaction_currency": self.get("currency") or self.company_currency,
"transaction_exchange_rate": self.get("conversion_rate", 1),
"debit_in_transaction_currency": self.get_value_in_transaction_currency(
- account_currency, args, "debit"
+ account_currency, gl_dict, "debit"
),
"credit_in_transaction_currency": self.get_value_in_transaction_currency(
- account_currency, args, "credit"
+ account_currency, gl_dict, "credit"
),
}
)
@@ -1067,11 +1067,11 @@
return "Debit Note"
return self.doctype
- def get_value_in_transaction_currency(self, account_currency, args, field):
+ def get_value_in_transaction_currency(self, account_currency, gl_dict, field):
if account_currency == self.get("currency"):
- return args.get(field + "_in_account_currency")
+ return gl_dict.get(field + "_in_account_currency")
else:
- return flt(args.get(field, 0) / self.get("conversion_rate", 1))
+ return flt(gl_dict.get(field, 0) / self.get("conversion_rate", 1))
def validate_zero_qty_for_return_invoices_with_stock(self):
rows = []