| {{ _(" ") }} | -{{ _(range1) }} | -{{ _(range2) }} | -{{ _(range3) }} | -{{ _(range4) }} | -{{ _(range5) }} | -{{ _(range6) }} | -{{ _("Total") }} | -
|---|---|---|---|---|---|---|---|
| {{ _("Total Outstanding") }} | -- {{ format_number(balance_row["age"], null, 2) }} - | -- {{ frappe.utils.fmt_money(balance_row["range1"], data[data.length-1]["currency"]) }} - | -- {{ frappe.utils.fmt_money(balance_row["range2"], data[data.length-1]["currency"]) }} - | -- {{ frappe.utils.fmt_money(balance_row["range3"], data[data.length-1]["currency"]) }} - | -- {{ frappe.utils.fmt_money(balance_row["range4"], data[data.length-1]["currency"]) }} - | -- {{ frappe.utils.fmt_money(balance_row["range5"], data[data.length-1]["currency"]) }} - | -- {{ frappe.utils.fmt_money(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) }} - | -{{ _("Future Payments") }} | -- | - | - | - | - | - | - {{ frappe.utils.fmt_money(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) }} - | -
| {{ _("Cheques Required") }} | -- | - | - | - | - | - | - {{ frappe.utils.fmt_money(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) }} | -
| {{ _("Date") }} | -{{ _("Age (Days)") }} | - - {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} -{{ _("Reference") }} | -{{ _("Sales Person") }} | - {% else %} -{{ _("Reference") }} | - {% endif %} - {% if not(filters.show_future_payments) %} -- {% if (filters.customer or filters.supplier or filters.customer_name) %} - {{ _("Remarks") }} - {% else %} - {{ _("Party") }} - {% endif %} - | - {% endif %} -{{ _("Invoiced Amount") }} | - {% if not(filters.show_future_payments) %} -{{ _("Paid Amount") }} | -- {% if report.report_name == "Accounts Receivable" %} - {{ _('Credit Note') }} - {% else %} - {{ _('Debit Note') }} - {% endif %} - | - {% endif %} -{{ _("Outstanding Amount") }} | - {% if(filters.show_future_payments) %} - {% if(report.report_name == "Accounts Receivable") %} -{{ _("Customer LPO No.") }} | - {% endif %} -{{ _("Future Payment Ref") }} | -{{ _("Future Payment Amount") }} | -{{ _("Remaining Balance") }} | - {% endif %} - {% else %} -- {% if (filters.customer or filters.supplier or filters.customer_name) %} - {{ _("Remarks")}} - {% else %} - {{ _("Party") }} - {% endif %} - | -{{ _("Total Invoiced Amount") }} | -{{ _("Total Paid Amount") }} | -- {% if report.report_name == "Accounts Receivable Summary" %} - {{ _('Credit Note Amount') }} - {% else %} - {{ _('Debit Note Amount') }} - {% endif %} - | -{{ _("Total Outstanding Amount") }} | - {% endif %} +{{ _(" ") }} | +{{ _(age) }} | +{{ _(range1) }} | +{{ _(range2) }} | +{{ _(range3) }} | +{{ _(range4) }} | +{{ _(range5) }} | +{{ _("Total") }} |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ frappe.format((data[i]["posting_date"]), 'Date') }} | -{{ data[i]["age"] }} | -
- {% if not(filters.show_future_payments) %}
- {{ data[i]["voucher_type"] }}
- - {% endif %} - {{ data[i]["voucher_no"] }} - |
+ ||||||||||||||||||||||||
| {{ _("Total Outstanding") }} | ++ {{ frappe.utils.flt(balance_row["age"], 2) }} + | ++ {{ frappe.utils.fmt_money(balance_row["range1"], currency=balance_row["currency"]) }} + | ++ {{ frappe.utils.fmt_money(balance_row["range2"], currency=balance_row["currency"]) }} + | ++ {{ frappe.utils.fmt_money(balance_row["range3"], currency=balance_row["currency"]) }} + | ++ {{ frappe.utils.fmt_money(balance_row["range4"], currency=balance_row["currency"]) }} + | ++ {{ frappe.utils.fmt_money(balance_row["range5"], currency=balance_row["currency"]) }} + | ++ {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"]), currency=balance_row["currency"]) }} + | +{{ _("Future Payments") }} | ++ | + | + | + | + | + | + {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["future_amount"]), currency=balance_row["currency"]) }} + | +|||||||||||
| {{ _("Cheques Required") }} | ++ | + | + | + | + | + | + {{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"] - balance_row["future_amount"]), currency=balance_row["currency"]) }} | +{{ data[i]["sales_person"] }} | +
| {{ _("Date") }} | +{{ _("Age (Days)") }} | + + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} +{{ _("Reference") }} | +{{ _("Sales Person") }} | + {% else %} +{{ _("Reference") }} | + {% endif %} + {% if not(filters.show_future_payments) and filters.show_remarks %} ++ {% if (filters.customer or filters.supplier or filters.customer_name) %} + {{ _("Remarks") }} + {% else %} + {{ _("Party") }} + {% endif %} + | + {% endif %} +{{ _("Invoiced Amount") }} | + {% if not(filters.show_future_payments) %} +{{ _("Paid Amount") }} | ++ {% if report.report_name == "Accounts Receivable" %} + {{ _("Credit Note") }} + {% else %} + {{ _("Debit Note") }} {% endif %} + | + {% endif %} +{{ _("Outstanding Amount") }} | + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} +{{ _("Customer LPO No.") }} | + {% endif %} +{{ _("Future Payment Ref") }} | +{{ _("Future Payment Amount") }} | +{{ _("Remaining Balance") }} | + {% endif %} + {% else %} ++ {% if (filters.customer or filters.supplier or filters.customer_name) %} + {{ _("Remarks")}} + {% else %} + {{ _("Party") }} + {% endif %} + | +{{ _("Total Invoiced Amount") }} | +{{ _("Total Paid Amount") }} | ++ {% if report.report_name == "Accounts Receivable Summary" %} + {{ _("Credit Note Amount") }} + {% else %} + {{ _("Debit Note Amount") }} + {% endif %} + | +{{ _("Total Outstanding Amount") }} | + {% endif %} +||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ frappe.format(data[i]["posting_date"], 'Date') }} | +{{ data[i]["age"] }} | +
+ {% if not(filters.show_future_payments) %}
+ {{ data[i]["voucher_type"] }}
+ + {% endif %} + {{ data[i]["voucher_no"] }} + |
- {% if not (filters.show_future_payments) %}
+ {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %}
+ {{ data[i]["sales_person"] }} | + {% endif %} + + {% if not (filters.show_future_payments) and filters.show_remarks %} +
+ {% if(not(filters.customer or filters.supplier or filters.customer_name)) %}
+ {{ data[i]["party"] }}
+ {% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %}
+ {{ data[i]["customer_name"] }} + {% elif(data[i]["supplier_name"] != data[i]["party"]) %} + {{ data[i]["supplier_name"] }} + {% endif %} + {% endif %} +
+ {% if data[i]["remarks"] %}
+ {{ _("Remarks") }}:
+ {{ data[i]["remarks"] }}
+ {% endif %}
+
+ |
+ {% endif %}
+
+ + {{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} | + + {% if not(filters.show_future_payments) %} ++ {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | ++ {{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | + {% endif %} ++ {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | + + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} ++ {{ data[i]["po_no"] }} | + {% endif %} +{{ data[i]["future_ref"] }} | +{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }} | + {% endif %} + {% else %} ++ {% if not(filters.show_future_payments) %} + | + {% endif %} + {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} + | + {% endif %} + | + | {{ _("Total") }} | ++ {{ frappe.utils.fmt_money(data[i]["invoiced"], data[i]["currency"]) }} | + + {% if not(filters.show_future_payments) %} ++ {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | + {% endif %} ++ {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | + + {% if(filters.show_future_payments) %} + {% if(report.report_name == "Accounts Receivable") %} ++ {{ data[i]["po_no"] }} | + {% endif %} +{{ data[i]["future_ref"] }} | +{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }} | + {% endif %} + {% endif %} + {% else %} + {% if(data[i]["party"] or " ") %} + {% if not(data[i]["is_total_row"]) %}
- {% if(not(filters.customer or filters.supplier or filters.customer_name)) %}
+ {% if(not(filters.customer | filters.supplier)) %}
{{ data[i]["party"] }}
{% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %}
{{ data[i]["customer_name"] }} @@ -235,132 +311,73 @@ {{ data[i]["supplier_name"] }} {% endif %} {% endif %} -
- {% if data[i]["remarks"] %}
- {{ _("Remarks") }}:
- {{ data[i]["remarks"] }}
- {% endif %}
-
+ {{ _("Remarks") }}: + {{ data[i]["remarks"] }} |
- {% endif %}
-
- - {{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} | - - {% if not(filters.show_future_payments) %} -- {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | -- {{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | - {% endif %} -- {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | - - {% if(filters.show_future_payments) %} - {% if(report.report_name == "Accounts Receivable") %} -- {{ data[i]["po_no"] }} | - {% endif %} -{{ data[i]["future_ref"] }} | -{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }} | - {% endif %} {% else %} -- {% if not(filters.show_future_payments) %} - | - {% endif %} - {% if(report.report_name == "Accounts Receivable" and filters.show_sales_person) %} - | - {% endif %} - | - | {{ _("Total") }} | -- {{ frappe.utils.fmt_money(data[i]["invoiced"], data[i]["currency"]) }} | - - {% if not(filters.show_future_payments) %} -- {{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | - {% endif %} -- {{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | - - {% if(filters.show_future_payments) %} - {% if(report.report_name == "Accounts Receivable") %} -- {{ data[i]["po_no"] }} | - {% endif %} -{{ data[i]["future_ref"] }} | -{{ frappe.utils.fmt_money(data[i]["future_amount"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["remaining_balance"], currency=data[i]["currency"]) }} | - {% endif %} - {% endif %} - {% else %} - {% if(data[i]["party"] or " ") %} - {% if not(data[i]["is_total_row"]) %} -
- {% if(not(filters.customer | filters.supplier)) %}
- {{ data[i]["party"] }}
- {% if(data[i]["customer_name"] and data[i]["customer_name"] != data[i]["party"]) %}
- {{ data[i]["customer_name"] }} - {% elif(data[i]["supplier_name"] != data[i]["party"]) %} - {{ data[i]["supplier_name"] }} - {% endif %} - {% endif %} - {{ _("Remarks") }}: - {{ data[i]["remarks"] }} - |
- {% else %}
- {{ _("Total") }} | - {% endif %} -{{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | -{{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | +{{ _("Total") }} | {% endif %} +{{ frappe.utils.fmt_money(data[i]["invoiced"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["paid"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["credit_note"], currency=data[i]["currency"]) }} | +{{ frappe.utils.fmt_money(data[i]["outstanding"], currency=data[i]["currency"]) }} | {% endif %} -- | + {% endif %} + + {% endfor %} + | + | + {% if (filters.show_future_payments) or filters.show_remarks %} | + {% endif %} + {% if not(filters.show_future_payments) %} | {{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }} | {{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }} | {{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }} | {{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }} | - -
| 0 - 30 Days | -30 - 60 Days | -60 - 90 Days | -90 - 120 Days | -Above 120 Days | -
|---|---|---|---|---|
| {{ frappe.utils.fmt_money(ageing.range1, currency=data[0]["currency"]) }} | -{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }} | -{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }} | -{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }} | -{{ frappe.utils.fmt_money(ageing.range5, currency=filters.presentation_currency) }} | -
{{ _("Printed On ") }}{{ frappe.utils.now() }}
+ {% else %} +| {{ _("0 - 30 Days") }} | +{{ _("30 - 60 Days") }} | +{{ _("60 - 90 Days") }} | +{{ _("90 - 120 Days") }} | +{{ _("Above 120 Days") }} | +
|---|---|---|---|---|
| {{ frappe.utils.fmt_money(ageing.range1, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }} | +{{ frappe.utils.fmt_money(ageing.range5, currency=filters.presentation_currency) }} | +
{{ _("Printed on {0}").format(frappe.utils.now()) }}
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py index 0aeec6905eb..a8e468415c1 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py +++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py @@ -215,16 +215,22 @@ def start_repost(account_repost_doc=str) -> None: def get_allowed_types_from_settings(child_doc: bool = False): - repost_docs = [ - x.document_type - for x in frappe.db.get_all( - "Repost Allowed Types", filters={"allowed": True}, fields=["distinct(document_type)"] - ) - ] + # Avoid DISTINCT(...) here: Frappe applies a default ORDER BY which breaks on Postgres + # when used with SELECT DISTINCT. + repost_docs = frappe.db.get_all( + "Repost Allowed Types", + filters={"allowed": True}, + pluck="document_type", + ) + + # De-dupe while preserving order (first occurrence wins) + repost_docs = list(dict.fromkeys(repost_docs)) result = repost_docs if repost_docs and child_doc: result.extend(get_child_docs(repost_docs)) + # Keep uniqueness after extending + result = list(dict.fromkeys(result)) return result @@ -291,8 +297,11 @@ def get_repost_allowed_types(doctype, txt, searchfield, start, page_len, filters if txt: filters.update({"document_type": ("like", f"%{txt}%")}) - if allowed_types := frappe.db.get_all( - "Repost Allowed Types", filters=filters, fields=["distinct(document_type)"], as_list=1 - ): - return allowed_types - return [] + allowed_types = frappe.db.get_all( + "Repost Allowed Types", + filters=filters, + pluck="document_type", + ) + + allowed_types = list(dict.fromkeys(allowed_types)) + return [[dt] for dt in allowed_types] diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index aeb266b6d87..bd8af98b16f 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -2974,6 +2974,60 @@ class TestSalesInvoice(FrappeTestCase): self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC") self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map) + def test_item_tax_template_change_with_grand_total_discount(self): + """ + Test that when item tax template changes due to discount on Grand Total, + the tax calculations are consistent. + """ + item = create_item("Test Item With Multiple Tax Templates") + + item.set("taxes", []) + item.append( + "taxes", + { + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC", + "minimum_net_rate": 0, + "maximum_net_rate": 500, + }, + ) + + item.append( + "taxes", + { + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC", + "minimum_net_rate": 501, + "maximum_net_rate": 1000, + }, + ) + + item.save() + + si = create_sales_invoice(item=item.name, rate=700, do_not_save=True) + si.append( + "taxes", + { + "charge_type": "On Net Total", + "account_head": "_Test Account Excise Duty - _TC", + "cost_center": "_Test Cost Center - _TC", + "description": "Excise Duty", + "rate": 0, + }, + ) + si.insert() + + self.assertEqual(si.items[0].item_tax_template, "_Test Account Excise Duty @ 12 - _TC") + + si.apply_discount_on = "Grand Total" + si.discount_amount = 300 + si.save() + + # Verify template changed to 10% + self.assertEqual(si.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC") + self.assertEqual(si.taxes[0].tax_amount, 70) # 10% of 700 + self.assertEqual(si.grand_total, 470) # 700 + 70 - 300 + + si.submit() + @change_settings("Selling Settings", {"enable_discount_accounting": 1}) def test_sales_invoice_with_discount_accounting_enabled(self): discount_account = create_account( diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py index b90e2e44bf3..f5a2cc406c0 100644 --- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py +++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py @@ -219,13 +219,18 @@ def get_net_profit( has_value = False + gross_income_roots = [row for row in (gross_income or []) if not flt(row.get("indent"))] + non_gross_income_roots = [row for row in (non_gross_income or []) if not flt(row.get("indent"))] + gross_expense_roots = [row for row in (gross_expense or []) if not flt(row.get("indent"))] + non_gross_expense_roots = [row for row in (non_gross_expense or []) if not flt(row.get("indent"))] + for period in period_list: key = period if consolidated else period.key - gross_income_for_period = flt(gross_income[0].get(key, 0)) if gross_income else 0 - non_gross_income_for_period = flt(non_gross_income[0].get(key, 0)) if non_gross_income else 0 - gross_expense_for_period = flt(gross_expense[0].get(key, 0)) if gross_expense else 0 - non_gross_expense_for_period = flt(non_gross_expense[0].get(key, 0)) if non_gross_expense else 0 + gross_income_for_period = sum(flt(row.get(key, 0)) for row in gross_income_roots) + non_gross_income_for_period = sum(flt(row.get(key, 0)) for row in non_gross_income_roots) + gross_expense_for_period = sum(flt(row.get(key, 0)) for row in gross_expense_roots) + non_gross_expense_for_period = sum(flt(row.get(key, 0)) for row in non_gross_expense_roots) total_income = gross_income_for_period + non_gross_income_for_period total_expense = gross_expense_for_period + non_gross_expense_for_period diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index d326541631a..78aa90ab947 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -105,7 +105,7 @@ def _execute(filters=None, additional_table_columns=None, additional_conditions= { "total_tax": total_tax, "total_other_charges": total_other_charges, - "total": d.base_net_amount + total_tax, + "total": d.base_net_amount + total_tax + total_other_charges, "currency": company_currency, } ) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 06685845b58..5a7c6ca9055 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -511,6 +511,7 @@ def reconcile_against_document( doc.make_advance_gl_entries(entry=row) else: _delete_pl_entries(voucher_type, voucher_no) + _delete_adv_pl_entries(voucher_type, voucher_no) gl_map = doc.build_gl_map() # Make sure there is no overallocation from erpnext.accounts.general_ledger import process_debit_credit_difference diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index 895df37253f..26ace63872f 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -1297,6 +1297,55 @@ class TestPurchaseOrder(FrappeTestCase): pi = make_pi_from_po(po.name) self.assertEqual(pi.items[0].qty, 50) + def test_multiple_advances_against_purchase_order_are_allocated_across_partial_purchase_invoices(self): + # step - 1: create PO + po = create_purchase_order(qty=10, rate=10) + + # step - 2: create first partial advance payment + pe1 = get_payment_entry("Purchase Order", po.name, bank_account="_Test Bank - _TC") + pe1.reference_no = "1" + pe1.reference_date = nowdate() + pe1.paid_amount = 50 + pe1.references[0].allocated_amount = 50 + pe1.save(ignore_permissions=True).submit() + + # check first advance paid against PO + po.reload() + self.assertEqual(po.advance_paid, 50) + + # step - 3: create first PI for partial qty and allocate first advance + pi_1 = make_pi_from_po(po.name) + pi_1.update_stock = 1 + pi_1.allocate_advances_automatically = 1 + pi_1.items[0].qty = 5 + pi_1.save(ignore_permissions=True).submit() + + # step - 4: create second advance payment for remaining + pe2 = get_payment_entry("Purchase Order", po.name, bank_account="_Test Bank - _TC") + pe2.reference_no = "2" + pe2.reference_date = nowdate() + pe2.paid_amount = 50 + pe2.references[0].allocated_amount = 50 + pe2.save(ignore_permissions=True).submit() + + # check second advance paid against PO + po.reload() + self.assertEqual(po.advance_paid, 100) + + # step - 5: create second PI for remaining qty and allocate second advance + pi_2 = make_pi_from_po(po.name) + pi_2.update_stock = 1 + pi_2.allocate_advances_automatically = 1 + pi_2.save(ignore_permissions=True).submit() + + # check PO and PI status + po.reload() + pi_1.reload() + pi_2.reload() + self.assertEqual(pi_1.status, "Paid") + self.assertEqual(pi_2.status, "Paid") + self.assertEqual(po.status, "Completed") + def create_po_for_sc_testing(): from erpnext.controllers.tests.test_subcontracting_controller import ( diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index 6ab5048082e..6420f034df7 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -34,15 +34,6 @@ frappe.ui.form.on("Request for Quotation", { }); }, - onload: function (frm) { - if (!frm.doc.message_for_supplier) { - frm.set_value( - "message_for_supplier", - __("Please supply the specified items at the best possible rates") - ); - } - }, - refresh: function (frm, cdt, cdn) { if (frm.doc.docstatus === 1) { frm.add_custom_button( @@ -248,6 +239,25 @@ frappe.ui.form.on("Request for Quotation", { } refresh_field("items"); }, + + email_template(frm) { + if (frm.doc.email_template) { + frappe.db + .get_value("Email Template", frm.doc.email_template, [ + "use_html", + "response", + "response_html", + "subject", + ]) + .then((r) => { + frm.set_value( + "message_for_supplier", + r.message.use_html ? r.message.response_html : r.message.response + ); + frm.set_value("subject", r.message.subject); + }); + } + }, preview: (frm) => { let dialog = new frappe.ui.Dialog({ title: __("Preview Email"), diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json index 824484f9c20..c5e72fb8e20 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -30,6 +30,7 @@ "send_attached_files", "send_document_print", "sec_break_email_2", + "subject", "message_for_supplier", "terms_section_break", "incoterm", @@ -126,6 +127,7 @@ "reqd": 1 }, { + "depends_on": "eval:doc.suppliers.some((item) => item.send_email) && !(doc.docstatus == 1 && !doc.email_template)", "fieldname": "supplier_response_section", "fieldtype": "Section Break", "label": "Email Details" @@ -139,8 +141,7 @@ }, { "allow_on_submit": 1, - "fetch_from": "email_template.response", - "fetch_if_empty": 1, + "default": "Please supply the specified items at the best possible rates", "fieldname": "message_for_supplier", "fieldtype": "Text Editor", "in_list_view": 1, @@ -251,7 +252,7 @@ "label": "Preview Email" }, { - "depends_on": "eval:!doc.__islocal", + "depends_on": "eval:doc.suppliers.some((item) => item.send_email)", "fieldname": "sec_break_email_2", "fieldtype": "Section Break", "hide_border": 1 @@ -315,6 +316,14 @@ "hidden": 1, "label": "Has Unit Price Items", "no_copy": 1 + }, + { + "default": "Request for Quotation", + "fieldname": "subject", + "fieldtype": "Data", + "label": "Subject", + "not_nullable": 1, + "reqd": 1 } ], "grid_page_length": 50, @@ -322,7 +331,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-03-03 16:48:39.856779", + "modified": "2026-01-05 14:27:33.329810", "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation", @@ -393,4 +402,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index e8c5690cf6f..b66cb09e082 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -56,6 +56,7 @@ class RequestforQuotation(BuyingController): send_attached_files: DF.Check send_document_print: DF.Check status: DF.Literal["", "Draft", "Submitted", "Cancelled"] + subject: DF.Data suppliers: DF.Table[RequestforQuotationSupplier] tc_name: DF.Link | None terms: DF.TextEditor | None @@ -66,6 +67,7 @@ class RequestforQuotation(BuyingController): def before_validate(self): self.set_has_unit_price_items() self.flags.allow_zero_qty = self.has_unit_price_items + self.set_data_for_supplier() def validate(self): self.validate_duplicate_supplier() @@ -90,6 +92,19 @@ class RequestforQuotation(BuyingController): not row.qty for row in self.get("items") if (row.item_code and not row.qty) ) + def set_data_for_supplier(self): + if self.email_template: + data = frappe.get_value( + "Email Template", + self.email_template, + ["use_html", "response", "response_html", "subject"], + as_dict=True, + ) + if not self.message_for_supplier: + self.message_for_supplier = data.response_html if data.use_html else data.response + if not self.subject: + self.subject = data.subject + def validate_duplicate_supplier(self): supplier_list = [d.supplier for d in self.suppliers] if len(supplier_list) != len(set(supplier_list)): @@ -283,12 +298,6 @@ class RequestforQuotation(BuyingController): } ) - if not self.email_template: - return - - email_template = frappe.get_doc("Email Template", self.email_template) - message = frappe.render_template(email_template.response_, doc_args) - subject = frappe.render_template(email_template.subject, doc_args) fixed_procurement_email = frappe.db.get_single_value("Buying Settings", "fixed_email") if fixed_procurement_email: sender = frappe.db.get_value("Email Account", fixed_procurement_email, "email_id") @@ -296,7 +305,12 @@ class RequestforQuotation(BuyingController): sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None if preview: - return {"message": message, "subject": subject} + return { + "message": self.message_for_supplier, + "subject": self.subject + or frappe.get_value("Email Template", self.email_template, "subject") + or _("Request for Quotation"), + } attachments = [] if self.send_attached_files: @@ -316,7 +330,15 @@ class RequestforQuotation(BuyingController): ) ) - self.send_email(data, sender, subject, message, attachments) + self.send_email( + data, + sender, + self.subject + or frappe.get_value("Email Template", self.email_template, "subject") + or _("Request for Quotation"), + self.message_for_supplier, + attachments, + ) def send_email(self, data, sender, subject, message, attachments): make( diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json index 534cd90cc65..69d530da7ee 100644 --- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json +++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json @@ -80,20 +80,21 @@ "fieldname": "email_id", "fieldtype": "Data", "in_list_view": 1, - "label": "Email Id", + "label": "Email ID", "no_copy": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-11-04 22:01:43.832942", + "modified": "2026-01-05 14:08:27.274538", "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation Supplier", "owner": "Administrator", "permissions": [], - "sort_field": "modified", + "row_format": "Dynamic", + "sort_field": "creation", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 172c63bebf6..f6195e6e09e 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -184,9 +184,8 @@ class AccountsController(TransactionBase): msg = "" if self.get("update_outstanding_for_self"): - msg = ( - "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, " - "uncheck '{2}' checkbox.