Merge pull request #35789 from GursheenK/Provision-to-send-Accounts-Receivable-Reports
feat: Provision to send Accounts Receivable Reports using Process SOA
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 2e4e3b0..a709740 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -336,6 +336,7 @@
entry_list = []
dr_or_cr_notes = []
+ difference_entries = []
for row in self.get("allocation"):
reconciled_entry = []
if row.invoice_number and row.allocated_amount:
@@ -348,13 +349,15 @@
reconciled_entry.append(payment_details)
if payment_details.difference_amount:
- self.make_difference_entry(payment_details)
+ difference_entries.append(
+ self.make_difference_entry(payment_details, do_not_save_and_submit=bool(dr_or_cr_notes))
+ )
if entry_list:
reconcile_against_document(entry_list, skip_ref_details_update_for_pe)
if dr_or_cr_notes:
- reconcile_dr_cr_note(dr_or_cr_notes, self.company)
+ reconcile_dr_cr_note(dr_or_cr_notes, difference_entries, self.company)
@frappe.whitelist()
def reconcile(self):
@@ -382,7 +385,7 @@
self.get_unreconciled_entries()
- def make_difference_entry(self, row):
+ def make_difference_entry(self, row, do_not_save_and_submit=False):
journal_entry = frappe.new_doc("Journal Entry")
journal_entry.voucher_type = "Exchange Gain Or Loss"
journal_entry.company = self.company
@@ -430,8 +433,11 @@
journal_entry.append("accounts", journal_account)
- journal_entry.save()
- journal_entry.submit()
+ if not do_not_save_and_submit:
+ journal_entry.save()
+ journal_entry.submit()
+
+ return journal_entry
def get_payment_details(self, row, dr_or_cr):
return frappe._dict(
@@ -597,7 +603,14 @@
return condition
-def reconcile_dr_cr_note(dr_cr_notes, company):
+def reconcile_dr_cr_note(dr_cr_notes, difference_entries, company):
+ def find_difference_entry(voucher_type, voucher_no):
+ for jv in difference_entries:
+ accounts = iter(jv.accounts)
+ for account in accounts:
+ if account.reference_type == voucher_type and account.reference_name == voucher_no:
+ return next(accounts)
+
for inv in dr_cr_notes:
voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note"
@@ -642,5 +655,9 @@
],
}
)
+
+ if difference_entry := find_difference_entry(inv.against_voucher_type, inv.against_voucher):
+ jv.append("accounts", difference_entry)
+
jv.flags.ignore_mandatory = True
jv.submit()
diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
index 3be11ae..2ac7df0 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -11,10 +11,13 @@
from erpnext import get_default_cost_center
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.party import get_party_account
from erpnext.stock.doctype.item.test_item import create_item
+test_dependencies = ["Item"]
+
class TestPaymentReconciliation(FrappeTestCase):
def setUp(self):
@@ -163,7 +166,9 @@
def create_payment_reconciliation(self):
pr = frappe.new_doc("Payment Reconciliation")
pr.company = self.company
- pr.party_type = "Customer"
+ pr.party_type = (
+ self.party_type if hasattr(self, "party_type") and self.party_type else "Customer"
+ )
pr.party = self.customer
pr.receivable_payable_account = get_party_account(pr.party_type, pr.party, pr.company)
pr.from_invoice_date = pr.to_invoice_date = pr.from_payment_date = pr.to_payment_date = nowdate()
@@ -890,6 +895,42 @@
self.assertEqual(pr.allocation[0].allocated_amount, 85)
self.assertEqual(pr.allocation[0].difference_amount, 0)
+ def test_reconciliation_purchase_invoice_against_return(self):
+ pi = make_purchase_invoice(
+ supplier="_Test Supplier USD", currency="USD", conversion_rate=50
+ ).submit()
+
+ pi_return = frappe.get_doc(pi.as_dict())
+ pi_return.name = None
+ pi_return.docstatus = 0
+ pi_return.is_return = 1
+ pi_return.conversion_rate = 80
+ pi_return.items[0].qty = -pi_return.items[0].qty
+ pi_return.submit()
+
+ self.company = "_Test Company"
+ self.party_type = "Supplier"
+ self.customer = "_Test Supplier USD"
+
+ pr = self.create_payment_reconciliation()
+ pr.get_unreconciled_entries()
+
+ invoices = []
+ payments = []
+ for invoice in pr.invoices:
+ if invoice.invoice_number == pi.name:
+ invoices.append(invoice.as_dict())
+ break
+ for payment in pr.payments:
+ if payment.reference_name == pi_return.name:
+ payments.append(payment.as_dict())
+ break
+
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+
+ # Should not raise frappe.exceptions.ValidationError: Total Debit must be equal to Total Credit.
+ pr.reconcile()
+
def make_customer(customer_name, currency=None):
if not frappe.db.exists("Customer", customer_name):
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
index ea18ade..6046c13 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
@@ -2,7 +2,11 @@
// For license information, please see license.txt
frappe.ui.form.on('Payment Terms Template', {
- setup: function(frm) {
+ refresh: function(frm) {
+ frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
+ },
+ allocate_payment_based_on_payment_terms: function(frm) {
+ frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
}
});
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
index ea3b76c..7b04a68 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
@@ -11,7 +11,7 @@
class PaymentTermsTemplate(Document):
def validate(self):
self.validate_invoice_portion()
- self.check_duplicate_terms()
+ self.validate_terms()
def validate_invoice_portion(self):
total_portion = 0
@@ -23,9 +23,12 @@
_("Combined invoice portion must equal 100%"), raise_exception=1, indicator="red"
)
- def check_duplicate_terms(self):
+ def validate_terms(self):
terms = []
for term in self.terms:
+ if self.allocate_payment_based_on_payment_terms and not term.payment_term:
+ frappe.throw(_("Row {0}: Payment Term is mandatory").format(term.idx))
+
term_info = (term.payment_term, term.credit_days, term.credit_months, term.due_date_based_on)
if term_info in terms:
frappe.msgprint(
diff --git a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
index e6d9fe2..a6c0102 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
@@ -123,22 +123,29 @@
row.expected_amount = row.opening_amount;
}
- const pos_inv_promises = frm.doc.pos_transactions.map(
- row => frappe.db.get_doc("POS Invoice", row.pos_invoice)
- );
-
- const pos_invoices = await Promise.all(pos_inv_promises);
-
- for (let doc of pos_invoices) {
- frm.doc.grand_total += flt(doc.grand_total);
- frm.doc.net_total += flt(doc.net_total);
- frm.doc.total_quantity += flt(doc.total_qty);
- refresh_payments(doc, frm);
- refresh_taxes(doc, frm);
- refresh_fields(frm);
- set_html_data(frm);
- }
-
+ await Promise.all([
+ frappe.call({
+ method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+ args: {
+ start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
+ end: frappe.datetime.get_datetime_as_string(frm.doc.period_end_date),
+ pos_profile: frm.doc.pos_profile,
+ user: frm.doc.user
+ },
+ callback: (r) => {
+ let pos_invoices = r.message;
+ for (let doc of pos_invoices) {
+ frm.doc.grand_total += flt(doc.grand_total);
+ frm.doc.net_total += flt(doc.net_total);
+ frm.doc.total_quantity += flt(doc.total_qty);
+ refresh_payments(doc, frm);
+ refresh_taxes(doc, frm);
+ refresh_fields(frm);
+ set_html_data(frm);
+ }
+ }
+ })
+ ])
frappe.dom.unfreeze();
}
});
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
index 123a82a..a3f0d00 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
@@ -30,7 +30,7 @@
"fieldname":"based_on_document",
"label": __("Based On Document"),
"fieldtype": "Select",
- "options": ["Sales Order", "Delivery Note", "Quotation"],
+ "options": ["Sales Order", "Sales Invoice", "Delivery Note", "Quotation"],
"default": "Sales Order",
"reqd": 1
},
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
index d3bce83..daef7f6 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
@@ -99,7 +99,9 @@
parent = frappe.qb.DocType(self.doctype)
child = frappe.qb.DocType(self.child_doctype)
- date_field = "posting_date" if self.doctype == "Delivery Note" else "transaction_date"
+ date_field = (
+ "posting_date" if self.doctype in ("Delivery Note", "Sales Invoice") else "transaction_date"
+ )
query = (
frappe.qb.from_(parent)
diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index fb4c558..a03bd45 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -81,7 +81,7 @@
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -147,7 +147,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-07-28 19:15:38.270046",
+ "modified": "2023-06-21 15:13:38.270046",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Reorder",
@@ -158,4 +158,4 @@
"read_only_onload": 0,
"sort_order": "ASC",
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 1986722..c6c84ca 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -72,6 +72,11 @@
self.assertEqual(sl_entry_cancelled[1].actual_qty, -0.5)
def test_make_purchase_invoice(self):
+ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_term
+
+ create_payment_term("_Test Payment Term 1 for Purchase Invoice")
+ create_payment_term("_Test Payment Term 2 for Purchase Invoice")
+
if not frappe.db.exists(
"Payment Terms Template", "_Test Payment Terms Template For Purchase Invoice"
):
@@ -83,12 +88,14 @@
"terms": [
{
"doctype": "Payment Terms Template Detail",
+ "payment_term": "_Test Payment Term 1 for Purchase Invoice",
"invoice_portion": 50.00,
"credit_days_based_on": "Day(s) after invoice date",
"credit_days": 00,
},
{
"doctype": "Payment Terms Template Detail",
+ "payment_term": "_Test Payment Term 2 for Purchase Invoice",
"invoice_portion": 50.00,
"credit_days_based_on": "Day(s) after invoice date",
"credit_days": 30,
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 136c78f..9075608 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -67,7 +67,7 @@
else:
projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
- if (reorder_level or reorder_qty) and projected_qty < reorder_level:
+ if (reorder_level or reorder_qty) and projected_qty <= reorder_level:
deficiency = reorder_level - projected_qty
if deficiency > reorder_qty:
reorder_qty = deficiency
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 68358c6..f9ec689 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -9905,3 +9905,7 @@
Select an item from each set to be used in the Sales Order.,"Wählen Sie aus den Alternativen jeweils einen Artikel aus, der in die Auftragsbestätigung übernommen werden soll.",
Is Alternative,Ist Alternative,
Alternative Items,Alternativpositionen,
+Add Template,Vorlage einfügen,
+Prepend the template to the email message,Vorlage oberhalb der Email-Nachricht einfügen,
+Clear & Add Template,Leeren und Vorlage einfügen,
+Clear the email message and add the template,Email-Feld leeren und Vorlage einfügen,