nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: company address query + style

Browse Source
This commit is contained in:
barredterra
2021-09-17 11:43:09 +02:00
committed by marination
parent b07620aacf
commit 9016baddca
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/dunning/dunning.js
View File

@@ -24,8 +24,9 @@ frappe.ui.form.on("Dunning", {
}; };
}); });
frm.set_query('contact_person', erpnext.queries.contact_query); frm.set_query("contact_person", erpnext.queries.contact_query);
frm.set_query('customer_address', erpnext.queries.address_query); frm.set_query("customer_address", erpnext.queries.address_query);
frm.set_query("company_address", erpnext.queries.company_address_query);
// cannot add rows manually, only via button "Fetch Overdue Payments" // cannot add rows manually, only via button "Fetch Overdue Payments"
frm.set_df_property("overdue_payments", "cannot_add_rows", true); frm.set_df_property("overdue_payments", "cannot_add_rows", true);
@@ -48,7 +49,7 @@ frappe.ui.form.on("Dunning", {
} }
if(frm.doc.docstatus > 0) { if(frm.doc.docstatus > 0) {
frm.add_custom_button(__('Ledger'), function() { frm.add_custom_button(__("Ledger"), function() {
frappe.route_options = { frappe.route_options = {
"voucher_no": frm.doc.name, "voucher_no": frm.doc.name,
"from_date": frm.doc.posting_date, "from_date": frm.doc.posting_date,
@@ -57,7 +58,7 @@ frappe.ui.form.on("Dunning", {
"show_cancelled_entries": frm.doc.docstatus === 2 "show_cancelled_entries": frm.doc.docstatus === 2
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");
}, __('View')); }, __("View"));
} }
if(frm.doc.docstatus === 0) { if(frm.doc.docstatus === 0) {
@@ -151,8 +152,8 @@ frappe.ui.form.on("Dunning", {
.reduce((prev, cur) => prev + cur.interest_amount, 0); .reduce((prev, cur) => prev + cur.interest_amount, 0);
const total_outstanding = frm.doc.overdue_payments const total_outstanding = frm.doc.overdue_payments
.reduce((prev, cur) => prev + cur.outstanding, 0); .reduce((prev, cur) => prev + cur.outstanding, 0);
const dunning_amount = flt(total_interest + frm.doc.dunning_fee, precision('dunning_amount')); const dunning_amount = flt(total_interest + frm.doc.dunning_fee, precision("dunning_amount"));
const grand_total = flt(total_outstanding + dunning_amount, precision('grand_total')); const grand_total = flt(total_outstanding + dunning_amount, precision("grand_total"));
frm.set_value("total_outstanding", total_outstanding); frm.set_value("total_outstanding", total_outstanding);
frm.set_value("total_interest", total_interest); frm.set_value("total_interest", total_interest);