Merge pull request #36220 from marination/dunning-patch-acc-frozen
fix: Patch Dunnings after accounts were frozen
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 0701435..35092a7 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -122,13 +122,10 @@
frm.set_query('payment_term', 'references', function(frm, cdt, cdn) {
const child = locals[cdt][cdn];
if (in_list(['Purchase Invoice', 'Sales Invoice'], child.reference_doctype) && child.reference_name) {
- let payment_term_list = frappe.get_list('Payment Schedule', {'parent': child.reference_name});
-
- payment_term_list = payment_term_list.map(pt => pt.payment_term);
-
return {
+ query: "erpnext.controllers.queries.get_payment_terms_for_references",
filters: {
- 'name': ['in', payment_term_list]
+ 'reference': child.reference_name
}
}
}
@@ -1463,4 +1460,4 @@
});
}
},
-})
\ No newline at end of file
+})
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 7542bab..c175e24 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -207,6 +207,16 @@
if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(d.outstanding_amount):
frappe.throw(fail_message.format(d.idx))
+ def term_based_allocation_enabled_for_reference(
+ self, reference_doctype: str, reference_name: str
+ ) -> bool:
+ if reference_doctype and reference_name:
+ if template := frappe.db.get_value(reference_doctype, reference_name, "payment_terms_template"):
+ return frappe.db.get_value(
+ "Payment Terms Template", template, "allocate_payment_based_on_payment_terms"
+ )
+ return False
+
def validate_allocated_amount_with_latest_data(self):
latest_references = get_outstanding_reference_documents(
{
@@ -228,10 +238,23 @@
d = frappe._dict(d)
latest_lookup.setdefault((d.voucher_type, d.voucher_no), frappe._dict())[d.payment_term] = d
- for d in self.get("references"):
- latest = (latest_lookup.get((d.reference_doctype, d.reference_name)) or frappe._dict()).get(
- d.payment_term
- )
+ for idx, d in enumerate(self.get("references"), start=1):
+ latest = latest_lookup.get((d.reference_doctype, d.reference_name)) or frappe._dict()
+
+ # If term based allocation is enabled, throw
+ if (
+ d.payment_term is None or d.payment_term == ""
+ ) and self.term_based_allocation_enabled_for_reference(
+ d.reference_doctype, d.reference_name
+ ):
+ frappe.throw(
+ _(
+ "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section"
+ ).format(frappe.bold(d.reference_name), frappe.bold(idx))
+ )
+
+ # if no payment template is used by invoice and has a custom term(no `payment_term`), then invoice outstanding will be in 'None' key
+ latest = latest.get(d.payment_term) or latest.get(None)
# The reference has already been fully paid
if not latest:
@@ -1633,6 +1656,9 @@
"invoice_amount": flt(d.invoice_amount),
"outstanding_amount": flt(d.outstanding_amount),
"payment_term_outstanding": payment_term_outstanding,
+ "allocated_amount": payment_term_outstanding
+ if payment_term_outstanding
+ else d.outstanding_amount,
"payment_amount": payment_term.payment_amount,
"payment_term": payment_term.payment_term,
"account": d.account,
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 70cc4b3..c6e93f3 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -1061,6 +1061,101 @@
}
self.assertDictEqual(ref_details, expected_response)
+ @change_settings(
+ "Accounts Settings",
+ {
+ "unlink_payment_on_cancellation_of_invoice": 1,
+ "delete_linked_ledger_entries": 1,
+ "allow_multi_currency_invoices_against_single_party_account": 1,
+ },
+ )
+ def test_overallocation_validation_on_payment_terms(self):
+ """
+ Validate Allocation on Payment Entry based on Payment Schedule. Upon overallocation, validation error must be thrown.
+
+ """
+ customer = create_customer()
+ create_payment_terms_template()
+
+ # Validate allocation on base/company currency
+ si1 = create_sales_invoice(do_not_save=1, qty=1, rate=200)
+ si1.payment_terms_template = "Test Receivable Template"
+ si1.save().submit()
+
+ si1.reload()
+ pe = get_payment_entry(si1.doctype, si1.name).save()
+ # Allocated amount should be according to the payment schedule
+ for idx, schedule in enumerate(si1.payment_schedule):
+ with self.subTest(idx=idx):
+ self.assertEqual(flt(schedule.payment_amount), flt(pe.references[idx].allocated_amount))
+ pe.save()
+
+ # Overallocation validation should trigger
+ pe.paid_amount = 400
+ pe.references[0].allocated_amount = 200
+ pe.references[1].allocated_amount = 200
+ self.assertRaises(frappe.ValidationError, pe.save)
+ pe.delete()
+ si1.cancel()
+ si1.delete()
+
+ # Validate allocation on foreign currency
+ si2 = create_sales_invoice(
+ customer="_Test Customer USD",
+ debit_to="_Test Receivable USD - _TC",
+ currency="USD",
+ conversion_rate=80,
+ do_not_save=1,
+ )
+ si2.payment_terms_template = "Test Receivable Template"
+ si2.save().submit()
+
+ si2.reload()
+ pe = get_payment_entry(si2.doctype, si2.name).save()
+ # Allocated amount should be according to the payment schedule
+ for idx, schedule in enumerate(si2.payment_schedule):
+ with self.subTest(idx=idx):
+ self.assertEqual(flt(schedule.payment_amount), flt(pe.references[idx].allocated_amount))
+ pe.save()
+
+ # Overallocation validation should trigger
+ pe.paid_amount = 200
+ pe.references[0].allocated_amount = 100
+ pe.references[1].allocated_amount = 100
+ self.assertRaises(frappe.ValidationError, pe.save)
+ pe.delete()
+ si2.cancel()
+ si2.delete()
+
+ # Validate allocation in base/company currency on a foreign currency document
+ # when invoice is made is foreign currency, but posted to base/company currency debtors account
+ si3 = create_sales_invoice(
+ customer=customer,
+ currency="USD",
+ conversion_rate=80,
+ do_not_save=1,
+ )
+ si3.payment_terms_template = "Test Receivable Template"
+ si3.save().submit()
+
+ si3.reload()
+ pe = get_payment_entry(si3.doctype, si3.name).save()
+ # Allocated amount should be equal to payment term outstanding
+ self.assertEqual(len(pe.references), 2)
+ for idx, ref in enumerate(pe.references):
+ with self.subTest(idx=idx):
+ self.assertEqual(ref.payment_term_outstanding, ref.allocated_amount)
+ pe.save()
+
+ # Overallocation validation should trigger
+ pe.paid_amount = 16000
+ pe.references[0].allocated_amount = 8000
+ pe.references[1].allocated_amount = 8000
+ self.assertRaises(frappe.ValidationError, pe.save)
+ pe.delete()
+ si3.cancel()
+ si3.delete()
+
def create_payment_entry(**args):
payment_entry = frappe.new_doc("Payment Entry")
@@ -1150,3 +1245,17 @@
def create_payment_term(name):
if not frappe.db.exists("Payment Term", name):
frappe.get_doc({"doctype": "Payment Term", "payment_term_name": name}).insert()
+
+
+def create_customer(name="_Test Customer 2 USD", currency="USD"):
+ customer = None
+ if frappe.db.exists("Customer", name):
+ customer = name
+ else:
+ customer = frappe.new_doc("Customer")
+ customer.customer_name = name
+ customer.default_currency = currency
+ customer.type = "Individual"
+ customer.save()
+ customer = customer.name
+ return customer
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index 922722f..4947248 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -126,23 +126,22 @@
def make_gl_entries(self, get_opening_entries=False):
gl_entries = self.get_gl_entries()
closing_entries = self.get_grouped_gl_entries(get_opening_entries=get_opening_entries)
- if gl_entries:
- if len(gl_entries) > 5000:
- frappe.enqueue(
- process_gl_entries,
- gl_entries=gl_entries,
- closing_entries=closing_entries,
- voucher_name=self.name,
- company=self.company,
- closing_date=self.posting_date,
- queue="long",
- )
- frappe.msgprint(
- _("The GL Entries will be processed in the background, it can take a few minutes."),
- alert=True,
- )
- else:
- process_gl_entries(gl_entries, closing_entries, self.name, self.company, self.posting_date)
+ if len(gl_entries) > 5000:
+ frappe.enqueue(
+ process_gl_entries,
+ gl_entries=gl_entries,
+ closing_entries=closing_entries,
+ voucher_name=self.name,
+ company=self.company,
+ closing_date=self.posting_date,
+ queue="long",
+ )
+ frappe.msgprint(
+ _("The GL Entries will be processed in the background, it can take a few minutes."),
+ alert=True,
+ )
+ else:
+ process_gl_entries(gl_entries, closing_entries, self.name, self.company, self.posting_date)
def get_grouped_gl_entries(self, get_opening_entries=False):
closing_entries = []
@@ -330,17 +329,15 @@
from erpnext.accounts.general_ledger import make_gl_entries
try:
- make_gl_entries(gl_entries, merge_entries=False)
+ if gl_entries:
+ make_gl_entries(gl_entries, merge_entries=False)
+
make_closing_entries(gl_entries + closing_entries, voucher_name, company, closing_date)
- frappe.db.set_value(
- "Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Completed"
- )
+ frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Completed")
except Exception as e:
frappe.db.rollback()
frappe.log_error(e)
- frappe.db.set_value(
- "Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Failed"
- )
+ frappe.db.set_value("Period Closing Voucher", voucher_name, "gle_processing_status", "Failed")
def make_reverse_gl_entries(voucher_type, voucher_no):
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 39917f9..599c8a3 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -231,6 +231,9 @@
(closing_balance.posting_date < filters.from_date) | (closing_balance.is_opening == "Yes")
)
+ if doctype == "GL Entry":
+ opening_balance = opening_balance.where(closing_balance.is_cancelled == 0)
+
if (
not filters.show_unclosed_fy_pl_balances
and report_type == "Profit and Loss"
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 4b54483..e354663 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -1112,7 +1112,8 @@
def parse_naming_series_variable(doc, variable):
if variable == "FY":
- return get_fiscal_year(date=doc.get("posting_date"), company=doc.get("company"))[0]
+ date = doc.get("posting_date") or doc.get("transaction_date") or getdate()
+ return get_fiscal_year(date=date, company=doc.get("company"))[0]
@frappe.whitelist()
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index d1dcd6a..5ec2474 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -874,3 +874,18 @@
fields.insert(1, meta.title_field.strip())
return unique(fields)
+
+
+@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
+def get_payment_terms_for_references(doctype, txt, searchfield, start, page_len, filters) -> list:
+ terms = []
+ if filters:
+ terms = frappe.db.get_all(
+ "Payment Schedule",
+ filters={"parent": filters.get("reference")},
+ fields=["payment_term"],
+ limit=page_len,
+ as_list=1,
+ )
+ return terms
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.js b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
index ef87586..8aa14d1 100644
--- a/erpnext/selling/report/address_and_contacts/address_and_contacts.js
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
@@ -13,7 +13,7 @@
"get_query": function() {
return {
"filters": {
- "name": ["in","Customer,Supplier,Sales Partner"],
+ "name": ["in","Customer,Supplier,Sales Partner,Lead"],
}
}
}
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.py b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
index 9a1cfda..4542bdf 100644
--- a/erpnext/selling/report/address_and_contacts/address_and_contacts.py
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
@@ -130,6 +130,7 @@
"Customer": "customer_group",
"Supplier": "supplier_group",
"Sales Partner": "partner_type",
+ "Lead": "status",
}
return group[party_type]
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index d9b5503..0059a3f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -420,7 +420,7 @@
transferred_materials = frappe.db.sql(
"""
select
- sum(qty) as qty
+ sum(sed.qty) as qty
from `tabStock Entry` se,`tabStock Entry Detail` sed
where
se.name = sed.parent and se.docstatus=1 and
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index c072874..e7d3e20 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -10,11 +10,18 @@
from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter
+SLE_COUNT_LIMIT = 10_000
+
def execute(filters=None):
if not filters:
filters = {}
+ sle_count = frappe.db.count("Stock Ledger Entry", {"is_cancelled": 0})
+
+ if sle_count > SLE_COUNT_LIMIT and not filters.get("item_code") and not filters.get("warehouse"):
+ frappe.throw(_("Please select either the Item or Warehouse filter to generate the report."))
+
if filters.from_date > filters.to_date:
frappe.throw(_("From Date must be before To Date"))