Merge pull request #31777 from ruthra-kumar/intercompany_po_bug
fix: intercompany SO created from Purchase Order throws exception
diff --git a/CODEOWNERS b/CODEOWNERS
index ecbae86..b6aadb3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,22 +11,18 @@
erpnext/support/ @nextchamp-saqib @deepeshgarg007
pos* @nextchamp-saqib
-erpnext/buying/ @marination @rohitwaghchaure @s-aga-r
-erpnext/e_commerce/ @marination
-erpnext/maintenance/ @marination @rohitwaghchaure @s-aga-r
-erpnext/manufacturing/ @marination @rohitwaghchaure @s-aga-r
-erpnext/portal/ @marination
+erpnext/buying/ @rohitwaghchaure @s-aga-r
+erpnext/maintenance/ @rohitwaghchaure @s-aga-r
+erpnext/manufacturing/ @rohitwaghchaure @s-aga-r
erpnext/quality_management/ @marination @rohitwaghchaure @s-aga-r
-erpnext/shopping_cart/ @marination
erpnext/stock/ @marination @rohitwaghchaure @s-aga-r
-erpnext/crm/ @NagariaHussain
-erpnext/education/ @rutwikhdev
+erpnext/crm/ @NagariaHussain
+erpnext/education/ @rutwikhdev
erpnext/projects/ @ruchamahabal
-erpnext/controllers/ @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
-erpnext/patches/ @deepeshgarg007 @nextchamp-saqib @marination
-erpnext/public/ @nextchamp-saqib @marination
+erpnext/controllers/ @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
+erpnext/patches/ @deepeshgarg007 @nextchamp-saqib
.github/ @ankush
-pyproject.toml @gavindsouza @ankush
+pyproject.toml @ankush
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index af5a5e2..48edda9 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -1184,6 +1184,7 @@
ple = qb.DocType("Payment Ledger Entry")
common_filter = []
+ posting_and_due_date = []
# confirm that Supplier is not blocked
if args.get("party_type") == "Supplier":
@@ -1224,7 +1225,7 @@
condition += " and {0} between '{1}' and '{2}'".format(
fieldname, args.get(date_fields[0]), args.get(date_fields[1])
)
- common_filter.append(ple[fieldname][args.get(date_fields[0]) : args.get(date_fields[1])])
+ posting_and_due_date.append(ple[fieldname][args.get(date_fields[0]) : args.get(date_fields[1])])
if args.get("company"):
condition += " and company = {0}".format(frappe.db.escape(args.get("company")))
@@ -1235,6 +1236,7 @@
args.get("party"),
args.get("party_account"),
common_filter=common_filter,
+ posting_date=posting_and_due_date,
min_outstanding=args.get("outstanding_amt_greater_than"),
max_outstanding=args.get("outstanding_amt_less_than"),
)
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 5ed34d3..601fc87 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -22,6 +22,7 @@
def __init__(self, *args, **kwargs):
super(PaymentReconciliation, self).__init__(*args, **kwargs)
self.common_filter_conditions = []
+ self.ple_posting_date_filter = []
@frappe.whitelist()
def get_unreconciled_entries(self):
@@ -150,6 +151,7 @@
return_outstanding = ple_query.get_voucher_outstandings(
vouchers=return_invoices,
common_filter=self.common_filter_conditions,
+ posting_date=self.ple_posting_date_filter,
min_outstanding=-(self.minimum_payment_amount) if self.minimum_payment_amount else None,
max_outstanding=-(self.maximum_payment_amount) if self.maximum_payment_amount else None,
get_payments=True,
@@ -187,6 +189,7 @@
self.party,
self.receivable_payable_account,
common_filter=self.common_filter_conditions,
+ posting_date=self.ple_posting_date_filter,
min_outstanding=self.minimum_invoice_amount if self.minimum_invoice_amount else None,
max_outstanding=self.maximum_invoice_amount if self.maximum_invoice_amount else None,
)
@@ -350,6 +353,7 @@
def build_qb_filter_conditions(self, get_invoices=False, get_return_invoices=False):
self.common_filter_conditions.clear()
+ self.ple_posting_date_filter.clear()
ple = qb.DocType("Payment Ledger Entry")
self.common_filter_conditions.append(ple.company == self.company)
@@ -359,15 +363,15 @@
if get_invoices:
if self.from_invoice_date:
- self.common_filter_conditions.append(ple.posting_date.gte(self.from_invoice_date))
+ self.ple_posting_date_filter.append(ple.posting_date.gte(self.from_invoice_date))
if self.to_invoice_date:
- self.common_filter_conditions.append(ple.posting_date.lte(self.to_invoice_date))
+ self.ple_posting_date_filter.append(ple.posting_date.lte(self.to_invoice_date))
elif get_return_invoices:
if self.from_payment_date:
- self.common_filter_conditions.append(ple.posting_date.gte(self.from_payment_date))
+ self.ple_posting_date_filter.append(ple.posting_date.gte(self.from_payment_date))
if self.to_payment_date:
- self.common_filter_conditions.append(ple.posting_date.lte(self.to_payment_date))
+ self.ple_posting_date_filter.append(ple.posting_date.lte(self.to_payment_date))
def get_conditions(self, get_payments=False):
condition = " and company = '{0}' ".format(self.company)
diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
index 625382a..dae029b 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -283,6 +283,41 @@
self.assertEqual(len(pr.get("invoices")), 2)
self.assertEqual(len(pr.get("payments")), 2)
+ def test_filter_posting_date_case2(self):
+ """
+ Posting date should not affect outstanding amount calculation
+ """
+
+ from_date = add_days(nowdate(), -30)
+ to_date = nowdate()
+ self.create_payment_entry(amount=25, posting_date=from_date).submit()
+ self.create_sales_invoice(rate=25, qty=1, posting_date=to_date)
+
+ pr = self.create_payment_reconciliation()
+ pr.from_invoice_date = pr.from_payment_date = from_date
+ pr.to_invoice_date = pr.to_payment_date = to_date
+ pr.get_unreconciled_entries()
+
+ self.assertEqual(len(pr.invoices), 1)
+ self.assertEqual(len(pr.payments), 1)
+
+ invoices = [x.as_dict() for x in pr.invoices]
+ payments = [x.as_dict() for x in pr.payments]
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+ pr.reconcile()
+
+ pr.get_unreconciled_entries()
+
+ self.assertEqual(len(pr.invoices), 0)
+ self.assertEqual(len(pr.payments), 0)
+
+ pr.from_invoice_date = pr.from_payment_date = to_date
+ pr.to_invoice_date = pr.to_payment_date = to_date
+
+ pr.get_unreconciled_entries()
+
+ self.assertEqual(len(pr.invoices), 0)
+
def test_filter_invoice_limit(self):
# check filter condition - invoice limit
transaction_date = nowdate()
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index e39f22b..67cf644 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -207,7 +207,7 @@
)
if company_address:
- party_details.update({"company_address": company_address})
+ party_details.company_address = company_address
else:
party_details.update(get_company_address(company))
@@ -219,12 +219,31 @@
get_regional_address_details(party_details, doctype, company)
elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]:
- if party_details.company_address:
- party_details["shipping_address"] = shipping_address or party_details["company_address"]
- party_details.shipping_address_display = get_address_display(party_details["shipping_address"])
+ if shipping_address:
party_details.update(
- get_fetch_values(doctype, "shipping_address", party_details.shipping_address)
+ shipping_address=shipping_address,
+ shipping_address_display=get_address_display(shipping_address),
+ **get_fetch_values(doctype, "shipping_address", shipping_address)
)
+
+ if party_details.company_address:
+ # billing address
+ party_details.update(
+ billing_address=party_details.company_address,
+ billing_address_display=(
+ party_details.company_address_display or get_address_display(party_details.company_address)
+ ),
+ **get_fetch_values(doctype, "billing_address", party_details.company_address)
+ )
+
+ # shipping address - if not already set
+ if not party_details.shipping_address:
+ party_details.update(
+ shipping_address=party_details.billing_address,
+ shipping_address_display=party_details.billing_address_display,
+ **get_fetch_values(doctype, "shipping_address", party_details.billing_address)
+ )
+
get_regional_address_details(party_details, doctype, company)
return party_details.get(billing_address_field), party_details.shipping_address_name
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index c7c746b..e937edb 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -165,7 +165,7 @@
"range4",
"range5",
"future_amount",
- "remaining_balance"
+ "remaining_balance",
]
def get_voucher_balance(self, ple):
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
index 3d37b58..21205c3 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -44,14 +44,14 @@
"parent_field": "parent_invoice",
"initial_depth": 3,
"formatter": function(value, row, column, data, default_formatter) {
- if (column.fieldname == "sales_invoice" && column.options == "Item" && data.indent == 0) {
+ if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) {
column._options = "Sales Invoice";
} else {
column._options = "Item";
}
value = default_formatter(value, row, column, data);
- if (data && (data.indent == 0.0 || row[1].content == "Total")) {
+ if (data && (data.indent == 0.0 || (row[1] && row[1].content == "Total"))) {
value = $(`<span>${value}</span>`);
var $value = $(value).css("font-weight", "bold");
value = $value.wrap("<p></p>").parent().html();
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 9dafef7..018e8f9 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -823,7 +823,13 @@
def get_outstanding_invoices(
- party_type, party, account, common_filter=None, min_outstanding=None, max_outstanding=None
+ party_type,
+ party,
+ account,
+ common_filter=None,
+ posting_date=None,
+ min_outstanding=None,
+ max_outstanding=None,
):
ple = qb.DocType("Payment Ledger Entry")
@@ -850,6 +856,7 @@
ple_query = QueryPaymentLedger()
invoice_list = ple_query.get_voucher_outstandings(
common_filter=common_filter,
+ posting_date=posting_date,
min_outstanding=min_outstanding,
max_outstanding=max_outstanding,
get_invoices=True,
@@ -1501,6 +1508,7 @@
# query filters
self.vouchers = []
self.common_filter = []
+ self.voucher_posting_date = []
self.min_outstanding = None
self.max_outstanding = None
@@ -1571,6 +1579,7 @@
.where(ple.delinked == 0)
.where(Criterion.all(filter_on_voucher_no))
.where(Criterion.all(self.common_filter))
+ .where(Criterion.all(self.voucher_posting_date))
.groupby(ple.voucher_type, ple.voucher_no, ple.party_type, ple.party)
)
@@ -1652,6 +1661,7 @@
self,
vouchers=None,
common_filter=None,
+ posting_date=None,
min_outstanding=None,
max_outstanding=None,
get_payments=False,
@@ -1671,6 +1681,7 @@
self.reset()
self.vouchers = vouchers
self.common_filter = common_filter or []
+ self.voucher_posting_date = posting_date or []
self.min_outstanding = min_outstanding
self.max_outstanding = max_outstanding
self.get_payments = get_payments
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 f319506..3ef57bb 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -112,7 +112,7 @@
def get_link(self):
# RFQ link for supplier portal
- return get_url("/rfq/" + self.name)
+ return get_url("/app/request-for-quotation/" + self.name)
def update_supplier_part_no(self, supplier):
self.vendor = supplier
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 036733c..c0f3745 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -86,6 +86,7 @@
company=self.company,
party_address=self.get("supplier_address"),
shipping_address=self.get("shipping_address"),
+ company_address=self.get("billing_address"),
fetch_payment_terms_template=not self.get("ignore_default_payment_terms_template"),
ignore_permissions=self.flags.ignore_permissions,
)
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 243ebb6..4f8b5c7 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -18,8 +18,9 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def employee_query(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Employee"
conditions = []
- fields = get_fields("Employee", ["name", "employee_name"])
+ fields = get_fields(doctype, ["name", "employee_name"])
return frappe.db.sql(
"""select {fields} from `tabEmployee`
@@ -49,7 +50,8 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def lead_query(doctype, txt, searchfield, start, page_len, filters):
- fields = get_fields("Lead", ["name", "lead_name", "company_name"])
+ doctype = "Lead"
+ fields = get_fields(doctype, ["name", "lead_name", "company_name"])
return frappe.db.sql(
"""select {fields} from `tabLead`
@@ -77,6 +79,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def customer_query(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Customer"
conditions = []
cust_master_name = frappe.defaults.get_user_default("cust_master_name")
@@ -85,9 +88,9 @@
else:
fields = ["name", "customer_name", "customer_group", "territory"]
- fields = get_fields("Customer", fields)
+ fields = get_fields(doctype, fields)
- searchfields = frappe.get_meta("Customer").get_search_fields()
+ searchfields = frappe.get_meta(doctype).get_search_fields()
searchfields = " or ".join(field + " like %(txt)s" for field in searchfields)
return frappe.db.sql(
@@ -116,6 +119,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def supplier_query(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Supplier"
supp_master_name = frappe.defaults.get_user_default("supp_master_name")
if supp_master_name == "Supplier Name":
@@ -123,7 +127,7 @@
else:
fields = ["name", "supplier_name", "supplier_group"]
- fields = get_fields("Supplier", fields)
+ fields = get_fields(doctype, fields)
return frappe.db.sql(
"""select {field} from `tabSupplier`
@@ -147,6 +151,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Account"
company_currency = erpnext.get_company_currency(filters.get("company"))
def get_accounts(with_account_type_filter):
@@ -197,13 +202,14 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=False):
+ doctype = "Item"
conditions = []
if isinstance(filters, str):
filters = json.loads(filters)
# Get searchfields from meta and use in Item Link field query
- meta = frappe.get_meta("Item", cached=True)
+ meta = frappe.get_meta(doctype, cached=True)
searchfields = meta.get_search_fields()
# these are handled separately
@@ -257,7 +263,7 @@
filters.pop("supplier", None)
description_cond = ""
- if frappe.db.count("Item", cache=True) < 50000:
+ if frappe.db.count(doctype, cache=True) < 50000:
# scan description only if items are less than 50000
description_cond = "or tabItem.description LIKE %(txt)s"
return frappe.db.sql(
@@ -300,8 +306,9 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def bom(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "BOM"
conditions = []
- fields = get_fields("BOM", ["name", "item"])
+ fields = get_fields(doctype, ["name", "item"])
return frappe.db.sql(
"""select {fields}
@@ -331,6 +338,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_project_name(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Project"
cond = ""
if filters and filters.get("customer"):
cond = """(`tabProject`.customer = %s or
@@ -338,8 +346,8 @@
frappe.db.escape(filters.get("customer"))
)
- fields = get_fields("Project", ["name", "project_name"])
- searchfields = frappe.get_meta("Project").get_search_fields()
+ fields = get_fields(doctype, ["name", "project_name"])
+ searchfields = frappe.get_meta(doctype).get_search_fields()
searchfields = " or ".join(["`tabProject`." + field + " like %(txt)s" for field in searchfields])
return frappe.db.sql(
@@ -366,7 +374,8 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len, filters, as_dict):
- fields = get_fields("Delivery Note", ["name", "customer", "posting_date"])
+ doctype = "Delivery Note"
+ fields = get_fields(doctype, ["name", "customer", "posting_date"])
return frappe.db.sql(
"""
@@ -402,6 +411,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Batch"
cond = ""
if filters.get("posting_date"):
cond = "and (batch.expiry_date is null or batch.expiry_date >= %(posting_date)s)"
@@ -420,7 +430,7 @@
if filters.get("is_return"):
having_clause = ""
- meta = frappe.get_meta("Batch", cached=True)
+ meta = frappe.get_meta(doctype, cached=True)
searchfields = meta.get_search_fields()
search_columns = ""
@@ -496,6 +506,7 @@
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_account_list(doctype, txt, searchfield, start, page_len, filters):
+ doctype = "Account"
filter_list = []
if isinstance(filters, dict):
@@ -514,7 +525,7 @@
filter_list.append([doctype, searchfield, "like", "%%%s%%" % txt])
return frappe.desk.reportview.execute(
- "Account",
+ doctype,
filters=filter_list,
fields=["name", "parent_account"],
limit_start=start,
@@ -553,6 +564,7 @@
if not filters:
filters = {}
+ doctype = "Account"
condition = ""
if filters.get("company"):
condition += "and tabAccount.company = %(company)s"
@@ -628,6 +640,7 @@
if not filters:
filters = {}
+ doctype = "Account"
condition = ""
if filters.get("company"):
condition += "and tabAccount.company = %(company)s"
@@ -650,6 +663,7 @@
@frappe.validate_and_sanitize_search_inputs
def warehouse_query(doctype, txt, searchfield, start, page_len, filters):
# Should be used when item code is passed in filters.
+ doctype = "Warehouse"
conditions, bin_conditions = [], []
filter_dict = get_doctype_wise_filters(filters)
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
index 0a576d6..514a5fc 100644
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
+++ b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
@@ -99,7 +99,7 @@
loan_account = frappe.db.get_value("Loan", self.loan, "loan_account")
remarks = "{} against loan {}".format(self.adjustment_type.capitalize(), self.loan)
if self.reference_number:
- remarks += "with reference no. {}".format(self.reference_number)
+ remarks += " with reference no. {}".format(self.reference_number)
loan_entry = {
"account": loan_account,
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json
index 50926d7..c7b5c03 100644
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json
+++ b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.json
@@ -163,11 +163,11 @@
},
{
"fetch_from": "against_loan.disbursement_account",
+ "fetch_if_empty": 1,
"fieldname": "disbursement_account",
"fieldtype": "Link",
"label": "Disbursement Account",
- "options": "Account",
- "read_only": 1
+ "options": "Account"
},
{
"fieldname": "column_break_16",
@@ -185,7 +185,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-02-17 18:23:44.157598",
+ "modified": "2022-08-04 17:16:04.922444",
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan Disbursement",
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
index 0c2042b..b73dee2 100644
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
+++ b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
@@ -209,6 +209,9 @@
"loan_amount",
"disbursed_amount",
"total_payment",
+ "debit_adjustment_amount",
+ "credit_adjustment_amount",
+ "refund_amount",
"total_principal_paid",
"total_interest_payable",
"status",
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
index 0aeb448..4680456 100644
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
@@ -147,6 +147,9 @@
"name",
"total_payment",
"total_amount_paid",
+ "debit_adjustment_amount",
+ "credit_adjustment_amount",
+ "refund_amount",
"loan_account",
"interest_income_account",
"loan_amount",
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
index 76dc8b4..3e7dc28 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
@@ -264,11 +264,11 @@
},
{
"fetch_from": "against_loan.payment_account",
+ "fetch_if_empty": 1,
"fieldname": "payment_account",
"fieldtype": "Link",
"label": "Repayment Account",
- "options": "Account",
- "read_only": 1
+ "options": "Account"
},
{
"fieldname": "column_break_36",
@@ -294,7 +294,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2022-06-21 10:10:07.742298",
+ "modified": "2022-08-04 17:13:51.964203",
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan Repayment",
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 07a1d0d..29da988 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -149,6 +149,9 @@
"status",
"is_secured_loan",
"total_payment",
+ "debit_adjustment_amount",
+ "credit_adjustment_amount",
+ "refund_amount",
"loan_amount",
"disbursed_amount",
"total_interest_payable",
@@ -398,7 +401,7 @@
remarks = "Repayment against loan " + self.against_loan
if self.reference_number:
- remarks += "with reference no. {}".format(self.reference_number)
+ remarks += " with reference no. {}".format(self.reference_number)
if hasattr(self, "repay_from_salary") and self.repay_from_salary:
payment_account = self.payroll_payable_account
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
index 0ab7beb..15a9c4a 100644
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
+++ b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
@@ -57,6 +57,9 @@
self.loan,
[
"total_payment",
+ "debit_adjustment_amount",
+ "credit_adjustment_amount",
+ "refund_amount",
"total_principal_paid",
"loan_amount",
"total_interest_payable",
diff --git a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py b/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py
index 25aecf6..ae483f9 100644
--- a/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py
+++ b/erpnext/loan_management/doctype/loan_write_off/loan_write_off.py
@@ -9,6 +9,9 @@
import erpnext
from erpnext.accounts.general_ledger import make_gl_entries
from erpnext.controllers.accounts_controller import AccountsController
+from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
+ get_pending_principal_amount,
+)
class LoanWriteOff(AccountsController):
@@ -22,16 +25,26 @@
def validate_write_off_amount(self):
precision = cint(frappe.db.get_default("currency_precision")) or 2
- total_payment, principal_paid, interest_payable, written_off_amount = frappe.get_value(
+
+ loan_details = frappe.get_value(
"Loan",
self.loan,
- ["total_payment", "total_principal_paid", "total_interest_payable", "written_off_amount"],
+ [
+ "total_payment",
+ "debit_adjustment_amount",
+ "credit_adjustment_amount",
+ "refund_amount",
+ "total_principal_paid",
+ "loan_amount",
+ "total_interest_payable",
+ "written_off_amount",
+ "disbursed_amount",
+ "status",
+ ],
+ as_dict=1,
)
- pending_principal_amount = flt(
- flt(total_payment) - flt(interest_payable) - flt(principal_paid) - flt(written_off_amount),
- precision,
- )
+ pending_principal_amount = flt(get_pending_principal_amount(loan_details), precision)
if self.write_off_amount > pending_principal_amount:
frappe.throw(_("Write off amount cannot be greater than pending principal amount"))
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 85485fc..c0a8c9e 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.provide('erpnext.accounts.dimensions');
erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals {
setup() {
@@ -794,24 +793,6 @@
set_party_account(set_pricing);
});
- // Get default company billing address in Purchase Invoice, Order and Receipt
- if (this.frm.doc.company && frappe.meta.get_docfield(this.frm.doctype, "billing_address")) {
- frappe.call({
- method: "erpnext.setup.doctype.company.company.get_default_company_address",
- args: {name: this.frm.doc.company, existing_address: this.frm.doc.billing_address || ""},
- debounce: 2000,
- callback: function(r) {
- if (r.message) {
- me.frm.set_value("billing_address", r.message);
- } else {
- if (frappe.meta.get_docfield(me.frm.doctype, 'company_address')) {
- me.frm.set_value("company_address", "");
- }
- }
- }
- });
- }
-
} else {
set_party_account(set_pricing);
}
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index a492b32..58594b0 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -3,25 +3,14 @@
frappe.provide("erpnext.utils");
+const SALES_DOCTYPES = ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'];
+const PURCHASE_DOCTYPES = ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'];
+
erpnext.utils.get_party_details = function(frm, method, args, callback) {
if (!method) {
method = "erpnext.accounts.party.get_party_details";
}
- if (args) {
- if (in_list(['Sales Invoice', 'Sales Order', 'Delivery Note'], frm.doc.doctype)) {
- if (frm.doc.company_address && (!args.company_address)) {
- args.company_address = frm.doc.company_address;
- }
- }
-
- if (in_list(['Purchase Invoice', 'Purchase Order', 'Purchase Receipt'], frm.doc.doctype)) {
- if (frm.doc.shipping_address && (!args.shipping_address)) {
- args.shipping_address = frm.doc.shipping_address;
- }
- }
- }
-
if (!args) {
if ((frm.doctype != "Purchase Order" && frm.doc.customer)
|| (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) {
@@ -45,41 +34,44 @@
};
}
- if (in_list(['Sales Invoice', 'Sales Order', 'Delivery Note'], frm.doc.doctype)) {
- if (!args) {
+ if (!args) {
+ if (in_list(SALES_DOCTYPES, frm.doc.doctype)) {
args = {
party: frm.doc.customer || frm.doc.party_name,
party_type: 'Customer'
- }
- }
- if (frm.doc.company_address && (!args.company_address)) {
- args.company_address = frm.doc.company_address;
+ };
}
- if (frm.doc.shipping_address_name &&(!args.shipping_address_name)) {
- args.shipping_address_name = frm.doc.shipping_address_name;
- }
- }
-
- if (in_list(['Purchase Invoice', 'Purchase Order', 'Purchase Receipt'], frm.doc.doctype)) {
- if (!args) {
+ if (in_list(PURCHASE_DOCTYPES, frm.doc.doctype)) {
args = {
party: frm.doc.supplier,
party_type: 'Supplier'
- }
- }
-
- if (frm.doc.shipping_address && (!args.shipping_address)) {
- args.shipping_address = frm.doc.shipping_address;
+ };
}
}
- if (args) {
- args.posting_date = frm.doc.posting_date || frm.doc.transaction_date;
- args.fetch_payment_terms_template = cint(!frm.doc.ignore_default_payment_terms_template);
+ if (!args || !args.party) return;
+
+ args.posting_date = frm.doc.posting_date || frm.doc.transaction_date;
+ args.fetch_payment_terms_template = cint(!frm.doc.ignore_default_payment_terms_template);
+ }
+
+ if (in_list(SALES_DOCTYPES, frm.doc.doctype)) {
+ if (!args.company_address && frm.doc.company_address) {
+ args.company_address = frm.doc.company_address;
}
}
- if (!args || !args.party) return;
+
+ if (in_list(PURCHASE_DOCTYPES, frm.doc.doctype)) {
+ if (!args.company_address && frm.doc.billing_address) {
+ args.company_address = frm.doc.billing_address;
+ }
+
+ if (!args.shipping_address && frm.doc.shipping_address) {
+ args.shipping_address = frm.doc.shipping_address;
+ }
+ }
+
if (frappe.meta.get_docfield(frm.doc.doctype, "taxes")) {
if (!erpnext.utils.validate_mandatory(frm, "Posting / Transaction Date",
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 6e940d0..411176b 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -142,10 +142,6 @@
if (context.get("website_image") or "").startswith("files/"):
context["website_image"] = "/" + quote(context["website_image"])
- context["show_availability_status"] = cint(
- frappe.db.get_single_value("E Commerce Settings", "show_availability_status")
- )
-
products_template = "templates/includes/products_as_list.html"
return frappe.get_template(products_template).render(context)