- ${__("Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.")}
+ ${__(
+ "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+ )}
- ${__("There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier.")}
+ ${__(
+ "There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier."
+ )}
- ${__("In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent")}
+ ${__(
+ "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+ )}
${__("If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.")}
- ${__("If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)")}
+ ${__(
+ "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+ )}
${__("One customer can be part of only single Loyalty Program.")}
@@ -37,14 +44,14 @@ frappe.ui.form.on('Loyalty Program', {
set_field_options("loyalty_program_help", help_content);
},
- onload: function(frm) {
- frm.set_query("expense_account", function(doc) {
+ onload: function (frm) {
+ frm.set_query("expense_account", function (doc) {
return {
filters: {
- "root_type": "Expense",
- 'is_group': 0,
- 'company': doc.company
- }
+ root_type: "Expense",
+ is_group: 0,
+ company: doc.company,
+ },
};
});
@@ -52,13 +59,15 @@ frappe.ui.form.on('Loyalty Program', {
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.loyalty_program_type === "Single Tier Program" && frm.doc.collection_rules.length > 1) {
- frappe.throw(__("Please select the Multiple Tier Program type for more than one collection rules."));
+ frappe.throw(
+ __("Please select the Multiple Tier Program type for more than one collection rules.")
+ );
}
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
- }
+ },
});
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
index 103fa96d02d6..25d437f154f9 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js
@@ -1,16 +1,16 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Mode of Payment', {
- setup: function(frm) {
- frm.set_query("default_account", "accounts", function(doc, cdt, cdn) {
+frappe.ui.form.on("Mode of Payment", {
+ setup: function (frm) {
+ frm.set_query("default_account", "accounts", function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
filters: [
- ['Account', 'account_type', 'in', 'Bank, Cash, Receivable'],
- ['Account', 'is_group', '=', 0],
- ['Account', 'company', '=', d.company]
- ]
+ ["Account", "account_type", "in", "Bank, Cash, Receivable"],
+ ["Account", "is_group", "=", 0],
+ ["Account", "company", "=", d.company],
+ ],
};
});
},
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
index 569f0084c6a4..3383534f59e6 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
@@ -1,16 +1,16 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Monthly Distribution', {
+frappe.ui.form.on("Monthly Distribution", {
onload(frm) {
- if(frm.doc.__islocal) {
- return frm.call('get_months').then(() => {
- frm.refresh_field('percentages');
+ if (frm.doc.__islocal) {
+ return frm.call("get_months").then(() => {
+ frm.refresh_field("percentages");
});
}
},
refresh(frm) {
- frm.toggle_display('distribution_id', frm.doc.__islocal);
- }
+ frm.toggle_display("distribution_id", frm.doc.__islocal);
+ },
});
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
index 88867d11bb87..f1efba8a954f 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
@@ -1,48 +1,52 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Opening Invoice Creation Tool', {
- setup: function(frm) {
- frm.set_query('party_type', 'invoices', function(doc, cdt, cdn) {
+frappe.ui.form.on("Opening Invoice Creation Tool", {
+ setup: function (frm) {
+ frm.set_query("party_type", "invoices", function (doc, cdt, cdn) {
return {
filters: {
- 'name': ['in', 'Customer, Supplier']
- }
+ name: ["in", "Customer, Supplier"],
+ },
};
});
if (frm.doc.company) {
- frm.trigger('setup_company_filters');
+ frm.trigger("setup_company_filters");
}
- frappe.realtime.on('opening_invoice_creation_progress', data => {
+ frappe.realtime.on("opening_invoice_creation_progress", (data) => {
if (!frm.doc.import_in_progress) {
frm.dashboard.reset();
frm.doc.import_in_progress = true;
}
if (data.count == data.total) {
- setTimeout(() => {
- frm.doc.import_in_progress = false;
- frm.clear_table("invoices");
- frm.refresh_fields();
- frm.page.clear_indicator();
- frm.dashboard.hide_progress();
- frappe.msgprint(__("Opening {0} Invoices created", [frm.doc.invoice_type]));
- }, 1500, data.title);
+ setTimeout(
+ () => {
+ frm.doc.import_in_progress = false;
+ frm.clear_table("invoices");
+ frm.refresh_fields();
+ frm.page.clear_indicator();
+ frm.dashboard.hide_progress();
+ frappe.msgprint(__("Opening {0} Invoices created", [frm.doc.invoice_type]));
+ },
+ 1500,
+ data.title
+ );
return;
}
frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
- frm.page.set_indicator(__('In Progress'), 'orange');
+ frm.page.set_indicator(__("In Progress"), "orange");
});
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.disable_save();
!frm.doc.import_in_progress && frm.trigger("make_dashboard");
- frm.page.set_primary_action(__('Create Invoices'), () => {
+ frm.page.set_primary_action(__("Create Invoices"), () => {
let btn_primary = frm.page.btn_primary.get(0);
return frm.call({
doc: frm.doc,
@@ -58,100 +62,98 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
}
},
- setup_company_filters: function(frm) {
- frm.set_query('cost_center', 'invoices', function(doc, cdt, cdn) {
+ setup_company_filters: function (frm) {
+ frm.set_query("cost_center", "invoices", function (doc, cdt, cdn) {
return {
filters: {
- 'company': doc.company
- }
+ company: doc.company,
+ },
};
});
- frm.set_query('cost_center', function(doc) {
+ frm.set_query("cost_center", function (doc) {
return {
filters: {
- 'company': doc.company
- }
+ company: doc.company,
+ },
};
});
- frm.set_query('temporary_opening_account', 'invoices', function(doc, cdt, cdn) {
+ frm.set_query("temporary_opening_account", "invoices", function (doc, cdt, cdn) {
return {
filters: {
- 'company': doc.company
- }
- }
+ company: doc.company,
+ },
+ };
});
},
- company: function(frm) {
+ company: function (frm) {
if (frm.doc.company) {
-
- frm.trigger('setup_company_filters');
+ frm.trigger("setup_company_filters");
frappe.call({
- method: 'erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account',
+ method: "erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account",
args: {
- company: frm.doc.company
+ company: frm.doc.company,
},
callback: (r) => {
if (r.message) {
frm.doc.__onload.temporary_opening_account = r.message;
- frm.trigger('update_invoice_table');
+ frm.trigger("update_invoice_table");
}
- }
- })
+ },
+ });
}
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- invoice_type: function(frm) {
+ invoice_type: function (frm) {
$.each(frm.doc.invoices, (idx, row) => {
- row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
+ row.party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
row.party = "";
});
frm.refresh_fields();
},
- make_dashboard: function(frm) {
+ make_dashboard: function (frm) {
let max_count = frm.doc.__onload.max_count;
let opening_invoices_summary = frm.doc.__onload.opening_invoices_summary;
- if(!$.isEmptyObject(opening_invoices_summary)) {
+ if (!$.isEmptyObject(opening_invoices_summary)) {
let section = frm.dashboard.add_section(
- frappe.render_template('opening_invoice_creation_tool_dashboard', {
+ frappe.render_template("opening_invoice_creation_tool_dashboard", {
data: opening_invoices_summary,
- max_count: max_count
+ max_count: max_count,
}),
__("Opening Invoices Summary")
);
- section.on('click', '.invoice-link', function() {
- let doctype = $(this).attr('data-type');
- let company = $(this).attr('data-company');
- frappe.set_route('List', doctype,
- {'is_opening': 'Yes', 'company': company, 'docstatus': 1});
+ section.on("click", ".invoice-link", function () {
+ let doctype = $(this).attr("data-type");
+ let company = $(this).attr("data-company");
+ frappe.set_route("List", doctype, { is_opening: "Yes", company: company, docstatus: 1 });
});
frm.dashboard.show();
}
},
- update_invoice_table: function(frm) {
+ update_invoice_table: function (frm) {
$.each(frm.doc.invoices, (idx, row) => {
if (!row.temporary_opening_account) {
row.temporary_opening_account = frm.doc.__onload.temporary_opening_account;
}
- if(!row.cost_center) {
+ if (!row.cost_center) {
row.cost_center = frm.doc.cost_center;
}
- row.party_type = frm.doc.invoice_type == "Sales"? "Customer": "Supplier";
+ row.party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
});
- }
+ },
});
-frappe.ui.form.on('Opening Invoice Creation Tool Item', {
+frappe.ui.form.on("Opening Invoice Creation Tool Item", {
invoices_add: (frm) => {
- frm.trigger('update_invoice_table');
- }
+ frm.trigger("update_invoice_table");
+ },
});
diff --git a/erpnext/accounts/doctype/party_link/party_link.js b/erpnext/accounts/doctype/party_link/party_link.js
index 6da9291d64db..dfa02c4be9ae 100644
--- a/erpnext/accounts/doctype/party_link/party_link.js
+++ b/erpnext/accounts/doctype/party_link/party_link.js
@@ -1,33 +1,34 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Party Link', {
- refresh: function(frm) {
- frm.set_query('primary_role', () => {
+frappe.ui.form.on("Party Link", {
+ refresh: function (frm) {
+ frm.set_query("primary_role", () => {
return {
filters: {
- name: ['in', ['Customer', 'Supplier']]
- }
+ name: ["in", ["Customer", "Supplier"]],
+ },
};
});
- frm.set_query('secondary_role', () => {
- let party_types = Object.keys(frappe.boot.party_account_types)
- .filter(p => p != frm.doc.primary_role);
+ frm.set_query("secondary_role", () => {
+ let party_types = Object.keys(frappe.boot.party_account_types).filter(
+ (p) => p != frm.doc.primary_role
+ );
return {
filters: {
- name: ['in', party_types]
- }
+ name: ["in", party_types],
+ },
};
});
},
primary_role(frm) {
- frm.set_value('primary_party', '');
- frm.set_value('secondary_role', '');
+ frm.set_value("primary_party", "");
+ frm.set_value("secondary_role", "");
},
secondary_role(frm) {
- frm.set_value('secondary_party', '');
- }
+ frm.set_value("secondary_party", "");
+ },
});
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 832b1166fba8..ab50c38b1e26 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -7,11 +7,20 @@ cur_frm.cscript.tax_table = "Advance Taxes and Charges";
erpnext.accounts.taxes.setup_tax_validations("Payment Entry");
erpnext.accounts.taxes.setup_tax_filters("Advance Taxes and Charges");
-frappe.ui.form.on('Payment Entry', {
- onload: function(frm) {
- frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', 'Repost Payment Ledger','Repost Accounting Ledger', 'Unreconcile Payment', 'Unreconcile Payment Entries', "Bank Transaction"];
+frappe.ui.form.on("Payment Entry", {
+ onload: function (frm) {
+ frm.ignore_doctypes_on_cancel_all = [
+ "Sales Invoice",
+ "Purchase Invoice",
+ "Journal Entry",
+ "Repost Payment Ledger",
+ "Repost Accounting Ledger",
+ "Unreconcile Payment",
+ "Unreconcile Payment Entries",
+ "Bank Transaction",
+ ];
- if(frm.doc.__islocal) {
+ if (frm.doc.__islocal) {
if (!frm.doc.paid_from) frm.set_value("paid_from_account_currency", null);
if (!frm.doc.paid_to) frm.set_value("paid_to_account_currency", null);
}
@@ -19,95 +28,97 @@ frappe.ui.form.on('Payment Entry', {
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- setup: function(frm) {
- frm.set_query("paid_from", function() {
+ setup: function (frm) {
+ frm.set_query("paid_from", function () {
frm.events.validate_company(frm);
- var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
- ["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
+ var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type)
+ ? ["Bank", "Cash"]
+ : [frappe.boot.party_account_types[frm.doc.party_type]];
return {
filters: {
- "account_type": ["in", account_types],
- "is_group": 0,
- "company": frm.doc.company
- }
- }
+ account_type: ["in", account_types],
+ is_group: 0,
+ company: frm.doc.company,
+ },
+ };
});
- frm.set_query("party_type", function() {
+ frm.set_query("party_type", function () {
frm.events.validate_company(frm);
- return{
+ return {
filters: {
- "name": ["in", Object.keys(frappe.boot.party_account_types)],
- }
- }
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
+ },
+ };
});
- frm.set_query("party_bank_account", function() {
+ frm.set_query("party_bank_account", function () {
return {
filters: {
is_company_account: 0,
party_type: frm.doc.party_type,
- party: frm.doc.party
- }
- }
+ party: frm.doc.party,
+ },
+ };
});
- frm.set_query("bank_account", function() {
+ frm.set_query("bank_account", function () {
return {
filters: {
is_company_account: 1,
- company: frm.doc.company
- }
- }
+ company: frm.doc.company,
+ },
+ };
});
- frm.set_query("contact_person", function() {
+ frm.set_query("contact_person", function () {
if (frm.doc.party) {
return {
- query: 'frappe.contacts.doctype.contact.contact.contact_query',
+ query: "frappe.contacts.doctype.contact.contact.contact_query",
filters: {
link_doctype: frm.doc.party_type,
- link_name: frm.doc.party
- }
+ link_name: frm.doc.party,
+ },
};
}
});
- frm.set_query("paid_to", function() {
+ frm.set_query("paid_to", function () {
frm.events.validate_company(frm);
- var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
- ["Bank", "Cash"] : [frappe.boot.party_account_types[frm.doc.party_type]];
+ var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type)
+ ? ["Bank", "Cash"]
+ : [frappe.boot.party_account_types[frm.doc.party_type]];
return {
filters: {
- "account_type": ["in", account_types],
- "is_group": 0,
- "company": frm.doc.company
- }
- }
+ account_type: ["in", account_types],
+ is_group: 0,
+ company: frm.doc.company,
+ },
+ };
});
- frm.set_query("account", "deductions", function() {
+ frm.set_query("account", "deductions", function () {
return {
filters: {
- "is_group": 0,
- "company": frm.doc.company
- }
- }
+ is_group: 0,
+ company: frm.doc.company,
+ },
+ };
});
- frm.set_query("advance_tax_account", function() {
+ frm.set_query("advance_tax_account", function () {
return {
filters: {
- "company": frm.doc.company,
- "root_type": ["in", ["Asset", "Liability"]],
- "is_group": 0
- }
- }
+ company: frm.doc.company,
+ root_type: ["in", ["Asset", "Liability"]],
+ is_group: 0,
+ },
+ };
});
- frm.set_query("reference_doctype", "references", function() {
+ frm.set_query("reference_doctype", "references", function () {
let doctypes = ["Journal Entry"];
if (frm.doc.party_type == "Customer") {
doctypes = ["Sales Order", "Sales Invoice", "Journal Entry", "Dunning"];
@@ -116,232 +127,312 @@ frappe.ui.form.on('Payment Entry', {
}
return {
- filters: { "name": ["in", doctypes] }
+ filters: { name: ["in", doctypes] },
};
});
- frm.set_query('payment_term', 'references', function(frm, cdt, cdn) {
+ 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) {
+ if (
+ in_list(["Purchase Invoice", "Sales Invoice"], child.reference_doctype) &&
+ child.reference_name
+ ) {
return {
query: "erpnext.controllers.queries.get_payment_terms_for_references",
filters: {
- 'reference': child.reference_name
- }
- }
+ reference: child.reference_name,
+ },
+ };
}
});
- frm.set_query("reference_name", "references", function(doc, cdt, cdn) {
+ frm.set_query("reference_name", "references", function (doc, cdt, cdn) {
const child = locals[cdt][cdn];
- const filters = {"docstatus": 1, "company": doc.company};
- const party_type_doctypes = ['Sales Invoice', 'Sales Order', 'Purchase Invoice',
- 'Purchase Order', 'Dunning'];
+ const filters = { docstatus: 1, company: doc.company };
+ const party_type_doctypes = [
+ "Sales Invoice",
+ "Sales Order",
+ "Purchase Invoice",
+ "Purchase Order",
+ "Dunning",
+ ];
if (in_list(party_type_doctypes, child.reference_doctype)) {
filters[doc.party_type.toLowerCase()] = doc.party;
}
return {
- filters: filters
+ filters: filters,
};
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
erpnext.hide_company(frm);
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm);
erpnext.accounts.ledger_preview.show_accounting_ledger_preview(frm);
- if((frm.doc.references) && (frm.doc.references.find((elem) => {return elem.exchange_gain_loss != 0}))) {
- frm.add_custom_button(__("View Exchange Gain/Loss Journals"), function() {
- frappe.set_route("List", "Journal Entry", {"voucher_type": "Exchange Gain Or Loss", "reference_name": frm.doc.name});
- }, __('Actions'));
-
+ if (
+ frm.doc.references &&
+ frm.doc.references.find((elem) => {
+ return elem.exchange_gain_loss != 0;
+ })
+ ) {
+ frm.add_custom_button(
+ __("View Exchange Gain/Loss Journals"),
+ function () {
+ frappe.set_route("List", "Journal Entry", {
+ voucher_type: "Exchange Gain Or Loss",
+ reference_name: frm.doc.name,
+ });
+ },
+ __("Actions")
+ );
}
erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
},
validate_company: (frm) => {
- if (!frm.doc.company){
- frappe.throw({message:__("Please select a Company first."), title: __("Mandatory")});
+ if (!frm.doc.company) {
+ frappe.throw({ message: __("Please select a Company first."), title: __("Mandatory") });
}
},
- company: function(frm) {
- frm.trigger('party');
+ company: function (frm) {
+ frm.trigger("party");
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- contact_person: function(frm) {
+ contact_person: function (frm) {
frm.set_value("contact_email", "");
erpnext.utils.get_contact_details(frm);
},
- hide_unhide_fields: function(frm) {
- var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
+ hide_unhide_fields: function (frm) {
+ var company_currency = frm.doc.company
+ ? frappe.get_doc(":Company", frm.doc.company).default_currency
+ : "";
- frm.toggle_display("source_exchange_rate",
- (frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency));
+ frm.toggle_display(
+ "source_exchange_rate",
+ frm.doc.paid_amount && frm.doc.paid_from_account_currency != company_currency
+ );
- frm.toggle_display("target_exchange_rate", (frm.doc.received_amount &&
- frm.doc.paid_to_account_currency != company_currency &&
- frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency));
+ frm.toggle_display(
+ "target_exchange_rate",
+ frm.doc.received_amount &&
+ frm.doc.paid_to_account_currency != company_currency &&
+ frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency
+ );
frm.toggle_display("base_paid_amount", frm.doc.paid_from_account_currency != company_currency);
if (frm.doc.payment_type == "Pay") {
- frm.toggle_display("base_total_taxes_and_charges", frm.doc.total_taxes_and_charges &&
- (frm.doc.paid_to_account_currency != company_currency));
+ frm.toggle_display(
+ "base_total_taxes_and_charges",
+ frm.doc.total_taxes_and_charges && frm.doc.paid_to_account_currency != company_currency
+ );
} else {
- frm.toggle_display("base_total_taxes_and_charges", frm.doc.total_taxes_and_charges &&
- (frm.doc.paid_from_account_currency != company_currency));
+ frm.toggle_display(
+ "base_total_taxes_and_charges",
+ frm.doc.total_taxes_and_charges && frm.doc.paid_from_account_currency != company_currency
+ );
}
- frm.toggle_display("base_received_amount", (
- frm.doc.paid_to_account_currency != company_currency
- && frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency
- && frm.doc.base_paid_amount != frm.doc.base_received_amount
- ));
-
- frm.toggle_display("received_amount", (frm.doc.payment_type=="Internal Transfer" ||
- frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency))
+ frm.toggle_display(
+ "base_received_amount",
+ frm.doc.paid_to_account_currency != company_currency &&
+ frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency &&
+ frm.doc.base_paid_amount != frm.doc.base_received_amount
+ );
- frm.toggle_display(["base_total_allocated_amount"],
- (frm.doc.paid_amount && frm.doc.received_amount && frm.doc.base_total_allocated_amount &&
- ((frm.doc.payment_type=="Receive" && frm.doc.paid_from_account_currency != company_currency) ||
- (frm.doc.payment_type=="Pay" && frm.doc.paid_to_account_currency != company_currency))));
+ frm.toggle_display(
+ "received_amount",
+ frm.doc.payment_type == "Internal Transfer" ||
+ frm.doc.paid_from_account_currency != frm.doc.paid_to_account_currency
+ );
- var party_amount = frm.doc.payment_type=="Receive" ?
- frm.doc.paid_amount : frm.doc.received_amount;
+ frm.toggle_display(
+ ["base_total_allocated_amount"],
+ frm.doc.paid_amount &&
+ frm.doc.received_amount &&
+ frm.doc.base_total_allocated_amount &&
+ ((frm.doc.payment_type == "Receive" &&
+ frm.doc.paid_from_account_currency != company_currency) ||
+ (frm.doc.payment_type == "Pay" && frm.doc.paid_to_account_currency != company_currency))
+ );
- frm.toggle_display("write_off_difference_amount", (frm.doc.difference_amount && frm.doc.party &&
- (frm.doc.total_allocated_amount > party_amount)));
+ var party_amount = frm.doc.payment_type == "Receive" ? frm.doc.paid_amount : frm.doc.received_amount;
- frm.toggle_display("set_exchange_gain_loss",
- frm.doc.paid_amount && frm.doc.received_amount && frm.doc.difference_amount);
+ frm.toggle_display(
+ "write_off_difference_amount",
+ frm.doc.difference_amount && frm.doc.party && frm.doc.total_allocated_amount > party_amount
+ );
+ frm.toggle_display(
+ "set_exchange_gain_loss",
+ frm.doc.paid_amount && frm.doc.received_amount && frm.doc.difference_amount
+ );
},
- set_dynamic_labels: function(frm) {
- var company_currency = frm.doc.company? frappe.get_doc(":Company", frm.doc.company).default_currency: "";
-
- frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
- "difference_amount", "base_paid_amount_after_tax", "base_received_amount_after_tax",
- "base_total_taxes_and_charges"], company_currency);
+ set_dynamic_labels: function (frm) {
+ var company_currency = frm.doc.company
+ ? frappe.get_doc(":Company", frm.doc.company).default_currency
+ : "";
+
+ frm.set_currency_labels(
+ [
+ "base_paid_amount",
+ "base_received_amount",
+ "base_total_allocated_amount",
+ "difference_amount",
+ "base_paid_amount_after_tax",
+ "base_received_amount_after_tax",
+ "base_total_taxes_and_charges",
+ ],
+ company_currency
+ );
frm.set_currency_labels(["paid_amount"], frm.doc.paid_from_account_currency);
frm.set_currency_labels(["received_amount"], frm.doc.paid_to_account_currency);
- var party_account_currency = frm.doc.payment_type=="Receive" ?
- frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
+ var party_account_currency =
+ frm.doc.payment_type == "Receive"
+ ? frm.doc.paid_from_account_currency
+ : frm.doc.paid_to_account_currency;
- frm.set_currency_labels(["total_allocated_amount", "unallocated_amount",
- "total_taxes_and_charges"], party_account_currency);
+ frm.set_currency_labels(
+ ["total_allocated_amount", "unallocated_amount", "total_taxes_and_charges"],
+ party_account_currency
+ );
- var currency_field = (frm.doc.payment_type=="Receive") ? "paid_from_account_currency" : "paid_to_account_currency"
+ var currency_field =
+ frm.doc.payment_type == "Receive" ? "paid_from_account_currency" : "paid_to_account_currency";
frm.set_df_property("total_allocated_amount", "options", currency_field);
frm.set_df_property("unallocated_amount", "options", currency_field);
frm.set_df_property("total_taxes_and_charges", "options", currency_field);
frm.set_df_property("party_balance", "options", currency_field);
- frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
- party_account_currency, "references");
+ frm.set_currency_labels(
+ ["total_amount", "outstanding_amount", "allocated_amount"],
+ party_account_currency,
+ "references"
+ );
- cur_frm.set_df_property("source_exchange_rate", "description",
- ("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
+ cur_frm.set_df_property(
+ "source_exchange_rate",
+ "description",
+ "1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency
+ );
- cur_frm.set_df_property("target_exchange_rate", "description",
- ("1 " + frm.doc.paid_to_account_currency + " = [?] " + company_currency));
+ cur_frm.set_df_property(
+ "target_exchange_rate",
+ "description",
+ "1 " + frm.doc.paid_to_account_currency + " = [?] " + company_currency
+ );
frm.refresh_fields();
},
- show_general_ledger: function(frm) {
- if(frm.doc.docstatus > 0) {
- frm.add_custom_button(__('Ledger'), function() {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "from_date": frm.doc.posting_date,
- "to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
- "company": frm.doc.company,
- "group_by": "",
- "show_cancelled_entries": frm.doc.docstatus === 2
- };
- frappe.set_route("query-report", "General Ledger");
- }, "fa fa-table");
+ show_general_ledger: function (frm) {
+ if (frm.doc.docstatus > 0) {
+ frm.add_custom_button(
+ __("Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.posting_date,
+ to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
+ company: frm.doc.company,
+ group_by: "",
+ show_cancelled_entries: frm.doc.docstatus === 2,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ "fa fa-table"
+ );
}
},
- payment_type: function(frm) {
- if(frm.doc.payment_type == "Internal Transfer") {
- $.each(["party", "party_balance", "paid_from", "paid_to",
- "references", "total_allocated_amount"], function(i, field) {
- frm.set_value(field, null);
- });
+ payment_type: function (frm) {
+ if (frm.doc.payment_type == "Internal Transfer") {
+ $.each(
+ ["party", "party_balance", "paid_from", "paid_to", "references", "total_allocated_amount"],
+ function (i, field) {
+ frm.set_value(field, null);
+ }
+ );
} else {
- if(frm.doc.party) {
+ if (frm.doc.party) {
frm.events.party(frm);
}
- if(frm.doc.mode_of_payment) {
+ if (frm.doc.mode_of_payment) {
frm.events.mode_of_payment(frm);
}
}
},
- mode_of_payment: function(frm) {
- erpnext.accounts.pos.get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account){
+ mode_of_payment: function (frm) {
+ erpnext.accounts.pos.get_payment_mode_account(frm, frm.doc.mode_of_payment, function (account) {
let payment_account_field = frm.doc.payment_type == "Receive" ? "paid_to" : "paid_from";
frm.set_value(payment_account_field, account);
- })
+ });
},
- party_type: function(frm) {
-
+ party_type: function (frm) {
let party_types = Object.keys(frappe.boot.party_account_types);
- if(frm.doc.party_type && !party_types.includes(frm.doc.party_type)){
+ if (frm.doc.party_type && !party_types.includes(frm.doc.party_type)) {
frm.set_value("party_type", "");
frappe.throw(__("Party can only be one of {0}", [party_types.join(", ")]));
}
- frm.set_query("party", function() {
- if(frm.doc.party_type == 'Employee'){
+ frm.set_query("party", function () {
+ if (frm.doc.party_type == "Employee") {
return {
- query: "erpnext.controllers.queries.employee_query"
- }
- }
- else if(frm.doc.party_type == 'Customer'){
+ query: "erpnext.controllers.queries.employee_query",
+ };
+ } else if (frm.doc.party_type == "Customer") {
return {
- query: "erpnext.controllers.queries.customer_query"
- }
+ query: "erpnext.controllers.queries.customer_query",
+ };
}
});
- if(frm.doc.party) {
- $.each(["party", "party_balance", "paid_from", "paid_to",
- "paid_from_account_currency", "paid_from_account_balance",
- "paid_to_account_currency", "paid_to_account_balance",
- "references", "total_allocated_amount"],
- function(i, field) {
+ if (frm.doc.party) {
+ $.each(
+ [
+ "party",
+ "party_balance",
+ "paid_from",
+ "paid_to",
+ "paid_from_account_currency",
+ "paid_from_account_balance",
+ "paid_to_account_currency",
+ "paid_to_account_balance",
+ "references",
+ "total_allocated_amount",
+ ],
+ function (i, field) {
frm.set_value(field, null);
- })
+ }
+ );
}
},
- party: function(frm) {
+ party: function (frm) {
if (frm.doc.contact_email || frm.doc.contact_person) {
frm.set_value("contact_email", "");
frm.set_value("contact_person", "");
}
- if(frm.doc.payment_type && frm.doc.party_type && frm.doc.party && frm.doc.company) {
- if(!frm.doc.posting_date) {
- frappe.msgprint(__("Please select Posting Date before selecting Party"))
+ if (frm.doc.payment_type && frm.doc.party_type && frm.doc.party && frm.doc.company) {
+ if (!frm.doc.posting_date) {
+ frappe.msgprint(__("Please select Posting Date before selecting Party"));
frm.set_value("party", "");
- return ;
+ return;
}
frm.set_party_account_based_on_party = true;
@@ -354,19 +445,25 @@ frappe.ui.form.on('Payment Entry', {
party_type: frm.doc.party_type,
party: frm.doc.party,
date: frm.doc.posting_date,
- cost_center: frm.doc.cost_center
+ cost_center: frm.doc.cost_center,
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
frappe.run_serially([
() => {
- if(frm.doc.payment_type == "Receive") {
+ if (frm.doc.payment_type == "Receive") {
frm.set_value("paid_from", r.message.party_account);
- frm.set_value("paid_from_account_currency", r.message.party_account_currency);
+ frm.set_value(
+ "paid_from_account_currency",
+ r.message.party_account_currency
+ );
frm.set_value("paid_from_account_balance", r.message.account_balance);
- } else if (frm.doc.payment_type == "Pay"){
+ } else if (frm.doc.payment_type == "Pay") {
frm.set_value("paid_to", r.message.party_account);
- frm.set_value("paid_to_account_currency", r.message.party_account_currency);
+ frm.set_value(
+ "paid_to_account_currency",
+ r.message.party_account_currency
+ );
frm.set_value("paid_to_account_balance", r.message.account_balance);
}
},
@@ -381,32 +478,46 @@ frappe.ui.form.on('Payment Entry', {
frm.set_value("bank_account", r.message.bank_account);
}
},
- () => frm.events.set_current_exchange_rate(frm, "source_exchange_rate",
- frm.doc.paid_from_account_currency, company_currency),
- () => frm.events.set_current_exchange_rate(frm, "target_exchange_rate",
- frm.doc.paid_to_account_currency, company_currency)
+ () =>
+ frm.events.set_current_exchange_rate(
+ frm,
+ "source_exchange_rate",
+ frm.doc.paid_from_account_currency,
+ company_currency
+ ),
+ () =>
+ frm.events.set_current_exchange_rate(
+ frm,
+ "target_exchange_rate",
+ frm.doc.paid_to_account_currency,
+ company_currency
+ ),
]);
}
- }
+ },
});
}
},
- apply_tax_withholding_amount: function(frm) {
+ apply_tax_withholding_amount: function (frm) {
if (!frm.doc.apply_tax_withholding_amount) {
- frm.set_value("tax_withholding_category", '');
+ frm.set_value("tax_withholding_category", "");
} else {
- frappe.db.get_value('Supplier', frm.doc.party, 'tax_withholding_category', (values) => {
+ frappe.db.get_value("Supplier", frm.doc.party, "tax_withholding_category", (values) => {
frm.set_value("tax_withholding_category", values.tax_withholding_category);
});
}
},
- paid_from: function(frm) {
- if(frm.set_party_account_based_on_party) return;
+ paid_from: function (frm) {
+ if (frm.set_party_account_based_on_party) return;
- frm.events.set_account_currency_and_balance(frm, frm.doc.paid_from,
- "paid_from_account_currency", "paid_from_account_balance", function(frm) {
+ frm.events.set_account_currency_and_balance(
+ frm,
+ frm.doc.paid_from,
+ "paid_from_account_currency",
+ "paid_from_account_balance",
+ function (frm) {
if (frm.doc.payment_type == "Pay") {
frm.events.paid_amount(frm);
}
@@ -414,18 +525,21 @@ frappe.ui.form.on('Payment Entry', {
);
},
- paid_to: function(frm) {
- if(frm.set_party_account_based_on_party) return;
+ paid_to: function (frm) {
+ if (frm.set_party_account_based_on_party) return;
- frm.events.set_account_currency_and_balance(frm, frm.doc.paid_to,
- "paid_to_account_currency", "paid_to_account_balance", function(frm) {
+ frm.events.set_account_currency_and_balance(
+ frm,
+ frm.doc.paid_to,
+ "paid_to_account_currency",
+ "paid_to_account_balance",
+ function (frm) {
if (frm.doc.payment_type == "Receive") {
- if(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
- if(frm.doc.source_exchange_rate) {
+ if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
+ if (frm.doc.source_exchange_rate) {
frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
}
frm.set_value("received_amount", frm.doc.paid_amount);
-
} else {
frm.events.received_amount(frm);
}
@@ -434,66 +548,85 @@ frappe.ui.form.on('Payment Entry', {
);
},
- set_account_currency_and_balance: function(frm, account, currency_field,
- balance_field, callback_function) {
-
+ set_account_currency_and_balance: function (
+ frm,
+ account,
+ currency_field,
+ balance_field,
+ callback_function
+ ) {
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
if (frm.doc.posting_date && account) {
frappe.call({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_account_details",
args: {
- "account": account,
- "date": frm.doc.posting_date,
- "cost_center": frm.doc.cost_center
+ account: account,
+ date: frm.doc.posting_date,
+ cost_center: frm.doc.cost_center,
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
frappe.run_serially([
- () => frm.set_value(currency_field, r.message['account_currency']),
+ () => frm.set_value(currency_field, r.message["account_currency"]),
() => {
- frm.set_value(balance_field, r.message['account_balance']);
-
- if(frm.doc.payment_type=="Receive" && currency_field=="paid_to_account_currency") {
- frm.toggle_reqd(["reference_no", "reference_date"],
- (r.message['account_type'] == "Bank" ? 1 : 0));
- if(!frm.doc.received_amount && frm.doc.paid_amount)
+ frm.set_value(balance_field, r.message["account_balance"]);
+
+ if (
+ frm.doc.payment_type == "Receive" &&
+ currency_field == "paid_to_account_currency"
+ ) {
+ frm.toggle_reqd(
+ ["reference_no", "reference_date"],
+ r.message["account_type"] == "Bank" ? 1 : 0
+ );
+ if (!frm.doc.received_amount && frm.doc.paid_amount)
frm.events.paid_amount(frm);
- } else if(frm.doc.payment_type=="Pay" && currency_field=="paid_from_account_currency") {
- frm.toggle_reqd(["reference_no", "reference_date"],
- (r.message['account_type'] == "Bank" ? 1 : 0));
-
- if(!frm.doc.paid_amount && frm.doc.received_amount)
+ } else if (
+ frm.doc.payment_type == "Pay" &&
+ currency_field == "paid_from_account_currency"
+ ) {
+ frm.toggle_reqd(
+ ["reference_no", "reference_date"],
+ r.message["account_type"] == "Bank" ? 1 : 0
+ );
+
+ if (!frm.doc.paid_amount && frm.doc.received_amount)
frm.events.received_amount(frm);
- if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency
- && frm.doc.paid_amount != frm.doc.received_amount) {
- if (company_currency != frm.doc.paid_from_account_currency &&
- frm.doc.payment_type == "Pay") {
- frm.doc.paid_amount = frm.doc.received_amount;
- }
+ if (
+ frm.doc.paid_from_account_currency ==
+ frm.doc.paid_to_account_currency &&
+ frm.doc.paid_amount != frm.doc.received_amount
+ ) {
+ if (
+ company_currency != frm.doc.paid_from_account_currency &&
+ frm.doc.payment_type == "Pay"
+ ) {
+ frm.doc.paid_amount = frm.doc.received_amount;
}
+ }
}
},
() => {
- if(callback_function) callback_function(frm);
+ if (callback_function) callback_function(frm);
frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm);
- }
+ },
]);
}
- }
+ },
});
}
},
- paid_from_account_currency: function(frm) {
- if(!frm.doc.paid_from_account_currency || !frm.doc.company) return;
+ paid_from_account_currency: function (frm) {
+ if (!frm.doc.paid_from_account_currency || !frm.doc.company) return;
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
if (frm.doc.paid_from_account_currency == company_currency) {
frm.set_value("source_exchange_rate", 1);
- } else if (frm.doc.paid_from){
+ } else if (frm.doc.paid_from) {
if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) {
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
frappe.call({
@@ -501,52 +634,60 @@ frappe.ui.form.on('Payment Entry', {
args: {
from_currency: frm.doc.paid_from_account_currency,
to_currency: company_currency,
- transaction_date: frm.doc.posting_date
+ transaction_date: frm.doc.posting_date,
},
- callback: function(r, rt) {
+ callback: function (r, rt) {
frm.set_value("source_exchange_rate", r.message);
- }
- })
+ },
+ });
} else {
- frm.events.set_current_exchange_rate(frm, "source_exchange_rate",
- frm.doc.paid_from_account_currency, company_currency);
+ frm.events.set_current_exchange_rate(
+ frm,
+ "source_exchange_rate",
+ frm.doc.paid_from_account_currency,
+ company_currency
+ );
}
}
},
- paid_to_account_currency: function(frm) {
- if(!frm.doc.paid_to_account_currency || !frm.doc.company) return;
+ paid_to_account_currency: function (frm) {
+ if (!frm.doc.paid_to_account_currency || !frm.doc.company) return;
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
- frm.events.set_current_exchange_rate(frm, "target_exchange_rate",
- frm.doc.paid_to_account_currency, company_currency);
+ frm.events.set_current_exchange_rate(
+ frm,
+ "target_exchange_rate",
+ frm.doc.paid_to_account_currency,
+ company_currency
+ );
},
- set_current_exchange_rate: function(frm, exchange_rate_field, from_currency, to_currency) {
+ set_current_exchange_rate: function (frm, exchange_rate_field, from_currency, to_currency) {
frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
transaction_date: frm.doc.posting_date,
from_currency: from_currency,
- to_currency: to_currency
+ to_currency: to_currency,
},
- callback: function(r, rt) {
+ callback: function (r, rt) {
const ex_rate = flt(r.message, frm.get_field(exchange_rate_field).get_precision());
frm.set_value(exchange_rate_field, ex_rate);
- }
- })
+ },
+ });
},
- posting_date: function(frm) {
+ posting_date: function (frm) {
frm.events.paid_from_account_currency(frm);
},
- source_exchange_rate: function(frm) {
+ source_exchange_rate: function (frm) {
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
if (frm.doc.paid_amount) {
frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
// target exchange rate should always be same as source if both account currencies is same
- if(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
+ if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
frm.set_value("base_received_amount", frm.doc.base_paid_amount);
} else if (company_currency == frm.doc.paid_to_account_currency) {
@@ -563,16 +704,20 @@ frappe.ui.form.on('Payment Entry', {
frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
},
- target_exchange_rate: function(frm) {
+ target_exchange_rate: function (frm) {
frm.set_paid_amount_based_on_received_amount = true;
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
if (frm.doc.received_amount) {
- frm.set_value("base_received_amount",
- flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate));
-
- if(!frm.doc.source_exchange_rate &&
- (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
+ frm.set_value(
+ "base_received_amount",
+ flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate)
+ );
+
+ if (
+ !frm.doc.source_exchange_rate &&
+ frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency
+ ) {
frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
frm.set_value("base_paid_amount", frm.doc.base_received_amount);
} else if (company_currency == frm.doc.paid_from_account_currency) {
@@ -590,125 +735,148 @@ frappe.ui.form.on('Payment Entry', {
frm.set_df_property("target_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
},
- paid_amount: function(frm) {
+ paid_amount: function (frm) {
frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
frm.trigger("reset_received_amount");
frm.events.hide_unhide_fields(frm);
},
- received_amount: function(frm) {
+ received_amount: function (frm) {
frm.set_paid_amount_based_on_received_amount = true;
- if(!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
+ if (!frm.doc.paid_amount && frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
frm.set_value("paid_amount", frm.doc.received_amount);
- if(frm.doc.target_exchange_rate) {
+ if (frm.doc.target_exchange_rate) {
frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate);
}
frm.set_value("base_paid_amount", frm.doc.base_received_amount);
}
- frm.set_value("base_received_amount",
- flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate));
+ frm.set_value(
+ "base_received_amount",
+ flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate)
+ );
- if(frm.doc.payment_type == "Pay")
+ if (frm.doc.payment_type == "Pay")
frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount, 1);
- else
- frm.events.set_unallocated_amount(frm);
+ else frm.events.set_unallocated_amount(frm);
frm.set_paid_amount_based_on_received_amount = false;
frm.events.hide_unhide_fields(frm);
},
- reset_received_amount: function(frm) {
- if(!frm.set_paid_amount_based_on_received_amount &&
- (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency)) {
-
+ reset_received_amount: function (frm) {
+ if (
+ !frm.set_paid_amount_based_on_received_amount &&
+ frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency
+ ) {
frm.set_value("received_amount", frm.doc.paid_amount);
- if(frm.doc.source_exchange_rate) {
+ if (frm.doc.source_exchange_rate) {
frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
}
frm.set_value("base_received_amount", frm.doc.base_paid_amount);
}
- if(frm.doc.payment_type == "Receive")
+ if (frm.doc.payment_type == "Receive")
frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount, 1);
- else
- frm.events.set_unallocated_amount(frm);
+ else frm.events.set_unallocated_amount(frm);
},
- get_outstanding_invoices_or_orders: function(frm, get_outstanding_invoices, get_orders_to_be_billed) {
+ get_outstanding_invoices_or_orders: function (frm, get_outstanding_invoices, get_orders_to_be_billed) {
const today = frappe.datetime.get_today();
let fields = [
- {fieldtype:"Section Break", label: __("Posting Date")},
- {fieldtype:"Date", label: __("From Date"),
- fieldname:"from_posting_date", default:frappe.datetime.add_days(today, -30)},
- {fieldtype:"Column Break"},
- {fieldtype:"Date", label: __("To Date"), fieldname:"to_posting_date", default:today},
- {fieldtype:"Section Break", label: __("Due Date")},
- {fieldtype:"Date", label: __("From Date"), fieldname:"from_due_date"},
- {fieldtype:"Column Break"},
- {fieldtype:"Date", label: __("To Date"), fieldname:"to_due_date"},
- {fieldtype:"Section Break", label: __("Outstanding Amount")},
- {fieldtype:"Float", label: __("Greater Than Amount"),
- fieldname:"outstanding_amt_greater_than", default: 0},
- {fieldtype:"Column Break"},
- {fieldtype:"Float", label: __("Less Than Amount"), fieldname:"outstanding_amt_less_than"},
+ { fieldtype: "Section Break", label: __("Posting Date") },
+ {
+ fieldtype: "Date",
+ label: __("From Date"),
+ fieldname: "from_posting_date",
+ default: frappe.datetime.add_days(today, -30),
+ },
+ { fieldtype: "Column Break" },
+ { fieldtype: "Date", label: __("To Date"), fieldname: "to_posting_date", default: today },
+ { fieldtype: "Section Break", label: __("Due Date") },
+ { fieldtype: "Date", label: __("From Date"), fieldname: "from_due_date" },
+ { fieldtype: "Column Break" },
+ { fieldtype: "Date", label: __("To Date"), fieldname: "to_due_date" },
+ { fieldtype: "Section Break", label: __("Outstanding Amount") },
+ {
+ fieldtype: "Float",
+ label: __("Greater Than Amount"),
+ fieldname: "outstanding_amt_greater_than",
+ default: 0,
+ },
+ { fieldtype: "Column Break" },
+ { fieldtype: "Float", label: __("Less Than Amount"), fieldname: "outstanding_amt_less_than" },
];
if (frm.dimension_filters) {
- let column_break_insertion_point = Math.ceil((frm.dimension_filters.length)/2);
+ let column_break_insertion_point = Math.ceil(frm.dimension_filters.length / 2);
- fields.push({fieldtype:"Section Break"});
- frm.dimension_filters.map((elem, idx)=>{
+ fields.push({ fieldtype: "Section Break" });
+ frm.dimension_filters.map((elem, idx) => {
fields.push({
fieldtype: "Link",
label: elem.document_type == "Cost Center" ? "Cost Center" : elem.label,
options: elem.document_type,
- fieldname: elem.fieldname || elem.document_type
+ fieldname: elem.fieldname || elem.document_type,
});
- if(idx+1 == column_break_insertion_point) {
- fields.push({fieldtype:"Column Break"});
+ if (idx + 1 == column_break_insertion_point) {
+ fields.push({ fieldtype: "Column Break" });
}
});
}
fields = fields.concat([
- {fieldtype:"Section Break"},
- {fieldtype:"Check", label: __("Allocate Payment Amount"), fieldname:"allocate_payment_amount", default:1},
+ { fieldtype: "Section Break" },
+ {
+ fieldtype: "Check",
+ label: __("Allocate Payment Amount"),
+ fieldname: "allocate_payment_amount",
+ default: 1,
+ },
]);
let btn_text = "";
if (get_outstanding_invoices) {
btn_text = "Get Outstanding Invoices";
- }
- else if (get_orders_to_be_billed) {
+ } else if (get_orders_to_be_billed) {
btn_text = "Get Outstanding Orders";
}
- frappe.prompt(fields, function(filters){
- frappe.flags.allocate_payment_amount = true;
- frm.events.validate_filters_data(frm, filters);
- frm.doc.cost_center = filters.cost_center;
- frm.events.get_outstanding_documents(frm, filters, get_outstanding_invoices, get_orders_to_be_billed);
- }, __("Filters"), __(btn_text));
+ frappe.prompt(
+ fields,
+ function (filters) {
+ frappe.flags.allocate_payment_amount = true;
+ frm.events.validate_filters_data(frm, filters);
+ frm.doc.cost_center = filters.cost_center;
+ frm.events.get_outstanding_documents(
+ frm,
+ filters,
+ get_outstanding_invoices,
+ get_orders_to_be_billed
+ );
+ },
+ __("Filters"),
+ __(btn_text)
+ );
},
- get_outstanding_invoices: function(frm) {
+ get_outstanding_invoices: function (frm) {
frm.events.get_outstanding_invoices_or_orders(frm, true, false);
},
- get_outstanding_orders: function(frm) {
+ get_outstanding_orders: function (frm) {
frm.events.get_outstanding_invoices_or_orders(frm, false, true);
},
- validate_filters_data: function(frm, filters) {
+ validate_filters_data: function (frm, filters) {
const fields = {
- 'Posting Date': ['from_posting_date', 'to_posting_date'],
- 'Due Date': ['from_posting_date', 'to_posting_date'],
- 'Advance Amount': ['from_posting_date', 'to_posting_date'],
+ "Posting Date": ["from_posting_date", "to_posting_date"],
+ "Due Date": ["from_posting_date", "to_posting_date"],
+ "Advance Amount": ["from_posting_date", "to_posting_date"],
};
for (let key in fields) {
@@ -716,21 +884,23 @@ frappe.ui.form.on('Payment Entry', {
let to_field = fields[key][1];
if (filters[from_field] && !filters[to_field]) {
- frappe.throw(
- __("Error: {0} is mandatory field", [to_field.replace(/_/g, " ")])
- );
+ frappe.throw(__("Error: {0} is mandatory field", [to_field.replace(/_/g, " ")]));
} else if (filters[from_field] && filters[from_field] > filters[to_field]) {
frappe.throw(
- __("{0}: {1} must be less than {2}", [key, from_field.replace(/_/g, " "), to_field.replace(/_/g, " ")])
+ __("{0}: {1} must be less than {2}", [
+ key,
+ from_field.replace(/_/g, " "),
+ to_field.replace(/_/g, " "),
+ ])
);
}
}
},
- get_outstanding_documents: function(frm, filters, get_outstanding_invoices, get_orders_to_be_billed) {
+ get_outstanding_documents: function (frm, filters, get_outstanding_invoices, get_orders_to_be_billed) {
frm.clear_table("references");
- if(!frm.doc.party) {
+ if (!frm.doc.party) {
return;
}
@@ -738,14 +908,14 @@ frappe.ui.form.on('Payment Entry', {
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
var args = {
- "posting_date": frm.doc.posting_date,
- "company": frm.doc.company,
- "party_type": frm.doc.party_type,
- "payment_type": frm.doc.payment_type,
- "party": frm.doc.party,
- "party_account": frm.doc.payment_type=="Receive" ? frm.doc.paid_from : frm.doc.paid_to,
- "cost_center": frm.doc.cost_center
- }
+ posting_date: frm.doc.posting_date,
+ company: frm.doc.company,
+ party_type: frm.doc.party_type,
+ payment_type: frm.doc.payment_type,
+ party: frm.doc.party,
+ party_account: frm.doc.payment_type == "Receive" ? frm.doc.paid_from : frm.doc.paid_to,
+ cost_center: frm.doc.cost_center,
+ };
for (let key in filters) {
args[key] = filters[key];
@@ -753,8 +923,7 @@ frappe.ui.form.on('Payment Entry', {
if (get_outstanding_invoices) {
args["get_outstanding_invoices"] = true;
- }
- else if (get_orders_to_be_billed) {
+ } else if (get_orders_to_be_billed) {
args["get_orders_to_be_billed"] = true;
}
@@ -762,22 +931,22 @@ frappe.ui.form.on('Payment Entry', {
args["book_advance_payments_in_separate_party_account"] = true;
}
- frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
+ frappe.flags.allocate_payment_amount = filters["allocate_payment_amount"];
- return frappe.call({
- method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
+ return frappe.call({
+ method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents",
args: {
- args:args
+ args: args,
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
var total_positive_outstanding = 0;
var total_negative_outstanding = 0;
- $.each(r.message, function(i, d) {
+ $.each(r.message, function (i, d) {
var c = frm.add_child("references");
c.reference_doctype = d.voucher_type;
c.reference_name = d.voucher_no;
- c.due_date = d.due_date
+ c.due_date = d.due_date;
c.total_amount = d.invoice_amount;
c.outstanding_amount = d.outstanding_amount;
c.bill_no = d.bill_no;
@@ -785,135 +954,157 @@ frappe.ui.form.on('Payment Entry', {
c.allocated_amount = d.allocated_amount;
c.account = d.account;
- if(!in_list(frm.events.get_order_doctypes(frm), d.voucher_type)) {
- if(flt(d.outstanding_amount) > 0)
+ if (!in_list(frm.events.get_order_doctypes(frm), d.voucher_type)) {
+ if (flt(d.outstanding_amount) > 0)
total_positive_outstanding += flt(d.outstanding_amount);
- else
- total_negative_outstanding += Math.abs(flt(d.outstanding_amount));
+ else total_negative_outstanding += Math.abs(flt(d.outstanding_amount));
}
- var party_account_currency = frm.doc.payment_type=="Receive" ?
- frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
+ var party_account_currency =
+ frm.doc.payment_type == "Receive"
+ ? frm.doc.paid_from_account_currency
+ : frm.doc.paid_to_account_currency;
- if(party_account_currency != company_currency) {
+ if (party_account_currency != company_currency) {
c.exchange_rate = d.exchange_rate;
} else {
c.exchange_rate = 1;
}
- if (in_list(frm.events.get_invoice_doctypes(frm), d.reference_doctype)){
+ if (in_list(frm.events.get_invoice_doctypes(frm), d.reference_doctype)) {
c.due_date = d.due_date;
}
});
- if(
- (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
- (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") ||
- (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
+ if (
+ (frm.doc.payment_type == "Receive" && frm.doc.party_type == "Customer") ||
+ (frm.doc.payment_type == "Pay" && frm.doc.party_type == "Supplier") ||
+ (frm.doc.payment_type == "Pay" && frm.doc.party_type == "Employee")
) {
- if(total_positive_outstanding > total_negative_outstanding)
+ if (total_positive_outstanding > total_negative_outstanding)
if (!frm.doc.paid_amount)
- frm.set_value("paid_amount",
- total_positive_outstanding - total_negative_outstanding);
+ frm.set_value(
+ "paid_amount",
+ total_positive_outstanding - total_negative_outstanding
+ );
} else if (
total_negative_outstanding &&
total_positive_outstanding < total_negative_outstanding
) {
if (!frm.doc.received_amount)
- frm.set_value("received_amount",
- total_negative_outstanding - total_positive_outstanding);
+ frm.set_value(
+ "received_amount",
+ total_negative_outstanding - total_positive_outstanding
+ );
}
}
- frm.events.allocate_party_amount_against_ref_docs(frm,
- (frm.doc.payment_type=="Receive" ? frm.doc.paid_amount : frm.doc.received_amount));
-
- }
+ frm.events.allocate_party_amount_against_ref_docs(
+ frm,
+ frm.doc.payment_type == "Receive" ? frm.doc.paid_amount : frm.doc.received_amount
+ );
+ },
});
},
- get_order_doctypes: function(frm) {
+ get_order_doctypes: function (frm) {
return ["Sales Order", "Purchase Order"];
},
- get_invoice_doctypes: function(frm) {
+ get_invoice_doctypes: function (frm) {
return ["Sales Invoice", "Purchase Invoice"];
},
- allocate_party_amount_against_ref_docs: function(frm, paid_amount, paid_amount_change) {
+ allocate_party_amount_against_ref_docs: function (frm, paid_amount, paid_amount_change) {
var total_positive_outstanding_including_order = 0;
var total_negative_outstanding = 0;
- var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
- function(d) { return flt(d.amount) }));
+ var total_deductions = frappe.utils.sum(
+ $.map(frm.doc.deductions || [], function (d) {
+ return flt(d.amount);
+ })
+ );
paid_amount -= total_deductions;
- $.each(frm.doc.references || [], function(i, row) {
- if(flt(row.outstanding_amount) > 0)
+ $.each(frm.doc.references || [], function (i, row) {
+ if (flt(row.outstanding_amount) > 0)
total_positive_outstanding_including_order += flt(row.outstanding_amount);
- else
- total_negative_outstanding += Math.abs(flt(row.outstanding_amount));
- })
+ else total_negative_outstanding += Math.abs(flt(row.outstanding_amount));
+ });
var allocated_negative_outstanding = 0;
if (
- (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
- (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") ||
- (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
- ) {
- if(total_positive_outstanding_including_order > paid_amount) {
- var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
- allocated_negative_outstanding = total_negative_outstanding < remaining_outstanding ?
- total_negative_outstanding : remaining_outstanding;
+ (frm.doc.payment_type == "Receive" && frm.doc.party_type == "Customer") ||
+ (frm.doc.payment_type == "Pay" && frm.doc.party_type == "Supplier") ||
+ (frm.doc.payment_type == "Pay" && frm.doc.party_type == "Employee")
+ ) {
+ if (total_positive_outstanding_including_order > paid_amount) {
+ var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
+ allocated_negative_outstanding =
+ total_negative_outstanding < remaining_outstanding
+ ? total_negative_outstanding
+ : remaining_outstanding;
}
- var allocated_positive_outstanding = paid_amount + allocated_negative_outstanding;
+ var allocated_positive_outstanding = paid_amount + allocated_negative_outstanding;
} else if (in_list(["Customer", "Supplier"], frm.doc.party_type)) {
- total_negative_outstanding = flt(total_negative_outstanding, precision("outstanding_amount"))
- if(paid_amount > total_negative_outstanding) {
- if(total_negative_outstanding == 0) {
+ total_negative_outstanding = flt(total_negative_outstanding, precision("outstanding_amount"));
+ if (paid_amount > total_negative_outstanding) {
+ if (total_negative_outstanding == 0) {
frappe.msgprint(
- __("Cannot {0} {1} {2} without any negative outstanding invoice", [frm.doc.payment_type,
- (frm.doc.party_type=="Customer" ? "to" : "from"), frm.doc.party_type])
+ __("Cannot {0} {1} {2} without any negative outstanding invoice", [
+ frm.doc.payment_type,
+ frm.doc.party_type == "Customer" ? "to" : "from",
+ frm.doc.party_type,
+ ])
);
- return false
+ return false;
} else {
frappe.msgprint(
- __("Paid Amount cannot be greater than total negative outstanding amount {0}", [total_negative_outstanding])
+ __("Paid Amount cannot be greater than total negative outstanding amount {0}", [
+ total_negative_outstanding,
+ ])
);
return false;
}
} else {
allocated_positive_outstanding = total_negative_outstanding - paid_amount;
- allocated_negative_outstanding = paid_amount +
- (total_positive_outstanding_including_order < allocated_positive_outstanding ?
- total_positive_outstanding_including_order : allocated_positive_outstanding)
+ allocated_negative_outstanding =
+ paid_amount +
+ (total_positive_outstanding_including_order < allocated_positive_outstanding
+ ? total_positive_outstanding_including_order
+ : allocated_positive_outstanding);
}
}
- $.each(frm.doc.references || [], function(i, row) {
+ $.each(frm.doc.references || [], function (i, row) {
if (frappe.flags.allocate_payment_amount == 0) {
//If allocate payment amount checkbox is unchecked, set zero to allocate amount
row.allocated_amount = 0;
-
- } else if (frappe.flags.allocate_payment_amount != 0 && (!row.allocated_amount || paid_amount_change)) {
+ } else if (
+ frappe.flags.allocate_payment_amount != 0 &&
+ (!row.allocated_amount || paid_amount_change)
+ ) {
if (row.outstanding_amount > 0 && allocated_positive_outstanding >= 0) {
- row.allocated_amount = (row.outstanding_amount >= allocated_positive_outstanding) ?
- allocated_positive_outstanding : row.outstanding_amount;
+ row.allocated_amount =
+ row.outstanding_amount >= allocated_positive_outstanding
+ ? allocated_positive_outstanding
+ : row.outstanding_amount;
allocated_positive_outstanding -= flt(row.allocated_amount);
-
} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
- row.allocated_amount = (Math.abs(row.outstanding_amount) >= allocated_negative_outstanding) ?
- -1*allocated_negative_outstanding : row.outstanding_amount;
+ row.allocated_amount =
+ Math.abs(row.outstanding_amount) >= allocated_negative_outstanding
+ ? -1 * allocated_negative_outstanding
+ : row.outstanding_amount;
allocated_negative_outstanding -= Math.abs(flt(row.allocated_amount));
}
}
- })
+ });
- frm.refresh_fields()
+ frm.refresh_fields();
frm.events.set_total_allocated_amount(frm);
},
- set_total_allocated_amount: function(frm) {
+ set_total_allocated_amount: function (frm) {
let exchange_rate = 1;
if (frm.doc.payment_type == "Receive") {
exchange_rate = frm.doc.source_exchange_rate;
@@ -922,11 +1113,13 @@ frappe.ui.form.on('Payment Entry', {
}
var total_allocated_amount = 0.0;
var base_total_allocated_amount = 0.0;
- $.each(frm.doc.references || [], function(i, row) {
+ $.each(frm.doc.references || [], function (i, row) {
if (row.allocated_amount) {
total_allocated_amount += flt(row.allocated_amount);
- base_total_allocated_amount += flt(flt(row.allocated_amount)*flt(exchange_rate),
- precision("base_paid_amount"));
+ base_total_allocated_amount += flt(
+ flt(row.allocated_amount) * flt(exchange_rate),
+ precision("base_paid_amount")
+ );
}
});
frm.set_value("total_allocated_amount", Math.abs(total_allocated_amount));
@@ -935,36 +1128,53 @@ frappe.ui.form.on('Payment Entry', {
frm.events.set_unallocated_amount(frm);
},
- set_unallocated_amount: function(frm) {
+ set_unallocated_amount: function (frm) {
var unallocated_amount = 0;
- var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
- function(d) { return flt(d.amount) }));
-
- if(frm.doc.party) {
- if(frm.doc.payment_type == "Receive"
- && frm.doc.base_total_allocated_amount < frm.doc.base_received_amount + total_deductions
- && frm.doc.total_allocated_amount < frm.doc.paid_amount + (total_deductions / frm.doc.source_exchange_rate)) {
- unallocated_amount = (frm.doc.base_received_amount + total_deductions - flt(frm.doc.base_total_taxes_and_charges)
- - frm.doc.base_total_allocated_amount) / frm.doc.source_exchange_rate;
- } else if (frm.doc.payment_type == "Pay"
- && frm.doc.base_total_allocated_amount < frm.doc.base_paid_amount - total_deductions
- && frm.doc.total_allocated_amount < frm.doc.received_amount + (total_deductions / frm.doc.target_exchange_rate)) {
- unallocated_amount = (frm.doc.base_paid_amount + flt(frm.doc.base_total_taxes_and_charges) - (total_deductions
- + frm.doc.base_total_allocated_amount)) / frm.doc.target_exchange_rate;
+ var total_deductions = frappe.utils.sum(
+ $.map(frm.doc.deductions || [], function (d) {
+ return flt(d.amount);
+ })
+ );
+
+ if (frm.doc.party) {
+ if (
+ frm.doc.payment_type == "Receive" &&
+ frm.doc.base_total_allocated_amount < frm.doc.base_received_amount + total_deductions &&
+ frm.doc.total_allocated_amount <
+ frm.doc.paid_amount + total_deductions / frm.doc.source_exchange_rate
+ ) {
+ unallocated_amount =
+ (frm.doc.base_received_amount +
+ total_deductions -
+ flt(frm.doc.base_total_taxes_and_charges) -
+ frm.doc.base_total_allocated_amount) /
+ frm.doc.source_exchange_rate;
+ } else if (
+ frm.doc.payment_type == "Pay" &&
+ frm.doc.base_total_allocated_amount < frm.doc.base_paid_amount - total_deductions &&
+ frm.doc.total_allocated_amount <
+ frm.doc.received_amount + total_deductions / frm.doc.target_exchange_rate
+ ) {
+ unallocated_amount =
+ (frm.doc.base_paid_amount +
+ flt(frm.doc.base_total_taxes_and_charges) -
+ (total_deductions + frm.doc.base_total_allocated_amount)) /
+ frm.doc.target_exchange_rate;
}
}
frm.set_value("unallocated_amount", unallocated_amount);
frm.trigger("set_difference_amount");
},
- set_difference_amount: function(frm) {
+ set_difference_amount: function (frm) {
var difference_amount = 0;
- var base_unallocated_amount = flt(frm.doc.unallocated_amount) *
- (frm.doc.payment_type=="Receive" ? frm.doc.source_exchange_rate : frm.doc.target_exchange_rate);
+ var base_unallocated_amount =
+ flt(frm.doc.unallocated_amount) *
+ (frm.doc.payment_type == "Receive" ? frm.doc.source_exchange_rate : frm.doc.target_exchange_rate);
var base_party_amount = flt(frm.doc.base_total_allocated_amount) + base_unallocated_amount;
- if(frm.doc.payment_type == "Receive") {
+ if (frm.doc.payment_type == "Receive") {
difference_amount = base_party_amount - flt(frm.doc.base_received_amount);
} else if (frm.doc.payment_type == "Pay") {
difference_amount = flt(frm.doc.base_paid_amount) - base_party_amount;
@@ -972,51 +1182,67 @@ frappe.ui.form.on('Payment Entry', {
difference_amount = flt(frm.doc.base_paid_amount) - flt(frm.doc.base_received_amount);
}
- var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
- function(d) { return flt(d.amount) }));
+ var total_deductions = frappe.utils.sum(
+ $.map(frm.doc.deductions || [], function (d) {
+ return flt(d.amount);
+ })
+ );
- frm.set_value("difference_amount", difference_amount - total_deductions +
- flt(frm.doc.base_total_taxes_and_charges));
+ frm.set_value(
+ "difference_amount",
+ difference_amount - total_deductions + flt(frm.doc.base_total_taxes_and_charges)
+ );
frm.events.hide_unhide_fields(frm);
},
- unallocated_amount: function(frm) {
+ unallocated_amount: function (frm) {
frm.trigger("set_difference_amount");
},
- check_mandatory_to_fetch: function(frm) {
- $.each(["Company", "Party Type", "Party", "payment_type"], function(i, field) {
- if(!frm.doc[frappe.model.scrub(field)]) {
+ check_mandatory_to_fetch: function (frm) {
+ $.each(["Company", "Party Type", "Party", "payment_type"], function (i, field) {
+ if (!frm.doc[frappe.model.scrub(field)]) {
frappe.msgprint(__("Please select {0} first", [field]));
return false;
}
-
});
},
- validate_reference_document: function(frm, row) {
- var _validate = function(i, row) {
+ validate_reference_document: function (frm, row) {
+ var _validate = function (i, row) {
if (!row.reference_doctype) {
return;
}
- if(frm.doc.party_type=="Customer" &&
+ if (
+ frm.doc.party_type == "Customer" &&
!in_list(["Sales Order", "Sales Invoice", "Journal Entry", "Dunning"], row.reference_doctype)
) {
frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
- frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning", [row.idx]));
+ frappe.msgprint(
+ __(
+ "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning",
+ [row.idx]
+ )
+ );
return false;
}
- if(frm.doc.party_type=="Supplier" &&
+ if (
+ frm.doc.party_type == "Supplier" &&
!in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.reference_doctype)
) {
frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
- frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
+ frappe.msgprint(
+ __(
+ "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",
+ [row.idx]
+ )
+ );
return false;
}
- }
+ };
if (row) {
_validate(0, row);
@@ -1025,28 +1251,31 @@ frappe.ui.form.on('Payment Entry', {
}
},
- write_off_difference_amount: function(frm) {
+ write_off_difference_amount: function (frm) {
frm.events.set_deductions_entry(frm, "write_off_account");
},
- set_exchange_gain_loss: function(frm) {
+ set_exchange_gain_loss: function (frm) {
frm.events.set_deductions_entry(frm, "exchange_gain_loss_account");
},
- set_deductions_entry: function(frm, account) {
- if(frm.doc.difference_amount) {
+ set_deductions_entry: function (frm, account) {
+ if (frm.doc.difference_amount) {
frappe.call({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_company_defaults",
args: {
- company: frm.doc.company
+ company: frm.doc.company,
},
- callback: function(r, rt) {
- if(r.message) {
- const write_off_row = $.map(frm.doc["deductions"] || [], function(t) {
- return t.account==r.message[account] ? t : null; });
+ callback: function (r, rt) {
+ if (r.message) {
+ const write_off_row = $.map(frm.doc["deductions"] || [], function (t) {
+ return t.account == r.message[account] ? t : null;
+ });
- const difference_amount = flt(frm.doc.difference_amount,
- precision("difference_amount"));
+ const difference_amount = flt(
+ frm.doc.difference_amount,
+ precision("difference_amount")
+ );
const add_deductions = (details) => {
let row = null;
@@ -1061,73 +1290,77 @@ frappe.ui.form.on('Payment Entry', {
if (row) {
row.amount = flt(row.amount) + difference_amount;
} else {
- frappe.msgprint(__("No gain or loss in the exchange rate"))
+ frappe.msgprint(__("No gain or loss in the exchange rate"));
}
refresh_field("deductions");
};
if (!r.message[account]) {
- frappe.prompt({
- label: __("Please Specify Account"),
- fieldname: account,
- fieldtype: "Link",
- options: "Account",
- get_query: () => ({
- filters: {
- company: frm.doc.company,
- }
- })
- }, (values) => {
- const details = Object.assign({}, r.message, values);
- add_deductions(details);
- }, __(frappe.unscrub(account)));
+ frappe.prompt(
+ {
+ label: __("Please Specify Account"),
+ fieldname: account,
+ fieldtype: "Link",
+ options: "Account",
+ get_query: () => ({
+ filters: {
+ company: frm.doc.company,
+ },
+ }),
+ },
+ (values) => {
+ const details = Object.assign({}, r.message, values);
+ add_deductions(details);
+ },
+ __(frappe.unscrub(account))
+ );
} else {
add_deductions(r.message);
}
frm.events.set_unallocated_amount(frm);
}
- }
- })
+ },
+ });
}
},
- bank_account: function(frm) {
- const field = frm.doc.payment_type == "Pay" ? "paid_from":"paid_to";
- if (frm.doc.bank_account && in_list(['Pay', 'Receive'], frm.doc.payment_type)) {
+ bank_account: function (frm) {
+ const field = frm.doc.payment_type == "Pay" ? "paid_from" : "paid_to";
+ if (frm.doc.bank_account && in_list(["Pay", "Receive"], frm.doc.payment_type)) {
frappe.call({
method: "erpnext.accounts.doctype.bank_account.bank_account.get_bank_account_details",
args: {
- bank_account: frm.doc.bank_account
+ bank_account: frm.doc.bank_account,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frm.set_value(field, r.message.account);
- frm.set_value('bank', r.message.bank);
- frm.set_value('bank_account_no', r.message.bank_account_no);
+ frm.set_value("bank", r.message.bank);
+ frm.set_value("bank_account_no", r.message.bank_account_no);
}
- }
+ },
});
}
},
- sales_taxes_and_charges_template: function(frm) {
- frm.trigger('fetch_taxes_from_template');
+ sales_taxes_and_charges_template: function (frm) {
+ frm.trigger("fetch_taxes_from_template");
},
- purchase_taxes_and_charges_template: function(frm) {
- frm.trigger('fetch_taxes_from_template');
+ purchase_taxes_and_charges_template: function (frm) {
+ frm.trigger("fetch_taxes_from_template");
},
- fetch_taxes_from_template: function(frm) {
- let master_doctype = '';
- let taxes_and_charges = '';
+ fetch_taxes_from_template: function (frm) {
+ let master_doctype = "";
+ let taxes_and_charges = "";
- if (frm.doc.party_type == 'Supplier') {
- master_doctype = 'Purchase Taxes and Charges Template';
+ if (frm.doc.party_type == "Supplier") {
+ master_doctype = "Purchase Taxes and Charges Template";
taxes_and_charges = frm.doc.purchase_taxes_and_charges_template;
- } else if (frm.doc.party_type == 'Customer') {
- master_doctype = 'Sales Taxes and Charges Template';
+ } else if (frm.doc.party_type == "Customer") {
+ master_doctype = "Sales Taxes and Charges Template";
taxes_and_charges = frm.doc.sales_taxes_and_charges_template;
}
@@ -1138,16 +1371,16 @@ frappe.ui.form.on('Payment Entry', {
frappe.call({
method: "erpnext.controllers.accounts_controller.get_taxes_and_charges",
args: {
- "master_doctype": master_doctype,
- "master_name": taxes_and_charges
+ master_doctype: master_doctype,
+ master_name: taxes_and_charges,
},
- callback: function(r) {
- if(!r.exc && r.message) {
+ callback: function (r) {
+ if (!r.exc && r.message) {
// set taxes table
- if(r.message) {
+ if (r.message) {
for (let tax of r.message) {
- if (tax.charge_type === 'On Net Total') {
- tax.charge_type = 'On Paid Amount';
+ if (tax.charge_type === "On Net Total") {
+ tax.charge_type = "On Paid Amount";
}
frm.add_child("taxes", tax);
}
@@ -1155,58 +1388,77 @@ frappe.ui.form.on('Payment Entry', {
frm.events.set_unallocated_amount(frm);
}
}
- }
+ },
});
},
- apply_taxes: function(frm) {
+ apply_taxes: function (frm) {
frm.events.initialize_taxes(frm);
frm.events.determine_exclusive_rate(frm);
frm.events.calculate_taxes(frm);
},
- initialize_taxes: function(frm) {
- $.each(frm.doc["taxes"] || [], function(i, tax) {
+ initialize_taxes: function (frm) {
+ $.each(frm.doc["taxes"] || [], function (i, tax) {
frm.events.validate_taxes_and_charges(tax);
frm.events.validate_inclusive_tax(tax);
tax.item_wise_tax_detail = {};
- let tax_fields = ["total", "tax_fraction_for_current_item",
- "grand_total_fraction_for_current_item"];
+ let tax_fields = [
+ "total",
+ "tax_fraction_for_current_item",
+ "grand_total_fraction_for_current_item",
+ ];
if (cstr(tax.charge_type) != "Actual") {
tax_fields.push("tax_amount");
}
- $.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
+ $.each(tax_fields, function (i, fieldname) {
+ tax[fieldname] = 0.0;
+ });
frm.doc.paid_amount_after_tax = frm.doc.base_paid_amount;
});
},
- validate_taxes_and_charges: function(d) {
+ validate_taxes_and_charges: function (d) {
let msg = "";
if (d.account_head && !d.description) {
// set description from account head
- d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
+ d.description = d.account_head.split(" - ").slice(0, -1).join(" - ");
}
if (!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
msg = __("Please select Charge Type first");
d.row_id = "";
d.rate = d.tax_amount = 0.0;
- } else if ((d.charge_type == 'Actual' || d.charge_type == 'On Net Total' || d.charge_type == 'On Paid Amount') && d.row_id) {
- msg = __("Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'");
+ } else if (
+ (d.charge_type == "Actual" ||
+ d.charge_type == "On Net Total" ||
+ d.charge_type == "On Paid Amount") &&
+ d.row_id
+ ) {
+ msg = __(
+ "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
+ );
d.row_id = "";
- } else if ((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) {
+ } else if (
+ (d.charge_type == "On Previous Row Amount" || d.charge_type == "On Previous Row Total") &&
+ d.row_id
+ ) {
if (d.idx == 1) {
- msg = __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row");
- d.charge_type = '';
+ msg = __(
+ "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
+ );
+ d.charge_type = "";
} else if (!d.row_id) {
msg = __("Please specify a valid Row ID for row {0} in table {1}", [d.idx, __(d.doctype)]);
d.row_id = "";
} else if (d.row_id && d.row_id >= d.idx) {
- msg = __("Cannot refer row number greater than or equal to current row number for this Charge type");
+ msg = __(
+ "Cannot refer row number greater than or equal to current row number for this Charge type"
+ );
d.row_id = "";
}
}
@@ -1215,34 +1467,39 @@ frappe.ui.form.on('Payment Entry', {
refresh_field("taxes");
frappe.throw(msg);
}
-
},
- validate_inclusive_tax: function(tax) {
- let actual_type_error = function() {
- let msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx])
+ validate_inclusive_tax: function (tax) {
+ let actual_type_error = function () {
+ let msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx]);
frappe.throw(msg);
};
- let on_previous_row_error = function(row_range) {
- let msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",
- [tax.idx, __(tax.doctype), tax.charge_type, row_range])
+ let on_previous_row_error = function (row_range) {
+ let msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included", [
+ tax.idx,
+ __(tax.doctype),
+ tax.charge_type,
+ row_range,
+ ]);
frappe.throw(msg);
};
- if(cint(tax.included_in_paid_amount)) {
- if(tax.charge_type == "Actual") {
+ if (cint(tax.included_in_paid_amount)) {
+ if (tax.charge_type == "Actual") {
// inclusive tax cannot be of type Actual
actual_type_error();
- } else if(tax.charge_type == "On Previous Row Amount" &&
+ } else if (
+ tax.charge_type == "On Previous Row Amount" &&
!cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_paid_amount)
) {
// referred row should also be an inclusive tax
on_previous_row_error(tax.row_id);
- } else if(tax.charge_type == "On Previous Row Total") {
- let taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id),
- function(t) { return cint(t.included_in_paid_amount) ? null : t; });
- if(taxes_not_included.length > 0) {
+ } else if (tax.charge_type == "On Previous Row Total") {
+ let taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id), function (t) {
+ return cint(t.included_in_paid_amount) ? null : t;
+ });
+ if (taxes_not_included.length > 0) {
// all rows above this tax should be inclusive
on_previous_row_error(tax.row_id == 1 ? "1" : "1 - " + tax.row_id);
}
@@ -1250,55 +1507,55 @@ frappe.ui.form.on('Payment Entry', {
}
},
- determine_exclusive_rate: function(frm) {
+ determine_exclusive_rate: function (frm) {
let has_inclusive_tax = false;
- $.each(frm.doc["taxes"] || [], function(i, row) {
- if(cint(row.included_in_paid_amount)) has_inclusive_tax = true;
+ $.each(frm.doc["taxes"] || [], function (i, row) {
+ if (cint(row.included_in_paid_amount)) has_inclusive_tax = true;
});
- if(has_inclusive_tax==false) return;
+ if (has_inclusive_tax == false) return;
let cumulated_tax_fraction = 0.0;
- $.each(frm.doc["taxes"] || [], function(i, tax) {
+ $.each(frm.doc["taxes"] || [], function (i, tax) {
tax.tax_fraction_for_current_item = frm.events.get_current_tax_fraction(frm, tax);
- if(i==0) {
+ if (i == 0) {
tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item;
} else {
tax.grand_total_fraction_for_current_item =
- frm.doc["taxes"][i-1].grand_total_fraction_for_current_item +
+ frm.doc["taxes"][i - 1].grand_total_fraction_for_current_item +
tax.tax_fraction_for_current_item;
}
cumulated_tax_fraction += tax.tax_fraction_for_current_item;
- frm.doc.paid_amount_after_tax = flt(frm.doc.base_paid_amount/(1+cumulated_tax_fraction))
+ frm.doc.paid_amount_after_tax = flt(frm.doc.base_paid_amount / (1 + cumulated_tax_fraction));
});
},
- get_current_tax_fraction: function(frm, tax) {
+ get_current_tax_fraction: function (frm, tax) {
let current_tax_fraction = 0.0;
- if(cint(tax.included_in_paid_amount)) {
+ if (cint(tax.included_in_paid_amount)) {
let tax_rate = tax.rate;
- if(tax.charge_type == "On Paid Amount") {
- current_tax_fraction = (tax_rate / 100.0);
- } else if(tax.charge_type == "On Previous Row Amount") {
- current_tax_fraction = (tax_rate / 100.0) *
- frm.doc["taxes"][cint(tax.row_id) - 1].tax_fraction_for_current_item;
- } else if(tax.charge_type == "On Previous Row Total") {
- current_tax_fraction = (tax_rate / 100.0) *
+ if (tax.charge_type == "On Paid Amount") {
+ current_tax_fraction = tax_rate / 100.0;
+ } else if (tax.charge_type == "On Previous Row Amount") {
+ current_tax_fraction =
+ (tax_rate / 100.0) * frm.doc["taxes"][cint(tax.row_id) - 1].tax_fraction_for_current_item;
+ } else if (tax.charge_type == "On Previous Row Total") {
+ current_tax_fraction =
+ (tax_rate / 100.0) *
frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_fraction_for_current_item;
}
}
- if(tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") {
+ if (tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") {
current_tax_fraction *= -1;
}
return current_tax_fraction;
},
-
- calculate_taxes: function(frm) {
+ calculate_taxes: function (frm) {
frm.doc.total_taxes_and_charges = 0.0;
frm.doc.base_total_taxes_and_charges = 0.0;
@@ -1306,13 +1563,13 @@ frappe.ui.form.on('Payment Entry', {
let actual_tax_dict = {};
// maintain actual tax rate based on idx
- $.each(frm.doc["taxes"] || [], function(i, tax) {
+ $.each(frm.doc["taxes"] || [], function (i, tax) {
if (tax.charge_type == "Actual") {
actual_tax_dict[tax.idx] = flt(tax.tax_amount, precision("tax_amount", tax));
}
});
- $.each(frm.doc["taxes"] || [], function(i, tax) {
+ $.each(frm.doc["taxes"] || [], function (i, tax) {
let current_tax_amount = frm.events.get_current_tax_amount(frm, tax);
// Adjust divisional loss to the last item
@@ -1325,29 +1582,28 @@ frappe.ui.form.on('Payment Entry', {
// tax accounts are only in company currency
tax.base_tax_amount = current_tax_amount;
- current_tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0;
+ current_tax_amount *= tax.add_deduct_tax == "Deduct" ? -1.0 : 1.0;
- if(i==0) {
+ if (i == 0) {
tax.total = flt(frm.doc.paid_amount_after_tax + current_tax_amount, precision("total", tax));
} else {
- tax.total = flt(frm.doc["taxes"][i-1].total + current_tax_amount, precision("total", tax));
+ tax.total = flt(frm.doc["taxes"][i - 1].total + current_tax_amount, precision("total", tax));
}
// tac accounts are only in company currency
- tax.base_total = tax.total
+ tax.base_total = tax.total;
// calculate total taxes and base total taxes
- if(frm.doc.payment_type == "Pay") {
+ if (frm.doc.payment_type == "Pay") {
// tax accounts only have company currency
- if(tax.currency != frm.doc.paid_to_account_currency) {
+ if (tax.currency != frm.doc.paid_to_account_currency) {
//total_taxes_and_charges has the target currency. so using target conversion rate
frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.target_exchange_rate);
-
} else {
frm.doc.total_taxes_and_charges += current_tax_amount;
}
- } else if(frm.doc.payment_type == "Receive") {
- if(tax.currency != frm.doc.paid_from_account_currency) {
+ } else if (frm.doc.payment_type == "Receive") {
+ if (tax.currency != frm.doc.paid_from_account_currency) {
//total_taxes_and_charges has the target currency. so using source conversion rate
frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.source_exchange_rate);
} else {
@@ -1357,49 +1613,48 @@ frappe.ui.form.on('Payment Entry', {
frm.doc.base_total_taxes_and_charges += tax.base_tax_amount;
- frm.refresh_field('taxes');
- frm.refresh_field('total_taxes_and_charges');
- frm.refresh_field('base_total_taxes_and_charges');
+ frm.refresh_field("taxes");
+ frm.refresh_field("total_taxes_and_charges");
+ frm.refresh_field("base_total_taxes_and_charges");
});
},
- get_current_tax_amount: function(frm, tax) {
+ get_current_tax_amount: function (frm, tax) {
let tax_rate = tax.rate;
let current_tax_amount = 0.0;
// To set row_id by default as previous row.
- if(["On Previous Row Amount", "On Previous Row Total"].includes(tax.charge_type)) {
+ if (["On Previous Row Amount", "On Previous Row Total"].includes(tax.charge_type)) {
if (tax.idx === 1) {
frappe.throw(
- __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"));
+ __(
+ "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
+ )
+ );
}
}
- if(tax.charge_type == "Actual") {
- current_tax_amount = flt(tax.tax_amount, precision("tax_amount", tax))
- } else if(tax.charge_type == "On Paid Amount") {
+ if (tax.charge_type == "Actual") {
+ current_tax_amount = flt(tax.tax_amount, precision("tax_amount", tax));
+ } else if (tax.charge_type == "On Paid Amount") {
current_tax_amount = flt((tax_rate / 100.0) * frm.doc.paid_amount_after_tax);
- } else if(tax.charge_type == "On Previous Row Amount") {
- current_tax_amount = flt((tax_rate / 100.0) *
- frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount);
-
- } else if(tax.charge_type == "On Previous Row Total") {
- current_tax_amount = flt((tax_rate / 100.0) *
- frm.doc["taxes"][cint(tax.row_id) - 1].total);
+ } else if (tax.charge_type == "On Previous Row Amount") {
+ current_tax_amount = flt((tax_rate / 100.0) * frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount);
+ } else if (tax.charge_type == "On Previous Row Total") {
+ current_tax_amount = flt((tax_rate / 100.0) * frm.doc["taxes"][cint(tax.row_id) - 1].total);
}
return current_tax_amount;
},
});
-
-frappe.ui.form.on('Payment Entry Reference', {
- reference_doctype: function(frm, cdt, cdn) {
+frappe.ui.form.on("Payment Entry Reference", {
+ reference_doctype: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
frm.events.validate_reference_document(frm, row);
},
- reference_name: function(frm, cdt, cdn) {
+ reference_name: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (row.reference_name && row.reference_doctype) {
return frappe.call({
@@ -1407,79 +1662,83 @@ frappe.ui.form.on('Payment Entry Reference', {
args: {
reference_doctype: row.reference_doctype,
reference_name: row.reference_name,
- party_account_currency: frm.doc.payment_type=="Receive" ?
- frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
+ party_account_currency:
+ frm.doc.payment_type == "Receive"
+ ? frm.doc.paid_from_account_currency
+ : frm.doc.paid_to_account_currency,
},
- callback: function(r, rt) {
- if(r.message) {
- $.each(r.message, function(field, value) {
+ callback: function (r, rt) {
+ if (r.message) {
+ $.each(r.message, function (field, value) {
frappe.model.set_value(cdt, cdn, field, value);
- })
+ });
- let allocated_amount = frm.doc.unallocated_amount > row.outstanding_amount ?
- row.outstanding_amount : frm.doc.unallocated_amount;
+ let allocated_amount =
+ frm.doc.unallocated_amount > row.outstanding_amount
+ ? row.outstanding_amount
+ : frm.doc.unallocated_amount;
- frappe.model.set_value(cdt, cdn, 'allocated_amount', allocated_amount);
+ frappe.model.set_value(cdt, cdn, "allocated_amount", allocated_amount);
frm.refresh_fields();
}
- }
- })
+ },
+ });
}
},
- allocated_amount: function(frm) {
+ allocated_amount: function (frm) {
frm.events.set_total_allocated_amount(frm);
},
- references_remove: function(frm) {
+ references_remove: function (frm) {
frm.events.set_total_allocated_amount(frm);
- }
-})
+ },
+});
-frappe.ui.form.on('Advance Taxes and Charges', {
- rate: function(frm) {
+frappe.ui.form.on("Advance Taxes and Charges", {
+ rate: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
},
- tax_amount : function(frm) {
+ tax_amount: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
},
- row_id: function(frm) {
+ row_id: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
},
- taxes_remove: function(frm) {
+ taxes_remove: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
},
- included_in_paid_amount: function(frm) {
+ included_in_paid_amount: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
},
- charge_type: function(frm) {
+ charge_type: function (frm) {
frm.events.apply_taxes(frm);
frm.events.set_unallocated_amount(frm);
- }
-})
+ },
+});
-frappe.ui.form.on('Payment Entry Deduction', {
- amount: function(frm) {
+frappe.ui.form.on("Payment Entry Deduction", {
+ amount: function (frm) {
frm.events.set_unallocated_amount(frm);
},
- deductions_remove: function(frm) {
+ deductions_remove: function (frm) {
frm.events.set_unallocated_amount(frm);
- }
-})
-frappe.ui.form.on('Payment Entry', {
- cost_center: function(frm){
- if (frm.doc.posting_date && (frm.doc.paid_from||frm.doc.paid_to)) {
+ },
+});
+frappe.ui.form.on("Payment Entry", {
+ cost_center: function (frm) {
+ if (frm.doc.posting_date && (frm.doc.paid_from || frm.doc.paid_to)) {
return frappe.call({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_party_and_account_balance",
args: {
@@ -1489,21 +1748,23 @@ frappe.ui.form.on('Payment Entry', {
paid_to: frm.doc.paid_to,
ptype: frm.doc.party_type,
pty: frm.doc.party,
- cost_center: frm.doc.cost_center
+ cost_center: frm.doc.cost_center,
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
frappe.run_serially([
() => {
- frm.set_value("paid_from_account_balance", r.message.paid_from_account_balance);
+ frm.set_value(
+ "paid_from_account_balance",
+ r.message.paid_from_account_balance
+ );
frm.set_value("paid_to_account_balance", r.message.paid_to_account_balance);
frm.set_value("party_balance", r.message.party_balance);
- }
+ },
]);
-
}
- }
+ },
});
}
},
-})
+});
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
index 2d76fe69ef98..6974e58c78cf 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js
@@ -1,14 +1,13 @@
-frappe.listview_settings['Payment Entry'] = {
-
- onload: function(listview) {
+frappe.listview_settings["Payment Entry"] = {
+ onload: function (listview) {
if (listview.page.fields_dict.party_type) {
- listview.page.fields_dict.party_type.get_query = function() {
+ listview.page.fields_dict.party_type.get_query = function () {
return {
- "filters": {
- "name": ["in", Object.keys(frappe.boot.party_account_types)],
- }
+ filters: {
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
+ },
};
};
}
- }
+ },
};
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js
index aff067eab893..f15c2bdab21b 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js
@@ -1,11 +1,11 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Payment Gateway Account', {
+frappe.ui.form.on("Payment Gateway Account", {
refresh(frm) {
erpnext.utils.check_payments_app();
- if(!frm.doc.__islocal) {
- frm.set_df_property('payment_gateway', 'read_only', 1);
+ if (!frm.doc.__islocal) {
+ frm.set_df_property("payment_gateway", "read_only", 1);
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js
index 5a7be8e5ab23..07fe83177ba0 100644
--- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js
+++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js
@@ -1,8 +1,7 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Payment Ledger Entry', {
+frappe.ui.form.on("Payment Ledger Entry", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.js b/erpnext/accounts/doctype/payment_order/payment_order.js
index 6630e7122c51..f009de595921 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.js
+++ b/erpnext/accounts/doctype/payment_order/payment_order.js
@@ -1,61 +1,69 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Payment Order', {
- setup: function(frm) {
- frm.set_query("company_bank_account", function() {
+frappe.ui.form.on("Payment Order", {
+ setup: function (frm) {
+ frm.set_query("company_bank_account", function () {
return {
filters: {
- "is_company_account":1
- }
- }
+ is_company_account: 1,
+ },
+ };
});
- frm.set_df_property('references', 'cannot_add_rows', true);
+ frm.set_df_property("references", "cannot_add_rows", true);
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.docstatus == 0) {
- frm.add_custom_button(__('Payment Request'), function() {
- frm.trigger("get_from_payment_request");
- }, __("Get Payments from"));
+ frm.add_custom_button(
+ __("Payment Request"),
+ function () {
+ frm.trigger("get_from_payment_request");
+ },
+ __("Get Payments from")
+ );
- frm.add_custom_button(__('Payment Entry'), function() {
- frm.trigger("get_from_payment_entry");
- }, __("Get Payments from"));
+ frm.add_custom_button(
+ __("Payment Entry"),
+ function () {
+ frm.trigger("get_from_payment_entry");
+ },
+ __("Get Payments from")
+ );
- frm.trigger('remove_button');
+ frm.trigger("remove_button");
}
// payment Entry
- if (frm.doc.docstatus===1 && frm.doc.payment_order_type==='Payment Request') {
- frm.add_custom_button(__('Create Payment Entries'), function() {
+ if (frm.doc.docstatus === 1 && frm.doc.payment_order_type === "Payment Request") {
+ frm.add_custom_button(__("Create Payment Entries"), function () {
frm.trigger("make_payment_records");
});
}
},
- remove_row_if_empty: function(frm) {
+ remove_row_if_empty: function (frm) {
// remove if first row is empty
if (frm.doc.references.length > 0 && !frm.doc.references[0].reference_name) {
frm.doc.references = [];
}
},
- remove_button: function(frm) {
+ remove_button: function (frm) {
// remove custom button of order type that is not imported
let label = ["Payment Request", "Payment Entry"];
if (frm.doc.references.length > 0 && frm.doc.payment_order_type) {
- label = label.reduce(x => {
- x!= frm.doc.payment_order_type;
+ label = label.reduce((x) => {
+ x != frm.doc.payment_order_type;
return x;
});
frm.remove_custom_button(label, "Get from");
}
},
- get_from_payment_entry: function(frm) {
+ get_from_payment_entry: function (frm) {
frm.trigger("remove_row_if_empty");
erpnext.utils.map_current_doc({
method: "erpnext.accounts.doctype.payment_entry.payment_entry.make_payment_order",
@@ -63,7 +71,7 @@ frappe.ui.form.on('Payment Order', {
target: frm,
date_field: "posting_date",
setters: {
- party: frm.doc.supplier || ""
+ party: frm.doc.supplier || "",
},
get_query_filters: {
bank: frm.doc.bank,
@@ -71,70 +79,79 @@ frappe.ui.form.on('Payment Order', {
payment_type: ["!=", "Receive"],
bank_account: frm.doc.company_bank_account,
paid_from: frm.doc.account,
- payment_order_status: ["=", "Initiated"]
- }
+ payment_order_status: ["=", "Initiated"],
+ },
});
},
- get_from_payment_request: function(frm) {
+ get_from_payment_request: function (frm) {
frm.trigger("remove_row_if_empty");
erpnext.utils.map_current_doc({
method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_order",
source_doctype: "Payment Request",
target: frm,
setters: {
- party: frm.doc.supplier || ""
+ party: frm.doc.supplier || "",
},
get_query_filters: {
bank: frm.doc.bank,
docstatus: 1,
status: ["=", "Initiated"],
- }
+ },
});
},
- make_payment_records: function(frm){
+ make_payment_records: function (frm) {
var dialog = new frappe.ui.Dialog({
title: __("For Supplier"),
fields: [
- {"fieldtype": "Link", "label": __("Supplier"), "fieldname": "supplier", "options":"Supplier",
- "get_query": function () {
+ {
+ fieldtype: "Link",
+ label: __("Supplier"),
+ fieldname: "supplier",
+ options: "Supplier",
+ get_query: function () {
return {
- query:"erpnext.accounts.doctype.payment_order.payment_order.get_supplier_query",
- filters: {'parent': frm.doc.name}
- }
- }, "reqd": 1
+ query: "erpnext.accounts.doctype.payment_order.payment_order.get_supplier_query",
+ filters: { parent: frm.doc.name },
+ };
+ },
+ reqd: 1,
},
- {"fieldtype": "Link", "label": __("Mode of Payment"), "fieldname": "mode_of_payment", "options":"Mode of Payment",
- "get_query": function () {
+ {
+ fieldtype: "Link",
+ label: __("Mode of Payment"),
+ fieldname: "mode_of_payment",
+ options: "Mode of Payment",
+ get_query: function () {
return {
- query:"erpnext.accounts.doctype.payment_order.payment_order.get_mop_query",
- filters: {'parent': frm.doc.name}
- }
- }
- }
- ]
+ query: "erpnext.accounts.doctype.payment_order.payment_order.get_mop_query",
+ filters: { parent: frm.doc.name },
+ };
+ },
+ },
+ ],
});
- dialog.set_primary_action(__("Submit"), function() {
+ dialog.set_primary_action(__("Submit"), function () {
var args = dialog.get_values();
- if(!args) return;
+ if (!args) return;
return frappe.call({
method: "erpnext.accounts.doctype.payment_order.payment_order.make_payment_records",
args: {
- "name": frm.doc.name,
- "supplier": args.supplier,
- "mode_of_payment": args.mode_of_payment
+ name: frm.doc.name,
+ supplier: args.supplier,
+ mode_of_payment: args.mode_of_payment,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
dialog.hide();
frm.refresh();
- }
- })
- })
+ },
+ });
+ });
dialog.show();
},
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 99593defae67..cc99fe7b583c 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -2,97 +2,94 @@
// For license information, please see license.txt
frappe.provide("erpnext.accounts");
-erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationController extends frappe.ui.form.Controller {
+erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationController extends (
+ frappe.ui.form.Controller
+) {
onload() {
- const default_company = frappe.defaults.get_default('company');
- this.frm.set_value('company', default_company);
+ const default_company = frappe.defaults.get_default("company");
+ this.frm.set_value("company", default_company);
- this.frm.set_value('party_type', '');
- this.frm.set_value('party', '');
- this.frm.set_value('receivable_payable_account', '');
+ this.frm.set_value("party_type", "");
+ this.frm.set_value("party", "");
+ this.frm.set_value("receivable_payable_account", "");
this.frm.set_query("party_type", () => {
return {
- "filters": {
- "name": ["in", Object.keys(frappe.boot.party_account_types)],
- }
- }
+ filters: {
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
+ },
+ };
});
- this.frm.set_query('receivable_payable_account', () => {
+ this.frm.set_query("receivable_payable_account", () => {
return {
filters: {
- "company": this.frm.doc.company,
- "is_group": 0,
- "account_type": frappe.boot.party_account_types[this.frm.doc.party_type],
- "root_type": this.frm.doc.party_type == 'Customer' ? "Asset" : "Liability"
- }
+ company: this.frm.doc.company,
+ is_group: 0,
+ account_type: frappe.boot.party_account_types[this.frm.doc.party_type],
+ root_type: this.frm.doc.party_type == "Customer" ? "Asset" : "Liability",
+ },
};
});
- this.frm.set_query('default_advance_account', () => {
+ this.frm.set_query("default_advance_account", () => {
return {
filters: {
- "company": this.frm.doc.company,
- "is_group": 0,
- "account_type": this.frm.doc.party_type == 'Customer' ? "Receivable": "Payable",
- "root_type": this.frm.doc.party_type == 'Customer' ? "Liability": "Asset"
- }
+ company: this.frm.doc.company,
+ is_group: 0,
+ account_type: this.frm.doc.party_type == "Customer" ? "Receivable" : "Payable",
+ root_type: this.frm.doc.party_type == "Customer" ? "Liability" : "Asset",
+ },
};
});
- this.frm.set_query('bank_cash_account', () => {
+ this.frm.set_query("bank_cash_account", () => {
return {
- filters:[
- ['Account', 'company', '=', this.frm.doc.company],
- ['Account', 'is_group', '=', 0],
- ['Account', 'account_type', 'in', ['Bank', 'Cash']]
- ]
+ filters: [
+ ["Account", "company", "=", this.frm.doc.company],
+ ["Account", "is_group", "=", 0],
+ ["Account", "account_type", "in", ["Bank", "Cash"]],
+ ],
};
});
this.frm.set_query("cost_center", () => {
return {
- "filters": {
- "company": this.frm.doc.company,
- "is_group": 0
- }
- }
+ filters: {
+ company: this.frm.doc.company,
+ is_group: 0,
+ },
+ };
});
}
refresh() {
this.frm.disable_save();
- this.frm.set_df_property('invoices', 'cannot_delete_rows', true);
- this.frm.set_df_property('payments', 'cannot_delete_rows', true);
- this.frm.set_df_property('allocation', 'cannot_delete_rows', true);
-
- this.frm.set_df_property('invoices', 'cannot_add_rows', true);
- this.frm.set_df_property('payments', 'cannot_add_rows', true);
- this.frm.set_df_property('allocation', 'cannot_add_rows', true);
+ this.frm.set_df_property("invoices", "cannot_delete_rows", true);
+ this.frm.set_df_property("payments", "cannot_delete_rows", true);
+ this.frm.set_df_property("allocation", "cannot_delete_rows", true);
+ this.frm.set_df_property("invoices", "cannot_add_rows", true);
+ this.frm.set_df_property("payments", "cannot_add_rows", true);
+ this.frm.set_df_property("allocation", "cannot_add_rows", true);
if (this.frm.doc.receivable_payable_account) {
- this.frm.add_custom_button(__('Get Unreconciled Entries'), () =>
+ this.frm.add_custom_button(__("Get Unreconciled Entries"), () =>
this.frm.trigger("get_unreconciled_entries")
);
- this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
+ this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "primary");
}
if (this.frm.doc.invoices.length && this.frm.doc.payments.length) {
- this.frm.add_custom_button(__('Allocate'), () =>
- this.frm.trigger("allocate")
- );
- this.frm.change_custom_button_type(__('Allocate'), null, 'primary');
- this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
+ this.frm.add_custom_button(__("Allocate"), () => this.frm.trigger("allocate"));
+ this.frm.change_custom_button_type(__("Allocate"), null, "primary");
+ this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "default");
}
if (this.frm.doc.allocation.length) {
- this.frm.add_custom_button(__('Reconcile'), () =>
- this.frm.trigger("reconcile")
- );
- this.frm.change_custom_button_type(__('Reconcile'), null, 'primary');
- this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
- this.frm.change_custom_button_type(__('Allocate'), null, 'default');
+ this.frm.add_custom_button(__("Reconcile"), () => this.frm.trigger("reconcile"));
+ this.frm.change_custom_button_type(__("Reconcile"), null, "primary");
+ this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "default");
+ this.frm.change_custom_button_type(__("Allocate"), null, "default");
}
this.frm.trigger("set_query_for_dimension_filters");
@@ -101,31 +98,39 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
if (this.frm.doc.receivable_payable_account) {
this.frm.call({
doc: this.frm.doc,
- method: 'is_auto_process_enabled',
+ method: "is_auto_process_enabled",
callback: (r) => {
if (r.message) {
- this.frm.call({
- 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
- "args": {
- for_filter: {
- company: this.frm.doc.company,
- party_type: this.frm.doc.party_type,
- party: this.frm.doc.party,
- receivable_payable_account: this.frm.doc.receivable_payable_account
+ this.frm
+ .call({
+ method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
+ args: {
+ for_filter: {
+ company: this.frm.doc.company,
+ party_type: this.frm.doc.party_type,
+ party: this.frm.doc.party,
+ receivable_payable_account: this.frm.doc.receivable_payable_account,
+ },
+ },
+ })
+ .then((r) => {
+ if (r.message) {
+ let doc_link = frappe.utils.get_form_link(
+ "Process Payment Reconciliation",
+ r.message,
+ true
+ );
+ let msg = __(
+ "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.",
+ [doc_link]
+ );
+ this.frm.dashboard.add_comment(msg, "yellow");
}
- }
- }).then(r => {
- if (r.message) {
- let doc_link = frappe.utils.get_form_link("Process Payment Reconciliation", r.message, true);
- let msg = __("Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.", [doc_link]);
- this.frm.dashboard.add_comment(msg, "yellow");
- }
- });
+ });
}
- }
+ },
});
}
-
}
set_query_for_dimension_filters() {
frappe.call({
@@ -135,29 +140,29 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
},
callback: (r) => {
if (!r.exc && r.message) {
- r.message.forEach(x => {
+ r.message.forEach((x) => {
this.frm.set_query(x.fieldname, () => {
return {
- 'filters': x.filters
+ filters: x.filters,
};
});
});
}
- }
+ },
});
}
company() {
- this.frm.set_value('party', '');
- this.frm.set_value('receivable_payable_account', '');
+ this.frm.set_value("party", "");
+ this.frm.set_value("receivable_payable_account", "");
}
party_type() {
- this.frm.set_value('party', '');
+ this.frm.set_value("party", "");
}
party() {
- this.frm.set_value('receivable_payable_account', '');
+ this.frm.set_value("receivable_payable_account", "");
this.frm.trigger("clear_child_tables");
if (!this.frm.doc.receivable_payable_account && this.frm.doc.party_type && this.frm.doc.party) {
@@ -167,7 +172,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
company: this.frm.doc.company,
party_type: this.frm.doc.party_type,
party: this.frm.doc.party,
- include_advance: 1
+ include_advance: 1,
},
callback: (r) => {
if (!r.exc && r.message) {
@@ -175,7 +180,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
this.frm.set_value("default_advance_account", r.message[1]);
}
this.frm.refresh();
- }
+ },
});
}
}
@@ -193,7 +198,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
this.frm.trigger("get_unreconciled_entries");
}
-
clear_child_tables() {
this.frm.clear_table("invoices");
this.frm.clear_table("payments");
@@ -205,52 +209,52 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
this.frm.clear_table("allocation");
return this.frm.call({
doc: this.frm.doc,
- method: 'get_unreconciled_entries',
+ method: "get_unreconciled_entries",
callback: () => {
if (!(this.frm.doc.payments.length || this.frm.doc.invoices.length)) {
- frappe.throw({message: __("No Unreconciled Invoices and Payments found for this party and account")});
- } else if (!(this.frm.doc.invoices.length)) {
- frappe.throw({message: __("No Outstanding Invoices found for this party")});
- } else if (!(this.frm.doc.payments.length)) {
- frappe.throw({message: __("No Unreconciled Payments found for this party")});
+ frappe.throw({
+ message: __("No Unreconciled Invoices and Payments found for this party and account"),
+ });
+ } else if (!this.frm.doc.invoices.length) {
+ frappe.throw({ message: __("No Outstanding Invoices found for this party") });
+ } else if (!this.frm.doc.payments.length) {
+ frappe.throw({ message: __("No Unreconciled Payments found for this party") });
}
this.frm.refresh();
- }
+ },
});
-
}
allocate() {
let payments = this.frm.fields_dict.payments.grid.get_selected_children();
- if (!(payments.length)) {
+ if (!payments.length) {
payments = this.frm.doc.payments;
}
let invoices = this.frm.fields_dict.invoices.grid.get_selected_children();
- if (!(invoices.length)) {
+ if (!invoices.length) {
invoices = this.frm.doc.invoices;
}
return this.frm.call({
doc: this.frm.doc,
- method: 'allocate_entries',
+ method: "allocate_entries",
args: {
payments: payments,
- invoices: invoices
+ invoices: invoices,
},
callback: () => {
this.frm.refresh();
- }
+ },
});
}
reconcile() {
- var show_dialog = this.frm.doc.allocation.filter(d => d.difference_amount);
+ var show_dialog = this.frm.doc.allocation.filter((d) => d.difference_amount);
if (show_dialog && show_dialog.length) {
-
this.data = [];
const dialog = new frappe.ui.Dialog({
title: __("Select Difference Account"),
- size: 'extra-large',
+ size: "extra-large",
fields: [
{
fieldname: "allocation",
@@ -262,77 +266,89 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
get_data: () => {
return this.data;
},
- fields: [{
- fieldtype:'Data',
- fieldname:"docname",
- in_list_view: 1,
- hidden: 1
- }, {
- fieldtype:'Data',
- fieldname:"reference_name",
- label: __("Voucher No"),
- in_list_view: 1,
- read_only: 1
- }, {
- fieldtype:'Date',
- fieldname:"gain_loss_posting_date",
- label: __("Posting Date"),
- in_list_view: 1,
- reqd: 1,
- }, {
-
- fieldtype:'Link',
- options: 'Account',
- in_list_view: 1,
- label: __("Difference Account"),
- fieldname: 'difference_account',
- reqd: 1,
- get_query: () => {
- return {
- filters: {
- company: this.frm.doc.company,
- is_group: 0
- }
- }
- }
- }, {
- fieldtype:'Currency',
- in_list_view: 1,
- label: __("Difference Amount"),
- fieldname: 'difference_amount',
- read_only: 1
- }]
+ fields: [
+ {
+ fieldtype: "Data",
+ fieldname: "docname",
+ in_list_view: 1,
+ hidden: 1,
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "reference_name",
+ label: __("Voucher No"),
+ in_list_view: 1,
+ read_only: 1,
+ },
+ {
+ fieldtype: "Date",
+ fieldname: "gain_loss_posting_date",
+ label: __("Posting Date"),
+ in_list_view: 1,
+ reqd: 1,
+ },
+ {
+ fieldtype: "Link",
+ options: "Account",
+ in_list_view: 1,
+ label: __("Difference Account"),
+ fieldname: "difference_account",
+ reqd: 1,
+ get_query: () => {
+ return {
+ filters: {
+ company: this.frm.doc.company,
+ is_group: 0,
+ },
+ };
+ },
+ },
+ {
+ fieldtype: "Currency",
+ in_list_view: 1,
+ label: __("Difference Amount"),
+ fieldname: "difference_amount",
+ read_only: 1,
+ },
+ ],
},
{
- fieldtype: 'HTML',
- options: " New Journal Entry will be posted for the difference amount "
- }
+ fieldtype: "HTML",
+ options: " New Journal Entry will be posted for the difference amount ",
+ },
],
primary_action: () => {
const args = dialog.get_values()["allocation"];
- args.forEach(d => {
- frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
- "difference_account", d.difference_account);
- frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
- "gain_loss_posting_date", d.gain_loss_posting_date);
-
+ args.forEach((d) => {
+ frappe.model.set_value(
+ "Payment Reconciliation Allocation",
+ d.docname,
+ "difference_account",
+ d.difference_account
+ );
+ frappe.model.set_value(
+ "Payment Reconciliation Allocation",
+ d.docname,
+ "gain_loss_posting_date",
+ d.gain_loss_posting_date
+ );
});
this.reconcile_payment_entries();
dialog.hide();
},
- primary_action_label: __('Reconcile Entries')
+ primary_action_label: __("Reconcile Entries"),
});
- this.frm.doc.allocation.forEach(d => {
+ this.frm.doc.allocation.forEach((d) => {
if (d.difference_amount) {
dialog.fields_dict.allocation.df.data.push({
- 'docname': d.name,
- 'reference_name': d.reference_name,
- 'difference_amount': d.difference_amount,
- 'difference_account': d.difference_account,
- 'gain_loss_posting_date': d.gain_loss_posting_date
+ docname: d.name,
+ reference_name: d.reference_name,
+ difference_amount: d.difference_amount,
+ difference_account: d.difference_account,
+ gain_loss_posting_date: d.gain_loss_posting_date,
});
}
});
@@ -348,41 +364,39 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
reconcile_payment_entries() {
return this.frm.call({
doc: this.frm.doc,
- method: 'reconcile',
+ method: "reconcile",
callback: () => {
this.frm.clear_table("allocation");
this.frm.refresh();
- }
+ },
});
}
};
-frappe.ui.form.on('Payment Reconciliation Allocation', {
- allocated_amount: function(frm, cdt, cdn) {
+frappe.ui.form.on("Payment Reconciliation Allocation", {
+ allocated_amount: function (frm, cdt, cdn) {
let row = locals[cdt][cdn];
// filter invoice
- let invoice = frm.doc.invoices.filter((x) => (x.invoice_number == row.invoice_number));
+ let invoice = frm.doc.invoices.filter((x) => x.invoice_number == row.invoice_number);
// filter payment
- let payment = frm.doc.payments.filter((x) => (x.reference_name == row.reference_name));
+ let payment = frm.doc.payments.filter((x) => x.reference_name == row.reference_name);
frm.call({
doc: frm.doc,
- method: 'calculate_difference_on_allocation_change',
+ method: "calculate_difference_on_allocation_change",
args: {
payment_entry: payment,
invoice: invoice,
- allocated_amount: row.allocated_amount
+ allocated_amount: row.allocated_amount,
},
callback: (r) => {
if (r.message) {
row.difference_amount = r.message;
frm.refresh();
}
- }
+ },
});
- }
+ },
});
-
-
-extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({ frm: cur_frm }));
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index c85cd42e4249..d07f8249fca0 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -1,87 +1,99 @@
-cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account")
-cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway")
-cur_frm.add_fetch("payment_gateway_account", "message", "message")
+cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account");
+cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway");
+cur_frm.add_fetch("payment_gateway_account", "message", "message");
frappe.ui.form.on("Payment Request", {
- setup: function(frm) {
- frm.set_query("party_type", function() {
+ setup: function (frm) {
+ frm.set_query("party_type", function () {
return {
query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
};
});
- }
-})
+ },
+});
-frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
+frappe.ui.form.on("Payment Request", "onload", function (frm, dt, dn) {
if (frm.doc.reference_doctype) {
frappe.call({
- method:"erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list",
- args: {"ref_doctype": frm.doc.reference_doctype},
- callback:function(r){
- set_field_options("print_format", r.message["print_format"])
- }
- })
+ method: "erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list",
+ args: { ref_doctype: frm.doc.reference_doctype },
+ callback: function (r) {
+ set_field_options("print_format", r.message["print_format"]);
+ },
+ });
}
-})
+});
-frappe.ui.form.on("Payment Request", "refresh", function(frm) {
- if(frm.doc.status == 'Failed'){
+frappe.ui.form.on("Payment Request", "refresh", function (frm) {
+ if (frm.doc.status == "Failed") {
frm.set_intro(__("Failure: {0}", [frm.doc.failed_reason]), "red");
}
- if(frm.doc.payment_request_type == 'Inward' && frm.doc.payment_channel !== "Phone" &&
- !in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal && frm.doc.docstatus==1){
- frm.add_custom_button(__('Resend Payment Email'), function(){
+ if (
+ frm.doc.payment_request_type == "Inward" &&
+ frm.doc.payment_channel !== "Phone" &&
+ !in_list(["Initiated", "Paid"], frm.doc.status) &&
+ !frm.doc.__islocal &&
+ frm.doc.docstatus == 1
+ ) {
+ frm.add_custom_button(__("Resend Payment Email"), function () {
frappe.call({
method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
- args: {"docname": frm.doc.name},
+ args: { docname: frm.doc.name },
freeze: true,
freeze_message: __("Sending"),
- callback: function(r){
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
frappe.msgprint(__("Message Sent"));
}
- }
+ },
});
});
}
- if((!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") && frm.doc.status == "Initiated") {
- frm.add_custom_button(__('Create Payment Entry'), function(){
+ if (
+ (!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") &&
+ frm.doc.status == "Initiated"
+ ) {
+ frm.add_custom_button(__("Create Payment Entry"), function () {
frappe.call({
method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_entry",
- args: {"docname": frm.doc.name},
+ args: { docname: frm.doc.name },
freeze: true,
- callback: function(r){
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
var doc = frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
+ },
});
}).addClass("btn-primary");
}
});
-frappe.ui.form.on("Payment Request", "is_a_subscription", function(frm) {
+frappe.ui.form.on("Payment Request", "is_a_subscription", function (frm) {
frm.toggle_reqd("payment_gateway_account", frm.doc.is_a_subscription);
frm.toggle_reqd("subscription_plans", frm.doc.is_a_subscription);
if (frm.doc.is_a_subscription && frm.doc.reference_doctype && frm.doc.reference_name) {
frappe.call({
method: "erpnext.accounts.doctype.payment_request.payment_request.get_subscription_details",
- args: {"reference_doctype": frm.doc.reference_doctype, "reference_name": frm.doc.reference_name},
+ args: { reference_doctype: frm.doc.reference_doctype, reference_name: frm.doc.reference_name },
freeze: true,
- callback: function(data){
- if(!data.exc) {
- $.each(data.message || [], function(i, v){
- var d = frappe.model.add_child(frm.doc, "Subscription Plan Detail", "subscription_plans");
+ callback: function (data) {
+ if (!data.exc) {
+ $.each(data.message || [], function (i, v) {
+ var d = frappe.model.add_child(
+ frm.doc,
+ "Subscription Plan Detail",
+ "subscription_plans"
+ );
d.qty = v.qty;
d.plan = v.plan;
});
frm.refresh_field("subscription_plans");
}
- }
+ },
});
}
});
diff --git a/erpnext/accounts/doctype/payment_request/payment_request_list.js b/erpnext/accounts/doctype/payment_request/payment_request_list.js
index 43f785692975..6e3dcefb9788 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request_list.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request_list.js
@@ -1,26 +1,21 @@
-frappe.listview_settings['Payment Request'] = {
+frappe.listview_settings["Payment Request"] = {
add_fields: ["status"],
- get_indicator: function(doc) {
- if(doc.status == "Draft") {
+ get_indicator: function (doc) {
+ if (doc.status == "Draft") {
return [__("Draft"), "gray", "status,=,Draft"];
}
- if(doc.status == "Requested") {
+ if (doc.status == "Requested") {
return [__("Requested"), "green", "status,=,Requested"];
- }
- else if(doc.status == "Initiated") {
+ } else if (doc.status == "Initiated") {
return [__("Initiated"), "green", "status,=,Initiated"];
- }
- else if(doc.status == "Partially Paid") {
+ } else if (doc.status == "Partially Paid") {
return [__("Partially Paid"), "orange", "status,=,Partially Paid"];
- }
- else if(doc.status == "Paid") {
+ } else if (doc.status == "Paid") {
return [__("Paid"), "blue", "status,=,Paid"];
- }
- else if(doc.status == "Failed") {
+ } else if (doc.status == "Failed") {
return [__("Failed"), "red", "status,=,Failed"];
- }
- else if(doc.status == "Cancelled") {
+ } else if (doc.status == "Cancelled") {
return [__("Cancelled"), "red", "status,=,Cancelled"];
}
- }
-}
+ },
+};
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.js b/erpnext/accounts/doctype/payment_term/payment_term.js
index 0898a09a1c6e..96cc50742c3b 100644
--- a/erpnext/accounts/doctype/payment_term/payment_term.js
+++ b/erpnext/accounts/doctype/payment_term/payment_term.js
@@ -1,22 +1,24 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Payment Term', {
+frappe.ui.form.on("Payment Term", {
onload(frm) {
- frm.trigger('set_dynamic_description');
+ frm.trigger("set_dynamic_description");
},
discount(frm) {
- frm.trigger('set_dynamic_description');
+ frm.trigger("set_dynamic_description");
},
discount_type(frm) {
- frm.trigger('set_dynamic_description');
+ frm.trigger("set_dynamic_description");
},
set_dynamic_description(frm) {
if (frm.doc.discount) {
- let description = __("{0}% of total invoice value will be given as discount.", [frm.doc.discount]);
- if (frm.doc.discount_type == 'Amount') {
+ let description = __("{0}% of total invoice value will be given as discount.", [
+ frm.doc.discount,
+ ]);
+ if (frm.doc.discount_type == "Amount") {
description = __("{0} will be given as discount.", [frm.doc.discount]);
}
frm.set_df_property("discount", "description", description);
}
- }
+ },
});
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 6046c13e1467..b766c3b412b4 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js
@@ -1,12 +1,18 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Payment Terms Template', {
- refresh: function(frm) {
- frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
+frappe.ui.form.on("Payment Terms Template", {
+ 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);
- }
+ 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/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index e923d4ed5e6d..82d8cb37fe7f 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -1,38 +1,41 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Period Closing Voucher', {
- onload: function(frm) {
+frappe.ui.form.on("Period Closing Voucher", {
+ onload: function (frm) {
if (!frm.doc.transaction_date) frm.doc.transaction_date = frappe.datetime.obj_to_str(new Date());
},
- setup: function(frm) {
- frm.set_query("closing_account_head", function() {
+ setup: function (frm) {
+ frm.set_query("closing_account_head", function () {
return {
filters: [
- ['Account', 'company', '=', frm.doc.company],
- ['Account', 'is_group', '=', '0'],
- ['Account', 'freeze_account', '=', 'No'],
- ['Account', 'root_type', 'in', 'Liability, Equity']
- ]
- }
+ ["Account", "company", "=", frm.doc.company],
+ ["Account", "is_group", "=", "0"],
+ ["Account", "freeze_account", "=", "No"],
+ ["Account", "root_type", "in", "Liability, Equity"],
+ ],
+ };
});
},
- refresh: function(frm) {
- if(frm.doc.docstatus > 0) {
- frm.add_custom_button(__('Ledger'), function() {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "from_date": frm.doc.posting_date,
- "to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
- "company": frm.doc.company,
- "group_by": "",
- "show_cancelled_entries": frm.doc.docstatus === 2
- };
- frappe.set_route("query-report", "General Ledger");
- }, "fa fa-table");
+ refresh: function (frm) {
+ if (frm.doc.docstatus > 0) {
+ frm.add_custom_button(
+ __("Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.posting_date,
+ to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
+ company: frm.doc.company,
+ group_by: "",
+ show_cancelled_entries: frm.doc.docstatus === 2,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ "fa fa-table"
+ );
}
- }
-
-})
+ },
+});
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 faceaf35d599..68a85f7ee963 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js
@@ -1,36 +1,37 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('POS Closing Entry', {
- onload: function(frm) {
- frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log'];
- frm.set_query("pos_profile", function(doc) {
+frappe.ui.form.on("POS Closing Entry", {
+ onload: function (frm) {
+ frm.ignore_doctypes_on_cancel_all = ["POS Invoice Merge Log"];
+ frm.set_query("pos_profile", function (doc) {
return {
- filters: { 'user': doc.user }
+ filters: { user: doc.user },
};
});
- frm.set_query("user", function(doc) {
+ frm.set_query("user", function (doc) {
return {
query: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_cashiers",
- filters: { 'parent': doc.pos_profile }
+ filters: { parent: doc.pos_profile },
};
});
- frm.set_query("pos_opening_entry", function(doc) {
- return { filters: { 'status': 'Open', 'docstatus': 1 } };
+ frm.set_query("pos_opening_entry", function (doc) {
+ return { filters: { status: "Open", docstatus: 1 } };
});
- if (frm.doc.docstatus === 0 && !frm.doc.amended_from) frm.set_value("period_end_date", frappe.datetime.now_datetime());
+ if (frm.doc.docstatus === 0 && !frm.doc.amended_from)
+ frm.set_value("period_end_date", frappe.datetime.now_datetime());
- frappe.realtime.on('closing_process_complete', async function(data) {
+ frappe.realtime.on("closing_process_complete", async function (data) {
await frm.reload_doc();
- if (frm.doc.status == 'Failed' && frm.doc.error_message) {
+ if (frm.doc.status == "Failed" && frm.doc.error_message) {
frappe.msgprint({
- title: __('POS Closing Failed'),
+ title: __("POS Closing Failed"),
message: frm.doc.error_message,
- indicator: 'orange',
- clear: true
+ indicator: "orange",
+ clear: true,
});
}
});
@@ -47,23 +48,23 @@ frappe.ui.form.on('POS Closing Entry', {
}
},
- refresh: function(frm) {
- if (frm.doc.docstatus == 1 && frm.doc.status == 'Failed') {
+ refresh: function (frm) {
+ if (frm.doc.docstatus == 1 && frm.doc.status == "Failed") {
const issue = 'issue ';
frm.dashboard.set_headline(
- __('POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.', [issue]));
+ __(
+ "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.",
+ [issue]
+ )
+ );
- $('#jump_to_error').on('click', (e) => {
+ $("#jump_to_error").on("click", (e) => {
e.preventDefault();
- frappe.utils.scroll_to(
- cur_frm.get_field("error_message").$wrapper,
- true,
- 30
- );
+ frappe.utils.scroll_to(cur_frm.get_field("error_message").$wrapper, true, 30);
});
- frm.add_custom_button(__('Retry'), function () {
- frm.call('retry', {}, () => {
+ frm.add_custom_button(__("Retry"), function () {
+ frm.call("retry", {}, () => {
frm.reload_doc();
});
});
@@ -71,48 +72,54 @@ frappe.ui.form.on('POS Closing Entry', {
},
pos_opening_entry(frm) {
- if (frm.doc.pos_opening_entry && frm.doc.period_start_date && frm.doc.period_end_date && frm.doc.user) {
+ if (
+ frm.doc.pos_opening_entry &&
+ frm.doc.period_start_date &&
+ frm.doc.period_end_date &&
+ frm.doc.user
+ ) {
reset_values(frm);
frappe.run_serially([
() => frm.trigger("set_opening_amounts"),
- () => frm.trigger("get_pos_invoices")
+ () => frm.trigger("get_pos_invoices"),
]);
}
},
set_opening_amounts(frm) {
- return frappe.db.get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
+ return frappe.db
+ .get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
.then(({ balance_details }) => {
- balance_details.forEach(detail => {
+ balance_details.forEach((detail) => {
frm.add_child("payment_reconciliation", {
mode_of_payment: detail.mode_of_payment,
opening_amount: detail.opening_amount,
- expected_amount: detail.opening_amount
+ expected_amount: detail.opening_amount,
});
- })
+ });
});
},
get_pos_invoices(frm) {
return frappe.call({
- method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+ 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
+ user: frm.doc.user,
},
callback: (r) => {
let pos_docs = r.message;
set_form_data(pos_docs, frm);
refresh_fields(frm);
set_html_data(frm);
- }
+ },
});
},
- before_save: async function(frm) {
- frappe.dom.freeze(__('Processing Sales! Please Wait...'));
+ before_save: async function (frm) {
+ frappe.dom.freeze(__("Processing Sales! Please Wait..."));
frm.set_value("grand_total", 0);
frm.set_value("net_total", 0);
@@ -125,12 +132,12 @@ frappe.ui.form.on('POS Closing Entry', {
await Promise.all([
frappe.call({
- method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+ 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
+ user: frm.doc.user,
},
callback: (r) => {
let pos_invoices = r.message;
@@ -143,22 +150,22 @@ frappe.ui.form.on('POS Closing Entry', {
refresh_fields(frm);
set_html_data(frm);
}
- }
- })
- ])
+ },
+ }),
+ ]);
frappe.dom.unfreeze();
- }
+ },
});
-frappe.ui.form.on('POS Closing Entry Detail', {
+frappe.ui.form.on("POS Closing Entry Detail", {
closing_amount: (frm, cdt, cdn) => {
const row = locals[cdt][cdn];
frappe.model.set_value(cdt, cdn, "difference", flt(row.closing_amount - row.expected_amount));
- }
-})
+ },
+});
function set_form_data(data, frm) {
- data.forEach(d => {
+ data.forEach((d) => {
add_to_pos_transaction(d, frm);
frm.doc.grand_total += flt(d.grand_total);
frm.doc.net_total += flt(d.net_total);
@@ -173,13 +180,15 @@ function add_to_pos_transaction(d, frm) {
pos_invoice: d.name,
posting_date: d.posting_date,
grand_total: d.grand_total,
- customer: d.customer
- })
+ customer: d.customer,
+ });
}
function refresh_payments(d, frm) {
- d.payments.forEach(p => {
- const payment = frm.doc.payment_reconciliation.find(pay => pay.mode_of_payment === p.mode_of_payment);
+ d.payments.forEach((p) => {
+ const payment = frm.doc.payment_reconciliation.find(
+ (pay) => pay.mode_of_payment === p.mode_of_payment
+ );
if (p.account == d.account_for_change_amount) {
p.amount -= flt(d.change_amount);
}
@@ -192,25 +201,25 @@ function refresh_payments(d, frm) {
mode_of_payment: p.mode_of_payment,
opening_amount: 0,
expected_amount: p.amount,
- closing_amount: 0
- })
+ closing_amount: 0,
+ });
}
- })
+ });
}
function refresh_taxes(d, frm) {
- d.taxes.forEach(t => {
- const tax = frm.doc.taxes.find(tx => tx.account_head === t.account_head && tx.rate === t.rate);
+ d.taxes.forEach((t) => {
+ const tax = frm.doc.taxes.find((tx) => tx.account_head === t.account_head && tx.rate === t.rate);
if (tax) {
tax.amount += flt(t.tax_amount);
} else {
frm.add_child("taxes", {
account_head: t.account_head,
rate: t.rate,
- amount: t.tax_amount
- })
+ amount: t.tax_amount,
+ });
}
- })
+ });
}
function reset_values(frm) {
@@ -232,13 +241,13 @@ function refresh_fields(frm) {
}
function set_html_data(frm) {
- if (frm.doc.docstatus === 1 && frm.doc.status == 'Submitted') {
+ if (frm.doc.docstatus === 1 && frm.doc.status == "Submitted") {
frappe.call({
method: "get_payment_reconciliation_details",
doc: frm.doc,
callback: (r) => {
frm.get_field("payment_reconciliation_details").$wrapper.html(r.message);
- }
+ },
});
}
}
diff --git a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry_list.js b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry_list.js
index cffeb4d5351e..29f00fbff7b4 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry_list.js
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry_list.js
@@ -2,16 +2,15 @@
// License: GNU General Public License v3. See license.txt
// render
-frappe.listview_settings['POS Closing Entry'] = {
- get_indicator: function(doc) {
+frappe.listview_settings["POS Closing Entry"] = {
+ get_indicator: function (doc) {
var status_color = {
- "Draft": "red",
- "Submitted": "blue",
- "Queued": "orange",
- "Failed": "red",
- "Cancelled": "red"
-
+ Draft: "red",
+ Submitted: "blue",
+ Queued: "orange",
+ Failed: "red",
+ Cancelled: "red",
};
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
- }
+ return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
+ },
};
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
index ae132eb6eb20..a6e8bfa62869 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
@@ -21,19 +21,23 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
onload(doc) {
super.onload();
- this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry', 'Serial and Batch Bundle'];
+ this.frm.ignore_doctypes_on_cancel_all = [
+ "POS Invoice Merge Log",
+ "POS Closing Entry",
+ "Serial and Batch Bundle",
+ ];
- if(doc.__islocal && doc.is_pos && frappe.get_route_str() !== 'point-of-sale') {
+ if (doc.__islocal && doc.is_pos && frappe.get_route_str() !== "point-of-sale") {
this.frm.script_manager.trigger("is_pos");
this.frm.refresh_fields();
}
- this.frm.set_query("set_warehouse", function(doc) {
+ this.frm.set_query("set_warehouse", function (doc) {
return {
filters: {
- company: doc.company ? doc.company : '',
- }
- }
+ company: doc.company ? doc.company : "",
+ },
+ };
});
erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
@@ -47,26 +51,29 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
super.refresh();
if (doc.docstatus == 1 && !doc.is_return) {
- this.frm.add_custom_button(__('Return'), this.make_sales_return, __('Create'));
- this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+ this.frm.add_custom_button(__("Return"), this.make_sales_return, __("Create"));
+ this.frm.page.set_inner_btn_group_as_primary(__("Create"));
}
if (doc.is_return && doc.__islocal) {
this.frm.return_print_format = "Sales Invoice Return";
- this.frm.set_value('consolidated_invoice', '');
+ this.frm.set_value("consolidated_invoice", "");
}
- this.frm.set_query("customer", (function () {
- const customer_groups = this.settings?.customer_groups;
+ this.frm.set_query(
+ "customer",
+ function () {
+ const customer_groups = this.settings?.customer_groups;
- if (!customer_groups?.length) return {};
+ if (!customer_groups?.length) return {};
- return {
- filters: {
- customer_group: ["in", customer_groups],
- }
- }
- }).bind(this));
+ return {
+ filters: {
+ customer_group: ["in", customer_groups],
+ },
+ };
+ }.bind(this)
+ );
}
is_pos() {
@@ -74,19 +81,19 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
}
async set_pos_data() {
- if(this.frm.doc.is_pos) {
+ if (this.frm.doc.is_pos) {
this.frm.set_value("allocate_advances_automatically", 0);
- if(!this.frm.doc.company) {
+ if (!this.frm.doc.company) {
this.frm.set_value("is_pos", 0);
frappe.msgprint(__("Please specify Company to proceed"));
} else {
const r = await this.frm.call({
doc: this.frm.doc,
method: "set_missing_values",
- freeze: true
+ freeze: true,
});
- if(!r.exc) {
- if(r.message) {
+ if (!r.exc) {
+ if (r.message) {
this.frm.pos_print_format = r.message.print_format || "";
this.frm.meta.default_print_format = r.message.print_format || "";
this.frm.doc.campaign = r.message.campaign;
@@ -103,32 +110,36 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
}
customer() {
- if (!this.frm.doc.customer) return
+ if (!this.frm.doc.customer) return;
const pos_profile = this.frm.doc.pos_profile;
- if(this.frm.updating_party_details) return;
- erpnext.utils.get_party_details(this.frm,
- "erpnext.accounts.party.get_party_details", {
+ if (this.frm.updating_party_details) return;
+ erpnext.utils.get_party_details(
+ this.frm,
+ "erpnext.accounts.party.get_party_details",
+ {
posting_date: this.frm.doc.posting_date,
party: this.frm.doc.customer,
party_type: "Customer",
account: this.frm.doc.debit_to,
price_list: this.frm.doc.selling_price_list,
pos_profile: pos_profile,
- company_address: this.frm.doc.company_address
- }, () => {
+ company_address: this.frm.doc.company_address,
+ },
+ () => {
this.apply_pricing_rule();
- });
+ }
+ );
}
pos_profile(frm) {
- if (!frm.pos_profile || frm.pos_profile == '') {
+ if (!frm.pos_profile || frm.pos_profile == "") {
this.update_customer_groups_settings([]);
return;
}
frappe.call({
method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_profile_data",
- args: { "pos_profile": frm.pos_profile },
+ args: { pos_profile: frm.pos_profile },
callback: ({ message: profile }) => {
this.update_customer_groups_settings(profile?.customer_groups);
this.frm.set_value("company", profile?.company);
@@ -137,17 +148,17 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
}
update_customer_groups_settings(customer_groups) {
- this.settings.customer_groups = customer_groups?.map((group) => group.name)
+ this.settings.customer_groups = customer_groups?.map((group) => group.name);
}
- amount(){
- this.write_off_outstanding_amount_automatically()
+ amount() {
+ this.write_off_outstanding_amount_automatically();
}
- change_amount(){
- if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
+ change_amount() {
+ if (this.frm.doc.paid_amount > this.frm.doc.grand_total) {
this.calculate_write_off_amount();
- }else {
+ } else {
this.frm.set_value("change_amount", 0.0);
this.frm.set_value("base_change_amount", 0.0);
}
@@ -155,7 +166,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
this.frm.refresh_fields();
}
- loyalty_amount(){
+ loyalty_amount() {
this.calculate_outstanding_amount();
this.frm.refresh_field("outstanding_amount");
this.frm.refresh_field("paid_amount");
@@ -166,8 +177,12 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]);
// this will make outstanding amount 0
- this.frm.set_value("write_off_amount",
- flt(this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance, precision("write_off_amount"))
+ this.frm.set_value(
+ "write_off_amount",
+ flt(
+ this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance,
+ precision("write_off_amount")
+ )
);
}
@@ -178,65 +193,69 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
make_sales_return() {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
-}
+};
-extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))
+extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }));
-frappe.ui.form.on('POS Invoice', {
- redeem_loyalty_points: function(frm) {
+frappe.ui.form.on("POS Invoice", {
+ redeem_loyalty_points: function (frm) {
frm.events.get_loyalty_details(frm);
},
- loyalty_points: function(frm) {
+ loyalty_points: function (frm) {
if (frm.redemption_conversion_factor) {
frm.events.set_loyalty_points(frm);
} else {
frappe.call({
method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_redeemption_factor",
args: {
- "loyalty_program": frm.doc.loyalty_program
+ loyalty_program: frm.doc.loyalty_program,
},
- callback: function(r) {
+ callback: function (r) {
if (r) {
frm.redemption_conversion_factor = r.message;
frm.events.set_loyalty_points(frm);
}
- }
+ },
});
}
},
- get_loyalty_details: function(frm) {
+ get_loyalty_details: function (frm) {
if (frm.doc.customer && frm.doc.redeem_loyalty_points) {
frappe.call({
method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details",
args: {
- "customer": frm.doc.customer,
- "loyalty_program": frm.doc.loyalty_program,
- "expiry_date": frm.doc.posting_date,
- "company": frm.doc.company
+ customer: frm.doc.customer,
+ loyalty_program: frm.doc.loyalty_program,
+ expiry_date: frm.doc.posting_date,
+ company: frm.doc.company,
},
- callback: function(r) {
+ callback: function (r) {
if (r) {
frm.set_value("loyalty_redemption_account", r.message.expense_account);
frm.set_value("loyalty_redemption_cost_center", r.message.cost_center);
frm.redemption_conversion_factor = r.message.conversion_factor;
}
- }
+ },
});
}
},
- set_loyalty_points: function(frm) {
+ set_loyalty_points: function (frm) {
if (frm.redemption_conversion_factor) {
- let loyalty_amount = flt(frm.redemption_conversion_factor*flt(frm.doc.loyalty_points), precision("loyalty_amount"));
- var remaining_amount = flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
- if (frm.doc.grand_total && (remaining_amount < loyalty_amount)) {
- let redeemable_points = parseInt(remaining_amount/frm.redemption_conversion_factor);
- frappe.throw(__("You can only redeem max {0} points in this order.",[redeemable_points]));
+ let loyalty_amount = flt(
+ frm.redemption_conversion_factor * flt(frm.doc.loyalty_points),
+ precision("loyalty_amount")
+ );
+ var remaining_amount =
+ flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
+ if (frm.doc.grand_total && remaining_amount < loyalty_amount) {
+ let redeemable_points = parseInt(remaining_amount / frm.redemption_conversion_factor);
+ frappe.throw(__("You can only redeem max {0} points in this order.", [redeemable_points]));
}
frm.set_value("loyalty_amount", loyalty_amount);
}
@@ -244,43 +263,49 @@ frappe.ui.form.on('POS Invoice', {
request_for_payment: function (frm) {
if (!frm.doc.contact_mobile) {
- frappe.throw(__('Please enter mobile number first.'));
+ frappe.throw(__("Please enter mobile number first."));
}
frm.dirty();
frm.save().then(() => {
- frappe.dom.freeze(__('Waiting for payment...'));
+ frappe.dom.freeze(__("Waiting for payment..."));
frappe
.call({
- method: 'create_payment_request',
- doc: frm.doc
+ method: "create_payment_request",
+ doc: frm.doc,
})
.fail(() => {
frappe.dom.unfreeze();
- frappe.msgprint(__('Payment request failed'));
+ frappe.msgprint(__("Payment request failed"));
})
.then(({ message }) => {
const payment_request_name = message.name;
setTimeout(() => {
- frappe.db.get_value('Payment Request', payment_request_name, ['status', 'grand_total']).then(({ message }) => {
- if (message.status != 'Paid') {
- frappe.dom.unfreeze();
- frappe.msgprint({
- message: __('Payment Request took too long to respond. Please try requesting for payment again.'),
- title: __('Request Timeout')
- });
- } else if (frappe.dom.freeze_count != 0) {
- frappe.dom.unfreeze();
- cur_frm.reload_doc();
- cur_pos.payment.events.submit_invoice();
-
- frappe.show_alert({
- message: __("Payment of {0} received successfully.", [format_currency(message.grand_total, frm.doc.currency, 0)]),
- indicator: 'green'
- });
- }
- });
+ frappe.db
+ .get_value("Payment Request", payment_request_name, ["status", "grand_total"])
+ .then(({ message }) => {
+ if (message.status != "Paid") {
+ frappe.dom.unfreeze();
+ frappe.msgprint({
+ message: __(
+ "Payment Request took too long to respond. Please try requesting for payment again."
+ ),
+ title: __("Request Timeout"),
+ });
+ } else if (frappe.dom.freeze_count != 0) {
+ frappe.dom.unfreeze();
+ cur_frm.reload_doc();
+ cur_pos.payment.events.submit_invoice();
+
+ frappe.show_alert({
+ message: __("Payment of {0} received successfully.", [
+ format_currency(message.grand_total, frm.doc.currency, 0),
+ ]),
+ indicator: "green",
+ });
+ }
+ });
}, 60000);
});
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice_list.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice_list.js
index 2dbf2a4fcd31..0379932bb7a8 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice_list.js
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice_list.js
@@ -2,40 +2,47 @@
// License: GNU General Public License v3. See license.txt
// render
-frappe.listview_settings['POS Invoice'] = {
- add_fields: ["customer", "customer_name", "base_grand_total", "outstanding_amount", "due_date", "company",
- "currency", "is_return"],
- get_indicator: function(doc) {
+frappe.listview_settings["POS Invoice"] = {
+ add_fields: [
+ "customer",
+ "customer_name",
+ "base_grand_total",
+ "outstanding_amount",
+ "due_date",
+ "company",
+ "currency",
+ "is_return",
+ ],
+ get_indicator: function (doc) {
var status_color = {
- "Draft": "red",
- "Unpaid": "orange",
- "Paid": "green",
- "Submitted": "blue",
- "Consolidated": "green",
- "Return": "darkgrey",
+ Draft: "red",
+ Unpaid: "orange",
+ Paid: "green",
+ Submitted: "blue",
+ Consolidated: "green",
+ Return: "darkgrey",
"Unpaid and Discounted": "orange",
"Overdue and Discounted": "red",
- "Overdue": "red"
-
+ Overdue: "red",
};
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
+ return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
},
right_column: "grand_total",
- onload: function(me) {
- me.page.add_action_item('Make Merge Log', function() {
+ onload: function (me) {
+ me.page.add_action_item("Make Merge Log", function () {
const invoices = me.get_checked_items();
frappe.call({
method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_merge_log",
freeze: true,
- args:{
- "invoices": invoices
+ args: {
+ invoices: invoices,
},
callback: function (r) {
if (r.message) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
});
},
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.js b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.js
index 73c6290d7b0e..8423987447ec 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.js
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.js
@@ -1,21 +1,21 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('POS Invoice Merge Log', {
- setup: function(frm) {
- frm.set_query("pos_invoice", "pos_invoices", doc => {
+frappe.ui.form.on("POS Invoice Merge Log", {
+ setup: function (frm) {
+ frm.set_query("pos_invoice", "pos_invoices", (doc) => {
return {
filters: {
- 'docstatus': 1,
- 'customer': doc.customer,
- 'consolidated_invoice': ''
- }
- }
+ docstatus: 1,
+ customer: doc.customer,
+ consolidated_invoice: "",
+ },
+ };
});
},
- merge_invoices_based_on: function(frm) {
- frm.set_value('customer', '');
- frm.set_value('customer_group', '');
- }
+ merge_invoices_based_on: function (frm) {
+ frm.set_value("customer", "");
+ frm.set_value("customer_group", "");
+ },
});
diff --git a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.js b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.js
index d23f348f04ee..6a316d55e6a6 100644
--- a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.js
+++ b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.js
@@ -1,56 +1,55 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('POS Opening Entry', {
+frappe.ui.form.on("POS Opening Entry", {
setup(frm) {
if (frm.doc.docstatus == 0) {
- frm.trigger('set_posting_date_read_only');
- frm.set_value('period_start_date', frappe.datetime.now_datetime());
- frm.set_value('user', frappe.session.user);
+ frm.trigger("set_posting_date_read_only");
+ frm.set_value("period_start_date", frappe.datetime.now_datetime());
+ frm.set_value("user", frappe.session.user);
}
- frm.set_query("user", function(doc) {
+ frm.set_query("user", function (doc) {
return {
query: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_cashiers",
- filters: { 'parent': doc.pos_profile }
+ filters: { parent: doc.pos_profile },
};
});
},
refresh(frm) {
// set default posting date / time
- if(frm.doc.docstatus == 0) {
- if(!frm.doc.posting_date) {
- frm.set_value('posting_date', frappe.datetime.nowdate());
+ if (frm.doc.docstatus == 0) {
+ if (!frm.doc.posting_date) {
+ frm.set_value("posting_date", frappe.datetime.nowdate());
}
- frm.trigger('set_posting_date_read_only');
+ frm.trigger("set_posting_date_read_only");
}
},
set_posting_date_read_only(frm) {
- if(frm.doc.docstatus == 0 && frm.doc.set_posting_date) {
- frm.set_df_property('posting_date', 'read_only', 0);
+ if (frm.doc.docstatus == 0 && frm.doc.set_posting_date) {
+ frm.set_df_property("posting_date", "read_only", 0);
} else {
- frm.set_df_property('posting_date', 'read_only', 1);
+ frm.set_df_property("posting_date", "read_only", 1);
}
},
set_posting_date(frm) {
- frm.trigger('set_posting_date_read_only');
+ frm.trigger("set_posting_date_read_only");
},
pos_profile: (frm) => {
if (frm.doc.pos_profile) {
- frappe.db.get_doc("POS Profile", frm.doc.pos_profile)
- .then(({ payments }) => {
- if (payments.length) {
- frm.doc.balance_details = [];
- payments.forEach(({ mode_of_payment }) => {
- frm.add_child("balance_details", { mode_of_payment });
- })
- frm.refresh_field("balance_details");
- }
- });
+ frappe.db.get_doc("POS Profile", frm.doc.pos_profile).then(({ payments }) => {
+ if (payments.length) {
+ frm.doc.balance_details = [];
+ payments.forEach(({ mode_of_payment }) => {
+ frm.add_child("balance_details", { mode_of_payment });
+ });
+ frm.refresh_field("balance_details");
+ }
+ });
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry_list.js b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry_list.js
index 1ad3c919b710..7ff9c4bbbc0c 100644
--- a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry_list.js
+++ b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry_list.js
@@ -2,15 +2,14 @@
// License: GNU General Public License v3. See license.txt
// render
-frappe.listview_settings['POS Opening Entry'] = {
- get_indicator: function(doc) {
+frappe.listview_settings["POS Opening Entry"] = {
+ get_indicator: function (doc) {
var status_color = {
- "Draft": "red",
- "Open": "orange",
- "Closed": "green",
- "Cancelled": "red"
-
+ Draft: "red",
+ Open: "orange",
+ Closed: "green",
+ Cancelled: "red",
};
- return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
- }
+ return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
+ },
};
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index ceaafaa3b12a..31f0f0725a6c 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -1,149 +1,143 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('POS Profile', {
- setup: function(frm) {
- frm.set_query("selling_price_list", function() {
+frappe.ui.form.on("POS Profile", {
+ setup: function (frm) {
+ frm.set_query("selling_price_list", function () {
return { filters: { selling: 1 } };
});
- frm.set_query("tc_name", function() {
+ frm.set_query("tc_name", function () {
return { filters: { selling: 1 } };
});
- erpnext.queries.setup_queries(frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(frm, "Warehouse", function () {
return erpnext.queries.warehouse(frm.doc);
});
- frm.set_query("print_format", function() {
+ frm.set_query("print_format", function () {
return {
- filters: [
- ['Print Format', 'doc_type', '=', 'POS Invoice']
- ]
+ filters: [["Print Format", "doc_type", "=", "POS Invoice"]],
};
});
- frm.set_query("account_for_change_amount", function(doc) {
+ frm.set_query("account_for_change_amount", function (doc) {
if (!doc.company) {
- frappe.throw(__('Please set Company'));
+ frappe.throw(__("Please set Company"));
}
return {
filters: {
- account_type: ['in', ["Cash", "Bank"]],
+ account_type: ["in", ["Cash", "Bank"]],
is_group: 0,
- company: doc.company
- }
+ company: doc.company,
+ },
};
});
- frm.set_query("taxes_and_charges", function() {
+ frm.set_query("taxes_and_charges", function () {
return {
filters: [
- ['Sales Taxes and Charges Template', 'company', '=', frm.doc.company],
- ['Sales Taxes and Charges Template', 'docstatus', '!=', 2]
- ]
+ ["Sales Taxes and Charges Template", "company", "=", frm.doc.company],
+ ["Sales Taxes and Charges Template", "docstatus", "!=", 2],
+ ],
};
});
- frm.set_query('company_address', function(doc) {
+ frm.set_query("company_address", function (doc) {
if (!doc.company) {
- frappe.throw(__('Please set Company'));
+ frappe.throw(__("Please set Company"));
}
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
- link_doctype: 'Company',
- link_name: doc.company
- }
+ link_doctype: "Company",
+ link_name: doc.company,
+ },
};
});
- frm.set_query('income_account', function(doc) {
+ frm.set_query("income_account", function (doc) {
if (!doc.company) {
- frappe.throw(__('Please set Company'));
+ frappe.throw(__("Please set Company"));
}
return {
filters: {
- 'is_group': 0,
- 'company': doc.company,
- 'account_type': "Income Account"
- }
+ is_group: 0,
+ company: doc.company,
+ account_type: "Income Account",
+ },
};
});
- frm.set_query('cost_center', function(doc) {
+ frm.set_query("cost_center", function (doc) {
if (!doc.company) {
- frappe.throw(__('Please set Company'));
+ frappe.throw(__("Please set Company"));
}
return {
filters: {
- 'company': doc.company,
- 'is_group': 0
- }
+ company: doc.company,
+ is_group: 0,
+ },
};
});
- frm.set_query('expense_account', function(doc) {
+ frm.set_query("expense_account", function (doc) {
if (!doc.company) {
- frappe.throw(__('Please set Company'));
+ frappe.throw(__("Please set Company"));
}
return {
filters: {
- "report_type": "Profit and Loss",
- "company": doc.company,
- "is_group": 0
- }
+ report_type: "Profit and Loss",
+ company: doc.company,
+ is_group: 0,
+ },
};
});
- frm.set_query("select_print_heading", function() {
+ frm.set_query("select_print_heading", function () {
return {
- filters: [
- ['Print Heading', 'docstatus', '!=', 2]
- ]
+ filters: [["Print Heading", "docstatus", "!=", 2]],
};
});
- frm.set_query("write_off_account", function(doc) {
+ frm.set_query("write_off_account", function (doc) {
return {
filters: {
- 'report_type': 'Profit and Loss',
- 'is_group': 0,
- 'company': doc.company
- }
+ report_type: "Profit and Loss",
+ is_group: 0,
+ company: doc.company,
+ },
};
});
- frm.set_query("write_off_cost_center", function(doc) {
+ frm.set_query("write_off_cost_center", function (doc) {
return {
filters: {
- 'is_group': 0,
- 'company': doc.company
- }
+ is_group: 0,
+ company: doc.company,
+ },
};
});
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.company) {
frm.trigger("toggle_display_account_head");
}
},
- company: function(frm) {
+ company: function (frm) {
frm.trigger("toggle_display_account_head");
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
-
},
- toggle_display_account_head: function(frm) {
- frm.toggle_display('expense_account',
- erpnext.is_perpetual_inventory_enabled(frm.doc.company));
- }
-});
\ No newline at end of file
+ toggle_display_account_head: function (frm) {
+ frm.toggle_display("expense_account", erpnext.is_perpetual_inventory_enabled(frm.doc.company));
+ },
+});
diff --git a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js
index f0884ebef5ee..63416745394a 100644
--- a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js
+++ b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js
@@ -1,6 +1,4 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('POS Profile User', {
-
-});
+frappe.ui.form.on("POS Profile User", {});
diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.js b/erpnext/accounts/doctype/pos_settings/pos_settings.js
index 7d8f3562c8c7..a2e5a57e5f72 100644
--- a/erpnext/accounts/doctype/pos_settings/pos_settings.js
+++ b/erpnext/accounts/doctype/pos_settings/pos_settings.js
@@ -1,57 +1,91 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-let search_fields_datatypes = ['Data', 'Link', 'Dynamic Link', 'Long Text', 'Select', 'Small Text', 'Text', 'Text Editor'];
-let do_not_include_fields = ["naming_series", "item_code", "item_name", "stock_uom", "asset_naming_series",
- "default_material_request_type", "valuation_method", "warranty_period", "weight_uom", "batch_number_series",
- "serial_no_series", "purchase_uom", "customs_tariff_number", "sales_uom", "deferred_revenue_account",
- "deferred_expense_account", "quality_inspection_template", "route", "slideshow", "website_image_alt", "thumbnail",
- "web_long_description"]
+let search_fields_datatypes = [
+ "Data",
+ "Link",
+ "Dynamic Link",
+ "Long Text",
+ "Select",
+ "Small Text",
+ "Text",
+ "Text Editor",
+];
+let do_not_include_fields = [
+ "naming_series",
+ "item_code",
+ "item_name",
+ "stock_uom",
+ "asset_naming_series",
+ "default_material_request_type",
+ "valuation_method",
+ "warranty_period",
+ "weight_uom",
+ "batch_number_series",
+ "serial_no_series",
+ "purchase_uom",
+ "customs_tariff_number",
+ "sales_uom",
+ "deferred_revenue_account",
+ "deferred_expense_account",
+ "quality_inspection_template",
+ "route",
+ "slideshow",
+ "website_image_alt",
+ "thumbnail",
+ "web_long_description",
+];
-frappe.ui.form.on('POS Settings', {
- onload: function(frm) {
+frappe.ui.form.on("POS Settings", {
+ onload: function (frm) {
frm.trigger("get_invoice_fields");
frm.trigger("add_search_options");
},
- get_invoice_fields: function(frm) {
+ get_invoice_fields: function (frm) {
frappe.model.with_doctype("POS Invoice", () => {
- var fields = $.map(frappe.get_doc("DocType", "POS Invoice").fields, function(d) {
- if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 || ['Button'].includes(d.fieldtype)) {
- return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname };
+ var fields = $.map(frappe.get_doc("DocType", "POS Invoice").fields, function (d) {
+ if (
+ frappe.model.no_value_type.indexOf(d.fieldtype) === -1 ||
+ ["Button"].includes(d.fieldtype)
+ ) {
+ return { label: d.label + " (" + d.fieldtype + ")", value: d.fieldname };
} else {
return null;
}
});
frm.fields_dict.invoice_fields.grid.update_docfield_property(
- 'fieldname', 'options', [""].concat(fields)
+ "fieldname",
+ "options",
+ [""].concat(fields)
);
});
-
},
- add_search_options: function(frm) {
+ add_search_options: function (frm) {
frappe.model.with_doctype("Item", () => {
- var fields = $.map(frappe.get_doc("DocType", "Item").fields, function(d) {
- if (search_fields_datatypes.includes(d.fieldtype) && !(do_not_include_fields.includes(d.fieldname))) {
+ var fields = $.map(frappe.get_doc("DocType", "Item").fields, function (d) {
+ if (
+ search_fields_datatypes.includes(d.fieldtype) &&
+ !do_not_include_fields.includes(d.fieldname)
+ ) {
return [d.label];
} else {
return null;
}
});
- fields.unshift('');
- frm.fields_dict.pos_search_fields.grid.update_docfield_property('field', 'options', fields);
+ fields.unshift("");
+ frm.fields_dict.pos_search_fields.grid.update_docfield_property("field", "options", fields);
});
-
- }
+ },
});
frappe.ui.form.on("POS Search Fields", {
- field: function(frm, doctype, name) {
+ field: function (frm, doctype, name) {
var doc = frappe.get_doc(doctype, name);
- var df = $.map(frappe.get_doc("DocType", "Item").fields, function(d) {
+ var df = $.map(frappe.get_doc("DocType", "Item").fields, function (d) {
if (doc.field == d.label && search_fields_datatypes.includes(d.fieldtype)) {
return d;
} else {
@@ -61,13 +95,13 @@ frappe.ui.form.on("POS Search Fields", {
doc.fieldname = df.fieldname;
frm.refresh_field("fields");
- }
+ },
});
frappe.ui.form.on("POS Field", {
- fieldname: function(frm, doctype, name) {
+ fieldname: function (frm, doctype, name) {
var doc = frappe.get_doc(doctype, name);
- var df = $.map(frappe.get_doc("DocType", "POS Invoice").fields, function(d) {
+ var df = $.map(frappe.get_doc("DocType", "POS Invoice").fields, function (d) {
return doc.fieldname == d.fieldname ? d : null;
})[0];
@@ -77,5 +111,5 @@ frappe.ui.form.on("POS Field", {
doc.fieldtype = df.fieldtype;
doc.default_value = df.default;
frm.refresh_field("fields");
- }
+ },
});
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 826758245a38..cd5b00e6ad00 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -1,44 +1,43 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Pricing Rule', {
- setup: function(frm) {
- frm.fields_dict["for_price_list"].get_query = function(doc){
+frappe.ui.form.on("Pricing Rule", {
+ setup: function (frm) {
+ frm.fields_dict["for_price_list"].get_query = function (doc) {
return {
filters: {
- 'selling': doc.selling,
- 'buying': doc.buying,
- 'currency': doc.currency
- }
+ selling: doc.selling,
+ buying: doc.buying,
+ currency: doc.currency,
+ },
};
};
- ['items', 'item_groups', 'brands'].forEach(d => {
- frm.fields_dict[d].grid.get_field('uom').get_query = function(doc, cdt, cdn){
+ ["items", "item_groups", "brands"].forEach((d) => {
+ frm.fields_dict[d].grid.get_field("uom").get_query = function (doc, cdt, cdn) {
var row = locals[cdt][cdn];
return {
- query:"erpnext.accounts.doctype.pricing_rule.pricing_rule.get_item_uoms",
- filters: {'value': row[frappe.scrub(doc.apply_on)], apply_on: doc.apply_on}
- }
+ query: "erpnext.accounts.doctype.pricing_rule.pricing_rule.get_item_uoms",
+ filters: { value: row[frappe.scrub(doc.apply_on)], apply_on: doc.apply_on },
+ };
};
- })
+ });
},
- onload: function(frm) {
- if(frm.doc.__islocal && !frm.doc.applicable_for && (frm.doc.customer || frm.doc.supplier)) {
- if(frm.doc.customer) {
+ onload: function (frm) {
+ if (frm.doc.__islocal && !frm.doc.applicable_for && (frm.doc.customer || frm.doc.supplier)) {
+ if (frm.doc.customer) {
frm.doc.applicable_for = "Customer";
- frm.doc.selling = 1
+ frm.doc.selling = 1;
} else {
frm.doc.applicable_for = "Supplier";
- frm.doc.buying = 1
+ frm.doc.buying = 1;
}
}
},
- refresh: function(frm) {
- var help_content =
- `
+ refresh: function (frm) {
+ var help_content = `
`;
- frm.set_df_property('pricing_rule_help', 'options', help_content);
+ frm.set_df_property("pricing_rule_help", "options", help_content);
frm.events.set_options_for_applicable_for(frm);
frm.trigger("toggle_reqd_apply_on");
},
- apply_on: function(frm) {
+ apply_on: function (frm) {
frm.trigger("toggle_reqd_apply_on");
},
- toggle_reqd_apply_on: function(frm) {
+ toggle_reqd_apply_on: function (frm) {
const fields = {
- 'Item Code': 'items',
- 'Item Group': 'item_groups',
- 'Brand': 'brands'
- }
+ "Item Code": "items",
+ "Item Group": "item_groups",
+ Brand: "brands",
+ };
for (var key in fields) {
- frm.toggle_reqd(fields[key],
- frm.doc.apply_on === key ? 1 : 0);
+ frm.toggle_reqd(fields[key], frm.doc.apply_on === key ? 1 : 0);
}
},
- rate_or_discount: function(frm) {
- if(frm.doc.rate_or_discount == 'Rate') {
- frm.set_value('for_price_list', "");
+ rate_or_discount: function (frm) {
+ if (frm.doc.rate_or_discount == "Rate") {
+ frm.set_value("for_price_list", "");
}
},
- selling: function(frm) {
+ selling: function (frm) {
frm.events.set_options_for_applicable_for(frm);
},
- buying: function(frm) {
+ buying: function (frm) {
frm.events.set_options_for_applicable_for(frm);
},
//Dynamically change the description based on type of margin
- margin_type: function(frm){
- frm.set_df_property('margin_rate_or_amount', 'description', frm.doc.margin_type=='Percentage'?'In Percentage %':'In Amount');
+ margin_type: function (frm) {
+ frm.set_df_property(
+ "margin_rate_or_amount",
+ "description",
+ frm.doc.margin_type == "Percentage" ? "In Percentage %" : "In Amount"
+ );
},
- set_options_for_applicable_for: function(frm) {
+ set_options_for_applicable_for: function (frm) {
var options = [""];
var applicable_for = frm.doc.applicable_for;
- if(frm.doc.selling) {
- options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
+ if (frm.doc.selling) {
+ options = $.merge(options, [
+ "Customer",
+ "Customer Group",
+ "Territory",
+ "Sales Partner",
+ "Campaign",
+ ]);
}
- if(frm.doc.buying) {
+ if (frm.doc.buying) {
$.merge(options, ["Supplier", "Supplier Group"]);
}
set_field_options("applicable_for", options.join("\n"));
- if(!in_list(options, applicable_for)) applicable_for = null;
+ if (!in_list(options, applicable_for)) applicable_for = null;
frm.set_value("applicable_for", applicable_for);
- }
+ },
});
diff --git a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js
index 1ec6805ae0c1..92a6c6259f0f 100644
--- a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js
+++ b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js
@@ -1,53 +1,58 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Process Deferred Accounting', {
- setup: function(frm) {
- frm.set_query("document_type", function() {
+frappe.ui.form.on("Process Deferred Accounting", {
+ setup: function (frm) {
+ frm.set_query("document_type", function () {
return {
filters: {
- 'name': ['in', ['Sales Invoice', 'Purchase Invoice']]
- }
+ name: ["in", ["Sales Invoice", "Purchase Invoice"]],
+ },
};
});
},
- type: function(frm) {
+ type: function (frm) {
if (frm.doc.company && frm.doc.type) {
- frm.set_query("account", function() {
+ frm.set_query("account", function () {
return {
filters: {
- 'company': frm.doc.company,
- 'root_type': frm.doc.type === 'Income' ? 'Liability' : 'Asset',
- 'is_group': 0
- }
+ company: frm.doc.company,
+ root_type: frm.doc.type === "Income" ? "Liability" : "Asset",
+ is_group: 0,
+ },
};
});
}
},
- validate: function() {
+ validate: function () {
return new Promise((resolve) => {
- return frappe.db.get_single_value('Accounts Settings', 'automatically_process_deferred_accounting_entry')
- .then(value => {
- if(value) {
- frappe.throw(__('Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again'));
+ return frappe.db
+ .get_single_value("Accounts Settings", "automatically_process_deferred_accounting_entry")
+ .then((value) => {
+ if (value) {
+ frappe.throw(
+ __(
+ "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
+ )
+ );
}
resolve(value);
});
});
},
- end_date: function(frm) {
+ end_date: function (frm) {
if (frm.doc.end_date && frm.doc.end_date < frm.doc.start_date) {
frappe.throw(__("End date cannot be before start date"));
}
},
- onload: function(frm) {
+ onload: function (frm) {
if (frm.doc.posting_date && frm.doc.docstatus === 0) {
- frm.set_value('start_date', frappe.datetime.add_months(frm.doc.posting_date, -1));
- frm.set_value('end_date', frm.doc.posting_date);
+ frm.set_value("start_date", frappe.datetime.add_months(frm.doc.posting_date, -1));
+ frm.set_value("end_date", frm.doc.posting_date);
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
index dd601bfc4511..0f52a4d998e4 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js
@@ -2,129 +2,128 @@
// For license information, please see license.txt
frappe.ui.form.on("Process Payment Reconciliation", {
- onload: function(frm) {
+ onload: function (frm) {
// set queries
- frm.set_query("party_type", function() {
+ frm.set_query("party_type", function () {
return {
- "filters": {
- "name": ["in", Object.keys(frappe.boot.party_account_types)],
- }
- }
+ filters: {
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
+ },
+ };
});
- frm.set_query('receivable_payable_account', function(doc) {
+ frm.set_query("receivable_payable_account", function (doc) {
return {
filters: {
- "company": doc.company,
- "is_group": 0,
- "account_type": frappe.boot.party_account_types[doc.party_type]
- }
+ company: doc.company,
+ is_group: 0,
+ account_type: frappe.boot.party_account_types[doc.party_type],
+ },
};
});
- frm.set_query('cost_center', function(doc) {
+ frm.set_query("cost_center", function (doc) {
return {
filters: {
- "company": doc.company,
- "is_group": 0,
- }
+ company: doc.company,
+ is_group: 0,
+ },
};
});
- frm.set_query('bank_cash_account', function(doc) {
+ frm.set_query("bank_cash_account", function (doc) {
return {
- filters:[
- ['Account', 'company', '=', doc.company],
- ['Account', 'is_group', '=', 0],
- ['Account', 'account_type', 'in', ['Bank', 'Cash']]
- ]
+ filters: [
+ ["Account", "company", "=", doc.company],
+ ["Account", "is_group", "=", 0],
+ ["Account", "account_type", "in", ["Bank", "Cash"]],
+ ],
};
});
-
},
- refresh: function(frm) {
- if (frm.doc.docstatus==1 && ['Queued', 'Paused'].find(x => x == frm.doc.status)) {
- let execute_btn = __("Start / Resume")
+ refresh: function (frm) {
+ if (frm.doc.docstatus == 1 && ["Queued", "Paused"].find((x) => x == frm.doc.status)) {
+ let execute_btn = __("Start / Resume");
frm.add_custom_button(execute_btn, () => {
frm.call({
- method: 'erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc',
+ method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc",
args: {
- docname: frm.doc.name
- }
- }).then(r => {
- if(!r.exc) {
+ docname: frm.doc.name,
+ },
+ }).then((r) => {
+ if (!r.exc) {
frappe.show_alert(__("Job Started"));
frm.reload_doc();
}
});
});
}
- if (frm.doc.docstatus==1 && ['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+ if (
+ frm.doc.docstatus == 1 &&
+ ["Completed", "Running", "Paused", "Partially Reconciled"].find((x) => x == frm.doc.status)
+ ) {
frm.call({
- 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
+ method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
args: {
- "docname": frm.docname,
- }
- }).then(r => {
+ docname: frm.docname,
+ },
+ }).then((r) => {
if (r.message) {
let progress = 0;
let description = "";
if (r.message.processed) {
- progress = (r.message.processed/r.message.total) * 100;
- description = r.message.processed + "/" + r.message.total + " processed";
+ progress = (r.message.processed / r.message.total) * 100;
+ description = r.message.processed + "/" + r.message.total + " processed";
} else if (r.message.total == 0 && frm.doc.status == "Completed") {
progress = 100;
}
-
- frm.dashboard.add_progress('Reconciliation Progress', progress, description);
+ frm.dashboard.add_progress("Reconciliation Progress", progress, description);
}
- })
+ });
}
- if (frm.doc.docstatus==1 && frm.doc.status == 'Running') {
- let execute_btn = __("Pause")
+ if (frm.doc.docstatus == 1 && frm.doc.status == "Running") {
+ let execute_btn = __("Pause");
frm.add_custom_button(execute_btn, () => {
frm.call({
- 'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
+ method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
args: {
- "docname": frm.docname,
- }
- }).then(r => {
+ docname: frm.docname,
+ },
+ }).then((r) => {
if (!r.exc) {
frappe.show_alert(__("Job Paused"));
- frm.reload_doc()
+ frm.reload_doc();
}
});
-
});
}
},
company(frm) {
- frm.set_value('party', '');
- frm.set_value('receivable_payable_account', '');
+ frm.set_value("party", "");
+ frm.set_value("receivable_payable_account", "");
},
party_type(frm) {
- frm.set_value('party', '');
+ frm.set_value("party", "");
},
party(frm) {
- frm.set_value('receivable_payable_account', '');
+ frm.set_value("receivable_payable_account", "");
if (!frm.doc.receivable_payable_account && frm.doc.party_type && frm.doc.party) {
return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
company: frm.doc.company,
party_type: frm.doc.party_type,
- party: frm.doc.party
+ party: frm.doc.party,
},
callback: (r) => {
if (!r.exc && r.message) {
frm.set_value("receivable_payable_account", r.message);
}
frm.refresh();
-
- }
+ },
});
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
index 8012d6e03743..ed182adde1b4 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js
@@ -1,15 +1,15 @@
-frappe.listview_settings['Process Payment Reconciliation'] = {
+frappe.listview_settings["Process Payment Reconciliation"] = {
add_fields: ["status"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
let colors = {
- 'Queued': 'orange',
- 'Paused': 'orange',
- 'Completed': 'green',
- 'Partially Reconciled': 'orange',
- 'Running': 'blue',
- 'Failed': 'red',
+ Queued: "orange",
+ Paused: "orange",
+ Completed: "green",
+ "Partially Reconciled": "orange",
+ Running: "blue",
+ Failed: "red",
};
let status = doc.status;
- return [__(status), colors[status], 'status,=,'+status];
+ return [__(status), colors[status], "status,=," + status];
},
};
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
index 2468f10bccfd..f483d0039e3c 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js
@@ -3,15 +3,14 @@
frappe.ui.form.on("Process Payment Reconciliation Log", {
refresh(frm) {
- if (['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+ if (["Completed", "Running", "Paused", "Partially Reconciled"].find((x) => x == frm.doc.status)) {
let progress = 0;
if (frm.doc.reconciled_entries != 0) {
- progress = frm.doc.reconciled_entries / frm.doc.total_allocations * 100;
- } else if(frm.doc.total_allocations == 0 && frm.doc.status == "Completed"){
+ progress = (frm.doc.reconciled_entries / frm.doc.total_allocations) * 100;
+ } else if (frm.doc.total_allocations == 0 && frm.doc.status == "Completed") {
progress = 100;
}
- frm.dashboard.add_progress(__('Reconciliation Progress'), progress);
+ frm.dashboard.add_progress(__("Reconciliation Progress"), progress);
}
-
},
});
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
index 5a652048a235..19c73b249dcf 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js
@@ -1,15 +1,15 @@
-frappe.listview_settings['Process Payment Reconciliation Log'] = {
+frappe.listview_settings["Process Payment Reconciliation Log"] = {
add_fields: ["status"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var colors = {
- 'Partially Reconciled': 'orange',
- 'Paused': 'orange',
- 'Reconciled': 'green',
- 'Failed': 'red',
- 'Cancelled': 'red',
- 'Running': 'blue',
+ "Partially Reconciled": "orange",
+ Paused: "orange",
+ Reconciled: "green",
+ Failed: "red",
+ Cancelled: "red",
+ Running: "blue",
};
let status = doc.status;
- return [__(status), colors[status], "status,=,"+status];
+ return [__(status), colors[status], "status,=," + status];
},
};
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
index cec48c1d56da..25274f1be81a 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js
@@ -1,155 +1,150 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Process Statement Of Accounts', {
- view_properties: function(frm) {
- frappe.route_options = {doc_type: 'Customer'};
+frappe.ui.form.on("Process Statement Of Accounts", {
+ view_properties: function (frm) {
+ frappe.route_options = { doc_type: "Customer" };
frappe.set_route("Form", "Customize Form");
},
- refresh: function(frm){
- if(!frm.doc.__islocal) {
- frm.add_custom_button(__('Send Emails'), function(){
- if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
+ refresh: function (frm) {
+ if (!frm.doc.__islocal) {
+ frm.add_custom_button(__("Send Emails"), function () {
+ if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."));
frappe.call({
method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_emails",
args: {
- "document_name": frm.doc.name,
+ document_name: frm.doc.name,
},
- callback: function(r) {
- if(r && r.message) {
- frappe.show_alert({message: __('Emails Queued'), indicator: 'blue'});
+ callback: function (r) {
+ if (r && r.message) {
+ frappe.show_alert({ message: __("Emails Queued"), indicator: "blue" });
+ } else {
+ frappe.msgprint(__("No Records for these settings."));
}
- else{
- frappe.msgprint(__('No Records for these settings.'))
- }
- }
+ },
});
});
- frm.add_custom_button(__('Download'), function(){
- if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
+ frm.add_custom_button(__("Download"), function () {
+ if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."));
let url = frappe.urllib.get_full_url(
- '/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?'
- + 'document_name='+encodeURIComponent(frm.doc.name))
+ "/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?" +
+ "document_name=" +
+ encodeURIComponent(frm.doc.name)
+ );
$.ajax({
url: url,
- type: 'GET',
- success: function(result) {
- if(jQuery.isEmptyObject(result)){
- frappe.msgprint(__('No Records for these settings.'));
- }
- else{
+ type: "GET",
+ success: function (result) {
+ if (jQuery.isEmptyObject(result)) {
+ frappe.msgprint(__("No Records for these settings."));
+ } else {
window.location = url;
}
- }
+ },
});
});
}
},
- onload: function(frm) {
- frm.set_query('currency', function(){
+ onload: function (frm) {
+ frm.set_query("currency", function () {
return {
filters: {
- 'enabled': 1
- }
- }
+ enabled: 1,
+ },
+ };
});
- frm.set_query("account", function() {
+ frm.set_query("account", function () {
return {
filters: {
- 'company': frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
});
- if(frm.doc.__islocal){
- frm.set_value('from_date', frappe.datetime.add_months(frappe.datetime.get_today(), -1));
- frm.set_value('to_date', frappe.datetime.get_today());
+ if (frm.doc.__islocal) {
+ frm.set_value("from_date", frappe.datetime.add_months(frappe.datetime.get_today(), -1));
+ frm.set_value("to_date", frappe.datetime.get_today());
}
},
- report: function(frm){
+ report: function (frm) {
let filters = {
- 'company': frm.doc.company,
- }
- if(frm.doc.report == 'Accounts Receivable'){
- filters['account_type'] = 'Receivable';
+ company: frm.doc.company,
+ };
+ if (frm.doc.report == "Accounts Receivable") {
+ filters["account_type"] = "Receivable";
}
- frm.set_query("account", function() {
+ frm.set_query("account", function () {
return {
- filters: filters
+ filters: filters,
};
});
-
},
- customer_collection: function(frm){
- frm.set_value('collection_name', '');
- if(frm.doc.customer_collection){
- frm.get_field('collection_name').set_label(frm.doc.customer_collection);
+ customer_collection: function (frm) {
+ frm.set_value("collection_name", "");
+ if (frm.doc.customer_collection) {
+ frm.get_field("collection_name").set_label(frm.doc.customer_collection);
}
},
- frequency: function(frm){
- if(frm.doc.frequency != ''){
- frm.set_value('start_date', frappe.datetime.get_today());
- }
- else{
- frm.set_value('start_date', '');
+ frequency: function (frm) {
+ if (frm.doc.frequency != "") {
+ frm.set_value("start_date", frappe.datetime.get_today());
+ } else {
+ frm.set_value("start_date", "");
}
},
- fetch_customers: function(frm){
- if(frm.doc.collection_name){
+ fetch_customers: function (frm) {
+ if (frm.doc.collection_name) {
frappe.call({
method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.fetch_customers",
args: {
- 'customer_collection': frm.doc.customer_collection,
- 'collection_name': frm.doc.collection_name,
- 'primary_mandatory': frm.doc.primary_mandatory
+ customer_collection: frm.doc.customer_collection,
+ collection_name: frm.doc.collection_name,
+ primary_mandatory: frm.doc.primary_mandatory,
},
- callback: function(r) {
- if(!r.exc) {
- if(r.message.length){
- frm.clear_table('customers');
- for (const customer of r.message){
- var row = frm.add_child('customers');
+ callback: function (r) {
+ if (!r.exc) {
+ if (r.message.length) {
+ frm.clear_table("customers");
+ for (const customer of r.message) {
+ var row = frm.add_child("customers");
row.customer = customer.name;
row.primary_email = customer.primary_email;
row.billing_email = customer.billing_email;
}
- frm.refresh_field('customers');
- }
- else{
- frappe.throw(__('No Customers found with selected options.'));
+ frm.refresh_field("customers");
+ } else {
+ frappe.throw(__("No Customers found with selected options."));
}
}
- }
+ },
});
+ } else {
+ frappe.throw("Enter " + frm.doc.customer_collection + " name.");
}
- else {
- frappe.throw('Enter ' + frm.doc.customer_collection + ' name.');
- }
- }
+ },
});
-frappe.ui.form.on('Process Statement Of Accounts Customer', {
- customer: function(frm, cdt, cdn){
+frappe.ui.form.on("Process Statement Of Accounts Customer", {
+ customer: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
- if (!row.customer){
+ if (!row.customer) {
return;
}
frappe.call({
- method: 'erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.get_customer_emails',
+ method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.get_customer_emails",
args: {
- 'customer_name': row.customer,
- 'primary_mandatory': frm.doc.primary_mandatory
+ customer_name: row.customer,
+ primary_mandatory: frm.doc.primary_mandatory,
},
- callback: function(r){
- if(!r.exe){
- if(r.message.length){
- frappe.model.set_value(cdt, cdn, "primary_email", r.message[0])
- frappe.model.set_value(cdt, cdn, "billing_email", r.message[1])
- }
- else {
- return
+ callback: function (r) {
+ if (!r.exe) {
+ if (r.message.length) {
+ frappe.model.set_value(cdt, cdn, "primary_email", r.message[0]);
+ frappe.model.set_value(cdt, cdn, "billing_email", r.message[1]);
+ } else {
+ return;
}
}
- }
- })
- }
+ },
+ });
+ },
});
diff --git a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.js b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.js
index e840c79cd759..7a26c07d01f1 100644
--- a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.js
+++ b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.js
@@ -1,51 +1,56 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Promotional Scheme', {
- refresh: function(frm) {
+frappe.ui.form.on("Promotional Scheme", {
+ refresh: function (frm) {
frm.trigger("set_options_for_applicable_for");
frm.trigger("toggle_reqd_apply_on");
},
- selling: function(frm) {
+ selling: function (frm) {
frm.trigger("set_options_for_applicable_for");
},
- buying: function(frm) {
+ buying: function (frm) {
frm.trigger("set_options_for_applicable_for");
},
- set_options_for_applicable_for: function(frm) {
+ set_options_for_applicable_for: function (frm) {
var options = [""];
var applicable_for = frm.doc.applicable_for;
- if(frm.doc.selling) {
- options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
+ if (frm.doc.selling) {
+ options = $.merge(options, [
+ "Customer",
+ "Customer Group",
+ "Territory",
+ "Sales Partner",
+ "Campaign",
+ ]);
}
- if(frm.doc.buying) {
+ if (frm.doc.buying) {
$.merge(options, ["Supplier", "Supplier Group"]);
}
set_field_options("applicable_for", options.join("\n"));
- if(!in_list(options, applicable_for)) applicable_for = null;
+ if (!in_list(options, applicable_for)) applicable_for = null;
frm.set_value("applicable_for", applicable_for);
},
- apply_on: function(frm) {
+ apply_on: function (frm) {
frm.trigger("toggle_reqd_apply_on");
},
- toggle_reqd_apply_on: function(frm) {
+ toggle_reqd_apply_on: function (frm) {
const fields = {
- 'Item Code': 'items',
- 'Item Group': 'item_groups',
- 'Brand': 'brands'
+ "Item Code": "items",
+ "Item Group": "item_groups",
+ Brand: "brands",
};
for (var key in fields) {
- frm.toggle_reqd(fields[key],
- frm.doc.apply_on === key ? 1 : 0);
+ frm.toggle_reqd(fields[key], frm.doc.apply_on === key ? 1 : 0);
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 8f0df3ec93b9..d6455b2002a5 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -14,19 +14,19 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
super.setup(doc);
// formatter for purchase invoice item
- if(this.frm.doc.update_stock) {
- this.frm.set_indicator_formatter('item_code', function(doc) {
- return (doc.qty<=doc.received_qty) ? "green" : "orange";
+ if (this.frm.doc.update_stock) {
+ this.frm.set_indicator_formatter("item_code", function (doc) {
+ return doc.qty <= doc.received_qty ? "green" : "orange";
});
}
- this.frm.set_query("unrealized_profit_loss_account", function() {
+ this.frm.set_query("unrealized_profit_loss_account", function () {
return {
filters: {
company: doc.company,
is_group: 0,
root_type: "Liability",
- }
+ },
};
});
}
@@ -35,11 +35,21 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
super.onload();
// Ignore linked advances
- this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry', 'Purchase Invoice', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Serial and Batch Bundle", "Bank Transaction"];
+ this.frm.ignore_doctypes_on_cancel_all = [
+ "Journal Entry",
+ "Payment Entry",
+ "Purchase Invoice",
+ "Repost Payment Ledger",
+ "Repost Accounting Ledger",
+ "Unreconcile Payment",
+ "Unreconcile Payment Entries",
+ "Serial and Batch Bundle",
+ "Bank Transaction",
+ ];
- if(!this.frm.doc.__islocal) {
+ if (!this.frm.doc.__islocal) {
// show credit_to in print format
- if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
+ if (!this.frm.doc.supplier && this.frm.doc.credit_to) {
this.frm.set_df_property("credit_to", "print_hide", 0);
}
}
@@ -47,7 +57,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
// Trigger supplier event on load if supplier is available
// The reason for this is PI can be created from PR or PO and supplier is pre populated
if (this.frm.doc.supplier && this.frm.doc.__islocal) {
- this.frm.trigger('supplier');
+ this.frm.trigger("supplier");
}
}
@@ -60,116 +70,137 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
this.show_general_ledger();
erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
- if(doc.update_stock==1) {
+ if (doc.update_stock == 1) {
this.show_stock_ledger();
erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
}
- if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
- this.frm.set_intro(__("Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."));
- this.frm.add_custom_button(__('Repost Accounting Entries'),
- () => {
+ if (this.frm.doc.repost_required && this.frm.doc.docstatus === 1) {
+ this.frm.set_intro(
+ __(
+ "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
+ )
+ );
+ this.frm
+ .add_custom_button(__("Repost Accounting Entries"), () => {
this.frm.call({
doc: this.frm.doc,
- method: 'repost_accounting_entries',
+ method: "repost_accounting_entries",
freeze: true,
- freeze_message: __('Reposting...'),
+ freeze_message: __("Reposting..."),
callback: (r) => {
if (!r.exc) {
- frappe.msgprint(__('Accounting Entries are reposted.'));
+ frappe.msgprint(__("Accounting Entries are reposted."));
me.frm.refresh();
}
- }
+ },
});
- }).removeClass('btn-default').addClass('btn-warning');
+ })
+ .removeClass("btn-default")
+ .addClass("btn-warning");
}
- if(!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0){
- if(doc.on_hold) {
+ if (!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0) {
+ if (doc.on_hold) {
this.frm.add_custom_button(
- __('Change Release Date'),
- function() {me.change_release_date()},
- __('Hold Invoice')
+ __("Change Release Date"),
+ function () {
+ me.change_release_date();
+ },
+ __("Hold Invoice")
);
this.frm.add_custom_button(
- __('Unblock Invoice'),
- function() {me.unblock_invoice()},
- __('Create')
+ __("Unblock Invoice"),
+ function () {
+ me.unblock_invoice();
+ },
+ __("Create")
);
} else if (!doc.on_hold) {
this.frm.add_custom_button(
- __('Block Invoice'),
- function() {me.block_invoice()},
- __('Create')
+ __("Block Invoice"),
+ function () {
+ me.block_invoice();
+ },
+ __("Create")
);
}
}
- if(doc.docstatus == 1 && doc.outstanding_amount != 0 && !doc.on_hold) {
- this.frm.add_custom_button(
- __('Payment'),
- () => this.make_payment_entry(),
- __('Create')
- );
- cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
+ if (doc.docstatus == 1 && doc.outstanding_amount != 0 && !doc.on_hold) {
+ this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if(!doc.is_return && doc.docstatus==1) {
- if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
- cur_frm.add_custom_button(__('Return / Debit Note'),
- this.make_debit_note, __('Create'));
+ if (!doc.is_return && doc.docstatus == 1) {
+ if (doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ cur_frm.add_custom_button(__("Return / Debit Note"), this.make_debit_note, __("Create"));
}
}
if (doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) {
- cur_frm.add_custom_button(__('Payment Request'), function() {
- me.make_payment_request()
- }, __('Create'));
+ cur_frm.add_custom_button(
+ __("Payment Request"),
+ function () {
+ me.make_payment_request();
+ },
+ __("Create")
+ );
}
- if(doc.docstatus===0) {
- this.frm.add_custom_button(__('Purchase Order'), function() {
- erpnext.utils.map_current_doc({
- method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
- source_doctype: "Purchase Order",
- target: me.frm,
- setters: {
- supplier: me.frm.doc.supplier || undefined,
- schedule_date: undefined
- },
- get_query_filters: {
- docstatus: 1,
- status: ["not in", ["Closed", "On Hold"]],
- per_billed: ["<", 99.99],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
-
- this.frm.add_custom_button(__('Purchase Receipt'), function() {
- erpnext.utils.map_current_doc({
- method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
- source_doctype: "Purchase Receipt",
- target: me.frm,
- setters: {
- supplier: me.frm.doc.supplier || undefined,
- posting_date: undefined
- },
- get_query_filters: {
- docstatus: 1,
- status: ["not in", ["Closed", "Completed", "Return Issued"]],
- company: me.frm.doc.company,
- is_return: 0
- }
- })
- }, __("Get Items From"));
+ if (doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("Purchase Order"),
+ function () {
+ erpnext.utils.map_current_doc({
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
+ source_doctype: "Purchase Order",
+ target: me.frm,
+ setters: {
+ supplier: me.frm.doc.supplier || undefined,
+ schedule_date: undefined,
+ },
+ get_query_filters: {
+ docstatus: 1,
+ status: ["not in", ["Closed", "On Hold"]],
+ per_billed: ["<", 99.99],
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
+
+ this.frm.add_custom_button(
+ __("Purchase Receipt"),
+ function () {
+ erpnext.utils.map_current_doc({
+ method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
+ source_doctype: "Purchase Receipt",
+ target: me.frm,
+ setters: {
+ supplier: me.frm.doc.supplier || undefined,
+ posting_date: undefined,
+ },
+ get_query_filters: {
+ docstatus: 1,
+ status: ["not in", ["Closed", "Completed", "Return Issued"]],
+ company: me.frm.doc.company,
+ is_return: 0,
+ },
+ });
+ },
+ __("Get Items From")
+ );
if (!this.frm.doc.is_return) {
frappe.db.get_single_value("Buying Settings", "maintain_same_rate").then((value) => {
if (value) {
this.frm.doc.items.forEach((item) => {
this.frm.fields_dict.items.grid.update_docfield_property(
- "rate", "read_only", (item.purchase_receipt && item.pr_detail)
+ "rate",
+ "read_only",
+ item.purchase_receipt && item.pr_detail
);
});
}
@@ -179,14 +210,18 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted);
if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) {
- frappe.model.with_doc("Supplier", me.frm.doc.supplier, function() {
+ frappe.model.with_doc("Supplier", me.frm.doc.supplier, function () {
var supplier = frappe.model.get_doc("Supplier", me.frm.doc.supplier);
var internal = supplier.is_internal_supplier;
var disabled = supplier.disabled;
if (internal == 1 && disabled == 0) {
- me.frm.add_custom_button("Inter Company Invoice", function() {
- me.make_inter_company_invoice(me.frm);
- }, __('Create'));
+ me.frm.add_custom_button(
+ "Inter Company Invoice",
+ function () {
+ me.make_inter_company_invoice(me.frm);
+ },
+ __("Create")
+ );
}
});
}
@@ -198,9 +233,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
unblock_invoice() {
const me = this;
frappe.call({
- 'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice',
- 'args': {'name': me.frm.doc.name},
- 'callback': (r) => me.frm.reload_doc()
+ method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice",
+ args: { name: me.frm.doc.name },
+ callback: (r) => me.frm.reload_doc(),
});
}
@@ -215,50 +250,50 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
can_change_release_date(date) {
const diff = frappe.datetime.get_diff(date, frappe.datetime.nowdate());
if (diff < 0) {
- frappe.throw(__('New release date should be in the future'));
+ frappe.throw(__("New release date should be in the future"));
return false;
} else {
return true;
}
}
- make_comment_dialog_and_block_invoice(){
+ make_comment_dialog_and_block_invoice() {
const me = this;
- const title = __('Block Invoice');
+ const title = __("Block Invoice");
const fields = [
{
- fieldname: 'release_date',
+ fieldname: "release_date",
read_only: 0,
- fieldtype:'Date',
- label: __('Release Date'),
+ fieldtype: "Date",
+ label: __("Release Date"),
default: me.frm.doc.release_date,
- reqd: 1
+ reqd: 1,
},
{
- fieldname: 'hold_comment',
+ fieldname: "hold_comment",
read_only: 0,
- fieldtype:'Small Text',
- label: __('Reason For Putting On Hold'),
- default: ""
+ fieldtype: "Small Text",
+ label: __("Reason For Putting On Hold"),
+ default: "",
},
];
this.dialog = new frappe.ui.Dialog({
title: title,
- fields: fields
+ fields: fields,
});
- this.dialog.set_primary_action(__('Save'), function() {
+ this.dialog.set_primary_action(__("Save"), function () {
const dialog_data = me.dialog.get_values();
frappe.call({
- 'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice',
- 'args': {
- 'name': me.frm.doc.name,
- 'hold_comment': dialog_data.hold_comment,
- 'release_date': dialog_data.release_date
+ method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice",
+ args: {
+ name: me.frm.doc.name,
+ hold_comment: dialog_data.hold_comment,
+ release_date: dialog_data.release_date,
},
- 'callback': (r) => me.frm.reload_doc()
+ callback: (r) => me.frm.reload_doc(),
});
me.dialog.hide();
});
@@ -269,25 +304,25 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
make_dialog_and_set_release_date() {
const me = this;
- const title = __('Set New Release Date');
+ const title = __("Set New Release Date");
const fields = [
{
- fieldname: 'release_date',
+ fieldname: "release_date",
read_only: 0,
- fieldtype:'Date',
- label: __('Release Date'),
- default: me.frm.doc.release_date
+ fieldtype: "Date",
+ label: __("Release Date"),
+ default: me.frm.doc.release_date,
},
];
this.dialog = new frappe.ui.Dialog({
title: title,
- fields: fields
+ fields: fields,
});
- this.dialog.set_primary_action(__('Save'), function() {
+ this.dialog.set_primary_action(__("Save"), function () {
me.dialog_data = me.dialog.get_values();
- if(me.can_change_release_date(me.dialog_data.release_date)) {
+ if (me.can_change_release_date(me.dialog_data.release_date)) {
me.dialog_data.name = me.frm.doc.name;
me.set_release_date(me.dialog_data);
me.dialog.hide();
@@ -299,9 +334,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
set_release_date(data) {
return frappe.call({
- 'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date',
- 'args': data,
- 'callback': (r) => this.frm.reload_doc()
+ method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date",
+ args: data,
+ callback: (r) => this.frm.reload_doc(),
});
}
@@ -309,12 +344,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
var me = this;
// Do not update if inter company reference is there as the details will already be updated
- if(this.frm.updating_party_details || this.frm.doc.inter_company_invoice_reference)
- return;
+ if (this.frm.updating_party_details || this.frm.doc.inter_company_invoice_reference) return;
if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return;
- erpnext.utils.get_party_details(this.frm, "erpnext.accounts.party.get_party_details",
+ erpnext.utils.get_party_details(
+ this.frm,
+ "erpnext.accounts.party.get_party_details",
{
posting_date: this.frm.doc.posting_date,
bill_date: this.frm.doc.bill_date,
@@ -322,21 +358,23 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
party_type: "Supplier",
account: this.frm.doc.credit_to,
price_list: this.frm.doc.buying_price_list,
- fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template)
- }, function() {
+ fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template),
+ },
+ function () {
me.apply_pricing_rule();
me.frm.doc.apply_tds = me.frm.supplier_tds ? 1 : 0;
me.frm.doc.tax_withholding_category = me.frm.supplier_tds;
me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1);
me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1);
- })
+ }
+ );
}
apply_tds(frm) {
var me = this;
me.frm.set_value("tax_withheld_vouchers", []);
if (!me.frm.doc.apply_tds) {
- me.frm.set_value("tax_withholding_category", '');
+ me.frm.set_value("tax_withholding_category", "");
me.frm.set_df_property("tax_withholding_category", "hidden", 1);
} else {
me.frm.set_value("tax_withholding_category", me.frm.supplier_tds);
@@ -346,7 +384,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
credit_to() {
var me = this;
- if(this.frm.doc.credit_to) {
+ if (this.frm.doc.credit_to) {
me.frm.call({
method: "frappe.client.get_value",
args: {
@@ -354,12 +392,12 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
fieldname: "account_currency",
filters: { name: me.frm.doc.credit_to },
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
me.frm.set_value("party_account_currency", r.message.account_currency);
me.set_dynamic_labels();
}
- }
+ },
});
}
}
@@ -367,16 +405,16 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
make_inter_company_invoice(frm) {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_inter_company_sales_invoice",
- frm: frm
+ frm: frm,
});
}
is_paid() {
hide_fields(this.frm.doc);
- if(cint(this.frm.doc.is_paid)) {
+ if (cint(this.frm.doc.is_paid)) {
this.frm.set_value("allocate_advances_automatically", 0);
- if(!this.frm.doc.company) {
- this.frm.set_value("is_paid", 0)
+ if (!this.frm.doc.company) {
+ this.frm.set_value("is_paid", 0);
frappe.msgprint(__("Please specify Company to proceed"));
}
}
@@ -403,23 +441,27 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
items_add(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- this.frm.script_manager.copy_from_first_row("items", row,
- ["expense_account", "discount_account", "cost_center", "project"]);
+ this.frm.script_manager.copy_from_first_row("items", row, [
+ "expense_account",
+ "discount_account",
+ "cost_center",
+ "project",
+ ]);
}
on_submit() {
super.on_submit();
- $.each(this.frm.doc["items"] || [], function(i, row) {
- if(row.purchase_receipt) frappe.model.clear_doc("Purchase Receipt", row.purchase_receipt)
- })
+ $.each(this.frm.doc["items"] || [], function (i, row) {
+ if (row.purchase_receipt) frappe.model.clear_doc("Purchase Receipt", row.purchase_receipt);
+ });
}
make_debit_note() {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
};
@@ -428,172 +470,170 @@ cur_frm.script_manager.make(erpnext.accounts.PurchaseInvoice);
// Hide Fields
// ------------
function hide_fields(doc) {
- var parent_fields = ['due_date', 'is_opening', 'advances_section', 'from_date', 'to_date'];
+ var parent_fields = ["due_date", "is_opening", "advances_section", "from_date", "to_date"];
- if(cint(doc.is_paid) == 1) {
+ if (cint(doc.is_paid) == 1) {
hide_field(parent_fields);
} else {
for (var i in parent_fields) {
var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
- if(!docfield.hidden) unhide_field(parent_fields[i]);
+ if (!docfield.hidden) unhide_field(parent_fields[i]);
}
-
}
- var item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
+ var item_fields_stock = ["warehouse_section", "received_qty", "rejected_qty"];
- cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
- (cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
+ cur_frm.fields_dict["items"].grid.set_column_disp(
+ item_fields_stock,
+ cint(doc.update_stock) == 1 || cint(doc.is_return) == 1 ? true : false
+ );
cur_frm.refresh_fields();
}
-cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {
+cur_frm.fields_dict.cash_bank_account.get_query = function (doc) {
return {
filters: [
["Account", "account_type", "in", ["Cash", "Bank"]],
- ["Account", "is_group", "=",0],
+ ["Account", "is_group", "=", 0],
["Account", "company", "=", doc.company],
- ["Account", "report_type", "=", "Balance Sheet"]
- ]
- }
-}
+ ["Account", "report_type", "=", "Balance Sheet"],
+ ],
+ };
+};
-cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["items"].grid.get_field("item_code").get_query = function (doc, cdt, cdn) {
return {
query: "erpnext.controllers.queries.item_query",
- filters: {'is_purchase_item': 1}
- }
-}
+ filters: { is_purchase_item: 1 },
+ };
+};
-cur_frm.fields_dict['credit_to'].get_query = function(doc) {
+cur_frm.fields_dict["credit_to"].get_query = function (doc) {
// filter on Account
return {
filters: {
- 'account_type': 'Payable',
- 'is_group': 0,
- 'company': doc.company
- }
- }
-}
+ account_type: "Payable",
+ is_group: 0,
+ company: doc.company,
+ },
+ };
+};
// Get Print Heading
-cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["select_print_heading"].get_query = function (doc, cdt, cdn) {
return {
- filters:[
- ['Print Heading', 'docstatus', '!=', 2]
- ]
- }
-}
+ filters: [["Print Heading", "docstatus", "!=", 2]],
+ };
+};
-cur_frm.set_query("expense_account", "items", function(doc) {
+cur_frm.set_query("expense_account", "items", function (doc) {
return {
query: "erpnext.controllers.queries.get_expense_account",
- filters: {'company': doc.company }
- }
+ filters: { company: doc.company },
+ };
});
-cur_frm.set_query("wip_composite_asset", "items", function() {
+cur_frm.set_query("wip_composite_asset", "items", function () {
return {
- filters: {'is_composite_asset': 1, 'docstatus': 0 }
- }
+ filters: { is_composite_asset: 1, docstatus: 0 },
+ };
});
-cur_frm.cscript.expense_account = function(doc, cdt, cdn){
+cur_frm.cscript.expense_account = function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
- if(d.idx == 1 && d.expense_account){
+ if (d.idx == 1 && d.expense_account) {
var cl = doc.items || [];
- for(var i = 0; i < cl.length; i++){
- if(!cl[i].expense_account) cl[i].expense_account = d.expense_account;
+ for (var i = 0; i < cl.length; i++) {
+ if (!cl[i].expense_account) cl[i].expense_account = d.expense_account;
}
}
- refresh_field('items');
-}
+ refresh_field("items");
+};
-cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function(doc) {
+cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function (doc) {
return {
filters: {
- 'company': doc.company,
- 'is_group': 0
- }
-
- }
-}
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+};
-cur_frm.cscript.cost_center = function(doc, cdt, cdn){
+cur_frm.cscript.cost_center = function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
- if(d.cost_center){
+ if (d.cost_center) {
var cl = doc.items || [];
- for(var i = 0; i < cl.length; i++){
- if(!cl[i].cost_center) cl[i].cost_center = d.cost_center;
+ for (var i = 0; i < cl.length; i++) {
+ if (!cl[i].cost_center) cl[i].cost_center = d.cost_center;
}
}
- refresh_field('items');
-}
+ refresh_field("items");
+};
-cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
- return{
- filters:[
- ['Project', 'status', 'not in', 'Completed, Cancelled']
- ]
- }
-}
+cur_frm.fields_dict["items"].grid.get_field("project").get_query = function (doc, cdt, cdn) {
+ return {
+ filters: [["Project", "status", "not in", "Completed, Cancelled"]],
+ };
+};
frappe.ui.form.on("Purchase Invoice", {
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Purchase Invoice': 'Return / Debit Note',
- 'Payment Entry': 'Payment',
- 'Landed Cost Voucher': function () { frm.trigger('create_landed_cost_voucher') },
- }
+ "Purchase Invoice": "Return / Debit Note",
+ "Payment Entry": "Payment",
+ "Landed Cost Voucher": function () {
+ frm.trigger("create_landed_cost_voucher");
+ },
+ };
- frm.set_query("additional_discount_account", function() {
+ frm.set_query("additional_discount_account", function () {
return {
filters: {
company: frm.doc.company,
is_group: 0,
report_type: "Profit and Loss",
- }
+ },
};
});
- frm.fields_dict['items'].grid.get_field('deferred_expense_account').get_query = function(doc) {
+ frm.fields_dict["items"].grid.get_field("deferred_expense_account").get_query = function (doc) {
return {
filters: {
- 'root_type': 'Asset',
- 'company': doc.company,
- "is_group": 0
- }
- }
- }
+ root_type: "Asset",
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+ };
- frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
+ frm.fields_dict["items"].grid.get_field("discount_account").get_query = function (doc) {
return {
filters: {
- 'report_type': 'Profit and Loss',
- 'company': doc.company,
- "is_group": 0
- }
- }
- }
+ report_type: "Profit and Loss",
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+ };
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.events.add_custom_buttons(frm);
},
- mode_of_payment: function(frm) {
- erpnext.accounts.pos.get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account) {
+ mode_of_payment: function (frm) {
+ erpnext.accounts.pos.get_payment_mode_account(frm, frm.doc.mode_of_payment, function (account) {
frm.set_value("cash_bank_account", account);
- })
+ });
},
create_landed_cost_voucher: function (frm) {
- let lcv = frappe.model.get_new_doc('Landed Cost Voucher');
+ let lcv = frappe.model.get_new_doc("Landed Cost Voucher");
lcv.company = frm.doc.company;
- let lcv_receipt = frappe.model.get_new_doc('Landed Cost Purchase Invoice');
- lcv_receipt.receipt_document_type = 'Purchase Invoice';
+ let lcv_receipt = frappe.model.get_new_doc("Landed Cost Purchase Invoice");
+ lcv_receipt.receipt_document_type = "Purchase Invoice";
lcv_receipt.receipt_document = frm.doc.name;
lcv_receipt.supplier = frm.doc.supplier;
lcv_receipt.grand_total = frm.doc.grand_total;
@@ -602,35 +642,43 @@ frappe.ui.form.on("Purchase Invoice", {
frappe.set_route("Form", lcv.doctype, lcv.name);
},
- add_custom_buttons: function(frm) {
+ add_custom_buttons: function (frm) {
if (frm.doc.docstatus == 1 && frm.doc.per_received < 100) {
- frm.add_custom_button(__('Purchase Receipt'), () => {
- frm.events.make_purchase_receipt(frm);
- }, __('Create'));
+ frm.add_custom_button(
+ __("Purchase Receipt"),
+ () => {
+ frm.events.make_purchase_receipt(frm);
+ },
+ __("Create")
+ );
}
if (frm.doc.docstatus == 1 && frm.doc.per_received > 0) {
- frm.add_custom_button(__('Purchase Receipt'), () => {
- frappe.route_options = {
- 'purchase_invoice': frm.doc.name
- }
+ frm.add_custom_button(
+ __("Purchase Receipt"),
+ () => {
+ frappe.route_options = {
+ purchase_invoice: frm.doc.name,
+ };
- frappe.set_route("List", "Purchase Receipt", "List")
- }, __('View'));
+ frappe.set_route("List", "Purchase Receipt", "List");
+ },
+ __("View")
+ );
}
},
- onload: function(frm) {
- if(frm.doc.__onload && frm.is_new()) {
- if(frm.doc.supplier) {
+ onload: function (frm) {
+ if (frm.doc.__onload && frm.is_new()) {
+ if (frm.doc.supplier) {
frm.doc.apply_tds = frm.doc.__onload.supplier_tds ? 1 : 0;
}
- if(!frm.doc.__onload.supplier_tds) {
+ if (!frm.doc.__onload.supplier_tds) {
frm.set_df_property("apply_tds", "read_only", 1);
}
}
- erpnext.queries.setup_queries(frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(frm, "Warehouse", function () {
return erpnext.queries.warehouse(frm.doc);
});
@@ -639,7 +687,7 @@ frappe.ui.form.on("Purchase Invoice", {
}
},
- is_subcontracted: function(frm) {
+ is_subcontracted: function (frm) {
if (frm.doc.is_old_subcontracting_flow) {
erpnext.buying.get_default_bom(frm);
}
@@ -647,30 +695,29 @@ frappe.ui.form.on("Purchase Invoice", {
frm.toggle_reqd("supplier_warehouse", frm.doc.is_subcontracted);
},
- update_stock: function(frm) {
+ update_stock: function (frm) {
hide_fields(frm.doc);
- frm.fields_dict.items.grid.toggle_reqd("item_code", frm.doc.update_stock? true: false);
+ frm.fields_dict.items.grid.toggle_reqd("item_code", frm.doc.update_stock ? true : false);
},
- make_purchase_receipt: function(frm) {
+ make_purchase_receipt: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_purchase_receipt",
frm: frm,
- freeze_message: __("Creating Purchase Receipt ...")
- })
+ freeze_message: __("Creating Purchase Receipt ..."),
+ });
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
if (frm.doc.company) {
frappe.call({
- method:
- "erpnext.accounts.party.get_party_account",
+ method: "erpnext.accounts.party.get_party_account",
args: {
- party_type: 'Supplier',
+ party_type: "Supplier",
party: frm.doc.supplier,
- company: frm.doc.company
+ company: frm.doc.company,
},
callback: (response) => {
if (response) frm.set_value("credit_to", response.message);
@@ -678,4 +725,4 @@ frappe.ui.form.on("Purchase Invoice", {
});
}
},
-})
+});
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
index fa30c3707256..031b2341bb6a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -22,48 +22,35 @@ frappe.listview_settings["Purchase Invoice"] = {
return [__(doc.status), "gray", "status,=," + doc.status];
}
- if (
- flt(doc.outstanding_amount) > 0 &&
- doc.docstatus == 1 &&
- cint(doc.on_hold)
- ) {
+ if (flt(doc.outstanding_amount) > 0 && doc.docstatus == 1 && cint(doc.on_hold)) {
if (!doc.release_date) {
return [__("On Hold"), "darkgrey"];
- } else if (
- frappe.datetime.get_diff(
- doc.release_date,
- frappe.datetime.nowdate()
- ) > 0
- ) {
+ } else if (frappe.datetime.get_diff(doc.release_date, frappe.datetime.nowdate()) > 0) {
return [__("Temporarily on Hold"), "darkgrey"];
}
}
const status_colors = {
- "Unpaid": "orange",
- "Paid": "green",
- "Return": "gray",
- "Overdue": "red",
+ Unpaid: "orange",
+ Paid: "green",
+ Return: "gray",
+ Overdue: "red",
"Partly Paid": "yellow",
"Internal Transfer": "darkgrey",
};
if (status_colors[doc.status]) {
- return [
- __(doc.status),
- status_colors[doc.status],
- "status,=," + doc.status,
- ];
+ return [__(doc.status), status_colors[doc.status], "status,=," + doc.status];
}
},
- onload: function(listview) {
- listview.page.add_action_item(__("Purchase Receipt"), ()=>{
+ onload: function (listview) {
+ listview.page.add_action_item(__("Purchase Receipt"), () => {
erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Purchase Receipt");
});
- listview.page.add_action_item(__("Payment"), ()=>{
+ listview.page.add_action_item(__("Payment"), () => {
erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Payment Entry");
});
- }
+ },
};
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
index 78dc4bee1a6c..66a9cbe84406 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
@@ -8,24 +8,23 @@ frappe.ui.form.on("Purchase Taxes and Charges", {
add_deduct_tax(doc, cdt, cdn) {
let d = locals[cdt][cdn];
- if(!d.category && d.add_deduct_tax) {
+ if (!d.category && d.add_deduct_tax) {
frappe.msgprint(__("Please select Category first"));
- d.add_deduct_tax = '';
- }
- else if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
+ d.add_deduct_tax = "";
+ } else if (d.category != "Total" && d.add_deduct_tax == "Deduct") {
frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
- d.add_deduct_tax = '';
+ d.add_deduct_tax = "";
}
- refresh_field('add_deduct_tax', d.name, 'taxes');
+ refresh_field("add_deduct_tax", d.name, "taxes");
},
category(doc, cdt, cdn) {
let d = locals[cdt][cdn];
- if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
+ if (d.category != "Total" && d.add_deduct_tax == "Deduct") {
frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
- d.add_deduct_tax = '';
+ d.add_deduct_tax = "";
}
- refresh_field('add_deduct_tax', d.name, 'taxes');
- }
+ refresh_field("add_deduct_tax", d.name, "taxes");
+ },
});
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js
index c7b7a148cfb3..c304c7f17eb8 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js
+++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js
@@ -2,47 +2,47 @@
// For license information, please see license.txt
frappe.ui.form.on("Repost Accounting Ledger", {
- setup: function(frm) {
- frm.fields_dict['vouchers'].grid.get_field('voucher_type').get_query = function(doc) {
+ setup: function (frm) {
+ frm.fields_dict["vouchers"].grid.get_field("voucher_type").get_query = function (doc) {
return {
- query: "erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger.get_repost_allowed_types"
- }
- }
+ query: "erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger.get_repost_allowed_types",
+ };
+ };
- frm.fields_dict['vouchers'].grid.get_field('voucher_no').get_query = function(doc) {
+ frm.fields_dict["vouchers"].grid.get_field("voucher_no").get_query = function (doc) {
if (doc.company) {
return {
filters: {
company: doc.company,
- docstatus: 1
- }
- }
+ docstatus: 1,
+ },
+ };
}
- }
+ };
},
- refresh: function(frm) {
- frm.add_custom_button(__('Show Preview'), () => {
+ refresh: function (frm) {
+ frm.add_custom_button(__("Show Preview"), () => {
frm.call({
- method: 'generate_preview',
+ method: "generate_preview",
doc: frm.doc,
freeze: true,
- freeze_message: __('Generating Preview'),
- callback: function(r) {
+ freeze_message: __("Generating Preview"),
+ callback: function (r) {
if (r && r.message) {
let content = r.message;
let opts = {
title: "Preview",
subtitle: "preview",
content: content,
- print_settings: {orientation: "landscape"},
+ print_settings: { orientation: "landscape" },
columns: [],
data: [],
- }
+ };
frappe.render_grid(opts);
}
- }
+ },
});
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.js b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.js
index 6801408c7b3c..b9621c06eb83 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.js
+++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.js
@@ -1,53 +1,53 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Repost Payment Ledger', {
- setup: function(frm) {
+frappe.ui.form.on("Repost Payment Ledger", {
+ setup: function (frm) {
frm.set_query("voucher_type", () => {
return {
filters: {
- name: ['in', ['Purchase Invoice', 'Sales Invoice', 'Payment Entry', 'Journal Entry']]
- }
+ name: ["in", ["Purchase Invoice", "Sales Invoice", "Payment Entry", "Journal Entry"]],
+ },
};
});
- frm.fields_dict['repost_vouchers'].grid.get_field('voucher_type').get_query = function(doc) {
+ frm.fields_dict["repost_vouchers"].grid.get_field("voucher_type").get_query = function (doc) {
return {
filters: {
- name: ['in', ['Purchase Invoice', 'Sales Invoice', 'Payment Entry', 'Journal Entry']]
- }
- }
- }
+ name: ["in", ["Purchase Invoice", "Sales Invoice", "Payment Entry", "Journal Entry"]],
+ },
+ };
+ };
- frm.fields_dict['repost_vouchers'].grid.get_field('voucher_no').get_query = function(doc) {
+ frm.fields_dict["repost_vouchers"].grid.get_field("voucher_no").get_query = function (doc) {
if (doc.company) {
return {
filters: {
company: doc.company,
- docstatus: 1
- }
- }
+ docstatus: 1,
+ },
+ };
}
- }
-
+ };
},
- refresh: function(frm) {
-
- if (frm.doc.docstatus==1 && ['Queued', 'Failed'].find(x => x == frm.doc.repost_status)) {
- frm.set_intro(__("Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."));
- var btn_label = __("Repost in background")
+ refresh: function (frm) {
+ if (frm.doc.docstatus == 1 && ["Queued", "Failed"].find((x) => x == frm.doc.repost_status)) {
+ frm.set_intro(
+ __(
+ "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
+ )
+ );
+ var btn_label = __("Repost in background");
frm.add_custom_button(btn_label, () => {
frappe.call({
- method: 'erpnext.accounts.doctype.repost_payment_ledger.repost_payment_ledger.execute_repost_payment_ledger',
+ method: "erpnext.accounts.doctype.repost_payment_ledger.repost_payment_ledger.execute_repost_payment_ledger",
args: {
docname: frm.doc.name,
- }
+ },
});
- frappe.msgprint(__('Reposting in the background.'));
+ frappe.msgprint(__("Reposting in the background."));
});
}
-
- }
+ },
});
-
diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger_list.js b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger_list.js
index e0451845cede..76d17fc68604 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger_list.js
+++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger_list.js
@@ -1,12 +1,12 @@
frappe.listview_settings["Repost Payment Ledger"] = {
add_fields: ["repost_status"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var colors = {
- 'Queued': 'orange',
- 'Completed': 'green',
- 'Failed': 'red',
+ Queued: "orange",
+ Completed: "green",
+ Failed: "red",
};
let status = doc.repost_status;
- return [__(status), colors[status], 'status,=,'+status];
+ return [__(status), colors[status], "status,=," + status];
},
};
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/italy.js b/erpnext/accounts/doctype/sales_invoice/regional/italy.js
index 2f305b914eb9..a403b444838d 100644
--- a/erpnext/accounts/doctype/sales_invoice/regional/italy.js
+++ b/erpnext/accounts/doctype/sales_invoice/regional/italy.js
@@ -1,23 +1,23 @@
frappe.ui.form.on("Sales Invoice", {
- refresh: (frm) => {
- if(frm.doc.docstatus == 1) {
- frm.add_custom_button(__('Generate E-Invoice'), () => {
- frm.call({
- method: "erpnext.regional.italy.utils.generate_single_invoice",
- args: {
- docname: frm.doc.name
- },
- callback: function(r) {
- frm.reload_doc();
- if(r.message) {
- open_url_post(frappe.request.url, {
- cmd: 'frappe.core.doctype.file.file.download_file',
- file_url: r.message
- });
- }
- }
- });
- });
- }
- }
-});
\ No newline at end of file
+ refresh: (frm) => {
+ if (frm.doc.docstatus == 1) {
+ frm.add_custom_button(__("Generate E-Invoice"), () => {
+ frm.call({
+ method: "erpnext.regional.italy.utils.generate_single_invoice",
+ args: {
+ docname: frm.doc.name,
+ },
+ callback: function (r) {
+ frm.reload_doc();
+ if (r.message) {
+ open_url_post(frappe.request.url, {
+ cmd: "frappe.core.doctype.file.file.download_file",
+ file_url: r.message,
+ });
+ }
+ },
+ });
+ });
+ }
+ },
+});
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index ef1f6bd8d821..17101cd27200 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -8,7 +8,9 @@ erpnext.accounts.payment_triggers.setup("Sales Invoice");
erpnext.accounts.pos.setup("Sales Invoice");
erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
erpnext.sales_common.setup_selling_controller();
-erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends erpnext.selling.SellingController {
+erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends (
+ erpnext.selling.SellingController
+) {
setup(doc) {
this.setup_posting_date_time_check();
super.setup(doc);
@@ -21,20 +23,31 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
var me = this;
super.onload();
- this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log',
- 'POS Closing Entry', 'Journal Entry', 'Payment Entry', "Repost Payment Ledger", "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Serial and Batch Bundle", "Bank Transaction",
+ this.frm.ignore_doctypes_on_cancel_all = [
+ "POS Invoice",
+ "Timesheet",
+ "POS Invoice Merge Log",
+ "POS Closing Entry",
+ "Journal Entry",
+ "Payment Entry",
+ "Repost Payment Ledger",
+ "Repost Accounting Ledger",
+ "Unreconcile Payment",
+ "Unreconcile Payment Entries",
+ "Serial and Batch Bundle",
+ "Bank Transaction",
];
- if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
+ if (!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
// show debit_to in print format
this.frm.set_df_property("debit_to", "print_hide", 0);
}
- erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(this.frm, "Warehouse", function () {
return erpnext.queries.warehouse(me.frm.doc);
});
- if(this.frm.doc.__islocal && this.frm.doc.is_pos) {
+ if (this.frm.doc.__islocal && this.frm.doc.is_pos) {
//Load pos profile data on the invoice if the default value of Is POS is 1
me.frm.script_manager.trigger("is_pos");
@@ -46,30 +59,36 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
refresh(doc, dt, dn) {
const me = this;
super.refresh();
- if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
+ if (cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
// hide new msgbox
cur_frm.msgbox.hide();
}
this.frm.toggle_reqd("due_date", !this.frm.doc.is_return);
- if (this.frm.doc.repost_required && this.frm.doc.docstatus===1) {
- this.frm.set_intro(__("Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."));
- this.frm.add_custom_button(__('Repost Accounting Entries'),
- () => {
+ if (this.frm.doc.repost_required && this.frm.doc.docstatus === 1) {
+ this.frm.set_intro(
+ __(
+ "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
+ )
+ );
+ this.frm
+ .add_custom_button(__("Repost Accounting Entries"), () => {
this.frm.call({
doc: this.frm.doc,
- method: 'repost_accounting_entries',
+ method: "repost_accounting_entries",
freeze: true,
- freeze_message: __('Reposting...'),
+ freeze_message: __("Reposting..."),
callback: (r) => {
if (!r.exc) {
- frappe.msgprint(__('Accounting Entries are reposted'));
+ frappe.msgprint(__("Accounting Entries are reposted"));
me.frm.refresh();
}
- }
+ },
});
- }).removeClass('btn-default').addClass('btn-warning');
+ })
+ .removeClass("btn-default")
+ .addClass("btn-warning");
}
if (this.frm.doc.is_return) {
@@ -79,79 +98,89 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
this.show_general_ledger();
erpnext.accounts.ledger_preview.show_accounting_ledger_preview(this.frm);
- if(doc.update_stock){
+ if (doc.update_stock) {
this.show_stock_ledger();
erpnext.accounts.ledger_preview.show_stock_ledger_preview(this.frm);
}
- if (doc.docstatus == 1 && doc.outstanding_amount!=0) {
- this.frm.add_custom_button(
- __('Payment'),
- () => this.make_payment_entry(),
- __('Create')
- );
- this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+ if (doc.docstatus == 1 && doc.outstanding_amount != 0) {
+ this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
+ this.frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if(doc.docstatus==1 && !doc.is_return) {
-
+ if (doc.docstatus == 1 && !doc.is_return) {
var is_delivered_by_supplier = false;
- is_delivered_by_supplier = cur_frm.doc.items.some(function(item){
+ is_delivered_by_supplier = cur_frm.doc.items.some(function (item) {
return item.is_delivered_by_supplier ? true : false;
- })
+ });
- if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
- cur_frm.add_custom_button(__('Return / Credit Note'),
- this.make_sales_return, __('Create'));
- cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
+ if (doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ cur_frm.add_custom_button(__("Return / Credit Note"), this.make_sales_return, __("Create"));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if(cint(doc.update_stock)!=1) {
+ if (cint(doc.update_stock) != 1) {
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
var from_delivery_note = false;
- from_delivery_note = cur_frm.doc.items
- .some(function(item) {
- return item.delivery_note ? true : false;
- });
+ from_delivery_note = cur_frm.doc.items.some(function (item) {
+ return item.delivery_note ? true : false;
+ });
- if(!from_delivery_note && !is_delivered_by_supplier) {
- cur_frm.add_custom_button(__('Delivery'),
- cur_frm.cscript['Make Delivery Note'], __('Create'));
+ if (!from_delivery_note && !is_delivered_by_supplier) {
+ cur_frm.add_custom_button(
+ __("Delivery"),
+ cur_frm.cscript["Make Delivery Note"],
+ __("Create")
+ );
}
}
- if (doc.outstanding_amount>0) {
- cur_frm.add_custom_button(__('Payment Request'), function() {
- me.make_payment_request();
- }, __('Create'));
-
- cur_frm.add_custom_button(__('Invoice Discounting'), function() {
- cur_frm.events.create_invoice_discounting(cur_frm);
- }, __('Create'));
+ if (doc.outstanding_amount > 0) {
+ cur_frm.add_custom_button(
+ __("Payment Request"),
+ function () {
+ me.make_payment_request();
+ },
+ __("Create")
+ );
- const payment_is_overdue = doc.payment_schedule.map(
- row => Date.parse(row.due_date) < Date.now()
- ).reduce(
- (prev, current) => prev || current
+ cur_frm.add_custom_button(
+ __("Invoice Discounting"),
+ function () {
+ cur_frm.events.create_invoice_discounting(cur_frm);
+ },
+ __("Create")
);
+ const payment_is_overdue = doc.payment_schedule
+ .map((row) => Date.parse(row.due_date) < Date.now())
+ .reduce((prev, current) => prev || current);
+
if (payment_is_overdue) {
- this.frm.add_custom_button(__('Dunning'), () => {
- this.frm.events.create_dunning(this.frm);
- }, __('Create'));
+ this.frm.add_custom_button(
+ __("Dunning"),
+ () => {
+ this.frm.events.create_dunning(this.frm);
+ },
+ __("Create")
+ );
}
}
if (doc.docstatus === 1) {
- cur_frm.add_custom_button(__('Maintenance Schedule'), function () {
- cur_frm.cscript.make_maintenance_schedule();
- }, __('Create'));
+ cur_frm.add_custom_button(
+ __("Maintenance Schedule"),
+ function () {
+ cur_frm.cscript.make_maintenance_schedule();
+ },
+ __("Create")
+ );
}
}
// Show buttons only when pos view is active
- if (cint(doc.docstatus==0) && cur_frm.page.current_view_name!=="pos" && !doc.is_return) {
+ if (cint(doc.docstatus == 0) && cur_frm.page.current_view_name !== "pos" && !doc.is_return) {
this.frm.cscript.sales_order_btn();
this.frm.cscript.delivery_note_btn();
this.frm.cscript.quotation_btn();
@@ -161,12 +190,18 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) {
let internal = me.frm.doc.is_internal_customer;
if (internal) {
- let button_label = (me.frm.doc.company === me.frm.doc.represents_company) ? "Internal Purchase Invoice" :
- "Inter Company Purchase Invoice";
-
- me.frm.add_custom_button(button_label, function() {
- me.make_inter_company_invoice();
- }, __('Create'));
+ let button_label =
+ me.frm.doc.company === me.frm.doc.represents_company
+ ? "Internal Purchase Invoice"
+ : "Inter Company Purchase Invoice";
+
+ me.frm.add_custom_button(
+ button_label,
+ function () {
+ me.make_inter_company_invoice();
+ },
+ __("Create")
+ );
}
}
@@ -176,40 +211,45 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
make_maintenance_schedule() {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_maintenance_schedule",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
on_submit(doc, dt, dn) {
var me = this;
super.on_submit();
- if (frappe.get_route()[0] != 'Form') {
- return
+ if (frappe.get_route()[0] != "Form") {
+ return;
}
doc.items.forEach((row) => {
- if(row.delivery_note) frappe.model.clear_doc("Delivery Note", row.delivery_note)
+ if (row.delivery_note) frappe.model.clear_doc("Delivery Note", row.delivery_note);
});
}
set_default_print_format() {
// set default print format to POS type or Credit Note
- if(cur_frm.doc.is_pos) {
- if(cur_frm.pos_print_format) {
+ if (cur_frm.doc.is_pos) {
+ if (cur_frm.pos_print_format) {
cur_frm.meta._default_print_format = cur_frm.meta.default_print_format;
cur_frm.meta.default_print_format = cur_frm.pos_print_format;
}
- } else if(cur_frm.doc.is_return && !cur_frm.meta.default_print_format) {
- if(cur_frm.return_print_format) {
+ } else if (cur_frm.doc.is_return && !cur_frm.meta.default_print_format) {
+ if (cur_frm.return_print_format) {
cur_frm.meta._default_print_format = cur_frm.meta.default_print_format;
cur_frm.meta.default_print_format = cur_frm.return_print_format;
}
} else {
- if(cur_frm.meta._default_print_format) {
+ if (cur_frm.meta._default_print_format) {
cur_frm.meta.default_print_format = cur_frm.meta._default_print_format;
cur_frm.meta._default_print_format = null;
- } else if(in_list([cur_frm.pos_print_format, cur_frm.return_print_format], cur_frm.meta.default_print_format)) {
+ } else if (
+ in_list(
+ [cur_frm.pos_print_format, cur_frm.return_print_format],
+ cur_frm.meta.default_print_format
+ )
+ ) {
cur_frm.meta.default_print_format = null;
cur_frm.meta._default_print_format = null;
}
@@ -218,8 +258,9 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
sales_order_btn() {
var me = this;
- this.$sales_order_btn = this.frm.add_custom_button(__('Sales Order'),
- function() {
+ this.$sales_order_btn = this.frm.add_custom_button(
+ __("Sales Order"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
source_doctype: "Sales Order",
@@ -231,99 +272,113 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
docstatus: 1,
status: ["not in", ["Closed", "On Hold"]],
per_billed: ["<", 99.99],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
}
quotation_btn() {
var me = this;
- this.$quotation_btn = this.frm.add_custom_button(__('Quotation'),
- function() {
+ this.$quotation_btn = this.frm.add_custom_button(
+ __("Quotation"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.quotation.quotation.make_sales_invoice",
source_doctype: "Quotation",
target: me.frm,
- setters: [{
- fieldtype: 'Link',
- label: __('Customer'),
- options: 'Customer',
- fieldname: 'party_name',
- default: me.frm.doc.customer,
- }],
+ setters: [
+ {
+ fieldtype: "Link",
+ label: __("Customer"),
+ options: "Customer",
+ fieldname: "party_name",
+ default: me.frm.doc.customer,
+ },
+ ],
get_query_filters: {
docstatus: 1,
status: ["!=", "Lost"],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
}
delivery_note_btn() {
var me = this;
- this.$delivery_note_btn = this.frm.add_custom_button(__('Delivery Note'),
- function() {
+ this.$delivery_note_btn = this.frm.add_custom_button(
+ __("Delivery Note"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
source_doctype: "Delivery Note",
target: me.frm,
date_field: "posting_date",
setters: {
- customer: me.frm.doc.customer || undefined
+ customer: me.frm.doc.customer || undefined,
},
- get_query: function() {
+ get_query: function () {
var filters = {
docstatus: 1,
company: me.frm.doc.company,
- is_return: 0
+ is_return: 0,
};
- if(me.frm.doc.customer) filters["customer"] = me.frm.doc.customer;
+ if (me.frm.doc.customer) filters["customer"] = me.frm.doc.customer;
return {
query: "erpnext.controllers.queries.get_delivery_notes_to_be_billed",
- filters: filters
+ filters: filters,
};
- }
+ },
});
- }, __("Get Items From"));
+ },
+ __("Get Items From")
+ );
}
tc_name() {
this.get_terms();
}
customer() {
- if (this.frm.doc.is_pos){
+ if (this.frm.doc.is_pos) {
var pos_profile = this.frm.doc.pos_profile;
}
var me = this;
- if(this.frm.updating_party_details) return;
+ if (this.frm.updating_party_details) return;
if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return;
- erpnext.utils.get_party_details(this.frm,
- "erpnext.accounts.party.get_party_details", {
+ erpnext.utils.get_party_details(
+ this.frm,
+ "erpnext.accounts.party.get_party_details",
+ {
posting_date: this.frm.doc.posting_date,
party: this.frm.doc.customer,
party_type: "Customer",
account: this.frm.doc.debit_to,
price_list: this.frm.doc.selling_price_list,
- pos_profile: pos_profile
- }, function() {
+ pos_profile: pos_profile,
+ },
+ function () {
me.apply_pricing_rule();
- });
+ }
+ );
- if(this.frm.doc.customer) {
+ if (this.frm.doc.customer) {
frappe.call({
- "method": "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_loyalty_programs",
- "args": {
- "customer": this.frm.doc.customer
+ method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_loyalty_programs",
+ args: {
+ customer: this.frm.doc.customer,
},
- callback: function(r) {
- if(r.message && r.message.length > 1) {
+ callback: function (r) {
+ if (r.message && r.message.length > 1) {
select_loyalty_program(me.frm, r.message);
}
- }
+ },
});
}
}
@@ -332,13 +387,13 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
let me = this;
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
- frm: me.frm
+ frm: me.frm,
});
}
debit_to() {
var me = this;
- if(this.frm.doc.debit_to) {
+ if (this.frm.doc.debit_to) {
me.frm.call({
method: "frappe.client.get_value",
args: {
@@ -346,12 +401,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
fieldname: "account_currency",
filters: { name: me.frm.doc.debit_to },
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
me.frm.set_value("party_account_currency", r.message.account_currency);
me.set_dynamic_labels();
}
- }
+ },
});
}
}
@@ -365,8 +420,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]);
// this will make outstanding amount 0
- this.frm.set_value("write_off_amount",
- flt(this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance, precision("write_off_amount"))
+ this.frm.set_value(
+ "write_off_amount",
+ flt(
+ this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance,
+ precision("write_off_amount")
+ )
);
}
@@ -381,12 +440,16 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
items_add(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- this.frm.script_manager.copy_from_first_row("items", row, ["income_account", "discount_account", "cost_center"]);
+ this.frm.script_manager.copy_from_first_row("items", row, [
+ "income_account",
+ "discount_account",
+ "cost_center",
+ ]);
}
set_dynamic_labels() {
super.set_dynamic_labels();
- this.frm.events.hide_fields(this.frm)
+ this.frm.events.hide_fields(this.frm);
}
items_on_form_rendered() {
@@ -400,39 +463,39 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
make_sales_return() {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
asset(frm, cdt, cdn) {
var row = locals[cdt][cdn];
- if(row.asset) {
+ if (row.asset) {
frappe.call({
method: erpnext.assets.doctype.asset.depreciation.get_disposal_account_and_cost_center,
args: {
- "company": frm.doc.company
+ company: frm.doc.company,
},
- callback: function(r, rt) {
+ callback: function (r, rt) {
frappe.model.set_value(cdt, cdn, "income_account", r.message[0]);
frappe.model.set_value(cdt, cdn, "cost_center", r.message[1]);
- }
- })
+ },
+ });
}
}
- is_pos(frm){
+ is_pos(frm) {
this.set_pos_data();
}
pos_profile() {
- this.frm.doc.taxes = []
+ this.frm.doc.taxes = [];
this.set_pos_data();
}
set_pos_data() {
- if(this.frm.doc.is_pos) {
+ if (this.frm.doc.is_pos) {
this.frm.set_value("allocate_advances_automatically", 0);
- if(!this.frm.doc.company) {
+ if (!this.frm.doc.company) {
this.frm.set_value("is_pos", 0);
frappe.msgprint(__("Please specify Company to proceed"));
} else {
@@ -440,13 +503,13 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
return this.frm.call({
doc: me.frm.doc,
method: "set_missing_values",
- callback: function(r) {
- if(!r.exc) {
- if(r.message && r.message.print_format) {
+ callback: function (r) {
+ if (!r.exc) {
+ if (r.message && r.message.print_format) {
me.frm.pos_print_format = r.message.print_format;
}
me.frm.trigger("update_stock");
- if(me.frm.doc.taxes_and_charges) {
+ if (me.frm.doc.taxes_and_charges) {
me.frm.script_manager.trigger("taxes_and_charges");
}
@@ -454,21 +517,20 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
me.set_dynamic_labels();
me.calculate_taxes_and_totals();
}
- }
+ },
});
}
- }
- else this.frm.trigger("refresh");
+ } else this.frm.trigger("refresh");
}
- amount(){
- this.write_off_outstanding_amount_automatically()
+ amount() {
+ this.write_off_outstanding_amount_automatically();
}
- change_amount(){
- if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
+ change_amount() {
+ if (this.frm.doc.paid_amount > this.frm.doc.grand_total) {
this.calculate_write_off_amount();
- }else {
+ } else {
this.frm.set_value("change_amount", 0.0);
this.frm.set_value("base_change_amount", 0.0);
}
@@ -476,7 +538,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
this.frm.refresh_fields();
}
- loyalty_amount(){
+ loyalty_amount() {
this.calculate_outstanding_amount();
this.frm.refresh_field("outstanding_amount");
this.frm.refresh_field("paid_amount");
@@ -488,16 +550,24 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
super.currency();
if (this.frm.doc.timesheets) {
this.frm.doc.timesheets.forEach((d) => {
- let row = frappe.get_doc(d.doctype, d.name)
- set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail)
+ let row = frappe.get_doc(d.doctype, d.name);
+ set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail);
});
this.frm.trigger("calculate_timesheet_totals");
}
}
is_cash_or_non_trade_discount() {
- this.frm.set_df_property("additional_discount_account", "hidden", 1 - this.frm.doc.is_cash_or_non_trade_discount);
- this.frm.set_df_property("additional_discount_account", "reqd", this.frm.doc.is_cash_or_non_trade_discount);
+ this.frm.set_df_property(
+ "additional_discount_account",
+ "hidden",
+ 1 - this.frm.doc.is_cash_or_non_trade_discount
+ );
+ this.frm.set_df_property(
+ "additional_discount_account",
+ "reqd",
+ this.frm.doc.is_cash_or_non_trade_discount
+ );
if (!this.frm.doc.is_cash_or_non_trade_discount) {
this.frm.set_value("additional_discount_account", "");
@@ -508,337 +578,349 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
};
// for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({ frm: cur_frm }));
-cur_frm.cscript['Make Delivery Note'] = function() {
+cur_frm.cscript["Make Delivery Note"] = function () {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note",
- frm: cur_frm
- })
-}
+ frm: cur_frm,
+ });
+};
-cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {
+cur_frm.fields_dict.cash_bank_account.get_query = function (doc) {
return {
filters: [
["Account", "account_type", "in", ["Cash", "Bank"]],
["Account", "root_type", "=", "Asset"],
- ["Account", "is_group", "=",0],
- ["Account", "company", "=", doc.company]
- ]
- }
-}
-
-cur_frm.fields_dict.write_off_account.get_query = function(doc) {
- return{
- filters:{
- 'report_type': 'Profit and Loss',
- 'is_group': 0,
- 'company': doc.company
- }
- }
-}
+ ["Account", "is_group", "=", 0],
+ ["Account", "company", "=", doc.company],
+ ],
+ };
+};
+
+cur_frm.fields_dict.write_off_account.get_query = function (doc) {
+ return {
+ filters: {
+ report_type: "Profit and Loss",
+ is_group: 0,
+ company: doc.company,
+ },
+ };
+};
// Write off cost center
//-----------------------
-cur_frm.fields_dict.write_off_cost_center.get_query = function(doc) {
- return{
- filters:{
- 'is_group': 0,
- 'company': doc.company
- }
- }
-}
+cur_frm.fields_dict.write_off_cost_center.get_query = function (doc) {
+ return {
+ filters: {
+ is_group: 0,
+ company: doc.company,
+ },
+ };
+};
// Cost Center in Details Table
// -----------------------------
-cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function(doc) {
+cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function (doc) {
return {
filters: {
- 'company': doc.company,
- "is_group": 0
- }
- }
-}
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+};
-cur_frm.cscript.income_account = function(doc, cdt, cdn) {
+cur_frm.cscript.income_account = function (doc, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(doc, cdt, cdn, "items", "income_account");
-}
+};
-cur_frm.cscript.expense_account = function(doc, cdt, cdn) {
+cur_frm.cscript.expense_account = function (doc, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(doc, cdt, cdn, "items", "expense_account");
-}
+};
-cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
+cur_frm.cscript.cost_center = function (doc, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(doc, cdt, cdn, "items", "cost_center");
-}
+};
-cur_frm.set_query("debit_to", function(doc) {
+cur_frm.set_query("debit_to", function (doc) {
return {
filters: {
- 'account_type': 'Receivable',
- 'is_group': 0,
- 'company': doc.company
- }
- }
+ account_type: "Receivable",
+ is_group: 0,
+ company: doc.company,
+ },
+ };
});
-cur_frm.set_query("asset", "items", function(doc, cdt, cdn) {
+cur_frm.set_query("asset", "items", function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
return {
filters: [
["Asset", "item_code", "=", d.item_code],
["Asset", "docstatus", "=", 1],
["Asset", "status", "in", ["Submitted", "Partially Depreciated", "Fully Depreciated"]],
- ["Asset", "company", "=", doc.company]
- ]
- }
+ ["Asset", "company", "=", doc.company],
+ ],
+ };
});
-frappe.ui.form.on('Sales Invoice', {
- setup: function(frm){
- frm.add_fetch('customer', 'tax_id', 'tax_id');
- frm.add_fetch('payment_term', 'invoice_portion', 'invoice_portion');
- frm.add_fetch('payment_term', 'description', 'description');
+frappe.ui.form.on("Sales Invoice", {
+ setup: function (frm) {
+ frm.add_fetch("customer", "tax_id", "tax_id");
+ frm.add_fetch("payment_term", "invoice_portion", "invoice_portion");
+ frm.add_fetch("payment_term", "description", "description");
- frm.set_df_property('packed_items', 'cannot_add_rows', true);
- frm.set_df_property('packed_items', 'cannot_delete_rows', true);
+ frm.set_df_property("packed_items", "cannot_add_rows", true);
+ frm.set_df_property("packed_items", "cannot_delete_rows", true);
- frm.set_query("account_for_change_amount", function() {
+ frm.set_query("account_for_change_amount", function () {
return {
filters: {
- account_type: ['in', ["Cash", "Bank"]],
+ account_type: ["in", ["Cash", "Bank"]],
company: frm.doc.company,
- is_group: 0
- }
+ is_group: 0,
+ },
};
});
- frm.set_query("unrealized_profit_loss_account", function() {
+ frm.set_query("unrealized_profit_loss_account", function () {
return {
filters: {
company: frm.doc.company,
is_group: 0,
root_type: "Liability",
- }
+ },
};
});
- frm.set_query("adjustment_against", function() {
+ frm.set_query("adjustment_against", function () {
return {
filters: {
company: frm.doc.company,
customer: frm.doc.customer,
- docstatus: 1
- }
+ docstatus: 1,
+ },
};
});
- frm.set_query("additional_discount_account", function() {
+ frm.set_query("additional_discount_account", function () {
return {
filters: {
company: frm.doc.company,
is_group: 0,
report_type: "Profit and Loss",
- }
+ },
};
});
- frm.set_query("income_account", "items", function() {
- return{
+ frm.set_query("income_account", "items", function () {
+ return {
query: "erpnext.controllers.queries.get_income_account",
filters: {
- 'company': frm.doc.company,
- "disabled": 0
- }
- }
+ company: frm.doc.company,
+ disabled: 0,
+ },
+ };
});
- frm.custom_make_buttons = {
- 'Delivery Note': 'Delivery',
- 'Sales Invoice': 'Return / Credit Note',
- 'Payment Request': 'Payment Request',
- 'Payment Entry': 'Payment'
- },
- frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function(doc, cdt, cdn){
- return{
- query: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet",
- filters: {'project': doc.project}
- }
- }
+ (frm.custom_make_buttons = {
+ "Delivery Note": "Delivery",
+ "Sales Invoice": "Return / Credit Note",
+ "Payment Request": "Payment Request",
+ "Payment Entry": "Payment",
+ }),
+ (frm.fields_dict["timesheets"].grid.get_field("time_sheet").get_query = function (doc, cdt, cdn) {
+ return {
+ query: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet",
+ filters: { project: doc.project },
+ };
+ });
// discount account
- frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
+ frm.fields_dict["items"].grid.get_field("discount_account").get_query = function (doc) {
return {
filters: {
- 'report_type': 'Profit and Loss',
- 'company': doc.company,
- "is_group": 0
- }
- }
- }
+ report_type: "Profit and Loss",
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+ };
- frm.fields_dict['items'].grid.get_field('deferred_revenue_account').get_query = function(doc) {
+ frm.fields_dict["items"].grid.get_field("deferred_revenue_account").get_query = function (doc) {
return {
filters: {
- 'root_type': 'Liability',
- 'company': doc.company,
- "is_group": 0
- }
- }
- }
+ root_type: "Liability",
+ company: doc.company,
+ is_group: 0,
+ },
+ };
+ };
- frm.set_query('company_address', function(doc) {
- if(!doc.company) {
- frappe.throw(__('Please set Company'));
+ frm.set_query("company_address", function (doc) {
+ if (!doc.company) {
+ frappe.throw(__("Please set Company"));
}
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
- link_doctype: 'Company',
- link_name: doc.company
- }
+ link_doctype: "Company",
+ link_name: doc.company,
+ },
};
});
- frm.set_query('pos_profile', function(doc) {
- if(!doc.company) {
- frappe.throw(__('Please set Company'));
+ frm.set_query("pos_profile", function (doc) {
+ if (!doc.company) {
+ frappe.throw(__("Please set Company"));
}
return {
- query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
+ query: "erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query",
filters: {
- company: doc.company
- }
+ company: doc.company,
+ },
};
});
// set get_query for loyalty redemption account
- frm.fields_dict["loyalty_redemption_account"].get_query = function() {
+ frm.fields_dict["loyalty_redemption_account"].get_query = function () {
return {
- filters:{
- "company": frm.doc.company,
- "is_group": 0
- }
- }
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ },
+ };
};
// set get_query for loyalty redemption cost center
- frm.fields_dict["loyalty_redemption_cost_center"].get_query = function() {
+ frm.fields_dict["loyalty_redemption_cost_center"].get_query = function () {
return {
- filters:{
- "company": frm.doc.company,
- "is_group": 0
- }
- }
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ },
+ };
};
},
// When multiple companies are set up. in case company name is changed set default company address
- company: function(frm){
+ company: function (frm) {
if (frm.doc.company) {
frappe.call({
method: "erpnext.setup.doctype.company.company.get_default_company_address",
- args: {name:frm.doc.company, existing_address: frm.doc.company_address || ""},
+ args: { name: frm.doc.company, existing_address: frm.doc.company_address || "" },
debounce: 2000,
- callback: function(r){
- if (r.message){
- frm.set_value("company_address",r.message)
+ callback: function (r) {
+ if (r.message) {
+ frm.set_value("company_address", r.message);
+ } else {
+ frm.set_value("company_address", "");
}
- else {
- frm.set_value("company_address","")
- }
- }
- })
+ },
+ });
}
},
- onload: function(frm) {
+ onload: function (frm) {
frm.redemption_conversion_factor = null;
},
- update_stock: function(frm, dt, dn) {
+ update_stock: function (frm, dt, dn) {
frm.events.hide_fields(frm);
- frm.trigger('reset_posting_time');
+ frm.trigger("reset_posting_time");
},
- redeem_loyalty_points: function(frm) {
+ redeem_loyalty_points: function (frm) {
frm.events.get_loyalty_details(frm);
},
- loyalty_points: function(frm) {
+ loyalty_points: function (frm) {
if (frm.redemption_conversion_factor) {
frm.events.set_loyalty_points(frm);
} else {
frappe.call({
method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_redeemption_factor",
args: {
- "loyalty_program": frm.doc.loyalty_program
+ loyalty_program: frm.doc.loyalty_program,
},
- callback: function(r) {
+ callback: function (r) {
if (r) {
frm.redemption_conversion_factor = r.message;
frm.events.set_loyalty_points(frm);
}
- }
+ },
});
}
},
- hide_fields: function(frm) {
+ hide_fields: function (frm) {
let doc = frm.doc;
- var parent_fields = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances',
- 'advances', 'from_date', 'to_date'];
+ var parent_fields = [
+ "project",
+ "due_date",
+ "is_opening",
+ "source",
+ "total_advance",
+ "get_advances",
+ "advances",
+ "from_date",
+ "to_date",
+ ];
- if(cint(doc.is_pos) == 1) {
+ if (cint(doc.is_pos) == 1) {
hide_field(parent_fields);
} else {
for (var i in parent_fields) {
var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
- if(!docfield.hidden) unhide_field(parent_fields[i]);
+ if (!docfield.hidden) unhide_field(parent_fields[i]);
}
}
frm.refresh_fields();
},
- get_loyalty_details: function(frm) {
+ get_loyalty_details: function (frm) {
if (frm.doc.customer && frm.doc.redeem_loyalty_points) {
frappe.call({
method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details",
args: {
- "customer": frm.doc.customer,
- "loyalty_program": frm.doc.loyalty_program,
- "expiry_date": frm.doc.posting_date,
- "company": frm.doc.company
+ customer: frm.doc.customer,
+ loyalty_program: frm.doc.loyalty_program,
+ expiry_date: frm.doc.posting_date,
+ company: frm.doc.company,
},
- callback: function(r) {
+ callback: function (r) {
if (r) {
frm.set_value("loyalty_redemption_account", r.message.expense_account);
frm.set_value("loyalty_redemption_cost_center", r.message.cost_center);
frm.redemption_conversion_factor = r.message.conversion_factor;
}
- }
+ },
});
}
},
- set_loyalty_points: function(frm) {
+ set_loyalty_points: function (frm) {
if (frm.redemption_conversion_factor) {
- let loyalty_amount = flt(frm.redemption_conversion_factor*flt(frm.doc.loyalty_points), precision("loyalty_amount"));
- var remaining_amount = flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
- if (frm.doc.grand_total && (remaining_amount < loyalty_amount)) {
- let redeemable_points = parseInt(remaining_amount/frm.redemption_conversion_factor);
- frappe.throw(__("You can only redeem max {0} points in this order.",[redeemable_points]));
+ let loyalty_amount = flt(
+ frm.redemption_conversion_factor * flt(frm.doc.loyalty_points),
+ precision("loyalty_amount")
+ );
+ var remaining_amount =
+ flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
+ if (frm.doc.grand_total && remaining_amount < loyalty_amount) {
+ let redeemable_points = parseInt(remaining_amount / frm.redemption_conversion_factor);
+ frappe.throw(__("You can only redeem max {0} points in this order.", [redeemable_points]));
}
frm.set_value("loyalty_amount", loyalty_amount);
}
},
- project: function(frm) {
+ project: function (frm) {
if (frm.doc.project) {
frm.events.add_timesheet_data(frm, {
- project: frm.doc.project
+ project: frm.doc.project,
});
}
},
@@ -858,26 +940,30 @@ frappe.ui.form.on('Sales Invoice', {
},
async get_timesheet_data(frm, kwargs) {
- return frappe.call({
- method: "erpnext.projects.doctype.timesheet.timesheet.get_projectwise_timesheet_data",
- args: kwargs
- }).then(r => {
- if (!r.exc && r.message.length > 0) {
- return r.message
- } else {
- return []
- }
- });
+ return frappe
+ .call({
+ method: "erpnext.projects.doctype.timesheet.timesheet.get_projectwise_timesheet_data",
+ args: kwargs,
+ })
+ .then((r) => {
+ if (!r.exc && r.message.length > 0) {
+ return r.message;
+ } else {
+ return [];
+ }
+ });
},
- set_timesheet_data: function(frm, timesheets) {
- frm.clear_table("timesheets")
+ set_timesheet_data: function (frm, timesheets) {
+ frm.clear_table("timesheets");
timesheets.forEach(async (timesheet) => {
if (frm.doc.currency != timesheet.currency) {
const exchange_rate = await frm.events.get_exchange_rate(
- frm, timesheet.currency, frm.doc.currency
- )
- frm.events.append_time_log(frm, timesheet, exchange_rate)
+ frm,
+ timesheet.currency,
+ frm.doc.currency
+ );
+ frm.events.append_time_log(frm, timesheet, exchange_rate);
} else {
frm.events.append_time_log(frm, timesheet, 1.0);
}
@@ -888,9 +974,9 @@ frappe.ui.form.on('Sales Invoice', {
async get_exchange_rate(frm, from_currency, to_currency) {
if (
- frm.exchange_rates
- && frm.exchange_rates[from_currency]
- && frm.exchange_rates[from_currency][to_currency]
+ frm.exchange_rates &&
+ frm.exchange_rates[from_currency] &&
+ frm.exchange_rates[from_currency][to_currency]
) {
return frm.exchange_rates[from_currency][to_currency];
}
@@ -899,20 +985,20 @@ frappe.ui.form.on('Sales Invoice', {
method: "erpnext.setup.utils.get_exchange_rate",
args: {
from_currency,
- to_currency
+ to_currency,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
// cache exchange rates
frm.exchange_rates = frm.exchange_rates || {};
frm.exchange_rates[from_currency] = frm.exchange_rates[from_currency] || {};
frm.exchange_rates[from_currency][to_currency] = r.message;
}
- }
+ },
});
},
- append_time_log: function(frm, time_log, exchange_rate) {
+ append_time_log: function (frm, time_log, exchange_rate) {
const row = frm.add_child("timesheets");
row.activity_type = time_log.activity_type;
row.description = time_log.description;
@@ -925,114 +1011,118 @@ frappe.ui.form.on('Sales Invoice', {
row.project_name = time_log.project_name;
},
- calculate_timesheet_totals: function(frm) {
- frm.set_value("total_billing_amount",
- frm.doc.timesheets.reduce((a, b) => a + (b["billing_amount"] || 0.0), 0.0));
- frm.set_value("total_billing_hours",
- frm.doc.timesheets.reduce((a, b) => a + (b["billing_hours"] || 0.0), 0.0));
+ calculate_timesheet_totals: function (frm) {
+ frm.set_value(
+ "total_billing_amount",
+ frm.doc.timesheets.reduce((a, b) => a + (b["billing_amount"] || 0.0), 0.0)
+ );
+ frm.set_value(
+ "total_billing_hours",
+ frm.doc.timesheets.reduce((a, b) => a + (b["billing_hours"] || 0.0), 0.0)
+ );
},
- refresh: function(frm) {
- if (frm.doc.docstatus===0 && !frm.doc.is_return) {
- frm.add_custom_button(__("Fetch Timesheet"), function() {
+ refresh: function (frm) {
+ if (frm.doc.docstatus === 0 && !frm.doc.is_return) {
+ frm.add_custom_button(__("Fetch Timesheet"), function () {
let d = new frappe.ui.Dialog({
title: __("Fetch Timesheet"),
fields: [
{
- "label" : __("From"),
- "fieldname": "from_time",
- "fieldtype": "Date",
- "reqd": 1,
+ label: __("From"),
+ fieldname: "from_time",
+ fieldtype: "Date",
+ reqd: 1,
},
{
fieldtype: "Column Break",
fieldname: "col_break_1",
},
{
- "label" : __("To"),
- "fieldname": "to_time",
- "fieldtype": "Date",
- "reqd": 1,
+ label: __("To"),
+ fieldname: "to_time",
+ fieldtype: "Date",
+ reqd: 1,
},
{
- "label" : __("Project"),
- "fieldname": "project",
- "fieldtype": "Link",
- "options": "Project",
- "default": frm.doc.project
+ label: __("Project"),
+ fieldname: "project",
+ fieldtype: "Link",
+ options: "Project",
+ default: frm.doc.project,
},
],
- primary_action: function() {
+ primary_action: function () {
const data = d.get_values();
frm.events.add_timesheet_data(frm, {
from_time: data.from_time,
to_time: data.to_time,
- project: data.project
+ project: data.project,
});
d.hide();
},
- primary_action_label: __("Get Timesheets")
+ primary_action_label: __("Get Timesheets"),
});
d.show();
});
}
if (frm.doc.is_debit_note) {
- frm.set_df_property('return_against', 'label', __('Adjustment Against'));
+ frm.set_df_property("return_against", "label", __("Adjustment Against"));
}
},
- create_invoice_discounting: function(frm) {
+ create_invoice_discounting: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_invoice_discounting",
- frm: frm
+ frm: frm,
});
},
- create_dunning: function(frm) {
+ create_dunning: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.create_dunning",
- frm: frm
+ frm: frm,
});
- }
+ },
});
frappe.ui.form.on("Sales Invoice Timesheet", {
timesheets_remove(frm) {
frm.trigger("calculate_timesheet_totals");
- }
+ },
});
-var set_timesheet_detail_rate = function(cdt, cdn, currency, timelog) {
+var set_timesheet_detail_rate = function (cdt, cdn, currency, timelog) {
frappe.call({
method: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet_detail_rate",
args: {
timelog: timelog,
- currency: currency
+ currency: currency,
},
- callback: function(r) {
+ callback: function (r) {
if (!r.exc && r.message) {
- frappe.model.set_value(cdt, cdn, 'billing_amount', r.message);
+ frappe.model.set_value(cdt, cdn, "billing_amount", r.message);
}
- }
+ },
});
-}
+};
-var select_loyalty_program = function(frm, loyalty_programs) {
+var select_loyalty_program = function (frm, loyalty_programs) {
var dialog = new frappe.ui.Dialog({
title: __("Select Loyalty Program"),
fields: [
{
- "label": __("Loyalty Program"),
- "fieldname": "loyalty_program",
- "fieldtype": "Select",
- "options": loyalty_programs,
- "default": loyalty_programs[0]
- }
- ]
+ label: __("Loyalty Program"),
+ fieldname: "loyalty_program",
+ fieldtype: "Select",
+ options: loyalty_programs,
+ default: loyalty_programs[0],
+ },
+ ],
});
- dialog.set_primary_action(__("Set Loyalty Program"), function() {
+ dialog.set_primary_action(__("Set Loyalty Program"), function () {
dialog.hide();
return frappe.call({
method: "frappe.client.set_value",
@@ -1042,9 +1132,9 @@ var select_loyalty_program = function(frm, loyalty_programs) {
fieldname: "loyalty_program",
value: dialog.get_value("loyalty_program"),
},
- callback: function(r) { }
+ callback: function (r) {},
});
});
dialog.show();
-}
+};
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
index 1605b151a14f..f971f68a4546 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -2,34 +2,42 @@
// License: GNU General Public License v3. See license.txt
// render
-frappe.listview_settings['Sales Invoice'] = {
- add_fields: ["customer", "customer_name", "base_grand_total", "outstanding_amount", "due_date", "company",
- "currency", "is_return"],
- get_indicator: function(doc) {
+frappe.listview_settings["Sales Invoice"] = {
+ add_fields: [
+ "customer",
+ "customer_name",
+ "base_grand_total",
+ "outstanding_amount",
+ "due_date",
+ "company",
+ "currency",
+ "is_return",
+ ],
+ get_indicator: function (doc) {
const status_colors = {
- "Draft": "grey",
- "Unpaid": "orange",
- "Paid": "green",
- "Return": "gray",
+ Draft: "grey",
+ Unpaid: "orange",
+ Paid: "green",
+ Return: "gray",
"Credit Note Issued": "gray",
"Unpaid and Discounted": "orange",
"Partly Paid and Discounted": "yellow",
"Overdue and Discounted": "red",
- "Overdue": "red",
+ Overdue: "red",
"Partly Paid": "yellow",
- "Internal Transfer": "darkgrey"
+ "Internal Transfer": "darkgrey",
};
- return [__(doc.status), status_colors[doc.status], "status,=,"+doc.status];
+ return [__(doc.status), status_colors[doc.status], "status,=," + doc.status];
},
right_column: "grand_total",
- onload: function(listview) {
- listview.page.add_action_item(__("Delivery Note"), ()=>{
+ onload: function (listview) {
+ listview.page.add_action_item(__("Delivery Note"), () => {
erpnext.bulk_transaction_processing.create(listview, "Sales Invoice", "Delivery Note");
});
- listview.page.add_action_item(__("Payment"), ()=>{
+ listview.page.add_action_item(__("Payment"), () => {
erpnext.bulk_transaction_processing.create(listview, "Sales Invoice", "Payment Entry");
});
- }
+ },
};
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
index 00e8b621c0d0..91d4d047f8f2 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
@@ -2,4 +2,4 @@
// License: GNU General Public License v3. See license.txt
erpnext.accounts.taxes.setup_tax_validations("Sales Taxes and Charges Template");
-erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
\ No newline at end of file
+erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.js b/erpnext/accounts/doctype/share_transfer/share_transfer.js
index 6317c9c8c0d1..dd9d9628aa88 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.js
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.js
@@ -3,21 +3,19 @@
frappe.provide("erpnext.share_transfer");
-frappe.ui.form.on('Share Transfer', {
- refresh: function(frm) {
+frappe.ui.form.on("Share Transfer", {
+ refresh: function (frm) {
// Don't show Parties which are a Company
- let shareholders = ['from_shareholder', 'to_shareholder'];
+ let shareholders = ["from_shareholder", "to_shareholder"];
shareholders.forEach((shareholder) => {
- frm.fields_dict[shareholder].get_query = function() {
+ frm.fields_dict[shareholder].get_query = function () {
return {
- filters: [
- ["Shareholder", "is_company", "=", 0]
- ]
+ filters: [["Shareholder", "is_company", "=", 0]],
};
};
});
if (frm.doc.docstatus == 1 && frm.doc.equity_or_liability_account && frm.doc.asset_account) {
- frm.add_custom_button(__('Create Journal Entry'), function () {
+ frm.add_custom_button(__("Create Journal Entry"), function () {
erpnext.share_transfer.make_jv(frm);
});
}
@@ -25,54 +23,59 @@ frappe.ui.form.on('Share Transfer', {
frm.toggle_reqd("asset_account", frm.doc.transfer_type != "Transfer");
},
no_of_shares: (frm) => {
- if (frm.doc.rate != undefined || frm.doc.rate != null){
+ if (frm.doc.rate != undefined || frm.doc.rate != null) {
erpnext.share_transfer.update_amount(frm);
}
},
rate: (frm) => {
- if (frm.doc.no_of_shares != undefined || frm.doc.no_of_shares != null){
+ if (frm.doc.no_of_shares != undefined || frm.doc.no_of_shares != null) {
erpnext.share_transfer.update_amount(frm);
}
},
- company: async function(frm) {
+ company: async function (frm) {
if (frm.doc.company) {
- let currency = (await frappe.db.get_value("Company", frm.doc.company, "default_currency")).message.default_currency;
- frm.set_query("equity_or_liability_account", function() {
+ let currency = (await frappe.db.get_value("Company", frm.doc.company, "default_currency")).message
+ .default_currency;
+ frm.set_query("equity_or_liability_account", function () {
return {
filters: {
- "is_group":0,
- "root_type": ["in",["Equity","Liability"]],
- "company": frm.doc.company,
- "account_currency": currency
- }
+ is_group: 0,
+ root_type: ["in", ["Equity", "Liability"]],
+ company: frm.doc.company,
+ account_currency: currency,
+ },
};
});
- frm.set_query("asset_account", function() {
+ frm.set_query("asset_account", function () {
return {
filters: {
- "is_group":0,
- "root_type":"Asset",
- "company": frm.doc.company,
- "account_currency": currency
- }
+ is_group: 0,
+ root_type: "Asset",
+ company: frm.doc.company,
+ account_currency: currency,
+ },
};
});
}
},
- transfer_type: function(frm) {
+ transfer_type: function (frm) {
frm.toggle_reqd("asset_account", frm.doc.transfer_type != "Transfer");
- }
+ },
});
-erpnext.share_transfer.update_amount = function(frm) {
+erpnext.share_transfer.update_amount = function (frm) {
frm.doc.amount = frm.doc.no_of_shares * frm.doc.rate;
frm.refresh_field("amount");
};
erpnext.share_transfer.make_jv = function (frm) {
- var account, payment_account, credit_applicant_type, credit_applicant,
- debit_applicant_type, debit_applicant;
+ var account,
+ payment_account,
+ credit_applicant_type,
+ credit_applicant,
+ debit_applicant_type,
+ debit_applicant;
if (frm.doc.transfer_type == "Transfer") {
account = frm.doc.equity_or_liability_account;
@@ -81,16 +84,14 @@ erpnext.share_transfer.make_jv = function (frm) {
credit_applicant = frm.doc.to_shareholder;
debit_applicant_type = "Shareholder";
debit_applicant = frm.doc.from_shareholder;
- }
- else if (frm.doc.transfer_type == "Issue") {
+ } else if (frm.doc.transfer_type == "Issue") {
account = frm.doc.asset_account;
payment_account = frm.doc.equity_or_liability_account;
credit_applicant_type = "Shareholder";
credit_applicant = frm.doc.to_shareholder;
debit_applicant_type = "";
debit_applicant = "";
- }
- else {
+ } else {
account = frm.doc.equity_or_liability_account;
payment_account = frm.doc.asset_account;
credit_applicant_type = "";
@@ -100,19 +101,19 @@ erpnext.share_transfer.make_jv = function (frm) {
}
frappe.call({
args: {
- "company": frm.doc.company,
- "account": account,
- "amount": frm.doc.amount,
- "payment_account": payment_account,
- "credit_applicant_type": credit_applicant_type,
- "credit_applicant": credit_applicant,
- "debit_applicant_type": debit_applicant_type,
- "debit_applicant": debit_applicant
+ company: frm.doc.company,
+ account: account,
+ amount: frm.doc.amount,
+ payment_account: payment_account,
+ credit_applicant_type: credit_applicant_type,
+ credit_applicant: credit_applicant,
+ debit_applicant_type: debit_applicant_type,
+ debit_applicant: debit_applicant,
},
method: "erpnext.accounts.doctype.share_transfer.share_transfer.make_jv_entry",
callback: function (r) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
- }
+ },
});
};
diff --git a/erpnext/accounts/doctype/share_type/share_type.js b/erpnext/accounts/doctype/share_type/share_type.js
index 1ae85e3a57ea..5dfb7607fed4 100644
--- a/erpnext/accounts/doctype/share_type/share_type.js
+++ b/erpnext/accounts/doctype/share_type/share_type.js
@@ -1,8 +1,6 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Share Type', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Share Type", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.js b/erpnext/accounts/doctype/shareholder/shareholder.js
index 544d417a0e5d..baf092061ddc 100644
--- a/erpnext/accounts/doctype/shareholder/shareholder.js
+++ b/erpnext/accounts/doctype/shareholder/shareholder.js
@@ -1,37 +1,36 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Shareholder', {
- refresh: function(frm) {
- frm.toggle_display(['contact_html'], !frm.doc.__islocal);
+frappe.ui.form.on("Shareholder", {
+ refresh: function (frm) {
+ frm.toggle_display(["contact_html"], !frm.doc.__islocal);
if (frm.doc.__islocal) {
- hide_field(['contact_html']);
+ hide_field(["contact_html"]);
frappe.contacts.clear_address_and_contact(frm);
- }
- else {
- if (frm.doc.is_company){
- hide_field(['company']);
+ } else {
+ if (frm.doc.is_company) {
+ hide_field(["company"]);
} else {
- unhide_field(['contact_html']);
+ unhide_field(["contact_html"]);
frappe.contacts.render_address_and_contact(frm);
}
}
- if (frm.doc.folio_no != undefined){
- frm.add_custom_button(__("Share Balance"), function(){
+ if (frm.doc.folio_no != undefined) {
+ frm.add_custom_button(__("Share Balance"), function () {
frappe.route_options = {
- "shareholder": frm.doc.name,
+ shareholder: frm.doc.name,
};
frappe.set_route("query-report", "Share Balance");
});
- frm.add_custom_button(__("Share Ledger"), function(){
+ frm.add_custom_button(__("Share Ledger"), function () {
frappe.route_options = {
- "shareholder": frm.doc.name,
+ shareholder: frm.doc.name,
};
frappe.set_route("query-report", "Share Ledger");
});
- let fields = ['title', 'folio_no', 'company'];
+ let fields = ["title", "folio_no", "company"];
fields.forEach((fieldname) => {
frm.fields_dict[fieldname].df.read_only = 1;
frm.refresh_fields(fieldname);
@@ -42,11 +41,11 @@ frappe.ui.form.on('Shareholder', {
},
validate: (frm) => {
let contact_list = {
- contacts: []
+ contacts: [],
};
- $('div[data-fieldname=contact_html] > .address-box').each( (index, ele) => {
- contact_list.contacts.push(ele.innerText.replace(' Edit', ''));
+ $("div[data-fieldname=contact_html] > .address-box").each((index, ele) => {
+ contact_list.contacts.push(ele.innerText.replace(" Edit", ""));
});
frm.doc.contact_list = JSON.stringify(contact_list);
- }
+ },
});
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
index 8e4b806f02da..1ece3e6c3dd1 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
@@ -1,33 +1,33 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.provide('erpnext.accounts.dimensions');
+frappe.provide("erpnext.accounts.dimensions");
-frappe.ui.form.on('Shipping Rule', {
- onload: function(frm) {
+frappe.ui.form.on("Shipping Rule", {
+ onload: function (frm) {
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- refresh: function(frm) {
- frm.set_query("account", function() {
+ refresh: function (frm) {
+ frm.set_query("account", function () {
return {
filters: {
- company: frm.doc.company
- }
- }
- })
+ company: frm.doc.company,
+ },
+ };
+ });
- frm.trigger('toggle_reqd');
+ frm.trigger("toggle_reqd");
},
- calculate_based_on: function(frm) {
- frm.trigger('toggle_reqd');
+ calculate_based_on: function (frm) {
+ frm.trigger("toggle_reqd");
+ },
+ toggle_reqd: function (frm) {
+ frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === "Fixed");
+ frm.toggle_reqd("conditions", frm.doc.calculate_based_on !== "Fixed");
},
- toggle_reqd: function(frm) {
- frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === 'Fixed');
- frm.toggle_reqd("conditions", frm.doc.calculate_based_on !== 'Fixed');
- }
});
diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js
index 92f8a3a09787..b3e21abcaae6 100644
--- a/erpnext/accounts/doctype/subscription/subscription.js
+++ b/erpnext/accounts/doctype/subscription/subscription.js
@@ -1,29 +1,29 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Subscription', {
+frappe.ui.form.on("Subscription", {
setup: function (frm) {
- frm.set_query('party_type', function () {
+ frm.set_query("party_type", function () {
return {
filters: {
- name: ['in', ['Customer', 'Supplier']]
- }
- }
+ name: ["in", ["Customer", "Supplier"]],
+ },
+ };
});
- frm.set_query('cost_center', function () {
+ frm.set_query("cost_center", function () {
return {
filters: {
- company: frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
});
- frm.set_query('sales_tax_template', function () {
+ frm.set_query("sales_tax_template", function () {
return {
filters: {
- company: frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
});
},
@@ -31,32 +31,32 @@ frappe.ui.form.on('Subscription', {
refresh: function (frm) {
if (frm.is_new()) return;
- if (frm.doc.status !== 'Cancelled') {
+ if (frm.doc.status !== "Cancelled") {
frm.add_custom_button(
- __('Fetch Subscription Updates'),
- () => frm.trigger('get_subscription_updates'),
- __('Actions')
+ __("Fetch Subscription Updates"),
+ () => frm.trigger("get_subscription_updates"),
+ __("Actions")
);
frm.add_custom_button(
- __('Cancel Subscription'),
- () => frm.trigger('cancel_this_subscription'),
- __('Actions')
+ __("Cancel Subscription"),
+ () => frm.trigger("cancel_this_subscription"),
+ __("Actions")
);
- } else if (frm.doc.status === 'Cancelled') {
+ } else if (frm.doc.status === "Cancelled") {
frm.add_custom_button(
- __('Restart Subscription'),
- () => frm.trigger('renew_this_subscription'),
- __('Actions')
+ __("Restart Subscription"),
+ () => frm.trigger("renew_this_subscription"),
+ __("Actions")
);
}
},
cancel_this_subscription: function (frm) {
frappe.confirm(
- __('This action will stop future billing. Are you sure you want to cancel this subscription?'),
+ __("This action will stop future billing. Are you sure you want to cancel this subscription?"),
() => {
- frm.call('cancel_subscription').then(r => {
+ frm.call("cancel_subscription").then((r) => {
if (!r.exec) {
frm.reload_doc();
}
@@ -66,23 +66,20 @@ frappe.ui.form.on('Subscription', {
},
renew_this_subscription: function (frm) {
- frappe.confirm(
- __('Are you sure you want to restart this subscription?'),
- () => {
- frm.call('restart_subscription').then(r => {
- if (!r.exec) {
- frm.reload_doc();
- }
- });
- }
- );
+ frappe.confirm(__("Are you sure you want to restart this subscription?"), () => {
+ frm.call("restart_subscription").then((r) => {
+ if (!r.exec) {
+ frm.reload_doc();
+ }
+ });
+ });
},
get_subscription_updates: function (frm) {
- frm.call('process').then(r => {
+ frm.call("process").then((r) => {
if (!r.exec) {
frm.reload_doc();
}
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/subscription/subscription_list.js b/erpnext/accounts/doctype/subscription/subscription_list.js
index ea48b535cf2b..bc831d396f27 100644
--- a/erpnext/accounts/doctype/subscription/subscription_list.js
+++ b/erpnext/accounts/doctype/subscription/subscription_list.js
@@ -1,17 +1,17 @@
-frappe.listview_settings['Subscription'] = {
- get_indicator: function(doc) {
- if(doc.status === 'Trialing') {
+frappe.listview_settings["Subscription"] = {
+ get_indicator: function (doc) {
+ if (doc.status === "Trialing") {
return [__("Trialing"), "green"];
- } else if(doc.status === 'Active') {
+ } else if (doc.status === "Active") {
return [__("Active"), "green"];
- } else if(doc.status === 'Completed') {
- return [__("Completed"), "green"];
- } else if(doc.status === 'Past Due Date') {
+ } else if (doc.status === "Completed") {
+ return [__("Completed"), "green"];
+ } else if (doc.status === "Past Due Date") {
return [__("Past Due Date"), "orange"];
- } else if(doc.status === 'Unpaid') {
+ } else if (doc.status === "Unpaid") {
return [__("Unpaid"), "red"];
- } else if(doc.status === 'Cancelled') {
+ } else if (doc.status === "Cancelled") {
return [__("Cancelled"), "gray"];
}
- }
+ },
};
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.js b/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
index 00727f103f98..125dc7dd9ae9 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
@@ -1,10 +1,10 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Subscription Plan', {
- price_determination: function(frm) {
- frm.toggle_reqd("cost", frm.doc.price_determination === 'Fixed rate');
- frm.toggle_reqd("price_list", frm.doc.price_determination === 'Based on price list');
+frappe.ui.form.on("Subscription Plan", {
+ price_determination: function (frm) {
+ frm.toggle_reqd("cost", frm.doc.price_determination === "Fixed rate");
+ frm.toggle_reqd("price_list", frm.doc.price_determination === "Based on price list");
},
subscription_plan: function (frm) {
diff --git a/erpnext/accounts/doctype/tax_category/tax_category.js b/erpnext/accounts/doctype/tax_category/tax_category.js
index 4b63edbde2d2..fe60e037b166 100644
--- a/erpnext/accounts/doctype/tax_category/tax_category.js
+++ b/erpnext/accounts/doctype/tax_category/tax_category.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Tax Category', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Tax Category", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.js b/erpnext/accounts/doctype/tax_rule/tax_rule.js
index bc497163e8b0..b8c68e8d81d5 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.js
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.js
@@ -1,40 +1,40 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on("Tax Rule", "customer", function(frm) {
- if(frm.doc.customer) {
+frappe.ui.form.on("Tax Rule", "customer", function (frm) {
+ if (frm.doc.customer) {
frappe.call({
- method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
+ method: "erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
args: {
- "party": frm.doc.customer,
- "party_type": "customer"
+ party: frm.doc.customer,
+ party_type: "customer",
},
- callback: function(r) {
- if(!r.exc) {
- $.each(r.message, function(k, v) {
+ callback: function (r) {
+ if (!r.exc) {
+ $.each(r.message, function (k, v) {
frm.set_value(k, v);
});
}
- }
+ },
});
}
});
-frappe.ui.form.on("Tax Rule", "supplier", function(frm) {
- if(frm.doc.supplier) {
+frappe.ui.form.on("Tax Rule", "supplier", function (frm) {
+ if (frm.doc.supplier) {
frappe.call({
- method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
+ method: "erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
args: {
- "party": frm.doc.supplier,
- "party_type": "supplier"
+ party: frm.doc.supplier,
+ party_type: "supplier",
},
- callback: function(r) {
- if(!r.exc) {
- $.each(r.message, function(k, v) {
+ callback: function (r) {
+ if (!r.exc) {
+ $.each(r.message, function (k, v) {
frm.set_value(k, v);
});
}
- }
+ },
});
}
});
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js
index 7b4797494655..4f4f32c47474 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.js
@@ -1,18 +1,18 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Tax Withholding Category', {
- setup: function(frm) {
- frm.set_query("account", "accounts", function(doc, cdt, cdn) {
+frappe.ui.form.on("Tax Withholding Category", {
+ setup: function (frm) {
+ frm.set_query("account", "accounts", function (doc, cdt, cdn) {
var child = locals[cdt][cdn];
if (child.company) {
return {
filters: {
- 'company': child.company,
- 'root_type': ['in', ['Asset', 'Liability']]
- }
+ company: child.company,
+ root_type: ["in", ["Asset", "Liability"]],
+ },
};
}
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.js b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.js
index 70cefb13b572..63ae30d9d201 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.js
+++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.js
@@ -3,39 +3,36 @@
frappe.ui.form.on("Unreconcile Payment", {
refresh(frm) {
- frm.set_query("voucher_type", function() {
+ frm.set_query("voucher_type", function () {
return {
filters: {
- name: ["in", ["Payment Entry", "Journal Entry"]]
- }
- }
+ name: ["in", ["Payment Entry", "Journal Entry"]],
+ },
+ };
});
-
- frm.set_query("voucher_no", function(doc) {
+ frm.set_query("voucher_no", function (doc) {
return {
filters: {
company: doc.company,
- docstatus: 1
- }
- }
+ docstatus: 1,
+ },
+ };
});
-
},
- get_allocations: function(frm) {
+ get_allocations: function (frm) {
frm.clear_table("allocations");
frappe.call({
method: "get_allocations_from_payment",
doc: frm.doc,
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- r.message.forEach(x => {
- frm.add_child("allocations", x)
- })
+ r.message.forEach((x) => {
+ frm.add_child("allocations", x);
+ });
frm.refresh_fields();
}
- }
- })
-
- }
+ },
+ });
+ },
});
diff --git a/erpnext/accounts/report/account_balance/account_balance.js b/erpnext/accounts/report/account_balance/account_balance.js
index ab5dce8145b3..f425b2580e5f 100644
--- a/erpnext/accounts/report/account_balance/account_balance.js
+++ b/erpnext/accounts/report/account_balance/account_balance.js
@@ -1,33 +1,32 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Account Balance"] = {
- "filters": [
+ filters: [
{
- fieldname:"company",
+ fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
- default: frappe.defaults.get_user_default("Company")
+ default: frappe.defaults.get_user_default("Company"),
},
{
- fieldname:"report_date",
+ fieldname: "report_date",
label: __("Date"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "root_type",
label: __("Root Type"),
fieldtype: "Select",
options: [
- { "value": "Asset", "label": __("Asset") },
- { "value": "Liability", "label": __("Liability") },
- { "value": "Income", "label": __("Income") },
- { "value": "Expense", "label": __("Expense") },
- { "value": "Equity", "label": __("Equity") }
+ { value: "Asset", label: __("Asset") },
+ { value: "Liability", label: __("Liability") },
+ { value: "Income", label: __("Income") },
+ { value: "Expense", label: __("Expense") },
+ { value: "Equity", label: __("Equity") },
],
},
{
@@ -35,30 +34,32 @@ frappe.query_reports["Account Balance"] = {
label: __("Account Type"),
fieldtype: "Select",
options: [
- { "value": "Accumulated Depreciation", "label": __("Accumulated Depreciation") },
- { "value": "Asset Received But Not Billed", "label": __("Asset Received But Not Billed") },
- { "value": "Bank", "label": __("Bank") },
- { "value": "Cash", "label": __("Cash") },
- { "value": "Chargeable", "label": __("Chargeable") },
- { "value": "Capital Work in Progress", "label": __("Capital Work in Progress") },
- { "value": "Cost of Goods Sold", "label": __("Cost of Goods Sold") },
- { "value": "Depreciation", "label": __("Depreciation") },
- { "value": "Equity", "label": __("Equity") },
- { "value": "Expense Account", "label": __("Expense Account") },
- { "value": "Expenses Included In Asset Valuation", "label": __("Expenses Included In Asset Valuation") },
- { "value": "Expenses Included In Valuation", "label": __("Expenses Included In Valuation") },
- { "value": "Fixed Asset", "label": __("Fixed Asset") },
- { "value": "Income Account", "label": __("Income Account") },
- { "value": "Payable", "label": __("Payable") },
- { "value": "Receivable", "label": __("Receivable") },
- { "value": "Round Off", "label": __("Round Off") },
- { "value": "Stock", "label": __("Stock") },
- { "value": "Stock Adjustment", "label": __("Stock Adjustment") },
- { "value": "Stock Received But Not Billed", "label": __("Stock Received But Not Billed") },
- { "value": "Tax", "label": __("Tax") },
- { "value": "Temporary", "label": __("Temporary") },
+ { value: "Accumulated Depreciation", label: __("Accumulated Depreciation") },
+ { value: "Asset Received But Not Billed", label: __("Asset Received But Not Billed") },
+ { value: "Bank", label: __("Bank") },
+ { value: "Cash", label: __("Cash") },
+ { value: "Chargeable", label: __("Chargeable") },
+ { value: "Capital Work in Progress", label: __("Capital Work in Progress") },
+ { value: "Cost of Goods Sold", label: __("Cost of Goods Sold") },
+ { value: "Depreciation", label: __("Depreciation") },
+ { value: "Equity", label: __("Equity") },
+ { value: "Expense Account", label: __("Expense Account") },
+ {
+ value: "Expenses Included In Asset Valuation",
+ label: __("Expenses Included In Asset Valuation"),
+ },
+ { value: "Expenses Included In Valuation", label: __("Expenses Included In Valuation") },
+ { value: "Fixed Asset", label: __("Fixed Asset") },
+ { value: "Income Account", label: __("Income Account") },
+ { value: "Payable", label: __("Payable") },
+ { value: "Receivable", label: __("Receivable") },
+ { value: "Round Off", label: __("Round Off") },
+ { value: "Stock", label: __("Stock") },
+ { value: "Stock Adjustment", label: __("Stock Adjustment") },
+ { value: "Stock Received But Not Billed", label: __("Stock Received But Not Billed") },
+ { value: "Tax", label: __("Tax") },
+ { value: "Temporary", label: __("Temporary") },
],
},
-
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index b608ebc3953a..f5402240aa40 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -2,193 +2,194 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Accounts Payable"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname": "report_date",
- "label": __("Posting Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "report_date",
+ label: __("Posting Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname": "finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname": "cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center",
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company
- }
- }
- }
+ company: company,
+ },
+ };
+ },
},
{
- "fieldname": "party_account",
- "label": __("Payable Account"),
- "fieldtype": "Link",
- "options": "Account",
+ fieldname: "party_account",
+ label: __("Payable Account"),
+ fieldtype: "Link",
+ options: "Account",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company,
- 'account_type': 'Payable',
- 'is_group': 0
- }
+ company: company,
+ account_type: "Payable",
+ is_group: 0,
+ },
};
- }
+ },
},
{
- "fieldname": "ageing_based_on",
- "label": __("Ageing Based On"),
- "fieldtype": "Select",
- "options": 'Posting Date\nDue Date\nSupplier Invoice Date',
- "default": "Due Date"
+ fieldname: "ageing_based_on",
+ label: __("Ageing Based On"),
+ fieldtype: "Select",
+ options: "Posting Date\nDue Date\nSupplier Invoice Date",
+ default: "Due Date",
},
{
- "fieldname": "range1",
- "label": __("Ageing Range 1"),
- "fieldtype": "Int",
- "default": "30",
- "reqd": 1
+ fieldname: "range1",
+ label: __("Ageing Range 1"),
+ fieldtype: "Int",
+ default: "30",
+ reqd: 1,
},
{
- "fieldname": "range2",
- "label": __("Ageing Range 2"),
- "fieldtype": "Int",
- "default": "60",
- "reqd": 1
+ fieldname: "range2",
+ label: __("Ageing Range 2"),
+ fieldtype: "Int",
+ default: "60",
+ reqd: 1,
},
{
- "fieldname": "range3",
- "label": __("Ageing Range 3"),
- "fieldtype": "Int",
- "default": "90",
- "reqd": 1
+ fieldname: "range3",
+ label: __("Ageing Range 3"),
+ fieldtype: "Int",
+ default: "90",
+ reqd: 1,
},
{
- "fieldname": "range4",
- "label": __("Ageing Range 4"),
- "fieldtype": "Int",
- "default": "120",
- "reqd": 1
+ fieldname: "range4",
+ label: __("Ageing Range 4"),
+ fieldtype: "Int",
+ default: "120",
+ reqd: 1,
},
{
- "fieldname": "payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Autocomplete",
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Autocomplete",
options: get_party_type_options(),
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- frappe.query_report.toggle_filter_display('supplier_group', frappe.query_report.get_filter_value('party_type') !== "Supplier");
- }
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ frappe.query_report.toggle_filter_display(
+ "supplier_group",
+ frappe.query_report.get_filter_value("party_type") !== "Supplier"
+ );
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
},
{
- "fieldname": "supplier_group",
- "label": __("Supplier Group"),
- "fieldtype": "Link",
- "options": "Supplier Group",
- "hidden": 1
+ fieldname: "supplier_group",
+ label: __("Supplier Group"),
+ fieldtype: "Link",
+ options: "Supplier Group",
+ hidden: 1,
},
{
- "fieldname": "group_by_party",
- "label": __("Group By Supplier"),
- "fieldtype": "Check"
+ fieldname: "group_by_party",
+ label: __("Group By Supplier"),
+ fieldtype: "Check",
},
{
- "fieldname": "based_on_payment_terms",
- "label": __("Based On Payment Terms"),
- "fieldtype": "Check",
+ fieldname: "based_on_payment_terms",
+ label: __("Based On Payment Terms"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_remarks",
- "label": __("Show Remarks"),
- "fieldtype": "Check",
+ fieldname: "show_remarks",
+ label: __("Show Remarks"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_future_payments",
- "label": __("Show Future Payments"),
- "fieldtype": "Check",
+ fieldname: "show_future_payments",
+ label: __("Show Future Payments"),
+ fieldtype: "Check",
},
{
- "fieldname": "in_party_currency",
- "label": __("In Party Currency"),
- "fieldtype": "Check",
+ fieldname: "in_party_currency",
+ label: __("In Party Currency"),
+ fieldtype: "Check",
},
{
- "fieldname": "for_revaluation_journals",
- "label": __("Revaluation Journals"),
- "fieldtype": "Check",
+ fieldname: "for_revaluation_journals",
+ label: __("Revaluation Journals"),
+ fieldtype: "Check",
},
{
- "fieldname": "ignore_accounts",
- "label": __("Group by Voucher"),
- "fieldtype": "Check",
- }
-
+ fieldname: "ignore_accounts",
+ label: __("Group by Voucher"),
+ fieldtype: "Check",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (data && data.bold) {
value = value.bold();
-
}
return value;
},
- onload: function(report) {
- report.page.add_inner_button(__("Accounts Payable Summary"), function() {
+ onload: function (report) {
+ report.page.add_inner_button(__("Accounts Payable Summary"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Accounts Payable Summary', {company: filters.company});
+ frappe.set_route("query-report", "Accounts Payable Summary", { company: filters.company });
});
- }
-}
+ },
+};
-erpnext.utils.add_dimensions('Accounts Payable', 9);
+erpnext.utils.add_dimensions("Accounts Payable", 9);
function get_party_type_options() {
let options = [];
- frappe.db.get_list(
- "Party Type", {filters:{"account_type": "Payable"}, fields:['name']}
- ).then((res) => {
- res.forEach((party_type) => {
- options.push(party_type.name);
+ frappe.db
+ .get_list("Party Type", { filters: { account_type: "Payable" }, fields: ["name"] })
+ .then((res) => {
+ res.forEach((party_type) => {
+ options.push(party_type.name);
+ });
});
- });
return options;
}
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
index 0f206b1cf421..92ea9e8f598f 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -2,140 +2,143 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Accounts Payable Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"report_date",
- "label": __("Posting Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "report_date",
+ label: __("Posting Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"ageing_based_on",
- "label": __("Ageing Based On"),
- "fieldtype": "Select",
- "options": 'Posting Date\nDue Date',
- "default": "Due Date"
+ fieldname: "ageing_based_on",
+ label: __("Ageing Based On"),
+ fieldtype: "Select",
+ options: "Posting Date\nDue Date",
+ default: "Due Date",
},
{
- "fieldname":"range1",
- "label": __("Ageing Range 1"),
- "fieldtype": "Int",
- "default": "30",
- "reqd": 1
+ fieldname: "range1",
+ label: __("Ageing Range 1"),
+ fieldtype: "Int",
+ default: "30",
+ reqd: 1,
},
{
- "fieldname":"range2",
- "label": __("Ageing Range 2"),
- "fieldtype": "Int",
- "default": "60",
- "reqd": 1
+ fieldname: "range2",
+ label: __("Ageing Range 2"),
+ fieldtype: "Int",
+ default: "60",
+ reqd: 1,
},
{
- "fieldname":"range3",
- "label": __("Ageing Range 3"),
- "fieldtype": "Int",
- "default": "90",
- "reqd": 1
+ fieldname: "range3",
+ label: __("Ageing Range 3"),
+ fieldtype: "Int",
+ default: "90",
+ reqd: 1,
},
{
- "fieldname":"range4",
- "label": __("Ageing Range 4"),
- "fieldtype": "Int",
- "default": "120",
- "reqd": 1
+ fieldname: "range4",
+ label: __("Ageing Range 4"),
+ fieldtype: "Int",
+ default: "120",
+ reqd: 1,
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center",
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company
- }
- }
- }
+ company: company,
+ },
+ };
+ },
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Autocomplete",
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Autocomplete",
options: get_party_type_options(),
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- frappe.query_report.toggle_filter_display('supplier_group', frappe.query_report.get_filter_value('party_type') !== "Supplier");
- }
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ frappe.query_report.toggle_filter_display(
+ "supplier_group",
+ frappe.query_report.get_filter_value("party_type") !== "Supplier"
+ );
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
},
{
- "fieldname":"payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname":"supplier_group",
- "label": __("Supplier Group"),
- "fieldtype": "Link",
- "options": "Supplier Group"
+ fieldname: "supplier_group",
+ label: __("Supplier Group"),
+ fieldtype: "Link",
+ options: "Supplier Group",
},
{
- "fieldname":"based_on_payment_terms",
- "label": __("Based On Payment Terms"),
- "fieldtype": "Check",
+ fieldname: "based_on_payment_terms",
+ label: __("Based On Payment Terms"),
+ fieldtype: "Check",
},
{
- "fieldname": "for_revaluation_journals",
- "label": __("Revaluation Journals"),
- "fieldtype": "Check",
- }
+ fieldname: "for_revaluation_journals",
+ label: __("Revaluation Journals"),
+ fieldtype: "Check",
+ },
],
- onload: function(report) {
- report.page.add_inner_button(__("Accounts Payable"), function() {
+ onload: function (report) {
+ report.page.add_inner_button(__("Accounts Payable"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Accounts Payable', {company: filters.company});
+ frappe.set_route("query-report", "Accounts Payable", { company: filters.company });
});
- }
-}
+ },
+};
-erpnext.utils.add_dimensions('Accounts Payable Summary', 9);
+erpnext.utils.add_dimensions("Accounts Payable Summary", 9);
function get_party_type_options() {
let options = [];
- frappe.db.get_list(
- "Party Type", {filters:{"account_type": "Payable"}, fields:['name']}
- ).then((res) => {
- res.forEach((party_type) => {
- options.push(party_type.name);
+ frappe.db
+ .get_list("Party Type", { filters: { account_type: "Payable" }, fields: ["name"] })
+ .then((res) => {
+ res.forEach((party_type) => {
+ options.push(party_type.name);
+ });
});
- });
return options;
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index b4bc8870d36c..0daf79e09c73 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -4,225 +4,224 @@
frappe.provide("erpnext.utils");
frappe.query_reports["Accounts Receivable"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname": "report_date",
- "label": __("Posting Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "report_date",
+ label: __("Posting Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname": "finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname": "cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center",
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company
- }
+ company: company,
+ },
};
- }
+ },
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Autocomplete",
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Autocomplete",
options: get_party_type_options(),
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- frappe.query_report.toggle_filter_display('customer_group', frappe.query_report.get_filter_value('party_type') !== "Customer");
- }
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ frappe.query_report.toggle_filter_display(
+ "customer_group",
+ frappe.query_report.get_filter_value("party_type") !== "Customer"
+ );
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
},
{
- "fieldname": "party_account",
- "label": __("Receivable Account"),
- "fieldtype": "Link",
- "options": "Account",
+ fieldname: "party_account",
+ label: __("Receivable Account"),
+ fieldtype: "Link",
+ options: "Account",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company,
- 'account_type': 'Receivable',
- 'is_group': 0
- }
+ company: company,
+ account_type: "Receivable",
+ is_group: 0,
+ },
};
- }
+ },
},
{
- "fieldname": "ageing_based_on",
- "label": __("Ageing Based On"),
- "fieldtype": "Select",
- "options": 'Posting Date\nDue Date',
- "default": "Due Date"
+ fieldname: "ageing_based_on",
+ label: __("Ageing Based On"),
+ fieldtype: "Select",
+ options: "Posting Date\nDue Date",
+ default: "Due Date",
},
{
- "fieldname": "range1",
- "label": __("Ageing Range 1"),
- "fieldtype": "Int",
- "default": "30",
- "reqd": 1
+ fieldname: "range1",
+ label: __("Ageing Range 1"),
+ fieldtype: "Int",
+ default: "30",
+ reqd: 1,
},
{
- "fieldname": "range2",
- "label": __("Ageing Range 2"),
- "fieldtype": "Int",
- "default": "60",
- "reqd": 1
+ fieldname: "range2",
+ label: __("Ageing Range 2"),
+ fieldtype: "Int",
+ default: "60",
+ reqd: 1,
},
{
- "fieldname": "range3",
- "label": __("Ageing Range 3"),
- "fieldtype": "Int",
- "default": "90",
- "reqd": 1
+ fieldname: "range3",
+ label: __("Ageing Range 3"),
+ fieldtype: "Int",
+ default: "90",
+ reqd: 1,
},
{
- "fieldname": "range4",
- "label": __("Ageing Range 4"),
- "fieldtype": "Int",
- "default": "120",
- "reqd": 1
+ fieldname: "range4",
+ label: __("Ageing Range 4"),
+ fieldtype: "Int",
+ default: "120",
+ reqd: 1,
},
{
- "fieldname":"customer_group",
- "label": __("Customer Group"),
- "fieldtype": "MultiSelectList",
- "options": "Customer Group",
- get_data: function(txt) {
- return frappe.db.get_link_options('Customer Group', txt);
- }
+ fieldname: "customer_group",
+ label: __("Customer Group"),
+ fieldtype: "MultiSelectList",
+ options: "Customer Group",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Customer Group", txt);
+ },
},
{
- "fieldname": "payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname": "sales_partner",
- "label": __("Sales Partner"),
- "fieldtype": "Link",
- "options": "Sales Partner"
+ fieldname: "sales_partner",
+ label: __("Sales Partner"),
+ fieldtype: "Link",
+ options: "Sales Partner",
},
{
- "fieldname": "sales_person",
- "label": __("Sales Person"),
- "fieldtype": "Link",
- "options": "Sales Person"
+ fieldname: "sales_person",
+ label: __("Sales Person"),
+ fieldtype: "Link",
+ options: "Sales Person",
},
{
- "fieldname": "territory",
- "label": __("Territory"),
- "fieldtype": "Link",
- "options": "Territory"
+ fieldname: "territory",
+ label: __("Territory"),
+ fieldtype: "Link",
+ options: "Territory",
},
{
- "fieldname": "group_by_party",
- "label": __("Group By Customer"),
- "fieldtype": "Check"
+ fieldname: "group_by_party",
+ label: __("Group By Customer"),
+ fieldtype: "Check",
},
{
- "fieldname": "based_on_payment_terms",
- "label": __("Based On Payment Terms"),
- "fieldtype": "Check",
+ fieldname: "based_on_payment_terms",
+ label: __("Based On Payment Terms"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_future_payments",
- "label": __("Show Future Payments"),
- "fieldtype": "Check",
+ fieldname: "show_future_payments",
+ label: __("Show Future Payments"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_delivery_notes",
- "label": __("Show Linked Delivery Notes"),
- "fieldtype": "Check",
+ fieldname: "show_delivery_notes",
+ label: __("Show Linked Delivery Notes"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_sales_person",
- "label": __("Show Sales Person"),
- "fieldtype": "Check",
+ fieldname: "show_sales_person",
+ label: __("Show Sales Person"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_remarks",
- "label": __("Show Remarks"),
- "fieldtype": "Check",
+ fieldname: "show_remarks",
+ label: __("Show Remarks"),
+ fieldtype: "Check",
},
{
- "fieldname": "in_party_currency",
- "label": __("In Party Currency"),
- "fieldtype": "Check",
+ fieldname: "in_party_currency",
+ label: __("In Party Currency"),
+ fieldtype: "Check",
},
{
- "fieldname": "for_revaluation_journals",
- "label": __("Revaluation Journals"),
- "fieldtype": "Check",
+ fieldname: "for_revaluation_journals",
+ label: __("Revaluation Journals"),
+ fieldtype: "Check",
},
{
- "fieldname": "ignore_accounts",
- "label": __("Group by Voucher"),
- "fieldtype": "Check",
- }
-
-
+ fieldname: "ignore_accounts",
+ label: __("Group by Voucher"),
+ fieldtype: "Check",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (data && data.bold) {
value = value.bold();
-
}
return value;
},
- onload: function(report) {
- report.page.add_inner_button(__("Accounts Receivable Summary"), function() {
+ onload: function (report) {
+ report.page.add_inner_button(__("Accounts Receivable Summary"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Accounts Receivable Summary', {company: filters.company});
+ frappe.set_route("query-report", "Accounts Receivable Summary", { company: filters.company });
});
- }
-}
-
-erpnext.utils.add_dimensions('Accounts Receivable', 9);
+ },
+};
+erpnext.utils.add_dimensions("Accounts Receivable", 9);
function get_party_type_options() {
let options = [];
- frappe.db.get_list(
- "Party Type", {filters:{"account_type": "Receivable"}, fields:['name']}
- ).then((res) => {
- res.forEach((party_type) => {
- options.push(party_type.name);
+ frappe.db
+ .get_list("Party Type", { filters: { account_type: "Receivable" }, fields: ["name"] })
+ .then((res) => {
+ res.forEach((party_type) => {
+ options.push(party_type.name);
+ });
});
- });
return options;
}
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
index 2f6d2582b338..964abc23747d 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -2,168 +2,171 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Accounts Receivable Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"report_date",
- "label": __("Posting Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "report_date",
+ label: __("Posting Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"ageing_based_on",
- "label": __("Ageing Based On"),
- "fieldtype": "Select",
- "options": 'Posting Date\nDue Date',
- "default": "Due Date"
+ fieldname: "ageing_based_on",
+ label: __("Ageing Based On"),
+ fieldtype: "Select",
+ options: "Posting Date\nDue Date",
+ default: "Due Date",
},
{
- "fieldname":"range1",
- "label": __("Ageing Range 1"),
- "fieldtype": "Int",
- "default": "30",
- "reqd": 1
+ fieldname: "range1",
+ label: __("Ageing Range 1"),
+ fieldtype: "Int",
+ default: "30",
+ reqd: 1,
},
{
- "fieldname":"range2",
- "label": __("Ageing Range 2"),
- "fieldtype": "Int",
- "default": "60",
- "reqd": 1
+ fieldname: "range2",
+ label: __("Ageing Range 2"),
+ fieldtype: "Int",
+ default: "60",
+ reqd: 1,
},
{
- "fieldname":"range3",
- "label": __("Ageing Range 3"),
- "fieldtype": "Int",
- "default": "90",
- "reqd": 1
+ fieldname: "range3",
+ label: __("Ageing Range 3"),
+ fieldtype: "Int",
+ default: "90",
+ reqd: 1,
},
{
- "fieldname":"range4",
- "label": __("Ageing Range 4"),
- "fieldtype": "Int",
- "default": "120",
- "reqd": 1
+ fieldname: "range4",
+ label: __("Ageing Range 4"),
+ fieldtype: "Int",
+ default: "120",
+ reqd: 1,
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center",
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company
- }
- }
- }
+ company: company,
+ },
+ };
+ },
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Autocomplete",
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Autocomplete",
options: get_party_type_options(),
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- frappe.query_report.toggle_filter_display('customer_group', frappe.query_report.get_filter_value('party_type') !== "Customer");
- }
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ frappe.query_report.toggle_filter_display(
+ "customer_group",
+ frappe.query_report.get_filter_value("party_type") !== "Customer"
+ );
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
},
{
- "fieldname":"customer_group",
- "label": __("Customer Group"),
- "fieldtype": "Link",
- "options": "Customer Group"
+ fieldname: "customer_group",
+ label: __("Customer Group"),
+ fieldtype: "Link",
+ options: "Customer Group",
},
{
- "fieldname":"payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname":"territory",
- "label": __("Territory"),
- "fieldtype": "Link",
- "options": "Territory"
+ fieldname: "territory",
+ label: __("Territory"),
+ fieldtype: "Link",
+ options: "Territory",
},
{
- "fieldname":"sales_partner",
- "label": __("Sales Partner"),
- "fieldtype": "Link",
- "options": "Sales Partner"
+ fieldname: "sales_partner",
+ label: __("Sales Partner"),
+ fieldtype: "Link",
+ options: "Sales Partner",
},
{
- "fieldname":"sales_person",
- "label": __("Sales Person"),
- "fieldtype": "Link",
- "options": "Sales Person"
+ fieldname: "sales_person",
+ label: __("Sales Person"),
+ fieldtype: "Link",
+ options: "Sales Person",
},
{
- "fieldname":"based_on_payment_terms",
- "label": __("Based On Payment Terms"),
- "fieldtype": "Check",
+ fieldname: "based_on_payment_terms",
+ label: __("Based On Payment Terms"),
+ fieldtype: "Check",
},
{
- "fieldname":"show_future_payments",
- "label": __("Show Future Payments"),
- "fieldtype": "Check",
+ fieldname: "show_future_payments",
+ label: __("Show Future Payments"),
+ fieldtype: "Check",
},
{
- "fieldname":"show_gl_balance",
- "label": __("Show GL Balance"),
- "fieldtype": "Check",
+ fieldname: "show_gl_balance",
+ label: __("Show GL Balance"),
+ fieldtype: "Check",
},
{
- "fieldname": "for_revaluation_journals",
- "label": __("Revaluation Journals"),
- "fieldtype": "Check",
- }
+ fieldname: "for_revaluation_journals",
+ label: __("Revaluation Journals"),
+ fieldtype: "Check",
+ },
],
- onload: function(report) {
- report.page.add_inner_button(__("Accounts Receivable"), function() {
+ onload: function (report) {
+ report.page.add_inner_button(__("Accounts Receivable"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Accounts Receivable', { company: filters.company });
+ frappe.set_route("query-report", "Accounts Receivable", { company: filters.company });
});
- }
-}
+ },
+};
-erpnext.utils.add_dimensions('Accounts Receivable Summary', 9);
+erpnext.utils.add_dimensions("Accounts Receivable Summary", 9);
function get_party_type_options() {
let options = [];
- frappe.db.get_list(
- "Party Type", {filters:{"account_type": "Receivable"}, fields:['name']}
- ).then((res) => {
- res.forEach((party_type) => {
- options.push(party_type.name);
+ frappe.db
+ .get_list("Party Type", { filters: { account_type: "Receivable" }, fields: ["name"] })
+ .then((res) => {
+ res.forEach((party_type) => {
+ options.push(party_type.name);
+ });
});
- });
return options;
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
index 12b94347e00f..db49ccb79a8d 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
@@ -2,58 +2,58 @@
// For license information, please see license.txt
frappe.query_reports["Asset Depreciation Ledger"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"asset",
- "label": __("Asset"),
- "fieldtype": "Link",
- "options": "Asset"
+ fieldname: "asset",
+ label: __("Asset"),
+ fieldtype: "Link",
+ options: "Asset",
},
{
- "fieldname":"asset_category",
- "label": __("Asset Category"),
- "fieldtype": "Link",
- "options": "Asset Category"
+ fieldname: "asset_category",
+ label: __("Asset Category"),
+ fieldtype: "Link",
+ options: "Asset Category",
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center"
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname": "include_default_book_assets",
- "label": __("Include Default FB Assets"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_default_book_assets",
+ label: __("Include Default FB Assets"),
+ fieldtype: "Check",
+ default: 1,
},
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
index 06fa9f3175d2..49771d7ebe9f 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
@@ -2,49 +2,49 @@
// For license information, please see license.txt
frappe.query_reports["Asset Depreciations and Balances"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ reqd: 1,
},
{
- "fieldname":"group_by",
- "label": __("Group By"),
- "fieldtype": "Select",
- "options": ["Asset Category", "Asset"],
- "default": "Asset Category",
+ fieldname: "group_by",
+ label: __("Group By"),
+ fieldtype: "Select",
+ options: ["Asset Category", "Asset"],
+ default: "Asset Category",
},
{
- "fieldname":"asset_category",
- "label": __("Asset Category"),
- "fieldtype": "Link",
- "options": "Asset Category",
- "depends_on": "eval: doc.group_by == 'Asset Category'",
+ fieldname: "asset_category",
+ label: __("Asset Category"),
+ fieldtype: "Link",
+ options: "Asset Category",
+ depends_on: "eval: doc.group_by == 'Asset Category'",
},
{
- "fieldname":"asset",
- "label": __("Asset"),
- "fieldtype": "Link",
- "options": "Asset",
- "depends_on": "eval: doc.group_by == 'Asset'",
+ fieldname: "asset",
+ label: __("Asset"),
+ fieldtype: "Link",
+ options: "Asset",
+ depends_on: "eval: doc.group_by == 'Asset'",
},
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.js b/erpnext/accounts/report/balance_sheet/balance_sheet.js
index 5525024b8951..0863c68009a6 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.js
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.js
@@ -1,26 +1,21 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.query_reports["Balance Sheet"] = $.extend(
- {},
- erpnext.financial_statements
-);
+frappe.query_reports["Balance Sheet"] = $.extend({}, erpnext.financial_statements);
erpnext.utils.add_dimensions("Balance Sheet", 10);
-frappe.query_reports["Balance Sheet"]["filters"].push(
- {
- "fieldname": "selected_view",
- "label": __("Select View"),
- "fieldtype": "Select",
- "options": [
- { "value": "Report", "label": __("Report View") },
- { "value": "Growth", "label": __("Growth View") }
- ],
- "default": "Report",
- "reqd": 1
- },
-);
+frappe.query_reports["Balance Sheet"]["filters"].push({
+ fieldname: "selected_view",
+ label: __("Select View"),
+ fieldtype: "Select",
+ options: [
+ { value: "Report", label: __("Report View") },
+ { value: "Growth", label: __("Growth View") },
+ ],
+ default: "Report",
+ reqd: 1,
+});
frappe.query_reports["Balance Sheet"]["filters"].push({
fieldname: "accumulated_values",
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
index 8a7d071a474b..e8ae2a1dabe1 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
@@ -2,37 +2,38 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Bank Clearance Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ width: "80",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"account",
- "label": __("Bank Account"),
- "fieldtype": "Link",
- "options": "Account",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")?
- locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
- "get_query": function() {
+ fieldname: "account",
+ label: __("Bank Account"),
+ fieldtype: "Link",
+ options: "Account",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company")
+ ? locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]
+ : "",
+ get_query: function () {
return {
- "query": "erpnext.controllers.queries.get_account_list",
- "filters": [
- ['Account', 'account_type', 'in', 'Bank, Cash'],
- ['Account', 'is_group', '=', 0],
- ]
- }
- }
+ query: "erpnext.controllers.queries.get_account_list",
+ filters: [
+ ["Account", "account_type", "in", "Bank, Cash"],
+ ["Account", "is_group", "=", 0],
+ ],
+ };
+ },
},
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
index 9bb6a14c6778..efcfa7a5ee59 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
@@ -2,47 +2,48 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Bank Reconciliation Statement"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"account",
- "label": __("Bank Account"),
- "fieldtype": "Link",
- "options": "Account",
- "default": frappe.defaults.get_user_default("Company")?
- locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
- "reqd": 1,
- "get_query": function() {
- var company = frappe.query_report.get_filter_value('company')
+ fieldname: "account",
+ label: __("Bank Account"),
+ fieldtype: "Link",
+ options: "Account",
+ default: frappe.defaults.get_user_default("Company")
+ ? locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]
+ : "",
+ reqd: 1,
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
- "query": "erpnext.controllers.queries.get_account_list",
- "filters": [
- ['Account', 'account_type', 'in', 'Bank, Cash'],
- ['Account', 'is_group', '=', 0],
- ['Account', 'disabled', '=', 0],
- ['Account', 'company', '=', company],
- ]
- }
- }
+ query: "erpnext.controllers.queries.get_account_list",
+ filters: [
+ ["Account", "account_type", "in", "Bank, Cash"],
+ ["Account", "is_group", "=", 0],
+ ["Account", "disabled", "=", 0],
+ ["Account", "company", "=", company],
+ ],
+ };
+ },
},
{
- "fieldname":"report_date",
- "label": __("Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "report_date",
+ label: __("Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"include_pos_transactions",
- "label": __("Include POS Transactions"),
- "fieldtype": "Check"
+ fieldname: "include_pos_transactions",
+ label: __("Include POS Transactions"),
+ fieldtype: "Check",
},
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js
index 7617ed1e2273..c8407c2fcb27 100644
--- a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js
+++ b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js
@@ -1,29 +1,28 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
-frappe.query_reports['Billed Items To Be Received'] = {
- 'filters': [
+frappe.query_reports["Billed Items To Be Received"] = {
+ filters: [
{
- 'label': __('Company'),
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'options': 'Company',
- 'reqd': 1,
- 'default': frappe.defaults.get_default('Company')
+ label: __("Company"),
+ fieldname: "company",
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_default("Company"),
},
{
- 'label': __('As on Date'),
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
- 'reqd': 1,
- 'default': frappe.datetime.get_today()
+ label: __("As on Date"),
+ fieldname: "posting_date",
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- 'label': __('Purchase Invoice'),
- 'fieldname': 'purchase_invoice',
- 'fieldtype': 'Link',
- 'options': 'Purchase Invoice'
- }
- ]
+ label: __("Purchase Invoice"),
+ fieldname: "purchase_invoice",
+ fieldtype: "Link",
+ options: "Purchase Invoice",
+ },
+ ],
};
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index d6a4755d6ae3..83bd48c71f31 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -2,37 +2,35 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Budget Variance Report"] = {
- "filters": get_filters(),
- "formatter": function (value, row, column, data, default_formatter) {
+ filters: get_filters(),
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (column.fieldname.includes(__("variance"))) {
-
if (data[column.fieldname] < 0) {
value = "" + value + " ";
- }
- else if (data[column.fieldname] > 0) {
+ } else if (data[column.fieldname] > 0) {
value = "" + value + " ";
}
}
return value;
- }
-}
+ },
+};
function get_filters() {
function get_dimensions() {
let result = [];
frappe.call({
method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimensions",
args: {
- 'with_cost_center_and_project': true
+ with_cost_center_and_project: true,
},
async: false,
- callback: function(r) {
- if(!r.exc) {
- result = r.message[0].map(elem => elem.document_type);
+ callback: function (r) {
+ if (!r.exc) {
+ result = r.message[0].map((elem) => elem.document_type);
}
- }
+ },
});
return result;
}
@@ -46,7 +44,7 @@ function get_filters() {
fieldtype: "Link",
options: "Fiscal Year",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "to_fiscal_year",
@@ -54,20 +52,20 @@ function get_filters() {
fieldtype: "Link",
options: "Fiscal Year",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "period",
label: __("Period"),
fieldtype: "Select",
options: [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
default: "Yearly",
- reqd: 1
+ reqd: 1,
},
{
fieldname: "company",
@@ -75,7 +73,7 @@ function get_filters() {
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "budget_against",
@@ -84,32 +82,31 @@ function get_filters() {
options: budget_against_options,
default: "Cost Center",
reqd: 1,
- on_change: function() {
+ on_change: function () {
frappe.query_report.set_filter_value("budget_against_filter", []);
frappe.query_report.refresh();
- }
+ },
},
{
- fieldname:"budget_against_filter",
- label: __('Dimension Filter'),
+ fieldname: "budget_against_filter",
+ label: __("Dimension Filter"),
fieldtype: "MultiSelectList",
- get_data: function(txt) {
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let budget_against = frappe.query_report.get_filter_value('budget_against');
+ let budget_against = frappe.query_report.get_filter_value("budget_against");
if (!budget_against) return;
return frappe.db.get_link_options(budget_against, txt);
- }
+ },
},
{
- fieldname:"show_cumulative",
+ fieldname: "show_cumulative",
label: __("Show Cumulative Amount"),
fieldtype: "Check",
default: 0,
},
- ]
+ ];
return filters;
}
-
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js
index ef17eb15034c..c824f0d9f384 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -1,12 +1,9 @@
// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.query_reports["Cash Flow"] = $.extend(
- {},
- erpnext.financial_statements
-);
+frappe.query_reports["Cash Flow"] = $.extend({}, erpnext.financial_statements);
-erpnext.utils.add_dimensions('Cash Flow', 10);
+erpnext.utils.add_dimensions("Cash Flow", 10);
// The last item in the array is the definition for Presentation Currency
// filter. It won't be used in cash flow for now so we pop it. Please take
@@ -14,11 +11,9 @@ erpnext.utils.add_dimensions('Cash Flow', 10);
frappe.query_reports["Cash Flow"]["filters"].splice(8, 1);
-frappe.query_reports["Cash Flow"]["filters"].push(
- {
- "fieldname": "include_default_book_entries",
- "label": __("Include Default FB Entries"),
- "fieldtype": "Check",
- "default": 1
- }
-);
+frappe.query_reports["Cash Flow"]["filters"].push({
+ fieldname: "include_default_book_entries",
+ label: __("Include Default FB Entries"),
+ fieldtype: "Check",
+ default: 1,
+});
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
index 6210fd17f106..5cd12aa0e5aa 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
@@ -1,121 +1,145 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Consolidated Financial Statement"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"filter_based_on",
- "label": __("Filter Based On"),
- "fieldtype": "Select",
- "options": ["Fiscal Year", "Date Range"],
- "default": ["Fiscal Year"],
- "reqd": 1,
- on_change: function() {
- let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
- frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('period_start_date', filter_based_on === 'Fiscal Year');
- frappe.query_report.toggle_filter_display('period_end_date', filter_based_on === 'Fiscal Year');
+ fieldname: "filter_based_on",
+ label: __("Filter Based On"),
+ fieldtype: "Select",
+ options: ["Fiscal Year", "Date Range"],
+ default: ["Fiscal Year"],
+ reqd: 1,
+ on_change: function () {
+ let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
+ frappe.query_report.toggle_filter_display(
+ "from_fiscal_year",
+ filter_based_on === "Date Range"
+ );
+ frappe.query_report.toggle_filter_display("to_fiscal_year", filter_based_on === "Date Range");
+ frappe.query_report.toggle_filter_display(
+ "period_start_date",
+ filter_based_on === "Fiscal Year"
+ );
+ frappe.query_report.toggle_filter_display(
+ "period_end_date",
+ filter_based_on === "Fiscal Year"
+ );
frappe.query_report.refresh();
- }
+ },
},
{
- "fieldname":"period_start_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "hidden": 1,
- "reqd": 1
+ fieldname: "period_start_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ hidden: 1,
+ reqd: 1,
},
{
- "fieldname":"period_end_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "hidden": 1,
- "reqd": 1
+ fieldname: "period_end_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ hidden: 1,
+ reqd: 1,
},
{
- "fieldname":"from_fiscal_year",
- "label": __("Start Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
+ fieldname: "from_fiscal_year",
+ label: __("Start Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
on_change: () => {
- frappe.model.with_doc("Fiscal Year", frappe.query_report.get_filter_value('from_fiscal_year'), function(r) {
- let year_start_date = frappe.model.get_value("Fiscal Year", frappe.query_report.get_filter_value('from_fiscal_year'), "year_start_date");
- frappe.query_report.set_filter_value({
- period_start_date: year_start_date
- });
- });
- }
+ frappe.model.with_doc(
+ "Fiscal Year",
+ frappe.query_report.get_filter_value("from_fiscal_year"),
+ function (r) {
+ let year_start_date = frappe.model.get_value(
+ "Fiscal Year",
+ frappe.query_report.get_filter_value("from_fiscal_year"),
+ "year_start_date"
+ );
+ frappe.query_report.set_filter_value({
+ period_start_date: year_start_date,
+ });
+ }
+ );
+ },
},
{
- "fieldname":"to_fiscal_year",
- "label": __("End Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
+ fieldname: "to_fiscal_year",
+ label: __("End Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
on_change: () => {
- frappe.model.with_doc("Fiscal Year", frappe.query_report.get_filter_value('to_fiscal_year'), function(r) {
- let year_end_date = frappe.model.get_value("Fiscal Year", frappe.query_report.get_filter_value('to_fiscal_year'), "year_end_date");
- frappe.query_report.set_filter_value({
- period_end_date: year_end_date
- });
- });
- }
+ frappe.model.with_doc(
+ "Fiscal Year",
+ frappe.query_report.get_filter_value("to_fiscal_year"),
+ function (r) {
+ let year_end_date = frappe.model.get_value(
+ "Fiscal Year",
+ frappe.query_report.get_filter_value("to_fiscal_year"),
+ "year_end_date"
+ );
+ frappe.query_report.set_filter_value({
+ period_end_date: year_end_date,
+ });
+ }
+ );
+ },
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"report",
- "label": __("Report"),
- "fieldtype": "Select",
- "options": ["Profit and Loss Statement", "Balance Sheet", "Cash Flow"],
- "default": "Balance Sheet",
- "reqd": 1
+ fieldname: "report",
+ label: __("Report"),
+ fieldtype: "Select",
+ options: ["Profit and Loss Statement", "Balance Sheet", "Cash Flow"],
+ default: "Balance Sheet",
+ reqd: 1,
},
{
- "fieldname": "presentation_currency",
- "label": __("Currency"),
- "fieldtype": "Select",
- "options": erpnext.get_presentation_currency_list(),
- "default": frappe.defaults.get_user_default("Currency")
+ fieldname: "presentation_currency",
+ label: __("Currency"),
+ fieldtype: "Select",
+ options: erpnext.get_presentation_currency_list(),
+ default: frappe.defaults.get_user_default("Currency"),
},
{
- "fieldname":"accumulated_in_group_company",
- "label": __("Accumulated Values in Group Company"),
- "fieldtype": "Check",
- "default": 0
+ fieldname: "accumulated_in_group_company",
+ label: __("Accumulated Values in Group Company"),
+ fieldtype: "Check",
+ default: 0,
},
{
- "fieldname": "include_default_book_entries",
- "label": __("Include Default FB Entries"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_default_book_entries",
+ label: __("Include Default FB Entries"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "show_zero_values",
- "label": __("Show zero values"),
- "fieldtype": "Check"
- }
+ fieldname: "show_zero_values",
+ label: __("Show zero values"),
+ fieldtype: "Check",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
- if (data && column.fieldname=="account") {
+ formatter: function (value, row, column, data, default_formatter) {
+ if (data && column.fieldname == "account") {
value = data.account_name || value;
column.link_onclick =
@@ -137,15 +161,15 @@ frappe.query_reports["Consolidated Financial Statement"] = {
}
return value;
},
- onload: function() {
+ onload: function () {
let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today());
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
period_start_date: fy.year_start_date,
- period_end_date: fy.year_end_date
+ period_end_date: fy.year_end_date,
});
});
- }
-}
+ },
+};
diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
index 74d52de2d2ed..3600db852f8c 100644
--- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
+++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
@@ -1,97 +1,96 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Customer Ledger Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"party",
- "label": __("Customer"),
- "fieldtype": "Link",
- "options": "Customer",
+ fieldname: "party",
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
on_change: () => {
- var party = frappe.query_report.get_filter_value('party');
+ var party = frappe.query_report.get_filter_value("party");
if (party) {
- frappe.db.get_value('Customer', party, ["tax_id", "customer_name"], function(value) {
- frappe.query_report.set_filter_value('tax_id', value["tax_id"]);
- frappe.query_report.set_filter_value('customer_name', value["customer_name"]);
+ frappe.db.get_value("Customer", party, ["tax_id", "customer_name"], function (value) {
+ frappe.query_report.set_filter_value("tax_id", value["tax_id"]);
+ frappe.query_report.set_filter_value("customer_name", value["customer_name"]);
});
} else {
- frappe.query_report.set_filter_value('tax_id', "");
- frappe.query_report.set_filter_value('customer_name', "");
+ frappe.query_report.set_filter_value("tax_id", "");
+ frappe.query_report.set_filter_value("customer_name", "");
}
- }
+ },
},
{
- "fieldname":"customer_group",
- "label": __("Customer Group"),
- "fieldtype": "Link",
- "options": "Customer Group"
+ fieldname: "customer_group",
+ label: __("Customer Group"),
+ fieldtype: "Link",
+ options: "Customer Group",
},
{
- "fieldname":"payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname":"territory",
- "label": __("Territory"),
- "fieldtype": "Link",
- "options": "Territory"
+ fieldname: "territory",
+ label: __("Territory"),
+ fieldtype: "Link",
+ options: "Territory",
},
{
- "fieldname":"sales_partner",
- "label": __("Sales Partner"),
- "fieldtype": "Link",
- "options": "Sales Partner"
+ fieldname: "sales_partner",
+ label: __("Sales Partner"),
+ fieldtype: "Link",
+ options: "Sales Partner",
},
{
- "fieldname":"sales_person",
- "label": __("Sales Person"),
- "fieldtype": "Link",
- "options": "Sales Person"
+ fieldname: "sales_person",
+ label: __("Sales Person"),
+ fieldtype: "Link",
+ options: "Sales Person",
},
{
- "fieldname":"tax_id",
- "label": __("Tax Id"),
- "fieldtype": "Data",
- "hidden": 1
+ fieldname: "tax_id",
+ label: __("Tax Id"),
+ fieldtype: "Data",
+ hidden: 1,
},
{
- "fieldname":"customer_name",
- "label": __("Customer Name"),
- "fieldtype": "Data",
- "hidden": 1
- }
- ]
+ fieldname: "customer_name",
+ label: __("Customer Name"),
+ fieldtype: "Data",
+ hidden: 1,
+ },
+ ],
};
diff --git a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js
index eec904ec8540..3540200e46e2 100644
--- a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js
+++ b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js
@@ -1,114 +1,121 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
function get_filters() {
let filters = [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"filter_based_on",
- "label": __("Filter Based On"),
- "fieldtype": "Select",
- "options": ["Fiscal Year", "Date Range"],
- "default": ["Fiscal Year"],
- "reqd": 1,
- on_change: function() {
- let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
- frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('period_start_date', filter_based_on === 'Fiscal Year');
- frappe.query_report.toggle_filter_display('period_end_date', filter_based_on === 'Fiscal Year');
+ fieldname: "filter_based_on",
+ label: __("Filter Based On"),
+ fieldtype: "Select",
+ options: ["Fiscal Year", "Date Range"],
+ default: ["Fiscal Year"],
+ reqd: 1,
+ on_change: function () {
+ let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
+ frappe.query_report.toggle_filter_display(
+ "from_fiscal_year",
+ filter_based_on === "Date Range"
+ );
+ frappe.query_report.toggle_filter_display("to_fiscal_year", filter_based_on === "Date Range");
+ frappe.query_report.toggle_filter_display(
+ "period_start_date",
+ filter_based_on === "Fiscal Year"
+ );
+ frappe.query_report.toggle_filter_display(
+ "period_end_date",
+ filter_based_on === "Fiscal Year"
+ );
frappe.query_report.refresh();
- }
+ },
},
{
- "fieldname":"period_start_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "hidden": 1,
- "reqd": 1
+ fieldname: "period_start_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ hidden: 1,
+ reqd: 1,
},
{
- "fieldname":"period_end_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "hidden": 1,
- "reqd": 1
+ fieldname: "period_end_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ hidden: 1,
+ reqd: 1,
},
{
- "fieldname":"from_fiscal_year",
- "label": __("Start Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1
+ fieldname: "from_fiscal_year",
+ label: __("Start Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
},
{
- "fieldname":"to_fiscal_year",
- "label": __("End Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1
+ fieldname: "to_fiscal_year",
+ label: __("End Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
},
{
- "fieldname": "periodicity",
- "label": __("Periodicity"),
- "fieldtype": "Select",
- "options": [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ fieldname: "periodicity",
+ label: __("Periodicity"),
+ fieldtype: "Select",
+ options: [
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
- "default": "Monthly",
- "reqd": 1
+ default: "Monthly",
+ reqd: 1,
},
{
- "fieldname": "type",
- "label": __("Invoice Type"),
- "fieldtype": "Select",
- "options": [
- { "value": "Revenue", "label": __("Revenue") },
- { "value": "Expense", "label": __("Expense") }
+ fieldname: "type",
+ label: __("Invoice Type"),
+ fieldtype: "Select",
+ options: [
+ { value: "Revenue", label: __("Revenue") },
+ { value: "Expense", label: __("Expense") },
],
- "default": "Revenue",
- "reqd": 1
+ default: "Revenue",
+ reqd: 1,
},
{
- "fieldname" : "with_upcoming_postings",
- "label": __("Show with upcoming revenue/expense"),
- "fieldtype": "Check",
- "default": 1
- }
- ]
+ fieldname: "with_upcoming_postings",
+ label: __("Show with upcoming revenue/expense"),
+ fieldtype: "Check",
+ default: 1,
+ },
+ ];
return filters;
}
frappe.query_reports["Deferred Revenue and Expense"] = {
- "filters": get_filters(),
- "formatter": function(value, row, column, data, default_formatter){
+ filters: get_filters(),
+ formatter: function (value, row, column, data, default_formatter) {
return default_formatter(value, row, column, data);
},
- onload: function(report){
+ onload: function (report) {
let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today());
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
period_start_date: fy.year_start_date,
- period_end_date: fy.year_end_date
+ period_end_date: fy.year_end_date,
});
});
- }
+ },
};
-
diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js
index 1454b2c73c87..f6051d7e04fa 100644
--- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js
+++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js
@@ -2,7 +2,5 @@
// For license information, please see license.txt
frappe.query_reports["Delivered Items To Be Billed"] = {
- "filters": [
-
- ]
-}
+ filters: [],
+};
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
index 51fa8c83f3bd..20c34e399001 100644
--- a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
@@ -1,82 +1,79 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Dimension-wise Accounts Balance Report"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
- "on_change": function(query_report) {
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
+ on_change: function (query_report) {
var fiscal_year = query_report.get_values().fiscal_year;
if (!fiscal_year) {
return;
}
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
from_date: fy.year_start_date,
- to_date: fy.year_end_date
+ to_date: fy.year_end_date,
});
});
- }
+ },
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ reqd: 1,
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ reqd: 1,
},
{
- "fieldname": "finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book",
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname": "dimension",
- "label": __("Select Dimension"),
- "fieldtype": "Select",
- "default": "Cost Center",
- "options": get_accounting_dimension_options(),
- "reqd": 1,
+ fieldname: "dimension",
+ label: __("Select Dimension"),
+ fieldtype: "Select",
+ default: "Cost Center",
+ options: get_accounting_dimension_options(),
+ reqd: 1,
},
],
- "formatter": erpnext.financial_statements.formatter,
- "tree": true,
- "name_field": "account",
- "parent_field": "parent_account",
- "initial_depth": 3
-}
-
+ formatter: erpnext.financial_statements.formatter,
+ tree: true,
+ name_field: "account",
+ parent_field: "parent_account",
+ initial_depth: 3,
+};
function get_accounting_dimension_options() {
- let options =["Cost Center", "Project"];
- frappe.db.get_list('Accounting Dimension',
- {fields:['document_type']}).then((res) => {
- res.forEach((dimension) => {
- options.push(dimension.document_type);
- });
- });
- return options
+ let options = ["Cost Center", "Project"];
+ frappe.db.get_list("Accounting Dimension", { fields: ["document_type"] }).then((res) => {
+ res.forEach((dimension) => {
+ options.push(dimension.document_type);
+ });
+ });
+ return options;
}
diff --git a/erpnext/accounts/report/financial_ratios/financial_ratios.js b/erpnext/accounts/report/financial_ratios/financial_ratios.js
index 643423d865c8..c0ae31d9bee5 100644
--- a/erpnext/accounts/report/financial_ratios/financial_ratios.js
+++ b/erpnext/accounts/report/financial_ratios/financial_ratios.js
@@ -51,9 +51,8 @@ frappe.query_reports["Financial Ratios"] = {
hidden: 1,
},
],
- "formatter": function(value, row, column, data, default_formatter) {
-
- let heading_ratios = ["Liquidity Ratios", "Solvency Ratios","Turnover Ratios"]
+ formatter: function (value, row, column, data, default_formatter) {
+ let heading_ratios = ["Liquidity Ratios", "Solvency Ratios", "Turnover Ratios"];
if (heading_ratios.includes(value)) {
value = $(`${value} `);
diff --git a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js
index 7e6b0537e875..4eadf342be85 100644
--- a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js
+++ b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js
@@ -4,49 +4,49 @@
function get_filters() {
let filters = [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"period_start_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1)
+ fieldname: "period_start_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
- "fieldname":"period_end_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "period_end_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"account",
- "label": __("Account"),
- "fieldtype": "MultiSelectList",
- "options": "Account",
- get_data: function(txt) {
- return frappe.db.get_link_options('Account', txt, {
+ fieldname: "account",
+ label: __("Account"),
+ fieldtype: "MultiSelectList",
+ options: "Account",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Account", txt, {
company: frappe.query_report.get_filter_value("company"),
- account_type: ['in', ["Receivable", "Payable"]]
+ account_type: ["in", ["Receivable", "Payable"]],
});
- }
+ },
},
{
- "fieldname":"voucher_no",
- "label": __("Voucher No"),
- "fieldtype": "Data",
- "width": 100,
+ fieldname: "voucher_no",
+ label: __("Voucher No"),
+ fieldtype: "Data",
+ width: 100,
},
- ]
+ ];
return filters;
}
frappe.query_reports["General and Payment Ledger Comparison"] = {
- "filters": get_filters()
+ filters: get_filters(),
};
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index b7b9d34e00f6..1894e9585520 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -2,119 +2,119 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["General Ledger"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"account",
- "label": __("Account"),
- "fieldtype": "MultiSelectList",
- "options": "Account",
- get_data: function(txt) {
- return frappe.db.get_link_options('Account', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "account",
+ label: __("Account"),
+ fieldtype: "MultiSelectList",
+ options: "Account",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Account", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
- }
+ },
},
{
- "fieldname":"voucher_no",
- "label": __("Voucher No"),
- "fieldtype": "Data",
- on_change: function() {
- frappe.query_report.set_filter_value('group_by', "Group by Voucher (Consolidated)");
- }
+ fieldname: "voucher_no",
+ label: __("Voucher No"),
+ fieldtype: "Data",
+ on_change: function () {
+ frappe.query_report.set_filter_value("group_by", "Group by Voucher (Consolidated)");
+ },
},
{
- "fieldname":"against_voucher_no",
- "label": __("Against Voucher No"),
- "fieldtype": "Data",
+ fieldname: "against_voucher_no",
+ label: __("Against Voucher No"),
+ fieldtype: "Data",
},
{
- "fieldtype": "Break",
+ fieldtype: "Break",
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Autocomplete",
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Autocomplete",
options: Object.keys(frappe.boot.party_account_types),
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- }
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
- on_change: function() {
- var party_type = frappe.query_report.get_filter_value('party_type');
- var parties = frappe.query_report.get_filter_value('party');
+ on_change: function () {
+ var party_type = frappe.query_report.get_filter_value("party_type");
+ var parties = frappe.query_report.get_filter_value("party");
- if(!party_type || parties.length === 0 || parties.length > 1) {
- frappe.query_report.set_filter_value('party_name', "");
- frappe.query_report.set_filter_value('tax_id', "");
+ if (!party_type || parties.length === 0 || parties.length > 1) {
+ frappe.query_report.set_filter_value("party_name", "");
+ frappe.query_report.set_filter_value("tax_id", "");
return;
} else {
var party = parties[0];
var fieldname = erpnext.utils.get_party_name(party_type) || "name";
- frappe.db.get_value(party_type, party, fieldname, function(value) {
- frappe.query_report.set_filter_value('party_name', value[fieldname]);
+ frappe.db.get_value(party_type, party, fieldname, function (value) {
+ frappe.query_report.set_filter_value("party_name", value[fieldname]);
});
if (party_type === "Customer" || party_type === "Supplier") {
- frappe.db.get_value(party_type, party, "tax_id", function(value) {
- frappe.query_report.set_filter_value('tax_id', value["tax_id"]);
+ frappe.db.get_value(party_type, party, "tax_id", function (value) {
+ frappe.query_report.set_filter_value("tax_id", value["tax_id"]);
});
}
}
- }
+ },
},
{
- "fieldname":"party_name",
- "label": __("Party Name"),
- "fieldtype": "Data",
- "hidden": 1
+ fieldname: "party_name",
+ label: __("Party Name"),
+ fieldtype: "Data",
+ hidden: 1,
},
{
- "fieldname":"group_by",
- "label": __("Group by"),
- "fieldtype": "Select",
- "options": [
+ fieldname: "group_by",
+ label: __("Group by"),
+ fieldtype: "Select",
+ options: [
"",
{
label: __("Group by Voucher"),
@@ -133,85 +133,83 @@ frappe.query_reports["General Ledger"] = {
value: "Group by Party",
},
],
- "default": "Group by Voucher (Consolidated)"
+ default: "Group by Voucher (Consolidated)",
},
{
- "fieldname":"tax_id",
- "label": __("Tax Id"),
- "fieldtype": "Data",
- "hidden": 1
+ fieldname: "tax_id",
+ label: __("Tax Id"),
+ fieldtype: "Data",
+ hidden: 1,
},
{
- "fieldname": "presentation_currency",
- "label": __("Currency"),
- "fieldtype": "Select",
- "options": erpnext.get_presentation_currency_list()
+ fieldname: "presentation_currency",
+ label: __("Currency"),
+ fieldtype: "Select",
+ options: erpnext.get_presentation_currency_list(),
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Cost Center', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Cost Center", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
- }
+ },
},
{
- "fieldname":"project",
- "label": __("Project"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Project', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "project",
+ label: __("Project"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Project", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
- }
+ },
},
{
- "fieldname": "include_dimensions",
- "label": __("Consider Accounting Dimensions"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_dimensions",
+ label: __("Consider Accounting Dimensions"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "show_opening_entries",
- "label": __("Show Opening Entries"),
- "fieldtype": "Check"
+ fieldname: "show_opening_entries",
+ label: __("Show Opening Entries"),
+ fieldtype: "Check",
},
{
- "fieldname": "include_default_book_entries",
- "label": __("Include Default FB Entries"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_default_book_entries",
+ label: __("Include Default FB Entries"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "show_cancelled_entries",
- "label": __("Show Cancelled Entries"),
- "fieldtype": "Check"
+ fieldname: "show_cancelled_entries",
+ label: __("Show Cancelled Entries"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_net_values_in_party_account",
- "label": __("Show Net Values in Party Account"),
- "fieldtype": "Check"
+ fieldname: "show_net_values_in_party_account",
+ label: __("Show Net Values in Party Account"),
+ fieldtype: "Check",
},
{
- "fieldname": "add_values_in_transaction_currency",
- "label": __("Add Columns in Transaction Currency"),
- "fieldtype": "Check"
+ fieldname: "add_values_in_transaction_currency",
+ label: __("Add Columns in Transaction Currency"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_remarks",
- "label": __("Show Remarks"),
- "fieldtype": "Check"
+ fieldname: "show_remarks",
+ label: __("Show Remarks"),
+ fieldtype: "Check",
},
{
- "fieldname": "ignore_err",
- "label": __("Ignore Exchange Rate Revaluation Journals"),
- "fieldtype": "Check"
- }
-
-
- ]
-}
+ fieldname: "ignore_err",
+ label: __("Ignore Exchange Rate Revaluation Journals"),
+ fieldtype: "Check",
+ },
+ ],
+};
-erpnext.utils.add_dimensions('General Ledger', 15)
+erpnext.utils.add_dimensions("General Ledger", 15);
diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
index 40d4259da994..2448eef90727 100644
--- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
+++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
@@ -1,16 +1,10 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
+frappe.query_reports["Gross and Net Profit Report"] = $.extend({}, erpnext.financial_statements);
-frappe.query_reports["Gross and Net Profit Report"] = $.extend(
- {},
- erpnext.financial_statements
-);
-
-frappe.query_reports["Gross and Net Profit Report"]["filters"].push(
- {
- "fieldname": "accumulated_values",
- "label": __("Accumulated Values"),
- "fieldtype": "Check"
- }
-);
+frappe.query_reports["Gross and Net Profit Report"]["filters"].push({
+ fieldname: "accumulated_values",
+ label: __("Accumulated Values"),
+ fieldtype: "Check",
+});
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js
index 752054834b47..fad6586466ef 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -2,74 +2,73 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Gross Profit"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ reqd: 1,
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ reqd: 1,
},
{
- "fieldname": "sales_invoice",
- "label": __("Sales Invoice"),
- "fieldtype": "Link",
- "options": "Sales Invoice"
+ fieldname: "sales_invoice",
+ label: __("Sales Invoice"),
+ fieldtype: "Link",
+ options: "Sales Invoice",
},
{
- "fieldname": "group_by",
- "label": __("Group By"),
- "fieldtype": "Select",
- "options": "Invoice\nItem Code\nItem Group\nBrand\nWarehouse\nCustomer\nCustomer Group\nTerritory\nSales Person\nProject\nMonthly\nPayment Term",
- "default": "Invoice"
+ fieldname: "group_by",
+ label: __("Group By"),
+ fieldtype: "Select",
+ options:
+ "Invoice\nItem Code\nItem Group\nBrand\nWarehouse\nCustomer\nCustomer Group\nTerritory\nSales Person\nProject\nMonthly\nPayment Term",
+ default: "Invoice",
},
{
- "fieldname": "item_group",
- "label": __("Item Group"),
- "fieldtype": "Link",
- "options": "Item Group"
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group",
},
{
- "fieldname": "sales_person",
- "label": __("Sales Person"),
- "fieldtype": "Link",
- "options": "Sales Person"
+ fieldname: "sales_person",
+ label: __("Sales Person"),
+ fieldtype: "Link",
+ options: "Sales Person",
},
{
- "fieldname": "warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse",
- "get_query": function () {
- var company = frappe.query_report.get_filter_value('company');
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
- filters: [
- ["Warehouse", "company", "=", company]
- ]
+ filters: [["Warehouse", "company", "=", company]],
};
},
},
],
- "tree": true,
- "name_field": "parent",
- "parent_field": "parent_invoice",
- "initial_depth": 3,
- "formatter": function(value, row, column, data, default_formatter) {
+ tree: true,
+ name_field: "parent",
+ parent_field: "parent_invoice",
+ initial_depth: 3,
+ formatter: function (value, row, column, data, default_formatter) {
if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) {
column._options = "Sales Invoice";
} else {
@@ -85,4 +84,4 @@ frappe.query_reports["Gross Profit"] = {
return value;
},
-}
+};
diff --git a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js
index bd9b54398b80..b420d9963e39 100644
--- a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js
+++ b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js
@@ -1,9 +1,8 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Inactive Sales Items"] = {
- "filters": [
+ filters: [
{
fieldname: "territory",
label: __("Territory"),
@@ -15,27 +14,27 @@ frappe.query_reports["Inactive Sales Items"] = {
fieldname: "item",
label: __("Item"),
fieldtype: "Link",
- options: "Item"
+ options: "Item",
},
{
fieldname: "item_group",
label: __("Item Group"),
fieldtype: "Link",
- options: "Item Group"
+ options: "Item Group",
},
{
fieldname: "based_on",
label: __("Based On"),
fieldtype: "Select",
options: "Sales Order\nSales Invoice",
- default: "Sales Order"
+ default: "Sales Order",
},
{
fieldname: "days",
label: __("Days Since Last order"),
fieldtype: "Select",
options: [30, 60, 90],
- default: 30
+ default: 30,
},
- ]
+ ],
};
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
index 423cd6a845b9..e05591e49dfa 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
@@ -2,65 +2,64 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Item-wise Purchase Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname": "item_code",
- "label": __("Item"),
- "fieldtype": "Link",
- "options": "Item",
+ fieldname: "item_code",
+ label: __("Item"),
+ fieldtype: "Link",
+ options: "Item",
},
{
- "fieldname": "item_group",
- "label": __("Item Group"),
- "fieldtype": "Link",
- "options": "Item Group",
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group",
},
{
- "fieldname":"supplier",
- "label": __("Supplier"),
- "fieldtype": "Link",
- "options": "Supplier"
+ fieldname: "supplier",
+ label: __("Supplier"),
+ fieldtype: "Link",
+ options: "Supplier",
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"mode_of_payment",
- "label": __("Mode of Payment"),
- "fieldtype": "Link",
- "options": "Mode of Payment"
+ fieldname: "mode_of_payment",
+ label: __("Mode of Payment"),
+ fieldtype: "Link",
+ options: "Mode of Payment",
},
{
- "label": __("Group By"),
- "fieldname": "group_by",
- "fieldtype": "Select",
- "options": ["Supplier", "Item Group", "Item", "Invoice"]
- }
+ label: __("Group By"),
+ fieldname: "group_by",
+ fieldtype: "Select",
+ options: ["Supplier", "Item Group", "Item", "Invoice"],
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (data && data.bold) {
value = value.bold();
-
}
return value;
- }
-}
+ },
+};
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
index 06f426b71e60..193e17597db0 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
@@ -2,85 +2,84 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Item-wise Sales Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname": "customer",
- "label": __("Customer"),
- "fieldtype": "Link",
- "options": "Customer"
+ fieldname: "customer",
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
},
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname": "mode_of_payment",
- "label": __("Mode of Payment"),
- "fieldtype": "Link",
- "options": "Mode of Payment"
+ fieldname: "mode_of_payment",
+ label: __("Mode of Payment"),
+ fieldtype: "Link",
+ options: "Mode of Payment",
},
{
- "fieldname": "warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
},
{
- "fieldname": "brand",
- "label": __("Brand"),
- "fieldtype": "Link",
- "options": "Brand"
+ fieldname: "brand",
+ label: __("Brand"),
+ fieldtype: "Link",
+ options: "Brand",
},
{
- "fieldname": "item_group",
- "label": __("Item Group"),
- "fieldtype": "Link",
- "options": "Item Group"
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group",
},
{
- "label": __("Group By"),
- "fieldname": "group_by",
- "fieldtype": "Select",
- "options": ["Customer Group", "Customer", "Item Group", "Item", "Territory", "Invoice"]
+ label: __("Group By"),
+ fieldname: "group_by",
+ fieldtype: "Select",
+ options: ["Customer Group", "Customer", "Item Group", "Item", "Territory", "Invoice"],
},
{
- "fieldname": "income_account",
- "label": __("Income Account"),
- "fieldtype": "Link",
- "options": "Account",
+ fieldname: "income_account",
+ label: __("Income Account"),
+ fieldtype: "Link",
+ options: "Account",
get_query: () => {
- let company = frappe.query_report.get_filter_value('company');
+ let company = frappe.query_report.get_filter_value("company");
return {
filters: {
- 'company': company,
- }
+ company: company,
+ },
};
- }
+ },
},
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (data && data.bold) {
value = value.bold();
-
}
return value;
- }
-}
+ },
+};
diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.js b/erpnext/accounts/report/payment_ledger/payment_ledger.js
index 65380ccdda65..8d1f227fe6d4 100644
--- a/erpnext/accounts/report/payment_ledger/payment_ledger.js
+++ b/erpnext/accounts/report/payment_ledger/payment_ledger.js
@@ -1,96 +1,92 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
function get_filters() {
let filters = [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"period_start_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1)
+ fieldname: "period_start_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
- "fieldname":"period_end_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "period_end_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"account",
- "label": __("Account"),
- "fieldtype": "MultiSelectList",
- "options": "Account",
- get_data: function(txt) {
- return frappe.db.get_link_options('Account', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "account",
+ label: __("Account"),
+ fieldtype: "MultiSelectList",
+ options: "Account",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Account", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
- }
+ },
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Link",
- "options": "Party Type",
- "default": "",
- on_change: function() {
- frappe.query_report.set_filter_value('party', "");
- }
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Link",
+ options: "Party Type",
+ default: "",
+ on_change: function () {
+ frappe.query_report.set_filter_value("party", "");
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let party_type = frappe.query_report.get_filter_value('party_type');
+ let party_type = frappe.query_report.get_filter_value("party_type");
if (!party_type) return;
return frappe.db.get_link_options(party_type, txt);
},
},
{
- "fieldname":"voucher_no",
- "label": __("Voucher No"),
- "fieldtype": "Data",
- "width": 100,
+ fieldname: "voucher_no",
+ label: __("Voucher No"),
+ fieldtype: "Data",
+ width: 100,
},
{
- "fieldname":"against_voucher_no",
- "label": __("Against Voucher No"),
- "fieldtype": "Data",
- "width": 100,
+ fieldname: "against_voucher_no",
+ label: __("Against Voucher No"),
+ fieldtype: "Data",
+ width: 100,
},
{
- "fieldname":"include_account_currency",
- "label": __("Include Account Currency"),
- "fieldtype": "Check",
- "width": 100,
+ fieldname: "include_account_currency",
+ label: __("Include Account Currency"),
+ fieldtype: "Check",
+ width: 100,
},
{
- "fieldname":"group_party",
- "label": __("Group by Party"),
- "fieldtype": "Check",
- "width": 100,
+ fieldname: "group_party",
+ label: __("Group by Party"),
+ fieldtype: "Check",
+ width: 100,
},
-
-
-
- ]
+ ];
return filters;
}
frappe.query_reports["Payment Ledger"] = {
- "filters": get_filters()
+ filters: get_filters(),
};
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
index 5ec2c9880c3a..528246cd3708 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -2,14 +2,14 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Payment Period Based On Invoice Date"] = {
- "filters": [
+ filters: [
{
- fieldname:"company",
+ fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
reqd: 1,
- default: frappe.defaults.get_user_default("Company")
+ default: frappe.defaults.get_user_default("Company"),
},
{
fieldname: "from_date",
@@ -18,41 +18,41 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
- default: frappe.datetime.get_today()
+ default: frappe.datetime.get_today(),
},
{
- fieldname:"payment_type",
+ fieldname: "payment_type",
label: __("Payment Type"),
fieldtype: "Select",
options: __("Incoming") + "\n" + __("Outgoing"),
- default: __("Incoming")
+ default: __("Incoming"),
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Link",
- "options": "DocType",
- "get_query": function() {
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Link",
+ options: "DocType",
+ get_query: function () {
return {
- filters: {"name": ["in", ["Customer", "Supplier"]]}
- }
- }
+ filters: { name: ["in", ["Customer", "Supplier"]] },
+ };
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var party_type = frappe.query_report.get_filter_value('party_type');
- var party = frappe.query_report.get_filter_value('party');
- if(party && !party_type) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "Dynamic Link",
+ get_options: function () {
+ var party_type = frappe.query_report.get_filter_value("party_type");
+ var party = frappe.query_report.get_filter_value("party");
+ if (party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
return party_type;
- }
+ },
},
- ]
-}
+ ],
+};
diff --git a/erpnext/accounts/report/pos_register/pos_register.js b/erpnext/accounts/report/pos_register/pos_register.js
index 6e5491a0f8fb..5d39796c6ca7 100644
--- a/erpnext/accounts/report/pos_register/pos_register.js
+++ b/erpnext/accounts/report/pos_register/pos_register.js
@@ -1,76 +1,74 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["POS Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"pos_profile",
- "label": __("POS Profile"),
- "fieldtype": "Link",
- "options": "POS Profile"
+ fieldname: "pos_profile",
+ label: __("POS Profile"),
+ fieldtype: "Link",
+ options: "POS Profile",
},
{
- "fieldname":"cashier",
- "label": __("Cashier"),
- "fieldtype": "Link",
- "options": "User"
+ fieldname: "cashier",
+ label: __("Cashier"),
+ fieldtype: "Link",
+ options: "User",
},
{
- "fieldname":"customer",
- "label": __("Customer"),
- "fieldtype": "Link",
- "options": "Customer"
+ fieldname: "customer",
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
},
{
- "fieldname":"mode_of_payment",
- "label": __("Payment Method"),
- "fieldtype": "Link",
- "options": "Mode of Payment"
+ fieldname: "mode_of_payment",
+ label: __("Payment Method"),
+ fieldtype: "Link",
+ options: "Mode of Payment",
},
{
- "fieldname":"group_by",
- "label": __("Group by"),
- "fieldtype": "Select",
- "options": ["", "POS Profile", "Cashier", "Payment Method", "Customer"],
- "default": "POS Profile"
+ fieldname: "group_by",
+ label: __("Group by"),
+ fieldtype: "Select",
+ options: ["", "POS Profile", "Cashier", "Payment Method", "Customer"],
+ default: "POS Profile",
},
{
- "fieldname":"is_return",
- "label": __("Is Return"),
- "fieldtype": "Check"
+ fieldname: "is_return",
+ label: __("Is Return"),
+ fieldtype: "Check",
},
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (data && data.bold) {
value = value.bold();
-
}
return value;
- }
+ },
};
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index a2f0fde16f95..2ffd3b310f9c 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -1,27 +1,22 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.query_reports["Profit and Loss Statement"] = $.extend(
- {},
- erpnext.financial_statements
-);
+frappe.query_reports["Profit and Loss Statement"] = $.extend({}, erpnext.financial_statements);
erpnext.utils.add_dimensions("Profit and Loss Statement", 10);
-frappe.query_reports["Profit and Loss Statement"]["filters"].push(
- {
- "fieldname": "selected_view",
- "label": __("Select View"),
- "fieldtype": "Select",
- "options": [
- { "value": "Report", "label": __("Report View") },
- { "value": "Growth", "label": __("Growth View") },
- { "value": "Margin", "label": __("Margin View") },
- ],
- "default": "Report",
- "reqd": 1
- },
-);
+frappe.query_reports["Profit and Loss Statement"]["filters"].push({
+ fieldname: "selected_view",
+ label: __("Select View"),
+ fieldtype: "Select",
+ options: [
+ { value: "Report", label: __("Report View") },
+ { value: "Growth", label: __("Growth View") },
+ { value: "Margin", label: __("Margin View") },
+ ],
+ default: "Report",
+ reqd: 1,
+});
frappe.query_reports["Profit and Loss Statement"]["filters"].push({
fieldname: "accumulated_values",
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
index 5dd3617a9263..69e12846aa11 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -2,88 +2,90 @@
// For license information, please see license.txt
frappe.query_reports["Profitability Analysis"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "based_on",
- "label": __("Based On"),
- "fieldtype": "Select",
- "options": ["Cost Center", "Project", "Accounting Dimension"],
- "default": "Cost Center",
- "reqd": 1,
- "on_change": function(query_report){
+ fieldname: "based_on",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: ["Cost Center", "Project", "Accounting Dimension"],
+ default: "Cost Center",
+ reqd: 1,
+ on_change: function (query_report) {
let based_on = query_report.get_values().based_on;
- if(based_on!='Accounting Dimension'){
+ if (based_on != "Accounting Dimension") {
frappe.query_report.set_filter_value({
- accounting_dimension: ''
+ accounting_dimension: "",
});
}
- }
+ },
},
{
- "fieldname": "accounting_dimension",
- "label": __("Accounting Dimension"),
- "fieldtype": "Link",
- "options": "Accounting Dimension",
+ fieldname: "accounting_dimension",
+ label: __("Accounting Dimension"),
+ fieldtype: "Link",
+ options: "Accounting Dimension",
},
{
- "fieldname": "fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
- "on_change": function(query_report) {
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
+ on_change: function (query_report) {
var fiscal_year = query_report.get_values().fiscal_year;
if (!fiscal_year) {
return;
}
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
from_date: fy.year_start_date,
- to_date: fy.year_end_date
+ to_date: fy.year_end_date,
});
});
- }
+ },
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
},
{
- "fieldname": "show_zero_values",
- "label": __("Show zero values"),
- "fieldtype": "Check"
- }
+ fieldname: "show_zero_values",
+ label: __("Show zero values"),
+ fieldtype: "Check",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
- if (column.fieldname=="account") {
+ formatter: function (value, row, column, data, default_formatter) {
+ if (column.fieldname == "account") {
value = data.account_name;
column.link_onclick =
- "frappe.query_reports['Profitability Analysis'].open_profit_and_loss_statement(" + JSON.stringify(data) + ")";
+ "frappe.query_reports['Profitability Analysis'].open_profit_and_loss_statement(" +
+ JSON.stringify(data) +
+ ")";
column.is_tree = true;
}
value = default_formatter(value, row, column, data);
- if (!data.parent_account && data.based_on != 'project') {
+ if (!data.parent_account && data.based_on != "project") {
value = $(`${value} `);
var $value = $(value).css("font-weight", "bold");
if (data.warn_if_negative && data[column.fieldname] < 0) {
@@ -95,25 +97,25 @@ frappe.query_reports["Profitability Analysis"] = {
return value;
},
- "open_profit_and_loss_statement": function(data) {
+ open_profit_and_loss_statement: function (data) {
if (!data.account) return;
frappe.route_options = {
- "company": frappe.query_report.get_filter_value('company'),
- "from_fiscal_year": data.fiscal_year,
- "to_fiscal_year": data.fiscal_year
+ company: frappe.query_report.get_filter_value("company"),
+ from_fiscal_year: data.fiscal_year,
+ to_fiscal_year: data.fiscal_year,
};
- if(data.based_on == 'Cost Center'){
- frappe.route_options["cost_center"] = data.account
+ if (data.based_on == "Cost Center") {
+ frappe.route_options["cost_center"] = data.account;
} else {
- frappe.route_options["project"] = data.account
+ frappe.route_options["project"] = data.account;
}
frappe.set_route("query-report", "Profit and Loss Statement");
},
- "tree": true,
- "name_field": "account",
- "parent_field": "parent_account",
- "initial_depth": 3
-}
+ tree: true,
+ name_field: "account",
+ parent_field: "parent_account",
+ initial_depth: 3,
+};
diff --git a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
index feab96f26521..e3f90f299827 100644
--- a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
@@ -1,8 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
+frappe.require("assets/erpnext/js/purchase_trends_filters.js", function () {
frappe.query_reports["Purchase Invoice Trends"] = {
- filters: erpnext.get_purchase_trends_filters()
- }
+ filters: erpnext.get_purchase_trends_filters(),
+ };
});
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.js b/erpnext/accounts/report/purchase_register/purchase_register.js
index cf11ed0986b3..588749869ed1 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.js
+++ b/erpnext/accounts/report/purchase_register/purchase_register.js
@@ -2,70 +2,70 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Purchase Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ width: "80",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"supplier",
- "label": __("Supplier"),
- "fieldtype": "Link",
- "options": "Supplier"
+ fieldname: "supplier",
+ label: __("Supplier"),
+ fieldtype: "Link",
+ options: "Supplier",
},
{
- "fieldname":"supplier_group",
- "label": __("Supplier Group"),
- "fieldtype": "Link",
- "options": "Supplier Group"
+ fieldname: "supplier_group",
+ label: __("Supplier Group"),
+ fieldtype: "Link",
+ options: "Supplier Group",
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"mode_of_payment",
- "label": __("Mode of Payment"),
- "fieldtype": "Link",
- "options": "Mode of Payment"
+ fieldname: "mode_of_payment",
+ label: __("Mode of Payment"),
+ fieldtype: "Link",
+ options: "Mode of Payment",
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center"
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
},
{
- "fieldname":"warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
},
{
- "fieldname":"item_group",
- "label": __("Item Group"),
- "fieldtype": "Link",
- "options": "Item Group"
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group",
},
{
- "fieldname": "include_payments",
- "label": __("Show Ledger View"),
- "fieldtype": "Check",
- "default": 0
- }
- ]
-}
+ fieldname: "include_payments",
+ label: __("Show Ledger View"),
+ fieldtype: "Check",
+ default: 0,
+ },
+ ],
+};
-erpnext.utils.add_dimensions('Purchase Register', 7);
+erpnext.utils.add_dimensions("Purchase Register", 7);
diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js
index 0ee3f5771719..ad97f270dd39 100644
--- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js
+++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js
@@ -2,7 +2,5 @@
// For license information, please see license.txt
frappe.query_reports["Received Items To Be Billed"] = {
- "filters": [
-
- ]
-}
+ filters: [],
+};
diff --git a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
index e3d43a7de1e7..292d827b1634 100644
--- a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
@@ -1,8 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
+frappe.require("assets/erpnext/js/sales_trends_filters.js", function () {
frappe.query_reports["Sales Invoice Trends"] = {
- filters: erpnext.get_sales_trends_filters()
- }
+ filters: erpnext.get_sales_trends_filters(),
+ };
});
diff --git a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js
index 92e6f7f51418..b64db9ebc718 100644
--- a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js
+++ b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js
@@ -1,44 +1,44 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Sales Payment Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "80",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"owner",
- "label": __("Owner"),
- "fieldtype": "Link",
- "options": "User",
+ fieldname: "owner",
+ label: __("Owner"),
+ fieldtype: "Link",
+ options: "User",
},
{
- "fieldname":"is_pos",
- "label": __("Show only POS"),
- "fieldtype": "Check"
+ fieldname: "is_pos",
+ label: __("Show only POS"),
+ fieldtype: "Check",
},
{
- "fieldname":"payment_detail",
- "label": __("Show Payment Details"),
- "fieldtype": "Check"
+ fieldname: "payment_detail",
+ label: __("Show Payment Details"),
+ fieldtype: "Check",
},
- ]
+ ],
};
diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
index 4578ac3f6ecf..c4f57c8840ce 100644
--- a/erpnext/accounts/report/sales_register/sales_register.js
+++ b/erpnext/accounts/report/sales_register/sales_register.js
@@ -2,82 +2,82 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Sales Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ width: "80",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"customer",
- "label": __("Customer"),
- "fieldtype": "Link",
- "options": "Customer"
+ fieldname: "customer",
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
},
{
- "fieldname":"customer_group",
- "label": __("Customer Group"),
- "fieldtype": "Link",
- "options": "Customer Group"
+ fieldname: "customer_group",
+ label: __("Customer Group"),
+ fieldtype: "Link",
+ options: "Customer Group",
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"mode_of_payment",
- "label": __("Mode of Payment"),
- "fieldtype": "Link",
- "options": "Mode of Payment"
+ fieldname: "mode_of_payment",
+ label: __("Mode of Payment"),
+ fieldtype: "Link",
+ options: "Mode of Payment",
},
{
- "fieldname":"owner",
- "label": __("Owner"),
- "fieldtype": "Link",
- "options": "User"
+ fieldname: "owner",
+ label: __("Owner"),
+ fieldtype: "Link",
+ options: "User",
},
{
- "fieldname":"cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center"
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
},
{
- "fieldname":"warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
},
{
- "fieldname":"brand",
- "label": __("Brand"),
- "fieldtype": "Link",
- "options": "Brand"
+ fieldname: "brand",
+ label: __("Brand"),
+ fieldtype: "Link",
+ options: "Brand",
},
{
- "fieldname":"item_group",
- "label": __("Item Group"),
- "fieldtype": "Link",
- "options": "Item Group"
+ fieldname: "item_group",
+ label: __("Item Group"),
+ fieldtype: "Link",
+ options: "Item Group",
},
{
- "fieldname": "include_payments",
- "label": __("Show Ledger View"),
- "fieldtype": "Check",
- "default": 0
- }
- ]
-}
+ fieldname: "include_payments",
+ label: __("Show Ledger View"),
+ fieldtype: "Check",
+ default: 0,
+ },
+ ],
+};
-erpnext.utils.add_dimensions('Sales Register', 7);
+erpnext.utils.add_dimensions("Sales Register", 7);
diff --git a/erpnext/accounts/report/share_balance/share_balance.js b/erpnext/accounts/report/share_balance/share_balance.js
index ac64a0bfb9f2..05d2959a5bcf 100644
--- a/erpnext/accounts/report/share_balance/share_balance.js
+++ b/erpnext/accounts/report/share_balance/share_balance.js
@@ -2,21 +2,20 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Share Balance"] = {
- "filters": [
+ filters: [
{
- "fieldname":"date",
- "label": __("Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "date",
+ label: __("Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"shareholder",
- "label": __("Shareholder"),
- "fieldtype": "Link",
- "options": "Shareholder"
- }
- ]
-}
+ fieldname: "shareholder",
+ label: __("Shareholder"),
+ fieldtype: "Link",
+ options: "Shareholder",
+ },
+ ],
+};
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.js b/erpnext/accounts/report/share_ledger/share_ledger.js
index 4f2d2cc78f87..0d4e3c62a5c2 100644
--- a/erpnext/accounts/report/share_ledger/share_ledger.js
+++ b/erpnext/accounts/report/share_ledger/share_ledger.js
@@ -2,21 +2,20 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Share Ledger"] = {
- "filters": [
+ filters: [
{
- "fieldname":"date",
- "label": __("Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "date",
+ label: __("Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"shareholder",
- "label": __("Shareholder"),
- "fieldtype": "Link",
- "options": "Shareholder"
- }
- ]
+ fieldname: "shareholder",
+ label: __("Shareholder"),
+ fieldtype: "Link",
+ options: "Shareholder",
+ },
+ ],
};
diff --git a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
index 8e3c8ac63004..5d91575b8b29 100644
--- a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
+++ b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
@@ -1,79 +1,78 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Supplier Ledger Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"party",
- "label": __("Supplier"),
- "fieldtype": "Link",
- "options": "Supplier",
+ fieldname: "party",
+ label: __("Supplier"),
+ fieldtype: "Link",
+ options: "Supplier",
on_change: () => {
- var party = frappe.query_report.get_filter_value('party');
+ var party = frappe.query_report.get_filter_value("party");
if (party) {
- frappe.db.get_value('Supplier', party, ["tax_id", "supplier_name"], function(value) {
- frappe.query_report.set_filter_value('tax_id', value["tax_id"]);
- frappe.query_report.set_filter_value('supplier_name', value["supplier_name"]);
+ frappe.db.get_value("Supplier", party, ["tax_id", "supplier_name"], function (value) {
+ frappe.query_report.set_filter_value("tax_id", value["tax_id"]);
+ frappe.query_report.set_filter_value("supplier_name", value["supplier_name"]);
});
} else {
- frappe.query_report.set_filter_value('tax_id', "");
- frappe.query_report.set_filter_value('supplier_name', "");
+ frappe.query_report.set_filter_value("tax_id", "");
+ frappe.query_report.set_filter_value("supplier_name", "");
}
- }
+ },
},
{
- "fieldname":"supplier_group",
- "label": __("Supplier Group"),
- "fieldtype": "Link",
- "options": "Supplier Group"
+ fieldname: "supplier_group",
+ label: __("Supplier Group"),
+ fieldtype: "Link",
+ options: "Supplier Group",
},
{
- "fieldname":"payment_terms_template",
- "label": __("Payment Terms Template"),
- "fieldtype": "Link",
- "options": "Payment Terms Template"
+ fieldname: "payment_terms_template",
+ label: __("Payment Terms Template"),
+ fieldtype: "Link",
+ options: "Payment Terms Template",
},
{
- "fieldname":"tax_id",
- "label": __("Tax Id"),
- "fieldtype": "Data",
- "hidden": 1
+ fieldname: "tax_id",
+ label: __("Tax Id"),
+ fieldtype: "Data",
+ hidden: 1,
},
{
- "fieldname":"supplier_name",
- "label": __("Supplier Name"),
- "fieldtype": "Data",
- "hidden": 1
- }
- ]
+ fieldname: "supplier_name",
+ label: __("Supplier Name"),
+ fieldtype: "Data",
+ hidden: 1,
+ },
+ ],
};
diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js
index 8808165919ad..bdc98ab0ae35 100644
--- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js
+++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.js
@@ -1,62 +1,61 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Tax Withholding Details"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_default('company')
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_default("company"),
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Select",
- "options": ["Supplier", "Customer"],
- "reqd": 1,
- "default": "Supplier",
- "on_change": function(){
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Select",
+ options: ["Supplier", "Customer"],
+ reqd: 1,
+ default: "Supplier",
+ on_change: function () {
frappe.query_report.set_filter_value("party", "");
- }
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var party_type = frappe.query_report.get_filter_value('party_type');
- var party = frappe.query_report.get_filter_value('party');
- if(party && !party_type) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "Dynamic Link",
+ get_options: function () {
+ var party_type = frappe.query_report.get_filter_value("party_type");
+ var party = frappe.query_report.get_filter_value("party");
+ if (party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
return party_type;
},
- "get_query": function() {
+ get_query: function () {
return {
- "filters": {
- "tax_withholding_category": ["!=",""],
- }
- }
+ filters: {
+ tax_withholding_category: ["!=", ""],
+ },
+ };
},
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
- }
- ]
-}
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
+ },
+ ],
+};
diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.js b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.js
index a0be1b5abdbf..3db1f290b299 100644
--- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.js
+++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.js
@@ -1,62 +1,61 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["TDS Computation Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_default('company')
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_default("company"),
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Select",
- "options": ["Supplier", "Customer"],
- "reqd": 1,
- "default": "Supplier",
- "on_change": function(){
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Select",
+ options: ["Supplier", "Customer"],
+ reqd: 1,
+ default: "Supplier",
+ on_change: function () {
frappe.query_report.set_filter_value("party", "");
- }
+ },
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var party_type = frappe.query_report.get_filter_value('party_type');
- var party = frappe.query_report.get_filter_value('party');
- if(party && !party_type) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "Dynamic Link",
+ get_options: function () {
+ var party_type = frappe.query_report.get_filter_value("party_type");
+ var party = frappe.query_report.get_filter_value("party");
+ if (party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
return party_type;
},
- "get_query": function() {
+ get_query: function () {
return {
- "filters": {
- "tax_withholding_category": ["!=",""],
- }
- }
+ filters: {
+ tax_withholding_category: ["!=", ""],
+ },
+ };
},
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "reqd": 1,
- "width": "60px"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ reqd: 1,
+ width: "60px",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1,
- "width": "60px"
- }
- ]
-}
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
+ width: "60px",
+ },
+ ],
+};
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index 5374ac16d11a..2f701900cf76 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -2,121 +2,121 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["Trial Balance"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
- "on_change": function(query_report) {
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
+ on_change: function (query_report) {
var fiscal_year = query_report.get_values().fiscal_year;
if (!fiscal_year) {
return;
}
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
from_date: fy.year_start_date,
- to_date: fy.year_end_date
+ to_date: fy.year_end_date,
});
});
- }
+ },
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
},
{
- "fieldname": "cost_center",
- "label": __("Cost Center"),
- "fieldtype": "Link",
- "options": "Cost Center",
- "get_query": function() {
- var company = frappe.query_report.get_filter_value('company');
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "Link",
+ options: "Cost Center",
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
- "doctype": "Cost Center",
- "filters": {
- "company": company,
- }
- }
- }
+ doctype: "Cost Center",
+ filters: {
+ company: company,
+ },
+ };
+ },
},
{
- "fieldname": "project",
- "label": __("Project"),
- "fieldtype": "Link",
- "options": "Project"
+ fieldname: "project",
+ label: __("Project"),
+ fieldtype: "Link",
+ options: "Project",
},
{
- "fieldname": "finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book",
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname": "presentation_currency",
- "label": __("Currency"),
- "fieldtype": "Select",
- "options": erpnext.get_presentation_currency_list()
+ fieldname: "presentation_currency",
+ label: __("Currency"),
+ fieldtype: "Select",
+ options: erpnext.get_presentation_currency_list(),
},
{
- "fieldname": "with_period_closing_entry_for_opening",
- "label": __("With Period Closing Entry For Opening Balances"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "with_period_closing_entry_for_opening",
+ label: __("With Period Closing Entry For Opening Balances"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "with_period_closing_entry_for_current_period",
- "label": __("Period Closing Entry For Current Period"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "with_period_closing_entry_for_current_period",
+ label: __("Period Closing Entry For Current Period"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "show_zero_values",
- "label": __("Show zero values"),
- "fieldtype": "Check"
+ fieldname: "show_zero_values",
+ label: __("Show zero values"),
+ fieldtype: "Check",
},
{
- "fieldname": "show_unclosed_fy_pl_balances",
- "label": __("Show unclosed fiscal year's P&L balances"),
- "fieldtype": "Check"
+ fieldname: "show_unclosed_fy_pl_balances",
+ label: __("Show unclosed fiscal year's P&L balances"),
+ fieldtype: "Check",
},
{
- "fieldname": "include_default_book_entries",
- "label": __("Include Default FB Entries"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_default_book_entries",
+ label: __("Include Default FB Entries"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname": "show_net_values",
- "label": __("Show net values in opening and closing columns"),
- "fieldtype": "Check",
- "default": 1
- }
+ fieldname: "show_net_values",
+ label: __("Show net values in opening and closing columns"),
+ fieldtype: "Check",
+ default: 1,
+ },
],
- "formatter": erpnext.financial_statements.formatter,
- "tree": true,
- "name_field": "account",
- "parent_field": "parent_account",
- "initial_depth": 3
-}
+ formatter: erpnext.financial_statements.formatter,
+ tree: true,
+ name_field: "account",
+ parent_field: "parent_account",
+ initial_depth: 3,
+};
-erpnext.utils.add_dimensions('Trial Balance', 6);
+erpnext.utils.add_dimensions("Trial Balance", 6);
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index 33c644adcb99..50578d314e3b 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -2,88 +2,88 @@
// For license information, please see license.txt
frappe.query_reports["Trial Balance for Party"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
- "on_change": function(query_report) {
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
+ on_change: function (query_report) {
var fiscal_year = query_report.get_values().fiscal_year;
if (!fiscal_year) {
return;
}
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
from_date: fy.year_start_date,
- to_date: fy.year_end_date
+ to_date: fy.year_end_date,
});
});
- }
+ },
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
},
{
- "fieldname":"party_type",
- "label": __("Party Type"),
- "fieldtype": "Link",
- "options": "Party Type",
- "default": "Customer",
- "reqd": 1
+ fieldname: "party_type",
+ label: __("Party Type"),
+ fieldtype: "Link",
+ options: "Party Type",
+ default: "Customer",
+ reqd: 1,
},
{
- "fieldname":"party",
- "label": __("Party"),
- "fieldtype": "Dynamic Link",
- "get_options": function() {
- var party_type = frappe.query_report.get_filter_value('party_type');
- var party = frappe.query_report.get_filter_value('party');
- if(party && !party_type) {
+ fieldname: "party",
+ label: __("Party"),
+ fieldtype: "Dynamic Link",
+ get_options: function () {
+ var party_type = frappe.query_report.get_filter_value("party_type");
+ var party = frappe.query_report.get_filter_value("party");
+ if (party && !party_type) {
frappe.throw(__("Please select Party Type first"));
}
return party_type;
- }
+ },
},
{
- "fieldname": "account",
- "label": __("Account"),
- "fieldtype": "Link",
- "options": "Account",
- "get_query": function() {
- var company = frappe.query_report.get_filter_value('company');
+ fieldname: "account",
+ label: __("Account"),
+ fieldtype: "Link",
+ options: "Account",
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
- "doctype": "Account",
- "filters": {
- "company": company,
- }
- }
- }
+ doctype: "Account",
+ filters: {
+ company: company,
+ },
+ };
+ },
},
{
- "fieldname": "show_zero_values",
- "label": __("Show zero values"),
- "fieldtype": "Check"
- }
- ]
-}
+ fieldname: "show_zero_values",
+ label: __("Show zero values"),
+ fieldtype: "Check",
+ },
+ ],
+};
diff --git a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js
index f7ab029f1944..03ebf730d4de 100644
--- a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js
+++ b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.js
@@ -1,28 +1,27 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Voucher-wise Balance"] = {
- "filters": [
- {
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company"
- },
- {
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "width": "60px"
- },
- {
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "width": "60px"
- },
- ]
+ filters: [
+ {
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ },
+ {
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ width: "60px",
+ },
+ {
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ width: "60px",
+ },
+ ],
};
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 673fe549ee3c..6dbb53a078f4 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -4,136 +4,175 @@
frappe.provide("erpnext.asset");
frappe.provide("erpnext.accounts.dimensions");
-frappe.ui.form.on('Asset', {
- onload: function(frm) {
- frm.set_query("item_code", function() {
+frappe.ui.form.on("Asset", {
+ onload: function (frm) {
+ frm.set_query("item_code", function () {
return {
- "filters": {
- "is_fixed_asset": 1,
- "is_stock_item": 0
- }
+ filters: {
+ is_fixed_asset: 1,
+ is_stock_item: 0,
+ },
};
});
- frm.set_query("warehouse", function() {
+ frm.set_query("warehouse", function () {
return {
- "filters": {
- "company": frm.doc.company,
- "is_group": 0
- }
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ },
};
});
- frm.set_query("department", function() {
+ frm.set_query("department", function () {
return {
- "filters": {
- "company": frm.doc.company,
- }
+ filters: {
+ company: frm.doc.company,
+ },
};
});
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- setup: function(frm) {
- frm.ignore_doctypes_on_cancel_all = ['Journal Entry'];
+ setup: function (frm) {
+ frm.ignore_doctypes_on_cancel_all = ["Journal Entry"];
frm.make_methods = {
- 'Asset Movement': () => {
+ "Asset Movement": () => {
frappe.call({
- method: "erpnext.assets.doctype.asset.asset.make_asset_movement",
- freeze: true,
- args:{
- "assets": [{ name: cur_frm.doc.name }]
- },
- callback: function (r) {
- if (r.message) {
- var doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- }
- });
+ method: "erpnext.assets.doctype.asset.asset.make_asset_movement",
+ freeze: true,
+ args: {
+ assets: [{ name: cur_frm.doc.name }],
+ },
+ callback: function (r) {
+ if (r.message) {
+ var doc = frappe.model.sync(r.message)[0];
+ frappe.set_route("Form", doc.doctype, doc.name);
+ }
+ },
+ });
},
- }
+ };
frm.set_query("purchase_receipt", (doc) => {
return {
query: "erpnext.controllers.queries.get_purchase_receipts",
- filters: { item_code: doc.item_code }
- }
+ filters: { item_code: doc.item_code },
+ };
});
frm.set_query("purchase_invoice", (doc) => {
return {
query: "erpnext.controllers.queries.get_purchase_invoices",
- filters: { item_code: doc.item_code }
- }
+ filters: { item_code: doc.item_code },
+ };
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
frappe.ui.form.trigger("Asset", "is_existing_asset");
frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
- if (frm.doc.docstatus==1) {
+ if (frm.doc.docstatus == 1) {
if (in_list(["Submitted", "Partially Depreciated", "Fully Depreciated"], frm.doc.status)) {
- frm.add_custom_button(__("Transfer Asset"), function() {
- erpnext.asset.transfer_asset(frm);
- }, __("Manage"));
-
- frm.add_custom_button(__("Scrap Asset"), function() {
- erpnext.asset.scrap_asset(frm);
- }, __("Manage"));
-
- frm.add_custom_button(__("Sell Asset"), function() {
- frm.trigger("make_sales_invoice");
- }, __("Manage"));
-
- } else if (frm.doc.status=='Scrapped') {
- frm.add_custom_button(__("Restore Asset"), function() {
- erpnext.asset.restore_asset(frm);
- }, __("Manage"));
+ frm.add_custom_button(
+ __("Transfer Asset"),
+ function () {
+ erpnext.asset.transfer_asset(frm);
+ },
+ __("Manage")
+ );
+
+ frm.add_custom_button(
+ __("Scrap Asset"),
+ function () {
+ erpnext.asset.scrap_asset(frm);
+ },
+ __("Manage")
+ );
+
+ frm.add_custom_button(
+ __("Sell Asset"),
+ function () {
+ frm.trigger("make_sales_invoice");
+ },
+ __("Manage")
+ );
+ } else if (frm.doc.status == "Scrapped") {
+ frm.add_custom_button(
+ __("Restore Asset"),
+ function () {
+ erpnext.asset.restore_asset(frm);
+ },
+ __("Manage")
+ );
}
if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
- frm.add_custom_button(__("Maintain Asset"), function() {
- frm.trigger("create_asset_maintenance");
- }, __("Manage"));
+ frm.add_custom_button(
+ __("Maintain Asset"),
+ function () {
+ frm.trigger("create_asset_maintenance");
+ },
+ __("Manage")
+ );
}
- frm.add_custom_button(__("Repair Asset"), function() {
- frm.trigger("create_asset_repair");
- }, __("Manage"));
-
- frm.add_custom_button(__("Split Asset"), function() {
- frm.trigger("split_asset");
- }, __("Manage"));
+ frm.add_custom_button(
+ __("Repair Asset"),
+ function () {
+ frm.trigger("create_asset_repair");
+ },
+ __("Manage")
+ );
- if (frm.doc.status != 'Fully Depreciated') {
- frm.add_custom_button(__("Adjust Asset Value"), function() {
- frm.trigger("create_asset_value_adjustment");
- }, __("Manage"));
+ frm.add_custom_button(
+ __("Split Asset"),
+ function () {
+ frm.trigger("split_asset");
+ },
+ __("Manage")
+ );
+
+ if (frm.doc.status != "Fully Depreciated") {
+ frm.add_custom_button(
+ __("Adjust Asset Value"),
+ function () {
+ frm.trigger("create_asset_value_adjustment");
+ },
+ __("Manage")
+ );
}
if (!frm.doc.calculate_depreciation) {
- frm.add_custom_button(__("Create Depreciation Entry"), function() {
- frm.trigger("make_journal_entry");
- }, __("Manage"));
+ frm.add_custom_button(
+ __("Create Depreciation Entry"),
+ function () {
+ frm.trigger("make_journal_entry");
+ },
+ __("Manage")
+ );
}
if (frm.doc.purchase_receipt || !frm.doc.is_existing_asset) {
- frm.add_custom_button(__("View General Ledger"), function() {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "from_date": frm.doc.available_for_use_date,
- "to_date": frm.doc.available_for_use_date,
- "company": frm.doc.company
- };
- frappe.set_route("query-report", "General Ledger");
- }, __("Manage"));
+ frm.add_custom_button(
+ __("View General Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.available_for_use_date,
+ to_date: frm.doc.available_for_use_date,
+ company: frm.doc.company,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ __("Manage")
+ );
}
if (frm.doc.depr_entry_posting_status === "Failed") {
@@ -149,10 +188,10 @@ frappe.ui.form.on('Asset', {
frm.toggle_reqd("finance_books", frm.doc.calculate_depreciation);
if (frm.doc.is_composite_asset && !frm.doc.capitalized_in) {
- $('.primary-action').prop('hidden', true);
- $('.form-message').text('Capitalize this asset to confirm');
+ $(".primary-action").prop("hidden", true);
+ $(".form-message").text("Capitalize this asset to confirm");
- frm.add_custom_button(__("Capitalize Asset"), function() {
+ frm.add_custom_button(__("Capitalize Asset"), function () {
frm.trigger("create_asset_capitalization");
});
}
@@ -172,81 +211,89 @@ frappe.ui.form.on('Asset', {
frm.dashboard.set_headline_alert(alert);
},
- toggle_reference_doc: function(frm) {
+ toggle_reference_doc: function (frm) {
if (frm.doc.purchase_receipt && frm.doc.purchase_invoice && frm.doc.docstatus === 1) {
- frm.set_df_property('purchase_invoice', 'read_only', 1);
- frm.set_df_property('purchase_receipt', 'read_only', 1);
- }
- else if (frm.doc.is_existing_asset || frm.doc.is_composite_asset) {
- frm.toggle_reqd('purchase_receipt', 0);
- frm.toggle_reqd('purchase_invoice', 0);
- }
- else if (frm.doc.purchase_receipt) {
+ frm.set_df_property("purchase_invoice", "read_only", 1);
+ frm.set_df_property("purchase_receipt", "read_only", 1);
+ } else if (frm.doc.is_existing_asset || frm.doc.is_composite_asset) {
+ frm.toggle_reqd("purchase_receipt", 0);
+ frm.toggle_reqd("purchase_invoice", 0);
+ } else if (frm.doc.purchase_receipt) {
// if purchase receipt link is set then set PI disabled
- frm.toggle_reqd('purchase_invoice', 0);
- frm.set_df_property('purchase_invoice', 'read_only', 1);
- }
- else if (frm.doc.purchase_invoice) {
+ frm.toggle_reqd("purchase_invoice", 0);
+ frm.set_df_property("purchase_invoice", "read_only", 1);
+ } else if (frm.doc.purchase_invoice) {
// if purchase invoice link is set then set PR disabled
- frm.toggle_reqd('purchase_receipt', 0);
- frm.set_df_property('purchase_receipt', 'read_only', 1);
- }
- else {
- frm.toggle_reqd('purchase_receipt', 1);
- frm.set_df_property('purchase_receipt', 'read_only', 0);
- frm.toggle_reqd('purchase_invoice', 1);
- frm.set_df_property('purchase_invoice', 'read_only', 0);
+ frm.toggle_reqd("purchase_receipt", 0);
+ frm.set_df_property("purchase_receipt", "read_only", 1);
+ } else {
+ frm.toggle_reqd("purchase_receipt", 1);
+ frm.set_df_property("purchase_receipt", "read_only", 0);
+ frm.toggle_reqd("purchase_invoice", 1);
+ frm.set_df_property("purchase_invoice", "read_only", 0);
}
},
- make_journal_entry: function(frm) {
+ make_journal_entry: function (frm) {
frappe.call({
method: "erpnext.assets.doctype.asset.asset.make_journal_entry",
args: {
- asset_name: frm.doc.name
+ asset_name: frm.doc.name,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
- }
- })
+ },
+ });
},
- render_depreciation_schedule_view: function(frm, asset_depr_schedule_doc) {
+ render_depreciation_schedule_view: function (frm, asset_depr_schedule_doc) {
let wrapper = $(frm.fields_dict["depreciation_schedule_view"].wrapper).empty();
let data = [];
asset_depr_schedule_doc.depreciation_schedule.forEach((sch) => {
const row = [
- sch['idx'],
- frappe.format(sch['schedule_date'], { fieldtype: 'Date' }),
- frappe.format(sch['depreciation_amount'], { fieldtype: 'Currency' }),
- frappe.format(sch['accumulated_depreciation_amount'], { fieldtype: 'Currency' }),
- sch['journal_entry'] || '',
+ sch["idx"],
+ frappe.format(sch["schedule_date"], { fieldtype: "Date" }),
+ frappe.format(sch["depreciation_amount"], { fieldtype: "Currency" }),
+ frappe.format(sch["accumulated_depreciation_amount"], { fieldtype: "Currency" }),
+ sch["journal_entry"] || "",
];
if (asset_depr_schedule_doc.shift_based) {
- row.push(sch['shift']);
+ row.push(sch["shift"]);
}
data.push(row);
});
let columns = [
- {name: __("No."), editable: false, resizable: false, format: value => value, width: 60},
- {name: __("Schedule Date"), editable: false, resizable: false, width: 270},
- {name: __("Depreciation Amount"), editable: false, resizable: false, width: 164},
- {name: __("Accumulated Depreciation Amount"), editable: false, resizable: false, width: 164},
+ { name: __("No."), editable: false, resizable: false, format: (value) => value, width: 60 },
+ { name: __("Schedule Date"), editable: false, resizable: false, width: 270 },
+ { name: __("Depreciation Amount"), editable: false, resizable: false, width: 164 },
+ { name: __("Accumulated Depreciation Amount"), editable: false, resizable: false, width: 164 },
];
if (asset_depr_schedule_doc.shift_based) {
- columns.push({name: __("Journal Entry"), editable: false, resizable: false, format: value => `${value} `, width: 245});
- columns.push({name: __("Shift"), editable: false, resizable: false, width: 59});
+ columns.push({
+ name: __("Journal Entry"),
+ editable: false,
+ resizable: false,
+ format: (value) => `${value} `,
+ width: 245,
+ });
+ columns.push({ name: __("Shift"), editable: false, resizable: false, width: 59 });
} else {
- columns.push({name: __("Journal Entry"), editable: false, resizable: false, format: value => `${value} `, width: 304});
+ columns.push({
+ name: __("Journal Entry"),
+ editable: false,
+ resizable: false,
+ format: (value) => `${value} `,
+ width: 304,
+ });
}
let datatable = new frappe.DataTable(wrapper.get(0), {
@@ -255,55 +302,73 @@ frappe.ui.form.on('Asset', {
layout: "fluid",
serialNoColumn: false,
checkboxColumn: true,
- cellHeight: 35
+ cellHeight: 35,
});
- datatable.style.setStyle(`.dt-scrollable`, {'font-size': '0.75rem', 'margin-bottom': '1rem', 'margin-left': '0.35rem', 'margin-right': '0.35rem'});
- datatable.style.setStyle(`.dt-header`, {'margin-left': '0.35rem', 'margin-right': '0.35rem'});
- datatable.style.setStyle(`.dt-cell--header .dt-cell__content`, {'color': 'var(--gray-600)', 'font-size': 'var(--text-sm)'});
- datatable.style.setStyle(`.dt-cell`, {'color': 'var(--text-color)'});
- datatable.style.setStyle(`.dt-cell--col-1`, {'text-align': 'center'});
- datatable.style.setStyle(`.dt-cell--col-2`, {'font-weight': 600});
- datatable.style.setStyle(`.dt-cell--col-3`, {'font-weight': 600});
+ datatable.style.setStyle(`.dt-scrollable`, {
+ "font-size": "0.75rem",
+ "margin-bottom": "1rem",
+ "margin-left": "0.35rem",
+ "margin-right": "0.35rem",
+ });
+ datatable.style.setStyle(`.dt-header`, { "margin-left": "0.35rem", "margin-right": "0.35rem" });
+ datatable.style.setStyle(`.dt-cell--header .dt-cell__content`, {
+ color: "var(--gray-600)",
+ "font-size": "var(--text-sm)",
+ });
+ datatable.style.setStyle(`.dt-cell`, { color: "var(--text-color)" });
+ datatable.style.setStyle(`.dt-cell--col-1`, { "text-align": "center" });
+ datatable.style.setStyle(`.dt-cell--col-2`, { "font-weight": 600 });
+ datatable.style.setStyle(`.dt-cell--col-3`, { "font-weight": 600 });
},
- setup_chart_and_depr_schedule_view: async function(frm) {
- if(frm.doc.finance_books.length > 1) {
- return
+ setup_chart_and_depr_schedule_view: async function (frm) {
+ if (frm.doc.finance_books.length > 1) {
+ return;
}
- var x_intervals = [frappe.format(frm.doc.purchase_date, { fieldtype: 'Date' })];
+ var x_intervals = [frappe.format(frm.doc.purchase_date, { fieldtype: "Date" })];
var asset_values = [frm.doc.gross_purchase_amount];
- if(frm.doc.calculate_depreciation) {
- if(frm.doc.opening_accumulated_depreciation) {
+ if (frm.doc.calculate_depreciation) {
+ if (frm.doc.opening_accumulated_depreciation) {
var depreciation_date = frappe.datetime.add_months(
frm.doc.finance_books[0].depreciation_start_date,
-1 * frm.doc.finance_books[0].frequency_of_depreciation
);
- x_intervals.push(frappe.format(depreciation_date, { fieldtype: 'Date' }));
- asset_values.push(flt(frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation, precision('gross_purchase_amount')));
+ x_intervals.push(frappe.format(depreciation_date, { fieldtype: "Date" }));
+ asset_values.push(
+ flt(
+ frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation,
+ precision("gross_purchase_amount")
+ )
+ );
}
- let asset_depr_schedule_doc = (await frappe.call(
- "erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule.get_asset_depr_schedule_doc",
- {
- asset_name: frm.doc.name,
- status: "Active",
- finance_book: frm.doc.finance_books[0].finance_book || null
- }
- )).message;
-
- $.each(asset_depr_schedule_doc.depreciation_schedule || [], function(i, v) {
- x_intervals.push(frappe.format(v.schedule_date, { fieldtype: 'Date' }));
- var asset_value = flt(frm.doc.gross_purchase_amount - v.accumulated_depreciation_amount, precision('gross_purchase_amount'));
- if(v.journal_entry) {
+ let asset_depr_schedule_doc = (
+ await frappe.call(
+ "erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule.get_asset_depr_schedule_doc",
+ {
+ asset_name: frm.doc.name,
+ status: "Active",
+ finance_book: frm.doc.finance_books[0].finance_book || null,
+ }
+ )
+ ).message;
+
+ $.each(asset_depr_schedule_doc.depreciation_schedule || [], function (i, v) {
+ x_intervals.push(frappe.format(v.schedule_date, { fieldtype: "Date" }));
+ var asset_value = flt(
+ frm.doc.gross_purchase_amount - v.accumulated_depreciation_amount,
+ precision("gross_purchase_amount")
+ );
+ if (v.journal_entry) {
asset_values.push(asset_value);
} else {
if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
asset_values.push(null);
} else {
- asset_values.push(asset_value)
+ asset_values.push(asset_value);
}
}
});
@@ -311,25 +376,32 @@ frappe.ui.form.on('Asset', {
frm.toggle_display(["depreciation_schedule_view"], 1);
frm.events.render_depreciation_schedule_view(frm, asset_depr_schedule_doc);
} else {
- if(frm.doc.opening_accumulated_depreciation) {
- x_intervals.push(frappe.format(frm.doc.creation.split(" ")[0], { fieldtype: 'Date' }));
- asset_values.push(flt(frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation, precision('gross_purchase_amount')));
+ if (frm.doc.opening_accumulated_depreciation) {
+ x_intervals.push(frappe.format(frm.doc.creation.split(" ")[0], { fieldtype: "Date" }));
+ asset_values.push(
+ flt(
+ frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation,
+ precision("gross_purchase_amount")
+ )
+ );
}
- let depr_entries = (await frappe.call({
- method: "get_manual_depreciation_entries",
- doc: frm.doc,
- })).message;
-
- $.each(depr_entries || [], function(i, v) {
- x_intervals.push(frappe.format(v.posting_date, { fieldtype: 'Date' }));
- let last_asset_value = asset_values[asset_values.length - 1]
- asset_values.push(flt(last_asset_value - v.value, precision('gross_purchase_amount')));
+ let depr_entries = (
+ await frappe.call({
+ method: "get_manual_depreciation_entries",
+ doc: frm.doc,
+ })
+ ).message;
+
+ $.each(depr_entries || [], function (i, v) {
+ x_intervals.push(frappe.format(v.posting_date, { fieldtype: "Date" }));
+ let last_asset_value = asset_values[asset_values.length - 1];
+ asset_values.push(flt(last_asset_value - v.value, precision("gross_purchase_amount")));
});
}
- if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
- x_intervals.push(frappe.format(frm.doc.disposal_date, { fieldtype: 'Date' }));
+ if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
+ x_intervals.push(frappe.format(frm.doc.disposal_date, { fieldtype: "Date" }));
asset_values.push(0);
}
@@ -337,145 +409,146 @@ frappe.ui.form.on('Asset', {
title: "Asset Value",
data: {
labels: x_intervals,
- datasets: [{
- color: 'green',
- values: asset_values,
- formatted: asset_values.map(d => d?.toFixed(2))
- }]
+ datasets: [
+ {
+ color: "green",
+ values: asset_values,
+ formatted: asset_values.map((d) => d?.toFixed(2)),
+ },
+ ],
},
- type: 'line'
+ type: "line",
});
},
-
- item_code: function(frm) {
- if(frm.doc.item_code && frm.doc.calculate_depreciation && frm.doc.gross_purchase_amount) {
- frm.trigger('set_finance_book');
+ item_code: function (frm) {
+ if (frm.doc.item_code && frm.doc.calculate_depreciation && frm.doc.gross_purchase_amount) {
+ frm.trigger("set_finance_book");
} else {
- frm.set_value('finance_books', []);
+ frm.set_value("finance_books", []);
}
},
- set_finance_book: function(frm) {
+ set_finance_book: function (frm) {
frappe.call({
method: "erpnext.assets.doctype.asset.asset.get_item_details",
args: {
item_code: frm.doc.item_code,
asset_category: frm.doc.asset_category,
- gross_purchase_amount: frm.doc.gross_purchase_amount
+ gross_purchase_amount: frm.doc.gross_purchase_amount,
},
- callback: function(r, rt) {
- if(r.message) {
- frm.set_value('finance_books', r.message);
+ callback: function (r, rt) {
+ if (r.message) {
+ frm.set_value("finance_books", r.message);
}
- }
- })
+ },
+ });
},
- is_existing_asset: function(frm) {
+ is_existing_asset: function (frm) {
frm.trigger("toggle_reference_doc");
},
- is_composite_asset: function(frm) {
- if(frm.doc.is_composite_asset) {
- frm.set_value('gross_purchase_amount', 0);
- frm.set_df_property('gross_purchase_amount', 'read_only', 1);
+ is_composite_asset: function (frm) {
+ if (frm.doc.is_composite_asset) {
+ frm.set_value("gross_purchase_amount", 0);
+ frm.set_df_property("gross_purchase_amount", "read_only", 1);
} else {
- frm.set_df_property('gross_purchase_amount', 'read_only', 0);
+ frm.set_df_property("gross_purchase_amount", "read_only", 0);
}
frm.trigger("toggle_reference_doc");
},
- make_sales_invoice: function(frm) {
+ make_sales_invoice: function (frm) {
frappe.call({
args: {
- "asset": frm.doc.name,
- "item_code": frm.doc.item_code,
- "company": frm.doc.company,
- "serial_no": frm.doc.serial_no
+ asset: frm.doc.name,
+ item_code: frm.doc.item_code,
+ company: frm.doc.company,
+ serial_no: frm.doc.serial_no,
},
method: "erpnext.assets.doctype.asset.asset.make_sales_invoice",
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
- create_asset_maintenance: function(frm) {
+ create_asset_maintenance: function (frm) {
frappe.call({
args: {
- "asset": frm.doc.name,
- "item_code": frm.doc.item_code,
- "item_name": frm.doc.item_name,
- "asset_category": frm.doc.asset_category,
- "company": frm.doc.company
+ asset: frm.doc.name,
+ item_code: frm.doc.item_code,
+ item_name: frm.doc.item_name,
+ asset_category: frm.doc.asset_category,
+ company: frm.doc.company,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_maintenance",
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
- create_asset_repair: function(frm) {
+ create_asset_repair: function (frm) {
frappe.call({
args: {
- "asset": frm.doc.name,
- "asset_name": frm.doc.asset_name
+ asset: frm.doc.name,
+ asset_name: frm.doc.asset_name,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_repair",
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
},
- create_asset_capitalization: function(frm) {
+ create_asset_capitalization: function (frm) {
frappe.call({
args: {
- "asset": frm.doc.name,
+ asset: frm.doc.name,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_capitalization",
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
},
- split_asset: function(frm) {
- const title = __('Split Asset');
+ split_asset: function (frm) {
+ const title = __("Split Asset");
const fields = [
{
- fieldname: 'split_qty',
- fieldtype: 'Int',
- label: __('Split Qty'),
- reqd: 1
- }
+ fieldname: "split_qty",
+ fieldtype: "Int",
+ label: __("Split Qty"),
+ reqd: 1,
+ },
];
let dialog = new frappe.ui.Dialog({
title: title,
- fields: fields
+ fields: fields,
});
- dialog.set_primary_action(__('Split'), function() {
+ dialog.set_primary_action(__("Split"), function () {
const dialog_data = dialog.get_values();
frappe.call({
args: {
- "asset_name": frm.doc.name,
- "split_qty": cint(dialog_data.split_qty)
+ asset_name: frm.doc.name,
+ split_qty: cint(dialog_data.split_qty),
},
method: "erpnext.assets.doctype.asset.asset.split_asset",
- callback: function(r) {
+ callback: function (r) {
let doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
dialog.hide();
@@ -484,23 +557,23 @@ frappe.ui.form.on('Asset', {
dialog.show();
},
- create_asset_value_adjustment: function(frm) {
+ create_asset_value_adjustment: function (frm) {
frappe.call({
args: {
- "asset": frm.doc.name,
- "asset_category": frm.doc.asset_category,
- "company": frm.doc.company
+ asset: frm.doc.name,
+ asset_category: frm.doc.asset_category,
+ company: frm.doc.company,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_value_adjustment",
freeze: 1,
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
- calculate_depreciation: function(frm) {
+ calculate_depreciation: function (frm) {
frm.toggle_reqd("finance_books", frm.doc.calculate_depreciation);
if (frm.doc.item_code && frm.doc.calculate_depreciation && frm.doc.gross_purchase_amount) {
frm.trigger("set_finance_book");
@@ -509,203 +582,249 @@ frappe.ui.form.on('Asset', {
}
},
- gross_purchase_amount: function(frm) {
+ gross_purchase_amount: function (frm) {
if (frm.doc.finance_books) {
- frm.doc.finance_books.forEach(d => {
+ frm.doc.finance_books.forEach((d) => {
frm.events.set_depreciation_rate(frm, d);
- })
+ });
}
},
purchase_receipt: (frm) => {
- frm.trigger('toggle_reference_doc');
+ frm.trigger("toggle_reference_doc");
if (frm.doc.purchase_receipt) {
if (frm.doc.item_code) {
- frappe.db.get_doc('Purchase Receipt', frm.doc.purchase_receipt).then(pr_doc => {
- frm.events.set_values_from_purchase_doc(frm, 'Purchase Receipt', pr_doc)
+ frappe.db.get_doc("Purchase Receipt", frm.doc.purchase_receipt).then((pr_doc) => {
+ frm.events.set_values_from_purchase_doc(frm, "Purchase Receipt", pr_doc);
});
} else {
- frm.set_value('purchase_receipt', '');
+ frm.set_value("purchase_receipt", "");
frappe.msgprint({
- title: __('Not Allowed'),
- message: __("Please select Item Code first")
+ title: __("Not Allowed"),
+ message: __("Please select Item Code first"),
});
}
}
},
purchase_invoice: (frm) => {
- frm.trigger('toggle_reference_doc');
+ frm.trigger("toggle_reference_doc");
if (frm.doc.purchase_invoice) {
if (frm.doc.item_code) {
- frappe.db.get_doc('Purchase Invoice', frm.doc.purchase_invoice).then(pi_doc => {
- frm.events.set_values_from_purchase_doc(frm, 'Purchase Invoice', pi_doc)
+ frappe.db.get_doc("Purchase Invoice", frm.doc.purchase_invoice).then((pi_doc) => {
+ frm.events.set_values_from_purchase_doc(frm, "Purchase Invoice", pi_doc);
});
} else {
- frm.set_value('purchase_invoice', '');
+ frm.set_value("purchase_invoice", "");
frappe.msgprint({
- title: __('Not Allowed'),
- message: __("Please select Item Code first")
+ title: __("Not Allowed"),
+ message: __("Please select Item Code first"),
});
}
}
},
- set_values_from_purchase_doc: function(frm, doctype, purchase_doc) {
- frm.set_value('company', purchase_doc.company);
+ set_values_from_purchase_doc: function (frm, doctype, purchase_doc) {
+ frm.set_value("company", purchase_doc.company);
if (purchase_doc.bill_date) {
- frm.set_value('purchase_date', purchase_doc.bill_date);
+ frm.set_value("purchase_date", purchase_doc.bill_date);
} else {
- frm.set_value('purchase_date', purchase_doc.posting_date);
+ frm.set_value("purchase_date", purchase_doc.posting_date);
}
if (!frm.doc.is_existing_asset && !frm.doc.available_for_use_date) {
- frm.set_value('available_for_use_date', frm.doc.purchase_date);
+ frm.set_value("available_for_use_date", frm.doc.purchase_date);
}
- const item = purchase_doc.items.find(item => item.item_code === frm.doc.item_code);
+ const item = purchase_doc.items.find((item) => item.item_code === frm.doc.item_code);
if (!item) {
- let doctype_field = frappe.scrub(doctype)
- frm.set_value(doctype_field, '');
+ let doctype_field = frappe.scrub(doctype);
+ frm.set_value(doctype_field, "");
frappe.msgprint({
- title: __('Invalid {0}', [__(doctype)]),
- message: __('The selected {0} does not contain the selected Asset Item.', [__(doctype)]),
- indicator: 'red'
+ title: __("Invalid {0}", [__(doctype)]),
+ message: __("The selected {0} does not contain the selected Asset Item.", [__(doctype)]),
+ indicator: "red",
});
}
- frappe.db.get_value('Item', item.item_code, 'is_grouped_asset', (r) => {
+ frappe.db.get_value("Item", item.item_code, "is_grouped_asset", (r) => {
var asset_quantity = r.is_grouped_asset ? item.qty : 1;
- var purchase_amount = flt(item.valuation_rate * asset_quantity, precision('gross_purchase_amount'));
-
- frm.set_value('gross_purchase_amount', purchase_amount);
- frm.set_value('purchase_receipt_amount', purchase_amount);
- frm.set_value('asset_quantity', asset_quantity);
- frm.set_value('cost_center', item.cost_center || purchase_doc.cost_center);
- if(item.asset_location) { frm.set_value('location', item.asset_location); }
+ var purchase_amount = flt(
+ item.valuation_rate * asset_quantity,
+ precision("gross_purchase_amount")
+ );
+
+ frm.set_value("gross_purchase_amount", purchase_amount);
+ frm.set_value("purchase_receipt_amount", purchase_amount);
+ frm.set_value("asset_quantity", asset_quantity);
+ frm.set_value("cost_center", item.cost_center || purchase_doc.cost_center);
+ if (item.asset_location) {
+ frm.set_value("location", item.asset_location);
+ }
});
},
- set_depreciation_rate: function(frm, row) {
- if (row.total_number_of_depreciations && row.frequency_of_depreciation
- && row.expected_value_after_useful_life) {
+ set_depreciation_rate: function (frm, row) {
+ if (
+ row.total_number_of_depreciations &&
+ row.frequency_of_depreciation &&
+ row.expected_value_after_useful_life
+ ) {
frappe.call({
method: "get_depreciation_rate",
doc: frm.doc,
args: row,
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frappe.flags.dont_change_rate = true;
- frappe.model.set_value(row.doctype, row.name,
- "rate_of_depreciation", flt(r.message, precision("rate_of_depreciation", row)));
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "rate_of_depreciation",
+ flt(r.message, precision("rate_of_depreciation", row))
+ );
}
- }
+ },
});
}
},
- set_salvage_value_percentage_or_expected_value_after_useful_life: function(frm, row, salvage_value_percentage_changed, expected_value_after_useful_life_changed) {
+ set_salvage_value_percentage_or_expected_value_after_useful_life: function (
+ frm,
+ row,
+ salvage_value_percentage_changed,
+ expected_value_after_useful_life_changed
+ ) {
if (expected_value_after_useful_life_changed) {
frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life = true;
- const new_salvage_value_percentage = flt((row.expected_value_after_useful_life * 100) / frm.doc.gross_purchase_amount, precision("salvage_value_percentage", row));
- frappe.model.set_value(row.doctype, row.name, "salvage_value_percentage", new_salvage_value_percentage);
+ const new_salvage_value_percentage = flt(
+ (row.expected_value_after_useful_life * 100) / frm.doc.gross_purchase_amount,
+ precision("salvage_value_percentage", row)
+ );
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "salvage_value_percentage",
+ new_salvage_value_percentage
+ );
frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life = false;
} else if (salvage_value_percentage_changed) {
frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life = true;
- const new_expected_value_after_useful_life = flt(frm.doc.gross_purchase_amount * (row.salvage_value_percentage / 100), precision('gross_purchase_amount'));
- frappe.model.set_value(row.doctype, row.name, "expected_value_after_useful_life", new_expected_value_after_useful_life);
+ const new_expected_value_after_useful_life = flt(
+ frm.doc.gross_purchase_amount * (row.salvage_value_percentage / 100),
+ precision("gross_purchase_amount")
+ );
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "expected_value_after_useful_life",
+ new_expected_value_after_useful_life
+ );
frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life = false;
}
},
});
-frappe.ui.form.on('Asset Finance Book', {
- depreciation_method: function(frm, cdt, cdn) {
+frappe.ui.form.on("Asset Finance Book", {
+ depreciation_method: function (frm, cdt, cdn) {
const row = locals[cdt][cdn];
frm.events.set_depreciation_rate(frm, row);
},
- expected_value_after_useful_life: function(frm, cdt, cdn) {
+ expected_value_after_useful_life: function (frm, cdt, cdn) {
const row = locals[cdt][cdn];
if (!frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life) {
- frm.events.set_salvage_value_percentage_or_expected_value_after_useful_life(frm, row, false, true);
+ frm.events.set_salvage_value_percentage_or_expected_value_after_useful_life(
+ frm,
+ row,
+ false,
+ true
+ );
}
frm.events.set_depreciation_rate(frm, row);
},
- salvage_value_percentage: function(frm, cdt, cdn) {
+ salvage_value_percentage: function (frm, cdt, cdn) {
const row = locals[cdt][cdn];
if (!frappe.flags.from_set_salvage_value_percentage_or_expected_value_after_useful_life) {
- frm.events.set_salvage_value_percentage_or_expected_value_after_useful_life(frm, row, true, false);
+ frm.events.set_salvage_value_percentage_or_expected_value_after_useful_life(
+ frm,
+ row,
+ true,
+ false
+ );
}
},
- frequency_of_depreciation: function(frm, cdt, cdn) {
+ frequency_of_depreciation: function (frm, cdt, cdn) {
const row = locals[cdt][cdn];
frm.events.set_depreciation_rate(frm, row);
},
- total_number_of_depreciations: function(frm, cdt, cdn) {
+ total_number_of_depreciations: function (frm, cdt, cdn) {
const row = locals[cdt][cdn];
frm.events.set_depreciation_rate(frm, row);
},
- rate_of_depreciation: function(frm, cdt, cdn) {
- if(!frappe.flags.dont_change_rate) {
+ rate_of_depreciation: function (frm, cdt, cdn) {
+ if (!frappe.flags.dont_change_rate) {
frappe.model.set_value(cdt, cdn, "expected_value_after_useful_life", 0);
}
frappe.flags.dont_change_rate = false;
},
- depreciation_start_date: function(frm, cdt, cdn) {
+ depreciation_start_date: function (frm, cdt, cdn) {
const book = locals[cdt][cdn];
- if (frm.doc.available_for_use_date && book.depreciation_start_date == frm.doc.available_for_use_date) {
+ if (
+ frm.doc.available_for_use_date &&
+ book.depreciation_start_date == frm.doc.available_for_use_date
+ ) {
frappe.msgprint(__("Depreciation Posting Date should not be equal to Available for Use Date."));
book.depreciation_start_date = "";
frm.refresh_field("finance_books");
}
- }
+ },
});
-erpnext.asset.scrap_asset = function(frm) {
+erpnext.asset.scrap_asset = function (frm) {
frappe.confirm(__("Do you really want to scrap this asset?"), function () {
frappe.call({
args: {
- "asset_name": frm.doc.name
+ asset_name: frm.doc.name,
},
method: "erpnext.assets.doctype.asset.depreciation.scrap_asset",
- callback: function(r) {
+ callback: function (r) {
cur_frm.reload_doc();
- }
- })
- })
+ },
+ });
+ });
};
-erpnext.asset.restore_asset = function(frm) {
+erpnext.asset.restore_asset = function (frm) {
frappe.confirm(__("Do you really want to restore this scrapped asset?"), function () {
frappe.call({
args: {
- "asset_name": frm.doc.name
+ asset_name: frm.doc.name,
},
method: "erpnext.assets.doctype.asset.depreciation.restore_asset",
- callback: function(r) {
+ callback: function (r) {
cur_frm.reload_doc();
- }
- })
- })
+ },
+ });
+ });
};
-erpnext.asset.transfer_asset = function() {
+erpnext.asset.transfer_asset = function () {
frappe.call({
method: "erpnext.assets.doctype.asset.asset.make_asset_movement",
freeze: true,
- args:{
- "assets": [{ name: cur_frm.doc.name }],
- "purpose": "Transfer"
+ args: {
+ assets: [{ name: cur_frm.doc.name }],
+ purpose: "Transfer",
},
callback: function (r) {
if (r.message) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
};
diff --git a/erpnext/assets/doctype/asset/asset_list.js b/erpnext/assets/doctype/asset/asset_list.js
index 5f53b005aafe..712958adcfc5 100644
--- a/erpnext/assets/doctype/asset/asset_list.js
+++ b/erpnext/assets/doctype/asset/asset_list.js
@@ -1,56 +1,46 @@
-frappe.listview_settings['Asset'] = {
- add_fields: ['status'],
+frappe.listview_settings["Asset"] = {
+ add_fields: ["status"],
get_indicator: function (doc) {
if (doc.status === "Fully Depreciated") {
return [__("Fully Depreciated"), "green", "status,=,Fully Depreciated"];
-
} else if (doc.status === "Partially Depreciated") {
return [__("Partially Depreciated"), "grey", "status,=,Partially Depreciated"];
-
} else if (doc.status === "Sold") {
return [__("Sold"), "green", "status,=,Sold"];
-
} else if (["Capitalized", "Decapitalized"].includes(doc.status)) {
return [__(doc.status), "grey", "status,=," + doc.status];
-
} else if (doc.status === "Scrapped") {
return [__("Scrapped"), "grey", "status,=,Scrapped"];
-
} else if (doc.status === "In Maintenance") {
return [__("In Maintenance"), "orange", "status,=,In Maintenance"];
-
} else if (doc.status === "Out of Order") {
return [__("Out of Order"), "grey", "status,=,Out of Order"];
-
} else if (doc.status === "Issue") {
return [__("Issue"), "orange", "status,=,Issue"];
-
} else if (doc.status === "Receipt") {
return [__("Receipt"), "green", "status,=,Receipt"];
-
} else if (doc.status === "Submitted") {
return [__("Submitted"), "blue", "status,=,Submitted"];
-
} else if (doc.status === "Draft") {
return [__("Draft"), "red", "status,=,Draft"];
}
},
- onload: function(me) {
- me.page.add_action_item(__("Make Asset Movement"), function() {
+ onload: function (me) {
+ me.page.add_action_item(__("Make Asset Movement"), function () {
const assets = me.get_checked_items();
frappe.call({
method: "erpnext.assets.doctype.asset.asset.make_asset_movement",
freeze: true,
- args:{
- "assets": assets
+ args: {
+ assets: assets,
},
callback: function (r) {
if (r.message) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
});
},
-}
+};
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index 110f2c4f2a13..651b75d0a70a 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -3,10 +3,9 @@
frappe.provide("erpnext.assets");
-
erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.stock.StockController {
setup() {
- this.frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle', 'Asset Movement'];
+ this.frm.ignore_doctypes_on_cancel_all = ["Serial and Batch Bundle", "Asset Movement"];
this.setup_posting_date_time_check();
}
@@ -17,7 +16,10 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
refresh() {
this.show_general_ledger();
- if ((this.frm.doc.stock_items && this.frm.doc.stock_items.length) || !this.frm.doc.target_is_fixed_asset) {
+ if (
+ (this.frm.doc.stock_items && this.frm.doc.stock_items.length) ||
+ !this.frm.doc.target_is_fixed_asset
+ ) {
this.show_stock_ledger();
}
@@ -32,32 +34,32 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
me.setup_warehouse_query();
- me.frm.set_query("target_item_code", function() {
+ me.frm.set_query("target_item_code", function () {
if (me.frm.doc.entry_type == "Capitalization") {
- return erpnext.queries.item({"is_stock_item": 0, "is_fixed_asset": 1});
+ return erpnext.queries.item({ is_stock_item: 0, is_fixed_asset: 1 });
} else {
- return erpnext.queries.item({"is_stock_item": 1, "is_fixed_asset": 0});
+ return erpnext.queries.item({ is_stock_item: 1, is_fixed_asset: 0 });
}
});
- me.frm.set_query("target_asset", function() {
+ me.frm.set_query("target_asset", function () {
return {
- filters: {'is_composite_asset': 1, 'docstatus': 0 }
- }
+ filters: { is_composite_asset: 1, docstatus: 0 },
+ };
});
- me.frm.set_query("asset", "asset_items", function() {
+ me.frm.set_query("asset", "asset_items", function () {
var filters = {
- 'status': ["not in", ["Draft", "Scrapped", "Sold", "Capitalized", "Decapitalized"]],
- 'docstatus': 1
+ status: ["not in", ["Draft", "Scrapped", "Sold", "Capitalized", "Decapitalized"]],
+ docstatus: 1,
};
if (me.frm.doc.target_asset) {
- filters['name'] = ['!=', me.frm.doc.target_asset];
+ filters["name"] = ["!=", me.frm.doc.target_asset];
}
return {
- filters: filters
+ filters: filters,
};
});
@@ -65,58 +67,67 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
let row = locals[cdt][cdn];
return {
filters: {
- 'item_code': row.item_code,
- 'voucher_type': doc.doctype,
- 'voucher_no': ["in", [doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: row.item_code,
+ voucher_type: doc.doctype,
+ voucher_no: ["in", [doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
- me.frm.set_query("item_code", "stock_items", function() {
- return erpnext.queries.item({"is_stock_item": 1});
+ me.frm.set_query("item_code", "stock_items", function () {
+ return erpnext.queries.item({ is_stock_item: 1 });
});
- me.frm.set_query("item_code", "service_items", function() {
- return erpnext.queries.item({"is_stock_item": 0, "is_fixed_asset": 0});
+ me.frm.set_query("item_code", "service_items", function () {
+ return erpnext.queries.item({ is_stock_item: 0, is_fixed_asset: 0 });
});
- me.frm.set_query('batch_no', 'stock_items', function(doc, cdt, cdn) {
+ me.frm.set_query("batch_no", "stock_items", function (doc, cdt, cdn) {
var item = locals[cdt][cdn];
if (!item.item_code) {
frappe.throw(__("Please enter Item Code to get Batch Number"));
} else {
var filters = {
- 'item_code': item.item_code,
- 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
- 'warehouse': item.warehouse
+ item_code: item.item_code,
+ posting_date: me.frm.doc.posting_date || frappe.datetime.nowdate(),
+ warehouse: item.warehouse,
};
return {
query: "erpnext.controllers.queries.get_batch_no",
- filters: filters
+ filters: filters,
};
}
});
- me.frm.set_query('expense_account', 'service_items', function() {
+ me.frm.set_query("expense_account", "service_items", function () {
return {
filters: {
- "account_type": ['in', ["Tax", "Expense Account", "Income Account", "Expenses Included In Valuation", "Expenses Included In Asset Valuation"]],
- "is_group": 0,
- "company": me.frm.doc.company
- }
+ account_type: [
+ "in",
+ [
+ "Tax",
+ "Expense Account",
+ "Income Account",
+ "Expenses Included In Valuation",
+ "Expenses Included In Asset Valuation",
+ ],
+ ],
+ is_group: 0,
+ company: me.frm.doc.company,
+ },
};
});
- let sbb_field = me.frm.get_docfield('stock_items', 'serial_and_batch_bundle');
+ let sbb_field = me.frm.get_docfield("stock_items", "serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = (row) => {
return {
- 'item_code': row.doc.item_code,
- 'warehouse': row.doc.warehouse,
- 'voucher_type': me.frm.doc.doctype,
- }
+ item_code: row.doc.item_code,
+ warehouse: row.doc.warehouse,
+ voucher_type: me.frm.doc.doctype,
+ };
};
}
}
@@ -126,7 +137,10 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
}
target_asset() {
- if (this.frm.doc.target_asset && this.frm.doc.capitalization_method === "Choose a WIP composite asset") {
+ if (
+ this.frm.doc.target_asset &&
+ this.frm.doc.capitalization_method === "Choose a WIP composite asset"
+ ) {
this.set_consumed_stock_items_tagged_to_wip_composite_asset(this.frm.doc.target_asset);
this.get_target_asset_details();
}
@@ -143,7 +157,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
},
callback: function (r) {
if (!r.exc && r.message) {
- if(r.message[0] && r.message[0].length) {
+ if (r.message[0] && r.message[0].length) {
me.frm.clear_table("stock_items");
for (let item of r.message[0]) {
me.frm.add_child("stock_items", item);
@@ -160,7 +174,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
me.calculate_totals();
}
- }
+ },
});
}
}
@@ -192,7 +206,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
if (this.frm.doc.posting_date) {
frappe.run_serially([
() => this.get_all_item_warehouse_details(),
- () => this.get_all_asset_values()
+ () => this.get_all_asset_values(),
]);
}
}
@@ -248,15 +262,15 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
}
stock_items_add(doc, cdt, cdn) {
- erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'stock_items');
+ erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, "stock_items");
}
asset_items_add(doc, cdt, cdn) {
- erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'asset_items');
+ erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, "asset_items");
}
serivce_items_add(doc, cdt, cdn) {
- erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'service_items');
+ erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, "service_items");
}
get_target_item_details() {
@@ -274,7 +288,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
if (!r.exc) {
me.frm.refresh_fields();
}
- }
+ },
});
}
}
@@ -294,7 +308,7 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
if (!r.exc) {
me.frm.refresh_fields();
}
- }
+ },
});
}
}
@@ -316,13 +330,13 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
company: me.frm.doc.company,
posting_date: me.frm.doc.posting_date,
posting_time: me.frm.doc.posting_time,
- }
+ },
},
callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
}
@@ -343,13 +357,13 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
finance_book: row.finance_book || me.frm.doc.finance_book,
posting_date: me.frm.doc.posting_date,
posting_time: me.frm.doc.posting_time,
- }
+ },
},
callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
}
@@ -367,13 +381,13 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
qty: flt(row.qty),
expense_account: row.expense_account,
company: me.frm.doc.company,
- }
+ },
},
callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
}
@@ -386,23 +400,23 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
child: item,
args: {
args: {
- 'item_code': item.item_code,
- 'warehouse': cstr(item.warehouse),
- 'qty': flt(item.stock_qty),
- 'serial_no': item.serial_no,
- 'posting_date': me.frm.doc.posting_date,
- 'posting_time': me.frm.doc.posting_time,
- 'company': me.frm.doc.company,
- 'voucher_type': me.frm.doc.doctype,
- 'voucher_no': me.frm.doc.name,
- 'allow_zero_valuation': 1
- }
+ item_code: item.item_code,
+ warehouse: cstr(item.warehouse),
+ qty: flt(item.stock_qty),
+ serial_no: item.serial_no,
+ posting_date: me.frm.doc.posting_date,
+ posting_time: me.frm.doc.posting_time,
+ company: me.frm.doc.company,
+ voucher_type: me.frm.doc.doctype,
+ voucher_no: me.frm.doc.name,
+ allow_zero_valuation: 1,
+ },
},
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
}
@@ -412,11 +426,11 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
return me.frm.call({
method: "set_warehouse_details",
doc: me.frm.doc,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
@@ -425,11 +439,11 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
return me.frm.call({
method: "set_asset_values",
doc: me.frm.doc,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.calculate_totals();
}
- }
+ },
});
}
@@ -441,33 +455,38 @@ erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.s
me.frm.doc.service_items_total = 0;
$.each(me.frm.doc.stock_items || [], function (i, d) {
- d.amount = flt(flt(d.stock_qty) * flt(d.valuation_rate), precision('amount', d));
+ d.amount = flt(flt(d.stock_qty) * flt(d.valuation_rate), precision("amount", d));
me.frm.doc.stock_items_total += d.amount;
});
$.each(me.frm.doc.asset_items || [], function (i, d) {
- d.asset_value = flt(flt(d.asset_value), precision('asset_value', d));
+ d.asset_value = flt(flt(d.asset_value), precision("asset_value", d));
me.frm.doc.asset_items_total += d.asset_value;
});
$.each(me.frm.doc.service_items || [], function (i, d) {
- d.amount = flt(flt(d.qty) * flt(d.rate), precision('amount', d));
+ d.amount = flt(flt(d.qty) * flt(d.rate), precision("amount", d));
me.frm.doc.service_items_total += d.amount;
});
- me.frm.doc.stock_items_total = flt(me.frm.doc.stock_items_total, precision('stock_items_total'));
- me.frm.doc.asset_items_total = flt(me.frm.doc.asset_items_total, precision('asset_items_total'));
- me.frm.doc.service_items_total = flt(me.frm.doc.service_items_total, precision('service_items_total'));
+ me.frm.doc.stock_items_total = flt(me.frm.doc.stock_items_total, precision("stock_items_total"));
+ me.frm.doc.asset_items_total = flt(me.frm.doc.asset_items_total, precision("asset_items_total"));
+ me.frm.doc.service_items_total = flt(
+ me.frm.doc.service_items_total,
+ precision("service_items_total")
+ );
- me.frm.doc.total_value = me.frm.doc.stock_items_total + me.frm.doc.asset_items_total + me.frm.doc.service_items_total;
- me.frm.doc.total_value = flt(me.frm.doc.total_value, precision('total_value'));
+ me.frm.doc.total_value =
+ me.frm.doc.stock_items_total + me.frm.doc.asset_items_total + me.frm.doc.service_items_total;
+ me.frm.doc.total_value = flt(me.frm.doc.total_value, precision("total_value"));
- me.frm.doc.target_qty = flt(me.frm.doc.target_qty, precision('target_qty'));
- me.frm.doc.target_incoming_rate = me.frm.doc.target_qty ? me.frm.doc.total_value / flt(me.frm.doc.target_qty)
+ me.frm.doc.target_qty = flt(me.frm.doc.target_qty, precision("target_qty"));
+ me.frm.doc.target_incoming_rate = me.frm.doc.target_qty
+ ? me.frm.doc.total_value / flt(me.frm.doc.target_qty)
: me.frm.doc.total_value;
me.frm.refresh_fields();
}
};
-cur_frm.cscript = new erpnext.assets.AssetCapitalization({frm: cur_frm});
+cur_frm.cscript = new erpnext.assets.AssetCapitalization({ frm: cur_frm });
diff --git a/erpnext/assets/doctype/asset_category/asset_category.js b/erpnext/assets/doctype/asset_category/asset_category.js
index 7dde14ea0e61..046b62f244e2 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.js
+++ b/erpnext/assets/doctype/asset_category/asset_category.js
@@ -1,56 +1,55 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Category', {
- onload: function(frm) {
- frm.add_fetch('company_name', 'accumulated_depreciation_account', 'accumulated_depreciation_account');
- frm.add_fetch('company_name', 'depreciation_expense_account', 'depreciation_expense_account');
+frappe.ui.form.on("Asset Category", {
+ onload: function (frm) {
+ frm.add_fetch("company_name", "accumulated_depreciation_account", "accumulated_depreciation_account");
+ frm.add_fetch("company_name", "depreciation_expense_account", "depreciation_expense_account");
- frm.set_query('fixed_asset_account', 'accounts', function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ frm.set_query("fixed_asset_account", "accounts", function (doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
return {
- "filters": {
- "account_type": "Fixed Asset",
- "root_type": "Asset",
- "is_group": 0,
- "company": d.company_name
- }
+ filters: {
+ account_type: "Fixed Asset",
+ root_type: "Asset",
+ is_group: 0,
+ company: d.company_name,
+ },
};
});
- frm.set_query('accumulated_depreciation_account', 'accounts', function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ frm.set_query("accumulated_depreciation_account", "accounts", function (doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
return {
- "filters": {
- "account_type": "Accumulated Depreciation",
- "is_group": 0,
- "company": d.company_name
- }
+ filters: {
+ account_type: "Accumulated Depreciation",
+ is_group: 0,
+ company: d.company_name,
+ },
};
});
- frm.set_query('depreciation_expense_account', 'accounts', function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ frm.set_query("depreciation_expense_account", "accounts", function (doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
return {
- "filters": {
- "account_type": "Depreciation",
- "root_type": ["in", ["Expense", "Income"]],
- "is_group": 0,
- "company": d.company_name
- }
+ filters: {
+ account_type: "Depreciation",
+ root_type: ["in", ["Expense", "Income"]],
+ is_group: 0,
+ company: d.company_name,
+ },
};
});
- frm.set_query('capital_work_in_progress_account', 'accounts', function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ frm.set_query("capital_work_in_progress_account", "accounts", function (doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
return {
- "filters": {
- "account_type": "Capital Work in Progress",
- "is_group": 0,
- "company": d.company_name
- }
+ filters: {
+ account_type: "Capital Work in Progress",
+ is_group: 0,
+ company: d.company_name,
+ },
};
});
-
- }
+ },
});
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.js b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.js
index c99297d62663..83b5c376ac77 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.js
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.js
@@ -2,52 +2,63 @@
// For license information, please see license.txt
frappe.provide("erpnext.asset");
-frappe.ui.form.on('Asset Depreciation Schedule', {
- onload: function(frm) {
+frappe.ui.form.on("Asset Depreciation Schedule", {
+ onload: function (frm) {
frm.events.make_schedules_editable(frm);
},
- make_schedules_editable: function(frm) {
+ make_schedules_editable: function (frm) {
var is_manual_hence_editable = frm.doc.depreciation_method === "Manual" ? true : false;
var is_shift_hence_editable = frm.doc.shift_based ? true : false;
frm.toggle_enable("depreciation_schedule", is_manual_hence_editable || is_shift_hence_editable);
- frm.fields_dict["depreciation_schedule"].grid.toggle_enable("schedule_date", is_manual_hence_editable);
- frm.fields_dict["depreciation_schedule"].grid.toggle_enable("depreciation_amount", is_manual_hence_editable);
+ frm.fields_dict["depreciation_schedule"].grid.toggle_enable(
+ "schedule_date",
+ is_manual_hence_editable
+ );
+ frm.fields_dict["depreciation_schedule"].grid.toggle_enable(
+ "depreciation_amount",
+ is_manual_hence_editable
+ );
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("shift", is_shift_hence_editable);
- }
+ },
});
-frappe.ui.form.on('Depreciation Schedule', {
- make_depreciation_entry: function(frm, cdt, cdn) {
+frappe.ui.form.on("Depreciation Schedule", {
+ make_depreciation_entry: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (!row.journal_entry) {
frappe.call({
method: "erpnext.assets.doctype.asset.depreciation.make_depreciation_entry",
args: {
- "asset_depr_schedule_name": frm.doc.name,
- "date": row.schedule_date
+ asset_depr_schedule_name: frm.doc.name,
+ date: row.schedule_date,
},
- callback: function(r) {
+ callback: function (r) {
frappe.model.sync(r.message);
frm.refresh();
- }
- })
+ },
+ });
}
},
- depreciation_amount: function(frm, cdt, cdn) {
+ depreciation_amount: function (frm, cdt, cdn) {
erpnext.asset.set_accumulated_depreciation(frm);
- }
+ },
});
-erpnext.asset.set_accumulated_depreciation = function(frm) {
- if(frm.doc.depreciation_method != "Manual") return;
+erpnext.asset.set_accumulated_depreciation = function (frm) {
+ if (frm.doc.depreciation_method != "Manual") return;
var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
- $.each(frm.doc.depreciation_schedule || [], function(i, row) {
- accumulated_depreciation += flt(row.depreciation_amount);
- frappe.model.set_value(row.doctype, row.name, "accumulated_depreciation_amount", accumulated_depreciation);
- })
+ $.each(frm.doc.depreciation_schedule || [], function (i, row) {
+ accumulated_depreciation += flt(row.depreciation_amount);
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "accumulated_depreciation_amount",
+ accumulated_depreciation
+ );
+ });
};
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
index 5c03b98873b6..83dabab89357 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
@@ -1,49 +1,47 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Maintenance', {
+frappe.ui.form.on("Asset Maintenance", {
setup: (frm) => {
- frm.set_query("assign_to", "asset_maintenance_tasks", function(doc) {
+ frm.set_query("assign_to", "asset_maintenance_tasks", function (doc) {
return {
query: "erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_team_members",
filters: {
- maintenance_team: doc.maintenance_team
- }
+ maintenance_team: doc.maintenance_team,
+ },
};
});
- frm.set_indicator_formatter('maintenance_status',
- function(doc) {
- let indicator = 'blue';
- if (doc.maintenance_status == 'Overdue') {
- indicator = 'orange';
- }
- if (doc.maintenance_status == 'Cancelled') {
- indicator = 'red';
- }
- return indicator;
+ frm.set_indicator_formatter("maintenance_status", function (doc) {
+ let indicator = "blue";
+ if (doc.maintenance_status == "Overdue") {
+ indicator = "orange";
+ }
+ if (doc.maintenance_status == "Cancelled") {
+ indicator = "red";
}
- );
+ return indicator;
+ });
},
refresh: (frm) => {
- if(!frm.is_new()) {
- frm.trigger('make_dashboard');
+ if (!frm.is_new()) {
+ frm.trigger("make_dashboard");
}
},
make_dashboard: (frm) => {
- if(!frm.is_new()) {
+ if (!frm.is_new()) {
frappe.call({
- method: 'erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_maintenance_log',
- args: {asset_name: frm.doc.asset_name},
+ method: "erpnext.assets.doctype.asset_maintenance.asset_maintenance.get_maintenance_log",
+ args: { asset_name: frm.doc.asset_name },
callback: (r) => {
- if(!r.message) {
+ if (!r.message) {
return;
}
- const section = frm.dashboard.add_section('', __("Maintenance Log"));
- var rows = $('
').appendTo(section);
+ const section = frm.dashboard.add_section("", __("Maintenance Log"));
+ var rows = $("
").appendTo(section);
// show
- (r.message || []).forEach(function(d) {
+ (r.message || []).forEach(function (d) {
$(`
{
get_next_due_date(frm, cdt, cdn);
},
- periodicity: (frm, cdt, cdn) => {
+ periodicity: (frm, cdt, cdn) => {
get_next_due_date(frm, cdt, cdn);
},
- last_completion_date: (frm, cdt, cdn) => {
+ last_completion_date: (frm, cdt, cdn) => {
get_next_due_date(frm, cdt, cdn);
},
- end_date: (frm, cdt, cdn) => {
+ end_date: (frm, cdt, cdn) => {
get_next_due_date(frm, cdt, cdn);
- }
+ },
});
var get_next_due_date = function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.start_date && d.periodicity) {
return frappe.call({
- method: 'erpnext.assets.doctype.asset_maintenance.asset_maintenance.calculate_next_due_date',
+ method: "erpnext.assets.doctype.asset_maintenance.asset_maintenance.calculate_next_due_date",
args: {
start_date: d.start_date,
periodicity: d.periodicity,
end_date: d.end_date,
last_completion_date: d.last_completion_date,
- next_due_date: d.next_due_date
+ next_due_date: d.next_due_date,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, "next_due_date", r.message);
- }
- else {
+ } else {
frappe.model.set_value(cdt, cdn, "next_due_date", "");
}
- }
+ },
});
}
};
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js
index bcdc3acf0ac8..47a2128c3792 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.js
@@ -1,15 +1,15 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Maintenance Log', {
+frappe.ui.form.on("Asset Maintenance Log", {
asset_maintenance: (frm) => {
- frm.set_query('task', function(doc) {
+ frm.set_query("task", function (doc) {
return {
query: "erpnext.assets.doctype.asset_maintenance_log.asset_maintenance_log.get_maintenance_tasks",
filters: {
- 'asset_maintenance': doc.asset_maintenance
- }
+ asset_maintenance: doc.asset_maintenance,
+ },
};
});
- }
+ },
});
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js
index c804b31e908b..7b7b5085369d 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_calendar.js
@@ -3,20 +3,20 @@
frappe.views.calendar["Asset Maintenance Log"] = {
field_map: {
- "start": "due_date",
- "end": "due_date",
- "id": "name",
- "title": "task",
- "allDay": "allDay",
- "progress": "progress"
+ start: "due_date",
+ end: "due_date",
+ id: "name",
+ title: "task",
+ allDay: "allDay",
+ progress: "progress",
},
filters: [
{
- "fieldtype": "Link",
- "fieldname": "asset_name",
- "options": "Asset Maintenance",
- "label": __("Asset Maintenance")
- }
+ fieldtype: "Link",
+ fieldname: "asset_name",
+ options: "Asset Maintenance",
+ label: __("Asset Maintenance"),
+ },
],
- get_events_method: "frappe.desk.calendar.get_events"
+ get_events_method: "frappe.desk.calendar.get_events",
};
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
index 23000e60eff3..13f2444742d6 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js
@@ -1,15 +1,15 @@
-frappe.listview_settings['Asset Maintenance Log'] = {
+frappe.listview_settings["Asset Maintenance Log"] = {
add_fields: ["maintenance_status"],
has_indicator_for_draft: 1,
- get_indicator: function(doc) {
- if (doc.maintenance_status=="Planned") {
+ get_indicator: function (doc) {
+ if (doc.maintenance_status == "Planned") {
return [__(doc.maintenance_status), "orange", "status,=," + doc.maintenance_status];
- } else if (doc.maintenance_status=="Completed") {
+ } else if (doc.maintenance_status == "Completed") {
return [__(doc.maintenance_status), "green", "status,=," + doc.maintenance_status];
- } else if (doc.maintenance_status=="Cancelled") {
+ } else if (doc.maintenance_status == "Cancelled") {
return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status];
- } else if (doc.maintenance_status=="Overdue") {
+ } else if (doc.maintenance_status == "Overdue") {
return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status];
}
- }
+ },
};
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js
index c94e3dbc3c00..859876519008 100644
--- a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.js
@@ -1,8 +1,6 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Maintenance Team', {
- refresh: function() {
-
- }
+frappe.ui.form.on("Asset Maintenance Team", {
+ refresh: function () {},
});
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.js b/erpnext/assets/doctype/asset_movement/asset_movement.js
index 4ccc3f8013bf..e445c90f308c 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.js
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.js
@@ -1,104 +1,107 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Movement', {
+frappe.ui.form.on("Asset Movement", {
setup: (frm) => {
frm.set_query("to_employee", "assets", (doc) => {
return {
filters: {
- company: doc.company
- }
+ company: doc.company,
+ },
};
- })
+ });
frm.set_query("from_employee", "assets", (doc) => {
return {
filters: {
- company: doc.company
- }
+ company: doc.company,
+ },
};
- })
+ });
frm.set_query("reference_name", (doc) => {
return {
filters: {
company: doc.company,
- docstatus: 1
- }
+ docstatus: 1,
+ },
};
- })
+ });
frm.set_query("reference_doctype", () => {
return {
filters: {
- name: ["in", ["Purchase Receipt", "Purchase Invoice"]]
- }
+ name: ["in", ["Purchase Receipt", "Purchase Invoice"]],
+ },
};
}),
- frm.set_query("asset", "assets", () => {
- return {
- filters: {
- status: ["not in", ["Draft"]]
- }
- }
- })
+ frm.set_query("asset", "assets", () => {
+ return {
+ filters: {
+ status: ["not in", ["Draft"]],
+ },
+ };
+ });
},
onload: (frm) => {
- frm.trigger('set_required_fields');
+ frm.trigger("set_required_fields");
},
purpose: (frm) => {
- frm.trigger('set_required_fields');
+ frm.trigger("set_required_fields");
},
set_required_fields: (frm, cdt, cdn) => {
let fieldnames_to_be_altered;
- if (frm.doc.purpose === 'Transfer') {
+ if (frm.doc.purpose === "Transfer") {
fieldnames_to_be_altered = {
target_location: { read_only: 0, reqd: 1 },
source_location: { read_only: 1, reqd: 1 },
from_employee: { read_only: 1, reqd: 0 },
- to_employee: { read_only: 1, reqd: 0 }
+ to_employee: { read_only: 1, reqd: 0 },
};
- }
- else if (frm.doc.purpose === 'Receipt') {
+ } else if (frm.doc.purpose === "Receipt") {
fieldnames_to_be_altered = {
target_location: { read_only: 0, reqd: 1 },
source_location: { read_only: 1, reqd: 0 },
from_employee: { read_only: 0, reqd: 0 },
- to_employee: { read_only: 1, reqd: 0 }
+ to_employee: { read_only: 1, reqd: 0 },
};
- }
- else if (frm.doc.purpose === 'Issue') {
+ } else if (frm.doc.purpose === "Issue") {
fieldnames_to_be_altered = {
target_location: { read_only: 1, reqd: 0 },
source_location: { read_only: 1, reqd: 0 },
from_employee: { read_only: 1, reqd: 0 },
- to_employee: { read_only: 0, reqd: 1 }
+ to_employee: { read_only: 0, reqd: 1 },
};
}
if (fieldnames_to_be_altered) {
- Object.keys(fieldnames_to_be_altered).forEach(fieldname => {
+ Object.keys(fieldnames_to_be_altered).forEach((fieldname) => {
let property_to_be_altered = fieldnames_to_be_altered[fieldname];
- Object.keys(property_to_be_altered).forEach(property => {
+ Object.keys(property_to_be_altered).forEach((property) => {
let value = property_to_be_altered[property];
- frm.fields_dict['assets'].grid.update_docfield_property(fieldname, property, value);
+ frm.fields_dict["assets"].grid.update_docfield_property(fieldname, property, value);
});
});
- frm.refresh_field('assets');
+ frm.refresh_field("assets");
}
- }
+ },
});
-frappe.ui.form.on('Asset Movement Item', {
- asset: function(frm, cdt, cdn) {
+frappe.ui.form.on("Asset Movement Item", {
+ asset: function (frm, cdt, cdn) {
// on manual entry of an asset auto sets their source location / employee
const asset_name = locals[cdt][cdn].asset;
- if (asset_name){
- frappe.db.get_doc('Asset', asset_name).then((asset_doc) => {
- if(asset_doc.location) frappe.model.set_value(cdt, cdn, 'source_location', asset_doc.location);
- if(asset_doc.custodian) frappe.model.set_value(cdt, cdn, 'from_employee', asset_doc.custodian);
- }).catch((err) => {
- console.log(err); // eslint-disable-line
- });
+ if (asset_name) {
+ frappe.db
+ .get_doc("Asset", asset_name)
+ .then((asset_doc) => {
+ if (asset_doc.location)
+ frappe.model.set_value(cdt, cdn, "source_location", asset_doc.location);
+ if (asset_doc.custodian)
+ frappe.model.set_value(cdt, cdn, "from_employee", asset_doc.custodian);
+ })
+ .catch((err) => {
+ console.log(err); // eslint-disable-line
+ });
}
- }
+ },
});
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js
index 03afcb944292..27a4eb6e995c 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.js
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.js
@@ -1,31 +1,31 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Repair', {
- setup: function(frm) {
- frm.fields_dict.cost_center.get_query = function(doc) {
+frappe.ui.form.on("Asset Repair", {
+ setup: function (frm) {
+ frm.fields_dict.cost_center.get_query = function (doc) {
return {
filters: {
- 'is_group': 0,
- 'company': doc.company
- }
+ is_group: 0,
+ company: doc.company,
+ },
};
};
- frm.fields_dict.project.get_query = function(doc) {
+ frm.fields_dict.project.get_query = function (doc) {
return {
filters: {
- 'company': doc.company
- }
+ company: doc.company,
+ },
};
};
- frm.fields_dict.warehouse.get_query = function(doc) {
+ frm.fields_dict.warehouse.get_query = function (doc) {
return {
filters: {
- 'is_group': 0,
- 'company': doc.company
- }
+ is_group: 0,
+ company: doc.company,
+ },
};
};
@@ -33,87 +33,87 @@ frappe.ui.form.on('Asset Repair', {
let row = locals[cdt][cdn];
return {
filters: {
- 'item_code': row.item_code,
- 'voucher_type': doc.doctype,
- 'voucher_no': ["in", [doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: row.item_code,
+ voucher_type: doc.doctype,
+ voucher_no: ["in", [doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.docstatus) {
- frm.add_custom_button(__("View General Ledger"), function() {
+ frm.add_custom_button(__("View General Ledger"), function () {
frappe.route_options = {
- "voucher_no": frm.doc.name
+ voucher_no: frm.doc.name,
};
frappe.set_route("query-report", "General Ledger");
});
}
- let sbb_field = frm.get_docfield('stock_items', 'serial_and_batch_bundle');
+ let sbb_field = frm.get_docfield("stock_items", "serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = (row) => {
return {
- 'item_code': row.doc.item_code,
- 'voucher_type': frm.doc.doctype,
- }
+ item_code: row.doc.item_code,
+ voucher_type: frm.doc.doctype,
+ };
};
}
},
repair_status: (frm) => {
if (frm.doc.completion_date && frm.doc.repair_status == "Completed") {
- frappe.call ({
+ frappe.call({
method: "erpnext.assets.doctype.asset_repair.asset_repair.get_downtime",
args: {
- "failure_date":frm.doc.failure_date,
- "completion_date":frm.doc.completion_date
+ failure_date: frm.doc.failure_date,
+ completion_date: frm.doc.completion_date,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
frm.set_value("downtime", r.message + " Hrs");
}
- }
+ },
});
}
if (frm.doc.repair_status == "Completed") {
- frm.set_value('completion_date', frappe.datetime.now_datetime());
+ frm.set_value("completion_date", frappe.datetime.now_datetime());
}
},
stock_items_on_form_rendered() {
erpnext.setup_serial_or_batch_no();
- }
+ },
});
-frappe.ui.form.on('Asset Repair Consumed Item', {
- item_code: function(frm, cdt, cdn) {
+frappe.ui.form.on("Asset Repair Consumed Item", {
+ item_code: function (frm, cdt, cdn) {
var item = locals[cdt][cdn];
let item_args = {
- 'item_code': item.item_code,
- 'warehouse': frm.doc.warehouse,
- 'qty': item.consumed_quantity,
- 'serial_no': item.serial_no,
- 'company': frm.doc.company,
+ item_code: item.item_code,
+ warehouse: frm.doc.warehouse,
+ qty: item.consumed_quantity,
+ serial_no: item.serial_no,
+ company: frm.doc.company,
};
frappe.call({
- method: 'erpnext.stock.utils.get_incoming_rate',
+ method: "erpnext.stock.utils.get_incoming_rate",
args: {
- args: item_args
+ args: item_args,
+ },
+ callback: function (r) {
+ frappe.model.set_value(cdt, cdn, "valuation_rate", r.message);
},
- callback: function(r) {
- frappe.model.set_value(cdt, cdn, 'valuation_rate', r.message);
- }
});
},
- consumed_quantity: function(frm, cdt, cdn) {
+ consumed_quantity: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
- frappe.model.set_value(cdt, cdn, 'total_value', row.consumed_quantity * row.valuation_rate);
+ frappe.model.set_value(cdt, cdn, "total_value", row.consumed_quantity * row.valuation_rate);
},
});
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair_list.js b/erpnext/assets/doctype/asset_repair/asset_repair_list.js
index 86376f400467..633c39ba77f3 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair_list.js
+++ b/erpnext/assets/doctype/asset_repair/asset_repair_list.js
@@ -1,12 +1,12 @@
-frappe.listview_settings['Asset Repair'] = {
+frappe.listview_settings["Asset Repair"] = {
add_fields: ["repair_status"],
- get_indicator: function(doc) {
- if(doc.repair_status=="Pending") {
+ get_indicator: function (doc) {
+ if (doc.repair_status == "Pending") {
return [__("Pending"), "orange"];
- } else if(doc.repair_status=="Completed") {
+ } else if (doc.repair_status == "Completed") {
return [__("Completed"), "green"];
- } else if(doc.repair_status=="Cancelled") {
+ } else if (doc.repair_status == "Cancelled") {
return [__("Cancelled"), "red"];
}
- }
+ },
};
diff --git a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.js b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.js
index 54df69339b56..c22feb05458a 100644
--- a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.js
+++ b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.js
@@ -1,14 +1,14 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Asset Shift Allocation', {
- onload: function(frm) {
+frappe.ui.form.on("Asset Shift Allocation", {
+ onload: function (frm) {
frm.events.make_schedules_editable(frm);
},
- make_schedules_editable: function(frm) {
+ make_schedules_editable: function (frm) {
frm.toggle_enable("depreciation_schedule", true);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("schedule_date", false);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("depreciation_amount", false);
frm.fields_dict["depreciation_schedule"].grid.toggle_enable("shift", true);
- }
+ },
});
diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js
index d07f40cdf422..7fbe6d0bd124 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js
+++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js
@@ -3,61 +3,61 @@
frappe.provide("erpnext.accounts.dimensions");
-frappe.ui.form.on('Asset Value Adjustment', {
- setup: function(frm) {
- frm.add_fetch('company', 'cost_center', 'cost_center');
- frm.set_query('cost_center', function() {
+frappe.ui.form.on("Asset Value Adjustment", {
+ setup: function (frm) {
+ frm.add_fetch("company", "cost_center", "cost_center");
+ frm.set_query("cost_center", function () {
return {
filters: {
company: frm.doc.company,
- is_group: 0
- }
- }
+ is_group: 0,
+ },
+ };
});
- frm.set_query('asset', function() {
+ frm.set_query("asset", function () {
return {
filters: {
calculate_depreciation: 1,
- docstatus: 1
- }
+ docstatus: 1,
+ },
};
});
},
- onload: function(frm) {
- if(frm.is_new() && frm.doc.asset) {
+ onload: function (frm) {
+ if (frm.is_new() && frm.doc.asset) {
frm.trigger("set_current_asset_value");
}
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- asset: function(frm) {
+ asset: function (frm) {
frm.trigger("set_current_asset_value");
},
- finance_book: function(frm) {
+ finance_book: function (frm) {
frm.trigger("set_current_asset_value");
},
- set_current_asset_value: function(frm) {
+ set_current_asset_value: function (frm) {
if (frm.doc.asset) {
frm.call({
method: "erpnext.assets.doctype.asset.asset.get_asset_value_after_depreciation",
args: {
asset_name: frm.doc.asset,
- finance_book: frm.doc.finance_book
+ finance_book: frm.doc.finance_book,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.set_value('current_asset_value', r.message);
+ frm.set_value("current_asset_value", r.message);
}
- }
+ },
});
}
- }
+ },
});
diff --git a/erpnext/assets/doctype/location/location.js b/erpnext/assets/doctype/location/location.js
index 0f069b2fd8e3..97d723915881 100644
--- a/erpnext/assets/doctype/location/location.js
+++ b/erpnext/assets/doctype/location/location.js
@@ -1,13 +1,13 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Location', {
+frappe.ui.form.on("Location", {
setup: function (frm) {
frm.set_query("parent_location", function () {
return {
- "filters": {
- "is_group": 1
- }
+ filters: {
+ is_group: 1,
+ },
};
});
},
@@ -15,10 +15,9 @@ frappe.ui.form.on('Location', {
onload_post_render(frm) {
if (!frm.doc.location && frm.doc.latitude && frm.doc.longitude) {
frm.fields_dict.location.map.setView([frm.doc.latitude, frm.doc.longitude], 13);
- }
- else {
- frm.doc.latitude = frm.fields_dict.location.map.getCenter()['lat'];
- frm.doc.longitude = frm.fields_dict.location.map.getCenter()['lng'];
+ } else {
+ frm.doc.latitude = frm.fields_dict.location.map.getCenter()["lat"];
+ frm.doc.longitude = frm.fields_dict.location.map.getCenter()["lng"];
}
},
});
diff --git a/erpnext/assets/doctype/location/location_tree.js b/erpnext/assets/doctype/location/location_tree.js
index 3e105f6ca49a..c3484c2469b2 100644
--- a/erpnext/assets/doctype/location/location_tree.js
+++ b/erpnext/assets/doctype/location/location_tree.js
@@ -1,7 +1,7 @@
frappe.treeview_settings["Location"] = {
ignore_fields: ["parent_location"],
- get_tree_nodes: 'erpnext.assets.doctype.location.location.get_children',
- add_tree_node: 'erpnext.assets.doctype.location.location.add_node',
+ get_tree_nodes: "erpnext.assets.doctype.location.location.get_children",
+ add_tree_node: "erpnext.assets.doctype.location.location.add_node",
filters: [
{
fieldname: "location",
@@ -10,9 +10,9 @@ frappe.treeview_settings["Location"] = {
label: __("Location"),
get_query: function () {
return {
- filters: [["Location", "is_group", "=", 1]]
+ filters: [["Location", "is_group", "=", 1]],
};
- }
+ },
},
],
breadcrumb: "Assets",
@@ -24,10 +24,10 @@ frappe.treeview_settings["Location"] = {
action: function () {
frappe.new_doc("Location", true);
},
- condition: 'frappe.boot.user.can_create.indexOf("Location") !== -1'
- }
+ condition: 'frappe.boot.user.can_create.indexOf("Location") !== -1',
+ },
],
onload: function (treeview) {
treeview.make_tree();
- }
+ },
};
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js
index 2db712546c67..6f3521ffd85c 100644
--- a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.js
@@ -1,8 +1,6 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Maintenance Team Member', {
- refresh: function() {
-
- }
+frappe.ui.form.on("Maintenance Team Member", {
+ refresh: function () {},
});
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
index 812b7f78e1a7..c7fd8e0a6aa3 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
@@ -1,105 +1,104 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Fixed Asset Register"] = {
- "filters": [
+ filters: [
{
- fieldname:"company",
+ fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"status",
+ fieldname: "status",
label: __("Status"),
fieldtype: "Select",
options: "\nIn Location\nDisposed",
- default: 'In Location'
+ default: "In Location",
},
{
- fieldname:"asset_category",
+ fieldname: "asset_category",
label: __("Asset Category"),
fieldtype: "Link",
- options: "Asset Category"
+ options: "Asset Category",
},
{
- fieldname:"cost_center",
+ fieldname: "cost_center",
label: __("Cost Center"),
fieldtype: "Link",
- options: "Cost Center"
+ options: "Cost Center",
},
{
- fieldname:"group_by",
+ fieldname: "group_by",
label: __("Group By"),
fieldtype: "Select",
options: ["--Select a group--", "Asset Category", "Location"],
default: "--Select a group--",
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"only_existing_assets",
+ fieldname: "only_existing_assets",
label: __("Only existing assets"),
- fieldtype: "Check"
+ fieldtype: "Check",
},
{
- fieldname:"finance_book",
+ fieldname: "finance_book",
label: __("Finance Book"),
fieldtype: "Link",
options: "Finance Book",
},
{
- "fieldname": "include_default_book_assets",
- "label": __("Include Default FB Assets"),
- "fieldtype": "Check",
- "default": 1
+ fieldname: "include_default_book_assets",
+ label: __("Include Default FB Assets"),
+ fieldtype: "Check",
+ default: 1,
},
{
- "fieldname":"filter_based_on",
- "label": __("Period Based On"),
- "fieldtype": "Select",
- "options": ["--Select a period--", "Fiscal Year", "Date Range"],
- "default": "--Select a period--",
+ fieldname: "filter_based_on",
+ label: __("Period Based On"),
+ fieldtype: "Select",
+ options: ["--Select a period--", "Fiscal Year", "Date Range"],
+ default: "--Select a period--",
},
{
- "fieldname":"from_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
- "depends_on": "eval: doc.filter_based_on == 'Date Range'",
+ fieldname: "from_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
+ depends_on: "eval: doc.filter_based_on == 'Date Range'",
},
{
- "fieldname":"to_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.nowdate(),
- "depends_on": "eval: doc.filter_based_on == 'Date Range'",
+ fieldname: "to_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.nowdate(),
+ depends_on: "eval: doc.filter_based_on == 'Date Range'",
},
{
- "fieldname":"from_fiscal_year",
- "label": __("Start Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+ fieldname: "from_fiscal_year",
+ label: __("Start Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ depends_on: "eval: doc.filter_based_on == 'Fiscal Year'",
},
{
- "fieldname":"to_fiscal_year",
- "label": __("End Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+ fieldname: "to_fiscal_year",
+ label: __("End Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ depends_on: "eval: doc.filter_based_on == 'Fiscal Year'",
},
{
- "fieldname":"date_based_on",
- "label": __("Date Based On"),
- "fieldtype": "Select",
- "options": ["Purchase Date", "Available For Use Date"],
- "default": "Purchase Date",
- "depends_on": "eval: doc.filter_based_on == 'Date Range' || doc.filter_based_on == 'Fiscal Year'",
+ fieldname: "date_based_on",
+ label: __("Date Based On"),
+ fieldtype: "Select",
+ options: ["Purchase Date", "Available For Use Date"],
+ default: "Purchase Date",
+ depends_on: "eval: doc.filter_based_on == 'Date Range' || doc.filter_based_on == 'Fiscal Year'",
},
- ]
+ ],
};
diff --git a/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js b/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js
index dc54d606e7a1..9ee0c499d985 100644
--- a/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js
+++ b/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js
@@ -3,17 +3,31 @@
frappe.ui.form.on("Bulk Transaction Log", {
refresh(frm) {
- frm.add_custom_button(__('Succeeded Entries'), function() {
- frappe.set_route('List', 'Bulk Transaction Log Detail', {'date': frm.doc.date, 'transaction_status': "Success"});
- }, __("View"));
- frm.add_custom_button(__('Failed Entries'), function() {
- frappe.set_route('List', 'Bulk Transaction Log Detail', {'date': frm.doc.date, 'transaction_status': "Failed"});
- }, __("View"));
+ frm.add_custom_button(
+ __("Succeeded Entries"),
+ function () {
+ frappe.set_route("List", "Bulk Transaction Log Detail", {
+ date: frm.doc.date,
+ transaction_status: "Success",
+ });
+ },
+ __("View")
+ );
+ frm.add_custom_button(
+ __("Failed Entries"),
+ function () {
+ frappe.set_route("List", "Bulk Transaction Log Detail", {
+ date: frm.doc.date,
+ transaction_status: "Failed",
+ });
+ },
+ __("View")
+ );
if (frm.doc.failed) {
- frm.add_custom_button(__('Retry Failed Transactions'), function() {
+ frm.add_custom_button(__("Retry Failed Transactions"), function () {
frappe.call({
method: "erpnext.utilities.bulk_transaction.retry",
- args: {date: frm.doc.date}
+ args: { date: frm.doc.date },
});
});
}
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.js b/erpnext/buying/doctype/buying_settings/buying_settings.js
index 32431fc39106..11b920aea71b 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.js
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.js
@@ -1,31 +1,38 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Buying Settings', {
+frappe.ui.form.on("Buying Settings", {
// refresh: function(frm) {
-
// }
});
-frappe.tour['Buying Settings'] = [
+frappe.tour["Buying Settings"] = [
{
fieldname: "supp_master_name",
title: "Supplier Naming By",
- description: __("By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a Naming Series choose the 'Naming Series' option."),
+ description: __(
+ "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option."
+ ),
},
{
fieldname: "buying_price_list",
title: "Default Buying Price List",
- description: __("Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List.")
+ description: __(
+ "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
+ ),
},
{
fieldname: "po_required",
title: "Purchase Order Required for Purchase Invoice & Receipt Creation",
- description: __("If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master.")
+ description: __(
+ "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
+ ),
},
{
fieldname: "pr_required",
title: "Purchase Receipt Required for Purchase Invoice Creation",
- description: __("If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master.")
- }
+ description: __(
+ "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
+ ),
+ },
];
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 3b671bb2390f..7875646ab722 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -9,52 +9,52 @@ erpnext.accounts.taxes.setup_tax_validations("Purchase Order");
erpnext.buying.setup_buying_controller();
frappe.ui.form.on("Purchase Order", {
- setup: function(frm) {
-
+ setup: function (frm) {
if (frm.doc.is_old_subcontracting_flow) {
- frm.set_query("reserve_warehouse", "supplied_items", function() {
+ frm.set_query("reserve_warehouse", "supplied_items", function () {
return {
filters: {
- "company": frm.doc.company,
- "name": ['!=', frm.doc.supplier_warehouse],
- "is_group": 0
- }
- }
+ company: frm.doc.company,
+ name: ["!=", frm.doc.supplier_warehouse],
+ is_group: 0,
+ },
+ };
});
}
- frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
+ frm.set_indicator_formatter("item_code", function (doc) {
+ return doc.qty <= doc.received_qty ? "green" : "orange";
+ });
- frm.set_query("expense_account", "items", function() {
+ frm.set_query("expense_account", "items", function () {
return {
query: "erpnext.controllers.queries.get_expense_account",
- filters: {'company': frm.doc.company}
- }
+ filters: { company: frm.doc.company },
+ };
});
- frm.set_query("fg_item", "items", function() {
+ frm.set_query("fg_item", "items", function () {
return {
filters: {
- 'is_stock_item': 1,
- 'is_sub_contracted_item': 1,
- 'default_bom': ['!=', '']
- }
- }
+ is_stock_item: 1,
+ is_sub_contracted_item: 1,
+ default_bom: ["!=", ""],
+ },
+ };
});
},
- company: function(frm) {
+ company: function (frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- refresh: function(frm) {
- if(frm.doc.is_old_subcontracting_flow) {
- frm.trigger('get_materials_from_supplier');
+ refresh: function (frm) {
+ if (frm.doc.is_old_subcontracting_flow) {
+ frm.trigger("get_materials_from_supplier");
- $('a.grey-link').each(function () {
- var id = $(this).children(':first-child').attr('data-label');
- if (id == 'Duplicate') {
+ $("a.grey-link").each(function () {
+ var id = $(this).children(":first-child").attr("data-label");
+ if (id == "Duplicate") {
$(this).remove();
return false;
}
@@ -62,87 +62,91 @@ frappe.ui.form.on("Purchase Order", {
}
},
- get_materials_from_supplier: function(frm) {
+ get_materials_from_supplier: function (frm) {
let po_details = [];
- if (frm.doc.supplied_items && (flt(frm.doc.per_received, 2) == 100 || frm.doc.status === 'Closed')) {
- frm.doc.supplied_items.forEach(d => {
+ if (frm.doc.supplied_items && (flt(frm.doc.per_received, 2) == 100 || frm.doc.status === "Closed")) {
+ frm.doc.supplied_items.forEach((d) => {
if (d.total_supplied_qty && d.total_supplied_qty != d.consumed_qty) {
- po_details.push(d.name)
+ po_details.push(d.name);
}
});
}
if (po_details && po_details.length) {
- frm.add_custom_button(__('Return of Components'), () => {
- frm.call({
- method: 'erpnext.controllers.subcontracting_controller.get_materials_from_supplier',
- freeze: true,
- freeze_message: __('Creating Stock Entry'),
- args: {
- subcontract_order: frm.doc.name,
- rm_details: po_details,
- order_doctype: cur_frm.doc.doctype
- },
- callback: function(r) {
- if (r && r.message) {
- const doc = frappe.model.sync(r.message);
- frappe.set_route("Form", doc[0].doctype, doc[0].name);
- }
- }
- });
- }, __('Create'));
+ frm.add_custom_button(
+ __("Return of Components"),
+ () => {
+ frm.call({
+ method: "erpnext.controllers.subcontracting_controller.get_materials_from_supplier",
+ freeze: true,
+ freeze_message: __("Creating Stock Entry"),
+ args: {
+ subcontract_order: frm.doc.name,
+ rm_details: po_details,
+ order_doctype: cur_frm.doc.doctype,
+ },
+ callback: function (r) {
+ if (r && r.message) {
+ const doc = frappe.model.sync(r.message);
+ frappe.set_route("Form", doc[0].doctype, doc[0].name);
+ }
+ },
+ });
+ },
+ __("Create")
+ );
}
},
- onload: function(frm) {
+ onload: function (frm) {
set_schedule_date(frm);
- if (!frm.doc.transaction_date){
- frm.set_value('transaction_date', frappe.datetime.get_today())
+ if (!frm.doc.transaction_date) {
+ frm.set_value("transaction_date", frappe.datetime.get_today());
}
- erpnext.queries.setup_queries(frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(frm, "Warehouse", function () {
return erpnext.queries.warehouse(frm.doc);
});
// On cancel and amending a purchase order with advance payment, reset advance paid amount
if (frm.is_new()) {
- frm.set_value("advance_paid", 0)
+ frm.set_value("advance_paid", 0);
}
},
- apply_tds: function(frm) {
+ apply_tds: function (frm) {
if (!frm.doc.apply_tds) {
- frm.set_value("tax_withholding_category", '');
+ frm.set_value("tax_withholding_category", "");
} else {
frm.set_value("tax_withholding_category", frm.supplier_tds);
}
},
- get_subcontracting_boms_for_finished_goods: function(fg_item) {
+ get_subcontracting_boms_for_finished_goods: function (fg_item) {
return frappe.call({
- method:"erpnext.subcontracting.doctype.subcontracting_bom.subcontracting_bom.get_subcontracting_boms_for_finished_goods",
+ method: "erpnext.subcontracting.doctype.subcontracting_bom.subcontracting_bom.get_subcontracting_boms_for_finished_goods",
args: {
- fg_items: fg_item
+ fg_items: fg_item,
},
});
},
- get_subcontracting_boms_for_service_item: function(service_item) {
+ get_subcontracting_boms_for_service_item: function (service_item) {
return frappe.call({
- method:"erpnext.subcontracting.doctype.subcontracting_bom.subcontracting_bom.get_subcontracting_boms_for_service_item",
+ method: "erpnext.subcontracting.doctype.subcontracting_bom.subcontracting_bom.get_subcontracting_boms_for_service_item",
args: {
- service_item: service_item
+ service_item: service_item,
},
});
},
});
frappe.ui.form.on("Purchase Order Item", {
- schedule_date: function(frm, cdt, cdn) {
+ schedule_date: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (row.schedule_date) {
- if(!frm.doc.schedule_date) {
+ if (!frm.doc.schedule_date) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "items", "schedule_date");
} else {
set_schedule_date(frm);
@@ -150,12 +154,12 @@ frappe.ui.form.on("Purchase Order Item", {
}
},
- item_code: async function(frm, cdt, cdn) {
+ item_code: async function (frm, cdt, cdn) {
if (frm.doc.is_subcontracted && !frm.doc.is_old_subcontracting_flow) {
var row = locals[cdt][cdn];
if (row.item_code && !row.fg_item) {
- var result = await frm.events.get_subcontracting_boms_for_service_item(row.item_code)
+ var result = await frm.events.get_subcontracting_boms_for_service_item(row.item_code);
if (result.message && Object.keys(result.message).length) {
var finished_goods = Object.keys(result.message);
@@ -175,7 +179,7 @@ frappe.ui.form.on("Purchase Order Item", {
fieldtype: "Autocomplete",
label: __("Finished Good"),
options: finished_goods,
- }
+ },
],
primary_action_label: __("Select"),
primary_action: () => {
@@ -198,16 +202,21 @@ frappe.ui.form.on("Purchase Order Item", {
}
},
- fg_item: async function(frm, cdt, cdn) {
+ fg_item: async function (frm, cdt, cdn) {
if (frm.doc.is_subcontracted && !frm.doc.is_old_subcontracting_flow) {
var row = locals[cdt][cdn];
if (row.fg_item) {
- var result = await frm.events.get_subcontracting_boms_for_finished_goods(row.fg_item)
+ var result = await frm.events.get_subcontracting_boms_for_finished_goods(row.fg_item);
if (result.message && Object.keys(result.message).length) {
frappe.model.set_value(cdt, cdn, "item_code", result.message.service_item);
- frappe.model.set_value(cdt, cdn, "qty", flt(row.fg_item_qty) * flt(result.message.conversion_factor));
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "qty",
+ flt(row.fg_item_qty) * flt(result.message.conversion_factor)
+ );
frappe.model.set_value(cdt, cdn, "uom", result.message.service_item_uom);
}
}
@@ -219,25 +228,36 @@ frappe.ui.form.on("Purchase Order Item", {
var row = locals[cdt][cdn];
if (row.fg_item) {
- var result = await frm.events.get_subcontracting_boms_for_finished_goods(row.fg_item)
-
- if (result.message && row.item_code == result.message.service_item && row.uom == result.message.service_item_uom) {
- frappe.model.set_value(cdt, cdn, "fg_item_qty", flt(row.qty) / flt(result.message.conversion_factor));
+ var result = await frm.events.get_subcontracting_boms_for_finished_goods(row.fg_item);
+
+ if (
+ result.message &&
+ row.item_code == result.message.service_item &&
+ row.uom == result.message.service_item_uom
+ ) {
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "fg_item_qty",
+ flt(row.qty) / flt(result.message.conversion_factor)
+ );
}
}
}
},
});
-erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends erpnext.buying.BuyingController {
+erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
+ erpnext.buying.BuyingController
+) {
setup() {
this.frm.custom_make_buttons = {
- 'Purchase Receipt': 'Purchase Receipt',
- 'Purchase Invoice': 'Purchase Invoice',
- 'Payment Entry': 'Payment',
- 'Subcontracting Order': 'Subcontracting Order',
- 'Stock Entry': 'Material to Supplier'
- }
+ "Purchase Receipt": "Purchase Receipt",
+ "Purchase Invoice": "Purchase Invoice",
+ "Payment Entry": "Payment",
+ "Subcontracting Order": "Subcontracting Order",
+ "Stock Entry": "Material to Supplier",
+ };
super.setup();
}
@@ -250,110 +270,155 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
for (var i in cur_frm.doc.items) {
var item = cur_frm.doc.items[i];
- if(item.delivered_by_supplier !== 1) {
+ if (item.delivered_by_supplier !== 1) {
allow_receipt = true;
} else {
is_drop_ship = true;
}
- if(is_drop_ship && allow_receipt) {
+ if (is_drop_ship && allow_receipt) {
break;
}
}
this.frm.set_df_property("drop_ship", "hidden", !is_drop_ship);
- if(doc.docstatus == 1) {
+ if (doc.docstatus == 1) {
this.frm.fields_dict.items_section.wrapper.addClass("hide-border");
- if(!this.frm.doc.set_warehouse) {
+ if (!this.frm.doc.set_warehouse) {
this.frm.fields_dict.items_section.wrapper.removeClass("hide-border");
}
- if(!in_list(["Closed", "Delivered"], doc.status)) {
- if(this.frm.doc.status !== 'Closed' && flt(this.frm.doc.per_received, 2) < 100 && flt(this.frm.doc.per_billed, 2) < 100) {
+ if (!in_list(["Closed", "Delivered"], doc.status)) {
+ if (
+ this.frm.doc.status !== "Closed" &&
+ flt(this.frm.doc.per_received, 2) < 100 &&
+ flt(this.frm.doc.per_billed, 2) < 100
+ ) {
if (!this.frm.doc.__onload || this.frm.doc.__onload.can_update_items) {
- this.frm.add_custom_button(__('Update Items'), () => {
+ this.frm.add_custom_button(__("Update Items"), () => {
erpnext.utils.update_child_items({
frm: this.frm,
child_docname: "items",
child_doctype: "Purchase Order Detail",
cannot_add_row: false,
- })
+ });
});
}
}
if (this.frm.has_perm("submit")) {
- if(flt(doc.per_billed, 2) < 100 || flt(doc.per_received, 2) < 100) {
+ if (flt(doc.per_billed, 2) < 100 || flt(doc.per_received, 2) < 100) {
if (doc.status != "On Hold") {
- this.frm.add_custom_button(__('Hold'), () => this.hold_purchase_order(), __("Status"));
- } else{
- this.frm.add_custom_button(__('Resume'), () => this.unhold_purchase_order(), __("Status"));
+ this.frm.add_custom_button(
+ __("Hold"),
+ () => this.hold_purchase_order(),
+ __("Status")
+ );
+ } else {
+ this.frm.add_custom_button(
+ __("Resume"),
+ () => this.unhold_purchase_order(),
+ __("Status")
+ );
}
- this.frm.add_custom_button(__('Close'), () => this.close_purchase_order(), __("Status"));
+ this.frm.add_custom_button(
+ __("Close"),
+ () => this.close_purchase_order(),
+ __("Status")
+ );
}
}
- if(is_drop_ship && doc.status!="Delivered") {
- this.frm.add_custom_button(__('Delivered'),
- this.delivered_by_supplier, __("Status"));
+ if (is_drop_ship && doc.status != "Delivered") {
+ this.frm.add_custom_button(__("Delivered"), this.delivered_by_supplier, __("Status"));
this.frm.page.set_inner_btn_group_as_primary(__("Status"));
}
- } else if(in_list(["Closed", "Delivered"], doc.status)) {
+ } else if (in_list(["Closed", "Delivered"], doc.status)) {
if (this.frm.has_perm("submit")) {
- this.frm.add_custom_button(__('Re-open'), () => this.unclose_purchase_order(), __("Status"));
+ this.frm.add_custom_button(
+ __("Re-open"),
+ () => this.unclose_purchase_order(),
+ __("Status")
+ );
}
}
- if(doc.status != "Closed") {
+ if (doc.status != "Closed") {
if (doc.status != "On Hold") {
- if(flt(doc.per_received, 2) < 100 && allow_receipt) {
- cur_frm.add_custom_button(__('Purchase Receipt'), this.make_purchase_receipt, __('Create'));
+ if (flt(doc.per_received, 2) < 100 && allow_receipt) {
+ cur_frm.add_custom_button(
+ __("Purchase Receipt"),
+ this.make_purchase_receipt,
+ __("Create")
+ );
if (doc.is_subcontracted) {
if (doc.is_old_subcontracting_flow) {
if (me.has_unsupplied_items()) {
- cur_frm.add_custom_button(__('Material to Supplier'), function() { me.make_stock_entry(); }, __("Transfer"));
+ cur_frm.add_custom_button(
+ __("Material to Supplier"),
+ function () {
+ me.make_stock_entry();
+ },
+ __("Transfer")
+ );
}
- }
- else {
- cur_frm.add_custom_button(__('Subcontracting Order'), this.make_subcontracting_order, __('Create'));
+ } else {
+ cur_frm.add_custom_button(
+ __("Subcontracting Order"),
+ this.make_subcontracting_order,
+ __("Create")
+ );
}
}
}
- if(flt(doc.per_billed, 2) < 100)
- cur_frm.add_custom_button(__('Purchase Invoice'),
- this.make_purchase_invoice, __('Create'));
+ if (flt(doc.per_billed, 2) < 100)
+ cur_frm.add_custom_button(
+ __("Purchase Invoice"),
+ this.make_purchase_invoice,
+ __("Create")
+ );
- if(flt(doc.per_billed, 2) < 100 && doc.status != "Delivered") {
+ if (flt(doc.per_billed, 2) < 100 && doc.status != "Delivered") {
this.frm.add_custom_button(
- __('Payment'),
+ __("Payment"),
() => this.make_payment_entry(),
- __('Create')
+ __("Create")
);
}
- if(flt(doc.per_billed, 2) < 100) {
- this.frm.add_custom_button(__('Payment Request'),
- function() { me.make_payment_request() }, __('Create'));
+ if (flt(doc.per_billed, 2) < 100) {
+ this.frm.add_custom_button(
+ __("Payment Request"),
+ function () {
+ me.make_payment_request();
+ },
+ __("Create")
+ );
}
if (doc.docstatus === 1 && !doc.inter_company_order_reference) {
let me = this;
let internal = me.frm.doc.is_internal_supplier;
if (internal) {
- let button_label = (me.frm.doc.company === me.frm.doc.represents_company) ? "Internal Sales Order" :
- "Inter Company Sales Order";
-
- me.frm.add_custom_button(button_label, function() {
- me.make_inter_company_order(me.frm);
- }, __('Create'));
+ let button_label =
+ me.frm.doc.company === me.frm.doc.represents_company
+ ? "Internal Sales Order"
+ : "Inter Company Sales Order";
+
+ me.frm.add_custom_button(
+ button_label,
+ function () {
+ me.make_inter_company_order(me.frm);
+ },
+ __("Create")
+ );
}
-
}
}
- cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- } else if(doc.docstatus===0) {
+ } else if (doc.docstatus === 0) {
cur_frm.cscript.add_from_mappers();
}
}
@@ -362,19 +427,20 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
args: {
- supplier: this.frm.doc.supplier
+ supplier: this.frm.doc.supplier,
},
source_doctype: "Material Request",
source_name: this.frm.doc.supplier,
target: this.frm,
setters: {
- company: this.frm.doc.company
+ company: this.frm.doc.company,
},
get_query_filters: {
docstatus: ["!=", 2],
- supplier: this.frm.doc.supplier
+ supplier: this.frm.doc.supplier,
},
- get_query_method: "erpnext.stock.doctype.material_request.material_request.get_material_requests_based_on_supplier"
+ get_query_method:
+ "erpnext.stock.doctype.material_request.material_request.get_material_requests_based_on_supplier",
});
}
@@ -383,27 +449,27 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
}
has_unsupplied_items() {
- return this.frm.doc['supplied_items'].some(item => item.required_qty > item.supplied_qty);
+ return this.frm.doc["supplied_items"].some((item) => item.required_qty > item.supplied_qty);
}
make_stock_entry() {
frappe.call({
- method:"erpnext.controllers.subcontracting_controller.make_rm_stock_entry",
+ method: "erpnext.controllers.subcontracting_controller.make_rm_stock_entry",
args: {
subcontract_order: cur_frm.doc.name,
- order_doctype: cur_frm.doc.doctype
+ order_doctype: cur_frm.doc.doctype,
},
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
}
make_inter_company_order(frm) {
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_inter_company_sales_order",
- frm: frm
+ frm: frm,
});
}
@@ -411,134 +477,163 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
frm: cur_frm,
- freeze_message: __("Creating Purchase Receipt ...")
- })
+ freeze_message: __("Creating Purchase Receipt ..."),
+ });
}
make_purchase_invoice() {
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
make_subcontracting_order() {
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_subcontracting_order",
frm: cur_frm,
- freeze_message: __("Creating Subcontracting Order ...")
- })
+ freeze_message: __("Creating Subcontracting Order ..."),
+ });
}
add_from_mappers() {
var me = this;
- this.frm.add_custom_button(__('Material Request'),
- function() {
+ this.frm.add_custom_button(
+ __("Material Request"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
source_doctype: "Material Request",
target: me.frm,
setters: {
schedule_date: undefined,
- status: undefined
+ status: undefined,
},
get_query_filters: {
material_request_type: "Purchase",
docstatus: 1,
status: ["!=", "Stopped"],
per_ordered: ["<", 100],
- company: me.frm.doc.company
+ company: me.frm.doc.company,
},
allow_child_item_selection: true,
child_fieldname: "items",
- child_columns: ["item_code", "qty", "ordered_qty"]
- })
- }, __("Get Items From"));
+ child_columns: ["item_code", "qty", "ordered_qty"],
+ });
+ },
+ __("Get Items From")
+ );
- this.frm.add_custom_button(__('Supplier Quotation'),
- function() {
+ this.frm.add_custom_button(
+ __("Supplier Quotation"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
source_doctype: "Supplier Quotation",
target: me.frm,
setters: {
supplier: me.frm.doc.supplier,
- valid_till: undefined
+ valid_till: undefined,
},
get_query_filters: {
docstatus: 1,
status: ["not in", ["Stopped", "Expired"]],
- }
- })
- }, __("Get Items From"));
+ },
+ });
+ },
+ __("Get Items From")
+ );
- this.frm.add_custom_button(__('Update Rate as per Last Purchase'),
- function() {
+ this.frm.add_custom_button(
+ __("Update Rate as per Last Purchase"),
+ function () {
frappe.call({
- "method": "get_last_purchase_rate",
- "doc": me.frm.doc,
- callback: function(r, rt) {
+ method: "get_last_purchase_rate",
+ doc: me.frm.doc,
+ callback: function (r, rt) {
me.frm.dirty();
me.frm.cscript.calculate_taxes_and_totals();
+ },
+ });
+ },
+ __("Tools")
+ );
+
+ this.frm.add_custom_button(
+ __("Link to Material Request"),
+ function () {
+ var my_items = [];
+ for (var i in me.frm.doc.items) {
+ if (!me.frm.doc.items[i].material_request) {
+ my_items.push(me.frm.doc.items[i].item_code);
}
- })
- }, __("Tools"));
-
- this.frm.add_custom_button(__('Link to Material Request'),
- function() {
- var my_items = [];
- for (var i in me.frm.doc.items) {
- if(!me.frm.doc.items[i].material_request){
- my_items.push(me.frm.doc.items[i].item_code);
}
- }
- frappe.call({
- method: "erpnext.buying.utils.get_linked_material_requests",
- args:{
- items: my_items
- },
- callback: function(r) {
- if(r.exc) return;
-
- var i = 0;
- var item_length = me.frm.doc.items.length;
- while (i < item_length) {
- var qty = me.frm.doc.items[i].qty;
- (r.message[0] || []).forEach(function(d) {
- if (d.qty > 0 && qty > 0 && me.frm.doc.items[i].item_code == d.item_code && !me.frm.doc.items[i].material_request_item)
- {
- me.frm.doc.items[i].material_request = d.mr_name;
- me.frm.doc.items[i].material_request_item = d.mr_item;
- var my_qty = Math.min(qty, d.qty);
- qty = qty - my_qty;
- d.qty = d.qty - my_qty;
- me.frm.doc.items[i].stock_qty = my_qty * me.frm.doc.items[i].conversion_factor;
- me.frm.doc.items[i].qty = my_qty;
-
- frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + me.frm.doc.items[i].idx + ")");
- if (qty > 0) {
- frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
- var new_row = frappe.model.add_child(me.frm.doc, me.frm.doc.items[i].doctype, "items");
- item_length++;
-
- for (var key in me.frm.doc.items[i]) {
- new_row[key] = me.frm.doc.items[i][key];
+ frappe.call({
+ method: "erpnext.buying.utils.get_linked_material_requests",
+ args: {
+ items: my_items,
+ },
+ callback: function (r) {
+ if (r.exc) return;
+
+ var i = 0;
+ var item_length = me.frm.doc.items.length;
+ while (i < item_length) {
+ var qty = me.frm.doc.items[i].qty;
+ (r.message[0] || []).forEach(function (d) {
+ if (
+ d.qty > 0 &&
+ qty > 0 &&
+ me.frm.doc.items[i].item_code == d.item_code &&
+ !me.frm.doc.items[i].material_request_item
+ ) {
+ me.frm.doc.items[i].material_request = d.mr_name;
+ me.frm.doc.items[i].material_request_item = d.mr_item;
+ var my_qty = Math.min(qty, d.qty);
+ qty = qty - my_qty;
+ d.qty = d.qty - my_qty;
+ me.frm.doc.items[i].stock_qty =
+ my_qty * me.frm.doc.items[i].conversion_factor;
+ me.frm.doc.items[i].qty = my_qty;
+
+ frappe.msgprint(
+ "Assigning " +
+ d.mr_name +
+ " to " +
+ d.item_code +
+ " (row " +
+ me.frm.doc.items[i].idx +
+ ")"
+ );
+ if (qty > 0) {
+ frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
+ var new_row = frappe.model.add_child(
+ me.frm.doc,
+ me.frm.doc.items[i].doctype,
+ "items"
+ );
+ item_length++;
+
+ for (var key in me.frm.doc.items[i]) {
+ new_row[key] = me.frm.doc.items[i][key];
+ }
+
+ new_row.idx = item_length;
+ new_row["stock_qty"] = new_row.conversion_factor * qty;
+ new_row["qty"] = qty;
+ new_row["material_request"] = "";
+ new_row["material_request_item"] = "";
}
-
- new_row.idx = item_length;
- new_row["stock_qty"] = new_row.conversion_factor * qty;
- new_row["qty"] = qty;
- new_row["material_request"] = "";
- new_row["material_request_item"] = "";
}
- }
- });
- i++;
- }
- refresh_field("items");
- }
- });
- }, __("Tools"));
+ });
+ i++;
+ }
+ refresh_field("items");
+ },
+ });
+ },
+ __("Tools")
+ );
}
tc_name() {
@@ -547,7 +642,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
items_add(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- if(doc.schedule_date) {
+ if (doc.schedule_date) {
row.schedule_date = doc.schedule_date;
refresh_field("schedule_date", cdn, "items");
} else {
@@ -555,24 +650,24 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
}
}
- unhold_purchase_order(){
- cur_frm.cscript.update_status("Resume", "Draft")
+ unhold_purchase_order() {
+ cur_frm.cscript.update_status("Resume", "Draft");
}
- hold_purchase_order(){
+ hold_purchase_order() {
var me = this;
var d = new frappe.ui.Dialog({
- title: __('Reason for Hold'),
+ title: __("Reason for Hold"),
fields: [
{
- "fieldname": "reason_for_hold",
- "fieldtype": "Text",
- "reqd": 1,
- }
+ fieldname: "reason_for_hold",
+ fieldtype: "Text",
+ reqd: 1,
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
- let reason_for_hold = 'Reason for hold: ' + data.reason_for_hold;
+ let reason_for_hold = "Reason for hold: " + data.reason_for_hold;
frappe.call({
method: "frappe.desk.form.utils.add_comment",
@@ -581,30 +676,30 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
reference_name: me.frm.docname,
content: __(reason_for_hold),
comment_email: frappe.session.user,
- comment_by: frappe.session.user_fullname
+ comment_by: frappe.session.user_fullname,
},
- callback: function(r) {
- if(!r.exc) {
- me.update_status('Hold', 'On Hold')
+ callback: function (r) {
+ if (!r.exc) {
+ me.update_status("Hold", "On Hold");
d.hide();
}
- }
+ },
});
- }
+ },
});
d.show();
}
- unclose_purchase_order(){
- cur_frm.cscript.update_status('Re-open', 'Submitted')
+ unclose_purchase_order() {
+ cur_frm.cscript.update_status("Re-open", "Submitted");
}
- close_purchase_order(){
- cur_frm.cscript.update_status('Close', 'Closed')
+ close_purchase_order() {
+ cur_frm.cscript.update_status("Close", "Closed");
}
- delivered_by_supplier(){
- cur_frm.cscript.update_status('Deliver', 'Delivered')
+ delivered_by_supplier() {
+ cur_frm.cscript.update_status("Deliver", "Delivered");
}
items_on_form_rendered() {
@@ -617,51 +712,55 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
};
// for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({ frm: cur_frm }));
-cur_frm.cscript.update_status= function(label, status){
+cur_frm.cscript.update_status = function (label, status) {
frappe.call({
method: "erpnext.buying.doctype.purchase_order.purchase_order.update_status",
- args: {status: status, name: cur_frm.doc.name},
- callback: function(r) {
+ args: { status: status, name: cur_frm.doc.name },
+ callback: function (r) {
cur_frm.set_value("status", status);
cur_frm.reload_doc();
- }
- })
-}
+ },
+ });
+};
-cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["items"].grid.get_field("project").get_query = function (doc, cdt, cdn) {
return {
- filters:[
- ['Project', 'status', 'not in', 'Completed, Cancelled']
- ]
- }
-}
+ filters: [["Project", "status", "not in", "Completed, Cancelled"]],
+ };
+};
if (cur_frm.doc.is_old_subcontracting_flow) {
- cur_frm.fields_dict['items'].grid.get_field('bom').get_query = function(doc, cdt, cdn) {
- var d = locals[cdt][cdn]
+ cur_frm.fields_dict["items"].grid.get_field("bom").get_query = function (doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
return {
filters: [
- ['BOM', 'item', '=', d.item_code],
- ['BOM', 'is_active', '=', '1'],
- ['BOM', 'docstatus', '=', '1'],
- ['BOM', 'company', '=', doc.company]
- ]
- }
- }
+ ["BOM", "item", "=", d.item_code],
+ ["BOM", "is_active", "=", "1"],
+ ["BOM", "docstatus", "=", "1"],
+ ["BOM", "company", "=", doc.company],
+ ],
+ };
+ };
}
function set_schedule_date(frm) {
- if(frm.doc.schedule_date){
- erpnext.utils.copy_value_in_all_rows(frm.doc, frm.doc.doctype, frm.doc.name, "items", "schedule_date");
+ if (frm.doc.schedule_date) {
+ erpnext.utils.copy_value_in_all_rows(
+ frm.doc,
+ frm.doc.doctype,
+ frm.doc.name,
+ "items",
+ "schedule_date"
+ );
}
}
frappe.provide("erpnext.buying");
-frappe.ui.form.on("Purchase Order", "is_subcontracted", function(frm) {
+frappe.ui.form.on("Purchase Order", "is_subcontracted", function (frm) {
if (frm.doc.is_old_subcontracting_flow) {
erpnext.buying.get_default_bom(frm);
}
-});
\ No newline at end of file
+});
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index d39d7f92137c..5e33b42ed7bd 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -1,6 +1,15 @@
-frappe.listview_settings['Purchase Order'] = {
- add_fields: ["base_grand_total", "company", "currency", "supplier",
- "supplier_name", "per_received", "per_billed", "status", "advance_payment_status"],
+frappe.listview_settings["Purchase Order"] = {
+ add_fields: [
+ "base_grand_total",
+ "company",
+ "currency",
+ "supplier",
+ "supplier_name",
+ "per_received",
+ "per_billed",
+ "status",
+ "advance_payment_status",
+ ],
get_indicator: function (doc) {
if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"];
@@ -12,15 +21,25 @@ frappe.listview_settings['Purchase Order'] = {
return [__("To Pay"), "gray", "advance_payment_status,=,Initiated"];
} else if (flt(doc.per_received, 2) < 100 && doc.status !== "Closed") {
if (flt(doc.per_billed, 2) < 100) {
- return [__("To Receive and Bill"), "orange",
- "per_received,<,100|per_billed,<,100|status,!=,Closed"];
+ return [
+ __("To Receive and Bill"),
+ "orange",
+ "per_received,<,100|per_billed,<,100|status,!=,Closed",
+ ];
} else {
- return [__("To Receive"), "orange",
- "per_received,<,100|per_billed,=,100|status,!=,Closed"];
+ return [__("To Receive"), "orange", "per_received,<,100|per_billed,=,100|status,!=,Closed"];
}
- } else if (flt(doc.per_received, 2) >= 100 && flt(doc.per_billed, 2) < 100 && doc.status !== "Closed") {
+ } else if (
+ flt(doc.per_received, 2) >= 100 &&
+ flt(doc.per_billed, 2) < 100 &&
+ doc.status !== "Closed"
+ ) {
return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Closed"];
- } else if (flt(doc.per_received, 2) >= 100 && flt(doc.per_billed, 2) == 100 && doc.status !== "Closed") {
+ } else if (
+ flt(doc.per_received, 2) >= 100 &&
+ flt(doc.per_billed, 2) == 100 &&
+ doc.status !== "Closed"
+ ) {
return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Closed"];
}
},
@@ -28,25 +47,23 @@ frappe.listview_settings['Purchase Order'] = {
var method = "erpnext.buying.doctype.purchase_order.purchase_order.close_or_unclose_purchase_orders";
listview.page.add_menu_item(__("Close"), function () {
- listview.call_for_selected_items(method, { "status": "Closed" });
+ listview.call_for_selected_items(method, { status: "Closed" });
});
listview.page.add_menu_item(__("Reopen"), function () {
- listview.call_for_selected_items(method, { "status": "Submitted" });
+ listview.call_for_selected_items(method, { status: "Submitted" });
});
-
- listview.page.add_action_item(__("Purchase Invoice"), ()=>{
+ listview.page.add_action_item(__("Purchase Invoice"), () => {
erpnext.bulk_transaction_processing.create(listview, "Purchase Order", "Purchase Invoice");
});
- listview.page.add_action_item(__("Purchase Receipt"), ()=>{
+ listview.page.add_action_item(__("Purchase Receipt"), () => {
erpnext.bulk_transaction_processing.create(listview, "Purchase Order", "Purchase Receipt");
});
- listview.page.add_action_item(__("Advance Payment"), ()=>{
+ listview.page.add_action_item(__("Advance Payment"), () => {
erpnext.bulk_transaction_processing.create(listview, "Purchase Order", "Payment Entry");
});
-
- }
+ },
};
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 31a06cf95e3e..272d077b1e39 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -1,60 +1,70 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-cur_frm.add_fetch('contact', 'email_id', 'email_id')
+cur_frm.add_fetch("contact", "email_id", "email_id");
erpnext.buying.setup_buying_controller();
-frappe.ui.form.on("Request for Quotation",{
- setup: function(frm) {
+frappe.ui.form.on("Request for Quotation", {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Supplier Quotation': 'Create'
- }
+ "Supplier Quotation": "Create",
+ };
- frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn) {
+ frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
query: "frappe.contacts.doctype.contact.contact.contact_query",
filters: {
link_doctype: "Supplier",
- link_name: d.supplier || ""
- }
+ link_name: d.supplier || "",
+ },
};
- }
+ };
- frm.set_query('warehouse', 'items', () => ({
+ frm.set_query("warehouse", "items", () => ({
filters: {
company: frm.doc.company,
- is_group: 0
- }
+ is_group: 0,
+ },
}));
},
- 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"))
+ 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) {
+ refresh: function (frm, cdt, cdn) {
if (frm.doc.docstatus === 1) {
+ frm.add_custom_button(
+ __("Supplier Quotation"),
+ function () {
+ frm.trigger("make_supplier_quotation");
+ },
+ __("Create")
+ );
- frm.add_custom_button(__('Supplier Quotation'),
- function(){ frm.trigger("make_supplier_quotation") }, __("Create"));
-
-
- frm.add_custom_button(__("Send Emails to Suppliers"), function() {
- frappe.call({
- method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.send_supplier_emails',
- freeze: true,
- args: {
- rfq_name: frm.doc.name
- },
- callback: function(r){
- frm.reload_doc();
- }
- });
- }, __("Tools"));
+ frm.add_custom_button(
+ __("Send Emails to Suppliers"),
+ function () {
+ frappe.call({
+ method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.send_supplier_emails",
+ freeze: true,
+ args: {
+ rfq_name: frm.doc.name,
+ },
+ callback: function (r) {
+ frm.reload_doc();
+ },
+ });
+ },
+ __("Tools")
+ );
frm.add_custom_button(
__("Download PDF"),
@@ -122,13 +132,13 @@ frappe.ui.form.on("Request for Quotation",{
var w = window.open(
frappe.urllib.get_full_url(
"/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?" +
- new URLSearchParams({
- name: frm.doc.name,
- supplier: data.supplier,
- print_format: data.print_format || "Standard",
- language: data.language || frappe.boot.lang,
- letterhead: data.letter_head || frm.doc.letter_head || "",
- }).toString()
+ new URLSearchParams({
+ name: frm.doc.name,
+ supplier: data.supplier,
+ print_format: data.print_format || "Standard",
+ language: data.language || frappe.boot.lang,
+ letterhead: data.letter_head || frm.doc.letter_head || "",
+ }).toString()
)
);
if (!w) {
@@ -147,101 +157,109 @@ frappe.ui.form.on("Request for Quotation",{
}
},
- make_supplier_quotation: function(frm) {
+ make_supplier_quotation: function (frm) {
var doc = frm.doc;
var dialog = new frappe.ui.Dialog({
title: __("Create Supplier Quotation"),
fields: [
- { "fieldtype": "Link",
- "label": __("Supplier"),
- "fieldname": "supplier",
- "options": 'Supplier',
- "reqd": 1,
+ {
+ fieldtype: "Link",
+ label: __("Supplier"),
+ fieldname: "supplier",
+ options: "Supplier",
+ reqd: 1,
get_query: () => {
return {
filters: [
- ["Supplier", "name", "in", frm.doc.suppliers.map((row) => {return row.supplier;})]
- ]
- }
- }
- }
+ [
+ "Supplier",
+ "name",
+ "in",
+ frm.doc.suppliers.map((row) => {
+ return row.supplier;
+ }),
+ ],
+ ],
+ };
+ },
+ },
],
primary_action_label: __("Create"),
primary_action: (args) => {
- if(!args) return;
+ if (!args) return;
dialog.hide();
return frappe.call({
type: "GET",
method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation_from_rfq",
args: {
- "source_name": doc.name,
- "for_supplier": args.supplier
+ source_name: doc.name,
+ for_supplier: args.supplier,
},
freeze: true,
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
var doc = frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
+ },
});
- }
+ },
});
- dialog.show()
+ dialog.show();
},
schedule_date(frm) {
- if(frm.doc.schedule_date){
+ if (frm.doc.schedule_date) {
frm.doc.items.forEach((item) => {
item.schedule_date = frm.doc.schedule_date;
- })
+ });
}
refresh_field("items");
},
preview: (frm) => {
let dialog = new frappe.ui.Dialog({
- title: __('Preview Email'),
+ title: __("Preview Email"),
fields: [
{
- label: __('Supplier'),
- fieldtype: 'Select',
- fieldname: 'supplier',
- options: frm.doc.suppliers.map(row => row.supplier),
- reqd: 1
+ label: __("Supplier"),
+ fieldtype: "Select",
+ fieldname: "supplier",
+ options: frm.doc.suppliers.map((row) => row.supplier),
+ reqd: 1,
},
{
- fieldtype: 'Column Break',
- fieldname: 'col_break_1',
+ fieldtype: "Column Break",
+ fieldname: "col_break_1",
},
{
- label: __('Subject'),
- fieldtype: 'Data',
- fieldname: 'subject',
+ label: __("Subject"),
+ fieldtype: "Data",
+ fieldname: "subject",
read_only: 1,
- depends_on: 'subject'
+ depends_on: "subject",
},
{
- fieldtype: 'Section Break',
- fieldname: 'sec_break_1',
- hide_border: 1
+ fieldtype: "Section Break",
+ fieldname: "sec_break_1",
+ hide_border: 1,
},
{
- label: __('Email'),
- fieldtype: 'HTML',
- fieldname: 'email_preview'
+ label: __("Email"),
+ fieldtype: "HTML",
+ fieldname: "email_preview",
},
{
- fieldtype: 'Section Break',
- fieldname: 'sec_break_2'
+ fieldtype: "Section Break",
+ fieldname: "sec_break_2",
},
{
- label: __('Note'),
- fieldtype: 'HTML',
- fieldname: 'note'
- }
- ]
+ label: __("Note"),
+ fieldtype: "HTML",
+ fieldname: "note",
+ },
+ ],
});
dialog.fields_dict["supplier"].df.onchange = () => {
@@ -249,74 +267,78 @@ frappe.ui.form.on("Request for Quotation",{
supplier: dialog.get_value("supplier"),
}).then(({ message }) => {
dialog.fields_dict.email_preview.$wrapper.empty();
- dialog.fields_dict.email_preview.$wrapper.append(
- message.message
- );
+ dialog.fields_dict.email_preview.$wrapper.append(message.message);
dialog.set_value("subject", message.subject);
});
};
- dialog.fields_dict.note.$wrapper.append(`
This is a preview of the email to be sent. A PDF of the document will
+ dialog.fields_dict.note.$wrapper
+ .append(`
This is a preview of the email to be sent. A PDF of the document will
automatically be attached with the email.
`);
dialog.show();
- }
-})
+ },
+});
frappe.ui.form.on("Request for Quotation Item", {
items_add(frm, cdt, cdn) {
if (frm.doc.schedule_date) {
- frappe.model.set_value(cdt, cdn, 'schedule_date', frm.doc.schedule_date);
+ frappe.model.set_value(cdt, cdn, "schedule_date", frm.doc.schedule_date);
}
- }
+ },
});
-frappe.ui.form.on("Request for Quotation Supplier",{
- supplier: function(frm, cdt, cdn) {
- var d = locals[cdt][cdn]
+frappe.ui.form.on("Request for Quotation Supplier", {
+ supplier: function (frm, cdt, cdn) {
+ var d = locals[cdt][cdn];
frappe.call({
- method:"erpnext.accounts.party.get_party_details",
- args:{
+ method: "erpnext.accounts.party.get_party_details",
+ args: {
party: d.supplier,
- party_type: 'Supplier'
+ party_type: "Supplier",
},
- callback: function(r){
- if(r.message){
- frappe.model.set_value(cdt, cdn, 'contact', r.message.contact_person)
- frappe.model.set_value(cdt, cdn, 'email_id', r.message.contact_email)
+ callback: function (r) {
+ if (r.message) {
+ frappe.model.set_value(cdt, cdn, "contact", r.message.contact_person);
+ frappe.model.set_value(cdt, cdn, "email_id", r.message.contact_email);
}
- }
- })
+ },
+ });
},
+});
-})
-
-erpnext.buying.RequestforQuotationController = class RequestforQuotationController extends erpnext.buying.BuyingController {
+erpnext.buying.RequestforQuotationController = class RequestforQuotationController extends (
+ erpnext.buying.BuyingController
+) {
refresh() {
var me = this;
super.refresh();
- if (this.frm.doc.docstatus===0) {
- this.frm.add_custom_button(__('Material Request'),
- function() {
+ if (this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("Material Request"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.material_request.material_request.make_request_for_quotation",
source_doctype: "Material Request",
target: me.frm,
setters: {
schedule_date: undefined,
- status: undefined
+ status: undefined,
},
get_query_filters: {
material_request_type: "Purchase",
docstatus: 1,
status: ["!=", "Stopped"],
per_ordered: ["<", 100],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
// Get items from Opportunity
- this.frm.add_custom_button(__('Opportunity'),
- function() {
+ this.frm.add_custom_button(
+ __("Opportunity"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_request_for_quotation",
source_doctype: "Opportunity",
@@ -324,67 +346,79 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
setters: {
party_name: undefined,
opportunity_from: undefined,
- status: undefined
+ status: undefined,
},
get_query_filters: {
status: ["not in", ["Closed", "Lost"]],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
// Get items from open Material Requests based on supplier
- this.frm.add_custom_button(__('Possible Supplier'), function() {
- // Create a dialog window for the user to pick their supplier
- var dialog = new frappe.ui.Dialog({
- title: __('Select Possible Supplier'),
- fields: [
- {
- fieldname: 'supplier',
- fieldtype:'Link',
- options:'Supplier',
- label:'Supplier',
- reqd:1,
- description: __("Get Items from Material Requests against this Supplier")
- }
- ],
- primary_action_label: __("Get Items"),
- primary_action: (args) => {
- if(!args) return;
- dialog.hide();
-
- erpnext.utils.map_current_doc({
- method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_item_from_material_requests_based_on_supplier",
- source_name: args.supplier,
- target: me.frm,
- setters: {
- company: me.frm.doc.company
+ this.frm.add_custom_button(
+ __("Possible Supplier"),
+ function () {
+ // Create a dialog window for the user to pick their supplier
+ var dialog = new frappe.ui.Dialog({
+ title: __("Select Possible Supplier"),
+ fields: [
+ {
+ fieldname: "supplier",
+ fieldtype: "Link",
+ options: "Supplier",
+ label: "Supplier",
+ reqd: 1,
+ description: __("Get Items from Material Requests against this Supplier"),
},
- get_query_filters: {
- material_request_type: "Purchase",
- docstatus: 1,
- status: ["!=", "Stopped"],
- per_ordered: ["<", 100]
- }
- });
- dialog.hide();
- }
- });
+ ],
+ primary_action_label: __("Get Items"),
+ primary_action: (args) => {
+ if (!args) return;
+ dialog.hide();
+
+ erpnext.utils.map_current_doc({
+ method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_item_from_material_requests_based_on_supplier",
+ source_name: args.supplier,
+ target: me.frm,
+ setters: {
+ company: me.frm.doc.company,
+ },
+ get_query_filters: {
+ material_request_type: "Purchase",
+ docstatus: 1,
+ status: ["!=", "Stopped"],
+ per_ordered: ["<", 100],
+ },
+ });
+ dialog.hide();
+ },
+ });
- dialog.show();
- }, __("Get Items From"));
+ dialog.show();
+ },
+ __("Get Items From")
+ );
// Link Material Requests
- this.frm.add_custom_button(__('Link to Material Requests'),
- function() {
+ this.frm.add_custom_button(
+ __("Link to Material Requests"),
+ function () {
erpnext.buying.link_to_mrs(me.frm);
- }, __("Tools"));
+ },
+ __("Tools")
+ );
// Get Suppliers
- this.frm.add_custom_button(__('Get Suppliers'),
- function() {
+ this.frm.add_custom_button(
+ __("Get Suppliers"),
+ function () {
me.get_suppliers_button(me.frm);
- }, __("Tools"));
+ },
+ __("Tools")
+ );
}
}
@@ -396,70 +430,75 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
this.get_terms();
}
- get_suppliers_button (frm) {
+ get_suppliers_button(frm) {
var doc = frm.doc;
var dialog = new frappe.ui.Dialog({
title: __("Get Suppliers"),
fields: [
{
- "fieldtype": "Select", "label": __("Get Suppliers By"),
- "fieldname": "search_type",
- "options": ["Supplier Group", "Tag"],
- "reqd": 1,
+ fieldtype: "Select",
+ label: __("Get Suppliers By"),
+ fieldname: "search_type",
+ options: ["Supplier Group", "Tag"],
+ reqd: 1,
onchange() {
- if(dialog.get_value('search_type') == 'Tag'){
- frappe.call({
- method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_tag',
- }).then(r => {
- dialog.set_df_property("tag", "options", r.message)
- });
+ if (dialog.get_value("search_type") == "Tag") {
+ frappe
+ .call({
+ method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_tag",
+ })
+ .then((r) => {
+ dialog.set_df_property("tag", "options", r.message);
+ });
}
- }
+ },
},
{
- "fieldtype": "Link", "label": __("Supplier Group"),
- "fieldname": "supplier_group",
- "options": "Supplier Group",
- "reqd": 0,
- "depends_on": "eval:doc.search_type == 'Supplier Group'"
+ fieldtype: "Link",
+ label: __("Supplier Group"),
+ fieldname: "supplier_group",
+ options: "Supplier Group",
+ reqd: 0,
+ depends_on: "eval:doc.search_type == 'Supplier Group'",
},
{
- "fieldtype": "Select", "label": __("Tag"),
- "fieldname": "tag",
- "reqd": 0,
- "depends_on": "eval:doc.search_type == 'Tag'",
- }
+ fieldtype: "Select",
+ label: __("Tag"),
+ fieldname: "tag",
+ reqd: 0,
+ depends_on: "eval:doc.search_type == 'Tag'",
+ },
],
primary_action_label: __("Add Suppliers"),
- primary_action : (args) => {
- if(!args) return;
+ primary_action: (args) => {
+ if (!args) return;
dialog.hide();
//Remove blanks
for (var j = 0; j < frm.doc.suppliers.length; j++) {
- if(!Object.prototype.hasOwnProperty.call(frm.doc.suppliers[j], "supplier")) {
+ if (!Object.prototype.hasOwnProperty.call(frm.doc.suppliers[j], "supplier")) {
frm.get_field("suppliers").grid.grid_rows[j].remove();
}
}
function load_suppliers(r) {
- if(r.message) {
+ if (r.message) {
for (var i = 0; i < r.message.length; i++) {
var exists = false;
let supplier = "";
- if (r.message[i].constructor === Array){
+ if (r.message[i].constructor === Array) {
supplier = r.message[i][0];
} else {
supplier = r.message[i].name;
}
- for (var j = 0; j < doc.suppliers.length;j++) {
+ for (var j = 0; j < doc.suppliers.length; j++) {
if (supplier === doc.suppliers[j].supplier) {
exists = true;
}
}
- if(!exists) {
- var d = frm.add_child('suppliers');
+ if (!exists) {
+ var d = frm.add_child("suppliers");
d.supplier = supplier;
frm.script_manager.trigger("supplier", d.doctype, d.name);
}
@@ -473,10 +512,10 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
type: "GET",
method: "frappe.desk.doctype.tag.tag.get_tagged_docs",
args: {
- "doctype": "Supplier",
- "tag": args.tag
+ doctype: "Supplier",
+ tag: args.tag,
},
- callback: load_suppliers
+ callback: load_suppliers,
});
} else if (args.supplier_group) {
return frappe.call({
@@ -485,13 +524,12 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
doctype: "Supplier",
order_by: "name",
fields: ["name"],
- filters: [["Supplier", "supplier_group", "=", args.supplier_group]]
-
+ filters: [["Supplier", "supplier_group", "=", args.supplier_group]],
},
- callback: load_suppliers
+ callback: load_suppliers,
});
}
- }
+ },
});
dialog.show();
@@ -499,4 +537,4 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
};
// for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({ frm: cur_frm }));
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 70d27828b4d4..b74474be89ec 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -3,65 +3,65 @@
frappe.ui.form.on("Supplier", {
setup: function (frm) {
- frm.set_query('default_price_list', { 'buying': 1 });
+ frm.set_query("default_price_list", { buying: 1 });
if (frm.doc.__islocal == 1) {
frm.set_value("represents_company", "");
}
- frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
+ frm.set_query("account", "accounts", function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
filters: {
- 'account_type': 'Payable',
- 'root_type': 'Liability',
- 'company': d.company,
- "is_group": 0
- }
- }
+ account_type: "Payable",
+ root_type: "Liability",
+ company: d.company,
+ is_group: 0,
+ },
+ };
});
- frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ frm.set_query("advance_account", "accounts", function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
filters: {
- "account_type": "Payable",
- "root_type": "Asset",
- "company": d.company,
- "is_group": 0
- }
- }
+ account_type: "Payable",
+ root_type: "Asset",
+ company: d.company,
+ is_group: 0,
+ },
+ };
});
- frm.set_query("default_bank_account", function() {
+ frm.set_query("default_bank_account", function () {
return {
filters: {
- "is_company_account":1
- }
- }
+ is_company_account: 1,
+ },
+ };
});
- frm.set_query("supplier_primary_contact", function(doc) {
+ frm.set_query("supplier_primary_contact", function (doc) {
return {
query: "erpnext.buying.doctype.supplier.supplier.get_supplier_primary_contact",
filters: {
- "supplier": doc.name
- }
+ supplier: doc.name,
+ },
};
});
- frm.set_query("supplier_primary_address", function(doc) {
+ frm.set_query("supplier_primary_address", function (doc) {
return {
filters: {
- "link_doctype": "Supplier",
- "link_name": doc.name
- }
+ link_doctype: "Supplier",
+ link_name: doc.name,
+ },
};
});
- frm.set_query("user", "portal_users", function(doc) {
+ frm.set_query("user", "portal_users", function (doc) {
return {
filters: {
- "ignore_user_type": true,
- }
+ ignore_user_type: true,
+ },
};
});
},
@@ -74,65 +74,94 @@ frappe.ui.form.on("Supplier", {
}
if (frm.doc.__islocal) {
- hide_field(['address_html','contact_html']);
+ hide_field(["address_html", "contact_html"]);
frappe.contacts.clear_address_and_contact(frm);
- }
- else {
- unhide_field(['address_html','contact_html']);
+ } else {
+ unhide_field(["address_html", "contact_html"]);
frappe.contacts.render_address_and_contact(frm);
// custom buttons
- frm.add_custom_button(__('Accounting Ledger'), function () {
- frappe.set_route('query-report', 'General Ledger',
- { party_type: 'Supplier', party: frm.doc.name, party_name: frm.doc.supplier_name });
- }, __("View"));
-
- frm.add_custom_button(__('Accounts Payable'), function () {
- frappe.set_route('query-report', 'Accounts Payable', { party_type: "Supplier", party: frm.doc.name });
- }, __("View"));
+ frm.add_custom_button(
+ __("Accounting Ledger"),
+ function () {
+ frappe.set_route("query-report", "General Ledger", {
+ party_type: "Supplier",
+ party: frm.doc.name,
+ party_name: frm.doc.supplier_name,
+ });
+ },
+ __("View")
+ );
+
+ frm.add_custom_button(
+ __("Accounts Payable"),
+ function () {
+ frappe.set_route("query-report", "Accounts Payable", {
+ party_type: "Supplier",
+ party: frm.doc.name,
+ });
+ },
+ __("View")
+ );
- frm.add_custom_button(__('Bank Account'), function () {
- erpnext.utils.make_bank_account(frm.doc.doctype, frm.doc.name);
- }, __('Create'));
+ frm.add_custom_button(
+ __("Bank Account"),
+ function () {
+ erpnext.utils.make_bank_account(frm.doc.doctype, frm.doc.name);
+ },
+ __("Create")
+ );
- frm.add_custom_button(__('Pricing Rule'), function () {
- erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
- }, __('Create'));
+ frm.add_custom_button(
+ __("Pricing Rule"),
+ function () {
+ erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
+ },
+ __("Create")
+ );
- frm.add_custom_button(__('Get Supplier Group Details'), function () {
- frm.trigger("get_supplier_group_details");
- }, __('Actions'));
+ frm.add_custom_button(
+ __("Get Supplier Group Details"),
+ function () {
+ frm.trigger("get_supplier_group_details");
+ },
+ __("Actions")
+ );
if (cint(frappe.defaults.get_default("enable_common_party_accounting"))) {
- frm.add_custom_button(__('Link with Customer'), function () {
- frm.trigger('show_party_link_dialog');
- }, __('Actions'));
+ frm.add_custom_button(
+ __("Link with Customer"),
+ function () {
+ frm.trigger("show_party_link_dialog");
+ },
+ __("Actions")
+ );
}
// indicators
erpnext.utils.set_party_dashboard_indicators(frm);
}
},
- get_supplier_group_details: function(frm) {
+ get_supplier_group_details: function (frm) {
frappe.call({
method: "get_supplier_group_details",
doc: frm.doc,
- callback: function() {
+ callback: function () {
frm.refresh();
- }
+ },
});
},
- supplier_primary_address: function(frm) {
+ supplier_primary_address: function (frm) {
if (frm.doc.supplier_primary_address) {
frappe.call({
- method: 'frappe.contacts.doctype.address.address.get_address_display',
+ method: "frappe.contacts.doctype.address.address.get_address_display",
args: {
- "address_dict": frm.doc.supplier_primary_address
+ address_dict: frm.doc.supplier_primary_address,
},
- callback: function(r) {
+ callback: function (r) {
frm.set_value("primary_address", r.message);
- }
+ },
});
}
if (!frm.doc.supplier_primary_address) {
@@ -140,56 +169,60 @@ frappe.ui.form.on("Supplier", {
}
},
- supplier_primary_contact: function(frm) {
+ supplier_primary_contact: function (frm) {
if (!frm.doc.supplier_primary_contact) {
frm.set_value("mobile_no", "");
frm.set_value("email_id", "");
}
},
- is_internal_supplier: function(frm) {
+ is_internal_supplier: function (frm) {
if (frm.doc.is_internal_supplier == 1) {
frm.toggle_reqd("represents_company", true);
- }
- else {
+ } else {
frm.toggle_reqd("represents_company", false);
}
},
- show_party_link_dialog: function(frm) {
+ show_party_link_dialog: function (frm) {
const dialog = new frappe.ui.Dialog({
- title: __('Select a Customer'),
- fields: [{
- fieldtype: 'Link', label: __('Customer'),
- options: 'Customer', fieldname: 'customer', reqd: 1
- }],
- primary_action: function({ customer }) {
+ title: __("Select a Customer"),
+ fields: [
+ {
+ fieldtype: "Link",
+ label: __("Customer"),
+ options: "Customer",
+ fieldname: "customer",
+ reqd: 1,
+ },
+ ],
+ primary_action: function ({ customer }) {
frappe.call({
- method: 'erpnext.accounts.doctype.party_link.party_link.create_party_link',
+ method: "erpnext.accounts.doctype.party_link.party_link.create_party_link",
args: {
- primary_role: 'Supplier',
+ primary_role: "Supplier",
primary_party: frm.doc.name,
- secondary_party: customer
+ secondary_party: customer,
},
freeze: true,
- callback: function() {
+ callback: function () {
dialog.hide();
frappe.msgprint({
- message: __('Successfully linked to Customer'),
- alert: true
+ message: __("Successfully linked to Customer"),
+ alert: true,
});
},
- error: function() {
+ error: function () {
dialog.hide();
frappe.msgprint({
- message: __('Linking to Customer Failed. Please try again.'),
- title: __('Linking Failed'),
- indicator: 'red'
+ message: __("Linking to Customer Failed. Please try again."),
+ title: __("Linking Failed"),
+ indicator: "red",
});
- }
+ },
});
},
- primary_action_label: __('Create Link')
+ primary_action_label: __("Create Link"),
});
dialog.show();
- }
+ },
});
diff --git a/erpnext/buying/doctype/supplier/supplier_list.js b/erpnext/buying/doctype/supplier/supplier_list.js
index c776b001a5a6..987c1e02038c 100644
--- a/erpnext/buying/doctype/supplier/supplier_list.js
+++ b/erpnext/buying/doctype/supplier/supplier_list.js
@@ -1,8 +1,8 @@
-frappe.listview_settings['Supplier'] = {
+frappe.listview_settings["Supplier"] = {
add_fields: ["supplier_name", "supplier_group", "image", "on_hold"],
- get_indicator: function(doc) {
- if(cint(doc.on_hold)) {
+ get_indicator: function (doc) {
+ if (cint(doc.on_hold)) {
return [__("On Hold"), "red"];
}
- }
+ },
};
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index addf5a5e77b4..c1698710135a 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -2,12 +2,14 @@
// License: GNU General Public License v3. See license.txt
erpnext.buying.setup_buying_controller();
-erpnext.buying.SupplierQuotationController = class SupplierQuotationController extends erpnext.buying.BuyingController {
+erpnext.buying.SupplierQuotationController = class SupplierQuotationController extends (
+ erpnext.buying.BuyingController
+) {
setup() {
this.frm.custom_make_buttons = {
- 'Purchase Order': 'Purchase Order',
- 'Quotation': 'Quotation'
- }
+ "Purchase Order": "Purchase Order",
+ Quotation: "Quotation",
+ };
super.setup();
}
@@ -17,89 +19,90 @@ erpnext.buying.SupplierQuotationController = class SupplierQuotationController e
super.refresh();
if (this.frm.doc.__islocal && !this.frm.doc.valid_till) {
- this.frm.set_value('valid_till', frappe.datetime.add_months(this.frm.doc.transaction_date, 1));
+ this.frm.set_value("valid_till", frappe.datetime.add_months(this.frm.doc.transaction_date, 1));
}
if (this.frm.doc.docstatus === 1) {
- cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order,
- __('Create'));
- cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
- cur_frm.add_custom_button(__("Quotation"), this.make_quotation,
- __('Create'));
- }
- else if (this.frm.doc.docstatus===0) {
-
- this.frm.add_custom_button(__('Material Request'),
- function() {
+ cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order, __("Create"));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
+ cur_frm.add_custom_button(__("Quotation"), this.make_quotation, __("Create"));
+ } else if (this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("Material Request"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.material_request.material_request.make_supplier_quotation",
source_doctype: "Material Request",
target: me.frm,
setters: {
schedule_date: undefined,
- status: undefined
+ status: undefined,
},
get_query_filters: {
material_request_type: "Purchase",
docstatus: 1,
status: ["!=", "Stopped"],
per_ordered: ["<", 100],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
// Link Material Requests
- this.frm.add_custom_button(__('Link to Material Requests'),
- function() {
+ this.frm.add_custom_button(
+ __("Link to Material Requests"),
+ function () {
erpnext.buying.link_to_mrs(me.frm);
- }, __("Tools"));
+ },
+ __("Tools")
+ );
- this.frm.add_custom_button(__("Request for Quotation"),
- function() {
- if (!me.frm.doc.supplier) {
- frappe.throw({message:__("Please select a Supplier"), title:__("Mandatory")})
- }
- erpnext.utils.map_current_doc({
- method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation_from_rfq",
- source_doctype: "Request for Quotation",
- target: me.frm,
- setters: {
- transaction_date: null
- },
- get_query_filters: {
- supplier: me.frm.doc.supplier,
- company: me.frm.doc.company
- },
- get_query_method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_rfq_containing_supplier"
-
- })
- }, __("Get Items From"));
+ this.frm.add_custom_button(
+ __("Request for Quotation"),
+ function () {
+ if (!me.frm.doc.supplier) {
+ frappe.throw({ message: __("Please select a Supplier"), title: __("Mandatory") });
+ }
+ erpnext.utils.map_current_doc({
+ method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation_from_rfq",
+ source_doctype: "Request for Quotation",
+ target: me.frm,
+ setters: {
+ transaction_date: null,
+ },
+ get_query_filters: {
+ supplier: me.frm.doc.supplier,
+ company: me.frm.doc.company,
+ },
+ get_query_method:
+ "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_rfq_containing_supplier",
+ });
+ },
+ __("Get Items From")
+ );
}
}
make_purchase_order() {
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
make_quotation() {
frappe.model.open_mapped_doc({
method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_quotation",
- frm: cur_frm
- })
-
+ frm: cur_frm,
+ });
}
};
// for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({ frm: cur_frm }));
-cur_frm.fields_dict['items'].grid.get_field('project').get_query =
- function(doc, cdt, cdn) {
- return{
- filters:[
- ['Project', 'status', 'not in', 'Completed, Cancelled']
- ]
- }
- }
+cur_frm.fields_dict["items"].grid.get_field("project").get_query = function (doc, cdt, cdn) {
+ return {
+ filters: [["Project", "status", "not in", "Completed, Cancelled"]],
+ };
+};
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js
index 73685caa0b44..99fe24d8770c 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js
@@ -1,22 +1,22 @@
-frappe.listview_settings['Supplier Quotation'] = {
+frappe.listview_settings["Supplier Quotation"] = {
add_fields: ["supplier", "base_grand_total", "status", "company", "currency"],
- get_indicator: function(doc) {
- if(doc.status==="Ordered") {
+ get_indicator: function (doc) {
+ if (doc.status === "Ordered") {
return [__("Ordered"), "green", "status,=,Ordered"];
- } else if(doc.status==="Rejected") {
+ } else if (doc.status === "Rejected") {
return [__("Lost"), "gray", "status,=,Lost"];
- } else if(doc.status==="Expired") {
+ } else if (doc.status === "Expired") {
return [__("Expired"), "gray", "status,=,Expired"];
}
},
- onload: function(listview) {
- listview.page.add_action_item(__("Purchase Order"), ()=>{
+ onload: function (listview) {
+ listview.page.add_action_item(__("Purchase Order"), () => {
erpnext.bulk_transaction_processing.create(listview, "Supplier Quotation", "Purchase Order");
});
- listview.page.add_action_item(__("Purchase Invoice"), ()=>{
+ listview.page.add_action_item(__("Purchase Invoice"), () => {
erpnext.bulk_transaction_processing.create(listview, "Supplier Quotation", "Purchase Invoice");
});
- }
+ },
};
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
index e9d56784ff6a..ca806f8df083 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
@@ -2,55 +2,51 @@
// For license information, please see license.txt
frappe.ui.form.on("Supplier Scorecard", {
- setup: function(frm) {
- if (frm.doc.indicator_color !== "") {
- frm.set_indicator_formatter("status", function(doc) {
+ setup: function (frm) {
+ if (frm.doc.indicator_color !== "") {
+ frm.set_indicator_formatter("status", function (doc) {
return doc.indicator_color.toLowerCase();
});
}
},
- onload: function(frm) {
- if (frm.doc.__unsaved == 1) {
+ onload: function (frm) {
+ if (frm.doc.__unsaved == 1) {
loadAllStandings(frm);
}
},
- load_criteria: function(frm) {
+ load_criteria: function (frm) {
frappe.call({
method: "erpnext.buying.doctype.supplier_scorecard_criteria.supplier_scorecard_criteria.get_criteria_list",
- callback: function(r) {
- frm.set_value('criteria', []);
- for (var i = 0; i < r.message.length; i++)
- {
+ callback: function (r) {
+ frm.set_value("criteria", []);
+ for (var i = 0; i < r.message.length; i++) {
var row = frm.add_child("criteria");
row.criteria_name = r.message[i].name;
frm.script_manager.trigger("criteria_name", row.doctype, row.name);
}
refresh_field("criteria");
- }
+ },
});
- }
-
+ },
});
frappe.ui.form.on("Supplier Scorecard Scoring Standing", {
-
- standing_name: function(frm, cdt, cdn) {
+ standing_name: function (frm, cdt, cdn) {
var d = frappe.get_doc(cdt, cdn);
if (d.standing_name) {
return frm.call({
method: "erpnext.buying.doctype.supplier_scorecard_standing.supplier_scorecard_standing.get_scoring_standing",
child: d,
args: {
- standing_name: d.standing_name
- }
+ standing_name: d.standing_name,
+ },
});
}
- }
+ },
});
frappe.ui.form.on("Supplier Scorecard Scoring Criteria", {
-
- criteria_name: function(frm, cdt, cdn) {
+ criteria_name: function (frm, cdt, cdn) {
var d = frappe.get_doc(cdt, cdn);
if (d.criteria_name) {
return frm.call({
@@ -58,36 +54,34 @@ frappe.ui.form.on("Supplier Scorecard Scoring Criteria", {
args: {
fieldname: "weight",
doctype: "Supplier Scorecard Criteria",
- filters: {name: d.criteria_name}
+ filters: { name: d.criteria_name },
},
- callback: function(r) {
- if(r.message){
+ callback: function (r) {
+ if (r.message) {
d.weight = r.message.weight;
- frm.refresh_field('criteria', 'weight');
+ frm.refresh_field("criteria", "weight");
}
- }
+ },
});
}
- }
+ },
});
-var loadAllStandings = function(frm) {
+var loadAllStandings = function (frm) {
frappe.call({
method: "erpnext.buying.doctype.supplier_scorecard_standing.supplier_scorecard_standing.get_standings_list",
- callback: function(r) {
- for (var j = 0; j < frm.doc.standings.length; j++)
- {
- if(!Object.prototype.hasOwnProperty.call(frm.doc.standings[j], "standing_name")) {
+ callback: function (r) {
+ for (var j = 0; j < frm.doc.standings.length; j++) {
+ if (!Object.prototype.hasOwnProperty.call(frm.doc.standings[j], "standing_name")) {
frm.get_field("standings").grid.grid_rows[j].remove();
}
}
- for (var i = 0; i < r.message.length; i++)
- {
+ for (var i = 0; i < r.message.length; i++) {
var new_row = frm.add_child("standings");
new_row.standing_name = r.message[i].name;
frm.script_manager.trigger("standing_name", new_row.doctype, new_row.name);
}
refresh_field("standings");
- }
+ },
});
};
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js
index edf0b04d72e0..87f43ab4c871 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js
@@ -1,16 +1,13 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.listview_settings["Supplier Scorecard"] = {
add_fields: ["indicator_color", "status"],
- get_indicator: function(doc) {
-
+ get_indicator: function (doc) {
if (doc.indicator_color) {
return [__(doc.status), doc.indicator_color.toLowerCase(), "status,=," + doc.status];
} else {
return [__("Unknown"), "gray", "status,=,''"];
}
},
-
-}
+};
diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.js b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.js
index 2186cd89eb31..70a0c0beb739 100644
--- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.js
+++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.js
@@ -2,5 +2,5 @@
// For license information, please see license.txt
frappe.ui.form.on("Supplier Scorecard Criteria", {
- refresh: function() {}
+ refresh: function () {},
});
diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js
index 62079cc3e0b6..3b6f543ebb96 100644
--- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js
+++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.js
@@ -2,12 +2,12 @@
// For license information, please see license.txt
frappe.ui.form.on("Supplier Scorecard Period", {
- onload: function(frm) {
+ onload: function (frm) {
let criteria_grid = frm.get_field("criteria").grid;
criteria_grid.toggle_enable("criteria_name", false);
criteria_grid.toggle_enable("weight", false);
criteria_grid.toggle_display("max_score", true);
criteria_grid.toggle_display("formula", true);
criteria_grid.toggle_display("score", true);
- }
+ },
});
diff --git a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.js b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.js
index 22756e75cf6d..9bdd670d4988 100644
--- a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.js
+++ b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.js
@@ -1,9 +1,6 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.ui.form.on("Supplier Scorecard Standing", {
- refresh: function() {
-
- }
+ refresh: function () {},
});
diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.js b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.js
index b3b4321a887b..4423cab03dfb 100644
--- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.js
+++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.js
@@ -2,7 +2,5 @@
// For license information, please see license.txt
frappe.ui.form.on("Supplier Scorecard Variable", {
- refresh: function() {
-
- }
+ refresh: function () {},
});
diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.js b/erpnext/buying/report/procurement_tracker/procurement_tracker.js
index 7e4822c31eb2..ada528b988f6 100644
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.js
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.js
@@ -1,9 +1,8 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Procurement Tracker"] = {
- "filters": [
+ filters: [
{
fieldname: "company",
label: __("Company"),
@@ -30,10 +29,10 @@ frappe.query_reports["Procurement Tracker"] = {
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
},
- ]
-}
+ ],
+};
diff --git a/erpnext/buying/report/purchase_analytics/purchase_analytics.js b/erpnext/buying/report/purchase_analytics/purchase_analytics.js
index 250b334d65c4..23a188057d95 100644
--- a/erpnext/buying/report/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/report/purchase_analytics/purchase_analytics.js
@@ -1,49 +1,48 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Purchase Analytics"] = {
- "filters": [
+ filters: [
{
fieldname: "tree_type",
label: __("Tree Type"),
fieldtype: "Select",
- options: ["Supplier Group","Supplier","Item Group","Item"],
+ options: ["Supplier Group", "Supplier", "Item Group", "Item"],
default: "Supplier",
- reqd: 1
+ reqd: 1,
},
{
fieldname: "doc_type",
label: __("based_on"),
fieldtype: "Select",
- options: ["Purchase Order","Purchase Receipt","Purchase Invoice"],
+ options: ["Purchase Order", "Purchase Receipt", "Purchase Invoice"],
default: "Purchase Invoice",
- reqd: 1
+ reqd: 1,
},
{
fieldname: "value_quantity",
label: __("Value Or Qty"),
fieldtype: "Select",
options: [
- { "value": "Value", "label": __("Value") },
- { "value": "Quantity", "label": __("Quantity") },
+ { value: "Value", label: __("Value") },
+ { value: "Quantity", label: __("Quantity") },
],
default: "Value",
- reqd: 1
+ reqd: 1,
},
{
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- reqd: 1
+ reqd: 1,
},
{
fieldname: "company",
@@ -51,22 +50,21 @@ frappe.query_reports["Purchase Analytics"] = {
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "range",
label: __("Range"),
fieldtype: "Select",
options: [
- { "value": "Weekly", "label": __("Weekly") },
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Yearly", "label": __("Yearly") }
+ { value: "Weekly", label: __("Weekly") },
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Yearly", label: __("Yearly") },
],
default: "Monthly",
- reqd: 1
- }
-
+ reqd: 1,
+ },
],
get_datatable_options(options) {
return Object.assign(options, {
@@ -75,34 +73,26 @@ frappe.query_reports["Purchase Analytics"] = {
onCheckRow: function (data) {
if (!data) return;
- const data_doctype = $(
- data[2].html
- )[0].attributes.getNamedItem("data-doctype").value;
+ const data_doctype = $(data[2].html)[0].attributes.getNamedItem("data-doctype").value;
const tree_type = frappe.query_report.filters[0].value;
if (data_doctype != tree_type) return;
let row_name = data[2].content;
let length = data.length;
- let row_values = '';
+ let row_values = "";
if (tree_type == "Supplier") {
- row_values = data
- .slice(4, length - 1)
- .map(function (column) {
- return column.content;
- });
+ row_values = data.slice(4, length - 1).map(function (column) {
+ return column.content;
+ });
} else if (tree_type == "Item") {
- row_values = data
- .slice(5, length - 1)
- .map(function (column) {
- return column.content;
- });
+ row_values = data.slice(5, length - 1).map(function (column) {
+ return column.content;
+ });
} else {
- row_values = data
- .slice(3, length - 1)
- .map(function (column) {
- return column.content;
- });
+ row_values = data.slice(3, length - 1).map(function (column) {
+ return column.content;
+ });
}
let entry = {
@@ -113,13 +103,13 @@ frappe.query_reports["Purchase Analytics"] = {
let raw_data = frappe.query_report.chart.data;
let new_datasets = raw_data.datasets;
- let element_found = new_datasets.some((element, index, array)=>{
- if(element.name == row_name){
- array.splice(index, 1)
- return true
+ let element_found = new_datasets.some((element, index, array) => {
+ if (element.name == row_name) {
+ array.splice(index, 1);
+ return true;
}
- return false
- })
+ return false;
+ });
if (!element_found) {
new_datasets.push(entry);
@@ -128,12 +118,14 @@ frappe.query_reports["Purchase Analytics"] = {
labels: raw_data.labels,
datasets: new_datasets,
};
- const new_options = Object.assign({}, frappe.query_report.chart_options, {data: new_data});
+ const new_options = Object.assign({}, frappe.query_report.chart_options, {
+ data: new_data,
+ });
frappe.query_report.render_chart(new_options);
frappe.query_report.raw_chart_data = new_data;
},
},
});
- }
-}
+ },
+};
diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
index 3bf4f2bb296b..8575633da5a0 100644
--- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
+++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
@@ -1,80 +1,79 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Purchase Order Analysis"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_default("company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_default("company"),
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"project",
- "label": __("Project"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Project"
+ fieldname: "project",
+ label: __("Project"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Project",
},
{
- "fieldname": "name",
- "label": __("Purchase Order"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Purchase Order",
- "get_query": () =>{
+ fieldname: "name",
+ label: __("Purchase Order"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Purchase Order",
+ get_query: () => {
return {
- filters: { "docstatus": 1 }
- }
- }
+ filters: { docstatus: 1 },
+ };
+ },
},
{
- "fieldname": "status",
- "label": __("Status"),
- "fieldtype": "MultiSelectList",
- "width": "80",
- get_data: function(txt) {
- let status = ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed"]
- let options = []
- for (let option of status){
+ fieldname: "status",
+ label: __("Status"),
+ fieldtype: "MultiSelectList",
+ width: "80",
+ get_data: function (txt) {
+ let status = ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed"];
+ let options = [];
+ for (let option of status) {
options.push({
- "value": option,
- "label": __(option),
- "description": ""
- })
+ value: option,
+ label: __(option),
+ description: "",
+ });
}
- return options
- }
+ return options;
+ },
},
{
- "fieldname": "group_by_po",
- "label": __("Group by Purchase Order"),
- "fieldtype": "Check",
- "default": 0
- }
+ fieldname: "group_by_po",
+ label: __("Group by Purchase Order"),
+ fieldtype: "Check",
+ default: 0,
+ },
],
- "formatter": function (value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
let format_fields = ["received_qty", "billed_amount"];
@@ -82,5 +81,5 @@ frappe.query_reports["Purchase Order Analysis"] = {
value = "
" + value + " ";
}
return value;
- }
+ },
};
diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
index 90919dcc6a3c..366fff191a01 100644
--- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
@@ -1,8 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
+frappe.require("assets/erpnext/js/purchase_trends_filters.js", function () {
frappe.query_reports["Purchase Order Trends"] = {
- filters: erpnext.get_purchase_trends_filters()
- }
+ filters: erpnext.get_purchase_trends_filters(),
+ };
});
diff --git a/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js b/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js
index cb05109d5b7e..039ac2c96712 100644
--- a/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js
+++ b/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js
@@ -1,76 +1,75 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Requested Items to Order and Receive"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_default("company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_default("company"),
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
- "fieldname": "material_request",
- "label": __("Material Request"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Material Request",
- "get_query": () => {
+ fieldname: "material_request",
+ label: __("Material Request"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Material Request",
+ get_query: () => {
return {
filters: {
- "docstatus": 1,
- "material_request_type": "Purchase",
- "per_received": ["<", 100]
- }
- }
- }
+ docstatus: 1,
+ material_request_type: "Purchase",
+ per_received: ["<", 100],
+ },
+ };
+ },
},
{
- "fieldname": "item_code",
- "label": __("Item"),
- "fieldtype": "Link",
- "width": "80",
- "options": "Item",
- "get_query": () => {
+ fieldname: "item_code",
+ label: __("Item"),
+ fieldtype: "Link",
+ width: "80",
+ options: "Item",
+ get_query: () => {
return {
- query: "erpnext.controllers.queries.item_query"
- }
- }
+ query: "erpnext.controllers.queries.item_query",
+ };
+ },
},
{
- "fieldname": "group_by_mr",
- "label": __("Group by Material Request"),
- "fieldtype": "Check",
- "default": 0
- }
+ fieldname: "group_by_mr",
+ label: __("Group by Material Request"),
+ fieldtype: "Check",
+ default: 0,
+ },
],
- "formatter": function (value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (column.fieldname == "ordered_qty" && data && data.ordered_qty > 0) {
value = "
" + value + " ";
}
return value;
- }
+ },
};
diff --git a/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.js b/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.js
index 800b8ab7dbd6..8606fae47c4e 100644
--- a/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.js
+++ b/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.js
@@ -1,42 +1,41 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Subcontract Order Summary"] = {
- "filters": [
+ filters: [
{
label: __("Company"),
fieldname: "company",
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
label: __("From Date"),
fieldname: "from_date",
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- reqd: 1
+ reqd: 1,
},
{
label: __("To Date"),
fieldname: "to_date",
fieldtype: "Date",
default: frappe.datetime.get_today(),
- reqd: 1
+ reqd: 1,
},
{
label: __("Order Type"),
fieldname: "order_type",
fieldtype: "Select",
options: ["Purchase Order", "Subcontracting Order"],
- default: "Subcontracting Order"
+ default: "Subcontracting Order",
},
{
label: __("Subcontract Order"),
fieldname: "name",
- fieldtype: "Data"
- }
- ]
-};
\ No newline at end of file
+ fieldtype: "Data",
+ },
+ ],
+};
diff --git a/erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js b/erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js
index 35be2a9cf888..f20d24931237 100644
--- a/erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js
+++ b/erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js
@@ -1,36 +1,35 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Subcontracted Item To Be Received"] = {
- "filters": [
+ filters: [
{
label: __("Order Type"),
fieldname: "order_type",
fieldtype: "Select",
options: ["Purchase Order", "Subcontracting Order"],
- default: "Subcontracting Order"
+ default: "Subcontracting Order",
},
{
fieldname: "supplier",
label: __("Supplier"),
fieldtype: "Link",
options: "Supplier",
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"from_date",
+ fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
- reqd: 1
+ reqd: 1,
},
- ]
+ ],
};
diff --git a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js
index 33b26dcb5f67..999fae5eec5b 100644
--- a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js
+++ b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js
@@ -1,36 +1,35 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Subcontracted Raw Materials To Be Transferred"] = {
- "filters": [
+ filters: [
{
label: __("Order Type"),
fieldname: "order_type",
fieldtype: "Select",
options: ["Purchase Order", "Subcontracting Order"],
- default: "Subcontracting Order"
+ default: "Subcontracting Order",
},
{
fieldname: "supplier",
label: __("Supplier"),
fieldtype: "Link",
options: "Supplier",
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"from_date",
+ fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
- reqd: 1
+ reqd: 1,
},
- ]
-}
+ ],
+};
diff --git a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js
index 579c0a65ad94..c109abd8146a 100644
--- a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js
+++ b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js
@@ -9,23 +9,23 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
options: "Company",
fieldname: "company",
default: frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "width": "80",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ width: "80",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
{
default: "",
@@ -34,34 +34,34 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
fieldname: "item_code",
fieldtype: "Link",
get_query: () => {
- let quote = frappe.query_report.get_filter_value('supplier_quotation');
+ let quote = frappe.query_report.get_filter_value("supplier_quotation");
if (quote != "") {
return {
query: "erpnext.stock.doctype.quality_inspection.quality_inspection.item_query",
filters: {
- "from": "Supplier Quotation Item",
- "parent": quote
- }
- }
+ from: "Supplier Quotation Item",
+ parent: quote,
+ },
+ };
}
- }
+ },
},
{
fieldname: "supplier",
label: __("Supplier"),
fieldtype: "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Supplier', txt);
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Supplier", txt);
+ },
},
{
fieldtype: "MultiSelectList",
label: __("Supplier Quotation"),
fieldname: "supplier_quotation",
default: "",
- get_data: function(txt) {
- return frappe.db.get_link_options('Supplier Quotation', txt, {'docstatus': ["<", 2]});
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Supplier Quotation", txt, { docstatus: ["<", 2] });
+ },
},
{
fieldtype: "Link",
@@ -70,37 +70,36 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
fieldname: "request_for_quotation",
default: "",
get_query: () => {
- return { filters: { "docstatus": ["<", 2] } }
- }
+ return { filters: { docstatus: ["<", 2] } };
+ },
},
{
- "fieldname":"group_by",
- "label": __("Group by"),
- "fieldtype": "Select",
- "options": [__("Group by Supplier"), __("Group by Item")],
- "default": __("Group by Supplier")
+ fieldname: "group_by",
+ label: __("Group by"),
+ fieldtype: "Select",
+ options: [__("Group by Supplier"), __("Group by Item")],
+ default: __("Group by Supplier"),
},
{
fieldtype: "Check",
label: __("Include Expired"),
fieldname: "include_expired",
- default: 0
- }
+ default: 0,
+ },
],
formatter: (value, row, column, data, default_formatter) => {
value = default_formatter(value, row, column, data);
- if(column.fieldname === "valid_till" && data.valid_till){
- if(frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 1){
+ if (column.fieldname === "valid_till" && data.valid_till) {
+ if (frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 1) {
value = `
${value}
`;
- }
- else if (frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 7){
+ } else if (frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 7) {
value = `
${value}
`;
}
}
- if(column.fieldname === "price_per_unit" && data.price_per_unit && data.min && data.min === 1){
+ if (column.fieldname === "price_per_unit" && data.price_per_unit && data.min && data.min === 1) {
value = `
${value}
`;
}
return value;
@@ -108,48 +107,53 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
onload: (report) => {
// Create a button for setting the default supplier
- report.page.add_inner_button(__("Select Default Supplier"), () => {
- let reporter = frappe.query_reports["Supplier Quotation Comparison"];
-
- //Always make a new one so that the latest values get updated
- reporter.make_default_supplier_dialog(report);
- }, __("Tools"));
+ report.page.add_inner_button(
+ __("Select Default Supplier"),
+ () => {
+ let reporter = frappe.query_reports["Supplier Quotation Comparison"];
+ //Always make a new one so that the latest values get updated
+ reporter.make_default_supplier_dialog(report);
+ },
+ __("Tools")
+ );
},
make_default_supplier_dialog: (report) => {
// Get the name of the item to change
- if(!report.data) return;
+ if (!report.data) return;
let filters = report.get_values();
let item_code = filters.item_code;
// Get a list of the suppliers (with a blank as well) for the user to select
- let suppliers = $.map(report.data, (row, idx)=>{ return row.supplier_name })
+ let suppliers = $.map(report.data, (row, idx) => {
+ return row.supplier_name;
+ });
// Create a dialog window for the user to pick their supplier
let dialog = new frappe.ui.Dialog({
- title: __('Select Default Supplier'),
+ title: __("Select Default Supplier"),
fields: [
{
reqd: 1,
- label: 'Supplier',
- fieldtype: 'Link',
- options: 'Supplier',
- fieldname: 'supplier',
+ label: "Supplier",
+ fieldtype: "Link",
+ options: "Supplier",
+ fieldname: "supplier",
get_query: () => {
return {
filters: {
- 'name': ['in', suppliers]
- }
- }
- }
- }
- ]
+ name: ["in", suppliers],
+ },
+ };
+ },
+ },
+ ],
});
dialog.set_primary_action(__("Set Default Supplier"), () => {
let values = dialog.get_values();
- if(values) {
+ if (values) {
// Set the default_supplier field of the appropriate Item to the selected supplier
frappe.call({
method: "frappe.client.set_value",
@@ -163,10 +167,10 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
callback: (r) => {
frappe.msgprint(__("Successfully Set Supplier"));
dialog.hide();
- }
+ },
});
}
});
dialog.show();
- }
-}
+ },
+};
diff --git a/erpnext/crm/doctype/appointment/appointment.js b/erpnext/crm/doctype/appointment/appointment.js
index ca38121b1cfd..54aa9a6b716d 100644
--- a/erpnext/crm/doctype/appointment/appointment.js
+++ b/erpnext/crm/doctype/appointment/appointment.js
@@ -1,26 +1,26 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Appointment', {
- refresh: function(frm) {
- if(frm.doc.lead){
- frm.add_custom_button(frm.doc.lead,()=>{
+frappe.ui.form.on("Appointment", {
+ refresh: function (frm) {
+ if (frm.doc.lead) {
+ frm.add_custom_button(frm.doc.lead, () => {
frappe.set_route("Form", "Lead", frm.doc.lead);
});
}
- if(frm.doc.calendar_event){
- frm.add_custom_button(__(frm.doc.calendar_event),()=>{
+ if (frm.doc.calendar_event) {
+ frm.add_custom_button(__(frm.doc.calendar_event), () => {
frappe.set_route("Form", "Event", frm.doc.calendar_event);
});
}
},
- onload: function(frm){
- frm.set_query("appointment_with", function(){
+ onload: function (frm) {
+ frm.set_query("appointment_with", function () {
return {
- filters : {
- "name": ["in", ["Customer", "Lead"]]
- }
+ filters: {
+ name: ["in", ["Customer", "Lead"]],
+ },
};
});
- }
+ },
});
diff --git a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.js b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.js
index 0c64eb8e822b..255e665a4d2f 100644
--- a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.js
+++ b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.js
@@ -1,10 +1,14 @@
-frappe.ui.form.on('Appointment Booking Settings', 'validate',check_times);
+frappe.ui.form.on("Appointment Booking Settings", "validate", check_times);
function check_times(frm) {
$.each(frm.doc.availability_of_slots || [], function (i, d) {
- let from_time = Date.parse('01/01/2019 ' + d.from_time);
- let to_time = Date.parse('01/01/2019 ' + d.to_time);
+ let from_time = Date.parse("01/01/2019 " + d.from_time);
+ let to_time = Date.parse("01/01/2019 " + d.to_time);
if (from_time > to_time) {
- frappe.throw(__('In row {0} of Appointment Booking Slots: "To Time" must be later than "From Time".', [i + 1]));
+ frappe.throw(
+ __('In row {0} of Appointment Booking Slots: "To Time" must be later than "From Time".', [
+ i + 1,
+ ])
+ );
}
});
}
diff --git a/erpnext/crm/doctype/campaign/campaign.js b/erpnext/crm/doctype/campaign/campaign.js
index cac45c682cbf..9e4a0a953621 100644
--- a/erpnext/crm/doctype/campaign/campaign.js
+++ b/erpnext/crm/doctype/campaign/campaign.js
@@ -1,17 +1,25 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Campaign', {
- refresh: function(frm) {
+frappe.ui.form.on("Campaign", {
+ refresh: function (frm) {
erpnext.toggle_naming_series();
if (frm.is_new()) {
- frm.toggle_display("naming_series", frappe.boot.sysdefaults.campaign_naming_by=="Naming Series");
+ frm.toggle_display(
+ "naming_series",
+ frappe.boot.sysdefaults.campaign_naming_by == "Naming Series"
+ );
} else {
- cur_frm.add_custom_button(__("View Leads"), function() {
- frappe.route_options = {"source": "Campaign", "campaign_name": frm.doc.name};
- frappe.set_route("List", "Lead");
- }, "fa fa-list", true);
+ cur_frm.add_custom_button(
+ __("View Leads"),
+ function () {
+ frappe.route_options = { source: "Campaign", campaign_name: frm.doc.name };
+ frappe.set_route("List", "Lead");
+ },
+ "fa fa-list",
+ true
+ );
}
- }
+ },
});
diff --git a/erpnext/crm/doctype/competitor/competitor.js b/erpnext/crm/doctype/competitor/competitor.js
index a5b617dc74ce..abd59346b8aa 100644
--- a/erpnext/crm/doctype/competitor/competitor.js
+++ b/erpnext/crm/doctype/competitor/competitor.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Competitor', {
+frappe.ui.form.on("Competitor", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/crm/doctype/contract/contract.js b/erpnext/crm/doctype/contract/contract.js
index 7848de7a7279..8d44c22db28f 100644
--- a/erpnext/crm/doctype/contract/contract.js
+++ b/erpnext/crm/doctype/contract/contract.js
@@ -5,12 +5,12 @@ frappe.ui.form.on("Contract", {
contract_template: function (frm) {
if (frm.doc.contract_template) {
frappe.call({
- method: 'erpnext.crm.doctype.contract_template.contract_template.get_contract_template',
+ method: "erpnext.crm.doctype.contract_template.contract_template.get_contract_template",
args: {
template_name: frm.doc.contract_template,
- doc: frm.doc
+ doc: frm.doc,
},
- callback: function(r) {
+ callback: function (r) {
if (r && r.message) {
let contract_template = r.message.contract_template;
frm.set_value("contract_terms", r.message.contract_terms);
@@ -18,15 +18,15 @@ frappe.ui.form.on("Contract", {
if (frm.doc.requires_fulfilment) {
// Populate the fulfilment terms table from a contract template, if any
- r.message.contract_template.fulfilment_terms.forEach(element => {
+ r.message.contract_template.fulfilment_terms.forEach((element) => {
let d = frm.add_child("fulfilment_terms");
d.requirement = element.requirement;
});
frm.refresh_field("fulfilment_terms");
}
}
- }
+ },
});
}
- }
+ },
});
diff --git a/erpnext/crm/doctype/contract/contract_list.js b/erpnext/crm/doctype/contract/contract_list.js
index 7d5609651a15..e1f8c22f70ea 100644
--- a/erpnext/crm/doctype/contract/contract_list.js
+++ b/erpnext/crm/doctype/contract/contract_list.js
@@ -1,4 +1,4 @@
-frappe.listview_settings['Contract'] = {
+frappe.listview_settings["Contract"] = {
add_fields: ["status"],
get_indicator: function (doc) {
if (doc.status == "Unsigned") {
diff --git a/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.js b/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.js
index f0525b13e22a..bdc3fcc4696c 100644
--- a/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.js
+++ b/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Contract Fulfilment Checklist', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Contract Fulfilment Checklist", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/crm/doctype/contract_template/contract_template.js b/erpnext/crm/doctype/contract_template/contract_template.js
index 4f7c9a8dc976..5044bbe996c1 100644
--- a/erpnext/crm/doctype/contract_template/contract_template.js
+++ b/erpnext/crm/doctype/contract_template/contract_template.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Contract Template', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Contract Template", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/crm/doctype/crm_settings/crm_settings.js b/erpnext/crm/doctype/crm_settings/crm_settings.js
index c6569d8122ee..0fb695a3da49 100644
--- a/erpnext/crm/doctype/crm_settings/crm_settings.js
+++ b/erpnext/crm/doctype/crm_settings/crm_settings.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('CRM Settings', {
+frappe.ui.form.on("CRM Settings", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/crm/doctype/email_campaign/email_campaign.js b/erpnext/crm/doctype/email_campaign/email_campaign.js
index b0e935360945..7b090a06ef5b 100644
--- a/erpnext/crm/doctype/email_campaign/email_campaign.js
+++ b/erpnext/crm/doctype/email_campaign/email_campaign.js
@@ -1,8 +1,8 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Email Campaign', {
- email_campaign_for: function(frm) {
- frm.set_value('recipient', '');
- }
+frappe.ui.form.on("Email Campaign", {
+ email_campaign_for: function (frm) {
+ frm.set_value("recipient", "");
+ },
});
diff --git a/erpnext/crm/doctype/email_campaign/email_campaign_list.js b/erpnext/crm/doctype/email_campaign/email_campaign_list.js
index adc399da0f0c..3020921e2e4c 100644
--- a/erpnext/crm/doctype/email_campaign/email_campaign_list.js
+++ b/erpnext/crm/doctype/email_campaign/email_campaign_list.js
@@ -1,11 +1,11 @@
-frappe.listview_settings['Email Campaign'] = {
- get_indicator: function(doc) {
+frappe.listview_settings["Email Campaign"] = {
+ get_indicator: function (doc) {
var colors = {
- "Unsubscribed": "red",
- "Scheduled": "blue",
+ Unsubscribed: "red",
+ Scheduled: "blue",
"In Progress": "orange",
- "Completed": "green"
+ Completed: "green",
};
return [__(doc.status), colors[doc.status], "status,=," + doc.status];
- }
+ },
};
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index b1799cee6c0e..0b6cdf25aac1 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -5,41 +5,45 @@ frappe.provide("erpnext");
cur_frm.email_field = "email_id";
erpnext.LeadController = class LeadController extends frappe.ui.form.Controller {
- setup () {
+ setup() {
this.frm.make_methods = {
- 'Customer': this.make_customer,
- 'Quotation': this.make_quotation,
- 'Opportunity': this.make_opportunity
+ Customer: this.make_customer,
+ Quotation: this.make_quotation,
+ Opportunity: this.make_opportunity,
};
// For avoiding integration issues.
- this.frm.set_df_property('first_name', 'reqd', true);
+ this.frm.set_df_property("first_name", "reqd", true);
}
- onload () {
+ onload() {
this.frm.set_query("customer", function (doc, cdt, cdn) {
- return { query: "erpnext.controllers.queries.customer_query" }
+ return { query: "erpnext.controllers.queries.customer_query" };
});
this.frm.set_query("lead_owner", function (doc, cdt, cdn) {
- return { query: "frappe.core.doctype.user.user.user_query" }
+ return { query: "frappe.core.doctype.user.user.user_query" };
});
}
- refresh () {
+ refresh() {
var me = this;
let doc = this.frm.doc;
erpnext.toggle_naming_series();
if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) {
this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create"));
- this.frm.add_custom_button(__("Opportunity"), function() {
- me.frm.trigger("make_opportunity");
- }, __("Create"));
+ this.frm.add_custom_button(
+ __("Opportunity"),
+ function () {
+ me.frm.trigger("make_opportunity");
+ },
+ __("Create")
+ );
this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Create"));
if (!doc.__onload.linked_prospects.length) {
this.frm.add_custom_button(__("Prospect"), this.make_prospect, __("Create"));
- this.frm.add_custom_button(__('Add to Prospect'), this.add_lead_to_prospect, __('Action'));
+ this.frm.add_custom_button(__("Add to Prospect"), this.add_lead_to_prospect, __("Action"));
}
}
@@ -53,51 +57,55 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
this.show_activities();
}
- add_lead_to_prospect () {
+ add_lead_to_prospect() {
let me = this;
- frappe.prompt([
- {
- fieldname: 'prospect',
- label: __('Prospect'),
- fieldtype: 'Link',
- options: 'Prospect',
- reqd: 1
- }
- ],
- function(data) {
- frappe.call({
- method: 'erpnext.crm.doctype.lead.lead.add_lead_to_prospect',
- args: {
- 'lead': me.frm.doc.name,
- 'prospect': data.prospect
- },
- callback: function(r) {
- if (!r.exc) {
- me.frm.reload_doc();
- }
+ frappe.prompt(
+ [
+ {
+ fieldname: "prospect",
+ label: __("Prospect"),
+ fieldtype: "Link",
+ options: "Prospect",
+ reqd: 1,
},
- freeze: true,
- freeze_message: __('Adding Lead to Prospect...')
- });
- }, __('Add Lead to Prospect'), __('Add'));
+ ],
+ function (data) {
+ frappe.call({
+ method: "erpnext.crm.doctype.lead.lead.add_lead_to_prospect",
+ args: {
+ lead: me.frm.doc.name,
+ prospect: data.prospect,
+ },
+ callback: function (r) {
+ if (!r.exc) {
+ me.frm.reload_doc();
+ }
+ },
+ freeze: true,
+ freeze_message: __("Adding Lead to Prospect..."),
+ });
+ },
+ __("Add Lead to Prospect"),
+ __("Add")
+ );
}
- make_customer () {
+ make_customer() {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.lead.lead.make_customer",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
- make_quotation () {
+ make_quotation() {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.lead.lead.make_quotation",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
- make_prospect () {
- frappe.model.with_doctype("Prospect", function() {
+ make_prospect() {
+ frappe.model.with_doctype("Prospect", function () {
let prospect = frappe.model.get_new_doc("Prospect");
prospect.company_name = cur_frm.doc.company_name;
prospect.no_of_employees = cur_frm.doc.no_of_employees;
@@ -109,14 +117,14 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
prospect.prospect_owner = cur_frm.doc.lead_owner;
prospect.notes = cur_frm.doc.notes;
- let leads_row = frappe.model.add_child(prospect, 'leads');
+ let leads_row = frappe.model.add_child(prospect, "leads");
leads_row.lead = cur_frm.doc.name;
frappe.set_route("Form", "Prospect", prospect.name);
});
}
- company_name () {
+ company_name() {
if (!this.frm.doc.lead_name) {
this.frm.set_value("lead_name", this.frm.doc.company_name);
}
@@ -145,86 +153,91 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
}
};
-
extend_cscript(cur_frm.cscript, new erpnext.LeadController({ frm: cur_frm }));
frappe.ui.form.on("Lead", {
- make_opportunity: async function(frm) {
- let existing_prospect = (await frappe.db.get_value("Prospect Lead",
- {
- "lead": frm.doc.name
- },
- "name", null, "Prospect"
- )).message.name;
+ make_opportunity: async function (frm) {
+ let existing_prospect = (
+ await frappe.db.get_value(
+ "Prospect Lead",
+ {
+ lead: frm.doc.name,
+ },
+ "name",
+ null,
+ "Prospect"
+ )
+ ).message.name;
if (!existing_prospect) {
var fields = [
{
- "label": "Create Prospect",
- "fieldname": "create_prospect",
- "fieldtype": "Check",
- "default": 1
+ label: "Create Prospect",
+ fieldname: "create_prospect",
+ fieldtype: "Check",
+ default: 1,
},
{
- "label": "Prospect Name",
- "fieldname": "prospect_name",
- "fieldtype": "Data",
- "default": frm.doc.company_name,
- "depends_on": "create_prospect"
- }
+ label: "Prospect Name",
+ fieldname: "prospect_name",
+ fieldtype: "Data",
+ default: frm.doc.company_name,
+ depends_on: "create_prospect",
+ },
];
}
- let existing_contact = (await frappe.db.get_value("Contact",
- {
- "first_name": frm.doc.first_name || frm.doc.lead_name,
- "last_name": frm.doc.last_name
- },
- "name"
- )).message.name;
+ let existing_contact = (
+ await frappe.db.get_value(
+ "Contact",
+ {
+ first_name: frm.doc.first_name || frm.doc.lead_name,
+ last_name: frm.doc.last_name,
+ },
+ "name"
+ )
+ ).message.name;
if (!existing_contact) {
- fields.push(
- {
- "label": "Create Contact",
- "fieldname": "create_contact",
- "fieldtype": "Check",
- "default": "1"
- }
- );
+ fields.push({
+ label: "Create Contact",
+ fieldname: "create_contact",
+ fieldtype: "Check",
+ default: "1",
+ });
}
if (fields) {
var d = new frappe.ui.Dialog({
- title: __('Create Opportunity'),
+ title: __("Create Opportunity"),
fields: fields,
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
frappe.call({
- method: 'create_prospect_and_contact',
+ method: "create_prospect_and_contact",
doc: frm.doc,
args: {
data: data,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.lead.lead.make_opportunity",
- frm: frm
+ frm: frm,
});
}
d.hide();
- }
+ },
});
},
- primary_action_label: __('Create')
+ primary_action_label: __("Create"),
});
d.show();
} else {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.lead.lead.make_opportunity",
- frm: frm
+ frm: frm,
});
}
- }
-});
\ No newline at end of file
+ },
+});
diff --git a/erpnext/crm/doctype/lead/lead_list.js b/erpnext/crm/doctype/lead/lead_list.js
index dbeaf608ffc4..97415251a93e 100644
--- a/erpnext/crm/doctype/lead/lead_list.js
+++ b/erpnext/crm/doctype/lead/lead_list.js
@@ -1,28 +1,42 @@
-frappe.listview_settings['Lead'] = {
- onload: function(listview) {
+frappe.listview_settings["Lead"] = {
+ onload: function (listview) {
if (frappe.boot.user.can_create.includes("Prospect")) {
- listview.page.add_action_item(__("Create Prospect"), function() {
- frappe.model.with_doctype("Prospect", function() {
+ listview.page.add_action_item(__("Create Prospect"), function () {
+ frappe.model.with_doctype("Prospect", function () {
let prospect = frappe.model.get_new_doc("Prospect");
let leads = listview.get_checked_items();
- frappe.db.get_value("Lead", leads[0].name, ["company_name", "no_of_employees", "industry", "market_segment", "territory", "fax", "website", "lead_owner"], (r) => {
- prospect.company_name = r.company_name;
- prospect.no_of_employees = r.no_of_employees;
- prospect.industry = r.industry;
- prospect.market_segment = r.market_segment;
- prospect.territory = r.territory;
- prospect.fax = r.fax;
- prospect.website = r.website;
- prospect.prospect_owner = r.lead_owner;
+ frappe.db.get_value(
+ "Lead",
+ leads[0].name,
+ [
+ "company_name",
+ "no_of_employees",
+ "industry",
+ "market_segment",
+ "territory",
+ "fax",
+ "website",
+ "lead_owner",
+ ],
+ (r) => {
+ prospect.company_name = r.company_name;
+ prospect.no_of_employees = r.no_of_employees;
+ prospect.industry = r.industry;
+ prospect.market_segment = r.market_segment;
+ prospect.territory = r.territory;
+ prospect.fax = r.fax;
+ prospect.website = r.website;
+ prospect.prospect_owner = r.lead_owner;
- leads.forEach(function(lead) {
- let lead_prospect_row = frappe.model.add_child(prospect, 'leads');
- lead_prospect_row.lead = lead.name;
- });
- frappe.set_route("Form", "Prospect", prospect.name);
- });
+ leads.forEach(function (lead) {
+ let lead_prospect_row = frappe.model.add_child(prospect, "leads");
+ lead_prospect_row.lead = lead.name;
+ });
+ frappe.set_route("Form", "Prospect", prospect.name);
+ }
+ );
});
});
}
- }
+ },
};
diff --git a/erpnext/crm/doctype/lead_source/lead_source.js b/erpnext/crm/doctype/lead_source/lead_source.js
index 3cbe64920905..5efc750601a1 100644
--- a/erpnext/crm/doctype/lead_source/lead_source.js
+++ b/erpnext/crm/doctype/lead_source/lead_source.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Lead Source', {
+frappe.ui.form.on("Lead Source", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.js b/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.js
index 08fbdad4a5a1..c3081f8a4d03 100644
--- a/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.js
+++ b/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Lost Reason Detail', {
- refresh: function() {
-
- }
+frappe.ui.form.on("Lost Reason Detail", {
+ refresh: function () {},
});
diff --git a/erpnext/crm/doctype/market_segment/market_segment.js b/erpnext/crm/doctype/market_segment/market_segment.js
index 94ffdee75d9c..b089c52b5c9c 100644
--- a/erpnext/crm/doctype/market_segment/market_segment.js
+++ b/erpnext/crm/doctype/market_segment/market_segment.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Market Segment', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Market Segment", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 0b485bb896c2..1c8a80a0ed69 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -4,38 +4,37 @@ frappe.provide("erpnext.crm");
erpnext.pre_sales.set_as_lost("Opportunity");
erpnext.sales_common.setup_selling_controller();
-
frappe.ui.form.on("Opportunity", {
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Quotation': 'Quotation',
- 'Supplier Quotation': 'Supplier Quotation'
+ Quotation: "Quotation",
+ "Supplier Quotation": "Supplier Quotation",
};
- frm.set_query("opportunity_from", function() {
- return{
- "filters": {
- "name": ["in", ["Customer", "Lead", "Prospect"]],
- }
- }
+ frm.set_query("opportunity_from", function () {
+ return {
+ filters: {
+ name: ["in", ["Customer", "Lead", "Prospect"]],
+ },
+ };
});
frm.email_field = "contact_email";
},
- validate: function(frm) {
+ validate: function (frm) {
if (frm.doc.status == "Lost" && !frm.doc.lost_reasons.length) {
- frm.trigger('set_as_lost_dialog');
+ frm.trigger("set_as_lost_dialog");
frappe.throw(__("Lost Reasons are required in case opportunity is Lost."));
}
},
- onload_post_render: function(frm) {
+ onload_post_render: function (frm) {
frm.get_field("items").grid.set_multiple_add("item_code", "qty");
},
- party_name: function(frm) {
- frm.trigger('set_contact_link');
+ party_name: function (frm) {
+ frm.trigger("set_contact_link");
if (frm.doc.opportunity_from == "Customer") {
erpnext.utils.get_party_details(frm);
@@ -43,75 +42,86 @@ frappe.ui.form.on("Opportunity", {
erpnext.utils.map_current_doc({
method: "erpnext.crm.doctype.lead.lead.make_opportunity",
source_name: frm.doc.party_name,
- frm: frm
+ frm: frm,
});
}
},
- status:function(frm){
- if (frm.doc.status == "Lost"){
- frm.trigger('set_as_lost_dialog');
+ status: function (frm) {
+ if (frm.doc.status == "Lost") {
+ frm.trigger("set_as_lost_dialog");
}
-
},
- customer_address: function(frm, cdt, cdn) {
- erpnext.utils.get_address_display(frm, 'customer_address', 'address_display', false);
+ customer_address: function (frm, cdt, cdn) {
+ erpnext.utils.get_address_display(frm, "customer_address", "address_display", false);
},
contact_person: erpnext.utils.get_contact_details,
- opportunity_from: function(frm) {
- frm.trigger('setup_opportunity_from');
+ opportunity_from: function (frm) {
+ frm.trigger("setup_opportunity_from");
frm.set_value("party_name", "");
},
- setup_opportunity_from: function(frm) {
- frm.trigger('setup_queries');
+ setup_opportunity_from: function (frm) {
+ frm.trigger("setup_queries");
frm.trigger("set_dynamic_field_label");
},
- refresh: function(frm) {
+ refresh: function (frm) {
var doc = frm.doc;
- frm.trigger('setup_opportunity_from');
+ frm.trigger("setup_opportunity_from");
erpnext.toggle_naming_series();
- if(!frm.is_new() && doc.status!=="Lost") {
- if(doc.items){
- frm.add_custom_button(__('Supplier Quotation'),
- function() {
- frm.trigger("make_supplier_quotation")
- }, __('Create'));
-
- frm.add_custom_button(__('Request For Quotation'),
- function() {
- frm.trigger("make_request_for_quotation")
- }, __('Create'));
+ if (!frm.is_new() && doc.status !== "Lost") {
+ if (doc.items) {
+ frm.add_custom_button(
+ __("Supplier Quotation"),
+ function () {
+ frm.trigger("make_supplier_quotation");
+ },
+ __("Create")
+ );
+
+ frm.add_custom_button(
+ __("Request For Quotation"),
+ function () {
+ frm.trigger("make_request_for_quotation");
+ },
+ __("Create")
+ );
}
if (frm.doc.opportunity_from != "Customer") {
- frm.add_custom_button(__('Customer'),
- function() {
- frm.trigger("make_customer")
- }, __('Create'));
+ frm.add_custom_button(
+ __("Customer"),
+ function () {
+ frm.trigger("make_customer");
+ },
+ __("Create")
+ );
}
- frm.add_custom_button(__('Quotation'),
- function() {
- frm.trigger("create_quotation")
- }, __('Create'));
+ frm.add_custom_button(
+ __("Quotation"),
+ function () {
+ frm.trigger("create_quotation");
+ },
+ __("Create")
+ );
}
- if(!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus==0) {
- if(frm.doc.status==="Open") {
- frm.add_custom_button(__("Close"), function() {
+ if (!frm.doc.__islocal && frm.perm[0].write && frm.doc.docstatus == 0) {
+ if (frm.doc.status === "Open") {
+ frm.add_custom_button(__("Close"), function () {
frm.set_value("status", "Closed");
frm.save();
});
} else {
- frm.add_custom_button(__("Reopen"), function() {
- frm.set_value("lost_reasons",[])
+ frm.add_custom_button(__("Reopen"), function () {
+ frm.set_value("lost_reasons", []);
frm.set_value("status", "Open");
frm.save();
});
@@ -126,141 +136,149 @@ frappe.ui.form.on("Opportunity", {
}
if (frm.doc.opportunity_from && frm.doc.party_name) {
- frm.trigger('set_contact_link');
+ frm.trigger("set_contact_link");
}
},
- set_contact_link: function(frm) {
- if(frm.doc.opportunity_from == "Customer" && frm.doc.party_name) {
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Customer'}
- } else if(frm.doc.opportunity_from == "Lead" && frm.doc.party_name) {
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Lead'}
+ set_contact_link: function (frm) {
+ if (frm.doc.opportunity_from == "Customer" && frm.doc.party_name) {
+ frappe.dynamic_link = { doc: frm.doc, fieldname: "party_name", doctype: "Customer" };
+ } else if (frm.doc.opportunity_from == "Lead" && frm.doc.party_name) {
+ frappe.dynamic_link = { doc: frm.doc, fieldname: "party_name", doctype: "Lead" };
} else if (frm.doc.opportunity_from == "Prospect" && frm.doc.party_name) {
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Prospect'}
+ frappe.dynamic_link = { doc: frm.doc, fieldname: "party_name", doctype: "Prospect" };
}
},
- currency: function(frm) {
+ currency: function (frm) {
let company_currency = erpnext.get_currency(frm.doc.company);
if (company_currency != frm.doc.company) {
frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
from_currency: frm.doc.currency,
- to_currency: company_currency
+ to_currency: company_currency,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.set_value('conversion_rate', flt(r.message));
- frm.set_df_property('conversion_rate', 'description', '1 ' + frm.doc.currency
- + ' = [?] ' + company_currency);
+ frm.set_value("conversion_rate", flt(r.message));
+ frm.set_df_property(
+ "conversion_rate",
+ "description",
+ "1 " + frm.doc.currency + " = [?] " + company_currency
+ );
}
- }
+ },
});
} else {
- frm.set_value('conversion_rate', 1.0);
- frm.set_df_property('conversion_rate', 'hidden', 1);
- frm.set_df_property('conversion_rate', 'description', '');
+ frm.set_value("conversion_rate", 1.0);
+ frm.set_df_property("conversion_rate", "hidden", 1);
+ frm.set_df_property("conversion_rate", "description", "");
}
- frm.trigger('opportunity_amount');
- frm.trigger('set_dynamic_field_label');
+ frm.trigger("opportunity_amount");
+ frm.trigger("set_dynamic_field_label");
},
- opportunity_amount: function(frm) {
- frm.set_value('base_opportunity_amount', flt(frm.doc.opportunity_amount) * flt(frm.doc.conversion_rate));
+ opportunity_amount: function (frm) {
+ frm.set_value(
+ "base_opportunity_amount",
+ flt(frm.doc.opportunity_amount) * flt(frm.doc.conversion_rate)
+ );
},
- set_dynamic_field_label: function(frm){
+ set_dynamic_field_label: function (frm) {
if (frm.doc.opportunity_from) {
frm.set_df_property("party_name", "label", frm.doc.opportunity_from);
}
- frm.trigger('change_grid_labels');
- frm.trigger('change_form_labels');
+ frm.trigger("change_grid_labels");
+ frm.trigger("change_form_labels");
},
- make_supplier_quotation: function(frm) {
+ make_supplier_quotation: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_supplier_quotation",
- frm: frm
- })
+ frm: frm,
+ });
},
- make_request_for_quotation: function(frm) {
+ make_request_for_quotation: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_request_for_quotation",
- frm: frm
- })
+ frm: frm,
+ });
},
- change_form_labels: function(frm) {
+ change_form_labels: function (frm) {
let company_currency = erpnext.get_currency(frm.doc.company);
frm.set_currency_labels(["base_opportunity_amount", "base_total"], company_currency);
frm.set_currency_labels(["opportunity_amount", "total"], frm.doc.currency);
// toggle fields
- frm.toggle_display(["conversion_rate", "base_opportunity_amount", "base_total"],
- frm.doc.currency != company_currency);
+ frm.toggle_display(
+ ["conversion_rate", "base_opportunity_amount", "base_total"],
+ frm.doc.currency != company_currency
+ );
},
- change_grid_labels: function(frm) {
+ change_grid_labels: function (frm) {
let company_currency = erpnext.get_currency(frm.doc.company);
frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "items");
frm.set_currency_labels(["rate", "amount"], frm.doc.currency, "items");
let item_grid = frm.fields_dict.items.grid;
- $.each(["base_rate", "base_amount"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
+ $.each(["base_rate", "base_amount"], function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname))
item_grid.set_column_disp(fname, frm.doc.currency != company_currency);
});
frm.refresh_fields();
},
- calculate_total: function(frm) {
- let total = 0, base_total = 0;
- frm.doc.items.forEach(item => {
+ calculate_total: function (frm) {
+ let total = 0,
+ base_total = 0;
+ frm.doc.items.forEach((item) => {
total += item.amount;
base_total += item.base_amount;
- })
+ });
frm.set_value({
- 'total': flt(total),
- 'base_total': flt(base_total)
+ total: flt(total),
+ base_total: flt(base_total),
});
},
});
frappe.ui.form.on("Opportunity Item", {
- calculate: function(frm, cdt, cdn) {
+ calculate: function (frm, cdt, cdn) {
let row = frappe.get_doc(cdt, cdn);
frappe.model.set_value(cdt, cdn, "amount", flt(row.qty) * flt(row.rate));
frappe.model.set_value(cdt, cdn, "base_rate", flt(frm.doc.conversion_rate) * flt(row.rate));
frappe.model.set_value(cdt, cdn, "base_amount", flt(frm.doc.conversion_rate) * flt(row.amount));
frm.trigger("calculate_total");
},
- qty: function(frm, cdt, cdn) {
+ qty: function (frm, cdt, cdn) {
frm.trigger("calculate", cdt, cdn);
},
- rate: function(frm, cdt, cdn) {
+ rate: function (frm, cdt, cdn) {
frm.trigger("calculate", cdt, cdn);
- }
-})
+ },
+});
// TODO commonify this code
erpnext.crm.Opportunity = class Opportunity extends frappe.ui.form.Controller {
onload() {
-
- if(!this.frm.doc.status) {
- this.frm.set_value('status', 'Open');
+ if (!this.frm.doc.status) {
+ this.frm.set_value("status", "Open");
}
- if(!this.frm.doc.company && frappe.defaults.get_user_default("Company")) {
- this.frm.set_value('company', frappe.defaults.get_user_default("Company"));
+ if (!this.frm.doc.company && frappe.defaults.get_user_default("Company")) {
+ this.frm.set_value("company", frappe.defaults.get_user_default("Company"));
}
- if(!this.frm.doc.currency) {
- this.frm.set_value('currency', frappe.defaults.get_user_default("Currency"));
+ if (!this.frm.doc.currency) {
+ this.frm.set_value("currency", frappe.defaults.get_user_default("Currency"));
}
this.setup_queries();
- this.frm.trigger('currency');
+ this.frm.trigger("currency");
}
refresh() {
@@ -271,28 +289,27 @@ erpnext.crm.Opportunity = class Opportunity extends frappe.ui.form.Controller {
setup_queries() {
var me = this;
- me.frm.set_query('customer_address', erpnext.queries.address_query);
+ me.frm.set_query("customer_address", erpnext.queries.address_query);
- this.frm.set_query("item_code", "items", function() {
+ this.frm.set_query("item_code", "items", function () {
return {
query: "erpnext.controllers.queries.item_query",
- filters: {'is_sales_item': 1}
+ filters: { is_sales_item: 1 },
};
});
- me.frm.set_query('contact_person', erpnext.queries['contact_query'])
+ me.frm.set_query("contact_person", erpnext.queries["contact_query"]);
if (me.frm.doc.opportunity_from == "Lead") {
- me.frm.set_query('party_name', erpnext.queries['lead']);
- }
- else if (me.frm.doc.opportunity_from == "Customer") {
- me.frm.set_query('party_name', erpnext.queries['customer']);
+ me.frm.set_query("party_name", erpnext.queries["lead"]);
+ } else if (me.frm.doc.opportunity_from == "Customer") {
+ me.frm.set_query("party_name", erpnext.queries["customer"]);
} else if (me.frm.doc.opportunity_from == "Prospect") {
- me.frm.set_query('party_name', function() {
+ me.frm.set_query("party_name", function () {
return {
filters: {
- "company": me.frm.doc.company
- }
+ company: me.frm.doc.company,
+ },
};
});
}
@@ -301,15 +318,15 @@ erpnext.crm.Opportunity = class Opportunity extends frappe.ui.form.Controller {
create_quotation() {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
make_customer() {
frappe.model.open_mapped_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_customer",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
}
show_notes() {
@@ -331,22 +348,22 @@ erpnext.crm.Opportunity = class Opportunity extends frappe.ui.form.Controller {
}
};
-extend_cscript(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.crm.Opportunity({ frm: cur_frm }));
-cur_frm.cscript.item_code = function(doc, cdt, cdn) {
+cur_frm.cscript.item_code = function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.item_code) {
return frappe.call({
method: "erpnext.crm.doctype.opportunity.opportunity.get_item_details",
- args: {"item_code":d.item_code},
- callback: function(r, rt) {
- if(r.message) {
- $.each(r.message, function(k, v) {
+ args: { item_code: d.item_code },
+ callback: function (r, rt) {
+ if (r.message) {
+ $.each(r.message, function (k, v) {
frappe.model.set_value(cdt, cdn, k, v);
});
- refresh_field('image_view', d.name, 'items');
+ refresh_field("image_view", d.name, "items");
}
- }
- })
+ },
+ });
}
-}
+};
diff --git a/erpnext/crm/doctype/opportunity/opportunity_list.js b/erpnext/crm/doctype/opportunity/opportunity_list.js
index 24b05145fd2a..5028ae178c75 100644
--- a/erpnext/crm/doctype/opportunity/opportunity_list.js
+++ b/erpnext/crm/doctype/opportunity/opportunity_list.js
@@ -1,31 +1,31 @@
-frappe.listview_settings['Opportunity'] = {
+frappe.listview_settings["Opportunity"] = {
add_fields: ["customer_name", "opportunity_type", "opportunity_from", "status"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
- if(doc.status=="Quotation") {
+ if (doc.status == "Quotation") {
indicator[1] = "green";
}
return indicator;
},
- onload: function(listview) {
+ onload: function (listview) {
var method = "erpnext.crm.doctype.opportunity.opportunity.set_multiple_status";
- listview.page.add_menu_item(__("Set as Open"), function() {
- listview.call_for_selected_items(method, {"status": "Open"});
+ listview.page.add_menu_item(__("Set as Open"), function () {
+ listview.call_for_selected_items(method, { status: "Open" });
});
- listview.page.add_menu_item(__("Set as Closed"), function() {
- listview.call_for_selected_items(method, {"status": "Closed"});
+ listview.page.add_menu_item(__("Set as Closed"), function () {
+ listview.call_for_selected_items(method, { status: "Closed" });
});
- if(listview.page.fields_dict.opportunity_from) {
- listview.page.fields_dict.opportunity_from.get_query = function() {
+ if (listview.page.fields_dict.opportunity_from) {
+ listview.page.fields_dict.opportunity_from.get_query = function () {
return {
- "filters": {
- "name": ["in", ["Customer", "Lead"]],
- }
+ filters: {
+ name: ["in", ["Customer", "Lead"]],
+ },
};
};
}
- }
+ },
};
diff --git a/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.js b/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.js
index 877dd592b22f..3f08355442f7 100644
--- a/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.js
+++ b/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Opportunity Lost Reason', {
- refresh: function() {
-
- }
+frappe.ui.form.on("Opportunity Lost Reason", {
+ refresh: function () {},
});
diff --git a/erpnext/crm/doctype/opportunity_type/opportunity_type.js b/erpnext/crm/doctype/opportunity_type/opportunity_type.js
index 174625e73c69..18213ad0cdf3 100644
--- a/erpnext/crm/doctype/opportunity_type/opportunity_type.js
+++ b/erpnext/crm/doctype/opportunity_type/opportunity_type.js
@@ -1,8 +1,6 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Opportunity Type', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Opportunity Type", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/crm/doctype/prospect/prospect.js b/erpnext/crm/doctype/prospect/prospect.js
index c1a7ff576c1a..1bf7f26be8eb 100644
--- a/erpnext/crm/doctype/prospect/prospect.js
+++ b/erpnext/crm/doctype/prospect/prospect.js
@@ -1,23 +1,31 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Prospect', {
- refresh (frm) {
+frappe.ui.form.on("Prospect", {
+ refresh(frm) {
if (!frm.is_new() && frappe.boot.user.can_create.includes("Customer")) {
- frm.add_custom_button(__("Customer"), function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.crm.doctype.prospect.prospect.make_customer",
- frm: frm
- });
- }, __("Create"));
+ frm.add_custom_button(
+ __("Customer"),
+ function () {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.crm.doctype.prospect.prospect.make_customer",
+ frm: frm,
+ });
+ },
+ __("Create")
+ );
}
if (!frm.is_new() && frappe.boot.user.can_create.includes("Opportunity")) {
- frm.add_custom_button(__("Opportunity"), function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.crm.doctype.prospect.prospect.make_opportunity",
- frm: frm
- });
- }, __("Create"));
+ frm.add_custom_button(
+ __("Opportunity"),
+ function () {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.crm.doctype.prospect.prospect.make_opportunity",
+ frm: frm,
+ });
+ },
+ __("Create")
+ );
}
if (!frm.is_new()) {
@@ -29,7 +37,7 @@ frappe.ui.form.on('Prospect', {
frm.trigger("show_activities");
},
- show_notes (frm) {
+ show_notes(frm) {
const crm_notes = new erpnext.utils.CRMNotes({
frm: frm,
notes_wrapper: $(frm.fields_dict.notes_html.wrapper),
@@ -37,7 +45,7 @@ frappe.ui.form.on('Prospect', {
crm_notes.refresh();
},
- show_activities (frm) {
+ show_activities(frm) {
const crm_activities = new erpnext.utils.CRMActivities({
frm: frm,
open_activities_wrapper: $(frm.fields_dict.open_activities_html.wrapper),
@@ -45,6 +53,5 @@ frappe.ui.form.on('Prospect', {
form_wrapper: $(frm.wrapper),
});
crm_activities.refresh();
- }
-
+ },
});
diff --git a/erpnext/crm/doctype/sales_stage/sales_stage.js b/erpnext/crm/doctype/sales_stage/sales_stage.js
index 0447f783ce63..c6811665a63b 100644
--- a/erpnext/crm/doctype/sales_stage/sales_stage.js
+++ b/erpnext/crm/doctype/sales_stage/sales_stage.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Sales Stage', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Sales Stage", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
index 0c4e7f2dabea..a1e51f0654da 100644
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
@@ -1,18 +1,18 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.query_reports["Campaign Efficiency"] = {
- "filters": [
+ filters: [
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- }
- ]
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ },
+ ],
};
diff --git a/erpnext/crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js b/erpnext/crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js
index 4bf82479a1f6..efaea49873c1 100644
--- a/erpnext/crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js
+++ b/erpnext/crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js
@@ -1,43 +1,44 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["First Response Time for Opportunity"] = {
- "filters": [
+ filters: [
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_days(frappe.datetime.nowdate(), -30),
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.nowdate()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.nowdate(),
},
],
get_chart_data: function (_columns, result) {
return {
data: {
- labels: result.map(d => d.creation_date),
- datasets: [{
- name: "First Response Time",
- values: result.map(d => d.first_response_time)
- }]
+ labels: result.map((d) => d.creation_date),
+ datasets: [
+ {
+ name: "First Response Time",
+ values: result.map((d) => d.first_response_time),
+ },
+ ],
},
type: "line",
tooltipOptions: {
- formatTooltipY: d => {
+ formatTooltipY: (d) => {
let duration_options = {
hide_days: 0,
- hide_seconds: 0
+ hide_seconds: 0,
};
return frappe.utils.get_formatted_duration(d, duration_options);
- }
- }
- }
- }
+ },
+ },
+ };
+ },
};
diff --git a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.js b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.js
index d7ff9ad53886..0019337bc6f8 100644
--- a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.js
+++ b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.js
@@ -1,22 +1,21 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Lead Conversion Time"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- 'reqd': 1,
- "default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_days(frappe.datetime.nowdate(), -30),
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- 'reqd': 1,
- "default":frappe.datetime.nowdate()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.nowdate(),
},
- ]
+ ],
};
diff --git a/erpnext/crm/report/lead_details/lead_details.js b/erpnext/crm/report/lead_details/lead_details.js
index 66611f6c6c17..feecc071b364 100644
--- a/erpnext/crm/report/lead_details/lead_details.js
+++ b/erpnext/crm/report/lead_details/lead_details.js
@@ -1,52 +1,51 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Lead Details"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -12),
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"status",
- "label": __("Status"),
- "fieldtype": "Select",
+ fieldname: "status",
+ label: __("Status"),
+ fieldtype: "Select",
options: [
- { "value": "Lead", "label": __("Lead") },
- { "value": "Open", "label": __("Open") },
- { "value": "Replied", "label": __("Replied") },
- { "value": "Opportunity", "label": __("Opportunity") },
- { "value": "Quotation", "label": __("Quotation") },
- { "value": "Lost Quotation", "label": __("Lost Quotation") },
- { "value": "Interested", "label": __("Interested") },
- { "value": "Converted", "label": __("Converted") },
- { "value": "Do Not Contact", "label": __("Do Not Contact") },
+ { value: "Lead", label: __("Lead") },
+ { value: "Open", label: __("Open") },
+ { value: "Replied", label: __("Replied") },
+ { value: "Opportunity", label: __("Opportunity") },
+ { value: "Quotation", label: __("Quotation") },
+ { value: "Lost Quotation", label: __("Lost Quotation") },
+ { value: "Interested", label: __("Interested") },
+ { value: "Converted", label: __("Converted") },
+ { value: "Do Not Contact", label: __("Do Not Contact") },
],
},
{
- "fieldname":"territory",
- "label": __("Territory"),
- "fieldtype": "Link",
- "options": "Territory",
- }
- ]
+ fieldname: "territory",
+ label: __("Territory"),
+ fieldtype: "Link",
+ options: "Territory",
+ },
+ ],
};
diff --git a/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js b/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
index 6fc52a1afc92..bd64641dcc23 100644
--- a/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
+++ b/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
@@ -1,17 +1,18 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
- frappe.query_reports["Lead Owner Efficiency"] = {
- "filters": [
- {
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- },
- {
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- }
- ]};
+frappe.query_reports["Lead Owner Efficiency"] = {
+ filters: [
+ {
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+ },
+ {
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+ },
+ ],
+};
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.js b/erpnext/crm/report/lost_opportunity/lost_opportunity.js
index 8d5923950a67..7932afe5e4b9 100644
--- a/erpnext/crm/report/lost_opportunity/lost_opportunity.js
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.js
@@ -1,61 +1,60 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Lost Opportunity"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -12),
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"lost_reason",
- "label": __("Lost Reason"),
- "fieldtype": "Link",
- "options": "Opportunity Lost Reason"
+ fieldname: "lost_reason",
+ label: __("Lost Reason"),
+ fieldtype: "Link",
+ options: "Opportunity Lost Reason",
},
{
- "fieldname":"territory",
- "label": __("Territory"),
- "fieldtype": "Link",
- "options": "Territory"
+ fieldname: "territory",
+ label: __("Territory"),
+ fieldtype: "Link",
+ options: "Territory",
},
{
- "fieldname":"opportunity_from",
- "label": __("Opportunity From"),
- "fieldtype": "Link",
- "options": "DocType",
- "get_query": function() {
+ fieldname: "opportunity_from",
+ label: __("Opportunity From"),
+ fieldtype: "Link",
+ options: "DocType",
+ get_query: function () {
return {
- "filters": {
- "name": ["in", ["Customer", "Lead"]],
- }
- }
- }
+ filters: {
+ name: ["in", ["Customer", "Lead"]],
+ },
+ };
+ },
},
{
- "fieldname":"party_name",
- "label": __("Party"),
- "fieldtype": "Dynamic Link",
- "options": "opportunity_from"
+ fieldname: "party_name",
+ label: __("Party"),
+ fieldtype: "Dynamic Link",
+ options: "opportunity_from",
},
- ]
+ ],
};
diff --git a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
index 0aa21436bc9f..36361e531dfe 100644
--- a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
+++ b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
@@ -1,28 +1,26 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Opportunity Summary by Sales Stage"] = {
- "filters": [
+ filters: [
{
fieldname: "based_on",
label: __("Based On"),
fieldtype: "Select",
options: "Opportunity Owner\nSource\nOpportunity Type",
- default: "Opportunity Owner"
+ default: "Opportunity Owner",
},
{
fieldname: "data_based_on",
label: __("Data Based On"),
fieldtype: "Select",
options: "Number\nAmount",
- default: "Number"
+ default: "Number",
},
{
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
-
},
{
fieldname: "to_date",
@@ -33,14 +31,14 @@ frappe.query_reports["Opportunity Summary by Sales Stage"] = {
fieldname: "status",
label: __("Status"),
fieldtype: "MultiSelectList",
- get_data: function() {
+ get_data: function () {
return [
- {value: "Open", description: "Status"},
- {value: "Converted", description: "Status"},
- {value: "Quotation", description: "Status"},
- {value: "Replied", description: "Status"}
- ]
- }
+ { value: "Open", description: "Status" },
+ { value: "Converted", description: "Status" },
+ { value: "Quotation", description: "Status" },
+ { value: "Replied", description: "Status" },
+ ];
+ },
},
{
fieldname: "opportunity_source",
@@ -59,7 +57,7 @@ frappe.query_reports["Opportunity Summary by Sales Stage"] = {
label: __("Company"),
fieldtype: "Link",
options: "Company",
- default: frappe.defaults.get_user_default("Company")
- }
- ]
+ default: frappe.defaults.get_user_default("Company"),
+ },
+ ],
};
diff --git a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js
index 6f37719f6399..d62594148238 100644
--- a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js
+++ b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js
@@ -2,24 +2,24 @@
// For license information, please see license.txt
frappe.query_reports["Prospects Engaged But Not Converted"] = {
- "filters": [
+ filters: [
{
- "fieldname": "lead",
- "label": __("Lead"),
- "fieldtype": "Link",
- "options": "Lead"
+ fieldname: "lead",
+ label: __("Lead"),
+ fieldtype: "Link",
+ options: "Lead",
},
{
- "fieldname": "no_of_interaction",
- "label": __("Number of Interaction"),
- "fieldtype": "Int",
- "default": 1
+ fieldname: "no_of_interaction",
+ label: __("Number of Interaction"),
+ fieldtype: "Int",
+ default: 1,
},
{
- "fieldname": "lead_age",
- "label": __("Minimum Lead Age (Days)"),
- "fieldtype": "Int",
- "default": 60
+ fieldname: "lead_age",
+ label: __("Minimum Lead Age (Days)"),
+ fieldtype: "Int",
+ default: 60,
},
- ]
-}
+ ],
+};
diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js
index 311112152298..df035c1a2014 100644
--- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js
+++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js
@@ -1,70 +1,69 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Sales Pipeline Analytics"] = {
- "filters": [
+ filters: [
{
fieldname: "pipeline_by",
label: __("Pipeline By"),
fieldtype: "Select",
options: "Owner\nSales Stage",
- default: "Owner"
+ default: "Owner",
},
{
fieldname: "from_date",
label: __("From Date"),
- fieldtype: "Date"
+ fieldtype: "Date",
},
{
fieldname: "to_date",
label: __("To Date"),
- fieldtype: "Date"
+ fieldtype: "Date",
},
{
fieldname: "range",
label: __("Range"),
fieldtype: "Select",
options: "Monthly\nQuarterly",
- default: "Monthly"
+ default: "Monthly",
},
{
fieldname: "assigned_to",
label: __("Assigned To"),
fieldtype: "Link",
- options: "User"
+ options: "User",
},
{
fieldname: "status",
label: __("Status"),
fieldtype: "Select",
- options: "Open\nQuotation\nConverted\nReplied"
+ options: "Open\nQuotation\nConverted\nReplied",
},
{
fieldname: "based_on",
label: __("Based On"),
fieldtype: "Select",
options: "Number\nAmount",
- default: "Number"
+ default: "Number",
},
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
- default: frappe.defaults.get_user_default("Company")
+ default: frappe.defaults.get_user_default("Company"),
},
{
fieldname: "opportunity_source",
label: __("Opportunity Source"),
fieldtype: "Link",
- options: "Lead Source"
+ options: "Lead Source",
},
{
fieldname: "opportunity_type",
label: __("Opportunity Type"),
fieldtype: "Link",
- options: "Opportunity Type"
+ options: "Opportunity Type",
},
- ]
+ ],
};
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
index 015e943b80a1..fc3bf804245f 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
@@ -3,20 +3,20 @@
frappe.provide("erpnext.integrations");
-frappe.ui.form.on('Plaid Settings', {
+frappe.ui.form.on("Plaid Settings", {
enabled: function (frm) {
- frm.toggle_reqd('plaid_client_id', frm.doc.enabled);
- frm.toggle_reqd('plaid_secret', frm.doc.enabled);
- frm.toggle_reqd('plaid_env', frm.doc.enabled);
+ frm.toggle_reqd("plaid_client_id", frm.doc.enabled);
+ frm.toggle_reqd("plaid_secret", frm.doc.enabled);
+ frm.toggle_reqd("plaid_env", frm.doc.enabled);
},
refresh: function (frm) {
if (frm.doc.enabled) {
- frm.add_custom_button(__('Link a new bank account'), () => {
+ frm.add_custom_button(__("Link a new bank account"), () => {
new erpnext.integrations.plaidLink(frm);
});
- frm.add_custom_button(__('Reset Plaid Link'), () => {
+ frm.add_custom_button(__("Reset Plaid Link"), () => {
new erpnext.integrations.plaidLink(frm);
});
@@ -29,20 +29,23 @@ frappe.ui.form.on('Plaid Settings', {
frappe.msgprint({
title: __("Sync Started"),
- message: __("The sync has started in the background, please check the {0} list for new records.", [bank_transaction_link]),
- alert: 1
+ message: __(
+ "The sync has started in the background, please check the {0} list for new records.",
+ [bank_transaction_link]
+ ),
+ alert: 1,
});
- }
+ },
});
}).addClass("btn-primary");
}
- }
+ },
});
erpnext.integrations.plaidLink = class plaidLink {
constructor(parent) {
this.frm = parent;
- this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
+ this.plaidUrl = "https://cdn.plaid.com/link/v2/stable/link-initialize.js";
this.init_config();
}
@@ -55,9 +58,9 @@ erpnext.integrations.plaidLink = class plaidLink {
}
async get_link_token() {
- const token = await this.frm.call("get_link_token").then(resp => resp.message);
+ const token = await this.frm.call("get_link_token").then((resp) => resp.message);
if (!token) {
- frappe.throw(__('Cannot retrieve link token. Check Error Log for more information'));
+ frappe.throw(__("Cannot retrieve link token. Check Error Log for more information"));
}
return token;
}
@@ -84,55 +87,74 @@ erpnext.integrations.plaidLink = class plaidLink {
resolve();
return;
}
- const el = document.createElement('script');
- el.type = 'text/javascript';
+ const el = document.createElement("script");
+ el.type = "text/javascript";
el.async = true;
el.src = src;
- el.addEventListener('load', resolve);
- el.addEventListener('error', reject);
- el.addEventListener('abort', reject);
+ el.addEventListener("load", resolve);
+ el.addEventListener("error", reject);
+ el.addEventListener("abort", reject);
document.head.appendChild(el);
});
}
onScriptLoaded(me) {
- me.linkHandler = Plaid.create({ // eslint-disable-line no-undef
+ me.linkHandler = Plaid.create({
+ // eslint-disable-line no-undef
clientName: me.client_name,
product: me.product,
env: me.plaid_env,
token: me.token,
- onSuccess: me.plaid_success
+ onSuccess: me.plaid_success,
});
}
onScriptError(error) {
- frappe.msgprint(__("There was an issue connecting to Plaid's authentication server. Check browser console for more information"));
+ frappe.msgprint(
+ __(
+ "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
+ )
+ );
console.log(error);
}
plaid_success(token, response) {
const me = this;
- frappe.prompt({
- fieldtype: "Link",
- options: "Company",
- label: __("Company"),
- fieldname: "company",
- reqd: 1
- }, (data) => {
- me.company = data.company;
- frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_institution', {
- token: token,
- response: response
- }).then((result) => {
- frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_bank_accounts', {
- response: response,
- bank: result,
- company: me.company
- });
- }).then(() => {
- frappe.show_alert({ message: __("Bank accounts added"), indicator: 'green' });
- });
- }, __("Select a company"), __("Continue"));
+ frappe.prompt(
+ {
+ fieldtype: "Link",
+ options: "Company",
+ label: __("Company"),
+ fieldname: "company",
+ reqd: 1,
+ },
+ (data) => {
+ me.company = data.company;
+ frappe
+ .xcall(
+ "erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_institution",
+ {
+ token: token,
+ response: response,
+ }
+ )
+ .then((result) => {
+ frappe.xcall(
+ "erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_bank_accounts",
+ {
+ response: response,
+ bank: result,
+ company: me.company,
+ }
+ );
+ })
+ .then(() => {
+ frappe.show_alert({ message: __("Bank accounts added"), indicator: "green" });
+ });
+ },
+ __("Select a company"),
+ __("Continue")
+ );
}
};
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js
index bfffcc515302..f9364edf5aac 100644
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js
+++ b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js
@@ -1,71 +1,77 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('QuickBooks Migrator', {
- connect: function(frm) {
+frappe.ui.form.on("QuickBooks Migrator", {
+ connect: function (frm) {
// OAuth requires user intervention to provide application access permissionsto requested scope
// Here we open a new window and redirect user to the authorization url.
// After user grants us permission to access. We will set authorization details on this doc which will force refresh.
- window.open(frm.doc.authorization_url)
+ window.open(frm.doc.authorization_url);
},
- fetch_data: function(frm) {
- frm.call("migrate")
+ fetch_data: function (frm) {
+ frm.call("migrate");
},
- onload: function(frm) {
- frm.trigger("set_indicator")
- var domain = frappe.urllib.get_base_url()
- var redirect_url = `${domain}/api/method/erpnext.erpnext_integrations.doctype.quickbooks_migrator.quickbooks_migrator.callback`
+ onload: function (frm) {
+ frm.trigger("set_indicator");
+ var domain = frappe.urllib.get_base_url();
+ var redirect_url = `${domain}/api/method/erpnext.erpnext_integrations.doctype.quickbooks_migrator.quickbooks_migrator.callback`;
if (frm.doc.redirect_url != redirect_url) {
- frm.set_value("redirect_url", redirect_url)
+ frm.set_value("redirect_url", redirect_url);
}
// Instead of changing percentage width and message of single progress bar
// Show a different porgress bar for every action after some time remove the finished progress bar
- // Former approach causes the progress bar to dance back and forth.
- frm.trigger("set_indicator")
- frappe.realtime.on("quickbooks_progress_update", function (data) {
- frm.dashboard.show_progress(data.message, (data.count / data.total) * 100, data.message)
+ // Former approach causes the progress bar to dance back and forth.
+ frm.trigger("set_indicator");
+ frappe.realtime.on("quickbooks_progress_update", function (data) {
+ frm.dashboard.show_progress(data.message, (data.count / data.total) * 100, data.message);
if (data.count == data.total) {
- window.setTimeout( function(message) {frm.dashboard.hide_progress(message)}, 1500, data.messsage)
+ window.setTimeout(
+ function (message) {
+ frm.dashboard.hide_progress(message);
+ },
+ 1500,
+ data.messsage
+ );
}
- })
+ });
},
- refresh: function(frm) {
- frm.trigger("set_indicator")
+ refresh: function (frm) {
+ frm.trigger("set_indicator");
if (!frm.doc.access_token) {
// Unset access_token signifies that we don't have enough information to connect to quickbooks api and fetch data
if (frm.doc.authorization_url) {
frm.add_custom_button(__("Connect to Quickbooks"), function () {
- frm.trigger("connect")
+ frm.trigger("connect");
});
}
}
if (frm.doc.access_token) {
// If we have access_token that means we also have refresh_token we don't need user intervention anymore
// All we need now is a Company from erpnext
- frm.remove_custom_button(__("Connect to Quickbooks"))
+ frm.remove_custom_button(__("Connect to Quickbooks"));
- frm.toggle_display("company_settings", 1)
- frm.set_df_property("company", "reqd", 1)
+ frm.toggle_display("company_settings", 1);
+ frm.set_df_property("company", "reqd", 1);
if (frm.doc.company) {
- frm.add_custom_button(__("Fetch Data"), function () {
- frm.trigger("fetch_data")
+ frm.add_custom_button(__("Fetch Data"), function () {
+ frm.trigger("fetch_data");
});
}
}
},
- set_indicator: function(frm) {
+ set_indicator: function (frm) {
var indicator_map = {
"Connecting to QuickBooks": [__("Connecting to QuickBooks"), "orange"],
"Connected to QuickBooks": [__("Connected to QuickBooks"), "green"],
"In Progress": [__("In Progress"), "orange"],
- "Complete": [__("Complete"), "green"],
- "Failed": [__("Failed"), "red"],
- }
+ Complete: [__("Complete"), "green"],
+ Failed: [__("Failed"), "red"],
+ };
if (frm.doc.status) {
- var indicator = indicator_map[frm.doc.status]
- var label = indicator[0]
- var color = indicator[1]
- frm.page.set_indicator(label, color)
+ var indicator = indicator_map[frm.doc.status];
+ var label = indicator[0];
+ var color = indicator[1];
+ frm.page.set_indicator(label, color);
}
},
});
diff --git a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
index af06b3451e04..556c332634d3 100644
--- a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
+++ b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js
@@ -16,24 +16,29 @@ frappe.ui.form.on("Tally Migration", {
frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
let error_occurred = data.count === -1;
if (data.count == data.total || error_occurred) {
- window.setTimeout((title) => {
- frm.dashboard.hide_progress(title);
- frm.reload_doc();
- if (error_occurred) {
- frappe.msgprint({
- message: __("An error has occurred during {0}. Check {1} for more details",
- [
- repl("
%(tally_document)s ", {
- tally_document: frm.docname
- }),
- "
Error Log "
- ]
- ),
- title: __("Tally Migration Error"),
- indicator: "red"
- });
- }
- }, 2000, data.title);
+ window.setTimeout(
+ (title) => {
+ frm.dashboard.hide_progress(title);
+ frm.reload_doc();
+ if (error_occurred) {
+ frappe.msgprint({
+ message: __("An error has occurred during {0}. Check {1} for more details", [
+ repl(
+ "
%(tally_document)s ",
+ {
+ tally_document: frm.docname,
+ }
+ ),
+ "
Error Log ",
+ ]),
+ title: __("Tally Migration Error"),
+ indicator: "red",
+ });
+ }
+ },
+ 2000,
+ data.title
+ );
}
});
},
@@ -43,10 +48,10 @@ frappe.ui.form.on("Tally Migration", {
erpnext.tally_migration.failed_import_log = JSON.parse(frm.doc.failed_import_log);
erpnext.tally_migration.fixed_errors_log = JSON.parse(frm.doc.fixed_errors_log);
- ["default_round_off_account", "default_warehouse", "default_cost_center"].forEach(account => {
- frm.toggle_reqd(account, frm.doc.is_master_data_imported === 1)
- frm.toggle_enable(account, frm.doc.is_day_book_data_processed != 1)
- })
+ ["default_round_off_account", "default_warehouse", "default_cost_center"].forEach((account) => {
+ frm.toggle_reqd(account, frm.doc.is_master_data_imported === 1);
+ frm.toggle_enable(account, frm.doc.is_day_book_data_processed != 1);
+ });
if (frm.doc.master_data && !frm.doc.is_master_data_imported) {
if (frm.doc.is_master_data_processed) {
@@ -74,27 +79,27 @@ frappe.ui.form.on("Tally Migration", {
},
erpnext_company: function (frm) {
- frappe.db.exists("Company", frm.doc.erpnext_company).then(exists => {
+ frappe.db.exists("Company", frm.doc.erpnext_company).then((exists) => {
if (exists) {
frappe.msgprint(
- __("Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts", [frm.doc.erpnext_company]),
+ __(
+ "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts",
+ [frm.doc.erpnext_company]
+ )
);
}
});
},
add_button: function (frm, label, method) {
- frm.add_custom_button(
- label,
- () => {
- frm.call({
- doc: frm.doc,
- method: method,
- freeze: true
- });
- frm.reload_doc();
- }
- );
+ frm.add_custom_button(label, () => {
+ frm.call({
+ doc: frm.doc,
+ method: method,
+ freeze: true,
+ });
+ frm.reload_doc();
+ });
},
render_html_table(frm, shown_logs, hidden_logs, field) {
@@ -102,23 +107,26 @@ frappe.ui.form.on("Tally Migration", {
frm.toggle_display(field, true);
} else {
frm.toggle_display(field, false);
- return
+ return;
}
let rows = erpnext.tally_migration.get_html_rows(shown_logs, field);
let rows_head, table_caption;
- let table_footer = (hidden_logs && (hidden_logs.length > 0)) ? `
+ let table_footer =
+ hidden_logs && hidden_logs.length > 0
+ ? `
And ${hidden_logs.length} more others
- `: "";
+ `
+ : "";
if (field === "fixed_error_log_preview") {
rows_head = `
${__("Meta Data")}
-
${__("Unresolve")} `
- table_caption = "Resolved Issues"
+
${__("Unresolve")} `;
+ table_caption = "Resolved Issues";
} else {
rows_head = `
${__("Error Message")}
-
${__("Create")} `
- table_caption = "Error Log"
+
${__("Create")} `;
+ table_caption = "Error Log";
}
frm.get_field(field).$wrapper.html(`
@@ -144,7 +152,7 @@ frappe.ui.form.on("Tally Migration", {
summary[row.doc.doctype] = 1;
}
}
- return summary
+ return summary;
}, {});
console.table(summary);
},
@@ -177,7 +185,7 @@ frappe.ui.form.on("Tally Migration", {
let hidden_logs = completed_log.slice(20);
frm.events.render_html_table(frm, logs, hidden_logs, "fixed_error_log_preview");
- }
+ },
});
erpnext.tally_migration.getError = (traceback) => {
@@ -186,31 +194,33 @@ erpnext.tally_migration.getError = (traceback) => {
let message;
if (is_multiline) {
- let exc_error_idx = traceback.trim().lastIndexOf("\n") + 1
- let error_line = traceback.substr(exc_error_idx)
- let split_str_idx = (error_line.indexOf(':') > 0) ? error_line.indexOf(':') + 1 : 0;
+ let exc_error_idx = traceback.trim().lastIndexOf("\n") + 1;
+ let error_line = traceback.substr(exc_error_idx);
+ let split_str_idx = error_line.indexOf(":") > 0 ? error_line.indexOf(":") + 1 : 0;
message = error_line.slice(split_str_idx).trim();
} else {
message = traceback;
}
- return message
-}
+ return message;
+};
erpnext.tally_migration.cleanDoc = (obj) => {
/* Strips all null and empty values of your JSON object */
let temp = obj;
- $.each(temp, function(key, value){
- if (value === "" || value === null){
+ $.each(temp, function (key, value) {
+ if (value === "" || value === null) {
delete obj[key];
- } else if (Object.prototype.toString.call(value) === '[object Object]') {
+ } else if (Object.prototype.toString.call(value) === "[object Object]") {
erpnext.tally_migration.cleanDoc(value);
} else if ($.isArray(value)) {
- $.each(value, function (k,v) { erpnext.tally_migration.cleanDoc(v); });
+ $.each(value, function (k, v) {
+ erpnext.tally_migration.cleanDoc(v);
+ });
}
});
return temp;
-}
+};
erpnext.tally_migration.unresolve = (document) => {
/* Mark document migration as unresolved ie. move to failed error log */
@@ -218,9 +228,9 @@ erpnext.tally_migration.unresolve = (document) => {
let failed_log = erpnext.tally_migration.failed_import_log;
let fixed_log = erpnext.tally_migration.fixed_errors_log;
- let modified_fixed_log = fixed_log.filter(row => {
+ let modified_fixed_log = fixed_log.filter((row) => {
if (!frappe.utils.deep_equal(erpnext.tally_migration.cleanDoc(row.doc), document)) {
- return row
+ return row;
}
});
@@ -231,7 +241,7 @@ erpnext.tally_migration.unresolve = (document) => {
frm.dirty();
frm.save();
-}
+};
erpnext.tally_migration.resolve = (document) => {
/* Mark document migration as resolved ie. move to fixed error log */
@@ -239,9 +249,9 @@ erpnext.tally_migration.resolve = (document) => {
let failed_log = erpnext.tally_migration.failed_import_log;
let fixed_log = erpnext.tally_migration.fixed_errors_log;
- let modified_failed_log = failed_log.filter(row => {
+ let modified_failed_log = failed_log.filter((row) => {
if (!frappe.utils.deep_equal(erpnext.tally_migration.cleanDoc(row.doc), document)) {
- return row
+ return row;
}
});
fixed_log.push({ doc: document, exc: `Solved on ${Date()}` });
@@ -251,27 +261,27 @@ erpnext.tally_migration.resolve = (document) => {
frm.dirty();
frm.save();
-}
+};
erpnext.tally_migration.create_new_doc = (document) => {
/* Mark as resolved and create new document */
erpnext.tally_migration.resolve(document);
return frappe.call({
type: "POST",
- method: 'erpnext.erpnext_integrations.doctype.tally_migration.tally_migration.new_doc',
+ method: "erpnext.erpnext_integrations.doctype.tally_migration.tally_migration.new_doc",
args: {
- document
+ document,
},
freeze: true,
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
frappe.model.sync(r.message);
frappe.get_doc(r.message.doctype, r.message.name).__run_link_triggers = true;
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
+ },
});
-}
+};
erpnext.tally_migration.get_html_rows = (logs, field) => {
let index = 0;
@@ -304,14 +314,18 @@ erpnext.tally_migration.get_html_rows = (logs, field) => {
`;
let create_button = `
-
+
${__("Create Document")}
- `
+ `;
let mark_as_unresolved = `
-
+
${__("Mark as unresolved")}
- `
+ `;
if (field === "fixed_error_log_preview") {
return `
@@ -343,7 +357,8 @@ erpnext.tally_migration.get_html_rows = (logs, field) => {
`;
}
- }).join("");
+ })
+ .join("");
- return rows
-}
+ return rows;
+};
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
index 4480ae51446a..43c7e1c0204b 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -2,28 +2,28 @@
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext.maintenance");
-frappe.ui.form.on('Maintenance Schedule', {
+frappe.ui.form.on("Maintenance Schedule", {
setup: function (frm) {
- frm.set_query('contact_person', erpnext.queries.contact_query);
- frm.set_query('customer_address', erpnext.queries.address_query);
- frm.set_query('customer', erpnext.queries.customer);
+ frm.set_query("contact_person", erpnext.queries.contact_query);
+ frm.set_query("customer_address", erpnext.queries.address_query);
+ frm.set_query("customer", erpnext.queries.customer);
- frm.set_query('serial_and_batch_bundle', 'items', (doc, cdt, cdn) => {
+ frm.set_query("serial_and_batch_bundle", "items", (doc, cdt, cdn) => {
let item = locals[cdt][cdn];
return {
filters: {
- 'item_code': item.item_code,
- 'voucher_type': 'Maintenance Schedule',
- 'type_of_transaction': 'Maintenance',
- 'company': doc.company,
- }
- }
+ item_code: item.item_code,
+ voucher_type: "Maintenance Schedule",
+ type_of_transaction: "Maintenance",
+ company: doc.company,
+ },
+ };
});
},
onload: function (frm) {
if (!frm.doc.status) {
- frm.set_value({ status: 'Draft' });
+ frm.set_value({ status: "Draft" });
}
if (frm.doc.__islocal) {
frm.set_value({ transaction_date: frappe.datetime.get_today() });
@@ -31,128 +31,136 @@ frappe.ui.form.on('Maintenance Schedule', {
},
refresh: function (frm) {
setTimeout(() => {
- frm.toggle_display('generate_schedule', !(frm.is_new() || frm.doc.docstatus));
- frm.toggle_display('schedule', !(frm.is_new()));
+ frm.toggle_display("generate_schedule", !(frm.is_new() || frm.doc.docstatus));
+ frm.toggle_display("schedule", !frm.is_new());
}, 10);
},
customer: function (frm) {
- erpnext.utils.get_party_details(frm)
+ erpnext.utils.get_party_details(frm);
},
customer_address: function (frm) {
- erpnext.utils.get_address_display(frm, 'customer_address', 'address_display');
+ erpnext.utils.get_address_display(frm, "customer_address", "address_display");
},
contact_person: function (frm) {
erpnext.utils.get_contact_details(frm);
},
generate_schedule: function (frm) {
if (frm.is_new()) {
- frappe.msgprint(__('Please save first'));
+ frappe.msgprint(__("Please save first"));
} else {
- frm.call('generate_schedule');
+ frm.call("generate_schedule");
}
- }
-})
+ },
+});
// TODO commonify this code
erpnext.maintenance.MaintenanceSchedule = class MaintenanceSchedule extends frappe.ui.form.Controller {
refresh() {
- frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+ frappe.dynamic_link = { doc: this.frm.doc, fieldname: "customer", doctype: "Customer" };
var me = this;
if (this.frm.doc.docstatus === 0) {
- this.frm.add_custom_button(__('Sales Order'),
+ this.frm.add_custom_button(
+ __("Sales Order"),
function () {
erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
source_doctype: "Sales Order",
target: me.frm,
setters: {
- customer: me.frm.doc.customer || undefined
+ customer: me.frm.doc.customer || undefined,
},
get_query_filters: {
docstatus: 1,
- company: me.frm.doc.company
- }
+ company: me.frm.doc.company,
+ },
});
- }, __("Get Items From"));
+ },
+ __("Get Items From")
+ );
} else if (this.frm.doc.docstatus === 1) {
let schedules = me.frm.doc.schedules;
- let flag = schedules.some(schedule => schedule.completion_status === "Pending");
+ let flag = schedules.some((schedule) => schedule.completion_status === "Pending");
if (flag) {
- this.frm.add_custom_button(__('Maintenance Visit'), function () {
- let options = "";
+ this.frm.add_custom_button(
+ __("Maintenance Visit"),
+ function () {
+ let options = "";
- me.frm.call('get_pending_data', {data_type: "items"}).then(r => {
- options = r.message;
+ me.frm.call("get_pending_data", { data_type: "items" }).then((r) => {
+ options = r.message;
- let schedule_id = "";
- let d = new frappe.ui.Dialog({
- title: __("Enter Visit Details"),
- fields: [{
- fieldtype: "Select",
- fieldname: "item_name",
- label: __("Item Name"),
- options: options,
- reqd: 1,
- onchange: function () {
- let field = d.get_field("scheduled_date");
- me.frm.call('get_pending_data',
- {
- item_name: this.value,
- data_type: "date"
- }).then(r => {
- field.df.options = r.message;
- field.refresh();
- });
- }
- },
- {
- label: __('Scheduled Date'),
- fieldname: 'scheduled_date',
- fieldtype: 'Select',
- options: "",
- reqd: 1,
- onchange: function () {
- let field = d.get_field('item_name');
- me.frm.call(
- 'get_pending_data',
- {
- item_name: field.value,
- s_date: this.value,
- data_type: "id"
- }).then(r => {
- schedule_id = r.message;
- });
- }
- },
- ],
- primary_action_label: 'Create Visit',
- primary_action(values) {
- frappe.call({
- method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
- args: {
- item_name: values.item_name,
- s_id: schedule_id,
- source_name: me.frm.doc.name,
+ let schedule_id = "";
+ let d = new frappe.ui.Dialog({
+ title: __("Enter Visit Details"),
+ fields: [
+ {
+ fieldtype: "Select",
+ fieldname: "item_name",
+ label: __("Item Name"),
+ options: options,
+ reqd: 1,
+ onchange: function () {
+ let field = d.get_field("scheduled_date");
+ me.frm
+ .call("get_pending_data", {
+ item_name: this.value,
+ data_type: "date",
+ })
+ .then((r) => {
+ field.df.options = r.message;
+ field.refresh();
+ });
+ },
+ },
+ {
+ label: __("Scheduled Date"),
+ fieldname: "scheduled_date",
+ fieldtype: "Select",
+ options: "",
+ reqd: 1,
+ onchange: function () {
+ let field = d.get_field("item_name");
+ me.frm
+ .call("get_pending_data", {
+ item_name: field.value,
+ s_date: this.value,
+ data_type: "id",
+ })
+ .then((r) => {
+ schedule_id = r.message;
+ });
+ },
},
- callback: function (r) {
- if (!r.exc) {
- frappe.model.sync(r.message);
- frappe.set_route("Form", r.message.doctype, r.message.name);
- }
- }
- });
- d.hide();
- }
+ ],
+ primary_action_label: "Create Visit",
+ primary_action(values) {
+ frappe.call({
+ method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
+ args: {
+ item_name: values.item_name,
+ s_id: schedule_id,
+ source_name: me.frm.doc.name,
+ },
+ callback: function (r) {
+ if (!r.exc) {
+ frappe.model.sync(r.message);
+ frappe.set_route("Form", r.message.doctype, r.message.name);
+ }
+ },
+ });
+ d.hide();
+ },
+ });
+ d.show();
});
- d.show();
- });
- }, __('Create'));
+ },
+ __("Create")
+ );
}
}
}
-
};
-extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({ frm: cur_frm }));
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
index e2f6cb3a6cc8..0a05791b1e98 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@@ -2,11 +2,11 @@
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext.maintenance");
-frappe.ui.form.on('Maintenance Visit', {
+frappe.ui.form.on("Maintenance Visit", {
setup: function (frm) {
- frm.set_query('contact_person', erpnext.queries.contact_query);
- frm.set_query('customer_address', erpnext.queries.address_query);
- frm.set_query('customer', erpnext.queries.customer);
+ frm.set_query("contact_person", erpnext.queries.contact_query);
+ frm.set_query("customer_address", erpnext.queries.address_query);
+ frm.set_query("customer", erpnext.queries.customer);
},
onload: function (frm) {
// filters for serial no based on item code
@@ -15,42 +15,44 @@ frappe.ui.form.on('Maintenance Visit', {
if (!item_code) {
return;
}
- frappe.call({
- method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule",
- args: {
- schedule: frm.doc.maintenance_schedule,
- item_code: item_code
- }
- }).then((r) => {
- let serial_nos = r.message;
- frm.set_query('serial_no', 'purposes', () => {
- if (serial_nos.length > 0) {
+ frappe
+ .call({
+ method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.get_serial_nos_from_schedule",
+ args: {
+ schedule: frm.doc.maintenance_schedule,
+ item_code: item_code,
+ },
+ })
+ .then((r) => {
+ let serial_nos = r.message;
+ frm.set_query("serial_no", "purposes", () => {
+ if (serial_nos.length > 0) {
+ return {
+ filters: {
+ item_code: item_code,
+ name: ["in", serial_nos],
+ },
+ };
+ }
return {
filters: {
- 'item_code': item_code,
- 'name': ["in", serial_nos]
- }
+ item_code: item_code,
+ },
};
- }
- return {
- filters: {
- 'item_code': item_code
- }
- };
+ });
});
- });
} else {
- frm.set_query('serial_no', 'purposes', (frm, cdt, cdn) => {
+ frm.set_query("serial_no", "purposes", (frm, cdt, cdn) => {
let row = locals[cdt][cdn];
return {
filters: {
- 'item_code': row.item_code
- }
+ item_code: row.item_code,
+ },
};
});
}
if (!frm.doc.status) {
- frm.set_value({ status: 'Draft' });
+ frm.set_value({ status: "Draft" });
}
if (frm.doc.__islocal) {
frm.set_value({ mntc_date: frappe.datetime.get_today() });
@@ -60,25 +62,26 @@ frappe.ui.form.on('Maintenance Visit', {
erpnext.utils.get_party_details(frm);
},
customer_address: function (frm) {
- erpnext.utils.get_address_display(frm, 'customer_address', 'address_display');
+ erpnext.utils.get_address_display(frm, "customer_address", "address_display");
},
contact_person: function (frm) {
erpnext.utils.get_contact_details(frm);
- }
-})
+ },
+});
// TODO commonify this code
erpnext.maintenance.MaintenanceVisit = class MaintenanceVisit extends frappe.ui.form.Controller {
refresh() {
- frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+ frappe.dynamic_link = { doc: this.frm.doc, fieldname: "customer", doctype: "Customer" };
var me = this;
if (this.frm.doc.docstatus === 0) {
- this.frm.add_custom_button(__('Maintenance Schedule'),
+ this.frm.add_custom_button(
+ __("Maintenance Schedule"),
function () {
if (!me.frm.doc.customer) {
- frappe.msgprint(__('Please select Customer first'));
+ frappe.msgprint(__("Please select Customer first"));
return;
}
erpnext.utils.map_current_doc({
@@ -90,11 +93,14 @@ erpnext.maintenance.MaintenanceVisit = class MaintenanceVisit extends frappe.ui.
},
get_query_filters: {
docstatus: 1,
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
- this.frm.add_custom_button(__('Warranty Claim'),
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
+ this.frm.add_custom_button(
+ __("Warranty Claim"),
function () {
erpnext.utils.map_current_doc({
method: "erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit",
@@ -106,14 +112,17 @@ erpnext.maintenance.MaintenanceVisit = class MaintenanceVisit extends frappe.ui.
},
get_query_filters: {
status: ["in", "Open, Work in Progress"],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"));
- this.frm.add_custom_button(__('Sales Order'),
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From")
+ );
+ this.frm.add_custom_button(
+ __("Sales Order"),
function () {
if (!me.frm.doc.customer) {
- frappe.msgprint(__('Please select Customer first'));
+ frappe.msgprint(__("Please select Customer first"));
return;
}
erpnext.utils.map_current_doc({
@@ -127,11 +136,13 @@ erpnext.maintenance.MaintenanceVisit = class MaintenanceVisit extends frappe.ui.
docstatus: 1,
company: me.frm.doc.company,
order_type: me.frm.doc.order_type,
- }
- })
- }, __("Get Items From"));
+ },
+ });
+ },
+ __("Get Items From")
+ );
}
}
};
-extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({ frm: cur_frm }));
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js
index e98979deb1bc..c47706e33d9e 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js
@@ -1,11 +1,15 @@
-frappe.listview_settings['Maintenance Visit'] = {
+frappe.listview_settings["Maintenance Visit"] = {
add_fields: ["customer", "customer_name", "completion_status", "maintenance_type"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var s = doc.completion_status || "Pending";
- return [__(s), {
- "Pending": "blue",
- "Partially Completed": "orange",
- "Fully Completed": "green"
- }[s], "completion_status,=," + doc.completion_status];
- }
+ return [
+ __(s),
+ {
+ Pending: "blue",
+ "Partially Completed": "orange",
+ "Fully Completed": "green",
+ }[s],
+ "completion_status,=," + doc.completion_status,
+ ];
+ },
};
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
index 716af85a7e88..91301093ef40 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
@@ -1,60 +1,72 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Blanket Order', {
- onload: function(frm) {
- frm.trigger('set_tc_name_filter');
+frappe.ui.form.on("Blanket Order", {
+ onload: function (frm) {
+ frm.trigger("set_tc_name_filter");
},
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Purchase Order': 'Purchase Order',
- 'Sales Order': 'Sales Order',
- 'Quotation': 'Quotation',
+ "Purchase Order": "Purchase Order",
+ "Sales Order": "Sales Order",
+ Quotation: "Quotation",
};
frm.add_fetch("customer", "customer_name", "customer_name");
frm.add_fetch("supplier", "supplier_name", "supplier_name");
},
- refresh: function(frm) {
+ refresh: function (frm) {
erpnext.hide_company(frm);
if (frm.doc.customer && frm.doc.docstatus === 1 && frm.doc.to_date > frappe.datetime.get_today()) {
- frm.add_custom_button(__("Sales Order"), function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
- frm: frm,
- args: {
- doctype: 'Sales Order'
- }
- });
- }, __('Create'));
+ frm.add_custom_button(
+ __("Sales Order"),
+ function () {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
+ frm: frm,
+ args: {
+ doctype: "Sales Order",
+ },
+ });
+ },
+ __("Create")
+ );
- frm.add_custom_button(__("Quotation"), function() {
- frappe.model.open_mapped_doc({
- method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
- frm: frm,
- args: {
- doctype: 'Quotation'
- }
- });
- }, __('Create'));
+ frm.add_custom_button(
+ __("Quotation"),
+ function () {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
+ frm: frm,
+ args: {
+ doctype: "Quotation",
+ },
+ });
+ },
+ __("Create")
+ );
}
if (frm.doc.supplier && frm.doc.docstatus === 1) {
- frm.add_custom_button(__("Purchase Order"), function(){
- frappe.model.open_mapped_doc({
- method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
- frm: frm,
- args: {
- doctype: 'Purchase Order'
- }
- });
- }, __('Create'));
+ frm.add_custom_button(
+ __("Purchase Order"),
+ function () {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.manufacturing.doctype.blanket_order.blanket_order.make_order",
+ frm: frm,
+ args: {
+ doctype: "Purchase Order",
+ },
+ });
+ },
+ __("Create")
+ );
}
},
- onload_post_render: function(frm) {
+ onload_post_render: function (frm) {
frm.get_field("items").grid.set_multiple_add("item_code", "qty");
},
@@ -66,28 +78,28 @@ frappe.ui.form.on('Blanket Order', {
});
},
- set_tc_name_filter: function(frm) {
- if (frm.doc.blanket_order_type === 'Selling') {
- frm.set_df_property("customer","reqd", 1);
- frm.set_df_property("supplier","reqd", 0);
+ set_tc_name_filter: function (frm) {
+ if (frm.doc.blanket_order_type === "Selling") {
+ frm.set_df_property("customer", "reqd", 1);
+ frm.set_df_property("supplier", "reqd", 0);
frm.set_value("supplier", "");
- frm.set_query("tc_name", function() {
+ frm.set_query("tc_name", function () {
return { filters: { selling: 1 } };
});
}
- if (frm.doc.blanket_order_type === 'Purchasing') {
- frm.set_df_property("supplier","reqd", 1);
- frm.set_df_property("customer","reqd", 0);
+ if (frm.doc.blanket_order_type === "Purchasing") {
+ frm.set_df_property("supplier", "reqd", 1);
+ frm.set_df_property("customer", "reqd", 0);
frm.set_value("customer", "");
- frm.set_query("tc_name", function() {
+ frm.set_query("tc_name", function () {
return { filters: { buying: 1 } };
});
}
},
blanket_order_type: function (frm) {
- frm.trigger('set_tc_name_filter');
- }
+ frm.trigger("set_tc_name_filter");
+ },
});
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 8c671e264409..2ac28ea885f5 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -6,139 +6,150 @@ frappe.provide("erpnext.bom");
frappe.ui.form.on("BOM", {
setup(frm) {
frm.custom_make_buttons = {
- 'Work Order': 'Work Order',
- 'Quality Inspection': 'Quality Inspection'
+ "Work Order": "Work Order",
+ "Quality Inspection": "Quality Inspection",
};
- frm.set_query("bom_no", "items", function() {
+ frm.set_query("bom_no", "items", function () {
return {
filters: {
- 'currency': frm.doc.currency,
- 'company': frm.doc.company
- }
+ currency: frm.doc.currency,
+ company: frm.doc.company,
+ },
};
});
- frm.set_query("source_warehouse", "items", function() {
+ frm.set_query("source_warehouse", "items", function () {
return {
filters: {
- 'company': frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
});
- frm.set_query("item", function() {
+ frm.set_query("item", function () {
return {
query: "erpnext.manufacturing.doctype.bom.bom.item_query",
filters: {
- "is_stock_item": 1
- }
+ is_stock_item: 1,
+ },
};
});
- frm.set_query("project", function() {
- return{
- filters:[
- ['Project', 'status', 'not in', 'Completed, Cancelled']
- ]
+ frm.set_query("project", function () {
+ return {
+ filters: [["Project", "status", "not in", "Completed, Cancelled"]],
};
});
- frm.set_query("item_code", "items", function(doc) {
+ frm.set_query("item_code", "items", function (doc) {
return {
query: "erpnext.manufacturing.doctype.bom.bom.item_query",
filters: {
- "include_item_in_manufacturing": 1,
- "is_fixed_asset": 0
- }
+ include_item_in_manufacturing: 1,
+ is_fixed_asset: 0,
+ },
};
});
- frm.set_query("bom_no", "items", function(doc, cdt, cdn) {
+ frm.set_query("bom_no", "items", function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
return {
filters: {
- 'item': d.item_code,
- 'is_active': 1,
- 'docstatus': 1
- }
+ item: d.item_code,
+ is_active: 1,
+ docstatus: 1,
+ },
};
});
},
- validate: function(frm) {
+ validate: function (frm) {
if (frm.doc.fg_based_operating_cost && frm.doc.with_operations) {
- frappe.throw({message: __("Please check either with operations or FG Based Operating Cost."), title: __("Mandatory")});
+ frappe.throw({
+ message: __("Please check either with operations or FG Based Operating Cost."),
+ title: __("Mandatory"),
+ });
}
},
- with_operations: function(frm) {
+ with_operations: function (frm) {
frm.set_df_property("fg_based_operating_cost", "hidden", frm.doc.with_operations ? 1 : 0);
},
- fg_based_operating_cost: function(frm) {
+ fg_based_operating_cost: function (frm) {
frm.set_df_property("with_operations", "hidden", frm.doc.fg_based_operating_cost ? 1 : 0);
},
- onload_post_render: function(frm) {
+ onload_post_render: function (frm) {
frm.get_field("items").grid.set_multiple_add("item_code", "qty");
},
refresh(frm) {
frm.toggle_enable("item", frm.doc.__islocal);
- frm.set_indicator_formatter('item_code',
- function(doc) {
- if (doc.original_item){
- return (doc.item_code != doc.original_item) ? "orange" : ""
- }
- return ""
+ frm.set_indicator_formatter("item_code", function (doc) {
+ if (doc.original_item) {
+ return doc.item_code != doc.original_item ? "orange" : "";
}
- )
+ return "";
+ });
- if (!frm.is_new() && frm.doc.docstatus<2) {
- frm.add_custom_button(__("Update Cost"), function() {
+ if (!frm.is_new() && frm.doc.docstatus < 2) {
+ frm.add_custom_button(__("Update Cost"), function () {
frm.events.update_cost(frm, true);
});
- frm.add_custom_button(__("Browse BOM"), function() {
+ frm.add_custom_button(__("Browse BOM"), function () {
frappe.route_options = {
- "bom": frm.doc.name
+ bom: frm.doc.name,
};
frappe.set_route("Tree", "BOM");
});
}
if (!frm.is_new() && !frm.doc.docstatus == 0) {
- frm.add_custom_button(__("New Version"), function() {
+ frm.add_custom_button(__("New Version"), function () {
let new_bom = frappe.model.copy_doc(frm.doc);
frappe.set_route("Form", "BOM", new_bom.name);
});
}
- if(frm.doc.docstatus==1) {
- frm.add_custom_button(__("Work Order"), function() {
- frm.trigger("make_work_order");
- }, __("Create"));
+ if (frm.doc.docstatus == 1) {
+ frm.add_custom_button(
+ __("Work Order"),
+ function () {
+ frm.trigger("make_work_order");
+ },
+ __("Create")
+ );
if (frm.doc.has_variants) {
- frm.add_custom_button(__("Variant BOM"), function() {
- frm.trigger("make_variant_bom");
- }, __("Create"));
+ frm.add_custom_button(
+ __("Variant BOM"),
+ function () {
+ frm.trigger("make_variant_bom");
+ },
+ __("Create")
+ );
}
if (frm.doc.inspection_required) {
- frm.add_custom_button(__("Quality Inspection"), function() {
- frm.trigger("make_quality_inspection");
- }, __("Create"));
+ frm.add_custom_button(
+ __("Quality Inspection"),
+ function () {
+ frm.trigger("make_quality_inspection");
+ },
+ __("Create")
+ );
}
- frm.page.set_inner_btn_group_as_primary(__('Create'));
+ frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if(frm.doc.items && frm.doc.allow_alternative_item) {
- const has_alternative = frm.doc.items.find(i => i.allow_alternative_item === 1);
+ if (frm.doc.items && frm.doc.allow_alternative_item) {
+ const has_alternative = frm.doc.items.find((i) => i.allow_alternative_item === 1);
if (frm.doc.docstatus == 0 && has_alternative) {
- frm.add_custom_button(__('Alternate Item'), () => {
+ frm.add_custom_button(__("Alternate Item"), () => {
erpnext.utils.select_alternate_items({
frm: frm,
child_docname: "items",
@@ -146,23 +157,26 @@ frappe.ui.form.on("BOM", {
child_doctype: "BOM Item",
original_item_field: "original_item",
condition: (d) => {
- if (d.allow_alternative_item) {return true;}
- }
- })
+ if (d.allow_alternative_item) {
+ return true;
+ }
+ },
+ });
});
}
}
-
if (frm.doc.has_variants) {
- frm.set_intro(__('This is a Template BOM and will be used to make the work order for {0} of the item {1}',
- [
+ frm.set_intro(
+ __("This is a Template BOM and will be used to make the work order for {0} of the item {1}", [
`
variants `,
`
${frm.doc.item} `,
- ]), true);
+ ]),
+ true
+ );
frm.$wrapper.find(".variants-intro").on("click", () => {
- frappe.set_route("List", "Item", {"variant_of": frm.doc.item});
+ frappe.set_route("List", "Item", { variant_of: frm.doc.item });
});
}
},
@@ -176,38 +190,43 @@ frappe.ui.form.on("BOM", {
item: item,
qty: data.qty || 0.0,
project: frm.doc.project,
- variant_items: variant_items
+ variant_items: variant_items,
},
freeze: true,
callback(r) {
- if(r.message) {
+ if (r.message) {
let doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
});
},
make_variant_bom(frm) {
- frm.events.setup_variant_prompt(frm, "Variant BOM", (frm, item, data, variant_items) => {
- frappe.call({
- method: "erpnext.manufacturing.doctype.bom.bom.make_variant_bom",
- args: {
- source_name: frm.doc.name,
- bom_no: frm.doc.name,
- item: item,
- variant_items: variant_items
- },
- freeze: true,
- callback(r) {
- if(r.message) {
- let doc = frappe.model.sync(r.message)[0];
- frappe.set_route("Form", doc.doctype, doc.name);
- }
- }
- });
- }, true);
+ frm.events.setup_variant_prompt(
+ frm,
+ "Variant BOM",
+ (frm, item, data, variant_items) => {
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.bom.bom.make_variant_bom",
+ args: {
+ source_name: frm.doc.name,
+ bom_no: frm.doc.name,
+ item: item,
+ variant_items: variant_items,
+ },
+ freeze: true,
+ callback(r) {
+ if (r.message) {
+ let doc = frappe.model.sync(r.message)[0];
+ frappe.set_route("Form", doc.doctype, doc.name);
+ }
+ },
+ });
+ },
+ true
+ );
},
setup_variant_prompt(frm, title, callback, skip_qty_field) {
@@ -215,27 +234,27 @@ frappe.ui.form.on("BOM", {
if (frm.doc.has_variants) {
fields.push({
- fieldtype: 'Link',
- label: __('Variant Item'),
- fieldname: 'item',
+ fieldtype: "Link",
+ label: __("Variant Item"),
+ fieldname: "item",
options: "Item",
reqd: 1,
get_query() {
return {
query: "erpnext.controllers.queries.item_query",
filters: {
- "variant_of": frm.doc.item
- }
+ variant_of: frm.doc.item,
+ },
};
- }
+ },
});
}
if (!skip_qty_field) {
fields.push({
- fieldtype: 'Float',
- label: __('Qty To Manufacture'),
- fieldname: 'qty',
+ fieldtype: "Float",
+ label: __("Qty To Manufacture"),
+ fieldname: "qty",
reqd: 1,
default: 1,
onchange: () => {
@@ -244,29 +263,23 @@ frappe.ui.form.on("BOM", {
acc[item.item_code] = item.qty;
return acc;
}, {});
- const mf_qty = cur_dialog.fields_list.filter(
- (f) => f.df.fieldname === "qty"
- )[0]?.value;
- const items = cur_dialog.fields.filter(
- (f) => f.fieldname === "items"
- )[0]?.data;
+ const mf_qty = cur_dialog.fields_list.filter((f) => f.df.fieldname === "qty")[0]?.value;
+ const items = cur_dialog.fields.filter((f) => f.fieldname === "items")[0]?.data;
if (!items) {
return;
}
items.forEach((item) => {
- item.qty =
- (variant_items_map[item.item_code] * mf_qty) /
- quantity;
+ item.qty = (variant_items_map[item.item_code] * mf_qty) / quantity;
});
cur_dialog.refresh();
- }
+ },
});
}
- var has_template_rm = frm.doc.items.filter(d => d.has_variants === 1) || [];
+ var has_template_rm = frm.doc.items.filter((d) => d.has_variants === 1) || [];
if (has_template_rm && has_template_rm.length > 0) {
fields.push({
fieldname: "items",
@@ -296,10 +309,10 @@ frappe.ui.form.on("BOM", {
return {
query: "erpnext.controllers.queries.item_query",
filters: {
- "variant_of": data.item_code
- }
+ variant_of: data.item_code,
+ },
};
- }
+ },
},
{
fieldname: "qty",
@@ -312,44 +325,48 @@ frappe.ui.form.on("BOM", {
fieldname: "source_warehouse",
label: __("Source Warehouse"),
fieldtype: "Link",
- options: "Warehouse"
+ options: "Warehouse",
},
{
fieldname: "operation",
label: __("Operation"),
fieldtype: "Data",
hidden: 1,
- }
+ },
],
in_place_edit: true,
data: [],
- get_data () {
+ get_data() {
return [];
},
});
}
- let dialog = frappe.prompt(fields, data => {
- let item = data.item || frm.doc.item;
- let variant_items = data.items || [];
+ let dialog = frappe.prompt(
+ fields,
+ (data) => {
+ let item = data.item || frm.doc.item;
+ let variant_items = data.items || [];
- variant_items.forEach(d => {
- if (!d.variant_item_code) {
- frappe.throw(__("Select variant item code for the template item {0}", [d.item_code]));
- }
- })
-
- callback(frm, item, data, variant_items);
+ variant_items.forEach((d) => {
+ if (!d.variant_item_code) {
+ frappe.throw(__("Select variant item code for the template item {0}", [d.item_code]));
+ }
+ });
- }, __(title), __("Create"));
+ callback(frm, item, data, variant_items);
+ },
+ __(title),
+ __("Create")
+ );
- has_template_rm.forEach(d => {
+ has_template_rm.forEach((d) => {
dialog.fields_dict.items.df.data.push({
- "item_code": d.item_code,
- "variant_item_code": "",
- "qty": d.qty,
- "source_warehouse": d.source_warehouse,
- "operation": d.operation
+ item_code: d.item_code,
+ variant_item_code: "",
+ qty: d.qty,
+ source_warehouse: d.source_warehouse,
+ operation: d.operation,
});
});
@@ -361,11 +378,11 @@ frappe.ui.form.on("BOM", {
make_quality_inspection(frm) {
frappe.model.open_mapped_doc({
method: "erpnext.stock.doctype.quality_inspection.quality_inspection.make_quality_inspection",
- frm: frm
- })
+ frm: frm,
+ });
},
- update_cost(frm, save_doc=false) {
+ update_cost(frm, save_doc = false) {
return frappe.call({
doc: frm.doc,
method: "update_cost",
@@ -373,12 +390,12 @@ frappe.ui.form.on("BOM", {
args: {
update_parent: true,
save: save_doc,
- from_child_bom: false
+ from_child_bom: false,
},
callback(r) {
refresh_field("items");
- if(!r.exc) frm.refresh_fields();
- }
+ if (!r.exc) frm.refresh_fields();
+ },
});
},
@@ -400,39 +417,39 @@ frappe.ui.form.on("BOM", {
erpnext.bom.calculate_op_cost(frm.doc);
erpnext.bom.calculate_total(frm.doc);
}
- }
+ },
});
}
},
process_loss_percentage(frm) {
- let qty = 0.0
+ let qty = 0.0;
if (frm.doc.process_loss_percentage) {
qty = (frm.doc.quantity * frm.doc.process_loss_percentage) / 100;
}
frm.set_value("process_loss_qty", qty);
- }
+ },
});
erpnext.bom.BomController = class BomController extends erpnext.TransactionController {
conversion_rate(doc) {
- if(this.frm.doc.currency === this.get_company_currency()) {
+ if (this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
} else {
erpnext.bom.update_cost(doc);
}
}
- item_code(doc, cdt, cdn){
+ item_code(doc, cdt, cdn) {
var scrap_items = false;
var child = locals[cdt][cdn];
- if (child.doctype == 'BOM Scrap Item') {
+ if (child.doctype == "BOM Scrap Item") {
scrap_items = true;
}
if (child.bom_no) {
- child.bom_no = '';
+ child.bom_no = "";
}
get_bom_material_detail(doc, cdt, cdn, scrap_items);
@@ -460,26 +477,26 @@ erpnext.bom.BomController = class BomController extends erpnext.TransactionContr
}
};
-extend_cscript(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.bom.BomController({ frm: cur_frm }));
-cur_frm.cscript.hour_rate = function(doc) {
+cur_frm.cscript.hour_rate = function (doc) {
erpnext.bom.calculate_op_cost(doc);
erpnext.bom.calculate_total(doc);
};
cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate;
-cur_frm.cscript.bom_no = function(doc, cdt, cdn) {
+cur_frm.cscript.bom_no = function (doc, cdt, cdn) {
get_bom_material_detail(doc, cdt, cdn, false);
};
-cur_frm.cscript.is_default = function(doc) {
+cur_frm.cscript.is_default = function (doc) {
if (doc.is_default) cur_frm.set_value("is_active", 1);
};
-var get_bom_material_detail = function(doc, cdt, cdn, scrap_items) {
+var get_bom_material_detail = function (doc, cdt, cdn, scrap_items) {
if (!doc.company) {
- frappe.throw({message: __("Please select a Company first."), title: __("Mandatory")});
+ frappe.throw({ message: __("Please select a Company first."), title: __("Mandatory") });
}
var d = locals[cdt][cdn];
@@ -488,20 +505,20 @@ var get_bom_material_detail = function(doc, cdt, cdn, scrap_items) {
doc: doc,
method: "get_bom_material_detail",
args: {
- "company": doc.company,
- "item_code": d.item_code,
- "bom_no": d.bom_no != null ? d.bom_no: '',
- "scrap_items": scrap_items,
- "qty": d.qty,
- "stock_qty": d.stock_qty,
- "include_item_in_manufacturing": d.include_item_in_manufacturing,
- "uom": d.uom,
- "stock_uom": d.stock_uom,
- "conversion_factor": d.conversion_factor,
- "sourced_by_supplier": d.sourced_by_supplier,
- "do_not_explode": d.do_not_explode
+ company: doc.company,
+ item_code: d.item_code,
+ bom_no: d.bom_no != null ? d.bom_no : "",
+ scrap_items: scrap_items,
+ qty: d.qty,
+ stock_qty: d.stock_qty,
+ include_item_in_manufacturing: d.include_item_in_manufacturing,
+ uom: d.uom,
+ stock_uom: d.stock_uom,
+ conversion_factor: d.conversion_factor,
+ sourced_by_supplier: d.sourced_by_supplier,
+ do_not_explode: d.do_not_explode,
},
- callback: function(r) {
+ callback: function (r) {
d = locals[cdt][cdn];
$.extend(d, r.message);
@@ -513,18 +530,18 @@ var get_bom_material_detail = function(doc, cdt, cdn, scrap_items) {
erpnext.bom.calculate_scrap_materials_cost(doc);
erpnext.bom.calculate_total(doc);
},
- freeze: true
+ freeze: true,
});
}
};
-cur_frm.cscript.qty = function(doc) {
+cur_frm.cscript.qty = function (doc) {
erpnext.bom.calculate_rm_cost(doc);
erpnext.bom.calculate_scrap_materials_cost(doc);
erpnext.bom.calculate_total(doc);
};
-cur_frm.cscript.rate = function(doc, cdt, cdn) {
+cur_frm.cscript.rate = function (doc, cdt, cdn) {
var d = locals[cdt][cdn];
const is_scrap_item = cdt == "BOM Scrap Item";
@@ -538,52 +555,60 @@ cur_frm.cscript.rate = function(doc, cdt, cdn) {
}
};
-erpnext.bom.update_cost = function(doc) {
+erpnext.bom.update_cost = function (doc) {
erpnext.bom.calculate_op_cost(doc);
erpnext.bom.calculate_rm_cost(doc);
erpnext.bom.calculate_scrap_materials_cost(doc);
erpnext.bom.calculate_total(doc);
};
-erpnext.bom.calculate_op_cost = function(doc) {
+erpnext.bom.calculate_op_cost = function (doc) {
doc.operating_cost = 0.0;
doc.base_operating_cost = 0.0;
- if(doc.with_operations) {
+ if (doc.with_operations) {
doc.operations.forEach((item) => {
- let operating_cost = flt(flt(item.hour_rate) * flt(item.time_in_mins) / 60, 2);
+ let operating_cost = flt((flt(item.hour_rate) * flt(item.time_in_mins)) / 60, 2);
let base_operating_cost = flt(operating_cost * doc.conversion_rate, 2);
- frappe.model.set_value('BOM Operation',item.name, {
- "operating_cost": operating_cost,
- "base_operating_cost": base_operating_cost
+ frappe.model.set_value("BOM Operation", item.name, {
+ operating_cost: operating_cost,
+ base_operating_cost: base_operating_cost,
});
doc.operating_cost += operating_cost;
doc.base_operating_cost += base_operating_cost;
});
- } else if(doc.fg_based_operating_cost) {
+ } else if (doc.fg_based_operating_cost) {
let total_operating_cost = doc.quantity * flt(doc.operating_cost_per_bom_quantity);
doc.operating_cost = total_operating_cost;
doc.base_operating_cost = flt(total_operating_cost * doc.conversion_rate, 2);
}
- refresh_field(['operating_cost', 'base_operating_cost']);
+ refresh_field(["operating_cost", "base_operating_cost"]);
};
// rm : raw material
-erpnext.bom.calculate_rm_cost = function(doc) {
+erpnext.bom.calculate_rm_cost = function (doc) {
var rm = doc.items || [];
var total_rm_cost = 0;
var base_total_rm_cost = 0;
- for(var i=0;i
{
- d.allow_alternative_item = r.allow_alternative_item
- })
+ frappe.db.get_value("Item", { name: d.item_code }, "allow_alternative_item", (r) => {
+ d.allow_alternative_item = r.allow_alternative_item;
+ });
refresh_field("allow_alternative_item", d.name, d.parentfield);
});
-frappe.ui.form.on("BOM Item", "sourced_by_supplier", function(frm, cdt, cdn) {
+frappe.ui.form.on("BOM Item", "sourced_by_supplier", function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.sourced_by_supplier) {
d.rate = 0;
@@ -700,7 +729,7 @@ frappe.ui.form.on("BOM Item", "sourced_by_supplier", function(frm, cdt, cdn) {
}
});
-frappe.ui.form.on("BOM Item", "rate", function(frm, cdt, cdn) {
+frappe.ui.form.on("BOM Item", "rate", function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.sourced_by_supplier) {
d.rate = 0;
@@ -708,37 +737,41 @@ frappe.ui.form.on("BOM Item", "rate", function(frm, cdt, cdn) {
}
});
-frappe.ui.form.on("BOM Operation", "operations_remove", function(frm) {
+frappe.ui.form.on("BOM Operation", "operations_remove", function (frm) {
erpnext.bom.calculate_op_cost(frm.doc);
erpnext.bom.calculate_total(frm.doc);
});
-frappe.ui.form.on("BOM Item", "items_remove", function(frm) {
+frappe.ui.form.on("BOM Item", "items_remove", function (frm) {
erpnext.bom.calculate_rm_cost(frm.doc);
erpnext.bom.calculate_total(frm.doc);
});
-frappe.tour['BOM'] = [
+frappe.tour["BOM"] = [
{
fieldname: "item",
title: "Item",
- description: __("Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically.")
+ description: __(
+ "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
+ ),
},
{
fieldname: "quantity",
title: "Quantity",
- description: __("Enter the quantity of the Item that will be manufactured from this Bill of Materials.")
+ description: __(
+ "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
+ ),
},
{
fieldname: "with_operations",
title: "With Operations",
- description: __("To add Operations tick the 'With Operations' checkbox.")
+ description: __("To add Operations tick the 'With Operations' checkbox."),
},
{
fieldname: "items",
title: "Raw Materials",
- description: __("Select the raw materials (Items) required to manufacture the Item")
- }
+ description: __("Select the raw materials (Items) required to manufacture the Item"),
+ },
];
frappe.ui.form.on("BOM Scrap Item", {
diff --git a/erpnext/manufacturing/doctype/bom/bom_list.js b/erpnext/manufacturing/doctype/bom/bom_list.js
index 4b5887f180cb..a26df545f85d 100644
--- a/erpnext/manufacturing/doctype/bom/bom_list.js
+++ b/erpnext/manufacturing/doctype/bom/bom_list.js
@@ -1,16 +1,16 @@
-frappe.listview_settings['BOM'] = {
+frappe.listview_settings["BOM"] = {
add_fields: ["is_active", "is_default", "total_cost", "has_variants"],
- get_indicator: function(doc) {
- if(doc.is_active && doc.has_variants) {
+ get_indicator: function (doc) {
+ if (doc.is_active && doc.has_variants) {
return [__("Template"), "orange", "has_variants,=,Yes"];
- } else if(doc.is_default) {
+ } else if (doc.is_default) {
return [__("Default"), "green", "is_default,=,Yes"];
- } else if(doc.is_active) {
+ } else if (doc.is_active) {
return [__("Active"), "blue", "is_active,=,Yes"];
- } else if(!doc.is_active) {
+ } else if (!doc.is_active) {
return [__("Not active"), "gray", "is_active,=,No"];
}
- }
+ },
};
frappe.help.youtube_id["BOM"] = "hDV0c1OeWLo";
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index fb99add12cf8..534de0e654bc 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -1,12 +1,12 @@
frappe.treeview_settings["BOM"] = {
- get_tree_nodes: 'erpnext.manufacturing.doctype.bom.bom.get_children',
+ get_tree_nodes: "erpnext.manufacturing.doctype.bom.bom.get_children",
filters: [
{
fieldname: "bom",
- fieldtype:"Link",
+ fieldtype: "Link",
options: "BOM",
- label: __("BOM")
- }
+ label: __("BOM"),
+ },
],
title: "BOM",
breadcrumb: "Manufacturing",
@@ -14,21 +14,21 @@ frappe.treeview_settings["BOM"] = {
root_label: "BOM", //fieldname from filters
get_tree_root: false,
show_expand_all: false,
- get_label: function(node) {
- if(node.data.qty) {
+ get_label: function (node) {
+ if (node.data.qty) {
return node.data.qty + " x " + node.data.item_code;
} else {
return node.data.item_code || node.data.value;
}
},
- onload: function(me) {
+ onload: function (me) {
var label = frappe.get_route()[0] + "/" + frappe.get_route()[1];
- if(frappe.pages[label]) {
+ if (frappe.pages[label]) {
delete frappe.pages[label];
}
var filter = me.opts.filters[0];
- if(frappe.route_options && frappe.route_options[filter.fieldname]) {
+ if (frappe.route_options && frappe.route_options[filter.fieldname]) {
var val = frappe.route_options[filter.fieldname];
delete frappe.route_options[filter.fieldname];
filter.default = "";
@@ -41,28 +41,27 @@ frappe.treeview_settings["BOM"] = {
toolbar: [
{ toggle_btn: true },
{
- label:__("Edit"),
- condition: function(node) {
+ label: __("Edit"),
+ condition: function (node) {
return node.expandable;
},
- click: function(node) {
-
+ click: function (node) {
frappe.set_route("Form", "BOM", node.data.value);
- }
- }
+ },
+ },
],
menu_items: [
{
label: __("New BOM"),
- action: function() {
- frappe.new_doc("BOM", true)
+ action: function () {
+ frappe.new_doc("BOM", true);
},
- condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1'
- }
+ condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1',
+ },
],
- onrender: function(node) {
- if(node.is_root && node.data.value!="BOM") {
- frappe.model.with_doc("BOM", node.data.value, function() {
+ onrender: function (node) {
+ if (node.is_root && node.data.value != "BOM") {
+ frappe.model.with_doc("BOM", node.data.value, function () {
var bom = frappe.model.get_doc("BOM", node.data.value);
node.data.image = escape(bom.image) || "";
node.data.description = bom.description || "";
@@ -70,5 +69,5 @@ frappe.treeview_settings["BOM"] = {
});
}
},
- view_template: 'bom_item_preview'
-}
+ view_template: "bom_item_preview",
+};
diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js
index 3bd2021e0c45..32231aa49494 100644
--- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.js
+++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.js
@@ -11,11 +11,10 @@ frappe.ui.form.on("BOM Creator", {
frm.dashboard.clear_comment();
if (!frm.is_new()) {
- if ((!frappe.bom_configurator
- || frappe.bom_configurator.bom_configurator !== frm.doc.name)) {
+ if (!frappe.bom_configurator || frappe.bom_configurator.bom_configurator !== frm.doc.name) {
frm.trigger("build_tree");
}
- } else if (!frm.doc.items?.length ) {
+ } else if (!frm.doc.items?.length) {
let $parent = $(frm.fields_dict["bom_creator"].wrapper);
$parent.empty();
frm.trigger("make_new_entry");
@@ -27,7 +26,7 @@ frappe.ui.form.on("BOM Creator", {
$parent.empty();
frm.toggle_enable("item_code", false);
- frappe.require('bom_configurator.bundle.js').then(() => {
+ frappe.require("bom_configurator.bundle.js").then(() => {
frappe.bom_configurator = new frappe.ui.BOMConfigurator({
wrapper: $parent,
page: $parent,
@@ -45,7 +44,7 @@ frappe.ui.form.on("BOM Creator", {
label: __("Name"),
fieldtype: "Data",
fieldname: "name",
- reqd: 1
+ reqd: 1,
},
{ fieldtype: "Column Break" },
{
@@ -62,7 +61,7 @@ frappe.ui.form.on("BOM Creator", {
fieldtype: "Link",
fieldname: "item_code",
options: "Item",
- reqd: 1
+ reqd: 1,
},
{ fieldtype: "Column Break" },
{
@@ -70,7 +69,7 @@ frappe.ui.form.on("BOM Creator", {
fieldtype: "Float",
fieldname: "qty",
reqd: 1,
- default: 1.0
+ default: 1.0,
},
{ fieldtype: "Section Break" },
{
@@ -79,7 +78,7 @@ frappe.ui.form.on("BOM Creator", {
fieldname: "currency",
options: "Currency",
reqd: 1,
- default: frappe.defaults.get_global_default("currency")
+ default: frappe.defaults.get_global_default("currency"),
},
{ fieldtype: "Column Break" },
{
@@ -87,42 +86,40 @@ frappe.ui.form.on("BOM Creator", {
fieldtype: "Float",
fieldname: "conversion_rate",
reqd: 1,
- default: 1.0
+ default: 1.0,
},
],
primary_action_label: __("Create"),
primary_action: (values) => {
values.doctype = frm.doc.doctype;
- frappe.db
- .insert(values)
- .then((doc) => {
- frappe.set_route("Form", doc.doctype, doc.name);
- });
- }
- })
+ frappe.db.insert(values).then((doc) => {
+ frappe.set_route("Form", doc.doctype, doc.name);
+ });
+ },
+ });
dialog.fields_dict.item_code.get_query = "erpnext.controllers.queries.item_query";
dialog.show();
},
set_queries(frm) {
- frm.set_query("bom_no", "items", function(doc, cdt, cdn) {
+ frm.set_query("bom_no", "items", function (doc, cdt, cdn) {
let item = frappe.get_doc(cdt, cdn);
return {
filters: {
item: item.item_code,
- }
- }
+ },
+ };
});
- frm.set_query("item_code", "items", function() {
+ frm.set_query("item_code", "items", function () {
return {
query: "erpnext.controllers.queries.item_query",
- }
+ };
});
- frm.set_query("fg_item", "items", function() {
+ frm.set_query("fg_item", "items", function () {
return {
query: "erpnext.controllers.queries.item_query",
- }
+ };
});
},
@@ -134,8 +131,7 @@ frappe.ui.form.on("BOM Creator", {
set_root_item(frm) {
if (frm.is_new() && frm.doc.items?.length) {
- frappe.model.set_value(frm.doc.items[0].doctype,
- frm.doc.items[0].name, "is_root", 1);
+ frappe.model.set_value(frm.doc.items[0].doctype, frm.doc.items[0].name, "is_root", 1);
}
},
@@ -157,8 +153,8 @@ frappe.ui.form.on("BOM Creator", {
frm.call({
method: "enqueue_create_boms",
doc: frm.doc,
- })
- }
+ });
+ },
});
frappe.ui.form.on("BOM Creator Item", {
@@ -176,24 +172,23 @@ frappe.ui.form.on("BOM Creator Item", {
method: "get_default_bom",
doc: frm.doc,
args: {
- item_code: item.item_code
+ item_code: item.item_code,
},
callback(r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, "bom_no", r.message);
}
- }
- })
+ },
+ });
} else {
frappe.model.set_value(cdt, cdn, "bom_no", "");
}
- }
+ },
});
-
erpnext.bom.BomConfigurator = class BomConfigurator extends erpnext.TransactionController {
conversion_rate(doc) {
- if(this.frm.doc.currency === this.get_company_currency()) {
+ if (this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
} else {
erpnext.bom.update_cost(doc);
@@ -222,4 +217,4 @@ erpnext.bom.BomConfigurator = class BomConfigurator extends erpnext.TransactionC
}
};
-extend_cscript(cur_frm.cscript, new erpnext.bom.BomConfigurator({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.bom.BomConfigurator({ frm: cur_frm }));
diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator_list.js b/erpnext/manufacturing/doctype/bom_creator/bom_creator_list.js
index 423b721e0474..880994c680b9 100644
--- a/erpnext/manufacturing/doctype/bom_creator/bom_creator_list.js
+++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator_list.js
@@ -1,4 +1,4 @@
-frappe.listview_settings['BOM Creator'] = {
+frappe.listview_settings["BOM Creator"] = {
add_fields: ["status"],
get_indicator: function (doc) {
if (doc.status === "Draft") {
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.js b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.js
index 6da808e26d12..7664c299b1a0 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.js
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.js
@@ -1,8 +1,7 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('BOM Update Log', {
+frappe.ui.form.on("BOM Update Log", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log_list.js b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log_list.js
index bc709d8fc439..cdaee70860ba 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log_list.js
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log_list.js
@@ -1,11 +1,11 @@
-frappe.listview_settings['BOM Update Log'] = {
+frappe.listview_settings["BOM Update Log"] = {
add_fields: ["status"],
get_indicator: (doc) => {
let status_map = {
- "Queued": "orange",
+ Queued: "orange",
"In Progress": "blue",
- "Completed": "green",
- "Failed": "red"
+ Completed: "green",
+ Failed: "red",
};
return [__(doc.status), status_map[doc.status], "status,=," + doc.status];
@@ -15,16 +15,14 @@ frappe.listview_settings['BOM Update Log'] = {
return;
}
- let sidebar_entry = $(
- ''
- ).appendTo(cur_list.page.sidebar);
+ let sidebar_entry = $('').appendTo(
+ cur_list.page.sidebar
+ );
let message = __("Note: Automatic log deletion only applies to logs of type Update Cost ");
$(`${message}
`).appendTo(sidebar_entry);
frappe.require("logtypes.bundle.js", () => {
frappe.utils.logtypes.show_log_retention_message(cur_list.doctype);
});
-
-
},
-};
\ No newline at end of file
+};
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js
index 7ba6517a4fbc..5cdb425bffce 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js
@@ -1,24 +1,24 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('BOM Update Tool', {
- setup: function(frm) {
- frm.set_query("current_bom", function() {
+frappe.ui.form.on("BOM Update Tool", {
+ setup: function (frm) {
+ frm.set_query("current_bom", function () {
return {
query: "erpnext.controllers.queries.bom",
- filters: {name: "!" + frm.doc.new_bom}
+ filters: { name: "!" + frm.doc.new_bom },
};
});
- frm.set_query("new_bom", function() {
+ frm.set_query("new_bom", function () {
return {
query: "erpnext.controllers.queries.bom",
- filters: {name: "!" + frm.doc.current_bom}
+ filters: { name: "!" + frm.doc.current_bom },
};
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.disable_save();
frm.events.disable_button(frm, "replace");
@@ -27,7 +27,7 @@ frappe.ui.form.on('BOM Update Tool', {
});
},
- disable_button: (frm, field, disable=true) => {
+ disable_button: (frm, field, disable = true) => {
frm.get_field(field).input.disabled = disable;
},
@@ -50,15 +50,15 @@ frappe.ui.form.on('BOM Update Tool', {
freeze: true,
args: {
boms: {
- "current_bom": frm.doc.current_bom,
- "new_bom": frm.doc.new_bom
- }
+ current_bom: frm.doc.current_bom,
+ new_bom: frm.doc.new_bom,
+ },
},
- callback: result => {
+ callback: (result) => {
if (result && result.message && !result.exc) {
frm.events.confirm_job_start(frm, result.message);
}
- }
+ },
});
}
},
@@ -67,20 +67,22 @@ frappe.ui.form.on('BOM Update Tool', {
frappe.call({
method: "erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.enqueue_update_cost",
freeze: true,
- callback: result => {
+ callback: (result) => {
if (result && result.message && !result.exc) {
frm.events.confirm_job_start(frm, result.message);
}
- }
+ },
});
},
confirm_job_start: (frm, log_data) => {
let log_link = frappe.utils.get_form_link("BOM Update Log", log_data.name, true);
frappe.msgprint({
- "message": __("BOM Updation is queued and may take a few minutes. Check {0} for progress.", [log_link]),
- "title": __("BOM Update Initiated"),
- "indicator": "blue"
+ message: __("BOM Updation is queued and may take a few minutes. Check {0} for progress.", [
+ log_link,
+ ]),
+ title: __("BOM Update Initiated"),
+ indicator: "blue",
});
- }
+ },
});
diff --git a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.js b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.js
index 3b7f5ba8d7f5..516e33c7a3b3 100644
--- a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.js
+++ b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Downtime Entry', {
+frappe.ui.form.on("Downtime Entry", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index 66212755b23d..4cc60a3b4a6d 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -1,40 +1,38 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Job Card', {
- setup: function(frm) {
- frm.set_query('operation', function() {
+frappe.ui.form.on("Job Card", {
+ setup: function (frm) {
+ frm.set_query("operation", function () {
return {
- query: 'erpnext.manufacturing.doctype.job_card.job_card.get_operations',
+ query: "erpnext.manufacturing.doctype.job_card.job_card.get_operations",
filters: {
- 'work_order': frm.doc.work_order
- }
+ work_order: frm.doc.work_order,
+ },
};
});
frm.set_query("serial_and_batch_bundle", () => {
return {
filters: {
- 'item_code': frm.doc.production_item,
- 'voucher_type': frm.doc.doctype,
- 'voucher_no': ["in", [frm.doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: frm.doc.production_item,
+ voucher_type: frm.doc.doctype,
+ voucher_no: ["in", [frm.doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
- frm.set_indicator_formatter('sub_operation',
- function(doc) {
- if (doc.status == "Pending") {
- return "red";
- } else {
- return doc.status === "Complete" ? "green" : "orange";
- }
+ frm.set_indicator_formatter("sub_operation", function (doc) {
+ if (doc.status == "Pending") {
+ return "red";
+ } else {
+ return doc.status === "Complete" ? "green" : "orange";
}
- );
+ });
},
- refresh: function(frm) {
+ refresh: function (frm) {
frappe.flags.pause_job = 0;
frappe.flags.resume_job = 0;
let has_items = frm.doc.items && frm.doc.items.length;
@@ -44,8 +42,7 @@ frappe.ui.form.on('Job Card', {
return;
}
- let has_stock_entry = frm.doc.__onload &&
- frm.doc.__onload.has_stock_entry ? true : false;
+ let has_stock_entry = frm.doc.__onload && frm.doc.__onload.has_stock_entry ? true : false;
frm.toggle_enable("for_quantity", !has_stock_entry);
@@ -71,33 +68,45 @@ frappe.ui.form.on('Job Card', {
}
if (frm.doc.docstatus == 1 && !frm.doc.is_corrective_job_card) {
- frm.trigger('setup_corrective_job_card');
+ frm.trigger("setup_corrective_job_card");
}
- frm.set_query("quality_inspection", function() {
+ frm.set_query("quality_inspection", function () {
return {
query: "erpnext.stock.doctype.quality_inspection.quality_inspection.quality_inspection_query",
filters: {
- "item_code": frm.doc.production_item,
- "reference_name": frm.doc.name
- }
+ item_code: frm.doc.production_item,
+ reference_name: frm.doc.name,
+ },
};
});
frm.trigger("toggle_operation_number");
- if (frm.doc.docstatus == 0 && !frm.is_new() &&
- (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity)
- && (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
-
+ if (
+ frm.doc.docstatus == 0 &&
+ !frm.is_new() &&
+ (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity) &&
+ (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)
+ ) {
// if Job Card is link to Work Order, the job card must not be able to start if Work Order not "Started"
// and if stock mvt for WIP is required
if (frm.doc.work_order) {
- frappe.db.get_value('Work Order', frm.doc.work_order, ['skip_transfer', 'status'], (result) => {
- if (result.skip_transfer === 1 || result.status == 'In Process' || frm.doc.transferred_qty > 0 || !frm.doc.items.length) {
- frm.trigger("prepare_timer_buttons");
+ frappe.db.get_value(
+ "Work Order",
+ frm.doc.work_order,
+ ["skip_transfer", "status"],
+ (result) => {
+ if (
+ result.skip_transfer === 1 ||
+ result.status == "In Process" ||
+ frm.doc.transferred_qty > 0 ||
+ !frm.doc.items.length
+ ) {
+ frm.trigger("prepare_timer_buttons");
+ }
}
- });
+ );
} else {
frm.trigger("prepare_timer_buttons");
}
@@ -106,100 +115,114 @@ frappe.ui.form.on('Job Card', {
frm.trigger("setup_quality_inspection");
if (frm.doc.work_order) {
- frappe.db.get_value('Work Order', frm.doc.work_order,
- 'transfer_material_against').then((r) => {
- if (r.message.transfer_material_against == 'Work Order') {
- frm.set_df_property('items', 'hidden', 1);
+ frappe.db.get_value("Work Order", frm.doc.work_order, "transfer_material_against").then((r) => {
+ if (r.message.transfer_material_against == "Work Order") {
+ frm.set_df_property("items", "hidden", 1);
}
});
}
- let sbb_field = frm.get_docfield('serial_and_batch_bundle');
+ let sbb_field = frm.get_docfield("serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = () => {
return {
- 'item_code': frm.doc.production_item,
- 'warehouse': frm.doc.wip_warehouse,
- 'voucher_type': frm.doc.doctype,
- }
+ item_code: frm.doc.production_item,
+ warehouse: frm.doc.wip_warehouse,
+ voucher_type: frm.doc.doctype,
+ };
};
}
},
- setup_quality_inspection: function(frm) {
+ setup_quality_inspection: function (frm) {
let quality_inspection_field = frm.get_docfield("quality_inspection");
- quality_inspection_field.get_route_options_for_new_doc = function(frm) {
- return {
- "inspection_type": "In Process",
- "reference_type": "Job Card",
- "reference_name": frm.doc.name,
- "item_code": frm.doc.production_item,
- "item_name": frm.doc.item_name,
- "item_serial_no": frm.doc.serial_no,
- "batch_no": frm.doc.batch_no,
- "quality_inspection_template": frm.doc.quality_inspection_template,
+ quality_inspection_field.get_route_options_for_new_doc = function (frm) {
+ return {
+ inspection_type: "In Process",
+ reference_type: "Job Card",
+ reference_name: frm.doc.name,
+ item_code: frm.doc.production_item,
+ item_name: frm.doc.item_name,
+ item_serial_no: frm.doc.serial_no,
+ batch_no: frm.doc.batch_no,
+ quality_inspection_template: frm.doc.quality_inspection_template,
};
};
},
- setup_corrective_job_card: function(frm) {
- frm.add_custom_button(__('Corrective Job Card'), () => {
- let operations = frm.doc.sub_operations.map(d => d.sub_operation).concat(frm.doc.operation);
-
- let fields = [
- {
- fieldtype: 'Link', label: __('Corrective Operation'), options: 'Operation',
- fieldname: 'operation', get_query() {
- return {
- filters: {
- "is_corrective_operation": 1
- }
- };
- }
- }, {
- fieldtype: 'Link', label: __('For Operation'), options: 'Operation',
- fieldname: 'for_operation', get_query() {
- return {
- filters: {
- "name": ["in", operations]
- }
- };
- }
- }
- ];
-
- frappe.prompt(fields, d => {
- frm.events.make_corrective_job_card(frm, d.operation, d.for_operation);
- }, __("Select Corrective Operation"));
- }, __('Make'));
+ setup_corrective_job_card: function (frm) {
+ frm.add_custom_button(
+ __("Corrective Job Card"),
+ () => {
+ let operations = frm.doc.sub_operations.map((d) => d.sub_operation).concat(frm.doc.operation);
+
+ let fields = [
+ {
+ fieldtype: "Link",
+ label: __("Corrective Operation"),
+ options: "Operation",
+ fieldname: "operation",
+ get_query() {
+ return {
+ filters: {
+ is_corrective_operation: 1,
+ },
+ };
+ },
+ },
+ {
+ fieldtype: "Link",
+ label: __("For Operation"),
+ options: "Operation",
+ fieldname: "for_operation",
+ get_query() {
+ return {
+ filters: {
+ name: ["in", operations],
+ },
+ };
+ },
+ },
+ ];
+
+ frappe.prompt(
+ fields,
+ (d) => {
+ frm.events.make_corrective_job_card(frm, d.operation, d.for_operation);
+ },
+ __("Select Corrective Operation")
+ );
+ },
+ __("Make")
+ );
},
- make_corrective_job_card: function(frm, operation, for_operation) {
+ make_corrective_job_card: function (frm, operation, for_operation) {
frappe.call({
- method: 'erpnext.manufacturing.doctype.job_card.job_card.make_corrective_job_card',
+ method: "erpnext.manufacturing.doctype.job_card.job_card.make_corrective_job_card",
args: {
source_name: frm.doc.name,
operation: operation,
- for_operation: for_operation
+ for_operation: for_operation,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
+ },
});
},
- operation: function(frm) {
+ operation: function (frm) {
frm.trigger("toggle_operation_number");
if (frm.doc.operation && frm.doc.work_order) {
frappe.call({
method: "erpnext.manufacturing.doctype.job_card.job_card.get_operation_details",
args: {
- "work_order":frm.doc.work_order,
- "operation":frm.doc.operation
+ work_order: frm.doc.work_order,
+ operation: frm.doc.operation,
},
callback: function (r) {
if (r.message) {
@@ -209,11 +232,13 @@ frappe.ui.form.on('Job Card', {
let args = [];
r.message.forEach((row) => {
- args.push({ "label": row.idx, "value": row.name });
+ args.push({ label: row.idx, value: row.name });
});
- let description = __("Operation {0} added multiple times in the work order {1}",
- [frm.doc.operation, frm.doc.work_order]);
+ let description = __("Operation {0} added multiple times in the work order {1}", [
+ frm.doc.operation,
+ frm.doc.work_order,
+ ]);
frm.set_df_property("operation_row_number", "options", args);
frm.set_df_property("operation_row_number", "description", description);
@@ -221,8 +246,8 @@ frappe.ui.form.on('Job Card', {
frm.trigger("toggle_operation_number");
}
- }
- })
+ },
+ });
}
},
@@ -237,16 +262,24 @@ frappe.ui.form.on('Job Card', {
frm.toggle_reqd("operation_row_number", !frm.doc.operation_id && frm.doc.operation);
},
- prepare_timer_buttons: function(frm) {
+ prepare_timer_buttons: function (frm) {
frm.trigger("make_dashboard");
if (!frm.doc.started_time && !frm.doc.current_time) {
frm.add_custom_button(__("Start Job"), () => {
if ((frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee) {
- frappe.prompt({fieldtype: 'Table MultiSelect', label: __('Select Employees'),
- options: "Job Card Time Log", fieldname: 'employees'}, d => {
- frm.events.start_job(frm, "Work In Progress", d.employees);
- }, __("Assign Job to Employee"));
+ frappe.prompt(
+ {
+ fieldtype: "Table MultiSelect",
+ label: __("Select Employees"),
+ options: "Job Card Time Log",
+ fieldname: "employees",
+ },
+ (d) => {
+ frm.events.start_job(frm, "Work In Progress", d.employees);
+ },
+ __("Assign Job to Employee")
+ );
} else {
frm.events.start_job(frm, "Work In Progress", frm.doc.employee);
}
@@ -268,16 +301,24 @@ frappe.ui.form.on('Job Card', {
set_qty = false;
let last_op_row = sub_operations[sub_operations.length - 2];
- if (last_op_row.status == 'Complete') {
+ if (last_op_row.status == "Complete") {
set_qty = true;
}
}
if (set_qty) {
- frappe.prompt({fieldtype: 'Float', label: __('Completed Quantity'),
- fieldname: 'qty', default: frm.doc.for_quantity}, data => {
- frm.events.complete_job(frm, "Complete", data.qty);
- }, __("Enter Value"));
+ frappe.prompt(
+ {
+ fieldtype: "Float",
+ label: __("Completed Quantity"),
+ fieldname: "qty",
+ default: frm.doc.for_quantity,
+ },
+ (data) => {
+ frm.events.complete_job(frm, "Complete", data.qty);
+ },
+ __("Enter Value")
+ );
} else {
frm.events.complete_job(frm, "Complete", 0.0);
}
@@ -285,64 +326,63 @@ frappe.ui.form.on('Job Card', {
}
},
- start_job: function(frm, status, employee) {
+ start_job: function (frm, status, employee) {
const args = {
job_card_id: frm.doc.name,
start_time: frappe.datetime.now_datetime(),
employees: employee,
- status: status
+ status: status,
};
frm.events.make_time_log(frm, args);
},
- complete_job: function(frm, status, completed_qty) {
+ complete_job: function (frm, status, completed_qty) {
const args = {
job_card_id: frm.doc.name,
complete_time: frappe.datetime.now_datetime(),
status: status,
- completed_qty: completed_qty
+ completed_qty: completed_qty,
};
frm.events.make_time_log(frm, args);
},
- make_time_log: function(frm, args) {
+ make_time_log: function (frm, args) {
frm.events.update_sub_operation(frm, args);
frappe.call({
method: "erpnext.manufacturing.doctype.job_card.job_card.make_time_log",
args: {
- args: args
+ args: args,
},
freeze: true,
callback: function () {
frm.reload_doc();
frm.trigger("make_dashboard");
- }
+ },
});
},
- update_sub_operation: function(frm, args) {
+ update_sub_operation: function (frm, args) {
if (frm.doc.sub_operations && frm.doc.sub_operations.length) {
- let sub_operations = frm.doc.sub_operations.filter(d => d.status != 'Complete');
+ let sub_operations = frm.doc.sub_operations.filter((d) => d.status != "Complete");
if (sub_operations && sub_operations.length) {
args["sub_operation"] = sub_operations[0].sub_operation;
}
}
},
- validate: function(frm) {
+ validate: function (frm) {
if ((!frm.doc.time_logs || !frm.doc.time_logs.length) && frm.doc.started_time) {
frm.trigger("reset_timer");
}
},
- reset_timer: function(frm) {
- frm.set_value('started_time' , '');
+ reset_timer: function (frm) {
+ frm.set_value("started_time", "");
},
- make_dashboard: function(frm) {
- if(frm.doc.__islocal)
- return;
+ make_dashboard: function (frm) {
+ if (frm.doc.__islocal) return;
function setCurrentIncrement() {
currentIncrement += 1;
@@ -351,16 +391,22 @@ frappe.ui.form.on('Job Card', {
function updateStopwatch(increment) {
var hours = Math.floor(increment / 3600);
- var minutes = Math.floor((increment - (hours * 3600)) / 60);
- var seconds = increment - (hours * 3600) - (minutes * 60);
-
- $(section).find(".hours").text(hours < 10 ? ("0" + hours.toString()) : hours.toString());
- $(section).find(".minutes").text(minutes < 10 ? ("0" + minutes.toString()) : minutes.toString());
- $(section).find(".seconds").text(seconds < 10 ? ("0" + seconds.toString()) : seconds.toString());
+ var minutes = Math.floor((increment - hours * 3600) / 60);
+ var seconds = increment - hours * 3600 - minutes * 60;
+
+ $(section)
+ .find(".hours")
+ .text(hours < 10 ? "0" + hours.toString() : hours.toString());
+ $(section)
+ .find(".minutes")
+ .text(minutes < 10 ? "0" + minutes.toString() : minutes.toString());
+ $(section)
+ .find(".seconds")
+ .text(seconds < 10 ? "0" + seconds.toString() : seconds.toString());
}
function initialiseTimer() {
- const interval = setInterval(function() {
+ const interval = setInterval(function () {
var current = setCurrentIncrement();
updateStopwatch(current);
}, 1000);
@@ -384,75 +430,76 @@ frappe.ui.form.on('Job Card', {
if (frm.doc.status == "On Hold") {
updateStopwatch(currentIncrement);
} else {
- currentIncrement += moment(frappe.datetime.now_datetime()).diff(moment(frm.doc.started_time),"seconds");
+ currentIncrement += moment(frappe.datetime.now_datetime()).diff(
+ moment(frm.doc.started_time),
+ "seconds"
+ );
initialiseTimer();
}
}
},
- hide_timer: function(frm) {
+ hide_timer: function (frm) {
frm.toolbar.page.inner_toolbar.find(".stopwatch").remove();
},
- for_quantity: function(frm) {
+ for_quantity: function (frm) {
frm.doc.items = [];
frm.call({
method: "get_required_items",
doc: frm.doc,
- callback: function() {
+ callback: function () {
refresh_field("items");
- }
- })
+ },
+ });
},
- make_material_request: function(frm) {
+ make_material_request: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.manufacturing.doctype.job_card.job_card.make_material_request",
frm: frm,
- run_link_triggers: true
+ run_link_triggers: true,
});
},
- make_stock_entry: function(frm) {
+ make_stock_entry: function (frm) {
frappe.model.open_mapped_doc({
method: "erpnext.manufacturing.doctype.job_card.job_card.make_stock_entry",
frm: frm,
- run_link_triggers: true
+ run_link_triggers: true,
});
},
- timer: function(frm) {
- return ` Start `
+ timer: function (frm) {
+ return ` Start `;
},
- set_total_completed_qty: function(frm) {
+ set_total_completed_qty: function (frm) {
frm.doc.total_completed_qty = 0;
- frm.doc.time_logs.forEach(d => {
+ frm.doc.time_logs.forEach((d) => {
if (d.completed_qty) {
frm.doc.total_completed_qty += d.completed_qty;
}
});
if (frm.doc.total_completed_qty && frm.doc.for_quantity > frm.doc.total_completed_qty) {
- let flt_precision = precision('for_quantity', frm.doc);
- let process_loss_qty = (
- flt(frm.doc.for_quantity, flt_precision)
- - flt(frm.doc.total_completed_qty, flt_precision)
- );
+ let flt_precision = precision("for_quantity", frm.doc);
+ let process_loss_qty =
+ flt(frm.doc.for_quantity, flt_precision) - flt(frm.doc.total_completed_qty, flt_precision);
- frm.set_value('process_loss_qty', process_loss_qty);
+ frm.set_value("process_loss_qty", process_loss_qty);
}
refresh_field("total_completed_qty");
- }
+ },
});
-frappe.ui.form.on('Job Card Time Log', {
- completed_qty: function(frm) {
+frappe.ui.form.on("Job Card Time Log", {
+ completed_qty: function (frm) {
frm.events.set_total_completed_qty(frm);
},
- to_time: function(frm) {
- frm.set_value('started_time', '');
- }
-})
+ to_time: function (frm) {
+ frm.set_value("started_time", "");
+ },
+});
diff --git a/erpnext/manufacturing/doctype/job_card/job_card_calendar.js b/erpnext/manufacturing/doctype/job_card/job_card_calendar.js
index 9e3208535149..7b32a6ee289f 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card_calendar.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card_calendar.js
@@ -1,31 +1,31 @@
frappe.views.calendar["Job Card"] = {
field_map: {
- "start": "from_time",
- "end": "to_time",
- "id": "name",
- "title": "subject",
- "color": "color",
- "allDay": "allDay",
- "progress": "progress"
+ start: "from_time",
+ end: "to_time",
+ id: "name",
+ title: "subject",
+ color: "color",
+ allDay: "allDay",
+ progress: "progress",
},
gantt: {
field_map: {
- "start": "expected_start_date",
- "end": "expected_end_date",
- "id": "name",
- "title": "subject",
- "color": "color",
- "allDay": "allDay",
- "progress": "progress"
- }
+ start: "expected_start_date",
+ end: "expected_end_date",
+ id: "name",
+ title: "subject",
+ color: "color",
+ allDay: "allDay",
+ progress: "progress",
+ },
},
filters: [
{
- "fieldtype": "Link",
- "fieldname": "employee",
- "options": "Employee",
- "label": __("Employee")
- }
+ fieldtype: "Link",
+ fieldname: "employee",
+ options: "Employee",
+ label: __("Employee"),
+ },
],
- get_events_method: "erpnext.manufacturing.doctype.job_card.job_card.get_job_details"
+ get_events_method: "erpnext.manufacturing.doctype.job_card.job_card.get_job_details",
};
diff --git a/erpnext/manufacturing/doctype/job_card/job_card_list.js b/erpnext/manufacturing/doctype/job_card/job_card_list.js
index 99fca9570f71..e417b7f576d0 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card_list.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card_list.js
@@ -1,17 +1,17 @@
-frappe.listview_settings['Job Card'] = {
+frappe.listview_settings["Job Card"] = {
has_indicator_for_draft: true,
add_fields: ["expected_start_date", "expected_end_date"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
const status_colors = {
"Work In Progress": "orange",
- "Completed": "green",
- "Cancelled": "red",
+ Completed: "green",
+ Cancelled: "red",
"Material Transferred": "blue",
- "Open": "red",
+ Open: "red",
};
const status = doc.status || "Open";
const color = status_colors[status] || "blue";
return [__(status), color, `status,=,${status}`];
- }
+ },
};
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
index a0122a473858..f54478a1c10b 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
@@ -1,33 +1,40 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Manufacturing Settings', {
-});
+frappe.ui.form.on("Manufacturing Settings", {});
frappe.tour["Manufacturing Settings"] = [
{
fieldname: "material_consumption",
title: __("Allow Multiple Material Consumption"),
- description: __("If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured.")
+ description: __(
+ "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
+ ),
},
{
fieldname: "backflush_raw_materials_based_on",
title: __("Backflush Raw Materials"),
- description: __("The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.
`);
+ this.get_stock_summary(start, item_code, item_group).then((stock_summary) => {
+ this.wrapper.find(".stock-summary-container").remove();
+ this.wrapper.append(
+ `
`
+ );
this.stock_summary = stock_summary.message;
this.render_stock_summary();
this.bind_events();
@@ -131,8 +134,8 @@ class VisualStock {
warehouse: this.frm.doc.warehouse,
start: start,
item_code: item_code,
- item_group: item_group
- }
+ item_group: item_group,
+ },
});
return stock_summary;
@@ -140,71 +143,80 @@ class VisualStock {
render_stock_summary() {
let template = frappe.render_template("stock_summary_template", {
- stock_summary: this.stock_summary
+ stock_summary: this.stock_summary,
});
- this.wrapper.find('.stock-summary-container').append(template);
+ this.wrapper.find(".stock-summary-container").append(template);
}
bind_events() {
- this.wrapper.find('.btn-add').click((e) => {
- this.item_code = decodeURI($(e.currentTarget).attr('data-item-code'));
-
- this.make_stock_entry([
- {
- label: __("For Item"),
- fieldname: "item_code",
- fieldtype: "Data",
- read_only: 1,
- default: this.item_code
- },
- {
- label: __("Quantity"),
- fieldname: "qty",
- fieldtype: "Float",
- reqd: 1
- }
- ], __("Add Stock"), "Material Receipt")
+ this.wrapper.find(".btn-add").click((e) => {
+ this.item_code = decodeURI($(e.currentTarget).attr("data-item-code"));
+
+ this.make_stock_entry(
+ [
+ {
+ label: __("For Item"),
+ fieldname: "item_code",
+ fieldtype: "Data",
+ read_only: 1,
+ default: this.item_code,
+ },
+ {
+ label: __("Quantity"),
+ fieldname: "qty",
+ fieldtype: "Float",
+ reqd: 1,
+ },
+ ],
+ __("Add Stock"),
+ "Material Receipt"
+ );
});
- this.wrapper.find('.btn-move').click((e) => {
- this.item_code = decodeURI($(e.currentTarget).attr('data-item-code'));
-
- this.make_stock_entry([
- {
- label: __("For Item"),
- fieldname: "item_code",
- fieldtype: "Data",
- read_only: 1,
- default: this.item_code
- },
- {
- label: __("Quantity"),
- fieldname: "qty",
- fieldtype: "Float",
- reqd: 1
- },
- {
- label: __("To Warehouse"),
- fieldname: "to_warehouse",
- fieldtype: "Link",
- options: "Warehouse",
- reqd: 1,
- get_query: () => {
- return {
- filters: {
- "is_group": 0,
- "company": this.frm.doc.company
- }
- }
- }
- }
- ], __("Move Stock"), "Material Transfer")
+ this.wrapper.find(".btn-move").click((e) => {
+ this.item_code = decodeURI($(e.currentTarget).attr("data-item-code"));
+
+ this.make_stock_entry(
+ [
+ {
+ label: __("For Item"),
+ fieldname: "item_code",
+ fieldtype: "Data",
+ read_only: 1,
+ default: this.item_code,
+ },
+ {
+ label: __("Quantity"),
+ fieldname: "qty",
+ fieldtype: "Float",
+ reqd: 1,
+ },
+ {
+ label: __("To Warehouse"),
+ fieldname: "to_warehouse",
+ fieldtype: "Link",
+ options: "Warehouse",
+ reqd: 1,
+ get_query: () => {
+ return {
+ filters: {
+ is_group: 0,
+ company: this.frm.doc.company,
+ },
+ };
+ },
+ },
+ ],
+ __("Move Stock"),
+ "Material Transfer"
+ );
});
}
make_stock_entry(fields, title, stock_entry_type) {
- frappe.prompt(fields,
+ frappe.prompt(
+ fields,
(values) => {
this.values = values;
this.stock_entry_type = stock_entry_type;
@@ -221,9 +233,11 @@ class VisualStock {
var doc = frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
- })
- }, __(title), __("Create")
+ },
+ });
+ },
+ __(title),
+ __("Create")
);
}
@@ -245,12 +259,12 @@ class VisualStock {
this.values = {
...this.values,
...{
- "company": this.frm.doc.company,
- "item_code": this.item_code,
- "from_warehouse": from_warehouse,
- "to_warehouse": to_warehouse,
- "purpose": this.stock_entry_type,
- }
- }
+ company: this.frm.doc.company,
+ item_code: this.item_code,
+ from_warehouse: from_warehouse,
+ to_warehouse: to_warehouse,
+ purpose: this.stock_entry_type,
+ },
+ };
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 667ece2077ec..54d1414c8145 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -1,11 +1,10 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Production Plan', {
-
+frappe.ui.form.on("Production Plan", {
before_save(frm) {
// preserve temporary names on production plan item to re-link sub-assembly items
- frm.doc.po_items.forEach(item => {
+ frm.doc.po_items.forEach((item) => {
item.temporary_name = item.name;
});
},
@@ -14,8 +13,8 @@ frappe.ui.form.on('Production Plan', {
frm.trigger("setup_queries");
frm.custom_make_buttons = {
- 'Work Order': 'Work Order / Subcontract PO',
- 'Material Request': 'Material Request',
+ "Work Order": "Work Order / Subcontract PO",
+ "Material Request": "Material Request",
};
},
@@ -25,36 +24,36 @@ frappe.ui.form.on('Production Plan', {
query: "erpnext.manufacturing.doctype.production_plan.production_plan.sales_order_query",
filters: {
company: frm.doc.company,
- }
- }
+ },
+ };
});
- frm.set_query('for_warehouse', function(doc) {
+ frm.set_query("for_warehouse", function (doc) {
return {
filters: {
company: doc.company,
- is_group: 0
- }
- }
+ is_group: 0,
+ },
+ };
});
- frm.set_query('material_request', 'material_requests', function() {
+ frm.set_query("material_request", "material_requests", function () {
return {
filters: {
material_request_type: "Manufacture",
docstatus: 1,
status: ["!=", "Stopped"],
- }
+ },
};
});
frm.set_query("item_code", "po_items", (doc, cdt, cdn) => {
return {
query: "erpnext.controllers.queries.item_query",
- filters:{
- 'is_stock_item': 1,
- }
- }
+ filters: {
+ is_stock_item: 1,
+ },
+ };
});
frm.set_query("bom_no", "po_items", (doc, cdt, cdn) => {
@@ -62,25 +61,25 @@ frappe.ui.form.on('Production Plan', {
if (d.item_code) {
return {
query: "erpnext.controllers.queries.bom",
- filters:{'item': d.item_code, 'docstatus': 1}
- }
+ filters: { item: d.item_code, docstatus: 1 },
+ };
} else frappe.msgprint(__("Please enter Item first"));
});
frm.set_query("warehouse", "mr_items", (doc) => {
return {
filters: {
- company: doc.company
- }
- }
+ company: doc.company,
+ },
+ };
});
frm.set_query("warehouse", "po_items", (doc) => {
return {
filters: {
- company: doc.company
- }
- }
+ company: doc.company,
+ },
+ };
});
},
@@ -89,36 +88,62 @@ frappe.ui.form.on('Production Plan', {
frm.trigger("show_progress");
if (frm.doc.status !== "Completed") {
- frm.add_custom_button(__("Production Plan Summary"), ()=> {
- frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
- }, __('View'));
-
- if (frm.doc.status === "Closed") {
- frm.add_custom_button(__("Re-open"), function() {
- frm.events.close_open_production_plan(frm, false);
- }, __("Status"));
+ frm.add_custom_button(
+ __("Production Plan Summary"),
+ () => {
+ frappe.set_route("query-report", "Production Plan Summary", {
+ production_plan: frm.doc.name,
+ });
+ },
+ __("View")
+ );
+
+ if (frm.doc.status === "Closed") {
+ frm.add_custom_button(
+ __("Re-open"),
+ function () {
+ frm.events.close_open_production_plan(frm, false);
+ },
+ __("Status")
+ );
} else {
- frm.add_custom_button(__("Close"), function() {
- frm.events.close_open_production_plan(frm, true);
- }, __("Status"));
+ frm.add_custom_button(
+ __("Close"),
+ function () {
+ frm.events.close_open_production_plan(frm, true);
+ },
+ __("Status")
+ );
}
if (frm.doc.po_items && frm.doc.status !== "Closed") {
- frm.add_custom_button(__("Work Order / Subcontract PO"), ()=> {
- frm.trigger("make_work_order");
- }, __('Create'));
+ frm.add_custom_button(
+ __("Work Order / Subcontract PO"),
+ () => {
+ frm.trigger("make_work_order");
+ },
+ __("Create")
+ );
}
- if (frm.doc.mr_items && frm.doc.mr_items.length && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
- frm.add_custom_button(__("Material Request"), ()=> {
- frm.trigger("make_material_request");
- }, __('Create'));
+ if (
+ frm.doc.mr_items &&
+ frm.doc.mr_items.length &&
+ !in_list(["Material Requested", "Closed"], frm.doc.status)
+ ) {
+ frm.add_custom_button(
+ __("Material Request"),
+ () => {
+ frm.trigger("make_material_request");
+ },
+ __("Create")
+ );
}
}
}
if (frm.doc.status !== "Closed") {
- frm.page.set_inner_btn_group_as_primary(__('Create'));
+ frm.page.set_inner_btn_group_as_primary(__("Create"));
}
frm.trigger("material_requirement");
@@ -145,19 +170,19 @@ frappe.ui.form.on('Production Plan', {
${__("Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured.")}
- ${__('Requested Qty: Quantity requested for purchase, but not ordered.')}
+ ${__("Requested Qty: Quantity requested for purchase, but not ordered.")}
- ${__('Ordered Qty: Quantity ordered for purchase, but not received.')}
+ ${__("Ordered Qty: Quantity ordered for purchase, but not received.")}
${__("Reserved Qty: Quantity ordered for sale, but not delivered.")}
- ${__('Reserved Qty for Production: Raw materials quantity to make manufacturing items.')}
+ ${__("Reserved Qty for Production: Raw materials quantity to make manufacturing items.")}
- ${__('Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.')}
+ ${__("Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.")}
@@ -168,15 +193,15 @@ frappe.ui.form.on('Production Plan', {
set_field_options("projected_qty_formula", projected_qty_formula);
},
- close_open_production_plan(frm, close=false) {
+ close_open_production_plan(frm, close = false) {
frappe.call({
method: "set_status",
freeze: true,
doc: frm.doc,
- args: {close : close, update_bin: true},
- callback: function() {
+ args: { close: close, update_bin: true },
+ callback: function () {
frm.reload_doc();
- }
+ },
});
},
@@ -185,19 +210,19 @@ frappe.ui.form.on('Production Plan', {
method: "make_work_order",
freeze: true,
doc: frm.doc,
- callback: function() {
+ callback: function () {
frm.reload_doc();
- }
+ },
});
},
make_material_request(frm) {
-
- frappe.confirm(__("Do you want to submit the material request"),
- function() {
+ frappe.confirm(
+ __("Do you want to submit the material request"),
+ function () {
frm.events.create_material_request(frm, 1);
},
- function() {
+ function () {
frm.events.create_material_request(frm, 0);
}
);
@@ -210,9 +235,9 @@ frappe.ui.form.on('Production Plan', {
method: "make_material_request",
freeze: true,
doc: frm.doc,
- callback: function(r) {
+ callback: function (r) {
frm.reload_doc();
- }
+ },
});
},
@@ -220,9 +245,9 @@ frappe.ui.form.on('Production Plan', {
frappe.call({
method: "get_open_sales_orders",
doc: frm.doc,
- callback: function(r) {
+ callback: function (r) {
refresh_field("sales_orders");
- }
+ },
});
},
@@ -230,22 +255,22 @@ frappe.ui.form.on('Production Plan', {
frappe.call({
method: "get_pending_material_requests",
doc: frm.doc,
- callback: function() {
- refresh_field('material_requests');
- }
+ callback: function () {
+ refresh_field("material_requests");
+ },
});
},
get_items(frm) {
- frm.clear_table('prod_plan_references');
+ frm.clear_table("prod_plan_references");
frappe.call({
method: "get_items",
freeze: true,
doc: frm.doc,
callback: function () {
- refresh_field('po_items');
- }
+ refresh_field("po_items");
+ },
});
},
combine_items(frm) {
@@ -255,12 +280,12 @@ frappe.ui.form.on('Production Plan', {
method: "get_items",
freeze: true,
doc: frm.doc,
- callback: function() {
+ callback: function () {
frm.refresh_field("po_items");
if (frm.doc.sub_assembly_items.length > 0) {
frm.trigger("get_sub_assembly_items");
}
- }
+ },
});
},
@@ -278,9 +303,9 @@ frappe.ui.form.on('Production Plan', {
method: "get_sub_assembly_items",
freeze: true,
doc: frm.doc,
- callback: function() {
+ callback: function () {
refresh_field("sub_assembly_items");
- }
+ },
});
},
@@ -294,9 +319,11 @@ frappe.ui.form.on('Production Plan', {
frappe.throw(__("Select the Warehouse"));
}
- frm.events.get_items_for_material_requests(frm, [{
- warehouse: frm.doc.for_warehouse
- }]);
+ frm.events.get_items_for_material_requests(frm, [
+ {
+ warehouse: frm.doc.for_warehouse,
+ },
+ ]);
},
transfer_materials(frm) {
@@ -315,26 +342,26 @@ frappe.ui.form.on('Production Plan', {
title: title,
fields: [
{
- 'label': __('Transfer From Warehouses'),
- 'fieldtype': 'Table MultiSelect',
- 'fieldname': 'warehouses',
- 'options': 'Production Plan Material Request Warehouse',
+ label: __("Transfer From Warehouses"),
+ fieldtype: "Table MultiSelect",
+ fieldname: "warehouses",
+ options: "Production Plan Material Request Warehouse",
get_query: function () {
return {
filters: {
- company: frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
},
},
{
- 'label': __('For Warehouse'),
- 'fieldtype': 'Link',
- 'fieldname': 'target_warehouse',
- 'read_only': true,
- 'default': frm.doc.for_warehouse
- }
- ]
+ label: __("For Warehouse"),
+ fieldtype: "Link",
+ fieldname: "target_warehouse",
+ read_only: true,
+ default: frm.doc.for_warehouse,
+ },
+ ],
});
dialog.show();
@@ -353,82 +380,90 @@ frappe.ui.form.on('Production Plan', {
freeze: true,
args: {
doc: frm.doc,
- warehouses: warehouses || []
+ warehouses: warehouses || [],
},
- callback: function(r) {
- if(r.message) {
- frm.set_value('mr_items', []);
- r.message.forEach(row => {
- let d = frm.add_child('mr_items');
+ callback: function (r) {
+ if (r.message) {
+ frm.set_value("mr_items", []);
+ r.message.forEach((row) => {
+ let d = frm.add_child("mr_items");
for (let field in row) {
- if (field !== 'name') {
+ if (field !== "name") {
d[field] = row[field];
}
}
});
}
- refresh_field('mr_items');
- }
+ refresh_field("mr_items");
+ },
});
},
download_materials_required(frm) {
- const fields = [{
- fieldname: 'warehouses',
- fieldtype: 'Table MultiSelect',
- label: __('Warehouses'),
- default: frm.doc.from_warehouse,
- options: "Production Plan Material Request Warehouse",
- get_query: function () {
- return {
- filters: {
- company: frm.doc.company
- }
- };
+ const fields = [
+ {
+ fieldname: "warehouses",
+ fieldtype: "Table MultiSelect",
+ label: __("Warehouses"),
+ default: frm.doc.from_warehouse,
+ options: "Production Plan Material Request Warehouse",
+ get_query: function () {
+ return {
+ filters: {
+ company: frm.doc.company,
+ },
+ };
+ },
},
- }];
-
- frappe.prompt(fields, (row) => {
- let get_template_url = 'erpnext.manufacturing.doctype.production_plan.production_plan.download_raw_materials';
- open_url_post(frappe.request.url, {
- cmd: get_template_url,
- doc: frm.doc,
- warehouses: row.warehouses
- });
- }, __('Select Warehouses to get Stock for Materials Planning'), __('Get Stock'));
+ ];
+
+ frappe.prompt(
+ fields,
+ (row) => {
+ let get_template_url =
+ "erpnext.manufacturing.doctype.production_plan.production_plan.download_raw_materials";
+ open_url_post(frappe.request.url, {
+ cmd: get_template_url,
+ doc: frm.doc,
+ warehouses: row.warehouses,
+ });
+ },
+ __("Select Warehouses to get Stock for Materials Planning"),
+ __("Get Stock")
+ );
},
show_progress(frm) {
var bars = [];
- var message = '';
- var title = '';
+ var message = "";
+ var title = "";
// produced qty
let item_wise_qty = {};
frm.doc.po_items.forEach((data) => {
- if(!item_wise_qty[data.item_code]) {
+ if (!item_wise_qty[data.item_code]) {
item_wise_qty[data.item_code] = data.produced_qty;
} else {
item_wise_qty[data.item_code] += data.produced_qty;
}
- })
+ });
if (item_wise_qty) {
for (var key in item_wise_qty) {
- title += __('Item {0}: {1} qty produced. ', [key, item_wise_qty[key]]);
+ title += __("Item {0}: {1} qty produced. ", [key, item_wise_qty[key]]);
}
}
bars.push({
- 'title': title,
- 'width': (frm.doc.total_produced_qty / frm.doc.total_planned_qty * 100) + '%',
- 'progress_class': 'progress-bar-success'
+ title: title,
+ width: (frm.doc.total_produced_qty / frm.doc.total_planned_qty) * 100 + "%",
+ progress_class: "progress-bar-success",
});
- if (bars[0].width == '0%') {
- bars[0].width = '0.5%';
+ if (bars[0].width == "0%") {
+ bars[0].width = "0.5%";
}
message = title;
- frm.dashboard.add_progress(__('Status'), bars, message);
+ frm.dashboard.add_progress(__("Status"), bars, message);
},
});
@@ -439,13 +474,13 @@ frappe.ui.form.on("Production Plan Item", {
frappe.call({
method: "erpnext.manufacturing.doctype.production_plan.production_plan.get_item_data",
args: {
- item_code: row.item_code
+ item_code: row.item_code,
},
- callback: function(r) {
+ callback: function (r) {
for (let key in r.message) {
frappe.model.set_value(cdt, cdn, key, r.message[key]);
}
- }
+ },
});
}
},
@@ -460,30 +495,29 @@ frappe.ui.form.on("Material Request Plan Item", {
args: {
row: row,
company: frm.doc.company,
- for_warehouse: row.warehouse
+ for_warehouse: row.warehouse,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- let {projected_qty, actual_qty} = r.message[0];
+ let { projected_qty, actual_qty } = r.message[0];
frappe.model.set_value(cdt, cdn, {
- 'projected_qty': projected_qty,
- 'actual_qty': actual_qty
+ projected_qty: projected_qty,
+ actual_qty: actual_qty,
});
}
- }
- })
+ },
+ });
}
},
material_request_type(frm, cdt, cdn) {
let row = locals[cdt][cdn];
- if (row.from_warehouse &&
- row.material_request_type !== "Material Transfer") {
- frappe.model.set_value(cdt, cdn, 'from_warehouse', '');
+ if (row.from_warehouse && row.material_request_type !== "Material Transfer") {
+ frappe.model.set_value(cdt, cdn, "from_warehouse", "");
}
- }
+ },
});
frappe.ui.form.on("Production Plan Sales Order", {
@@ -506,53 +540,61 @@ frappe.ui.form.on("Production Plan Sales Order", {
method: "erpnext.manufacturing.doctype.production_plan.production_plan.get_so_details",
args: { sales_order },
callback(r) {
- const {transaction_date, customer, grand_total} = r.message;
- frappe.model.set_value(cdt, cdn, 'sales_order_date', transaction_date);
- frappe.model.set_value(cdt, cdn, 'customer', customer);
- frappe.model.set_value(cdt, cdn, 'grand_total', grand_total);
- }
+ const { transaction_date, customer, grand_total } = r.message;
+ frappe.model.set_value(cdt, cdn, "sales_order_date", transaction_date);
+ frappe.model.set_value(cdt, cdn, "customer", customer);
+ frappe.model.set_value(cdt, cdn, "grand_total", grand_total);
+ },
});
- }
+ },
});
}
- }
+ },
});
frappe.ui.form.on("Production Plan Sub Assembly Item", {
fg_warehouse(frm, cdt, cdn) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "sub_assembly_items", "fg_warehouse");
},
-})
+});
-frappe.tour['Production Plan'] = [
+frappe.tour["Production Plan"] = [
{
fieldname: "get_items_from",
title: "Get Items From",
- description: __("Select whether to get items from a Sales Order or a Material Request. For now select Sales Order .\n A Production Plan can also be created manually where you can select the Items to manufacture.")
+ description: __(
+ "Select whether to get items from a Sales Order or a Material Request. For now select Sales Order .\n A Production Plan can also be created manually where you can select the Items to manufacture."
+ ),
},
{
fieldname: "get_sales_orders",
title: "Get Sales Orders",
- description: __("Click on Get Sales Orders to fetch sales orders based on the above filters.")
+ description: __("Click on Get Sales Orders to fetch sales orders based on the above filters."),
},
{
fieldname: "get_items",
title: "Get Finished Goods for Manufacture",
- description: __("Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched.")
+ description: __(
+ "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
+ ),
},
{
fieldname: "po_items",
title: "Finished Goods",
- description: __("On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process.")
+ description: __(
+ "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
+ ),
},
{
fieldname: "include_non_stock_items",
title: "Include Non Stock Items",
- description: __("To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked.")
+ description: __(
+ "To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked."
+ ),
},
{
fieldname: "include_subcontracted_items",
title: "Include Subcontracted Items",
- description: __("To add subcontracted Item's raw materials if include exploded items is disabled.")
- }
+ description: __("To add subcontracted Item's raw materials if include exploded items is disabled."),
+ },
];
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan_list.js b/erpnext/manufacturing/doctype/production_plan/production_plan_list.js
index 8f946866247a..bfef6e1220f3 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan_list.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan_list.js
@@ -1,4 +1,4 @@
-frappe.listview_settings['Production Plan'] = {
+frappe.listview_settings["Production Plan"] = {
hide_name_column: true,
add_fields: ["status"],
filters: [["status", "!=", "Closed"]],
@@ -6,14 +6,18 @@ frappe.listview_settings['Production Plan'] = {
if (doc.status === "Submitted") {
return [__("Not Started"), "orange", "status,=,Submitted"];
} else {
- return [__(doc.status), {
- "Draft": "red",
- "In Process": "orange",
- "Completed": "green",
- "Material Requested": "yellow",
- "Cancelled": "gray",
- "Closed": "grey"
- }[doc.status], "status,=," + doc.status];
+ return [
+ __(doc.status),
+ {
+ Draft: "red",
+ "In Process": "orange",
+ Completed: "green",
+ "Material Requested": "yellow",
+ Cancelled: "gray",
+ Closed: "grey",
+ }[doc.status],
+ "status,=," + doc.status,
+ ];
}
- }
+ },
};
diff --git a/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.js b/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.js
index 53f87582d10e..d4e74fa3ec7b 100644
--- a/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.js
+++ b/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Production Plan Material Request Warehouse', {
+frappe.ui.form.on("Production Plan Material Request Warehouse", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/manufacturing/doctype/routing/routing.js b/erpnext/manufacturing/doctype/routing/routing.js
index 784e83a4c032..fe67fe3feb63 100644
--- a/erpnext/manufacturing/doctype/routing/routing.js
+++ b/erpnext/manufacturing/doctype/routing/routing.js
@@ -1,38 +1,39 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Routing', {
- refresh: function(frm) {
+frappe.ui.form.on("Routing", {
+ refresh: function (frm) {
frm.trigger("display_sequence_id_column");
},
- onload: function(frm) {
+ onload: function (frm) {
frm.trigger("display_sequence_id_column");
},
- display_sequence_id_column: function(frm) {
- frm.fields_dict.operations.grid.update_docfield_property(
- 'sequence_id', 'in_list_view', 1
- );
+ display_sequence_id_column: function (frm) {
+ frm.fields_dict.operations.grid.update_docfield_property("sequence_id", "in_list_view", 1);
},
- calculate_operating_cost: function(frm, child) {
- const operating_cost = flt(flt(child.hour_rate) * flt(child.time_in_mins) / 60, precision("operating_cost", child));
+ calculate_operating_cost: function (frm, child) {
+ const operating_cost = flt(
+ (flt(child.hour_rate) * flt(child.time_in_mins)) / 60,
+ precision("operating_cost", child)
+ );
frappe.model.set_value(child.doctype, child.name, "operating_cost", operating_cost);
- }
+ },
});
-frappe.ui.form.on('BOM Operation', {
- operation: function(frm, cdt, cdn) {
+frappe.ui.form.on("BOM Operation", {
+ operation: function (frm, cdt, cdn) {
const d = locals[cdt][cdn];
- if(!d.operation) return;
+ if (!d.operation) return;
frappe.call({
- "method": "frappe.client.get",
+ method: "frappe.client.get",
args: {
doctype: "Operation",
- name: d.operation
+ name: d.operation,
},
callback: function (data) {
if (data.message.description) {
@@ -44,41 +45,43 @@ frappe.ui.form.on('BOM Operation', {
}
frm.events.calculate_operating_cost(frm, d);
- }
+ },
});
},
- workstation: function(frm, cdt, cdn) {
+ workstation: function (frm, cdt, cdn) {
const d = locals[cdt][cdn];
- if(!d.workstation) return;
+ if (!d.workstation) return;
frappe.call({
- "method": "frappe.client.get",
+ method: "frappe.client.get",
args: {
doctype: "Workstation",
- name: d.workstation
+ name: d.workstation,
},
callback: function (data) {
frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
frm.events.calculate_operating_cost(frm, d);
- }
+ },
});
},
- time_in_mins: function(frm, cdt, cdn) {
+ time_in_mins: function (frm, cdt, cdn) {
const d = locals[cdt][cdn];
frm.events.calculate_operating_cost(frm, d);
- }
+ },
});
-frappe.tour['Routing'] = [
+frappe.tour["Routing"] = [
{
fieldname: "routing_name",
title: "Routing Name",
- description: __("Enter a name for Routing.")
+ description: __("Enter a name for Routing."),
},
{
fieldname: "operations",
title: "BOM Operations",
- description: __("Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time.")
- }
+ description: __(
+ "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
+ ),
+ },
];
diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.js b/erpnext/manufacturing/doctype/sub_operation/sub_operation.js
index be9db6a4089b..8d6d3ddb879b 100644
--- a/erpnext/manufacturing/doctype/sub_operation/sub_operation.js
+++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Sub Operation', {
+frappe.ui.form.on("Sub Operation", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index d9cc212e8c7a..42f69438aef1 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -2,70 +2,70 @@
// For license information, please see license.txt
frappe.ui.form.on("Work Order", {
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Stock Entry': 'Start',
- 'Pick List': 'Create Pick List',
- 'Job Card': 'Create Job Card'
+ "Stock Entry": "Start",
+ "Pick List": "Create Pick List",
+ "Job Card": "Create Job Card",
};
// Set query for warehouses
- frm.set_query("wip_warehouse", function() {
+ frm.set_query("wip_warehouse", function () {
return {
filters: {
- 'company': frm.doc.company,
- }
+ company: frm.doc.company,
+ },
};
});
- frm.set_query("source_warehouse", function() {
+ frm.set_query("source_warehouse", function () {
return {
filters: {
- 'company': frm.doc.company,
- }
+ company: frm.doc.company,
+ },
};
});
- frm.set_query("source_warehouse", "required_items", function() {
+ frm.set_query("source_warehouse", "required_items", function () {
return {
filters: {
- 'company': frm.doc.company,
- }
+ company: frm.doc.company,
+ },
};
});
- frm.set_query("sales_order", function() {
+ frm.set_query("sales_order", function () {
return {
filters: {
- "status": ["not in", ["Closed", "On Hold"]]
- }
+ status: ["not in", ["Closed", "On Hold"]],
+ },
};
});
- frm.set_query("fg_warehouse", function() {
+ frm.set_query("fg_warehouse", function () {
return {
filters: {
- 'company': frm.doc.company,
- 'is_group': 0
- }
+ company: frm.doc.company,
+ is_group: 0,
+ },
};
});
- frm.set_query("scrap_warehouse", function() {
+ frm.set_query("scrap_warehouse", function () {
return {
filters: {
- 'company': frm.doc.company,
- 'is_group': 0
- }
+ company: frm.doc.company,
+ is_group: 0,
+ },
};
});
// Set query for BOM
- frm.set_query("bom_no", function() {
+ frm.set_query("bom_no", function () {
if (frm.doc.production_item) {
return {
query: "erpnext.controllers.queries.bom",
- filters: {item: cstr(frm.doc.production_item)}
+ filters: { item: cstr(frm.doc.production_item) },
};
} else {
frappe.msgprint(__("Please enter Production Item first"));
@@ -73,60 +73,62 @@ frappe.ui.form.on("Work Order", {
});
// Set query for FG Item
- frm.set_query("production_item", function() {
+ frm.set_query("production_item", function () {
return {
query: "erpnext.controllers.queries.item_query",
filters: {
- "is_stock_item": 1,
- }
+ is_stock_item: 1,
+ },
};
});
// Set query for FG Item
- frm.set_query("project", function() {
- return{
- filters:[
- ['Project', 'status', 'not in', 'Completed, Cancelled']
- ]
+ frm.set_query("project", function () {
+ return {
+ filters: [["Project", "status", "not in", "Completed, Cancelled"]],
};
});
- frm.set_query("operation", "required_items", function() {
+ frm.set_query("operation", "required_items", function () {
return {
query: "erpnext.manufacturing.doctype.work_order.work_order.get_bom_operations",
filters: {
- 'parent': frm.doc.bom_no,
- 'parenttype': 'BOM'
- }
+ parent: frm.doc.bom_no,
+ parenttype: "BOM",
+ },
};
});
// formatter for work order operation
- frm.set_indicator_formatter('operation',
- function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange"; });
+ frm.set_indicator_formatter("operation", function (doc) {
+ return frm.doc.qty == doc.completed_qty ? "green" : "orange";
+ });
},
- onload: function(frm) {
- if (!frm.doc.status)
- frm.doc.status = 'Draft';
+ onload: function (frm) {
+ if (!frm.doc.status) frm.doc.status = "Draft";
frm.add_fetch("sales_order", "project", "project");
- if(frm.doc.__islocal) {
+ if (frm.doc.__islocal) {
frm.set_value({
- "actual_start_date": "",
- "actual_end_date": ""
+ actual_start_date: "",
+ actual_end_date: "",
});
erpnext.work_order.set_default_warehouse(frm);
}
},
- source_warehouse: function(frm) {
+ source_warehouse: function (frm) {
let transaction_controller = new erpnext.TransactionController();
- transaction_controller.autofill_warehouse(frm.doc.required_items, "source_warehouse", frm.doc.source_warehouse);
+ transaction_controller.autofill_warehouse(
+ frm.doc.required_items,
+ "source_warehouse",
+ frm.doc.source_warehouse
+ );
},
- refresh: function(frm) {
+ refresh: function (frm) {
erpnext.toggle_naming_series();
erpnext.work_order.set_custom_buttons(frm);
frm.set_intro("");
@@ -139,27 +141,30 @@ frappe.ui.form.on("Work Order", {
}
if (frm.doc.status != "Closed") {
- if (frm.doc.docstatus === 1 && frm.doc.status !== "Completed"
- && frm.doc.operations && frm.doc.operations.length) {
-
- const not_completed = frm.doc.operations.filter(d => {
- if (d.status != 'Completed') {
+ if (
+ frm.doc.docstatus === 1 &&
+ frm.doc.status !== "Completed" &&
+ frm.doc.operations &&
+ frm.doc.operations.length
+ ) {
+ const not_completed = frm.doc.operations.filter((d) => {
+ if (d.status != "Completed") {
return true;
}
});
if (not_completed && not_completed.length) {
- frm.add_custom_button(__('Create Job Card'), () => {
+ frm.add_custom_button(__("Create Job Card"), () => {
frm.trigger("make_job_card");
- }).addClass('btn-primary');
+ }).addClass("btn-primary");
}
}
}
- if(frm.doc.required_items && frm.doc.allow_alternative_item) {
- const has_alternative = frm.doc.required_items.find(i => i.allow_alternative_item === 1);
+ if (frm.doc.required_items && frm.doc.allow_alternative_item) {
+ const has_alternative = frm.doc.required_items.find((i) => i.allow_alternative_item === 1);
if (frm.doc.docstatus == 0 && has_alternative) {
- frm.add_custom_button(__('Alternate Item'), () => {
+ frm.add_custom_button(__("Alternate Item"), () => {
erpnext.utils.select_alternate_items({
frm: frm,
child_docname: "required_items",
@@ -167,16 +172,20 @@ frappe.ui.form.on("Work Order", {
child_doctype: "Work Order Item",
original_item_field: "original_item",
condition: (d) => {
- if (d.allow_alternative_item) {return true;}
- }
+ if (d.allow_alternative_item) {
+ return true;
+ }
+ },
});
});
}
}
- if (frm.doc.status == "Completed" &&
- frm.doc.__onload.backflush_raw_materials_based_on == "Material Transferred for Manufacture") {
- frm.add_custom_button(__('Create BOM'), () => {
+ if (
+ frm.doc.status == "Completed" &&
+ frm.doc.__onload.backflush_raw_materials_based_on == "Material Transferred for Manufacture"
+ ) {
+ frm.add_custom_button(__("Create BOM"), () => {
frm.trigger("make_bom");
});
}
@@ -184,120 +193,128 @@ frappe.ui.form.on("Work Order", {
frm.trigger("add_custom_button_to_return_components");
},
- add_custom_button_to_return_components: function(frm) {
+ add_custom_button_to_return_components: function (frm) {
if (frm.doc.docstatus === 1 && in_list(["Closed", "Completed"], frm.doc.status)) {
- let non_consumed_items = frm.doc.required_items.filter(d =>{
- return flt(d.consumed_qty) < flt(d.transferred_qty - d.returned_qty)
+ let non_consumed_items = frm.doc.required_items.filter((d) => {
+ return flt(d.consumed_qty) < flt(d.transferred_qty - d.returned_qty);
});
if (non_consumed_items && non_consumed_items.length) {
- frm.add_custom_button(__("Return Components"), function() {
+ frm.add_custom_button(__("Return Components"), function () {
frm.trigger("create_stock_return_entry");
}).addClass("btn-primary");
}
}
},
- create_stock_return_entry: function(frm) {
+ create_stock_return_entry: function (frm) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.make_stock_return_entry",
args: {
- "work_order": frm.doc.name,
+ work_order: frm.doc.name,
},
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
let doc = frappe.model.sync(r.message);
frappe.set_route("Form", doc[0].doctype, doc[0].name);
}
- }
+ },
});
},
- make_job_card: function(frm) {
+ make_job_card: function (frm) {
let qty = 0;
let operations_data = [];
- const dialog = frappe.prompt({fieldname: 'operations', fieldtype: 'Table', label: __('Operations'),
- fields: [
- {
- fieldtype: 'Link',
- fieldname: 'operation',
- label: __('Operation'),
- read_only: 1,
- in_list_view: 1
+ const dialog = frappe.prompt(
+ {
+ fieldname: "operations",
+ fieldtype: "Table",
+ label: __("Operations"),
+ fields: [
+ {
+ fieldtype: "Link",
+ fieldname: "operation",
+ label: __("Operation"),
+ read_only: 1,
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "workstation",
+ label: __("Workstation"),
+ read_only: 1,
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "name",
+ label: __("Operation Id"),
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "pending_qty",
+ label: __("Pending Qty"),
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "qty",
+ label: __("Quantity to Manufacture"),
+ read_only: 0,
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "batch_size",
+ label: __("Batch Size"),
+ read_only: 1,
+ },
+ {
+ fieldtype: "Int",
+ fieldname: "sequence_id",
+ label: __("Sequence Id"),
+ read_only: 1,
+ },
+ ],
+ data: operations_data,
+ in_place_edit: true,
+ get_data: function () {
+ return operations_data;
},
- {
- fieldtype: 'Link',
- fieldname: 'workstation',
- label: __('Workstation'),
- read_only: 1,
- in_list_view: 1
- },
- {
- fieldtype: 'Data',
- fieldname: 'name',
- label: __('Operation Id')
- },
- {
- fieldtype: 'Float',
- fieldname: 'pending_qty',
- label: __('Pending Qty'),
- },
- {
- fieldtype: 'Float',
- fieldname: 'qty',
- label: __('Quantity to Manufacture'),
- read_only: 0,
- in_list_view: 1,
- },
- {
- fieldtype: 'Float',
- fieldname: 'batch_size',
- label: __('Batch Size'),
- read_only: 1
- },
- {
- fieldtype: 'Int',
- fieldname: 'sequence_id',
- label: __('Sequence Id'),
- read_only: 1
- },
- ],
- data: operations_data,
- in_place_edit: true,
- get_data: function() {
- return operations_data;
- }
- }, function(data) {
- frappe.call({
- method: "erpnext.manufacturing.doctype.work_order.work_order.make_job_card",
- freeze: true,
- args: {
- work_order: frm.doc.name,
- operations: data.operations,
- },
- callback: function() {
- frm.reload_doc();
- }
- });
- }, __("Job Card"), __("Create"));
+ },
+ function (data) {
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.work_order.work_order.make_job_card",
+ freeze: true,
+ args: {
+ work_order: frm.doc.name,
+ operations: data.operations,
+ },
+ callback: function () {
+ frm.reload_doc();
+ },
+ });
+ },
+ __("Job Card"),
+ __("Create")
+ );
- dialog.fields_dict["operations"].grid.wrapper.find('.grid-add-row').hide();
+ dialog.fields_dict["operations"].grid.wrapper.find(".grid-add-row").hide();
var pending_qty = 0;
- frm.doc.operations.forEach(data => {
- if(data.completed_qty + data.process_loss_qty != frm.doc.qty) {
+ frm.doc.operations.forEach((data) => {
+ if (data.completed_qty + data.process_loss_qty != frm.doc.qty) {
pending_qty = frm.doc.qty - flt(data.completed_qty) - flt(data.process_loss_qty);
if (pending_qty) {
dialog.fields_dict.operations.df.data.push({
- 'name': data.name,
- 'operation': data.operation,
- 'workstation': data.workstation,
- 'batch_size': data.batch_size,
- 'qty': pending_qty,
- 'pending_qty': pending_qty,
- 'sequence_id': data.sequence_id
+ name: data.name,
+ operation: data.operation,
+ workstation: data.workstation,
+ batch_size: data.batch_size,
+ qty: pending_qty,
+ pending_qty: pending_qty,
+ sequence_id: data.sequence_id,
});
}
}
@@ -305,202 +322,212 @@ frappe.ui.form.on("Work Order", {
dialog.fields_dict.operations.grid.refresh();
},
- make_bom: function(frm) {
+ make_bom: function (frm) {
frappe.call({
method: "make_bom",
doc: frm.doc,
- callback: function(r){
+ callback: function (r) {
if (r.message) {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
},
- show_progress_for_items: function(frm) {
+ show_progress_for_items: function (frm) {
var bars = [];
- var message = '';
+ var message = "";
var added_min = false;
// produced qty
- var title = __('{0} items produced', [frm.doc.produced_qty]);
+ var title = __("{0} items produced", [frm.doc.produced_qty]);
bars.push({
- 'title': title,
- 'width': (frm.doc.produced_qty / frm.doc.qty * 100) + '%',
- 'progress_class': 'progress-bar-success'
+ title: title,
+ width: (frm.doc.produced_qty / frm.doc.qty) * 100 + "%",
+ progress_class: "progress-bar-success",
});
- if (bars[0].width == '0%') {
- bars[0].width = '0.5%';
+ if (bars[0].width == "0%") {
+ bars[0].width = "0.5%";
added_min = 0.5;
}
message = title;
// pending qty
- if(!frm.doc.skip_transfer){
+ if (!frm.doc.skip_transfer) {
var pending_complete = frm.doc.material_transferred_for_manufacturing - frm.doc.produced_qty;
- if(pending_complete) {
- var width = ((pending_complete / frm.doc.qty * 100) - added_min);
- title = __('{0} items in progress', [pending_complete]);
+ if (pending_complete) {
+ var width = (pending_complete / frm.doc.qty) * 100 - added_min;
+ title = __("{0} items in progress", [pending_complete]);
bars.push({
- 'title': title,
- 'width': (width > 100 ? "99.5" : width) + '%',
- 'progress_class': 'progress-bar-warning'
+ title: title,
+ width: (width > 100 ? "99.5" : width) + "%",
+ progress_class: "progress-bar-warning",
});
- message = message + '. ' + title;
+ message = message + ". " + title;
}
}
- frm.dashboard.add_progress(__('Status'), bars, message);
+ frm.dashboard.add_progress(__("Status"), bars, message);
},
- show_progress_for_operations: function(frm) {
+ show_progress_for_operations: function (frm) {
if (frm.doc.operations && frm.doc.operations.length) {
-
let progress_class = {
"Work in Progress": "progress-bar-warning",
- "Completed": "progress-bar-success"
+ Completed: "progress-bar-success",
};
let bars = [];
- let message = '';
- let title = '';
+ let message = "";
+ let title = "";
let status_wise_oprtation_data = {};
let total_completed_qty = frm.doc.qty * frm.doc.operations.length;
- frm.doc.operations.forEach(d => {
+ frm.doc.operations.forEach((d) => {
if (!status_wise_oprtation_data[d.status]) {
status_wise_oprtation_data[d.status] = [d.completed_qty, d.operation];
} else {
status_wise_oprtation_data[d.status][0] += d.completed_qty;
- status_wise_oprtation_data[d.status][1] += ', ' + d.operation;
+ status_wise_oprtation_data[d.status][1] += ", " + d.operation;
}
});
for (let key in status_wise_oprtation_data) {
title = __("{0} Operations: {1}", [key, status_wise_oprtation_data[key][1].bold()]);
bars.push({
- 'title': title,
- 'width': status_wise_oprtation_data[key][0] / total_completed_qty * 100 + '%',
- 'progress_class': progress_class[key]
+ title: title,
+ width: (status_wise_oprtation_data[key][0] / total_completed_qty) * 100 + "%",
+ progress_class: progress_class[key],
});
- message += title + '. ';
+ message += title + ". ";
}
- frm.dashboard.add_progress(__('Status'), bars, message);
+ frm.dashboard.add_progress(__("Status"), bars, message);
}
},
- production_item: function(frm) {
+ production_item: function (frm) {
if (frm.doc.production_item) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.get_item_details",
args: {
item: frm.doc.production_item,
- project: frm.doc.project
+ project: frm.doc.project,
},
freeze: true,
- callback: function(r) {
- if(r.message) {
- frm.set_value('sales_order', "");
- frm.trigger('set_sales_order');
+ callback: function (r) {
+ if (r.message) {
+ frm.set_value("sales_order", "");
+ frm.trigger("set_sales_order");
erpnext.in_production_item_onchange = true;
- $.each(["description", "stock_uom", "project", "bom_no", "allow_alternative_item",
- "transfer_material_against", "item_name"], function(i, field) {
- frm.set_value(field, r.message[field]);
- });
+ $.each(
+ [
+ "description",
+ "stock_uom",
+ "project",
+ "bom_no",
+ "allow_alternative_item",
+ "transfer_material_against",
+ "item_name",
+ ],
+ function (i, field) {
+ frm.set_value(field, r.message[field]);
+ }
+ );
- if(r.message["set_scrap_wh_mandatory"]){
+ if (r.message["set_scrap_wh_mandatory"]) {
frm.toggle_reqd("scrap_warehouse", true);
}
erpnext.in_production_item_onchange = false;
}
- }
+ },
});
}
},
- project: function(frm) {
- if(!erpnext.in_production_item_onchange && !frm.doc.bom_no) {
+ project: function (frm) {
+ if (!erpnext.in_production_item_onchange && !frm.doc.bom_no) {
frm.trigger("production_item");
}
},
- bom_no: function(frm) {
+ bom_no: function (frm) {
return frm.call({
doc: frm.doc,
method: "get_items_and_operations_from_bom",
freeze: true,
- callback: function(r) {
- if(r.message["set_scrap_wh_mandatory"]){
+ callback: function (r) {
+ if (r.message["set_scrap_wh_mandatory"]) {
frm.toggle_reqd("scrap_warehouse", true);
}
- }
+ },
});
},
- use_multi_level_bom: function(frm) {
- if(frm.doc.bom_no) {
+ use_multi_level_bom: function (frm) {
+ if (frm.doc.bom_no) {
frm.trigger("bom_no");
}
},
- qty: function(frm) {
- frm.trigger('bom_no');
+ qty: function (frm) {
+ frm.trigger("bom_no");
},
- before_submit: function(frm) {
+ before_submit: function (frm) {
frm.fields_dict.required_items.grid.toggle_reqd("source_warehouse", true);
- frm.toggle_reqd("transfer_material_against",
- frm.doc.operations && frm.doc.operations.length > 0);
+ frm.toggle_reqd("transfer_material_against", frm.doc.operations && frm.doc.operations.length > 0);
},
- set_sales_order: function(frm) {
- if(frm.doc.production_item) {
+ set_sales_order: function (frm) {
+ if (frm.doc.production_item) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.query_sales_order",
args: { production_item: frm.doc.production_item },
- callback: function(r) {
- frm.set_query("sales_order", function() {
+ callback: function (r) {
+ frm.set_query("sales_order", function () {
erpnext.in_production_item_onchange = true;
return {
- filters: [
- ["Sales Order","name", "in", r.message]
- ]
+ filters: [["Sales Order", "name", "in", r.message]],
};
});
- }
+ },
});
}
},
- additional_operating_cost: function(frm) {
+ additional_operating_cost: function (frm) {
erpnext.work_order.calculate_cost(frm.doc);
erpnext.work_order.calculate_total_cost(frm);
},
});
frappe.ui.form.on("Work Order Item", {
- source_warehouse: function(frm, cdt, cdn) {
+ source_warehouse: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
- if(!row.item_code) {
+ if (!row.item_code) {
frappe.throw(__("Please set the Item Code first"));
- } else if(row.source_warehouse) {
+ } else if (row.source_warehouse) {
frappe.call({
- "method": "erpnext.stock.utils.get_latest_stock_qty",
+ method: "erpnext.stock.utils.get_latest_stock_qty",
args: {
item_code: row.item_code,
- warehouse: row.source_warehouse
+ warehouse: row.source_warehouse,
},
callback: function (r) {
- frappe.model.set_value(row.doctype, row.name,
- "available_qty_at_source_warehouse", r.message);
- }
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "available_qty_at_source_warehouse",
+ r.message
+ );
+ },
});
}
},
- item_code: function(frm, cdt, cdn) {
+ item_code: function (frm, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.item_code) {
@@ -508,94 +535,104 @@ frappe.ui.form.on("Work Order Item", {
method: "erpnext.stock.doctype.item.item.get_item_details",
args: {
item_code: row.item_code,
- company: frm.doc.company
+ company: frm.doc.company,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, {
- "required_qty": row.required_qty || 1,
- "item_name": r.message.item_name,
- "description": r.message.description,
- "source_warehouse": r.message.default_warehouse,
- "allow_alternative_item": r.message.allow_alternative_item,
- "include_item_in_manufacturing": r.message.include_item_in_manufacturing
+ required_qty: row.required_qty || 1,
+ item_name: r.message.item_name,
+ description: r.message.description,
+ source_warehouse: r.message.default_warehouse,
+ allow_alternative_item: r.message.allow_alternative_item,
+ include_item_in_manufacturing: r.message.include_item_in_manufacturing,
});
}
- }
+ },
});
}
- }
+ },
});
frappe.ui.form.on("Work Order Operation", {
- workstation: function(frm, cdt, cdn) {
+ workstation: function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
if (d.workstation) {
frappe.call({
- "method": "frappe.client.get",
+ method: "frappe.client.get",
args: {
doctype: "Workstation",
- name: d.workstation
+ name: d.workstation,
},
callback: function (data) {
frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
erpnext.work_order.calculate_cost(frm.doc);
erpnext.work_order.calculate_total_cost(frm);
- }
+ },
});
}
},
- time_in_mins: function(frm, cdt, cdn) {
+ time_in_mins: function (frm, cdt, cdn) {
erpnext.work_order.calculate_cost(frm.doc);
erpnext.work_order.calculate_total_cost(frm);
},
});
erpnext.work_order = {
- set_custom_buttons: function(frm) {
+ set_custom_buttons: function (frm) {
var doc = frm.doc;
if (doc.status !== "Closed") {
- frm.add_custom_button(__('Close'), function() {
- frappe.confirm(__("Once the Work Order is Closed. It can't be resumed."),
- () => {
+ frm.add_custom_button(
+ __("Close"),
+ function () {
+ frappe.confirm(__("Once the Work Order is Closed. It can't be resumed."), () => {
erpnext.work_order.change_work_order_status(frm, "Closed");
- }
- );
- }, __("Status"));
+ });
+ },
+ __("Status")
+ );
}
if (doc.docstatus === 1 && !in_list(["Closed", "Completed"], doc.status)) {
- if (doc.status != 'Stopped' && doc.status != 'Completed') {
- frm.add_custom_button(__('Stop'), function() {
- erpnext.work_order.change_work_order_status(frm, "Stopped");
- }, __("Status"));
- } else if (doc.status == 'Stopped') {
- frm.add_custom_button(__('Re-open'), function() {
- erpnext.work_order.change_work_order_status(frm, "Resumed");
- }, __("Status"));
+ if (doc.status != "Stopped" && doc.status != "Completed") {
+ frm.add_custom_button(
+ __("Stop"),
+ function () {
+ erpnext.work_order.change_work_order_status(frm, "Stopped");
+ },
+ __("Status")
+ );
+ } else if (doc.status == "Stopped") {
+ frm.add_custom_button(
+ __("Re-open"),
+ function () {
+ erpnext.work_order.change_work_order_status(frm, "Resumed");
+ },
+ __("Status")
+ );
}
- const show_start_btn = (frm.doc.skip_transfer
- || frm.doc.transfer_material_against == 'Job Card') ? 0 : 1;
+ const show_start_btn =
+ frm.doc.skip_transfer || frm.doc.transfer_material_against == "Job Card" ? 0 : 1;
if (show_start_btn) {
let pending_to_transfer = frm.doc.required_items.some(
- item => flt(item.transferred_qty) < flt(item.required_qty)
+ (item) => flt(item.transferred_qty) < flt(item.required_qty)
);
- if (pending_to_transfer && frm.doc.status != 'Stopped') {
+ if (pending_to_transfer && frm.doc.status != "Stopped") {
frm.has_start_btn = true;
- frm.add_custom_button(__('Create Pick List'), function() {
+ frm.add_custom_button(__("Create Pick List"), function () {
erpnext.work_order.create_pick_list(frm);
});
- var start_btn = frm.add_custom_button(__('Start'), function() {
- erpnext.work_order.make_se(frm, 'Material Transfer for Manufacture');
+ var start_btn = frm.add_custom_button(__("Start"), function () {
+ erpnext.work_order.make_se(frm, "Material Transfer for Manufacture");
});
- start_btn.addClass('btn-primary');
+ start_btn.addClass("btn-primary");
}
}
- if (frm.doc.status != 'Stopped') {
+ if (frm.doc.status != "Stopped") {
// If "Material Consumption is check in Manufacturing Settings, allow Material Consumption
if (frm.doc.__onload && frm.doc.__onload.material_consumption == 1) {
if (flt(doc.material_transferred_for_manufacturing) > 0 || frm.doc.skip_transfer) {
@@ -604,89 +641,102 @@ erpnext.work_order = {
var tbl = frm.doc.required_items || [];
var tbl_lenght = tbl.length;
for (var i = 0, len = tbl_lenght; i < len; i++) {
- let wo_item_qty = frm.doc.required_items[i].transferred_qty || frm.doc.required_items[i].required_qty;
+ let wo_item_qty =
+ frm.doc.required_items[i].transferred_qty ||
+ frm.doc.required_items[i].required_qty;
if (flt(wo_item_qty) > flt(frm.doc.required_items[i].consumed_qty)) {
counter += 1;
}
}
if (counter > 0) {
- var consumption_btn = frm.add_custom_button(__('Material Consumption'), function() {
- const backflush_raw_materials_based_on = frm.doc.__onload.backflush_raw_materials_based_on;
- erpnext.work_order.make_consumption_se(frm, backflush_raw_materials_based_on);
- });
- consumption_btn.addClass('btn-primary');
+ var consumption_btn = frm.add_custom_button(
+ __("Material Consumption"),
+ function () {
+ const backflush_raw_materials_based_on =
+ frm.doc.__onload.backflush_raw_materials_based_on;
+ erpnext.work_order.make_consumption_se(
+ frm,
+ backflush_raw_materials_based_on
+ );
+ }
+ );
+ consumption_btn.addClass("btn-primary");
}
}
}
- if(!frm.doc.skip_transfer){
+ if (!frm.doc.skip_transfer) {
if (flt(doc.material_transferred_for_manufacturing) > 0) {
- if ((flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing))) {
+ if (flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) {
frm.has_finish_btn = true;
- let finish_btn = frm.add_custom_button(__('Finish'), function() {
- erpnext.work_order.make_se(frm, 'Manufacture');
+ let finish_btn = frm.add_custom_button(__("Finish"), function () {
+ erpnext.work_order.make_se(frm, "Manufacture");
});
- if(doc.material_transferred_for_manufacturing>=doc.qty) {
+ if (doc.material_transferred_for_manufacturing >= doc.qty) {
// all materials transferred for manufacturing, make this primary
- finish_btn.addClass('btn-primary');
+ finish_btn.addClass("btn-primary");
}
} else if (frm.doc.__onload && frm.doc.__onload.overproduction_percentage) {
let allowance_percentage = frm.doc.__onload.overproduction_percentage;
if (allowance_percentage > 0) {
- let allowed_qty = frm.doc.qty + ((allowance_percentage / 100) * frm.doc.qty);
+ let allowed_qty = frm.doc.qty + (allowance_percentage / 100) * frm.doc.qty;
- if ((flt(doc.produced_qty) < allowed_qty)) {
- frm.add_custom_button(__('Finish'), function() {
- erpnext.work_order.make_se(frm, 'Manufacture');
+ if (flt(doc.produced_qty) < allowed_qty) {
+ frm.add_custom_button(__("Finish"), function () {
+ erpnext.work_order.make_se(frm, "Manufacture");
});
}
}
}
}
} else {
- if ((flt(doc.produced_qty) < flt(doc.qty))) {
- let finish_btn = frm.add_custom_button(__('Finish'), function() {
- erpnext.work_order.make_se(frm, 'Manufacture');
+ if (flt(doc.produced_qty) < flt(doc.qty)) {
+ let finish_btn = frm.add_custom_button(__("Finish"), function () {
+ erpnext.work_order.make_se(frm, "Manufacture");
});
- finish_btn.addClass('btn-primary');
+ finish_btn.addClass("btn-primary");
}
}
}
}
},
- calculate_cost: function(doc) {
- if (doc.operations){
+ calculate_cost: function (doc) {
+ if (doc.operations) {
var op = doc.operations;
doc.planned_operating_cost = 0.0;
- for(var i=0;i {
- frappe.prompt({
- fieldtype: 'Float',
- label: __('Qty for {0}', [__(purpose)]),
- fieldname: 'qty',
- description: __('Max: {0}', [max]),
- default: max
- }, data => {
- max += (frm.doc.qty * (frm.doc.__onload.overproduction_percentage || 0.0)) / 100;
-
- if (data.qty > max) {
- frappe.msgprint(__('Quantity must not be more than {0}', [max]));
- reject();
- }
- data.purpose = purpose;
- resolve(data);
- }, __('Select Quantity'), __('Create'));
+ frappe.prompt(
+ {
+ fieldtype: "Float",
+ label: __("Qty for {0}", [__(purpose)]),
+ fieldname: "qty",
+ description: __("Max: {0}", [max]),
+ default: max,
+ },
+ (data) => {
+ max += (frm.doc.qty * (frm.doc.__onload.overproduction_percentage || 0.0)) / 100;
+
+ if (data.qty > max) {
+ frappe.msgprint(__("Quantity must not be more than {0}", [max]));
+ reject();
+ }
+ data.purpose = purpose;
+ resolve(data);
+ },
+ __("Select Quantity"),
+ __("Create")
+ );
});
},
- make_se: function(frm, purpose) {
+ make_se: function (frm, purpose) {
this.show_prompt_for_qty_input(frm, purpose)
- .then(data => {
- return frappe.xcall('erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry', {
- 'work_order_id': frm.doc.name,
- 'purpose': purpose,
- 'qty': data.qty
+ .then((data) => {
+ return frappe.xcall("erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry", {
+ work_order_id: frm.doc.name,
+ purpose: purpose,
+ qty: data.qty,
});
- }).then(stock_entry => {
+ })
+ .then((stock_entry) => {
frappe.model.sync(stock_entry);
- frappe.set_route('Form', stock_entry.doctype, stock_entry.name);
+ frappe.set_route("Form", stock_entry.doctype, stock_entry.name);
});
-
},
- create_pick_list: function(frm, purpose='Material Transfer for Manufacture') {
+ create_pick_list: function (frm, purpose = "Material Transfer for Manufacture") {
this.show_prompt_for_qty_input(frm, purpose)
- .then(data => {
- return frappe.xcall('erpnext.manufacturing.doctype.work_order.work_order.create_pick_list', {
- 'source_name': frm.doc.name,
- 'for_qty': data.qty
+ .then((data) => {
+ return frappe.xcall("erpnext.manufacturing.doctype.work_order.work_order.create_pick_list", {
+ source_name: frm.doc.name,
+ for_qty: data.qty,
});
- }).then(pick_list => {
+ })
+ .then((pick_list) => {
frappe.model.sync(pick_list);
- frappe.set_route('Form', pick_list.doctype, pick_list.name);
+ frappe.set_route("Form", pick_list.doctype, pick_list.name);
});
},
- make_consumption_se: function(frm, backflush_raw_materials_based_on) {
+ make_consumption_se: function (frm, backflush_raw_materials_based_on) {
let max = 0;
- if(!frm.doc.skip_transfer){
- max = (backflush_raw_materials_based_on === "Material Transferred for Manufacture") ?
- flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty) :
- flt(frm.doc.qty) - flt(frm.doc.produced_qty);
- // flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
+ if (!frm.doc.skip_transfer) {
+ max =
+ backflush_raw_materials_based_on === "Material Transferred for Manufacture"
+ ? flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty)
+ : flt(frm.doc.qty) - flt(frm.doc.produced_qty);
+ // flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
} else {
max = flt(frm.doc.qty) - flt(frm.doc.produced_qty);
}
frappe.call({
- method:"erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry",
+ method: "erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry",
args: {
- "work_order_id": frm.doc.name,
- "purpose": "Material Consumption for Manufacture",
- "qty": max
+ work_order_id: frm.doc.name,
+ purpose: "Material Consumption for Manufacture",
+ qty: max,
},
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
},
- change_work_order_status: function(frm, status) {
- let method_name = status=="Closed" ? "close_work_order" : "stop_unstop";
+ change_work_order_status: function (frm, status) {
+ let method_name = status == "Closed" ? "close_work_order" : "stop_unstop";
frappe.call({
method: `erpnext.manufacturing.doctype.work_order.work_order.${method_name}`,
freeze: true,
freeze_message: __("Updating Work Order status"),
args: {
work_order: frm.doc.name,
- status: status
+ status: status,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
frm.set_value("status", r.message);
frm.reload_doc();
}
- }
+ },
});
- }
+ },
};
-frappe.tour['Work Order'] = [
+frappe.tour["Work Order"] = [
{
fieldname: "production_item",
title: "Item to Manufacture",
- description: __("Select the Item to be manufactured.")
+ description: __("Select the Item to be manufactured."),
},
{
fieldname: "bom_no",
title: "BOM No",
- description: __("The default BOM for that item will be fetched by the system. You can also change the BOM.")
+ description: __(
+ "The default BOM for that item will be fetched by the system. You can also change the BOM."
+ ),
},
{
fieldname: "qty",
title: "Qty to Manufacture",
- description: __("Enter the quantity to manufacture. Raw material Items will be fetched only when this is set.")
+ description: __(
+ "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
+ ),
},
{
fieldname: "use_multi_level_bom",
title: "Use Multi-Level BOM",
- description: __("This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox.")
+ description: __(
+ "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
+ ),
},
{
fieldname: "source_warehouse",
title: "Source Warehouse",
- description: __("The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage.")
+ description: __(
+ "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
+ ),
},
{
fieldname: "fg_warehouse",
title: "Target Warehouse",
- description: __("The warehouse where you store finished Items before they are shipped.")
+ description: __("The warehouse where you store finished Items before they are shipped."),
},
{
fieldname: "wip_warehouse",
title: "Work-in-Progress Warehouse",
- description: __("The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse.")
+ description: __(
+ "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse."
+ ),
},
{
fieldname: "scrap_warehouse",
title: "Scrap Warehouse",
- description: __("If the BOM results in Scrap material, the Scrap Warehouse needs to be selected.")
+ description: __("If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."),
},
{
fieldname: "required_items",
title: "Required Items",
- description: __("All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table.")
+ description: __(
+ "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table."
+ ),
},
{
fieldname: "planned_start_date",
title: "Planned Start Date",
- description: __("Set the Planned Start Date (an Estimated Date at which you want the Production to begin)")
+ description: __(
+ "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
+ ),
},
{
fieldname: "operations",
title: "Operations",
- description: __("If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed.")
+ description: __(
+ "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
+ ),
},
-
-
];
diff --git a/erpnext/manufacturing/doctype/work_order/work_order_calendar.js b/erpnext/manufacturing/doctype/work_order/work_order_calendar.js
index 7ce05e9b8814..90ce74ce232c 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order_calendar.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order_calendar.js
@@ -2,23 +2,23 @@
// For license information, please see license.txt
frappe.views.calendar["Work Order"] = {
- fields: ["planned_start_date", "planned_end_date", "status", "produced_qty", "qty", "name", "name"],
+ fields: ["planned_start_date", "planned_end_date", "status", "produced_qty", "qty", "name", "name"],
field_map: {
- "start": "planned_start_date",
- "end": "planned_end_date",
- "id": "name",
- "title": "name",
- "status": "status",
- "allDay": "allDay",
- "progress": function(data) {
- return flt(data.produced_qty) / data.qty * 100;
- }
+ start: "planned_start_date",
+ end: "planned_end_date",
+ id: "name",
+ title: "name",
+ status: "status",
+ allDay: "allDay",
+ progress: function (data) {
+ return (flt(data.produced_qty) / data.qty) * 100;
+ },
},
gantt: true,
- get_css_class: function(data) {
- if(data.status==="Completed") {
+ get_css_class: function (data) {
+ if (data.status === "Completed") {
return "success";
- } else if(data.status==="In Process") {
+ } else if (data.status === "In Process") {
return "warning";
} else {
return "danger";
@@ -26,23 +26,23 @@ frappe.views.calendar["Work Order"] = {
},
filters: [
{
- "fieldtype": "Link",
- "fieldname": "sales_order",
- "options": "Sales Order",
- "label": __("Sales Order")
+ fieldtype: "Link",
+ fieldname: "sales_order",
+ options: "Sales Order",
+ label: __("Sales Order"),
},
{
- "fieldtype": "Link",
- "fieldname": "production_item",
- "options": "Item",
- "label": __("Production Item")
+ fieldtype: "Link",
+ fieldname: "production_item",
+ options: "Item",
+ label: __("Production Item"),
},
{
- "fieldtype": "Link",
- "fieldname": "wip_warehouse",
- "options": "Warehouse",
- "label": __("WIP Warehouse")
- }
+ fieldtype: "Link",
+ fieldname: "wip_warehouse",
+ options: "Warehouse",
+ label: __("WIP Warehouse"),
+ },
],
- get_events_method: "frappe.desk.calendar.get_events"
-}
+ get_events_method: "frappe.desk.calendar.get_events",
+};
diff --git a/erpnext/manufacturing/doctype/work_order/work_order_list.js b/erpnext/manufacturing/doctype/work_order/work_order_list.js
index 81c23bb71044..1e1e5661fe58 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order_list.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order_list.js
@@ -1,19 +1,31 @@
-frappe.listview_settings['Work Order'] = {
- add_fields: ["bom_no", "status", "sales_order", "qty",
- "produced_qty", "expected_delivery_date", "planned_start_date", "planned_end_date"],
+frappe.listview_settings["Work Order"] = {
+ add_fields: [
+ "bom_no",
+ "status",
+ "sales_order",
+ "qty",
+ "produced_qty",
+ "expected_delivery_date",
+ "planned_start_date",
+ "planned_end_date",
+ ],
filters: [["status", "!=", "Stopped"]],
- get_indicator: function(doc) {
- if(doc.status==="Submitted") {
+ get_indicator: function (doc) {
+ if (doc.status === "Submitted") {
return [__("Not Started"), "orange", "status,=,Submitted"];
} else {
- return [__(doc.status), {
- "Draft": "red",
- "Stopped": "red",
- "Not Started": "red",
- "In Process": "orange",
- "Completed": "green",
- "Cancelled": "gray"
- }[doc.status], "status,=," + doc.status];
+ return [
+ __(doc.status),
+ {
+ Draft: "red",
+ Stopped: "red",
+ "Not Started": "red",
+ "In Process": "orange",
+ Completed: "green",
+ Cancelled: "gray",
+ }[doc.status],
+ "status,=," + doc.status,
+ ];
}
- }
+ },
};
diff --git a/erpnext/manufacturing/doctype/workstation/_test_workstation.js b/erpnext/manufacturing/doctype/workstation/_test_workstation.js
index f2dced81e210..8d0a75c06532 100644
--- a/erpnext/manufacturing/doctype/workstation/_test_workstation.js
+++ b/erpnext/manufacturing/doctype/workstation/_test_workstation.js
@@ -1,4 +1,3 @@
-
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
@@ -8,16 +7,16 @@ QUnit.test("test: Workstation", function (assert) {
// number of asserts
assert.expect(1);
- frappe.run_serially('Workstation', [
+ frappe.run_serially("Workstation", [
// insert a new Workstation
- () => frappe.tests.make([
- // values to be set
- {key: 'value'}
- ]),
+ () =>
+ frappe.tests.make([
+ // values to be set
+ { key: "value" },
+ ]),
() => {
- assert.equal(cur_frm.doc.key, 'value');
+ assert.equal(cur_frm.doc.key, "value");
},
- () => done()
+ () => done(),
]);
-
});
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.js b/erpnext/manufacturing/doctype/workstation/workstation.js
index e3ad3fe3cce5..255383baa87e 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.js
+++ b/erpnext/manufacturing/doctype/workstation/workstation.js
@@ -3,7 +3,8 @@
frappe.ui.form.on("Workstation", {
set_illustration_image(frm) {
- let status_image_field = frm.doc.status == "Production" ? frm.doc.on_status_image : frm.doc.off_status_image;
+ let status_image_field =
+ frm.doc.status == "Production" ? frm.doc.on_status_image : frm.doc.off_status_image;
if (status_image_field) {
frm.sidebar.image_wrapper.find(".sidebar-image").attr("src", status_image_field);
}
@@ -20,22 +21,21 @@ frappe.ui.form.on("Workstation", {
let workstation_dashboard = new WorkstationDashboard({
wrapper: $parent,
- frm: frm
+ frm: frm,
});
},
onload(frm) {
- if(frm.is_new())
- {
+ if (frm.is_new()) {
frappe.call({
- type:"GET",
- method:"erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
- callback: function(r) {
- if(!r.exe && r.message){
+ type: "GET",
+ method: "erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list",
+ callback: function (r) {
+ if (!r.exe && r.message) {
cur_frm.set_value("holiday_list", r.message);
}
- }
- })
+ },
+ });
}
},
@@ -44,40 +44,43 @@ frappe.ui.form.on("Workstation", {
frm.call({
method: "set_data_based_on_workstation_type",
doc: frm.doc,
- callback: function(r) {
+ callback: function (r) {
frm.refresh_fields();
- }
- })
+ },
+ });
}
- }
+ },
});
-frappe.tour['Workstation'] = [
+frappe.tour["Workstation"] = [
{
fieldname: "workstation_name",
title: "Workstation Name",
- description: __("You can set it as a machine name or operation type. For example, stiching machine 12")
+ description: __(
+ "You can set it as a machine name or operation type. For example, stiching machine 12"
+ ),
},
{
fieldname: "production_capacity",
title: "Production Capacity",
- description: __("No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time.")
+ description: __(
+ "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
+ ),
},
{
fieldname: "holiday_list",
title: "Holiday List",
- description: __("A Holiday List can be added to exclude counting these days for the Workstation.")
+ description: __("A Holiday List can be added to exclude counting these days for the Workstation."),
},
{
fieldname: "working_hours",
title: "Working Hours",
- description: __("Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified.")
+ description: __(
+ "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
+ ),
},
-
-
];
-
class WorkstationDashboard {
constructor({ wrapper, frm }) {
this.$wrapper = $(wrapper);
@@ -90,20 +93,20 @@ class WorkstationDashboard {
frappe.call({
method: "erpnext.manufacturing.doctype.workstation.workstation.get_job_cards",
args: {
- workstation: this.frm.doc.name
+ workstation: this.frm.doc.name,
},
callback: (r) => {
if (r.message) {
this.job_cards = r.message;
this.render_job_cards();
}
- }
+ },
});
}
render_job_cards() {
- let template = frappe.render_template("workstation_job_card", {
- data: this.job_cards
+ let template = frappe.render_template("workstation_job_card", {
+ data: this.job_cards,
});
this.$wrapper.html(template);
@@ -114,11 +117,18 @@ class WorkstationDashboard {
toggle_job_card() {
this.$wrapper.find(".collapse-indicator-job").on("click", (e) => {
- $(e.currentTarget).closest(".form-dashboard-section").find(".section-body-job-card").toggleClass("hide")
- if ($(e.currentTarget).closest(".form-dashboard-section").find(".section-body-job-card").hasClass("hide"))
- $(e.currentTarget).html(frappe.utils.icon("es-line-down", "sm", "mb-1"))
- else
- $(e.currentTarget).html(frappe.utils.icon("es-line-up", "sm", "mb-1"))
+ $(e.currentTarget)
+ .closest(".form-dashboard-section")
+ .find(".section-body-job-card")
+ .toggleClass("hide");
+ if (
+ $(e.currentTarget)
+ .closest(".form-dashboard-section")
+ .find(".section-body-job-card")
+ .hasClass("hide")
+ )
+ $(e.currentTarget).html(frappe.utils.icon("es-line-down", "sm", "mb-1"));
+ else $(e.currentTarget).html(frappe.utils.icon("es-line-up", "sm", "mb-1"));
});
}
@@ -142,80 +152,90 @@ class WorkstationDashboard {
start_job(job_card) {
let me = this;
- frappe.prompt([
- {
- fieldtype: 'Datetime',
- label: __('Start Time'),
- fieldname: 'start_time',
- reqd: 1,
- default: frappe.datetime.now_datetime()
- },
- {
- label: __('Operator'),
- fieldname: 'employee',
- fieldtype: 'Link',
- options: 'Employee',
- }
- ], data => {
- this.frm.call({
- method: "start_job",
- doc: this.frm.doc,
- args: {
- job_card: job_card,
- from_time: data.start_time,
- employee: data.employee,
+ frappe.prompt(
+ [
+ {
+ fieldtype: "Datetime",
+ label: __("Start Time"),
+ fieldname: "start_time",
+ reqd: 1,
+ default: frappe.datetime.now_datetime(),
},
- callback(r) {
- if (r.message) {
- me.job_cards = [r.message];
- me.prepare_timer()
- me.update_job_card_details();
- }
- }
- });
- }, __("Enter Value"), __("Start Job"));
+ {
+ label: __("Operator"),
+ fieldname: "employee",
+ fieldtype: "Link",
+ options: "Employee",
+ },
+ ],
+ (data) => {
+ this.frm.call({
+ method: "start_job",
+ doc: this.frm.doc,
+ args: {
+ job_card: job_card,
+ from_time: data.start_time,
+ employee: data.employee,
+ },
+ callback(r) {
+ if (r.message) {
+ me.job_cards = [r.message];
+ me.prepare_timer();
+ me.update_job_card_details();
+ }
+ },
+ });
+ },
+ __("Enter Value"),
+ __("Start Job")
+ );
}
complete_job(job_card, qty_to_manufacture) {
let me = this;
let fields = [
{
- fieldtype: 'Float',
- label: __('Completed Quantity'),
- fieldname: 'qty',
+ fieldtype: "Float",
+ label: __("Completed Quantity"),
+ fieldname: "qty",
reqd: 1,
- default: flt(qty_to_manufacture || 0)
+ default: flt(qty_to_manufacture || 0),
},
{
- fieldtype: 'Datetime',
- label: __('End Time'),
- fieldname: 'end_time',
- default: frappe.datetime.now_datetime()
+ fieldtype: "Datetime",
+ label: __("End Time"),
+ fieldname: "end_time",
+ default: frappe.datetime.now_datetime(),
},
];
- frappe.prompt(fields, data => {
- if (data.qty <= 0) {
- frappe.throw(__("Quantity should be greater than 0"));
- }
-
- this.frm.call({
- method: "complete_job",
- doc: this.frm.doc,
- args: {
- job_card: job_card,
- qty: data.qty,
- to_time: data.end_time,
- },
- callback: function(r) {
- if (r.message) {
- me.job_cards = [r.message];
- me.prepare_timer()
- me.update_job_card_details();
- }
+ frappe.prompt(
+ fields,
+ (data) => {
+ if (data.qty <= 0) {
+ frappe.throw(__("Quantity should be greater than 0"));
}
- });
- }, __("Enter Value"), __("Submit"));
+
+ this.frm.call({
+ method: "complete_job",
+ doc: this.frm.doc,
+ args: {
+ job_card: job_card,
+ qty: data.qty,
+ to_time: data.end_time,
+ },
+ callback: function (r) {
+ if (r.message) {
+ me.job_cards = [r.message];
+ me.prepare_timer();
+ me.update_job_card_details();
+ }
+ },
+ });
+ },
+ __("Enter Value"),
+ __("Submit")
+ );
}
make_material_request(job_card) {
@@ -229,7 +249,7 @@ class WorkstationDashboard {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
}
@@ -248,18 +268,17 @@ class WorkstationDashboard {
update_job_card_details() {
let color_map = {
- "Pending": "var(--bg-blue)",
+ Pending: "var(--bg-blue)",
"In Process": "var(--bg-yellow)",
- "Submitted": "var(--bg-blue)",
- "Open": "var(--bg-gray)",
- "Closed": "var(--bg-green)",
+ Submitted: "var(--bg-blue)",
+ Open: "var(--bg-gray)",
+ Closed: "var(--bg-green)",
"Work In Progress": "var(--bg-orange)",
- }
+ };
this.job_cards.forEach((data) => {
- let job_card_selector = this.$wrapper.find(`
- [data-name='${data.name}']`
- );
+ let job_card_selector = this.$wrapper.find(`
+ [data-name='${data.name}']`);
$(job_card_selector).find(".job-card-status").text(data.status);
$(job_card_selector).find(".job-card-status").css("backgroundColor", color_map[data.status]);
@@ -284,20 +303,26 @@ class WorkstationDashboard {
updateStopwatch(data) {
let increment = data._current_time;
let hours = Math.floor(increment / 3600);
- let minutes = Math.floor((increment - (hours * 3600)) / 60);
- let seconds = cint(increment - (hours * 3600) - (minutes * 60));
-
- let job_card_selector = `[data-job-card='${data.name}']`
- let timer_selector = this.$wrapper.find(job_card_selector)
-
- $(timer_selector).find(".hours").text(hours < 10 ? ("0" + hours.toString()) : hours.toString());
- $(timer_selector).find(".minutes").text(minutes < 10 ? ("0" + minutes.toString()) : minutes.toString());
- $(timer_selector).find(".seconds").text(seconds < 10 ? ("0" + seconds.toString()) : seconds.toString());
+ let minutes = Math.floor((increment - hours * 3600) / 60);
+ let seconds = cint(increment - hours * 3600 - minutes * 60);
+
+ let job_card_selector = `[data-job-card='${data.name}']`;
+ let timer_selector = this.$wrapper.find(job_card_selector);
+
+ $(timer_selector)
+ .find(".hours")
+ .text(hours < 10 ? "0" + hours.toString() : hours.toString());
+ $(timer_selector)
+ .find(".minutes")
+ .text(minutes < 10 ? "0" + minutes.toString() : minutes.toString());
+ $(timer_selector)
+ .find(".seconds")
+ .text(seconds < 10 ? "0" + seconds.toString() : seconds.toString());
}
get_current_time(data) {
let current_time = 0.0;
- data.time_logs.forEach(d => {
+ data.time_logs.forEach((d) => {
if (d.to_time) {
if (d.time_in_mins) {
current_time += flt(d.time_in_mins, 2) * 60;
@@ -315,4 +340,4 @@ class WorkstationDashboard {
get_seconds_diff(d1, d2) {
return moment(d1).diff(d2, "seconds");
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/workstation/workstation_list.js b/erpnext/manufacturing/doctype/workstation/workstation_list.js
index 86928cafcb22..33722634b960 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation_list.js
+++ b/erpnext/manufacturing/doctype/workstation/workstation_list.js
@@ -1,16 +1,15 @@
-
-frappe.listview_settings['Workstation'] = {
+frappe.listview_settings["Workstation"] = {
add_fields: ["status"],
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
let color_map = {
- "Production": "green",
- "Off": "gray",
- "Idle": "gray",
- "Problem": "red",
- "Maintenance": "yellow",
- "Setup": "blue",
- }
+ Production: "green",
+ Off: "gray",
+ Idle: "gray",
+ Problem: "red",
+ Maintenance: "yellow",
+ Setup: "blue",
+ };
return [__(doc.status), color_map[doc.status], true];
- }
+ },
};
diff --git a/erpnext/manufacturing/doctype/workstation_type/workstation_type.js b/erpnext/manufacturing/doctype/workstation_type/workstation_type.js
index 419fa6c10ad5..f0b3ed36a5e4 100644
--- a/erpnext/manufacturing/doctype/workstation_type/workstation_type.js
+++ b/erpnext/manufacturing/doctype/workstation_type/workstation_type.js
@@ -1,8 +1,7 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Workstation Type', {
+frappe.ui.form.on("Workstation Type", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js b/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
index 1bcb1efdaadf..fcb7e884ecc3 100644
--- a/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
+++ b/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js
@@ -1,12 +1,12 @@
-frappe.pages['bom-comparison-tool'].on_page_load = function(wrapper) {
+frappe.pages["bom-comparison-tool"].on_page_load = function (wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
- title: __('BOM Comparison Tool'),
- single_column: true
+ title: __("BOM Comparison Tool"),
+ single_column: true,
});
new erpnext.BOMComparisonTool(page);
-}
+};
erpnext.BOMComparisonTool = class BOMComparisonTool {
constructor(page) {
@@ -18,45 +18,45 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
this.form = new frappe.ui.FieldGroup({
fields: [
{
- label: __('BOM 1'),
- fieldname: 'name1',
- fieldtype: 'Link',
- options: 'BOM',
+ label: __("BOM 1"),
+ fieldname: "name1",
+ fieldtype: "Link",
+ options: "BOM",
change: () => this.fetch_and_render(),
get_query: () => {
return {
filters: {
- "name": ["not in", [this.form.get_value("name2") || ""]]
- }
- }
- }
+ name: ["not in", [this.form.get_value("name2") || ""]],
+ },
+ };
+ },
},
{
- fieldtype: 'Column Break'
+ fieldtype: "Column Break",
},
{
- label: __('BOM 2'),
- fieldname: 'name2',
- fieldtype: 'Link',
- options: 'BOM',
+ label: __("BOM 2"),
+ fieldname: "name2",
+ fieldtype: "Link",
+ options: "BOM",
change: () => this.fetch_and_render(),
get_query: () => {
return {
filters: {
- "name": ["not in", [this.form.get_value("name1") || ""]]
- }
- }
- }
+ name: ["not in", [this.form.get_value("name1") || ""]],
+ },
+ };
+ },
},
{
- fieldtype: 'Section Break'
+ fieldtype: "Section Break",
},
{
- fieldtype: 'HTML',
- fieldname: 'preview'
- }
+ fieldtype: "HTML",
+ fieldname: "preview",
+ },
],
- body: this.page.body
+ body: this.page.body,
});
this.form.make();
}
@@ -64,33 +64,34 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
fetch_and_render() {
let { name1, name2 } = this.form.get_values();
if (!(name1 && name2)) {
- this.form.get_field('preview').html('');
+ this.form.get_field("preview").html("");
return;
}
// set working state
- this.form.get_field('preview').html(`
+ this.form.get_field("preview").html(`
${__("Fetching...")}
`);
- frappe.call('erpnext.manufacturing.doctype.bom.bom.get_bom_diff', {
- bom1: name1,
- bom2: name2
- }).then(r => {
- let diff = r.message;
- frappe.model.with_doctype('BOM', () => {
- this.render('BOM', name1, name2, diff);
+ frappe
+ .call("erpnext.manufacturing.doctype.bom.bom.get_bom_diff", {
+ bom1: name1,
+ bom2: name2,
+ })
+ .then((r) => {
+ let diff = r.message;
+ frappe.model.with_doctype("BOM", () => {
+ this.render("BOM", name1, name2, diff);
+ });
});
- });
}
render(doctype, name1, name2, diff) {
-
let change_html = (title, doctype, changed) => {
let values_changed = this.get_changed_values(doctype, changed)
- .map(change => {
+ .map((change) => {
let [fieldname, value1, value2] = change;
return `
@@ -100,14 +101,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
`;
})
- .join('');
+ .join("");
return `
${title}
- ${__('Field')}
+ ${__("Field")}
${name1}
${name2}
@@ -115,28 +116,30 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
`;
- }
-
- let value_changes = change_html(__('Values Changed'), doctype, diff.changed);
+ };
- let row_changes_by_fieldname = group_items(diff.row_changed, change => change[0]);
+ let value_changes = change_html(__("Values Changed"), doctype, diff.changed);
- let table_changes = Object.keys(row_changes_by_fieldname).map(fieldname => {
- let changes = row_changes_by_fieldname[fieldname];
- let df = frappe.meta.get_docfield(doctype, fieldname);
+ let row_changes_by_fieldname = group_items(diff.row_changed, (change) => change[0]);
- let html = changes.map(change => {
- let [fieldname,, item_code, changes] = change;
+ let table_changes = Object.keys(row_changes_by_fieldname)
+ .map((fieldname) => {
+ let changes = row_changes_by_fieldname[fieldname];
let df = frappe.meta.get_docfield(doctype, fieldname);
- let child_doctype = df.options;
- let values_changed = this.get_changed_values(child_doctype, changes);
- return values_changed.map((change, i) => {
- let [fieldname, value1, value2] = change;
- let th = i === 0
- ? `${item_code} `
- : '';
- return `
+ let html = changes
+ .map((change) => {
+ let [fieldname, , item_code, changes] = change;
+ let df = frappe.meta.get_docfield(doctype, fieldname);
+ let child_doctype = df.options;
+ let values_changed = this.get_changed_values(child_doctype, changes);
+
+ return values_changed
+ .map((change, i) => {
+ let [fieldname, value1, value2] = change;
+ let th =
+ i === 0 ? `${item_code} ` : "";
+ return `
${th}
${frappe.meta.get_label(child_doctype, fieldname)}
@@ -144,54 +147,58 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
${value2}
`;
- }).join('');
- }).join('');
+ })
+ .join("");
+ })
+ .join("");
- return `
- ${__('Changes in {0}', [df.label])}
+ return `
+ ${__("Changes in {0}", [df.label])}
- ${__('Item Code')}
- ${__('Field')}
+ ${__("Item Code")}
+ ${__("Field")}
${name1}
${name2}
${html}
`;
- }).join('');
+ })
+ .join("");
let get_added_removed_html = (title, grouped_items) => {
- return Object.keys(grouped_items).map(fieldname => {
- let rows = grouped_items[fieldname];
- let df = frappe.meta.get_docfield(doctype, fieldname);
- let fields = frappe.meta.get_docfields(df.options)
- .filter(df => df.in_list_view);
-
- let html = rows.map(row => {
- let [, doc] = row;
- let cells = fields
- .map(df => `${doc[df.fieldname]} `)
- .join('');
- return `${cells} `;
- }).join('');
-
- let header = fields.map(df => `${df.label} `).join('');
- return `
+ return Object.keys(grouped_items)
+ .map((fieldname) => {
+ let rows = grouped_items[fieldname];
+ let df = frappe.meta.get_docfield(doctype, fieldname);
+ let fields = frappe.meta.get_docfields(df.options).filter((df) => df.in_list_view);
+
+ let html = rows
+ .map((row) => {
+ let [, doc] = row;
+ let cells = fields.map((df) => `${doc[df.fieldname]} `).join("");
+ return `${cells} `;
+ })
+ .join("");
+
+ let header = fields.map((df) => `${df.label} `).join("");
+ return `
${$.format(title, [df.label])}
`;
- }).join('');
+ })
+ .join("");
};
- let added_by_fieldname = group_items(diff.added, change => change[0]);
- let removed_by_fieldname = group_items(diff.removed, change => change[0]);
+ let added_by_fieldname = group_items(diff.added, (change) => change[0]);
+ let removed_by_fieldname = group_items(diff.removed, (change) => change[0]);
- let added_html = get_added_removed_html(__('Rows Added in {0}'), added_by_fieldname);
- let removed_html = get_added_removed_html(__('Rows Removed in {0}'), removed_by_fieldname);
+ let added_html = get_added_removed_html(__("Rows Added in {0}"), added_by_fieldname);
+ let removed_html = get_added_removed_html(__("Rows Removed in {0}"), removed_by_fieldname);
let html = `
${value_changes}
@@ -200,14 +207,14 @@ erpnext.BOMComparisonTool = class BOMComparisonTool {
${removed_html}
`;
- this.form.get_field('preview').html(html);
+ this.form.get_field("preview").html(html);
}
get_changed_values(doctype, changed) {
- return changed.filter(change => {
+ return changed.filter((change) => {
let [fieldname, value1, value2] = change;
- if (!value1) value1 = '';
- if (!value2) value2 = '';
+ if (!value1) value1 = "";
+ if (!value2) value2 = "";
if (value1 === value2) return false;
let df = frappe.meta.get_docfield(doctype, fieldname);
if (!df) return false;
diff --git a/erpnext/manufacturing/page/visual_plant_floor/visual_plant_floor.js b/erpnext/manufacturing/page/visual_plant_floor/visual_plant_floor.js
index 38667e8d795e..0d2c090594f4 100644
--- a/erpnext/manufacturing/page/visual_plant_floor/visual_plant_floor.js
+++ b/erpnext/manufacturing/page/visual_plant_floor/visual_plant_floor.js
@@ -1,13 +1,12 @@
-
-
-frappe.pages['visual-plant-floor'].on_page_load = function(wrapper) {
+frappe.pages["visual-plant-floor"].on_page_load = function (wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
- title: 'Visual Plant Floor',
- single_column: true
+ title: "Visual Plant Floor",
+ single_column: true,
});
frappe.visual_plant_floor = new frappe.ui.VisualPlantFloor(
- {wrapper: $(wrapper).find('.layout-main-section')}, wrapper.page
+ { wrapper: $(wrapper).find(".layout-main-section") },
+ wrapper.page
);
-}
\ No newline at end of file
+};
diff --git a/erpnext/manufacturing/report/bom_explorer/bom_explorer.js b/erpnext/manufacturing/report/bom_explorer/bom_explorer.js
index 50191bf8ab2c..f9feb01f1451 100644
--- a/erpnext/manufacturing/report/bom_explorer/bom_explorer.js
+++ b/erpnext/manufacturing/report/bom_explorer/bom_explorer.js
@@ -1,15 +1,14 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["BOM Explorer"] = {
- "filters": [
+ filters: [
{
fieldname: "bom",
label: __("BOM"),
fieldtype: "Link",
options: "BOM",
- reqd: 1
+ reqd: 1,
},
- ]
+ ],
};
diff --git a/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js b/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js
index 8729775dc231..27bccf670754 100644
--- a/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js
+++ b/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js
@@ -1,42 +1,41 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["BOM Operations Time"] = {
- "filters": [
+ filters: [
{
- "fieldname": "item_code",
- "label": __("Item Code"),
- "fieldtype": "Link",
- "width": "100",
- "options": "Item",
- "get_query": () =>{
+ fieldname: "item_code",
+ label: __("Item Code"),
+ fieldtype: "Link",
+ width: "100",
+ options: "Item",
+ get_query: () => {
return {
- filters: { "is_stock_item": 1 }
- }
- }
+ filters: { is_stock_item: 1 },
+ };
+ },
},
{
- "fieldname": "bom_id",
- "label": __("BOM ID"),
- "fieldtype": "MultiSelectList",
- "width": "100",
- "options": "BOM",
- "get_data": function(txt) {
+ fieldname: "bom_id",
+ label: __("BOM ID"),
+ fieldtype: "MultiSelectList",
+ width: "100",
+ options: "BOM",
+ get_data: function (txt) {
return frappe.db.get_link_options("BOM", txt);
},
- "get_query": () =>{
+ get_query: () => {
return {
- filters: { "docstatus": 1, "is_active": 1, "with_operations": 1 }
- }
- }
+ filters: { docstatus: 1, is_active: 1, with_operations: 1 },
+ };
+ },
},
{
- "fieldname": "workstation",
- "label": __("Workstation"),
- "fieldtype": "Link",
- "width": "100",
- "options": "Workstation"
+ fieldname: "workstation",
+ label: __("Workstation"),
+ fieldtype: "Link",
+ width: "100",
+ options: "Workstation",
},
- ]
+ ],
};
diff --git a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js
index 8e66f704c804..76a951278534 100644
--- a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js
+++ b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js
@@ -1,34 +1,33 @@
// Copyright (c) 2016, Epoch Consulting and contributors
// For license information, please see license.txt
-
frappe.query_reports["BOM Stock Calculated"] = {
- "filters": [
+ filters: [
{
- "fieldname": "bom",
- "label": __("BOM"),
- "fieldtype": "Link",
- "options": "BOM",
- "reqd": 1
+ fieldname: "bom",
+ label: __("BOM"),
+ fieldtype: "Link",
+ options: "BOM",
+ reqd: 1,
},
{
- "fieldname": "warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse",
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
},
{
- "fieldname": "qty_to_make",
- "label": __("Quantity to Make"),
- "fieldtype": "Float",
- "default": "1.0",
- "reqd": 1
+ fieldname: "qty_to_make",
+ label: __("Quantity to Make"),
+ fieldtype: "Float",
+ default: "1.0",
+ reqd: 1,
},
{
- "fieldname": "show_exploded_view",
- "label": __("Show exploded view"),
- "fieldtype": "Check",
- "default": false,
- }
- ]
-}
+ fieldname: "show_exploded_view",
+ label: __("Show exploded view"),
+ fieldtype: "Check",
+ default: false,
+ },
+ ],
+};
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
index e7f67caf249b..91d73d0101c0 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
@@ -1,38 +1,41 @@
frappe.query_reports["BOM Stock Report"] = {
- "filters": [
+ filters: [
{
- "fieldname": "bom",
- "label": __("BOM"),
- "fieldtype": "Link",
- "options": "BOM",
- "reqd": 1
- }, {
- "fieldname": "warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse",
- "reqd": 1
- }, {
- "fieldname": "show_exploded_view",
- "label": __("Show exploded view"),
- "fieldtype": "Check"
- }, {
- "fieldname": "qty_to_produce",
- "label": __("Quantity to Produce"),
- "fieldtype": "Int",
- "default": "1"
- },
+ fieldname: "bom",
+ label: __("BOM"),
+ fieldtype: "Link",
+ options: "BOM",
+ reqd: 1,
+ },
+ {
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
+ reqd: 1,
+ },
+ {
+ fieldname: "show_exploded_view",
+ label: __("Show exploded view"),
+ fieldtype: "Check",
+ },
+ {
+ fieldname: "qty_to_produce",
+ label: __("Quantity to Produce"),
+ fieldtype: "Int",
+ default: "1",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (column.id == "item") {
if (data["in_stock_qty"] >= data["required_qty"]) {
- value = `${data['item']} `;
+ value = `${data["item"]} `;
} else {
- value = `${data['item']} `;
+ value = `${data["item"]} `;
}
}
- return value
- }
-}
+ return value;
+ },
+};
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js
index db6f4d76882b..58d8d1f34821 100644
--- a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.js
@@ -1,29 +1,28 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["BOM Variance Report"] = {
- "filters": [
+ filters: [
{
- "fieldname":"bom_no",
- "label": __("BOM No"),
- "fieldtype": "Link",
- "options": "BOM"
+ fieldname: "bom_no",
+ label: __("BOM No"),
+ fieldtype: "Link",
+ options: "BOM",
},
{
- "fieldname":"work_order",
- "label": __("Work Order"),
- "fieldtype": "Link",
- "options": "Work Order",
- "get_query": function() {
- var bom_no = frappe.query_report.get_filter_value('bom_no');
- return{
+ fieldname: "work_order",
+ label: __("Work Order"),
+ fieldtype: "Link",
+ options: "Work Order",
+ get_query: function () {
+ var bom_no = frappe.query_report.get_filter_value("bom_no");
+ return {
query: "erpnext.manufacturing.report.bom_variance_report.bom_variance_report.get_work_orders",
filters: {
- 'bom_no': bom_no
- }
- }
- }
+ bom_no: bom_no,
+ },
+ };
+ },
},
- ]
-}
+ ],
+};
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js
index d0249ba84b9f..d534513eee39 100644
--- a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js
@@ -1,26 +1,27 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Cost of Poor Quality Report"] = {
- "filters": [
+ filters: [
{
label: __("Company"),
fieldname: "company",
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
label: __("From Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Datetime",
- default: frappe.datetime.convert_to_system_tz(frappe.datetime.add_months(frappe.datetime.now_datetime(), -1)),
+ default: frappe.datetime.convert_to_system_tz(
+ frappe.datetime.add_months(frappe.datetime.now_datetime(), -1)
+ ),
},
{
label: __("To Date"),
- fieldname:"to_date",
+ fieldname: "to_date",
fieldtype: "Datetime",
default: frappe.datetime.now_datetime(),
},
@@ -29,45 +30,45 @@ frappe.query_reports["Cost of Poor Quality Report"] = {
fieldname: "name",
fieldtype: "Link",
options: "Job Card",
- get_query: function() {
+ get_query: function () {
return {
filters: {
is_corrective_job_card: 1,
- docstatus: 1
- }
- }
- }
+ docstatus: 1,
+ },
+ };
+ },
},
{
label: __("Work Order"),
fieldname: "work_order",
fieldtype: "Link",
- options: "Work Order"
+ options: "Work Order",
},
{
label: __("Operation"),
fieldname: "operation",
fieldtype: "Link",
options: "Operation",
- get_query: function() {
+ get_query: function () {
return {
filters: {
- is_corrective_operation: 1
- }
- }
- }
+ is_corrective_operation: 1,
+ },
+ };
+ },
},
{
label: __("Workstation"),
fieldname: "workstation",
fieldtype: "Link",
- options: "Workstation"
+ options: "Workstation",
},
{
label: __("Item"),
fieldname: "production_item",
fieldtype: "Link",
- options: "Item"
+ options: "Item",
},
{
label: __("Serial No"),
@@ -75,14 +76,14 @@ frappe.query_reports["Cost of Poor Quality Report"] = {
fieldtype: "Link",
options: "Serial No",
depends_on: "eval: doc.production_item",
- get_query: function() {
- var item_code = frappe.query_report.get_filter_value('production_item');
+ get_query: function () {
+ var item_code = frappe.query_report.get_filter_value("production_item");
return {
filters: {
- item_code: item_code
- }
- }
- }
+ item_code: item_code,
+ },
+ };
+ },
},
{
label: __("Batch No"),
@@ -90,14 +91,14 @@ frappe.query_reports["Cost of Poor Quality Report"] = {
fieldtype: "Link",
options: "Batch No",
depends_on: "eval: doc.production_item",
- get_query: function() {
- var item_code = frappe.query_report.get_filter_value('production_item');
+ get_query: function () {
+ var item_code = frappe.query_report.get_filter_value("production_item");
return {
filters: {
- item: item_code
- }
- }
- }
+ item: item_code,
+ },
+ };
+ },
},
- ]
+ ],
};
diff --git a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js
index 058926095877..0eadc7279fe8 100644
--- a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js
+++ b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.js
@@ -1,19 +1,20 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Downtime Analysis"] = {
- "filters": [
+ filters: [
{
label: __("From Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Datetime",
- default: frappe.datetime.convert_to_system_tz(frappe.datetime.add_months(frappe.datetime.now_datetime(), -1)),
- reqd: 1
+ default: frappe.datetime.convert_to_system_tz(
+ frappe.datetime.add_months(frappe.datetime.now_datetime(), -1)
+ ),
+ reqd: 1,
},
{
label: __("To Date"),
- fieldname:"to_date",
+ fieldname: "to_date",
fieldtype: "Datetime",
default: frappe.datetime.now_datetime(),
reqd: 1,
@@ -22,7 +23,7 @@ frappe.query_reports["Downtime Analysis"] = {
label: __("Machine"),
fieldname: "workstation",
fieldtype: "Link",
- options: "Workstation"
- }
- ]
+ options: "Workstation",
+ },
+ ],
};
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 3795bd3df8b9..23fa9ab41b08 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js
@@ -1,97 +1,96 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Exponential Smoothing Forecasting"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today(),
- "reqd": 1
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
+ reqd: 1,
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), 12),
- "reqd": 1
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), 12),
+ reqd: 1,
},
{
- "fieldname":"based_on_document",
- "label": __("Based On Document"),
- "fieldtype": "Select",
- "options": ["Sales Order", "Sales Invoice", "Delivery Note", "Quotation"],
- "default": "Sales Order",
- "reqd": 1
+ fieldname: "based_on_document",
+ label: __("Based On Document"),
+ fieldtype: "Select",
+ options: ["Sales Order", "Sales Invoice", "Delivery Note", "Quotation"],
+ default: "Sales Order",
+ reqd: 1,
},
{
- "fieldname":"based_on_field",
- "label": __("Based On"),
- "fieldtype": "Select",
- "options": ["Qty", "Amount"],
- "default": "Qty",
- "reqd": 1
+ fieldname: "based_on_field",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: ["Qty", "Amount"],
+ default: "Qty",
+ reqd: 1,
},
{
- "fieldname":"no_of_years",
- "label": __("Based On Data ( in years )"),
- "fieldtype": "Select",
- "options": [3, 6, 9],
- "default": 3,
- "reqd": 1
+ fieldname: "no_of_years",
+ label: __("Based On Data ( in years )"),
+ fieldtype: "Select",
+ options: [3, 6, 9],
+ default: 3,
+ reqd: 1,
},
{
- "fieldname": "periodicity",
- "label": __("Periodicity"),
- "fieldtype": "Select",
- "options": [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ fieldname: "periodicity",
+ label: __("Periodicity"),
+ fieldtype: "Select",
+ options: [
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
- "default": "Yearly",
- "reqd": 1
+ default: "Yearly",
+ reqd: 1,
},
{
- "fieldname":"smoothing_constant",
- "label": __("Smoothing Constant"),
- "fieldtype": "Select",
- "options": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0],
- "reqd": 1,
- "default": 0.3
+ fieldname: "smoothing_constant",
+ label: __("Smoothing Constant"),
+ fieldtype: "Select",
+ options: [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0],
+ reqd: 1,
+ default: 0.3,
},
{
- "fieldname":"item_code",
- "label": __("Item Code"),
- "fieldtype": "Link",
- "options": "Item"
+ fieldname: "item_code",
+ label: __("Item Code"),
+ fieldtype: "Link",
+ options: "Item",
},
{
- "fieldname":"warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse",
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
get_query: () => {
- var company = frappe.query_report.get_filter_value('company');
+ var company = frappe.query_report.get_filter_value("company");
if (company) {
return {
filters: {
- 'company': company
- }
+ company: company,
+ },
};
}
- }
- }
- ]
+ },
+ },
+ ],
};
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
index 4b3f86fcbffd..2196500cfb0a 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -1,16 +1,15 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Job Card Summary"] = {
- "filters": [
+ filters: [
{
label: __("Company"),
fieldname: "company",
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "fiscal_year",
@@ -19,30 +18,30 @@ frappe.query_reports["Job Card Summary"] = {
options: "Fiscal Year",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
reqd: 1,
- on_change: function(query_report) {
+ on_change: function (query_report) {
var fiscal_year = query_report.get_values().fiscal_year;
if (!fiscal_year) {
return;
}
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
from_date: fy.year_start_date,
- to_date: fy.year_end_date
+ to_date: fy.year_end_date,
});
});
- }
+ },
},
{
label: __("From Posting Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- reqd: 1
+ reqd: 1,
},
{
label: __("To Posting Date"),
- fieldname:"to_date",
+ fieldname: "to_date",
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
reqd: 1,
@@ -51,35 +50,35 @@ frappe.query_reports["Job Card Summary"] = {
label: __("Status"),
fieldname: "status",
fieldtype: "Select",
- options: ["", "Open", "Work In Progress", "Completed", "On Hold"]
+ options: ["", "Open", "Work In Progress", "Completed", "On Hold"],
},
{
label: __("Work Orders"),
fieldname: "work_order",
fieldtype: "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Work Order', txt);
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Work Order", txt);
+ },
},
{
label: __("Production Item"),
fieldname: "production_item",
fieldtype: "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Item', txt);
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Item", txt);
+ },
},
{
label: __("Workstation"),
fieldname: "workstation",
fieldtype: "Link",
- options: "Workstation"
+ options: "Workstation",
},
{
label: __("Operation"),
fieldname: "operation",
fieldtype: "Link",
- options: "Operation"
- }
- ]
+ options: "Operation",
+ },
+ ],
};
diff --git a/erpnext/manufacturing/report/process_loss_report/process_loss_report.js b/erpnext/manufacturing/report/process_loss_report/process_loss_report.js
index c08413dc4a6c..89cc5584b67f 100644
--- a/erpnext/manufacturing/report/process_loss_report/process_loss_report.js
+++ b/erpnext/manufacturing/report/process_loss_report/process_loss_report.js
@@ -1,44 +1,43 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Process Loss Report"] = {
filters: [
- {
- label: __("Company"),
- fieldname: "company",
- fieldtype: "Link",
- options: "Company",
- mandatory: true,
- default: frappe.defaults.get_user_default("Company"),
- },
{
- label: __("Item"),
- fieldname: "item",
- fieldtype: "Link",
- options: "Item",
- mandatory: false,
+ label: __("Company"),
+ fieldname: "company",
+ fieldtype: "Link",
+ options: "Company",
+ mandatory: true,
+ default: frappe.defaults.get_user_default("Company"),
+ },
+ {
+ label: __("Item"),
+ fieldname: "item",
+ fieldtype: "Link",
+ options: "Item",
+ mandatory: false,
+ },
+ {
+ label: __("Work Order"),
+ fieldname: "work_order",
+ fieldtype: "Link",
+ options: "Work Order",
+ mandatory: false,
+ },
+ {
+ label: __("From Date"),
+ fieldname: "from_date",
+ fieldtype: "Date",
+ mandatory: true,
+ default: frappe.datetime.year_start(),
},
{
- label: __("Work Order"),
- fieldname: "work_order",
- fieldtype: "Link",
- options: "Work Order",
- mandatory: false,
+ label: __("To Date"),
+ fieldname: "to_date",
+ fieldtype: "Date",
+ mandatory: true,
+ default: frappe.datetime.get_today(),
},
- {
- label: __("From Date"),
- fieldname: "from_date",
- fieldtype: "Date",
- mandatory: true,
- default: frappe.datetime.year_start(),
- },
- {
- label: __("To Date"),
- fieldname: "to_date",
- fieldtype: "Date",
- mandatory: true,
- default: frappe.datetime.get_today(),
- },
- ]
+ ],
};
diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.js b/erpnext/manufacturing/report/production_analytics/production_analytics.js
index 77529a5e57eb..208cd3251c7c 100644
--- a/erpnext/manufacturing/report/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/report/production_analytics/production_analytics.js
@@ -1,43 +1,42 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Production Analytics"] = {
- "filters": [
+ filters: [
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
- reqd: 1
+ reqd: 1,
},
{
fieldname: "range",
label: __("Range"),
fieldtype: "Select",
options: [
- { "value": "Weekly", "label": __("Weekly") },
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Yearly", "label": __("Yearly") }
+ { value: "Weekly", label: __("Weekly") },
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Yearly", label: __("Yearly") },
],
default: "Monthly",
- reqd: 1
- }
- ]
-}
+ reqd: 1,
+ },
+ ],
+};
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
index afe4a6e0cbdf..0e89a25c2285 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
@@ -1,30 +1,29 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Production Plan Summary"] = {
- "filters": [
+ filters: [
{
fieldname: "production_plan",
label: __("Production Plan"),
fieldtype: "Link",
options: "Production Plan",
reqd: 1,
- get_query: function() {
+ get_query: function () {
return {
filters: {
- "docstatus": 1
- }
+ docstatus: 1,
+ },
};
- }
- }
+ },
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (column.fieldname == "item_code") {
- var color = data.pending_qty > 0 ? 'red': 'green';
- value = `${data['item_code']} `;
+ var color = data.pending_qty > 0 ? "red" : "green";
+ value = `${data["item_code"]} `;
}
return value;
diff --git a/erpnext/manufacturing/report/production_planning_report/production_planning_report.js b/erpnext/manufacturing/report/production_planning_report/production_planning_report.js
index 422583274b99..d6ca248abb55 100644
--- a/erpnext/manufacturing/report/production_planning_report/production_planning_report.js
+++ b/erpnext/manufacturing/report/production_planning_report/production_planning_report.js
@@ -1,108 +1,111 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Production Planning Report"] = {
- "filters": [
+ filters: [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"based_on",
- "label": __("Based On"),
- "fieldtype": "Select",
- "options": ["Sales Order", "Material Request", "Work Order"],
- "default": "Sales Order",
- "reqd": 1,
- on_change: function() {
+ fieldname: "based_on",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: ["Sales Order", "Material Request", "Work Order"],
+ default: "Sales Order",
+ reqd: 1,
+ on_change: function () {
let filters = frappe.query_report.filters;
- let based_on = frappe.query_report.get_filter_value('based_on');
+ let based_on = frappe.query_report.get_filter_value("based_on");
let options = {
"Sales Order": ["Delivery Date", "Total Amount"],
"Material Request": ["Required Date"],
- "Work Order": ["Planned Start Date"]
- }
+ "Work Order": ["Planned Start Date"],
+ };
- filters.forEach(d => {
+ filters.forEach((d) => {
if (d.fieldname == "order_by") {
d.df.options = options[based_on];
- d.set_input(d.df.options)
+ d.set_input(d.df.options);
}
});
frappe.query_report.refresh();
- }
+ },
},
{
- "fieldname":"docnames",
- "label": __("Document Name"),
- "fieldtype": "MultiSelectList",
- "options": "Sales Order",
- "get_data": function(txt) {
+ fieldname: "docnames",
+ label: __("Document Name"),
+ fieldtype: "MultiSelectList",
+ options: "Sales Order",
+ get_data: function (txt) {
if (!frappe.query_report.filters) return;
- let based_on = frappe.query_report.get_filter_value('based_on');
+ let based_on = frappe.query_report.get_filter_value("based_on");
if (!based_on) return;
return frappe.db.get_link_options(based_on, txt);
},
- "get_query": function() {
- var company = frappe.query_report.get_filter_value('company');
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- "docstatus": 1,
- "company": company
- }
+ docstatus: 1,
+ company: company,
+ },
};
- }
+ },
},
{
- "fieldname":"raw_material_warehouse",
- "label": __("Raw Material Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse",
- "depends_on": "eval: doc.based_on != 'Work Order'",
- "get_query": function() {
- var company = frappe.query_report.get_filter_value('company');
+ fieldname: "raw_material_warehouse",
+ label: __("Raw Material Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
+ depends_on: "eval: doc.based_on != 'Work Order'",
+ get_query: function () {
+ var company = frappe.query_report.get_filter_value("company");
return {
filters: {
- "company": company
- }
+ company: company,
+ },
};
- }
+ },
},
{
- "fieldname":"order_by",
- "label": __("Order By"),
- "fieldtype": "Select",
- "options": ["Delivery Date", "Total Amount"],
- "default": "Delivery Date"
+ fieldname: "order_by",
+ label: __("Order By"),
+ fieldtype: "Select",
+ options: ["Delivery Date", "Total Amount"],
+ default: "Delivery Date",
},
{
- "fieldname":"include_subassembly_raw_materials",
- "label": __("Include Sub-assembly Raw Materials"),
- "fieldtype": "Check",
- "depends_on": "eval: doc.based_on != 'Work Order'",
- "default": 0
+ fieldname: "include_subassembly_raw_materials",
+ label: __("Include Sub-assembly Raw Materials"),
+ fieldtype: "Check",
+ depends_on: "eval: doc.based_on != 'Work Order'",
+ default: 0,
},
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
- if (column.fieldname == "production_item_name" && data && data.qty_to_manufacture > data.available_qty ) {
+ if (
+ column.fieldname == "production_item_name" &&
+ data &&
+ data.qty_to_manufacture > data.available_qty
+ ) {
value = `${value}
`;
}
- if (column.fieldname == "production_item" && !data.name ) {
+ if (column.fieldname == "production_item" && !data.name) {
value = "";
}
- if (column.fieldname == "raw_material_name" && data && data.required_qty > data.allotted_qty ) {
+ if (column.fieldname == "raw_material_name" && data && data.required_qty > data.allotted_qty) {
value = `${value}
`;
}
diff --git a/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js b/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js
index 905d18507681..6c237d656965 100644
--- a/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js
+++ b/erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js
@@ -1,19 +1,18 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Quality Inspection Summary"] = {
- "filters": [
+ filters: [
{
label: __("From Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -12),
- reqd: 1
+ reqd: 1,
},
{
label: __("To Date"),
- fieldname:"to_date",
+ fieldname: "to_date",
fieldtype: "Date",
default: frappe.datetime.get_today(),
reqd: 1,
@@ -22,19 +21,19 @@ frappe.query_reports["Quality Inspection Summary"] = {
label: __("Status"),
fieldname: "status",
fieldtype: "Select",
- options: ["", "Accepted", "Rejected"]
+ options: ["", "Accepted", "Rejected"],
},
{
label: __("Item Code"),
fieldname: "item_code",
fieldtype: "Link",
- options: "Item"
+ options: "Item",
},
{
label: __("Inspected By"),
fieldname: "inspected_by",
fieldtype: "Link",
- options: "User"
- }
- ]
+ options: "User",
+ },
+ ],
};
diff --git a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js
index 70d7f92da0ef..b9ad4e2d6220 100644
--- a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js
+++ b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js
@@ -1,67 +1,66 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Work Order Consumed Materials"] = {
- "filters": [
+ filters: [
{
label: __("Company"),
fieldname: "company",
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
label: __("From Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- reqd: 1
+ reqd: 1,
},
{
- fieldname:"to_date",
+ fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
- reqd: 1
+ reqd: 1,
},
{
label: __("Work Order"),
fieldname: "name",
fieldtype: "Link",
options: "Work Order",
- get_query: function() {
+ get_query: function () {
return {
filters: {
- status: ["in", ["In Process", "Completed", "Stopped"]]
- }
- }
- }
+ status: ["in", ["In Process", "Completed", "Stopped"]],
+ },
+ };
+ },
},
{
label: __("Production Item"),
fieldname: "production_item",
fieldtype: "Link",
depends_on: "eval: !doc.name",
- options: "Item"
+ options: "Item",
},
{
label: __("Status"),
fieldname: "status",
fieldtype: "Select",
- options: ["", "In Process", "Completed", "Stopped"]
+ options: ["", "In Process", "Completed", "Stopped"],
},
{
label: __("Excess Materials Consumed"),
fieldname: "show_extra_consumed_materials",
- fieldtype: "Check"
- }
+ fieldtype: "Check",
+ },
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
- if (column.fieldname == "raw_material_name" && data && data.extra_consumed_qty > 0 ) {
+ if (column.fieldname == "raw_material_name" && data && data.extra_consumed_qty > 0) {
value = `${value}
`;
}
diff --git a/erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.js b/erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.js
index cf651cb39497..758056ad4800 100644
--- a/erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.js
+++ b/erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.js
@@ -1,14 +1,13 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Work Order Stock Report"] = {
- "filters": [
+ filters: [
{
- "fieldname": "warehouse",
- "label": __("Warehouse"),
- "fieldtype": "Link",
- "options": "Warehouse"
- }
- ]
-}
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ fieldtype: "Link",
+ options: "Warehouse",
+ },
+ ],
+};
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.js b/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
index d0242f4d3b94..f48f8b7ea187 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
@@ -1,34 +1,33 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Work Order Summary"] = {
- "filters": [
+ filters: [
{
label: __("Company"),
fieldname: "company",
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
- reqd: 1
+ reqd: 1,
},
{
label: __("Based On"),
- fieldname:"based_on",
+ fieldname: "based_on",
fieldtype: "Select",
options: "Creation Date\nPlanned Date\nActual Date",
- default: "Creation Date"
+ default: "Creation Date",
},
{
label: __("From Posting Date"),
- fieldname:"from_date",
+ fieldname: "from_date",
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -3),
- reqd: 1
+ reqd: 1,
},
{
label: __("To Posting Date"),
- fieldname:"to_date",
+ fieldname: "to_date",
fieldtype: "Date",
default: frappe.datetime.get_today(),
reqd: 1,
@@ -37,36 +36,36 @@ frappe.query_reports["Work Order Summary"] = {
label: __("Status"),
fieldname: "status",
fieldtype: "Select",
- options: ["", "Not Started", "In Process", "Completed", "Stopped", "Closed"]
+ options: ["", "Not Started", "In Process", "Completed", "Stopped", "Closed"],
},
{
label: __("Sales Orders"),
fieldname: "sales_order",
fieldtype: "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Sales Order', txt);
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Sales Order", txt);
+ },
},
{
label: __("Production Item"),
fieldname: "production_item",
fieldtype: "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Item', txt);
- }
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Item", txt);
+ },
},
{
label: __("Age"),
- fieldname:"age",
+ fieldname: "age",
fieldtype: "Int",
- default: "0"
+ default: "0",
},
{
label: __("Charts Based On"),
- fieldname:"charts_based_on",
+ fieldname: "charts_based_on",
fieldtype: "Select",
options: ["Status", "Age", "Quantity"],
- default: "Status"
+ default: "Status",
},
- ]
+ ],
};
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.js b/erpnext/projects/doctype/activity_cost/activity_cost.js
index 2d22caad8e2a..d47b574265f6 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.js
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.js
@@ -1 +1 @@
-cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
+cur_frm.add_fetch("employee", "employee_name", "employee_name");
diff --git a/erpnext/projects/doctype/activity_type/activity_type.js b/erpnext/projects/doctype/activity_type/activity_type.js
index f1ba882812e4..b620cdd6c64e 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.js
+++ b/erpnext/projects/doctype/activity_type/activity_type.js
@@ -1,12 +1,15 @@
frappe.ui.form.on("Activity Type", {
- onload: function(frm) {
- frm.set_currency_labels(["billing_rate", "costing_rate"], frappe.defaults.get_global_default('currency'));
+ onload: function (frm) {
+ frm.set_currency_labels(
+ ["billing_rate", "costing_rate"],
+ frappe.defaults.get_global_default("currency")
+ );
},
- refresh: function(frm) {
- frm.add_custom_button(__("Activity Cost per Employee"), function() {
- frappe.route_options = {"activity_type": frm.doc.name};
+ refresh: function (frm) {
+ frm.add_custom_button(__("Activity Cost per Employee"), function () {
+ frappe.route_options = { activity_type: frm.doc.name };
frappe.set_route("List", "Activity Cost");
});
- }
+ },
});
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index e0dd1989e80d..16ac8db024b4 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -3,16 +3,16 @@
frappe.ui.form.on("Project", {
setup(frm) {
frm.make_methods = {
- 'Timesheet': () => {
+ Timesheet: () => {
open_form(frm, "Timesheet", "Timesheet Detail", "time_logs");
},
- 'Purchase Order': () => {
+ "Purchase Order": () => {
open_form(frm, "Purchase Order", "Purchase Order Item", "items");
},
- 'Purchase Receipt': () => {
+ "Purchase Receipt": () => {
open_form(frm, "Purchase Receipt", "Purchase Receipt Item", "items");
},
- 'Purchase Invoice': () => {
+ "Purchase Invoice": () => {
open_form(frm, "Purchase Invoice", "Purchase Invoice Item", "items");
},
};
@@ -22,31 +22,31 @@ frappe.ui.form.on("Project", {
so.get_route_options_for_new_doc = () => {
if (frm.is_new()) return {};
return {
- "customer": frm.doc.customer,
- "project_name": frm.doc.name
+ customer: frm.doc.customer,
+ project_name: frm.doc.name,
};
};
- frm.set_query('customer', 'erpnext.controllers.queries.customer_query');
+ frm.set_query("customer", "erpnext.controllers.queries.customer_query");
frm.set_query("user", "users", function () {
return {
- query: "erpnext.projects.doctype.project.project.get_users_for_project"
+ query: "erpnext.projects.doctype.project.project.get_users_for_project",
};
});
frm.set_query("department", function (doc) {
return {
filters: {
- "company": doc.company,
- }
+ company: doc.company,
+ },
};
});
// sales order
- frm.set_query('sales_order', function () {
+ frm.set_query("sales_order", function () {
var filters = {
- 'project': ["in", frm.doc.__islocal ? [""] : [frm.doc.name, ""]]
+ project: ["in", frm.doc.__islocal ? [""] : [frm.doc.name, ""]],
};
if (frm.doc.customer) {
@@ -54,7 +54,7 @@ frappe.ui.form.on("Project", {
}
return {
- filters: filters
+ filters: filters,
};
});
},
@@ -65,108 +65,133 @@ frappe.ui.form.on("Project", {
} else {
frm.add_web_link("/projects?project=" + encodeURIComponent(frm.doc.name));
- frm.trigger('show_dashboard');
+ frm.trigger("show_dashboard");
}
frm.trigger("set_custom_buttons");
},
- set_custom_buttons: function(frm) {
+ set_custom_buttons: function (frm) {
if (!frm.is_new()) {
- frm.add_custom_button(__('Duplicate Project with Tasks'), () => {
- frm.events.create_duplicate(frm);
- }, __("Actions"));
+ frm.add_custom_button(
+ __("Duplicate Project with Tasks"),
+ () => {
+ frm.events.create_duplicate(frm);
+ },
+ __("Actions")
+ );
- frm.add_custom_button(__('Update Total Purchase Cost'), () => {
- frm.events.update_total_purchase_cost(frm);
- }, __("Actions"));
+ frm.add_custom_button(
+ __("Update Total Purchase Cost"),
+ () => {
+ frm.events.update_total_purchase_cost(frm);
+ },
+ __("Actions")
+ );
frm.trigger("set_project_status_button");
-
if (frappe.model.can_read("Task")) {
- frm.add_custom_button(__("Gantt Chart"), function () {
- frappe.route_options = {
- "project": frm.doc.name
- };
- frappe.set_route("List", "Task", "Gantt");
- }, __("View"));
-
- frm.add_custom_button(__("Kanban Board"), () => {
- frappe.call('erpnext.projects.doctype.project.project.create_kanban_board_if_not_exists', {
- project: frm.doc.name
- }).then(() => {
- frappe.set_route('List', 'Task', 'Kanban', frm.doc.project_name);
- });
- }, __("View"));
+ frm.add_custom_button(
+ __("Gantt Chart"),
+ function () {
+ frappe.route_options = {
+ project: frm.doc.name,
+ };
+ frappe.set_route("List", "Task", "Gantt");
+ },
+ __("View")
+ );
+
+ frm.add_custom_button(
+ __("Kanban Board"),
+ () => {
+ frappe
+ .call(
+ "erpnext.projects.doctype.project.project.create_kanban_board_if_not_exists",
+ {
+ project: frm.doc.name,
+ }
+ )
+ .then(() => {
+ frappe.set_route("List", "Task", "Kanban", frm.doc.project_name);
+ });
+ },
+ __("View")
+ );
}
}
-
-
},
- update_total_purchase_cost: function(frm) {
+ update_total_purchase_cost: function (frm) {
frappe.call({
method: "erpnext.projects.doctype.project.project.recalculate_project_total_purchase_cost",
- args: {project: frm.doc.name},
+ args: { project: frm.doc.name },
freeze: true,
- freeze_message: __('Recalculating Purchase Cost against this Project...'),
- callback: function(r) {
+ freeze_message: __("Recalculating Purchase Cost against this Project..."),
+ callback: function (r) {
if (r && !r.exc) {
- frappe.msgprint(__('Total Purchase Cost has been updated'));
+ frappe.msgprint(__("Total Purchase Cost has been updated"));
frm.refresh();
}
- }
-
+ },
});
},
- set_project_status_button: function(frm) {
- frm.add_custom_button(__('Set Project Status'), () => {
- let d = new frappe.ui.Dialog({
- "title": __("Set Project Status"),
- "fields": [
- {
- "fieldname": "status",
- "fieldtype": "Select",
- "label": "Status",
- "reqd": 1,
- "options": "Completed\nCancelled",
+ set_project_status_button: function (frm) {
+ frm.add_custom_button(
+ __("Set Project Status"),
+ () => {
+ let d = new frappe.ui.Dialog({
+ title: __("Set Project Status"),
+ fields: [
+ {
+ fieldname: "status",
+ fieldtype: "Select",
+ label: "Status",
+ reqd: 1,
+ options: "Completed\nCancelled",
+ },
+ ],
+ primary_action: function () {
+ frm.events.set_status(frm, d.get_values().status);
+ d.hide();
},
- ],
- primary_action: function() {
- frm.events.set_status(frm, d.get_values().status);
- d.hide();
- },
- primary_action_label: __("Set Project Status")
- }).show();
- }, __("Actions"));
+ primary_action_label: __("Set Project Status"),
+ }).show();
+ },
+ __("Actions")
+ );
},
- create_duplicate: function(frm) {
- return new Promise(resolve => {
- frappe.prompt('Project Name', (data) => {
- frappe.xcall('erpnext.projects.doctype.project.project.create_duplicate_project',
- {
+ create_duplicate: function (frm) {
+ return new Promise((resolve) => {
+ frappe.prompt("Project Name", (data) => {
+ frappe
+ .xcall("erpnext.projects.doctype.project.project.create_duplicate_project", {
prev_doc: frm.doc,
- project_name: data.value
- }).then(() => {
- frappe.set_route('Form', "Project", data.value);
- frappe.show_alert(__("Duplicate project has been created"));
- });
+ project_name: data.value,
+ })
+ .then(() => {
+ frappe.set_route("Form", "Project", data.value);
+ frappe.show_alert(__("Duplicate project has been created"));
+ });
resolve();
});
});
},
- set_status: function(frm, status) {
- frappe.confirm(__('Set Project and all Tasks to status {0}?', [status.bold()]), () => {
- frappe.xcall('erpnext.projects.doctype.project.project.set_project_status',
- {project: frm.doc.name, status: status}).then(() => {
- frm.reload_doc();
- });
+ set_status: function (frm, status) {
+ frappe.confirm(__("Set Project and all Tasks to status {0}?", [status.bold()]), () => {
+ frappe
+ .xcall("erpnext.projects.doctype.project.project.set_project_status", {
+ project: frm.doc.name,
+ status: status,
+ })
+ .then(() => {
+ frm.reload_doc();
+ });
});
},
-
});
function open_form(frm, doctype, child_doctype, parentfield) {
@@ -184,5 +209,4 @@ function open_form(frm, doctype, child_doctype, parentfield) {
frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
});
-
}
diff --git a/erpnext/projects/doctype/project/project_list.js b/erpnext/projects/doctype/project/project_list.js
index 5ad4bb7f93b5..1503b1ee5d3f 100644
--- a/erpnext/projects/doctype/project/project_list.js
+++ b/erpnext/projects/doctype/project/project_list.js
@@ -1,11 +1,11 @@
-frappe.listview_settings['Project'] = {
+frappe.listview_settings["Project"] = {
add_fields: ["status", "priority", "is_active", "percent_complete", "expected_end_date", "project_name"],
- filters:[["status","=", "Open"]],
- get_indicator: function(doc) {
- if(doc.status=="Open" && doc.percent_complete) {
+ filters: [["status", "=", "Open"]],
+ get_indicator: function (doc) {
+ if (doc.status == "Open" && doc.percent_complete) {
return [__("{0}%", [cint(doc.percent_complete)]), "orange", "percent_complete,>,0|status,=,Open"];
} else {
return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
}
- }
+ },
};
diff --git a/erpnext/projects/doctype/project/project_timesheet.js b/erpnext/projects/doctype/project/project_timesheet.js
index 32df04ff98bc..bc6de3134da5 100644
--- a/erpnext/projects/doctype/project/project_timesheet.js
+++ b/erpnext/projects/doctype/project/project_timesheet.js
@@ -1,53 +1,63 @@
-
-QUnit.test("test project", function(assert) {
+QUnit.test("test project", function (assert) {
assert.expect(6);
let done = assert.async();
- var task_title = ["Documentation","Implementation","Testing"];
+ var task_title = ["Documentation", "Implementation", "Testing"];
// To create a timesheet with different tasks and costs
- let timesheet = (title,start_time,end_time,bill_rate,cost_rate) => {
+ let timesheet = (title, start_time, end_time, bill_rate, cost_rate) => {
return frappe.run_serially([
- () => frappe.db.get_value('Task', {'subject': title}, 'name'),
+ () => frappe.db.get_value("Task", { subject: title }, "name"),
(task) => {
// Creating timesheet for a project
- return frappe.tests.make('Timesheet', [
- {time_logs:[
- [
- {activity_type: 'Communication'},
- {from_time: start_time},
- {to_time: end_time},
- {hours: 2},
- {project: 'Test App'},
- {task: task.name},
- {billable: '1'},
- {billing_rate: bill_rate},
- {costing_rate: cost_rate}
- ]
- ]}
+ return frappe.tests.make("Timesheet", [
+ {
+ time_logs: [
+ [
+ { activity_type: "Communication" },
+ { from_time: start_time },
+ { to_time: end_time },
+ { hours: 2 },
+ { project: "Test App" },
+ { task: task.name },
+ { billable: "1" },
+ { billing_rate: bill_rate },
+ { costing_rate: cost_rate },
+ ],
+ ],
+ },
]);
},
// To check if a correct billable and costing amount is calculated for every task
() => {
- if(title=== 'Documentation')
- {
- assert.ok(cur_frm.get_field('total_billable_amount').get_value()==20,
- 'Billable amount for Documentation task is correctly calculated');
- assert.ok(cur_frm.get_field('total_costing_amount').get_value()==16,
- 'Costing amount for Documentation task is correctly calculated');
+ if (title === "Documentation") {
+ assert.ok(
+ cur_frm.get_field("total_billable_amount").get_value() == 20,
+ "Billable amount for Documentation task is correctly calculated"
+ );
+ assert.ok(
+ cur_frm.get_field("total_costing_amount").get_value() == 16,
+ "Costing amount for Documentation task is correctly calculated"
+ );
}
- if(title=== 'Implementation')
- {
- assert.ok(cur_frm.get_field('total_billable_amount').get_value()==40,
- 'Billable amount for Implementation task is correctly calculated');
- assert.ok(cur_frm.get_field('total_costing_amount').get_value()==32,
- 'Costing amount for Implementation task is correctly calculated');
+ if (title === "Implementation") {
+ assert.ok(
+ cur_frm.get_field("total_billable_amount").get_value() == 40,
+ "Billable amount for Implementation task is correctly calculated"
+ );
+ assert.ok(
+ cur_frm.get_field("total_costing_amount").get_value() == 32,
+ "Costing amount for Implementation task is correctly calculated"
+ );
}
- if(title=== 'Testing')
- {
- assert.ok(cur_frm.get_field('total_billable_amount').get_value()==60,
- 'Billable amount for Testing task correctly calculated');
- assert.ok(cur_frm.get_field('total_costing_amount').get_value()==50,
- 'Costing amount for Testing task is correctly calculated');
+ if (title === "Testing") {
+ assert.ok(
+ cur_frm.get_field("total_billable_amount").get_value() == 60,
+ "Billable amount for Testing task correctly calculated"
+ );
+ assert.ok(
+ cur_frm.get_field("total_costing_amount").get_value() == 50,
+ "Costing amount for Testing task is correctly calculated"
+ );
}
},
]);
@@ -55,37 +65,39 @@ QUnit.test("test project", function(assert) {
frappe.run_serially([
() => {
// Creating project with task
- return frappe.tests.make('Project', [
- { project_name: 'Test App'},
- { expected_start_date: '2017-07-22'},
- { expected_end_date: '2017-09-22'},
- { estimated_costing: '10,000.00'},
- { tasks:[
- [
- {title: 'Documentation'},
- {start_date: '2017-07-24'},
- {end_date: '2017-07-31'},
- {description: 'To make a proper documentation defining requirements etc'}
- ],
- [
- {title: 'Implementation'},
- {start_date: '2017-08-01'},
- {end_date: '2017-08-01'},
- {description: 'Writing algorithms and to code the functionalities'}
+ return frappe.tests.make("Project", [
+ { project_name: "Test App" },
+ { expected_start_date: "2017-07-22" },
+ { expected_end_date: "2017-09-22" },
+ { estimated_costing: "10,000.00" },
+ {
+ tasks: [
+ [
+ { title: "Documentation" },
+ { start_date: "2017-07-24" },
+ { end_date: "2017-07-31" },
+ { description: "To make a proper documentation defining requirements etc" },
+ ],
+ [
+ { title: "Implementation" },
+ { start_date: "2017-08-01" },
+ { end_date: "2017-08-01" },
+ { description: "Writing algorithms and to code the functionalities" },
+ ],
+ [
+ { title: "Testing" },
+ { start_date: "2017-08-01" },
+ { end_date: "2017-08-15" },
+ { description: "To make the test cases and test the functionalities" },
+ ],
],
- [
- {title: 'Testing'},
- {start_date: '2017-08-01'},
- {end_date: '2017-08-15'},
- {description: 'To make the test cases and test the functionalities'}
- ]
- ]}
+ },
]);
},
// Creating Timesheet with different tasks
- () => timesheet(task_title[0],'2017-07-24 13:00:00','2017-07-24 13:00:00',10,8),
- () => timesheet(task_title[1],'2017-07-25 13:00:00','2017-07-25 15:00:00',20,16),
- () => timesheet(task_title[2],'2017-07-26 13:00:00','2017-07-26 15:00:00',30,25),
- () => done()
+ () => timesheet(task_title[0], "2017-07-24 13:00:00", "2017-07-24 13:00:00", 10, 8),
+ () => timesheet(task_title[1], "2017-07-25 13:00:00", "2017-07-25 15:00:00", 20, 16),
+ () => timesheet(task_title[2], "2017-07-26 13:00:00", "2017-07-26 15:00:00", 30, 25),
+ () => done(),
]);
});
diff --git a/erpnext/projects/doctype/project_template/project_template.js b/erpnext/projects/doctype/project_template/project_template.js
index 3d3c15c6e056..a2d008af0270 100644
--- a/erpnext/projects/doctype/project_template/project_template.js
+++ b/erpnext/projects/doctype/project_template/project_template.js
@@ -1,7 +1,7 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Project Template', {
+frappe.ui.form.on("Project Template", {
// refresh: function(frm) {
// }
@@ -9,19 +9,19 @@ frappe.ui.form.on('Project Template', {
frm.set_query("task", "tasks", function () {
return {
filters: {
- "is_template": 1
- }
+ is_template: 1,
+ },
};
});
- }
+ },
});
-frappe.ui.form.on('Project Template Task', {
+frappe.ui.form.on("Project Template Task", {
task: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
frappe.db.get_value("Task", row.task, "subject", (value) => {
row.subject = value.subject;
refresh_field("tasks");
});
- }
+ },
});
diff --git a/erpnext/projects/doctype/project_type/project_type.js b/erpnext/projects/doctype/project_type/project_type.js
index e3dda5eccc5d..8506c787ece3 100644
--- a/erpnext/projects/doctype/project_type/project_type.js
+++ b/erpnext/projects/doctype/project_type/project_type.js
@@ -1,6 +1,4 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Project Type', {
-
-});
+frappe.ui.form.on("Project Type", {});
diff --git a/erpnext/projects/doctype/project_update/project_update.js b/erpnext/projects/doctype/project_update/project_update.js
index 990c1afd9ab8..4e3f0fa97d27 100644
--- a/erpnext/projects/doctype/project_update/project_update.js
+++ b/erpnext/projects/doctype/project_update/project_update.js
@@ -1,10 +1,8 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Project Update', {
- refresh: function() {
-
- },
+frappe.ui.form.on("Project Update", {
+ refresh: function () {},
onload: function (frm) {
frm.set_value("naming_series", "UPDATE-.project.-.YY.MM.DD.-.####");
@@ -13,5 +11,5 @@ frappe.ui.form.on('Project Update', {
validate: function (frm) {
frm.set_value("time", frappe.datetime.now_time());
frm.set_value("date", frappe.datetime.nowdate());
- }
+ },
});
diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.js b/erpnext/projects/doctype/projects_settings/projects_settings.js
index 9902b8349209..08f50a6d989f 100644
--- a/erpnext/projects/doctype/projects_settings/projects_settings.js
+++ b/erpnext/projects/doctype/projects_settings/projects_settings.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Projects Settings', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Projects Settings", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 3cd92ee719db..c56c998a5184 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -6,33 +6,34 @@ frappe.provide("erpnext.projects");
frappe.ui.form.on("Task", {
setup: function (frm) {
frm.make_methods = {
- 'Timesheet': () => frappe.model.open_mapped_doc({
- method: 'erpnext.projects.doctype.task.task.make_timesheet',
- frm: frm
- })
- }
+ Timesheet: () =>
+ frappe.model.open_mapped_doc({
+ method: "erpnext.projects.doctype.task.task.make_timesheet",
+ frm: frm,
+ }),
+ };
},
onload: function (frm) {
frm.set_query("task", "depends_on", function () {
let filters = {
- name: ["!=", frm.doc.name]
+ name: ["!=", frm.doc.name],
};
if (frm.doc.project) filters["project"] = frm.doc.project;
return {
- filters: filters
+ filters: filters,
};
- })
+ });
frm.set_query("parent_task", function () {
let filters = {
- "is_group": 1,
- "name": ["!=", frm.doc.name]
+ is_group: 1,
+ name: ["!=", frm.doc.name],
};
if (frm.doc.project) filters["project"] = frm.doc.project;
return {
- filters: filters
- }
+ filters: filters,
+ };
});
},
@@ -40,22 +41,22 @@ frappe.ui.form.on("Task", {
frappe.call({
method: "erpnext.projects.doctype.task.task.check_if_child_exists",
args: {
- name: frm.doc.name
+ name: frm.doc.name,
},
callback: function (r) {
if (r.message.length > 0) {
- let message = __('Cannot convert Task to non-group because the following child Tasks exist: {0}.',
+ let message = __(
+ "Cannot convert Task to non-group because the following child Tasks exist: {0}.",
[r.message.join(", ")]
);
frappe.msgprint(message);
frm.reload_doc();
}
- }
- })
+ },
+ });
},
validate: function (frm) {
- frm.doc.project && frappe.model.remove_from_locals("Project",
- frm.doc.project);
- }
+ frm.doc.project && frappe.model.remove_from_locals("Project", frm.doc.project);
+ },
});
diff --git a/erpnext/projects/doctype/task/task_calendar.js b/erpnext/projects/doctype/task/task_calendar.js
index 49dbb76a1a57..768eb15b1571 100644
--- a/erpnext/projects/doctype/task/task_calendar.js
+++ b/erpnext/projects/doctype/task/task_calendar.js
@@ -3,21 +3,21 @@
frappe.views.calendar["Task"] = {
field_map: {
- "start": "exp_start_date",
- "end": "exp_end_date",
- "id": "name",
- "title": "subject",
- "allDay": "allDay",
- "progress": "progress"
+ start: "exp_start_date",
+ end: "exp_end_date",
+ id: "name",
+ title: "subject",
+ allDay: "allDay",
+ progress: "progress",
},
gantt: true,
filters: [
{
- "fieldtype": "Link",
- "fieldname": "project",
- "options": "Project",
- "label": __("Project")
- }
+ fieldtype: "Link",
+ fieldname: "project",
+ options: "Project",
+ label: __("Project"),
+ },
],
- get_events_method: "frappe.desk.calendar.get_events"
-}
+ get_events_method: "frappe.desk.calendar.get_events",
+};
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index 5ab8bae2e1d6..17b0ed2c7fa0 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -1,28 +1,36 @@
-frappe.listview_settings['Task'] = {
- add_fields: ["project", "status", "priority", "exp_start_date",
- "exp_end_date", "subject", "progress", "depends_on_tasks"],
+frappe.listview_settings["Task"] = {
+ add_fields: [
+ "project",
+ "status",
+ "priority",
+ "exp_start_date",
+ "exp_end_date",
+ "subject",
+ "progress",
+ "depends_on_tasks",
+ ],
filters: [["status", "=", "Open"]],
- onload: function(listview) {
+ onload: function (listview) {
var method = "erpnext.projects.doctype.task.task.set_multiple_status";
- listview.page.add_menu_item(__("Set as Open"), function() {
- listview.call_for_selected_items(method, {"status": "Open"});
+ listview.page.add_menu_item(__("Set as Open"), function () {
+ listview.call_for_selected_items(method, { status: "Open" });
});
- listview.page.add_menu_item(__("Set as Completed"), function() {
- listview.call_for_selected_items(method, {"status": "Completed"});
+ listview.page.add_menu_item(__("Set as Completed"), function () {
+ listview.call_for_selected_items(method, { status: "Completed" });
});
},
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var colors = {
- "Open": "orange",
- "Overdue": "red",
+ Open: "orange",
+ Overdue: "red",
"Pending Review": "orange",
- "Working": "orange",
- "Completed": "green",
- "Cancelled": "dark grey",
- "Template": "blue"
- }
+ Working: "orange",
+ Completed: "green",
+ Cancelled: "dark grey",
+ Template: "blue",
+ };
return [__(doc.status), colors[doc.status], "status,=," + doc.status];
},
gantt_custom_popup_html: function (ganttobj, task) {
diff --git a/erpnext/projects/doctype/task/task_tree.js b/erpnext/projects/doctype/task/task_tree.js
index 9ebfcdd180c5..fba1b309260c 100644
--- a/erpnext/projects/doctype/task/task_tree.js
+++ b/erpnext/projects/doctype/task/task_tree.js
@@ -1,84 +1,88 @@
frappe.provide("frappe.treeview_settings");
-frappe.treeview_settings['Task'] = {
+frappe.treeview_settings["Task"] = {
get_tree_nodes: "erpnext.projects.doctype.task.task.get_children",
add_tree_node: "erpnext.projects.doctype.task.task.add_node",
filters: [
{
fieldname: "project",
- fieldtype:"Link",
+ fieldtype: "Link",
options: "Project",
label: __("Project"),
},
{
fieldname: "task",
- fieldtype:"Link",
+ fieldtype: "Link",
options: "Task",
label: __("Task"),
- get_query: function() {
- var me = frappe.treeview_settings['Task'];
+ get_query: function () {
+ var me = frappe.treeview_settings["Task"];
var project = me.page.fields_dict.project.get_value();
- var args = [["Task", 'is_group', '=', 1]];
- if(project){
- args.push(["Task", 'project', "=", project]);
+ var args = [["Task", "is_group", "=", 1]];
+ if (project) {
+ args.push(["Task", "project", "=", project]);
}
return {
- filters: args
+ filters: args,
};
- }
- }
+ },
+ },
],
breadcrumb: "Projects",
get_tree_root: false,
root_label: "All Tasks",
ignore_fields: ["parent_task"],
- onload: function(me) {
- frappe.treeview_settings['Task'].page = {};
- $.extend(frappe.treeview_settings['Task'].page, me.page);
+ onload: function (me) {
+ frappe.treeview_settings["Task"].page = {};
+ $.extend(frappe.treeview_settings["Task"].page, me.page);
me.make_tree();
},
toolbar: [
{
- label:__("Add Multiple"),
- condition: function(node) {
+ label: __("Add Multiple"),
+ condition: function (node) {
return node.expandable;
},
- click: function(node) {
+ click: function (node) {
this.data = [];
const dialog = new frappe.ui.Dialog({
title: __("Add Multiple Tasks"),
fields: [
{
- fieldname: "multiple_tasks", fieldtype: "Table",
- in_place_edit: true, data: this.data,
+ fieldname: "multiple_tasks",
+ fieldtype: "Table",
+ in_place_edit: true,
+ data: this.data,
get_data: () => {
return this.data;
},
- fields: [{
- fieldtype:'Data',
- fieldname:"subject",
- in_list_view: 1,
- reqd: 1,
- label: __("Subject")
- }]
+ fields: [
+ {
+ fieldtype: "Data",
+ fieldname: "subject",
+ in_list_view: 1,
+ reqd: 1,
+ label: __("Subject"),
+ },
+ ],
},
],
- primary_action: function() {
+ primary_action: function () {
dialog.hide();
return frappe.call({
method: "erpnext.projects.doctype.task.task.add_multiple_tasks",
args: {
data: dialog.get_values()["multiple_tasks"],
- parent: node.data.value
+ parent: node.data.value,
},
- callback: function() { }
+ callback: function () {},
});
},
- primary_action_label: __('Create')
+ primary_action_label: __("Create"),
});
dialog.show();
- }
- }
+ },
+ },
],
- extend_toolbar: true
+ extend_toolbar: true,
};
diff --git a/erpnext/projects/doctype/task_type/task_type.js b/erpnext/projects/doctype/task_type/task_type.js
index c1be5da4f648..9c6176dbf550 100644
--- a/erpnext/projects/doctype/task_type/task_type.js
+++ b/erpnext/projects/doctype/task_type/task_type.js
@@ -1,8 +1,7 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Task Type', {
+frappe.ui.form.on("Task Type", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index eb7a97e615ee..9aba75b3ce92 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -2,39 +2,39 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Timesheet", {
- setup: function(frm) {
+ setup: function (frm) {
frappe.require("/assets/erpnext/js/projects/timer.js");
- frm.ignore_doctypes_on_cancel_all = ['Sales Invoice'];
+ frm.ignore_doctypes_on_cancel_all = ["Sales Invoice"];
- frm.fields_dict.employee.get_query = function() {
+ frm.fields_dict.employee.get_query = function () {
return {
- filters:{
- 'status': 'Active'
- }
+ filters: {
+ status: "Active",
+ },
};
};
- frm.fields_dict['time_logs'].grid.get_field('task').get_query = function(frm, cdt, cdn) {
+ frm.fields_dict["time_logs"].grid.get_field("task").get_query = function (frm, cdt, cdn) {
var child = locals[cdt][cdn];
- return{
+ return {
filters: {
- 'project': child.project,
- 'status': ["!=", "Cancelled"]
- }
+ project: child.project,
+ status: ["!=", "Cancelled"],
+ },
};
};
- frm.fields_dict['time_logs'].grid.get_field('project').get_query = function() {
- return{
+ frm.fields_dict["time_logs"].grid.get_field("project").get_query = function () {
+ return {
filters: {
- 'company': frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
};
},
- onload: function(frm) {
+ onload: function (frm) {
if (frm.doc.__islocal && frm.doc.time_logs) {
calculate_time_and_amount(frm);
}
@@ -44,33 +44,32 @@ frappe.ui.form.on("Timesheet", {
}
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.docstatus == 1) {
if (
- (frm.doc.per_billed < 100)
- && (frm.doc.total_billable_hours)
- && (frm.doc.total_billable_hours > frm.doc.total_billed_hours)
+ frm.doc.per_billed < 100 &&
+ frm.doc.total_billable_hours &&
+ frm.doc.total_billable_hours > frm.doc.total_billed_hours
) {
- frm.add_custom_button(__("Create Sales Invoice"), function() {
+ frm.add_custom_button(__("Create Sales Invoice"), function () {
frm.trigger("make_invoice");
});
}
}
if (frm.doc.docstatus < 1) {
-
- let button = 'Start Timer';
- $.each(frm.doc.time_logs || [], function(i, row) {
- if ((row.from_time <= frappe.datetime.now_datetime()) && !row.completed) {
- button = 'Resume Timer';
+ let button = "Start Timer";
+ $.each(frm.doc.time_logs || [], function (i, row) {
+ if (row.from_time <= frappe.datetime.now_datetime() && !row.completed) {
+ button = "Resume Timer";
}
});
- frm.add_custom_button(__(button), function() {
+ frm.add_custom_button(__(button), function () {
var flag = true;
- $.each(frm.doc.time_logs || [], function(i, row) {
+ $.each(frm.doc.time_logs || [], function (i, row) {
// Fetch the row for which from_time is not present
- if (flag && row.activity_type && !row.from_time){
+ if (flag && row.activity_type && !row.from_time) {
erpnext.timesheet.timer(frm, row);
row.from_time = frappe.datetime.now_datetime();
frm.refresh_fields("time_logs");
@@ -79,7 +78,10 @@ frappe.ui.form.on("Timesheet", {
}
// Fetch the row for timer where activity is not completed and from_time is before now_time
if (flag && row.from_time <= frappe.datetime.now_datetime() && !row.completed) {
- let timestamp = moment(frappe.datetime.now_datetime()).diff(moment(row.from_time),"seconds");
+ let timestamp = moment(frappe.datetime.now_datetime()).diff(
+ moment(row.from_time),
+ "seconds"
+ );
erpnext.timesheet.timer(frm, row, timestamp);
flag = false;
}
@@ -90,152 +92,177 @@ frappe.ui.form.on("Timesheet", {
}
}).addClass("btn-primary");
}
- if(frm.doc.per_billed > 0) {
+ if (frm.doc.per_billed > 0) {
frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
frm.fields_dict["time_logs"].grid.toggle_enable("is_billable", false);
}
let filters = {
- "status": "Open"
+ status: "Open",
};
if (frm.doc.customer) {
filters["customer"] = frm.doc.customer;
}
- frm.set_query('parent_project', function(doc) {
+ frm.set_query("parent_project", function (doc) {
return {
- filters: filters
+ filters: filters,
};
});
- frm.trigger('setup_filters');
- frm.trigger('set_dynamic_field_label');
- frm.trigger('set_route_options_for_new_task');
+ frm.trigger("setup_filters");
+ frm.trigger("set_dynamic_field_label");
+ frm.trigger("set_route_options_for_new_task");
},
- customer: function(frm) {
- frm.set_query('project', 'time_logs', function(doc) {
+ customer: function (frm) {
+ frm.set_query("project", "time_logs", function (doc) {
return {
filters: {
- "customer": doc.customer
- }
+ customer: doc.customer,
+ },
};
});
frm.refresh();
},
- currency: function(frm) {
- let base_currency = frappe.defaults.get_global_default('currency');
- if (frm.doc.currency && (base_currency != frm.doc.currency)) {
+ currency: function (frm) {
+ let base_currency = frappe.defaults.get_global_default("currency");
+ if (frm.doc.currency && base_currency != frm.doc.currency) {
frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
from_currency: frm.doc.currency,
- to_currency: base_currency
+ to_currency: base_currency,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.set_value('exchange_rate', flt(r.message));
- frm.set_df_property("exchange_rate", "description", "1 " + frm.doc.currency + " = [?] " + base_currency);
+ frm.set_value("exchange_rate", flt(r.message));
+ frm.set_df_property(
+ "exchange_rate",
+ "description",
+ "1 " + frm.doc.currency + " = [?] " + base_currency
+ );
}
- }
+ },
});
}
- frm.trigger('set_dynamic_field_label');
+ frm.trigger("set_dynamic_field_label");
},
- exchange_rate: function(frm) {
- $.each(frm.doc.time_logs, function(i, d) {
+ exchange_rate: function (frm) {
+ $.each(frm.doc.time_logs, function (i, d) {
calculate_billing_costing_amount(frm, d.doctype, d.name);
});
calculate_time_and_amount(frm);
},
- set_dynamic_field_label: function(frm) {
- let base_currency = frappe.defaults.get_global_default('currency');
- frm.set_currency_labels(["base_total_costing_amount", "base_total_billable_amount", "base_total_billed_amount"], base_currency);
- frm.set_currency_labels(["total_costing_amount", "total_billable_amount", "total_billed_amount"], frm.doc.currency);
-
- frm.toggle_display(["base_total_costing_amount", "base_total_billable_amount", "base_total_billed_amount"],
- frm.doc.currency != base_currency);
+ set_dynamic_field_label: function (frm) {
+ let base_currency = frappe.defaults.get_global_default("currency");
+ frm.set_currency_labels(
+ ["base_total_costing_amount", "base_total_billable_amount", "base_total_billed_amount"],
+ base_currency
+ );
+ frm.set_currency_labels(
+ ["total_costing_amount", "total_billable_amount", "total_billed_amount"],
+ frm.doc.currency
+ );
+
+ frm.toggle_display(
+ ["base_total_costing_amount", "base_total_billable_amount", "base_total_billed_amount"],
+ frm.doc.currency != base_currency
+ );
if (frm.doc.time_logs.length > 0) {
- frm.set_currency_labels(["base_billing_rate", "base_billing_amount", "base_costing_rate", "base_costing_amount"], base_currency, "time_logs");
- frm.set_currency_labels(["billing_rate", "billing_amount", "costing_rate", "costing_amount"], frm.doc.currency, "time_logs");
+ frm.set_currency_labels(
+ ["base_billing_rate", "base_billing_amount", "base_costing_rate", "base_costing_amount"],
+ base_currency,
+ "time_logs"
+ );
+ frm.set_currency_labels(
+ ["billing_rate", "billing_amount", "costing_rate", "costing_amount"],
+ frm.doc.currency,
+ "time_logs"
+ );
let time_logs_grid = frm.fields_dict.time_logs.grid;
- $.each(["base_billing_rate", "base_billing_amount", "base_costing_rate", "base_costing_amount"], function(i, d) {
- if (frappe.meta.get_docfield(time_logs_grid.doctype, d))
- time_logs_grid.set_column_disp(d, frm.doc.currency != base_currency);
- });
+ $.each(
+ ["base_billing_rate", "base_billing_amount", "base_costing_rate", "base_costing_amount"],
+ function (i, d) {
+ if (frappe.meta.get_docfield(time_logs_grid.doctype, d))
+ time_logs_grid.set_column_disp(d, frm.doc.currency != base_currency);
+ }
+ );
}
frm.refresh_fields();
},
set_route_options_for_new_task: (frm) => {
- let task_field = frm.get_docfield('time_logs', 'task');
+ let task_field = frm.get_docfield("time_logs", "task");
if (task_field) {
- task_field.get_route_options_for_new_doc = (row) => ({'project': row.doc.project});
+ task_field.get_route_options_for_new_doc = (row) => ({ project: row.doc.project });
}
},
- make_invoice: function(frm) {
- let fields = [{
- "fieldtype": "Link",
- "label": __("Item Code"),
- "fieldname": "item_code",
- "options": "Item"
- }];
+ make_invoice: function (frm) {
+ let fields = [
+ {
+ fieldtype: "Link",
+ label: __("Item Code"),
+ fieldname: "item_code",
+ options: "Item",
+ },
+ ];
if (!frm.doc.customer) {
fields.push({
- "fieldtype": "Link",
- "label": __("Customer"),
- "fieldname": "customer",
- "options": "Customer",
- "default": frm.doc.customer
+ fieldtype: "Link",
+ label: __("Customer"),
+ fieldname: "customer",
+ options: "Customer",
+ default: frm.doc.customer,
});
}
let dialog = new frappe.ui.Dialog({
title: __("Create Sales Invoice"),
- fields: fields
+ fields: fields,
});
- dialog.set_primary_action(__('Create Sales Invoice'), () => {
+ dialog.set_primary_action(__("Create Sales Invoice"), () => {
var args = dialog.get_values();
- if(!args) return;
+ if (!args) return;
dialog.hide();
return frappe.call({
type: "GET",
method: "erpnext.projects.doctype.timesheet.timesheet.make_sales_invoice",
args: {
- "source_name": frm.doc.name,
- "item_code": args.item_code,
- "customer": frm.doc.customer || args.customer,
- "currency": frm.doc.currency
+ source_name: frm.doc.name,
+ item_code: args.item_code,
+ customer: frm.doc.customer || args.customer,
+ currency: frm.doc.currency,
},
freeze: true,
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
+ },
});
});
dialog.show();
},
- parent_project: function(frm) {
+ parent_project: function (frm) {
set_project_in_timelog(frm);
- }
+ },
});
frappe.ui.form.on("Timesheet Detail", {
- time_logs_remove: function(frm) {
+ time_logs_remove: function (frm) {
calculate_time_and_amount(frm);
},
@@ -248,47 +275,47 @@ frappe.ui.form.on("Timesheet Detail", {
}
},
- from_time: function(frm, cdt, cdn) {
+ from_time: function (frm, cdt, cdn) {
calculate_end_time(frm, cdt, cdn);
},
- to_time: function(frm, cdt, cdn) {
+ to_time: function (frm, cdt, cdn) {
var child = locals[cdt][cdn];
- if(frm._setting_hours) return;
+ if (frm._setting_hours) return;
var hours = moment(child.to_time).diff(moment(child.from_time), "seconds") / 3600;
frappe.model.set_value(cdt, cdn, "hours", hours);
},
- time_logs_add: function(frm, cdt, cdn) {
- if(frm.doc.parent_project) {
- frappe.model.set_value(cdt, cdn, 'project', frm.doc.parent_project);
+ time_logs_add: function (frm, cdt, cdn) {
+ if (frm.doc.parent_project) {
+ frappe.model.set_value(cdt, cdn, "project", frm.doc.parent_project);
}
},
- hours: function(frm, cdt, cdn) {
+ hours: function (frm, cdt, cdn) {
calculate_end_time(frm, cdt, cdn);
calculate_billing_costing_amount(frm, cdt, cdn);
calculate_time_and_amount(frm);
},
- billing_hours: function(frm, cdt, cdn) {
+ billing_hours: function (frm, cdt, cdn) {
calculate_billing_costing_amount(frm, cdt, cdn);
calculate_time_and_amount(frm);
},
- billing_rate: function(frm, cdt, cdn) {
+ billing_rate: function (frm, cdt, cdn) {
calculate_billing_costing_amount(frm, cdt, cdn);
calculate_time_and_amount(frm);
},
- costing_rate: function(frm, cdt, cdn) {
+ costing_rate: function (frm, cdt, cdn) {
calculate_billing_costing_amount(frm, cdt, cdn);
calculate_time_and_amount(frm);
},
- is_billable: function(frm, cdt, cdn) {
+ is_billable: function (frm, cdt, cdn) {
update_billing_hours(frm, cdt, cdn);
update_time_rates(frm, cdt, cdn);
calculate_billing_costing_amount(frm, cdt, cdn);
@@ -303,7 +330,7 @@ frappe.ui.form.on("Timesheet Detail", {
args: {
employee: frm.doc.employee,
activity_type: frm.selected_doc.activity_type,
- currency: frm.doc.currency
+ currency: frm.doc.currency,
},
callback: function (r) {
if (r.message) {
@@ -311,72 +338,71 @@ frappe.ui.form.on("Timesheet Detail", {
frappe.model.set_value(cdt, cdn, "costing_rate", r.message["costing_rate"]);
calculate_billing_costing_amount(frm, cdt, cdn);
}
- }
+ },
});
- }
+ },
});
-var calculate_end_time = function(frm, cdt, cdn) {
+var calculate_end_time = function (frm, cdt, cdn) {
let child = locals[cdt][cdn];
- if(!child.from_time) {
+ if (!child.from_time) {
// if from_time value is not available then set the current datetime
frappe.model.set_value(cdt, cdn, "from_time", frappe.datetime.get_datetime_as_string());
}
let d = moment(child.from_time);
- if(child.hours) {
+ if (child.hours) {
d.add(child.hours, "hours");
frm._setting_hours = true;
- frappe.model.set_value(cdt, cdn, "to_time",
- d.format(frappe.defaultDatetimeFormat)).then(() => {
+ frappe.model.set_value(cdt, cdn, "to_time", d.format(frappe.defaultDatetimeFormat)).then(() => {
frm._setting_hours = false;
});
}
};
-var update_billing_hours = function(frm, cdt, cdn) {
+var update_billing_hours = function (frm, cdt, cdn) {
let child = frappe.get_doc(cdt, cdn);
if (!child.is_billable) {
- frappe.model.set_value(cdt, cdn, 'billing_hours', 0.0);
+ frappe.model.set_value(cdt, cdn, "billing_hours", 0.0);
} else {
// bill all hours by default
frappe.model.set_value(cdt, cdn, "billing_hours", child.hours);
}
};
-var update_time_rates = function(frm, cdt, cdn) {
+var update_time_rates = function (frm, cdt, cdn) {
let child = frappe.get_doc(cdt, cdn);
if (!child.is_billable) {
- frappe.model.set_value(cdt, cdn, 'billing_rate', 0.0);
+ frappe.model.set_value(cdt, cdn, "billing_rate", 0.0);
}
};
-var calculate_billing_costing_amount = function(frm, cdt, cdn) {
+var calculate_billing_costing_amount = function (frm, cdt, cdn) {
let row = frappe.get_doc(cdt, cdn);
let billing_amount = 0.0;
let base_billing_amount = 0.0;
let exchange_rate = flt(frm.doc.exchange_rate);
- frappe.model.set_value(cdt, cdn, 'base_billing_rate', flt(row.billing_rate) * exchange_rate);
- frappe.model.set_value(cdt, cdn, 'base_costing_rate', flt(row.costing_rate) * exchange_rate);
+ frappe.model.set_value(cdt, cdn, "base_billing_rate", flt(row.billing_rate) * exchange_rate);
+ frappe.model.set_value(cdt, cdn, "base_costing_rate", flt(row.costing_rate) * exchange_rate);
if (row.billing_hours && row.is_billable) {
base_billing_amount = flt(row.billing_hours) * flt(row.base_billing_rate);
billing_amount = flt(row.billing_hours) * flt(row.billing_rate);
}
- frappe.model.set_value(cdt, cdn, 'base_billing_amount', base_billing_amount);
- frappe.model.set_value(cdt, cdn, 'base_costing_amount', flt(row.base_costing_rate) * flt(row.hours));
- frappe.model.set_value(cdt, cdn, 'billing_amount', billing_amount);
- frappe.model.set_value(cdt, cdn, 'costing_amount', flt(row.costing_rate) * flt(row.hours));
+ frappe.model.set_value(cdt, cdn, "base_billing_amount", base_billing_amount);
+ frappe.model.set_value(cdt, cdn, "base_costing_amount", flt(row.base_costing_rate) * flt(row.hours));
+ frappe.model.set_value(cdt, cdn, "billing_amount", billing_amount);
+ frappe.model.set_value(cdt, cdn, "costing_amount", flt(row.costing_rate) * flt(row.hours));
};
-var calculate_time_and_amount = function(frm) {
+var calculate_time_and_amount = function (frm) {
let tl = frm.doc.time_logs || [];
let total_working_hr = 0;
let total_billing_hr = 0;
let total_billable_amount = 0;
let total_costing_amount = 0;
- for(var i=0; i {
+ const fields = ["name", "company"];
+ frappe.db.get_value("Employee", options, fields).then(({ message }) => {
if (message) {
// there is an employee with the currently logged in user_id
frm.set_value("employee", message.name);
@@ -408,8 +434,8 @@ const set_employee_and_company = function(frm) {
};
function set_project_in_timelog(frm) {
- if(frm.doc.parent_project) {
- $.each(frm.doc.time_logs || [], function(i, item) {
+ if (frm.doc.parent_project) {
+ $.each(frm.doc.time_logs || [], function (i, item) {
frappe.model.set_value(item.doctype, item.name, "project", frm.doc.parent_project);
});
}
diff --git a/erpnext/projects/doctype/timesheet/timesheet_calendar.js b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
index 80967ede1ce3..27992a107cbd 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_calendar.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
@@ -1,32 +1,32 @@
frappe.views.calendar["Timesheet"] = {
field_map: {
- "start": "start_date",
- "end": "end_date",
- "name": "parent",
- "id": "name",
- "allDay": "allDay",
- "child_name": "name",
- "title": "title"
+ start: "start_date",
+ end: "end_date",
+ name: "parent",
+ id: "name",
+ allDay: "allDay",
+ child_name: "name",
+ title: "title",
},
style_map: {
- "0": "info",
- "1": "standard",
- "2": "danger"
+ 0: "info",
+ 1: "standard",
+ 2: "danger",
},
gantt: true,
filters: [
{
- "fieldtype": "Link",
- "fieldname": "project",
- "options": "Project",
- "label": __("Project")
+ fieldtype: "Link",
+ fieldname: "project",
+ options: "Project",
+ label: __("Project"),
},
{
- "fieldtype": "Link",
- "fieldname": "employee",
- "options": "Employee",
- "label": __("Employee")
- }
+ fieldtype: "Link",
+ fieldname: "employee",
+ options: "Employee",
+ label: __("Employee"),
+ },
],
- get_events_method: "erpnext.projects.doctype.timesheet.timesheet.get_events"
-}
+ get_events_method: "erpnext.projects.doctype.timesheet.timesheet.get_events",
+};
diff --git a/erpnext/projects/doctype/timesheet/timesheet_list.js b/erpnext/projects/doctype/timesheet/timesheet_list.js
index b59fdc96fe80..0de568ce5896 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_list.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_list.js
@@ -1,16 +1,16 @@
-frappe.listview_settings['Timesheet'] = {
+frappe.listview_settings["Timesheet"] = {
add_fields: ["status", "total_hours", "start_date", "end_date"],
- get_indicator: function(doc) {
- if (doc.status== "Billed") {
- return [__("Billed"), "green", "status,=," + "Billed"]
+ get_indicator: function (doc) {
+ if (doc.status == "Billed") {
+ return [__("Billed"), "green", "status,=," + "Billed"];
}
- if (doc.status== "Payslip") {
- return [__("Payslip"), "green", "status,=," + "Payslip"]
+ if (doc.status == "Payslip") {
+ return [__("Payslip"), "green", "status,=," + "Payslip"];
}
- if (doc.status== "Completed") {
- return [__("Completed"), "green", "status,=," + "Completed"]
+ if (doc.status == "Completed") {
+ return [__("Completed"), "green", "status,=," + "Completed"];
}
- }
+ },
};
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
index 93cb9402fa82..60525a1ae411 100644
--- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.js
@@ -2,18 +2,18 @@
// For license information, please see license.txt
frappe.query_reports["Daily Timesheet Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
- ]
-}
+ ],
+};
diff --git a/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.js b/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.js
index fa70b9394a03..ad90d0496591 100644
--- a/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.js
+++ b/erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.js
@@ -1,33 +1,32 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Delayed Tasks Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date"
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
},
{
- "fieldname": "priority",
- "label": __("Priority"),
- "fieldtype": "Select",
- "options": ["", "Low", "Medium", "High", "Urgent"]
+ fieldname: "priority",
+ label: __("Priority"),
+ fieldtype: "Select",
+ options: ["", "Low", "Medium", "High", "Urgent"],
},
{
- "fieldname": "status",
- "label": __("Status"),
- "fieldtype": "Select",
- "options": ["", "Open", "Working","Pending Review","Overdue","Completed"]
+ fieldname: "status",
+ label: __("Status"),
+ fieldtype: "Select",
+ options: ["", "Open", "Working", "Pending Review", "Overdue", "Completed"],
},
],
- "formatter": function(value, row, column, data, default_formatter) {
+ formatter: function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
if (column.id == "delay") {
if (data["delay"] > 0) {
@@ -36,6 +35,6 @@ frappe.query_reports["Delayed Tasks Summary"] = {
value = `${value}
`;
}
}
- return value
- }
+ return value;
+ },
};
diff --git a/erpnext/projects/report/project_summary/project_summary.js b/erpnext/projects/report/project_summary/project_summary.js
index 21dbfda73f99..072098d5db5a 100644
--- a/erpnext/projects/report/project_summary/project_summary.js
+++ b/erpnext/projects/report/project_summary/project_summary.js
@@ -1,42 +1,41 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Project Summary"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname": "is_active",
- "label": __("Is Active"),
- "fieldtype": "Select",
- "options": "\nYes\nNo",
- "default": "Yes",
+ fieldname: "is_active",
+ label: __("Is Active"),
+ fieldtype: "Select",
+ options: "\nYes\nNo",
+ default: "Yes",
},
{
- "fieldname": "status",
- "label": __("Status"),
- "fieldtype": "Select",
- "options": "\nOpen\nCompleted\nCancelled",
- "default": "Open"
+ fieldname: "status",
+ label: __("Status"),
+ fieldtype: "Select",
+ options: "\nOpen\nCompleted\nCancelled",
+ default: "Open",
},
{
- "fieldname": "project_type",
- "label": __("Project Type"),
- "fieldtype": "Link",
- "options": "Project Type"
+ fieldname: "project_type",
+ label: __("Project Type"),
+ fieldtype: "Link",
+ options: "Project Type",
},
{
- "fieldname": "priority",
- "label": __("Priority"),
- "fieldtype": "Select",
- "options": "\nLow\nMedium\nHigh"
- }
- ]
+ fieldname: "priority",
+ label: __("Priority"),
+ fieldtype: "Select",
+ options: "\nLow\nMedium\nHigh",
+ },
+ ],
};
diff --git a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
index ccca26439d08..dcadcc0852e0 100644
--- a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
@@ -2,7 +2,5 @@
// For license information, please see license.txt
frappe.query_reports["Project wise Stock Tracking"] = {
- "filters": [
-
- ]
-}
+ filters: [],
+};
diff --git a/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.js b/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.js
index 1efd0c673304..2cd1cd98d65f 100644
--- a/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.js
+++ b/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.js
@@ -27,21 +27,16 @@ frappe.query_reports["Timesheet Billing Summary"] = {
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
- default: frappe.datetime.add_months(
- frappe.datetime.month_start(),
- -1
- ),
+ default: frappe.datetime.add_months(frappe.datetime.month_start(), -1),
},
{
fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
- default: frappe.datetime.add_days(
- frappe.datetime.month_start(),
- -1
- ),
+ default: frappe.datetime.add_days(frappe.datetime.month_start(), -1),
},
- { // NOTE: `update_group_by_options` expects this filter to be the fifth in the list
+ {
+ // NOTE: `update_group_by_options` expects this filter to be the fifth in the list
fieldname: "group_by",
label: __("Group By"),
fieldtype: "Select",
diff --git a/erpnext/projects/web_form/tasks/tasks.js b/erpnext/projects/web_form/tasks/tasks.js
index ffc5e984253b..8f56ebb353de 100644
--- a/erpnext/projects/web_form/tasks/tasks.js
+++ b/erpnext/projects/web_form/tasks/tasks.js
@@ -1,3 +1,3 @@
-frappe.ready(function() {
+frappe.ready(function () {
// bind events here
-})
+});
diff --git a/erpnext/public/js/address.js b/erpnext/public/js/address.js
index 57f7163bbb28..606e0b119fd3 100644
--- a/erpnext/public/js/address.js
+++ b/erpnext/public/js/address.js
@@ -2,24 +2,23 @@
// For license information, please see license.txt
frappe.ui.form.on("Address", {
- is_your_company_address: function(frm) {
- frm.clear_table('links');
- if(frm.doc.is_your_company_address) {
- frm.add_child('links', {
- link_doctype: 'Company',
- link_name: frappe.defaults.get_user_default('Company')
+ is_your_company_address: function (frm) {
+ frm.clear_table("links");
+ if (frm.doc.is_your_company_address) {
+ frm.add_child("links", {
+ link_doctype: "Company",
+ link_name: frappe.defaults.get_user_default("Company"),
});
- frm.set_query('link_doctype', 'links', () => {
+ frm.set_query("link_doctype", "links", () => {
return {
filters: {
- name: 'Company'
- }
+ name: "Company",
+ },
};
});
- frm.refresh_field('links');
+ frm.refresh_field("links");
+ } else {
+ frm.trigger("refresh");
}
- else {
- frm.trigger('refresh');
- }
- }
+ },
});
diff --git a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
index 5e5742af8c14..4aa087e99cfe 100644
--- a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
@@ -18,12 +18,11 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
make_dt() {
var me = this;
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions",
args: {
bank_account: this.bank_account,
from_date: this.bank_statement_from_date,
- to_date: this.bank_statement_to_date
+ to_date: this.bank_statement_to_date,
},
callback: function (response) {
me.format_data(response.message);
@@ -62,18 +61,14 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
editable: false,
width: 100,
format: (value) =>
- "" +
- format_currency(value, this.currency) +
- " ",
+ "" + format_currency(value, this.currency) + " ",
},
{
name: __("Withdrawal"),
editable: false,
width: 100,
format: (value) =>
- "" +
- format_currency(value, this.currency) +
- " ",
+ "" + format_currency(value, this.currency) + " ",
},
{
name: __("Unallocated Amount"),
@@ -117,13 +112,15 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
return [
row["date"],
row["party_type"],
- frappe.form.formatters.Link(row["party"], {options: row["party_type"]}),
+ frappe.form.formatters.Link(row["party"], { options: row["party_type"] }),
row["description"],
row["deposit"],
row["withdrawal"],
row["unallocated_amount"],
row["reference_number"],
- `${__("Actions")} `
+ `${__(
+ "Actions"
+ )} `,
];
}
@@ -135,14 +132,8 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
checkboxColumn: false,
inlineFilters: true,
};
- this.datatable = new frappe.DataTable(
- this.$reconciliation_tool_dt.get(0),
- datatable_options
- );
- $(`.${this.datatable.style.scopeClass} .dt-scrollable`).css(
- "max-height",
- "calc(100vh - 400px)"
- );
+ this.datatable = new frappe.DataTable(this.$reconciliation_tool_dt.get(0), datatable_options);
+ $(`.${this.datatable.style.scopeClass} .dt-scrollable`).css("max-height", "calc(100vh - 400px)");
if (this.transactions.length > 0) {
this.$reconciliation_tool_dt.show();
@@ -155,27 +146,18 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
set_listeners() {
var me = this;
- $(`.${this.datatable.style.scopeClass} .dt-scrollable`).on(
- "click",
- `.btn`,
- function () {
- me.dialog_manager.show_dialog(
- $(this).attr("data-name"),
- (bank_transaction) => me.update_dt_cards(bank_transaction)
- );
- return true;
- }
- );
+ $(`.${this.datatable.style.scopeClass} .dt-scrollable`).on("click", `.btn`, function () {
+ me.dialog_manager.show_dialog($(this).attr("data-name"), (bank_transaction) =>
+ me.update_dt_cards(bank_transaction)
+ );
+ return true;
+ });
}
update_dt_cards(bank_transaction) {
- const transaction_index = this.transaction_dt_map[
- bank_transaction.name
- ];
+ const transaction_index = this.transaction_dt_map[bank_transaction.name];
if (bank_transaction.unallocated_amount > 0) {
- this.transactions[transaction_index] = this.format_row(
- bank_transaction
- );
+ this.transactions[transaction_index] = this.format_row(bank_transaction);
} else {
this.transactions.splice(transaction_index, 1);
for (const [k, v] of Object.entries(this.transaction_dt_map)) {
@@ -191,14 +173,9 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
// this.make_dt();
this.get_cleared_balance().then(() => {
- this.cards_manager.$cards[1].set_value(
- format_currency(this.cleared_balance),
- this.currency
- );
+ this.cards_manager.$cards[1].set_value(format_currency(this.cleared_balance), this.currency);
this.cards_manager.$cards[2].set_value(
- format_currency(
- this.bank_statement_closing_balance - this.cleared_balance
- ),
+ format_currency(this.bank_statement_closing_balance - this.cleared_balance),
this.currency
);
this.cards_manager.$cards[2].set_value_color(
@@ -212,14 +189,12 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
get_cleared_balance() {
if (this.bank_account && this.bank_statement_to_date) {
return frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
args: {
bank_account: this.bank_account,
till_date: this.bank_statement_to_date,
},
- callback: (response) =>
- (this.cleared_balance = response.message),
+ callback: (response) => (this.cleared_balance = response.message),
});
}
}
diff --git a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
index 1f47347d46ec..6ff38f91082f 100644
--- a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
@@ -1,7 +1,15 @@
frappe.provide("erpnext.accounts.bank_reconciliation");
erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
- constructor(company, bank_account, bank_statement_from_date, bank_statement_to_date, filter_by_reference_date, from_reference_date, to_reference_date) {
+ constructor(
+ company,
+ bank_account,
+ bank_statement_from_date,
+ bank_statement_to_date,
+ filter_by_reference_date,
+ from_reference_date,
+ to_reference_date
+ ) {
this.bank_account = bank_account;
this.company = company;
this.make_dialog();
@@ -61,16 +69,15 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
get_linked_vouchers(document_types) {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_linked_payments",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_linked_payments",
args: {
bank_transaction_name: this.bank_transaction_name,
document_types: document_types,
from_date: this.bank_statement_from_date,
to_date: this.bank_statement_to_date,
filter_by_reference_date: this.filter_by_reference_date,
- from_reference_date:this.from_reference_date,
- to_reference_date:this.to_reference_date
+ from_reference_date: this.from_reference_date,
+ to_reference_date: this.to_reference_date,
},
callback: (result) => {
@@ -105,7 +112,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
editable: false,
width: 1,
format: (value, row) => {
- return frappe.form.formatters.Link(value, {options: row[2].content});
+ return frappe.form.formatters.Link(value, { options: row[2].content });
},
},
{
@@ -152,10 +159,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
checkboxColumn: true,
inlineFilters: true,
};
- this.datatable = new frappe.DataTable(
- proposals_wrapper.get(0),
- datatable_options
- );
+ this.datatable = new frappe.DataTable(proposals_wrapper.get(0), datatable_options);
} else {
this.datatable.refresh(this.data, this.columns);
this.datatable.rowmanager.checkMap = [];
@@ -217,10 +221,9 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
title: __("Reconcile the Bank Transaction"),
fields: fields,
size: "large",
- primary_action: (values) =>
- this.reconciliation_dialog_primary_action(values),
+ primary_action: (values) => this.reconciliation_dialog_primary_action(values),
});
- }
+ },
});
}
@@ -255,7 +258,9 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
{
fieldtype: "HTML",
fieldname: "no_matching_vouchers",
- options: __("{0}
", [__("No Matching Vouchers Found")])
+ options: __('{0}
', [
+ __("No Matching Vouchers Found"),
+ ]),
},
{
fieldtype: "Section Break",
@@ -299,8 +304,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
click: () => {
this.edit_in_full_page();
},
- depends_on:
- "eval:doc.action=='Create Voucher'",
+ depends_on: "eval:doc.action=='Create Voucher'",
},
{
fieldname: "column_break_7",
@@ -313,8 +317,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
label: "Journal Entry Type",
options:
"Journal Entry\nInter Company Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry\nDepreciation Entry\nExchange Rate Revaluation\nDeferred Revenue\nDeferred Expense",
- depends_on:
- "eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
+ depends_on: "eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
mandatory_depends_on:
"eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
},
@@ -323,8 +326,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
fieldtype: "Link",
label: "Account",
options: "Account",
- depends_on:
- "eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
+ depends_on: "eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
mandatory_depends_on:
"eval:doc.action=='Create Voucher' && doc.document_type=='Journal Entry'",
get_query: () => {
@@ -342,14 +344,11 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
label: "Party Type",
options: "DocType",
mandatory_depends_on:
- "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
+ "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
get_query: function () {
return {
filters: {
- name: [
- "in",
- Object.keys(frappe.boot.party_account_types),
- ],
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
},
};
},
@@ -367,16 +366,14 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
fieldtype: "Link",
label: "Project",
options: "Project",
- depends_on:
- "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
+ depends_on: "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
},
{
fieldname: "cost_center",
fieldtype: "Link",
label: "Cost Center",
options: "Cost Center",
- depends_on:
- "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
+ depends_on: "eval:doc.action=='Create Voucher' && doc.document_type=='Payment Entry'",
},
{
fieldtype: "Section Break",
@@ -435,7 +432,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
options: "Currency",
read_only: 1,
hidden: 1,
- }
+ },
];
}
@@ -457,18 +454,11 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
reconciliation_dialog_primary_action(values) {
if (values.action == "Match Against Voucher") this.match(values);
- if (
- values.action == "Create Voucher" &&
- values.document_type == "Payment Entry"
- )
+ if (values.action == "Create Voucher" && values.document_type == "Payment Entry")
this.add_payment_entry(values);
- if (
- values.action == "Create Voucher" &&
- values.document_type == "Journal Entry"
- )
+ if (values.action == "Create Voucher" && values.document_type == "Journal Entry")
this.add_journal_entry(values);
- else if (values.action == "Update Bank Transaction")
- this.update_transaction(values);
+ else if (values.action == "Update Bank Transaction") this.update_transaction(values);
}
match() {
@@ -486,8 +476,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
});
});
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.reconcile_vouchers",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.reconcile_vouchers",
args: {
bank_transaction_name: this.bank_transaction.name,
vouchers: vouchers,
@@ -503,8 +492,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
add_payment_entry(values) {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts",
args: {
bank_transaction_name: this.bank_transaction.name,
reference_number: values.reference_number,
@@ -517,7 +505,9 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
cost_center: values.cost_center,
},
callback: (response) => {
- const alert_string = __("Bank Transaction {0} added as Payment Entry", [this.bank_transaction.name]);
+ const alert_string = __("Bank Transaction {0} added as Payment Entry", [
+ this.bank_transaction.name,
+ ]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
@@ -527,8 +517,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
add_journal_entry(values) {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
args: {
bank_transaction_name: this.bank_transaction.name,
reference_number: values.reference_number,
@@ -541,7 +530,9 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
second_account: values.second_account,
},
callback: (response) => {
- const alert_string = __("Bank Transaction {0} added as Journal Entry", [this.bank_transaction.name]);
+ const alert_string = __("Bank Transaction {0} added as Journal Entry", [
+ this.bank_transaction.name,
+ ]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
@@ -551,8 +542,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
update_transaction(values) {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.update_bank_transaction",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.update_bank_transaction",
args: {
bank_transaction_name: this.bank_transaction.name,
reference_number: values.reference_number,
@@ -572,8 +562,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
const values = this.dialog.get_values(true);
if (values.document_type == "Payment Entry") {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts",
args: {
bank_transaction_name: this.bank_transaction.name,
reference_number: values.reference_number,
@@ -584,7 +573,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
mode_of_payment: values.mode_of_payment,
project: values.project,
cost_center: values.cost_center,
- allow_edit: true
+ allow_edit: true,
},
callback: (r) => {
const doc = frappe.model.sync(r.message);
@@ -593,8 +582,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
});
} else {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
args: {
bank_transaction_name: this.bank_transaction.name,
reference_number: values.reference_number,
@@ -605,7 +593,7 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
mode_of_payment: values.mode_of_payment,
entry_type: values.journal_entry_type,
second_account: values.second_account,
- allow_edit: true
+ allow_edit: true,
},
callback: (r) => {
var doc = frappe.model.sync(r.message);
@@ -614,5 +602,4 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager {
});
}
}
-
};
diff --git a/erpnext/public/js/bank_reconciliation_tool/number_card.js b/erpnext/public/js/bank_reconciliation_tool/number_card.js
index 7e1b2690a806..d39884c381ef 100644
--- a/erpnext/public/js/bank_reconciliation_tool/number_card.js
+++ b/erpnext/public/js/bank_reconciliation_tool/number_card.js
@@ -26,8 +26,7 @@ erpnext.accounts.bank_reconciliation.NumberCardManager = class NumberCardManager
currency: this.currency,
},
{
- value:
- this.bank_statement_closing_balance - this.cleared_balance,
+ value: this.bank_statement_closing_balance - this.cleared_balance,
label: __("Difference"),
datatype: "Currency",
currency: this.currency,
@@ -41,11 +40,9 @@ erpnext.accounts.bank_reconciliation.NumberCardManager = class NumberCardManager
number_card.$card.appendTo(this.$summary);
});
this.$cards[2].set_value_color(
- this.bank_statement_closing_balance - this.cleared_balance == 0
- ? "text-success"
- : "text-danger"
+ this.bank_statement_closing_balance - this.cleared_balance == 0 ? "text-success" : "text-danger"
);
- this.$summary.css({"border-bottom": "0px", "margin-left": "0px", "margin-right": "0px"});
+ this.$summary.css({ "border-bottom": "0px", "margin-left": "0px", "margin-right": "0px" });
this.$summary.show();
}
};
@@ -60,16 +57,10 @@ erpnext.accounts.NumberCard = class NumberCard {
}
set_value_color(color) {
- this.$card
- .find("div")
- .removeClass("text-danger text-success")
- .addClass(`${color}`);
+ this.$card.find("div").removeClass("text-danger text-success").addClass(`${color}`);
}
set_indicator(color) {
- this.$card
- .find("span")
- .removeClass("indicator red green")
- .addClass(`indicator ${color}`);
+ this.$card.find("span").removeClass("indicator red green").addClass(`indicator ${color}`);
}
};
diff --git a/erpnext/public/js/bom_configurator/bom_configurator.bundle.js b/erpnext/public/js/bom_configurator/bom_configurator.bundle.js
index 582b48796696..454a2a4709f1 100644
--- a/erpnext/public/js/bom_configurator/bom_configurator.bundle.js
+++ b/erpnext/public/js/bom_configurator/bom_configurator.bundle.js
@@ -39,14 +39,14 @@ class BOMConfigurator {
edit_qty: this.edit_qty,
load_tree: this.load_tree,
set_default_qty: this.set_default_qty,
- }
+ };
}
tree_options() {
return {
parent: this.$wrapper.get(0),
body: this.$wrapper.get(0),
- doctype: 'BOM Configurator',
+ doctype: "BOM Configurator",
page: this.page,
expandable: true,
title: __("Configure Product Assembly"),
@@ -59,7 +59,7 @@ class BOMConfigurator {
extend_toolbar: false,
do_not_make_page: true,
do_not_setup_menu: true,
- }
+ };
}
tree_methods() {
@@ -67,7 +67,7 @@ class BOMConfigurator {
let view = frappe.views.trees["BOM Configurator"];
return {
- onload: function(me) {
+ onload: function (me) {
me.args["parent_id"] = frm_obj.frm.doc.name;
me.args["parent"] = frm_obj.frm.doc.item_code;
me.parent = frm_obj.$wrapper.get(0);
@@ -103,126 +103,133 @@ class BOMConfigurator {
`).insertBefore(node.$ul);
},
- toolbar: this.frm?.doc.docstatus === 0 ? [
- {
- label:__(frappe.utils.icon('edit', 'sm') + " Qty"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
- view.events.edit_qty(node, view);
- },
- btnClass: "hidden-xs"
- },
- {
- label:__(frappe.utils.icon('add', 'sm') + " Raw Material"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
- view.events.add_item(node, view);
- },
- condition: function(node) {
- return node.expandable;
- },
- btnClass: "hidden-xs"
- },
- {
- label:__(frappe.utils.icon('add', 'sm') + " Sub Assembly"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
- view.events.add_sub_assembly(node, view);
- },
- condition: function(node) {
- return node.expandable;
- },
- btnClass: "hidden-xs"
- },
- {
- label:__("Expand All"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
-
- if (!node.expanded) {
- view.tree.load_children(node, true);
- $(node.parent[0]).find(".tree-children").show();
- node.$toolbar.find(".expand-all-btn").html("Collapse All");
- } else {
- node.$tree_link.trigger("click");
- node.$toolbar.find(".expand-all-btn").html("Expand All");
- }
- },
- condition: function(node) {
- return node.expandable && node.is_root;
- },
- btnClass: "hidden-xs expand-all-btn"
- },
- {
- label:__(frappe.utils.icon('move', 'sm') + " Sub Assembly"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
- view.events.convert_to_sub_assembly(node, view);
- },
- condition: function(node) {
- return !node.expandable;
- },
- btnClass: "hidden-xs"
- },
- {
- label:__(frappe.utils.icon('delete', 'sm') + __(" Item")),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
- view.events.delete_node(node, view);
- },
- condition: function(node) {
- return !node.is_root;
- },
- btnClass: "hidden-xs"
- },
- ] : [{
- label:__("Expand All"),
- click: function(node) {
- let view = frappe.views.trees["BOM Configurator"];
-
- if (!node.expanded) {
- view.tree.load_children(node, true);
- $(node.parent[0]).find(".tree-children").show();
- node.$toolbar.find(".expand-all-btn").html("Collapse All");
- } else {
- node.$tree_link.trigger("click");
- node.$toolbar.find(".expand-all-btn").html("Expand All");
- }
- },
- condition: function(node) {
- return node.expandable && node.is_root;
- },
- btnClass: "hidden-xs expand-all-btn"
- }],
- }
+ toolbar:
+ this.frm?.doc.docstatus === 0
+ ? [
+ {
+ label: __(frappe.utils.icon("edit", "sm") + " Qty"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+ view.events.edit_qty(node, view);
+ },
+ btnClass: "hidden-xs",
+ },
+ {
+ label: __(frappe.utils.icon("add", "sm") + " Raw Material"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+ view.events.add_item(node, view);
+ },
+ condition: function (node) {
+ return node.expandable;
+ },
+ btnClass: "hidden-xs",
+ },
+ {
+ label: __(frappe.utils.icon("add", "sm") + " Sub Assembly"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+ view.events.add_sub_assembly(node, view);
+ },
+ condition: function (node) {
+ return node.expandable;
+ },
+ btnClass: "hidden-xs",
+ },
+ {
+ label: __("Expand All"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+
+ if (!node.expanded) {
+ view.tree.load_children(node, true);
+ $(node.parent[0]).find(".tree-children").show();
+ node.$toolbar.find(".expand-all-btn").html("Collapse All");
+ } else {
+ node.$tree_link.trigger("click");
+ node.$toolbar.find(".expand-all-btn").html("Expand All");
+ }
+ },
+ condition: function (node) {
+ return node.expandable && node.is_root;
+ },
+ btnClass: "hidden-xs expand-all-btn",
+ },
+ {
+ label: __(frappe.utils.icon("move", "sm") + " Sub Assembly"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+ view.events.convert_to_sub_assembly(node, view);
+ },
+ condition: function (node) {
+ return !node.expandable;
+ },
+ btnClass: "hidden-xs",
+ },
+ {
+ label: __(frappe.utils.icon("delete", "sm") + __(" Item")),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+ view.events.delete_node(node, view);
+ },
+ condition: function (node) {
+ return !node.is_root;
+ },
+ btnClass: "hidden-xs",
+ },
+ ]
+ : [
+ {
+ label: __("Expand All"),
+ click: function (node) {
+ let view = frappe.views.trees["BOM Configurator"];
+
+ if (!node.expanded) {
+ view.tree.load_children(node, true);
+ $(node.parent[0]).find(".tree-children").show();
+ node.$toolbar.find(".expand-all-btn").html("Collapse All");
+ } else {
+ node.$tree_link.trigger("click");
+ node.$toolbar.find(".expand-all-btn").html("Expand All");
+ }
+ },
+ condition: function (node) {
+ return node.expandable && node.is_root;
+ },
+ btnClass: "hidden-xs expand-all-btn",
+ },
+ ],
+ };
}
add_item(node, view) {
- frappe.prompt([
- { label: __("Item"), fieldname: "item_code", fieldtype: "Link", options: "Item", reqd: 1 },
- { label: __("Qty"), fieldname: "qty", default: 1.0, fieldtype: "Float", reqd: 1 },
- ],
- (data) => {
- if (!node.data.parent_id) {
- node.data.parent_id = this.frm.doc.name;
- }
-
- frappe.call({
- method: "erpnext.manufacturing.doctype.bom_creator.bom_creator.add_item",
- args: {
- parent: node.data.parent_id,
- fg_item: node.data.value,
- item_code: data.item_code,
- fg_reference_id: node.data.name || this.frm.doc.name,
- qty: data.qty,
- },
- callback: (r) => {
- view.events.load_tree(r, node);
+ frappe.prompt(
+ [
+ { label: __("Item"), fieldname: "item_code", fieldtype: "Link", options: "Item", reqd: 1 },
+ { label: __("Qty"), fieldname: "qty", default: 1.0, fieldtype: "Float", reqd: 1 },
+ ],
+ (data) => {
+ if (!node.data.parent_id) {
+ node.data.parent_id = this.frm.doc.name;
}
- });
- },
- __("Add Item"),
- __("Add"));
+
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.bom_creator.bom_creator.add_item",
+ args: {
+ parent: node.data.parent_id,
+ fg_item: node.data.value,
+ item_code: data.item_code,
+ fg_reference_id: node.data.name || this.frm.doc.name,
+ qty: data.qty,
+ },
+ callback: (r) => {
+ view.events.load_tree(r, node);
+ },
+ });
+ },
+ __("Add Item"),
+ __("Add")
+ );
}
add_sub_assembly(node, view) {
@@ -251,27 +258,58 @@ class BOMConfigurator {
},
callback: (r) => {
view.events.load_tree(r, node);
- }
+ },
});
dialog.hide();
});
-
}
- get_sub_assembly_modal_fields(read_only=false) {
+ get_sub_assembly_modal_fields(read_only = false) {
return [
- { label: __("Sub Assembly Item"), fieldname: "item_code", fieldtype: "Link", options: "Item", reqd: 1, read_only: read_only },
+ {
+ label: __("Sub Assembly Item"),
+ fieldname: "item_code",
+ fieldtype: "Link",
+ options: "Item",
+ reqd: 1,
+ read_only: read_only,
+ },
{ fieldtype: "Column Break" },
- { label: __("Qty"), fieldname: "qty", default: 1.0, fieldtype: "Float", reqd: 1, read_only: read_only },
+ {
+ label: __("Qty"),
+ fieldname: "qty",
+ default: 1.0,
+ fieldtype: "Float",
+ reqd: 1,
+ read_only: read_only,
+ },
{ fieldtype: "Section Break" },
- { label: __("Raw Materials"), fieldname: "items", fieldtype: "Table", reqd: 1,
+ {
+ label: __("Raw Materials"),
+ fieldname: "items",
+ fieldtype: "Table",
+ reqd: 1,
fields: [
- { label: __("Item"), fieldname: "item_code", fieldtype: "Link", options: "Item", reqd: 1, in_list_view: 1 },
- { label: __("Qty"), fieldname: "qty", default: 1.0, fieldtype: "Float", reqd: 1, in_list_view: 1 },
- ]
+ {
+ label: __("Item"),
+ fieldname: "item_code",
+ fieldtype: "Link",
+ options: "Item",
+ reqd: 1,
+ in_list_view: 1,
+ },
+ {
+ label: __("Qty"),
+ fieldname: "qty",
+ default: 1.0,
+ fieldtype: "Float",
+ reqd: 1,
+ in_list_view: 1,
+ },
+ ],
},
- ]
+ ];
}
convert_to_sub_assembly(node, view) {
@@ -303,7 +341,7 @@ class BOMConfigurator {
callback: (r) => {
node.expandable = true;
view.events.load_tree(r, node);
- }
+ },
});
dialog.hide();
@@ -313,12 +351,12 @@ class BOMConfigurator {
set_default_qty(dialog) {
dialog.fields_dict.items.grid.fields_map.item_code.onchange = function (event) {
if (event) {
- let name = $(event.currentTarget).closest('.grid-row').attr("data-name")
+ let name = $(event.currentTarget).closest(".grid-row").attr("data-name");
let item_row = dialog.fields_dict.items.grid.grid_rows_by_docname[name].doc;
item_row.qty = 1;
- dialog.fields_dict.items.grid.refresh()
+ dialog.fields_dict.items.grid.refresh();
}
- }
+ };
}
delete_node(node, view) {
@@ -333,38 +371,40 @@ class BOMConfigurator {
},
callback: (r) => {
view.events.load_tree(r, node.parent_node);
- }
+ },
});
});
}
edit_qty(node, view) {
let qty = node.data.qty || this.frm.doc.qty;
- frappe.prompt([
- { label: __("Qty"), fieldname: "qty", default: qty, fieldtype: "Float", reqd: 1 },
- ],
- (data) => {
- let doctype = node.data.doctype || this.frm.doc.doctype;
- let docname = node.data.name || this.frm.doc.name;
-
- frappe.call({
- method: "erpnext.manufacturing.doctype.bom_creator.bom_creator.edit_qty",
- args: {
- doctype: doctype,
- docname: docname,
- qty: data.qty,
- parent: node.data.parent_id,
- },
- callback: (r) => {
- node.data.qty = data.qty;
- let uom = node.data.uom || this.frm.doc.uom;
- $(node.parent.get(0)).find(`[data-bom-qty-docname='${docname}']`).html(data.qty + " " + uom);
- view.events.load_tree(r, node);
- }
- });
- },
- __("Edit Qty"),
- __("Update"));
+ frappe.prompt(
+ [{ label: __("Qty"), fieldname: "qty", default: qty, fieldtype: "Float", reqd: 1 }],
+ (data) => {
+ let doctype = node.data.doctype || this.frm.doc.doctype;
+ let docname = node.data.name || this.frm.doc.name;
+
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.bom_creator.bom_creator.edit_qty",
+ args: {
+ doctype: doctype,
+ docname: docname,
+ qty: data.qty,
+ parent: node.data.parent_id,
+ },
+ callback: (r) => {
+ node.data.qty = data.qty;
+ let uom = node.data.uom || this.frm.doc.uom;
+ $(node.parent.get(0))
+ .find(`[data-bom-qty-docname='${docname}']`)
+ .html(data.qty + " " + uom);
+ view.events.load_tree(r, node);
+ },
+ });
+ },
+ __("Edit Qty"),
+ __("Update")
+ );
}
prepare_layout() {
@@ -378,35 +418,31 @@ class BOMConfigurator {
load_tree(response, node) {
let item_row = "";
- let parent_dom = ""
+ let parent_dom = "";
let total_amount = response.message.raw_material_cost;
frappe.views.trees["BOM Configurator"].tree.load_children(node);
while (node) {
- item_row = response.message.items.filter(item => item.name === node.data.name);
+ item_row = response.message.items.filter((item) => item.name === node.data.name);
if (item_row?.length) {
node.data.amount = item_row[0].amount;
- total_amount = node.data.amount
+ total_amount = node.data.amount;
} else {
total_amount = response.message.raw_material_cost;
}
parent_dom = $(node.parent.get(0));
- total_amount = frappe.format(
- total_amount, {
- fieldtype: "Currency",
- currency: this.frm.doc.currency
- }
- );
+ total_amount = frappe.format(total_amount, {
+ fieldtype: "Currency",
+ currency: this.frm.doc.currency,
+ });
$($(parent_dom).find(".fg-item-amt")[0]).html(total_amount);
node = node.parent_node;
-
}
-
}
}
-frappe.ui.BOMConfigurator = BOMConfigurator;
\ No newline at end of file
+frappe.ui.BOMConfigurator = BOMConfigurator;
diff --git a/erpnext/public/js/bulk_transaction_processing.js b/erpnext/public/js/bulk_transaction_processing.js
index 3ae5a5d9c1e6..e1906c4f55b2 100644
--- a/erpnext/public/js/bulk_transaction_processing.js
+++ b/erpnext/public/js/bulk_transaction_processing.js
@@ -1,30 +1,38 @@
frappe.provide("erpnext.bulk_transaction_processing");
$.extend(erpnext.bulk_transaction_processing, {
- create: function(listview, from_doctype, to_doctype, args) {
+ create: function (listview, from_doctype, to_doctype, args) {
let checked_items = listview.get_checked_items();
const doc_name = [];
- checked_items.forEach((Item)=> {
+ checked_items.forEach((Item) => {
if (Item.docstatus == 0) {
doc_name.push(Item.name);
}
});
let count_of_rows = checked_items.length;
- frappe.confirm(__("Create {0} {1} ?", [count_of_rows, __(to_doctype)]), ()=>{
+ frappe.confirm(__("Create {0} {1} ?", [count_of_rows, __(to_doctype)]), () => {
if (doc_name.length == 0) {
- frappe.call({
- method: "erpnext.utilities.bulk_transaction.transaction_processing",
- args: {data: checked_items, from_doctype: from_doctype, to_doctype: to_doctype, args: args}
- }).then(()=> {
-
- });
+ frappe
+ .call({
+ method: "erpnext.utilities.bulk_transaction.transaction_processing",
+ args: {
+ data: checked_items,
+ from_doctype: from_doctype,
+ to_doctype: to_doctype,
+ args: args,
+ },
+ })
+ .then(() => {});
if (count_of_rows > 10) {
- frappe.show_alert("Starting a background job to create {0} {1}", [count_of_rows, __(to_doctype)]);
+ frappe.show_alert("Starting a background job to create {0} {1}", [
+ count_of_rows,
+ __(to_doctype),
+ ]);
}
} else {
frappe.msgprint(__("Selected document must be in submitted state"));
}
});
- }
+ },
});
diff --git a/erpnext/public/js/call_popup/call_popup.js b/erpnext/public/js/call_popup/call_popup.js
index 2dbe999e05b9..7155c799ddb3 100644
--- a/erpnext/public/js/call_popup/call_popup.js
+++ b/erpnext/public/js/call_popup/call_popup.js
@@ -7,17 +7,17 @@ class CallPopup {
}
make() {
- frappe.utils.play_sound('incoming-call');
+ frappe.utils.play_sound("incoming-call");
this.dialog = new frappe.ui.Dialog({
- 'static': true,
- 'minimizable': true
+ static: true,
+ minimizable: true,
});
this.dialog.get_close_btn().show();
this.setup_dialog();
this.set_call_status();
frappe.utils.bind_actions_with_object(this.dialog.$body, this);
- this.dialog.$wrapper.addClass('call-popup');
- this.dialog.get_close_btn().unbind('click').click(this.close_modal.bind(this));
+ this.dialog.$wrapper.addClass("call-popup");
+ this.dialog.get_close_btn().unbind("click").click(this.close_modal.bind(this));
this.dialog.show();
}
@@ -26,28 +26,28 @@ class CallPopup {
this.dialog.$body.empty().append(this.caller_info);
}
- set_indicator(color, blink=false) {
- let classes = `indicator ${color} ${blink ? 'blink': ''}`;
- this.dialog.header.find('.indicator').attr('class', classes);
+ set_indicator(color, blink = false) {
+ let classes = `indicator ${color} ${blink ? "blink" : ""}`;
+ this.dialog.header.find(".indicator").attr("class", classes);
}
set_call_status(call_status) {
- let title = '';
+ let title = "";
call_status = call_status || this.call_log.status;
- if (['Ringing'].includes(call_status) || !call_status) {
- title = __('Incoming call from {0}', [this.get_caller_name() || this.caller_number]);
- this.set_indicator('blue', true);
- } else if (call_status === 'In Progress') {
- title = __('Call Connected');
- this.set_indicator('green');
- } else if (['No Answer', 'Missed'].includes(call_status)) {
- this.set_indicator('yellow');
- title = __('Call Missed');
- } else if (['Completed', 'Busy', 'Failed'].includes(call_status)) {
- this.set_indicator('red');
- title = __('Call Ended');
+ if (["Ringing"].includes(call_status) || !call_status) {
+ title = __("Incoming call from {0}", [this.get_caller_name() || this.caller_number]);
+ this.set_indicator("blue", true);
+ } else if (call_status === "In Progress") {
+ title = __("Call Connected");
+ this.set_indicator("green");
+ } else if (["No Answer", "Missed"].includes(call_status)) {
+ this.set_indicator("yellow");
+ title = __("Call Missed");
+ } else if (["Completed", "Busy", "Failed"].includes(call_status)) {
+ this.set_indicator("red");
+ title = __("Call Ended");
} else {
- this.set_indicator('blue');
+ this.set_indicator("blue");
title = call_status;
}
this.dialog.set_title(title);
@@ -55,7 +55,7 @@ class CallPopup {
update_call_log(call_log, missed) {
this.call_log = call_log;
- this.set_call_status(missed ? 'Missed': null);
+ this.set_call_status(missed ? "Missed" : null);
}
close_modal() {
@@ -64,10 +64,10 @@ class CallPopup {
}
call_ended(call_log, missed) {
- frappe.utils.play_sound('call-disconnect');
+ frappe.utils.play_sound("call-disconnect");
this.update_call_log(call_log, missed);
setTimeout(() => {
- if (!this.dialog.get_value('call_summary')) {
+ if (!this.dialog.get_value("call_summary")) {
this.close_modal();
}
}, 60000);
@@ -81,16 +81,16 @@ class CallPopup {
get_contact_link() {
let log = this.call_log;
- let contact_link = log.links.find(d => d.link_doctype === 'Contact');
+ let contact_link = log.links.find((d) => d.link_doctype === "Contact");
return contact_link || {};
}
setup_listener() {
- frappe.realtime.on(`call_${this.call_log.id}_ended`, call_log => {
+ frappe.realtime.on(`call_${this.call_log.id}_ended`, (call_log) => {
this.call_ended(call_log);
});
- frappe.realtime.on(`call_${this.call_log.id}_missed`, call_log => {
+ frappe.realtime.on(`call_${this.call_log.id}_missed`, (call_log) => {
this.call_ended(call_log, true);
});
}
@@ -103,84 +103,102 @@ class CallPopup {
setup_call_details() {
this.caller_info = $(`
`);
this.call_details = new frappe.ui.FieldGroup({
- fields: [{
- 'fieldname': 'name',
- 'label': 'Name',
- 'default': this.get_caller_name() || __('Unknown Caller'),
- 'fieldtype': 'Data',
- 'read_only': 1
- }, {
- 'fieldtype': 'Button',
- 'label': __('Open Contact'),
- 'click': () => frappe.set_route('Form', 'Contact', this.get_contact_link().link_name),
- 'depends_on': () => this.get_caller_name()
- }, {
- 'fieldtype': 'Button',
- 'label': __('Create New Contact'),
- 'click': this.create_new_contact.bind(this),
- 'depends_on': () => !this.get_caller_name()
- }, {
- 'fieldtype': 'Button',
- 'label': __('Create New Customer'),
- 'click': this.create_new_customer.bind(this),
- 'depends_on': () => !this.get_caller_name()
- }, {
- 'fieldtype': 'Button',
- 'label': __('Create New Lead'),
- 'click': () => frappe.new_doc('Lead', { 'mobile_no': this.caller_number }),
- 'depends_on': () => !this.get_caller_name()
- }, {
- 'fieldtype': 'Column Break',
- }, {
- 'fieldname': 'number',
- 'label': 'Phone Number',
- 'fieldtype': 'Data',
- 'default': this.caller_number,
- 'read_only': 1
- }, {
- 'fieldtype': 'Section Break',
- 'hide_border': 1,
- }, {
- 'fieldname': 'call_type',
- 'label': 'Call Type',
- 'fieldtype': 'Link',
- 'options': 'Telephony Call Type',
- }, {
- 'fieldtype': 'Section Break',
- 'hide_border': 1,
- }, {
- 'fieldtype': 'Small Text',
- 'label': __('Call Summary'),
- 'fieldname': 'call_summary',
- }, {
- 'fieldtype': 'Button',
- 'label': __('Save'),
- 'click': () => {
- const call_summary = this.call_details.get_value('call_summary');
- const call_type = this.call_details.get_value('call_type');
- if (!call_summary) return;
- frappe.xcall('erpnext.telephony.doctype.call_log.call_log.add_call_summary_and_call_type', {
- 'call_log': this.call_log.name,
- 'summary': call_summary,
- 'call_type': call_type,
- }).then(() => {
- this.close_modal();
- frappe.show_alert({
- message: `
- ${__('Call Summary Saved')}
+ fields: [
+ {
+ fieldname: "name",
+ label: "Name",
+ default: this.get_caller_name() || __("Unknown Caller"),
+ fieldtype: "Data",
+ read_only: 1,
+ },
+ {
+ fieldtype: "Button",
+ label: __("Open Contact"),
+ click: () => frappe.set_route("Form", "Contact", this.get_contact_link().link_name),
+ depends_on: () => this.get_caller_name(),
+ },
+ {
+ fieldtype: "Button",
+ label: __("Create New Contact"),
+ click: this.create_new_contact.bind(this),
+ depends_on: () => !this.get_caller_name(),
+ },
+ {
+ fieldtype: "Button",
+ label: __("Create New Customer"),
+ click: this.create_new_customer.bind(this),
+ depends_on: () => !this.get_caller_name(),
+ },
+ {
+ fieldtype: "Button",
+ label: __("Create New Lead"),
+ click: () => frappe.new_doc("Lead", { mobile_no: this.caller_number }),
+ depends_on: () => !this.get_caller_name(),
+ },
+ {
+ fieldtype: "Column Break",
+ },
+ {
+ fieldname: "number",
+ label: "Phone Number",
+ fieldtype: "Data",
+ default: this.caller_number,
+ read_only: 1,
+ },
+ {
+ fieldtype: "Section Break",
+ hide_border: 1,
+ },
+ {
+ fieldname: "call_type",
+ label: "Call Type",
+ fieldtype: "Link",
+ options: "Telephony Call Type",
+ },
+ {
+ fieldtype: "Section Break",
+ hide_border: 1,
+ },
+ {
+ fieldtype: "Small Text",
+ label: __("Call Summary"),
+ fieldname: "call_summary",
+ },
+ {
+ fieldtype: "Button",
+ label: __("Save"),
+ click: () => {
+ const call_summary = this.call_details.get_value("call_summary");
+ const call_type = this.call_details.get_value("call_type");
+ if (!call_summary) return;
+ frappe
+ .xcall(
+ "erpnext.telephony.doctype.call_log.call_log.add_call_summary_and_call_type",
+ {
+ call_log: this.call_log.name,
+ summary: call_summary,
+ call_type: call_type,
+ }
+ )
+ .then(() => {
+ this.close_modal();
+ frappe.show_alert({
+ message: `
+ ${__("Call Summary Saved")}
- ${__('View call log')}
+ ${__("View call log")}
`,
- indicator: 'green'
- });
- });
- }
- }],
- body: this.caller_info
+ indicator: "green",
+ });
+ });
+ },
+ },
+ ],
+ body: this.caller_info,
});
this.call_details.make();
}
@@ -191,23 +209,23 @@ class CallPopup {
create_new_customer() {
// to avoid quick entry form
- const new_customer = frappe.model.get_new_doc('Customer');
+ const new_customer = frappe.model.get_new_doc("Customer");
new_customer.mobile_no = this.caller_number;
- frappe.set_route('Form', new_customer.doctype, new_customer.name);
+ frappe.set_route("Form", new_customer.doctype, new_customer.name);
}
create_new_contact() {
// TODO: fix new_doc, it should accept child table values
- const new_contact = frappe.model.get_new_doc('Contact');
- const phone_no = frappe.model.add_child(new_contact, 'Contact Phone', 'phone_nos');
+ const new_contact = frappe.model.get_new_doc("Contact");
+ const phone_no = frappe.model.add_child(new_contact, "Contact Phone", "phone_nos");
phone_no.phone = this.caller_number;
phone_no.is_primary_mobile_no = 1;
- frappe.set_route('Form', new_contact.doctype, new_contact.name);
+ frappe.set_route("Form", new_contact.doctype, new_contact.name);
}
}
-$(document).on('app_ready', function () {
- frappe.realtime.on('show_call_popup', call_log => {
+$(document).on("app_ready", function () {
+ frappe.realtime.on("show_call_popup", (call_log) => {
let call_popup = erpnext.call_popup;
if (call_popup && call_log.name === call_popup.call_log.name) {
call_popup.update_call_log(call_log);
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
index f205d8896587..d9187f8b6788 100644
--- a/erpnext/public/js/communication.js
+++ b/erpnext/public/js/communication.js
@@ -1,33 +1,45 @@
frappe.ui.form.on("Communication", {
refresh: (frm) => {
// setup custom Make button only if Communication is Email
- if(frm.doc.communication_medium == "Email" && frm.doc.sent_or_received == "Received") {
+ if (frm.doc.communication_medium == "Email" && frm.doc.sent_or_received == "Received") {
frm.events.setup_custom_buttons(frm);
}
},
setup_custom_buttons: (frm) => {
let confirm_msg = "Are you sure you want to create {0} from this email?";
- if(frm.doc.reference_doctype !== "Issue") {
- frm.add_custom_button(__("Issue"), () => {
- frappe.confirm(__(confirm_msg, [__("Issue")]), () => {
- frm.trigger('make_issue_from_communication');
- })
- }, __("Create"));
+ if (frm.doc.reference_doctype !== "Issue") {
+ frm.add_custom_button(
+ __("Issue"),
+ () => {
+ frappe.confirm(__(confirm_msg, [__("Issue")]), () => {
+ frm.trigger("make_issue_from_communication");
+ });
+ },
+ __("Create")
+ );
}
- if(!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
- frm.add_custom_button(__("Lead"), () => {
- frappe.confirm(__(confirm_msg, [__("Lead")]), () => {
- frm.trigger('make_lead_from_communication');
- })
- }, __('Create'));
+ if (!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
+ frm.add_custom_button(
+ __("Lead"),
+ () => {
+ frappe.confirm(__(confirm_msg, [__("Lead")]), () => {
+ frm.trigger("make_lead_from_communication");
+ });
+ },
+ __("Create")
+ );
- frm.add_custom_button(__("Opportunity"), () => {
- frappe.confirm(__(confirm_msg, [__("Opportunity")]), () => {
- frm.trigger('make_opportunity_from_communication');
- })
- }, __('Create'));
+ frm.add_custom_button(
+ __("Opportunity"),
+ () => {
+ frappe.confirm(__(confirm_msg, [__("Opportunity")]), () => {
+ frm.trigger("make_opportunity_from_communication");
+ });
+ },
+ __("Create")
+ );
}
},
@@ -35,63 +47,69 @@ frappe.ui.form.on("Communication", {
return frappe.call({
method: "erpnext.crm.doctype.lead.lead.make_lead_from_communication",
args: {
- communication: frm.doc.name
+ communication: frm.doc.name,
},
freeze: true,
callback: (r) => {
- if(r.message) {
- frm.reload_doc()
+ if (r.message) {
+ frm.reload_doc();
}
- }
- })
+ },
+ });
},
make_issue_from_communication: (frm) => {
return frappe.call({
method: "erpnext.support.doctype.issue.issue.make_issue_from_communication",
args: {
- communication: frm.doc.name
+ communication: frm.doc.name,
},
freeze: true,
callback: (r) => {
- if(r.message) {
- frm.reload_doc()
+ if (r.message) {
+ frm.reload_doc();
}
- }
- })
+ },
+ });
},
make_opportunity_from_communication: (frm) => {
- const fields = [{
- fieldtype: 'Link',
- label: __('Select a Company'),
- fieldname: 'company',
- options: 'Company',
- reqd: 1,
- default: frappe.defaults.get_user_default("Company")
- }];
+ const fields = [
+ {
+ fieldtype: "Link",
+ label: __("Select a Company"),
+ fieldname: "company",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
+ },
+ ];
- frappe.prompt(fields, data => {
- frappe.call({
- method: "erpnext.crm.doctype.opportunity.opportunity.make_opportunity_from_communication",
- args: {
- communication: frm.doc.name,
- company: data.company
- },
- freeze: true,
- callback: (r) => {
- if(r.message) {
- frm.reload_doc();
- frappe.show_alert({
- message: __("Opportunity {0} created",
- ['' + r.message + ' ']),
- indicator: 'green'
- });
- }
- }
- });
- },
- 'Create an Opportunity',
- 'Create');
- }
+ frappe.prompt(
+ fields,
+ (data) => {
+ frappe.call({
+ method: "erpnext.crm.doctype.opportunity.opportunity.make_opportunity_from_communication",
+ args: {
+ communication: frm.doc.name,
+ company: data.company,
+ },
+ freeze: true,
+ callback: (r) => {
+ if (r.message) {
+ frm.reload_doc();
+ frappe.show_alert({
+ message: __("Opportunity {0} created", [
+ '' + r.message + " ",
+ ]),
+ indicator: "green",
+ });
+ }
+ },
+ });
+ },
+ "Create an Opportunity",
+ "Create"
+ );
+ },
});
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index a0f56a2d07fa..2e6e9ba1ad43 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -1,26 +1,26 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.provide('erpnext');
+frappe.provide("erpnext");
// preferred modules for breadcrumbs
$.extend(frappe.breadcrumbs.preferred, {
"Item Group": "Stock",
"Customer Group": "Selling",
"Supplier Group": "Buying",
- "Territory": "Selling",
+ Territory: "Selling",
"Sales Person": "Selling",
"Sales Partner": "Selling",
- "Brand": "Stock",
+ Brand: "Stock",
"Maintenance Schedule": "Support",
- "Maintenance Visit": "Support"
+ "Maintenance Visit": "Support",
});
$.extend(frappe.breadcrumbs.module_map, {
- 'ERPNext Integrations': 'Integrations',
- 'Geo': 'Settings',
- 'Portal': 'Website',
- 'Utilities': 'Settings',
- 'E-commerce': 'Website',
- 'Contacts': 'CRM'
+ "ERPNext Integrations": "Integrations",
+ Geo: "Settings",
+ Portal: "Website",
+ Utilities: "Settings",
+ "E-commerce": "Website",
+ Contacts: "CRM",
});
diff --git a/erpnext/public/js/contact.js b/erpnext/public/js/contact.js
index 41a0e8a9f999..ecfc4eeef935 100644
--- a/erpnext/public/js/contact.js
+++ b/erpnext/public/js/contact.js
@@ -1,16 +1,14 @@
-
-
frappe.ui.form.on("Contact", {
refresh(frm) {
- frm.set_query('link_doctype', "links", function() {
+ frm.set_query("link_doctype", "links", function () {
return {
query: "frappe.contacts.address_and_contact.filter_dynamic_link_doctypes",
filters: {
fieldtype: ["in", ["HTML", "Text Editor"]],
fieldname: ["in", ["contact_html", "company_description"]],
- }
+ },
};
});
frm.refresh_field("links");
- }
+ },
});
diff --git a/erpnext/public/js/erpnext.bundle.js b/erpnext/public/js/erpnext.bundle.js
index b847e5729f5f..b75a21bfc976 100644
--- a/erpnext/public/js/erpnext.bundle.js
+++ b/erpnext/public/js/erpnext.bundle.js
@@ -27,7 +27,7 @@ import "./bulk_transaction_processing";
import "./utils/crm_activities";
import "./templates/crm_activities.html";
import "./templates/crm_notes.html";
-import "./controllers/accounts.js"
+import "./controllers/accounts.js";
import "./utils/landed_taxes_and_charges_common.js";
import "./utils/sales_common.js";
import "./controllers/buying.js";
diff --git a/erpnext/public/js/event.js b/erpnext/public/js/event.js
index 665c8fbe1f40..a6733915a5c4 100644
--- a/erpnext/public/js/event.js
+++ b/erpnext/public/js/event.js
@@ -3,33 +3,53 @@
frappe.provide("frappe.desk");
frappe.ui.form.on("Event", {
- refresh: function(frm) {
- frm.set_query('reference_doctype', "event_participants", function() {
+ refresh: function (frm) {
+ frm.set_query("reference_doctype", "event_participants", function () {
return {
- "filters": {
- "name": ["in", ["Contact", "Lead", "Customer", "Supplier", "Employee", "Sales Partner"]]
- }
+ filters: {
+ name: ["in", ["Contact", "Lead", "Customer", "Supplier", "Employee", "Sales Partner"]],
+ },
};
});
- frm.add_custom_button(__('Add Leads'), function() {
- new frappe.desk.eventParticipants(frm, "Lead");
- }, __("Add Participants"));
+ frm.add_custom_button(
+ __("Add Leads"),
+ function () {
+ new frappe.desk.eventParticipants(frm, "Lead");
+ },
+ __("Add Participants")
+ );
- frm.add_custom_button(__('Add Customers'), function() {
- new frappe.desk.eventParticipants(frm, "Customer");
- }, __("Add Participants"));
+ frm.add_custom_button(
+ __("Add Customers"),
+ function () {
+ new frappe.desk.eventParticipants(frm, "Customer");
+ },
+ __("Add Participants")
+ );
- frm.add_custom_button(__('Add Suppliers'), function() {
- new frappe.desk.eventParticipants(frm, "Supplier");
- }, __("Add Participants"));
+ frm.add_custom_button(
+ __("Add Suppliers"),
+ function () {
+ new frappe.desk.eventParticipants(frm, "Supplier");
+ },
+ __("Add Participants")
+ );
- frm.add_custom_button(__('Add Employees'), function() {
- new frappe.desk.eventParticipants(frm, "Employee");
- }, __("Add Participants"));
+ frm.add_custom_button(
+ __("Add Employees"),
+ function () {
+ new frappe.desk.eventParticipants(frm, "Employee");
+ },
+ __("Add Participants")
+ );
- frm.add_custom_button(__('Add Sales Partners'), function() {
- new frappe.desk.eventParticipants(frm, "Sales Partners");
- }, __("Add Participants"));
- }
+ frm.add_custom_button(
+ __("Add Sales Partners"),
+ function () {
+ new frappe.desk.eventParticipants(frm, "Sales Partners");
+ },
+ __("Add Participants")
+ );
+ },
});
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 43e58c2efd0a..bd8b70af02e3 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -1,60 +1,58 @@
frappe.provide("erpnext.financial_statements");
erpnext.financial_statements = {
- "filters": get_filters(),
- "baseData": null,
- "formatter": function(value, row, column, data, default_formatter, filter) {
- if(frappe.query_report.get_filter_value("selected_view") == "Growth" && data && column.colIndex >= 3){
+ filters: get_filters(),
+ baseData: null,
+ formatter: function (value, row, column, data, default_formatter, filter) {
+ if (
+ frappe.query_report.get_filter_value("selected_view") == "Growth" &&
+ data &&
+ column.colIndex >= 3
+ ) {
//Assuming that the first three columns are s.no, account name and the very first year of the accounting values, to calculate the relative percentage values of the successive columns.
const lastAnnualValue = row[column.colIndex - 1].content;
const currentAnnualvalue = data[column.fieldname];
- if(currentAnnualvalue == undefined) return 'NA'; //making this not applicable for undefined/null values
+ if (currentAnnualvalue == undefined) return "NA"; //making this not applicable for undefined/null values
let annualGrowth = 0;
- if(lastAnnualValue == 0 && currentAnnualvalue > 0){
+ if (lastAnnualValue == 0 && currentAnnualvalue > 0) {
//If the previous year value is 0 and the current value is greater than 0
annualGrowth = 1;
- }
- else if(lastAnnualValue > 0){
- annualGrowth = (currentAnnualvalue - lastAnnualValue) / lastAnnualValue;
+ } else if (lastAnnualValue > 0) {
+ annualGrowth = (currentAnnualvalue - lastAnnualValue) / lastAnnualValue;
}
- const growthPercent = (Math.round(annualGrowth*10000)/100); //calculating the rounded off percentage
+ const growthPercent = Math.round(annualGrowth * 10000) / 100; //calculating the rounded off percentage
- value = $(`${((growthPercent >=0)? '+':'' )+growthPercent+'%'} `);
- if(growthPercent < 0){
+ value = $(`${(growthPercent >= 0 ? "+" : "") + growthPercent + "%"} `);
+ if (growthPercent < 0) {
value = $(value).addClass("text-danger");
- }
- else{
+ } else {
value = $(value).addClass("text-success");
}
value = $(value).wrap("
").parent().html();
return value;
- }
- else if(frappe.query_report.get_filter_value("selected_view") == "Margin" && data){
- if(column.fieldname =="account" && data.account_name == __("Income")){
+ } else if (frappe.query_report.get_filter_value("selected_view") == "Margin" && data) {
+ if (column.fieldname == "account" && data.account_name == __("Income")) {
//Taking the total income from each column (for all the financial years) as the base (100%)
this.baseData = row;
}
- if(column.colIndex >= 2){
+ if (column.colIndex >= 2) {
//Assuming that the first two columns are s.no and account name, to calculate the relative percentage values of the successive columns.
const currentAnnualvalue = data[column.fieldname];
const baseValue = this.baseData[column.colIndex].content;
- if(currentAnnualvalue == undefined || baseValue <= 0) return 'NA';
- const marginPercent = Math.round((currentAnnualvalue/baseValue)*10000)/100;
+ if (currentAnnualvalue == undefined || baseValue <= 0) return "NA";
+ const marginPercent = Math.round((currentAnnualvalue / baseValue) * 10000) / 100;
- value = $(`${marginPercent+'%'} `);
- if(marginPercent < 0)
- value = $(value).addClass("text-danger");
- else
- value = $(value).addClass("text-success");
+ value = $(`${marginPercent + "%"} `);
+ if (marginPercent < 0) value = $(value).addClass("text-danger");
+ else value = $(value).addClass("text-success");
value = $(value).wrap("
").parent().html();
return value;
}
-
}
- if (data && column.fieldname=="account") {
+ if (data && column.fieldname == "account") {
value = data.account_name || value;
if (filter && filter?.text && filter?.type == "contains") {
@@ -85,16 +83,18 @@ erpnext.financial_statements = {
return value;
},
- "open_general_ledger": function(data) {
+ open_general_ledger: function (data) {
if (!data.account) return;
- let project = $.grep(frappe.query_report.filters, function(e){ return e.df.fieldname == 'project'; });
+ let project = $.grep(frappe.query_report.filters, function (e) {
+ return e.df.fieldname == "project";
+ });
frappe.route_options = {
- "account": data.account,
- "company": frappe.query_report.get_filter_value('company'),
- "from_date": data.from_date || data.year_start_date,
- "to_date": data.to_date || data.year_end_date,
- "project": (project && project.length > 0) ? project[0].$input.val() : ""
+ account: data.account,
+ company: frappe.query_report.get_filter_value("company"),
+ from_date: data.from_date || data.year_start_date,
+ to_date: data.to_date || data.year_end_date,
+ project: project && project.length > 0 ? project[0].$input.val() : "",
};
let report = "General Ledger";
@@ -107,159 +107,172 @@ erpnext.financial_statements = {
frappe.set_route("query-report", report);
},
- "tree": true,
- "name_field": "account",
- "parent_field": "parent_account",
- "initial_depth": 3,
- onload: function(report) {
+ tree: true,
+ name_field: "account",
+ parent_field: "parent_account",
+ initial_depth: 3,
+ onload: function (report) {
// dropdown for links to other financial statements
- erpnext.financial_statements.filters = get_filters()
+ erpnext.financial_statements.filters = get_filters();
let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today());
- frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({
period_start_date: fy.year_start_date,
- period_end_date: fy.year_end_date
+ period_end_date: fy.year_end_date,
});
});
- if (report.page){
- const views_menu = report.page.add_custom_button_group(__('Financial Statements'));
+ if (report.page) {
+ const views_menu = report.page.add_custom_button_group(__("Financial Statements"));
- report.page.add_custom_menu_item(views_menu, __("Balance Sheet"), function() {
+ report.page.add_custom_menu_item(views_menu, __("Balance Sheet"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Balance Sheet', {company: filters.company});
+ frappe.set_route("query-report", "Balance Sheet", { company: filters.company });
});
- report.page.add_custom_menu_item(views_menu, __("Profit and Loss"), function() {
+ report.page.add_custom_menu_item(views_menu, __("Profit and Loss"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Profit and Loss Statement', {company: filters.company});
+ frappe.set_route("query-report", "Profit and Loss Statement", { company: filters.company });
});
- report.page.add_custom_menu_item(views_menu, __("Cash Flow Statement"), function() {
+ report.page.add_custom_menu_item(views_menu, __("Cash Flow Statement"), function () {
var filters = report.get_values();
- frappe.set_route('query-report', 'Cash Flow', {company: filters.company});
+ frappe.set_route("query-report", "Cash Flow", { company: filters.company });
});
}
- }
+ },
};
function get_filters() {
let filters = [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
},
{
- "fieldname":"finance_book",
- "label": __("Finance Book"),
- "fieldtype": "Link",
- "options": "Finance Book"
+ fieldname: "finance_book",
+ label: __("Finance Book"),
+ fieldtype: "Link",
+ options: "Finance Book",
},
{
- "fieldname":"filter_based_on",
- "label": __("Filter Based On"),
- "fieldtype": "Select",
- "options": ["Fiscal Year", "Date Range"],
- "default": ["Fiscal Year"],
- "reqd": 1,
- on_change: function() {
- let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
- frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
- frappe.query_report.toggle_filter_display('period_start_date', filter_based_on === 'Fiscal Year');
- frappe.query_report.toggle_filter_display('period_end_date', filter_based_on === 'Fiscal Year');
+ fieldname: "filter_based_on",
+ label: __("Filter Based On"),
+ fieldtype: "Select",
+ options: ["Fiscal Year", "Date Range"],
+ default: ["Fiscal Year"],
+ reqd: 1,
+ on_change: function () {
+ let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
+ frappe.query_report.toggle_filter_display(
+ "from_fiscal_year",
+ filter_based_on === "Date Range"
+ );
+ frappe.query_report.toggle_filter_display("to_fiscal_year", filter_based_on === "Date Range");
+ frappe.query_report.toggle_filter_display(
+ "period_start_date",
+ filter_based_on === "Fiscal Year"
+ );
+ frappe.query_report.toggle_filter_display(
+ "period_end_date",
+ filter_based_on === "Fiscal Year"
+ );
frappe.query_report.refresh();
- }
+ },
},
{
- "fieldname":"period_start_date",
- "label": __("Start Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "depends_on": "eval:doc.filter_based_on == 'Date Range'"
+ fieldname: "period_start_date",
+ label: __("Start Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ depends_on: "eval:doc.filter_based_on == 'Date Range'",
},
{
- "fieldname":"period_end_date",
- "label": __("End Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "depends_on": "eval:doc.filter_based_on == 'Date Range'"
+ fieldname: "period_end_date",
+ label: __("End Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ depends_on: "eval:doc.filter_based_on == 'Date Range'",
},
{
- "fieldname":"from_fiscal_year",
- "label": __("Start Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "reqd": 1,
- "depends_on": "eval:doc.filter_based_on == 'Fiscal Year'"
+ fieldname: "from_fiscal_year",
+ label: __("Start Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ reqd: 1,
+ depends_on: "eval:doc.filter_based_on == 'Fiscal Year'",
},
{
- "fieldname":"to_fiscal_year",
- "label": __("End Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "reqd": 1,
- "depends_on": "eval:doc.filter_based_on == 'Fiscal Year'"
+ fieldname: "to_fiscal_year",
+ label: __("End Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ reqd: 1,
+ depends_on: "eval:doc.filter_based_on == 'Fiscal Year'",
},
{
- "fieldname": "periodicity",
- "label": __("Periodicity"),
- "fieldtype": "Select",
- "options": [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ fieldname: "periodicity",
+ label: __("Periodicity"),
+ fieldtype: "Select",
+ options: [
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
- "default": "Yearly",
- "reqd": 1
+ default: "Yearly",
+ reqd: 1,
},
// Note:
// If you are modifying this array such that the presentation_currency object
// is no longer the last object, please make adjustments in cash_flow.js
// accordingly.
{
- "fieldname": "presentation_currency",
- "label": __("Currency"),
- "fieldtype": "Select",
- "options": erpnext.get_presentation_currency_list()
+ fieldname: "presentation_currency",
+ label: __("Currency"),
+ fieldtype: "Select",
+ options: erpnext.get_presentation_currency_list(),
},
{
- "fieldname": "cost_center",
- "label": __("Cost Center"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Cost Center', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "cost_center",
+ label: __("Cost Center"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Cost Center", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
- }
+ },
},
{
- "fieldname": "project",
- "label": __("Project"),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
- return frappe.db.get_link_options('Project', txt, {
- company: frappe.query_report.get_filter_value("company")
+ fieldname: "project",
+ label: __("Project"),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
+ return frappe.db.get_link_options("Project", txt, {
+ company: frappe.query_report.get_filter_value("company"),
});
},
- }
- ]
+ },
+ ];
// Dynamically set 'default' values for fiscal year filters
- let fy_filters = filters.filter(x=>{return ["from_fiscal_year", "to_fiscal_year"].includes(x.fieldname);})
+ let fy_filters = filters.filter((x) => {
+ return ["from_fiscal_year", "to_fiscal_year"].includes(x.fieldname);
+ });
let fiscal_year = erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), false, true);
if (fiscal_year) {
let fy = erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), false, false);
- fy_filters.forEach(x=>{x.default = fy;})
+ fy_filters.forEach((x) => {
+ x.default = fy;
+ });
}
return filters;
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index 6742761056ac..f9dbea9938a5 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -332,13 +332,9 @@ frappe.help.help_links["Form/Selling Settings"] = [
//Buying
-frappe.help.help_links["List/Supplier"] = [
- { label: "Supplier", url: docsUrl + "user/manual/en/supplier" },
-];
+frappe.help.help_links["List/Supplier"] = [{ label: "Supplier", url: docsUrl + "user/manual/en/supplier" }];
-frappe.help.help_links["Form/Supplier"] = [
- { label: "Supplier", url: docsUrl + "user/manual/en/supplier" },
-];
+frappe.help.help_links["Form/Supplier"] = [{ label: "Supplier", url: docsUrl + "user/manual/en/supplier" }];
frappe.help.help_links["Form/Request for Quotation"] = [
{
@@ -441,9 +437,7 @@ frappe.help.help_links["Tree/Territory"] = [
},
];
-frappe.help.help_links["List/Workflow"] = [
- { label: "Workflow", url: docsUrl + "user/manual/en/workflows" },
-];
+frappe.help.help_links["List/Workflow"] = [{ label: "Workflow", url: docsUrl + "user/manual/en/workflows" }];
frappe.help.help_links["List/Company"] = [
{
@@ -620,9 +614,7 @@ frappe.help.help_links["List/Item"] = [
},
{
label: "Item Valuation",
- url:
- docsUrl +
- "user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average",
+ url: docsUrl + "user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average",
},
];
@@ -706,9 +698,7 @@ frappe.help.help_links["List/Installation Note"] = [
},
];
-frappe.help.help_links["List/Budget"] = [
- { label: "Budgeting", url: docsUrl + "user/manual/en/budgeting" },
-];
+frappe.help.help_links["List/Budget"] = [{ label: "Budgeting", url: docsUrl + "user/manual/en/budgeting" }];
frappe.help.help_links["List/Material Request"] = [
{
@@ -768,13 +758,9 @@ frappe.help.help_links["Form/Serial No"] = [
{ label: "Serial No", url: docsUrl + "user/manual/en/serial-no" },
];
-frappe.help.help_links["List/Batch"] = [
- { label: "Batch", url: docsUrl + "user/manual/en/batch" },
-];
+frappe.help.help_links["List/Batch"] = [{ label: "Batch", url: docsUrl + "user/manual/en/batch" }];
-frappe.help.help_links["Form/Batch"] = [
- { label: "Batch", url: docsUrl + "user/manual/en/batch" },
-];
+frappe.help.help_links["Form/Batch"] = [{ label: "Batch", url: docsUrl + "user/manual/en/batch" }];
frappe.help.help_links["Form/Packing Slip"] = [
{
@@ -827,29 +813,21 @@ frappe.help.help_links["Form/Stock Reconciliation"] = [
//CRM
-frappe.help.help_links["Form/Lead"] = [
- { label: "Lead", url: docsUrl + "user/manual/en/lead" },
-];
+frappe.help.help_links["Form/Lead"] = [{ label: "Lead", url: docsUrl + "user/manual/en/lead" }];
frappe.help.help_links["Form/Opportunity"] = [
{ label: "Opportunity", url: docsUrl + "user/manual/en/opportunity" },
];
-frappe.help.help_links["Form/Address"] = [
- { label: "Address", url: docsUrl + "user/manual/en/address" },
-];
+frappe.help.help_links["Form/Address"] = [{ label: "Address", url: docsUrl + "user/manual/en/address" }];
-frappe.help.help_links["Form/Contact"] = [
- { label: "Contact", url: docsUrl + "user/manual/en/contact" },
-];
+frappe.help.help_links["Form/Contact"] = [{ label: "Contact", url: docsUrl + "user/manual/en/contact" }];
frappe.help.help_links["Form/Newsletter"] = [
{ label: "Newsletter", url: docsUrl + "user/manual/en/newsletter" },
];
-frappe.help.help_links["Form/Campaign"] = [
- { label: "Campaign", url: docsUrl + "user/manual/en/campaign" },
-];
+frappe.help.help_links["Form/Campaign"] = [{ label: "Campaign", url: docsUrl + "user/manual/en/campaign" }];
frappe.help.help_links["Tree/Sales Person"] = [
{
diff --git a/erpnext/public/js/newsletter.js b/erpnext/public/js/newsletter.js
index 3a4dbf893301..96c65de8d6fd 100644
--- a/erpnext/public/js/newsletter.js
+++ b/erpnext/public/js/newsletter.js
@@ -1,8 +1,8 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Newsletter', {
+frappe.ui.form.on("Newsletter", {
refresh() {
erpnext.toggle_naming_series();
- }
+ },
});
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
index 4c23669dbbb5..0e5842053962 100644
--- a/erpnext/public/js/payment/payments.js
+++ b/erpnext/public/js/payment/payments.js
@@ -6,7 +6,7 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
var me = this;
this.dialog = new frappe.ui.Dialog({
- title: 'Payment'
+ title: "Payment",
});
this.dialog.show();
@@ -17,15 +17,17 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
}
select_text() {
- $(this.$body).find('.form-control').click(function() {
- $(this).select();
- });
+ $(this.$body)
+ .find(".form-control")
+ .click(function () {
+ $(this).select();
+ });
}
set_payment_primary_action() {
var me = this;
- this.dialog.set_primary_action(__("Submit"), function() {
+ this.dialog.set_primary_action(__("Submit"), function () {
// Allow no ZERO payment
$.each(me.frm.doc.payments, function (index, data) {
if (data.amount != 0) {
@@ -34,131 +36,147 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
return;
}
});
- })
+ });
}
- make_keyboard(){
+ make_keyboard() {
var me = this;
$(this.$body).empty();
- $(this.$body).html(frappe.render_template('pos_payment', this.frm.doc))
+ $(this.$body).html(frappe.render_template("pos_payment", this.frm.doc));
this.show_payment_details();
- this.bind_keyboard_event()
- this.clear_amount()
+ this.bind_keyboard_event();
+ this.clear_amount();
}
- make_multimode_payment(){
+ make_multimode_payment() {
var me = this;
if (this.frm.doc.change_amount > 0) {
me.payment_val = me.doc.outstanding_amount;
}
- this.payments = frappe.model.add_child(this.frm.doc, 'Multi Mode Payment', "payments");
+ this.payments = frappe.model.add_child(this.frm.doc, "Multi Mode Payment", "payments");
this.payments.mode_of_payment = this.dialog.fields_dict.mode_of_payment.get_value();
this.payments.amount = flt(this.payment_val);
}
- show_payment_details(){
+ show_payment_details() {
var me = this;
- var multimode_payments = $(this.$body).find('.multimode-payments').empty();
+ var multimode_payments = $(this.$body).find(".multimode-payments").empty();
if (this.frm.doc.payments.length) {
- $.each(this.frm.doc.payments, function(index, data) {
- $(frappe.render_template('payment_details', {
- mode_of_payment: data.mode_of_payment,
- amount: data.amount,
- idx: data.idx,
- currency: me.frm.doc.currency,
- type: data.type
- })).appendTo(multimode_payments)
-
- if (data.type == 'Cash' && data.amount == me.frm.doc.paid_amount) {
+ $.each(this.frm.doc.payments, function (index, data) {
+ $(
+ frappe.render_template("payment_details", {
+ mode_of_payment: data.mode_of_payment,
+ amount: data.amount,
+ idx: data.idx,
+ currency: me.frm.doc.currency,
+ type: data.type,
+ })
+ ).appendTo(multimode_payments);
+
+ if (data.type == "Cash" && data.amount == me.frm.doc.paid_amount) {
me.idx = data.idx;
- me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']",{'idx': me.idx}));
+ me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']", { idx: me.idx }));
me.highlight_selected_row();
me.bind_amount_change_event();
}
- })
- }else{
- $("No payment mode selected in pos profile
").appendTo(multimode_payments)
+ });
+ } else {
+ $("No payment mode selected in pos profile
").appendTo(multimode_payments);
}
}
- set_outstanding_amount(){
- this.selected_mode = $(this.$body).find(repl("input[idx='%(idx)s']",{'idx': this.idx}));
+ set_outstanding_amount() {
+ this.selected_mode = $(this.$body).find(repl("input[idx='%(idx)s']", { idx: this.idx }));
this.highlight_selected_row();
this.payment_val = 0.0;
if (this.frm.doc.outstanding_amount > 0 && flt(this.selected_mode.val()) == 0.0) {
//When user first time click on row
- this.payment_val = flt(this.frm.doc.outstanding_amount / this.frm.doc.conversion_rate, precision("outstanding_amount"))
+ this.payment_val = flt(
+ this.frm.doc.outstanding_amount / this.frm.doc.conversion_rate,
+ precision("outstanding_amount")
+ );
this.selected_mode.val(format_currency(this.payment_val, this.frm.doc.currency));
this.update_payment_amount();
} else if (flt(this.selected_mode.val()) > 0) {
//If user click on existing row which has value
this.payment_val = flt(this.selected_mode.val());
}
- this.selected_mode.select()
+ this.selected_mode.select();
this.bind_amount_change_event();
}
- bind_keyboard_event(){
+ bind_keyboard_event() {
var me = this;
- this.payment_val = '';
+ this.payment_val = "";
this.bind_form_control_event();
this.bind_numeric_keys_event();
}
bind_form_control_event() {
var me = this;
- $(this.$body).find('.pos-payment-row').click(function() {
- me.idx = $(this).attr("idx");
- me.set_outstanding_amount();
- });
+ $(this.$body)
+ .find(".pos-payment-row")
+ .click(function () {
+ me.idx = $(this).attr("idx");
+ me.set_outstanding_amount();
+ });
- $(this.$body).find('.form-control').click(function() {
- me.idx = $(this).attr("idx");
- me.set_outstanding_amount();
- me.update_paid_amount(true);
- });
+ $(this.$body)
+ .find(".form-control")
+ .click(function () {
+ me.idx = $(this).attr("idx");
+ me.set_outstanding_amount();
+ me.update_paid_amount(true);
+ });
- $(this.$body).find('.write_off_amount').change(function() {
- me.write_off_amount(flt($(this).val()), precision("write_off_amount"));
- });
+ $(this.$body)
+ .find(".write_off_amount")
+ .change(function () {
+ me.write_off_amount(flt($(this).val()), precision("write_off_amount"));
+ });
- $(this.$body).find('.change_amount').change(function() {
- me.change_amount(flt($(this).val()), precision("change_amount"));
- });
+ $(this.$body)
+ .find(".change_amount")
+ .change(function () {
+ me.change_amount(flt($(this).val()), precision("change_amount"));
+ });
}
highlight_selected_row() {
- var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']", {'idx': this.idx}));
- $(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode');
- selected_row.addClass('selected-payment-mode');
- $(this.$body).find('.amount').attr('disabled', true);
- this.selected_mode.attr('disabled', false);
+ var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']", { idx: this.idx }));
+ $(this.$body).find(".pos-payment-row").removeClass("selected-payment-mode");
+ selected_row.addClass("selected-payment-mode");
+ $(this.$body).find(".amount").attr("disabled", true);
+ this.selected_mode.attr("disabled", false);
}
bind_numeric_keys_event() {
var me = this;
- $(this.$body).find('.pos-keyboard-key').click(function(){
- me.payment_val += $(this).text();
- me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
- me.idx = me.selected_mode.attr("idx");
- me.update_paid_amount();
- });
-
- $(this.$body).find('.delete-btn').click(function() {
- me.payment_val = cstr(flt(me.selected_mode.val())).slice(0, -1);
- me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
- me.idx = me.selected_mode.attr("idx");
- me.update_paid_amount();
- })
+ $(this.$body)
+ .find(".pos-keyboard-key")
+ .click(function () {
+ me.payment_val += $(this).text();
+ me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
+ me.idx = me.selected_mode.attr("idx");
+ me.update_paid_amount();
+ });
+ $(this.$body)
+ .find(".delete-btn")
+ .click(function () {
+ me.payment_val = cstr(flt(me.selected_mode.val())).slice(0, -1);
+ me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
+ me.idx = me.selected_mode.attr("idx");
+ me.update_paid_amount();
+ });
}
bind_amount_change_event() {
var me = this;
- this.selected_mode.change(function() {
- me.payment_val = flt($(this).val()) || 0.0;
+ this.selected_mode.change(function () {
+ me.payment_val = flt($(this).val()) || 0.0;
me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
me.idx = me.selected_mode.attr("idx");
me.update_payment_amount();
@@ -167,21 +185,25 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
clear_amount() {
var me = this;
- $(this.$body).find('.clr').click(function(e) {
- e.stopPropagation();
- me.idx = $(this).attr("idx");
- me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']",{'idx': me.idx}));
- me.payment_val = 0.0;
- me.selected_mode.val(0.0);
- me.highlight_selected_row();
- me.update_payment_amount();
- });
+ $(this.$body)
+ .find(".clr")
+ .click(function (e) {
+ e.stopPropagation();
+ me.idx = $(this).attr("idx");
+ me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']", { idx: me.idx }));
+ me.payment_val = 0.0;
+ me.selected_mode.val(0.0);
+ me.highlight_selected_row();
+ me.update_payment_amount();
+ });
}
write_off_amount(write_off_amount) {
this.frm.doc.write_off_amount = flt(write_off_amount, precision("write_off_amount"));
- this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
- precision("base_write_off_amount"));
+ this.frm.doc.base_write_off_amount = flt(
+ this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
+ precision("base_write_off_amount")
+ );
this.calculate_outstanding_amount(false);
this.show_amounts();
}
@@ -196,13 +218,16 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
update_paid_amount(update_write_off) {
var me = this;
- if (in_list(['change_amount', 'write_off_amount'], this.idx)) {
+ if (in_list(["change_amount", "write_off_amount"], this.idx)) {
var value = me.selected_mode.val();
- if (me.idx == 'change_amount') {
+ if (me.idx == "change_amount") {
me.change_amount(value);
} else {
- if(flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) {
- value = flt(me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate, precision(me.idx));
+ if (flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) {
+ value = flt(
+ me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate,
+ precision(me.idx)
+ );
}
me.write_off_amount(value);
}
@@ -211,25 +236,38 @@ erpnext.payments = class payments extends erpnext.stock.StockController {
}
}
- update_payment_amount(){
+ update_payment_amount() {
var me = this;
- $.each(this.frm.doc.payments, function(index, data) {
+ $.each(this.frm.doc.payments, function (index, data) {
if (cint(me.idx) == cint(data.idx)) {
data.amount = flt(me.selected_mode.val(), 2);
}
- })
+ });
this.calculate_outstanding_amount(false);
this.show_amounts();
}
- show_amounts(){
+ show_amounts() {
var me = this;
- $(this.$body).find(".write_off_amount").val(format_currency(this.frm.doc.write_off_amount, this.frm.doc.currency));
- $(this.$body).find('.paid_amount').text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency));
- $(this.$body).find('.change_amount').val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency));
- $(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, frappe.get_doc(":Company", this.frm.doc.company).default_currency));
+ $(this.$body)
+ .find(".write_off_amount")
+ .val(format_currency(this.frm.doc.write_off_amount, this.frm.doc.currency));
+ $(this.$body)
+ .find(".paid_amount")
+ .text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency));
+ $(this.$body)
+ .find(".change_amount")
+ .val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency));
+ $(this.$body)
+ .find(".outstanding_amount")
+ .text(
+ format_currency(
+ this.frm.doc.outstanding_amount,
+ frappe.get_doc(":Company", this.frm.doc.company).default_currency
+ )
+ );
this.update_invoice();
}
-}
+};
diff --git a/erpnext/public/js/plant_floor_visual/visual_plant.js b/erpnext/public/js/plant_floor_visual/visual_plant.js
index 8cd73adc5745..7e6ee6565ee2 100644
--- a/erpnext/public/js/plant_floor_visual/visual_plant.js
+++ b/erpnext/public/js/plant_floor_visual/visual_plant.js
@@ -1,5 +1,5 @@
class VisualPlantFloor {
- constructor({wrapper, skip_filters=false, plant_floor=null}, page=null) {
+ constructor({ wrapper, skip_filters = false, plant_floor = null }, page = null) {
this.wrapper = wrapper;
this.plant_floor = plant_floor;
this.skip_filters = skip_filters;
@@ -23,67 +23,67 @@ class VisualPlantFloor {
`);
if (!this.skip_filters) {
- this.filter_wrapper = this.wrapper.find('.plant-floor-filter');
- this.visualization_wrapper = this.wrapper.find('.plant-floor-visualization');
- } else if(this.plant_floor) {
- this.wrapper.find('.plant-floor').css('border', 'none');
+ this.filter_wrapper = this.wrapper.find(".plant-floor-filter");
+ this.visualization_wrapper = this.wrapper.find(".plant-floor-visualization");
+ } else if (this.plant_floor) {
+ this.wrapper.find(".plant-floor").css("border", "none");
this.prepare_data();
}
}
prepare_data() {
frappe.call({
- method: 'erpnext.manufacturing.doctype.workstation.workstation.get_workstations',
+ method: "erpnext.manufacturing.doctype.workstation.workstation.get_workstations",
args: {
plant_floor: this.plant_floor,
},
callback: (r) => {
this.workstations = r.message;
this.render_workstations();
- }
+ },
});
}
add_filter() {
this.plant_floor = frappe.ui.form.make_control({
df: {
- fieldtype: 'Link',
- options: 'Plant Floor',
- fieldname: 'plant_floor',
- label: __('Plant Floor'),
+ fieldtype: "Link",
+ options: "Plant Floor",
+ fieldname: "plant_floor",
+ label: __("Plant Floor"),
reqd: 1,
onchange: () => {
this.render_plant_visualization();
- }
+ },
},
parent: this.filter_wrapper,
render_input: true,
});
- this.plant_floor.$wrapper.addClass('form-column col-sm-2');
+ this.plant_floor.$wrapper.addClass("form-column col-sm-2");
this.workstation_type = frappe.ui.form.make_control({
df: {
- fieldtype: 'Link',
- options: 'Workstation Type',
- fieldname: 'workstation_type',
- label: __('Machine Type'),
+ fieldtype: "Link",
+ options: "Workstation Type",
+ fieldname: "workstation_type",
+ label: __("Machine Type"),
onchange: () => {
this.render_plant_visualization();
- }
+ },
},
parent: this.filter_wrapper,
render_input: true,
});
- this.workstation_type.$wrapper.addClass('form-column col-sm-2');
+ this.workstation_type.$wrapper.addClass("form-column col-sm-2");
this.workstation = frappe.ui.form.make_control({
df: {
- fieldtype: 'Link',
- options: 'Workstation',
- fieldname: 'workstation',
- label: __('Machine'),
+ fieldtype: "Link",
+ options: "Workstation",
+ fieldname: "workstation",
+ label: __("Machine"),
onchange: () => {
this.render_plant_visualization();
},
@@ -91,24 +91,24 @@ class VisualPlantFloor {
if (this.workstation_type.get_value()) {
return {
filters: {
- 'workstation_type': this.workstation_type.get_value() || ''
- }
- }
+ workstation_type: this.workstation_type.get_value() || "",
+ },
+ };
}
- }
+ },
},
parent: this.filter_wrapper,
render_input: true,
});
- this.workstation.$wrapper.addClass('form-column col-sm-2');
+ this.workstation.$wrapper.addClass("form-column col-sm-2");
this.workstation_status = frappe.ui.form.make_control({
df: {
- fieldtype: 'Select',
- options: '\nProduction\nOff\nIdle\nProblem\nMaintenance\nSetup',
- fieldname: 'workstation_status',
- label: __('Status'),
+ fieldtype: "Select",
+ options: "\nProduction\nOff\nIdle\nProblem\nMaintenance\nSetup",
+ fieldname: "workstation_status",
+ label: __("Status"),
onchange: () => {
this.render_plant_visualization();
},
@@ -123,35 +123,35 @@ class VisualPlantFloor {
if (plant_floor) {
frappe.call({
- method: 'erpnext.manufacturing.doctype.workstation.workstation.get_workstations',
+ method: "erpnext.manufacturing.doctype.workstation.workstation.get_workstations",
args: {
plant_floor: plant_floor,
workstation_type: this.workstation_type.get_value(),
workstation: this.workstation.get_value(),
- workstation_status: this.workstation_status.get_value()
+ workstation_status: this.workstation_status.get_value(),
},
callback: (r) => {
this.workstations = r.message;
this.render_workstations();
- }
+ },
});
}
}
render_workstations() {
- this.wrapper.find('.plant-floor-container').empty();
- let template = frappe.render_template("visual_plant_floor_template", {
- workstations: this.workstations
+ this.wrapper.find(".plant-floor-container").empty();
+ let template = frappe.render_template("visual_plant_floor_template", {
+ workstations: this.workstations,
});
- $(template).appendTo(this.wrapper.find('.plant-floor-container'));
+ $(template).appendTo(this.wrapper.find(".plant-floor-container"));
}
prepare_menu() {
- this.page.add_menu_item(__('Refresh'), () => {
+ this.page.add_menu_item(__("Refresh"), () => {
this.render_plant_visualization();
});
}
}
-frappe.ui.VisualPlantFloor = VisualPlantFloor;
\ No newline at end of file
+frappe.ui.VisualPlantFloor = VisualPlantFloor;
diff --git a/erpnext/public/js/projects/timer.js b/erpnext/public/js/projects/timer.js
index 0209f4c2322e..8370cc6ffffb 100644
--- a/erpnext/public/js/projects/timer.js
+++ b/erpnext/public/js/projects/timer.js
@@ -1,26 +1,30 @@
frappe.provide("erpnext.timesheet");
-erpnext.timesheet.timer = function(frm, row, timestamp=0) {
+erpnext.timesheet.timer = function (frm, row, timestamp = 0) {
let dialog = new frappe.ui.Dialog({
title: __("Timer"),
- fields:
- [
- {"fieldtype": "Link", "label": __("Activity Type"), "fieldname": "activity_type",
- "reqd": 1, "options": "Activity Type"},
- {"fieldtype": "Link", "label": __("Project"), "fieldname": "project", "options": "Project"},
- {"fieldtype": "Link", "label": __("Task"), "fieldname": "task", "options": "Task"},
- {"fieldtype": "Float", "label": __("Expected Hrs"), "fieldname": "expected_hours"},
- {"fieldtype": "Section Break"},
- {"fieldtype": "HTML", "fieldname": "timer_html"}
- ]
+ fields: [
+ {
+ fieldtype: "Link",
+ label: __("Activity Type"),
+ fieldname: "activity_type",
+ reqd: 1,
+ options: "Activity Type",
+ },
+ { fieldtype: "Link", label: __("Project"), fieldname: "project", options: "Project" },
+ { fieldtype: "Link", label: __("Task"), fieldname: "task", options: "Task" },
+ { fieldtype: "Float", label: __("Expected Hrs"), fieldname: "expected_hours" },
+ { fieldtype: "Section Break" },
+ { fieldtype: "HTML", fieldname: "timer_html" },
+ ],
});
if (row) {
dialog.set_values({
- 'activity_type': row.activity_type,
- 'project': row.project,
- 'task': row.task,
- 'expected_hours': row.expected_hours
+ activity_type: row.activity_type,
+ project: row.project,
+ task: row.task,
+ expected_hours: row.expected_hours,
});
}
dialog.get_field("timer_html").$wrapper.append(get_timer_html());
@@ -34,8 +38,8 @@ erpnext.timesheet.timer = function(frm, row, timestamp=0) {
00
- ${ __("Start") }
- ${ __("Complete") }
+ ${__("Start")}
+ ${__("Complete")}
`;
}
@@ -43,7 +47,7 @@ erpnext.timesheet.timer = function(frm, row, timestamp=0) {
dialog.show();
};
-erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
+erpnext.timesheet.control_timer = function (frm, dialog, row, timestamp = 0) {
var $btn_start = dialog.$wrapper.find(".playpause .btn-start");
var $btn_complete = dialog.$wrapper.find(".playpause .btn-complete");
var interval = null;
@@ -63,12 +67,16 @@ erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
$btn_complete.hide();
}
- $btn_start.click(function(e) {
+ $btn_start.click(function (e) {
if (!initialized) {
// New activity if no activities found
var args = dialog.get_values();
- if(!args) return;
- if (frm.doc.time_logs.length == 1 && !frm.doc.time_logs[0].activity_type && !frm.doc.time_logs[0].from_time) {
+ if (!args) return;
+ if (
+ frm.doc.time_logs.length == 1 &&
+ !frm.doc.time_logs[0].activity_type &&
+ !frm.doc.time_logs[0].from_time
+ ) {
frm.doc.time_logs = [];
}
row = frappe.model.add_child(frm.doc, "Timesheet Detail", "time_logs");
@@ -79,7 +87,7 @@ erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
row.expected_hours = args.expected_hours;
row.completed = 0;
let d = moment(row.from_time);
- if(row.expected_hours) {
+ if (row.expected_hours) {
d.add(row.expected_hours, "hours");
row.to_time = d.format(frappe.defaultDatetimeFormat);
}
@@ -101,8 +109,8 @@ erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
});
// Stop the timer and update the time logged by the timer on click of 'Complete' button
- $btn_complete.click(function() {
- var grid_row = cur_frm.fields_dict['time_logs'].grid.get_row(row.idx - 1);
+ $btn_complete.click(function () {
+ var grid_row = cur_frm.fields_dict["time_logs"].grid.get_row(row.idx - 1);
var args = dialog.get_values();
grid_row.doc.completed = 1;
grid_row.doc.activity_type = args.activity_type;
@@ -119,7 +127,7 @@ erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
});
function initializeTimer() {
- interval = setInterval(function() {
+ interval = setInterval(function () {
var current = setCurrentIncrement();
updateStopwatch(current);
}, 1000);
@@ -127,25 +135,24 @@ erpnext.timesheet.control_timer = function(frm, dialog, row, timestamp=0) {
function updateStopwatch(increment) {
var hours = Math.floor(increment / 3600);
- var minutes = Math.floor((increment - (hours * 3600)) / 60);
- var seconds = increment - (hours * 3600) - (minutes * 60);
+ var minutes = Math.floor((increment - hours * 3600) / 60);
+ var seconds = increment - hours * 3600 - minutes * 60;
// If modal is closed by clicking anywhere outside, reset the timer
- if (!$('.modal-dialog').is(':visible')) {
+ if (!$(".modal-dialog").is(":visible")) {
reset();
}
- if(hours > 99999)
- reset();
- if(cur_dialog && cur_dialog.get_value('expected_hours') > 0) {
- if(flag && (currentIncrement >= (cur_dialog.get_value('expected_hours') * 3600))) {
+ if (hours > 99999) reset();
+ if (cur_dialog && cur_dialog.get_value("expected_hours") > 0) {
+ if (flag && currentIncrement >= cur_dialog.get_value("expected_hours") * 3600) {
frappe.utils.play_sound("alert");
frappe.msgprint(__("Timer exceeded the given hours."));
flag = false;
}
}
- $(".hours").text(hours < 10 ? ("0" + hours.toString()) : hours.toString());
- $(".minutes").text(minutes < 10 ? ("0" + minutes.toString()) : minutes.toString());
- $(".seconds").text(seconds < 10 ? ("0" + seconds.toString()) : seconds.toString());
+ $(".hours").text(hours < 10 ? "0" + hours.toString() : hours.toString());
+ $(".minutes").text(minutes < 10 ? "0" + minutes.toString() : minutes.toString());
+ $(".seconds").text(seconds < 10 ? "0" + seconds.toString() : seconds.toString());
}
function setCurrentIncrement() {
diff --git a/erpnext/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js
index 77f1d2b496ae..14ffaf82162c 100644
--- a/erpnext/public/js/purchase_trends_filters.js
+++ b/erpnext/public/js/purchase_trends_filters.js
@@ -1,71 +1,67 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-erpnext.get_purchase_trends_filters = function() {
+erpnext.get_purchase_trends_filters = function () {
return [
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname":"period",
- "label": __("Period"),
- "fieldtype": "Select",
- "options": [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ fieldname: "period",
+ label: __("Period"),
+ fieldtype: "Select",
+ options: [
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
- "default": "Monthly"
+ default: "Monthly",
},
{
- "fieldname":"fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options":'Fiscal Year',
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today())
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
},
{
- "fieldname":"period_based_on",
- "label": __("Period based On"),
- "fieldtype": "Select",
- "options": [
- { "value": "posting_date", "label": __("Posting Date") },
- { "value": "bill_date", "label": __("Billing Date") },
+ fieldname: "period_based_on",
+ label: __("Period based On"),
+ fieldtype: "Select",
+ options: [
+ { value: "posting_date", label: __("Posting Date") },
+ { value: "bill_date", label: __("Billing Date") },
],
- "default": "posting_date"
+ default: "posting_date",
},
{
- "fieldname":"based_on",
- "label": __("Based On"),
- "fieldtype": "Select",
- "options": [
- { "value": "Item", "label": __("Item") },
- { "value": "Item Group", "label": __("Item Group") },
- { "value": "Supplier", "label": __("Supplier") },
- { "value": "Supplier Group", "label": __("Supplier Group") },
- { "value": "Project", "label": __("Project") }
+ fieldname: "based_on",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: [
+ { value: "Item", label: __("Item") },
+ { value: "Item Group", label: __("Item Group") },
+ { value: "Supplier", label: __("Supplier") },
+ { value: "Supplier Group", label: __("Supplier Group") },
+ { value: "Project", label: __("Project") },
],
- "default": "Item",
- "dashboard_config": {
- "read_only": 1
- }
+ default: "Item",
+ dashboard_config: {
+ read_only: 1,
+ },
},
{
- "fieldname":"group_by",
- "label": __("Group By"),
- "fieldtype": "Select",
- "options": [
- "",
- { "value": "Item", "label": __("Item") },
- { "value": "Supplier", "label": __("Supplier") }
- ],
- "default": ""
+ fieldname: "group_by",
+ label: __("Group By"),
+ fieldtype: "Select",
+ options: ["", { value: "Item", label: __("Item") }, { value: "Supplier", label: __("Supplier") }],
+ default: "",
},
];
-}
+};
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index b7d880ae408e..b7e685cd6fb8 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -4,129 +4,139 @@
// searches for enabled users
frappe.provide("erpnext.queries");
$.extend(erpnext.queries, {
- user: function() {
+ user: function () {
return { query: "frappe.core.doctype.user.user.user_query" };
},
- lead: function() {
+ lead: function () {
return { query: "erpnext.controllers.queries.lead_query" };
},
- customer: function() {
+ customer: function () {
return { query: "erpnext.controllers.queries.customer_query" };
},
- supplier: function() {
+ supplier: function () {
return { query: "erpnext.controllers.queries.supplier_query" };
},
- item: function(filters) {
+ item: function (filters) {
var args = { query: "erpnext.controllers.queries.item_query" };
- if(filters) args["filters"] = filters;
+ if (filters) args["filters"] = filters;
return args;
},
- bom: function() {
+ bom: function () {
return { query: "erpnext.controllers.queries.bom" };
},
- task: function() {
+ task: function () {
return { query: "erpnext.projects.utils.query_task" };
},
- customer_filter: function(doc) {
- if(!doc.customer) {
- frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "customer", doc.name))]));
+ customer_filter: function (doc) {
+ if (!doc.customer) {
+ frappe.throw(
+ __("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "customer", doc.name))])
+ );
}
return { filters: { customer: doc.customer } };
},
- contact_query: function(doc) {
- if(frappe.dynamic_link) {
- if(!doc[frappe.dynamic_link.fieldname]) {
- frappe.throw(__("Please set {0}",
- [__(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name))]));
+ contact_query: function (doc) {
+ if (frappe.dynamic_link) {
+ if (!doc[frappe.dynamic_link.fieldname]) {
+ frappe.throw(
+ __("Please set {0}", [
+ __(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name)),
+ ])
+ );
}
return {
- query: 'frappe.contacts.doctype.contact.contact.contact_query',
+ query: "frappe.contacts.doctype.contact.contact.contact_query",
filters: {
link_doctype: frappe.dynamic_link.doctype,
- link_name: doc[frappe.dynamic_link.fieldname]
- }
+ link_name: doc[frappe.dynamic_link.fieldname],
+ },
};
}
},
- address_query: function(doc) {
- if(frappe.dynamic_link) {
- if(!doc[frappe.dynamic_link.fieldname]) {
- frappe.throw(__("Please set {0}",
- [__(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name))]));
+ address_query: function (doc) {
+ if (frappe.dynamic_link) {
+ if (!doc[frappe.dynamic_link.fieldname]) {
+ frappe.throw(
+ __("Please set {0}", [
+ __(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name)),
+ ])
+ );
}
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
link_doctype: frappe.dynamic_link.doctype,
- link_name: doc[frappe.dynamic_link.fieldname]
- }
+ link_name: doc[frappe.dynamic_link.fieldname],
+ },
};
}
},
- company_address_query: function(doc) {
+ company_address_query: function (doc) {
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
- filters: { is_your_company_address: 1, link_doctype: 'Company', link_name: doc.company || '' }
+ query: "frappe.contacts.doctype.address.address.address_query",
+ filters: { is_your_company_address: 1, link_doctype: "Company", link_name: doc.company || "" },
};
},
- dispatch_address_query: function(doc) {
+ dispatch_address_query: function (doc) {
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
- filters: { link_doctype: 'Company', link_name: doc.company || '' }
+ query: "frappe.contacts.doctype.address.address.address_query",
+ filters: { link_doctype: "Company", link_name: doc.company || "" },
};
},
- supplier_filter: function(doc) {
- if(!doc.supplier) {
- frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "supplier", doc.name))]));
+ supplier_filter: function (doc) {
+ if (!doc.supplier) {
+ frappe.throw(
+ __("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "supplier", doc.name))])
+ );
}
return { filters: { supplier: doc.supplier } };
},
- lead_filter: function(doc) {
- if(!doc.lead) {
- frappe.throw(__("Please specify a {0}",
- [__(frappe.meta.get_label(doc.doctype, "lead", doc.name))]));
+ lead_filter: function (doc) {
+ if (!doc.lead) {
+ frappe.throw(
+ __("Please specify a {0}", [__(frappe.meta.get_label(doc.doctype, "lead", doc.name))])
+ );
}
return { filters: { lead: doc.lead } };
},
- not_a_group_filter: function() {
+ not_a_group_filter: function () {
return { filters: { is_group: 0 } };
},
- employee: function() {
- return { query: "erpnext.controllers.queries.employee_query" }
+ employee: function () {
+ return { query: "erpnext.controllers.queries.employee_query" };
},
- warehouse: function(doc) {
+ warehouse: function (doc) {
return {
filters: [
["Warehouse", "company", "in", ["", cstr(doc.company)]],
- ["Warehouse", "is_group", "=",0]
-
- ]
+ ["Warehouse", "is_group", "=", 0],
+ ],
};
},
- get_filtered_dimensions: function(doc, child_fields, dimension, company) {
- let account = '';
+ get_filtered_dimensions: function (doc, child_fields, dimension, company) {
+ let account = "";
child_fields.forEach((field) => {
if (!account) {
@@ -137,21 +147,23 @@ $.extend(erpnext.queries, {
return {
query: "erpnext.controllers.queries.get_filtered_dimensions",
filters: {
- 'dimension': dimension,
- 'account': account,
- 'company': company
- }
+ dimension: dimension,
+ account: account,
+ company: company,
+ },
};
- }
+ },
});
-erpnext.queries.setup_queries = function(frm, options, query_fn) {
+erpnext.queries.setup_queries = function (frm, options, query_fn) {
var me = this;
- var set_query = function(doctype, parentfield) {
- var link_fields = frappe.meta.get_docfields(doctype, frm.doc.name,
- {"fieldtype": "Link", "options": options});
- $.each(link_fields, function(i, df) {
- if(parentfield) {
+ var set_query = function (doctype, parentfield) {
+ var link_fields = frappe.meta.get_docfields(doctype, frm.doc.name, {
+ fieldtype: "Link",
+ options: options,
+ });
+ $.each(link_fields, function (i, df) {
+ if (parentfield) {
frm.set_query(df.fieldname, parentfield, query_fn);
} else {
frm.set_query(df.fieldname, query_fn);
@@ -162,24 +174,26 @@ erpnext.queries.setup_queries = function(frm, options, query_fn) {
set_query(frm.doc.doctype);
// warehouse field in tables
- $.each(frappe.meta.get_docfields(frm.doc.doctype, frm.doc.name, {"fieldtype": "Table"}),
- function(i, df) {
+ $.each(
+ frappe.meta.get_docfields(frm.doc.doctype, frm.doc.name, { fieldtype: "Table" }),
+ function (i, df) {
set_query(df.options, df.fieldname);
- });
-}
+ }
+ );
+};
/* if item code is selected in child table
then list down warehouses with its quantity
else apply default filters.
*/
-erpnext.queries.setup_warehouse_query = function(frm){
- frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
- var row = locals[cdt][cdn];
+erpnext.queries.setup_warehouse_query = function (frm) {
+ frm.set_query("warehouse", "items", function (doc, cdt, cdn) {
+ var row = locals[cdt][cdn];
var filters = erpnext.queries.warehouse(frm.doc);
- if(row.item_code){
- $.extend(filters, {"query":"erpnext.controllers.queries.warehouse_query"});
+ if (row.item_code) {
+ $.extend(filters, { query: "erpnext.controllers.queries.warehouse_query" });
filters["filters"].push(["Bin", "item_code", "=", row.item_code]);
}
- return filters
+ return filters;
});
-}
+};
diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js
index b73747a604d7..85daa01ff679 100644
--- a/erpnext/public/js/sales_trends_filters.js
+++ b/erpnext/public/js/sales_trends_filters.js
@@ -1,61 +1,57 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-erpnext.get_sales_trends_filters = function() {
- return[
+erpnext.get_sales_trends_filters = function () {
+ return [
{
- "fieldname":"period",
- "label": __("Period"),
- "fieldtype": "Select",
- "options": [
- { "value": "Monthly", "label": __("Monthly") },
- { "value": "Quarterly", "label": __("Quarterly") },
- { "value": "Half-Yearly", "label": __("Half-Yearly") },
- { "value": "Yearly", "label": __("Yearly") }
+ fieldname: "period",
+ label: __("Period"),
+ fieldtype: "Select",
+ options: [
+ { value: "Monthly", label: __("Monthly") },
+ { value: "Quarterly", label: __("Quarterly") },
+ { value: "Half-Yearly", label: __("Half-Yearly") },
+ { value: "Yearly", label: __("Yearly") },
],
- "default": "Monthly"
+ default: "Monthly",
},
{
- "fieldname":"based_on",
- "label": __("Based On"),
- "fieldtype": "Select",
- "options": [
- { "value": "Item", "label": __("Item") },
- { "value": "Item Group", "label": __("Item Group") },
- { "value": "Customer", "label": __("Customer") },
- { "value": "Customer Group", "label": __("Customer Group") },
- { "value": "Territory", "label": __("Territory") },
- { "value": "Project", "label": __("Project") }
+ fieldname: "based_on",
+ label: __("Based On"),
+ fieldtype: "Select",
+ options: [
+ { value: "Item", label: __("Item") },
+ { value: "Item Group", label: __("Item Group") },
+ { value: "Customer", label: __("Customer") },
+ { value: "Customer Group", label: __("Customer Group") },
+ { value: "Territory", label: __("Territory") },
+ { value: "Project", label: __("Project") },
],
- "default": "Item",
- "dashboard_config": {
- "read_only": 1,
- }
+ default: "Item",
+ dashboard_config: {
+ read_only: 1,
+ },
},
{
- "fieldname":"group_by",
- "label": __("Group By"),
- "fieldtype": "Select",
- "options": [
- "",
- { "value": "Item", "label": __("Item") },
- { "value": "Customer", "label": __("Customer") }
- ],
- "default": ""
+ fieldname: "group_by",
+ label: __("Group By"),
+ fieldtype: "Select",
+ options: ["", { value: "Item", label: __("Item") }, { value: "Customer", label: __("Customer") }],
+ default: "",
},
{
- "fieldname":"fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options":'Fiscal Year',
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
];
-}
+};
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 3cbec3e8efcb..3879b38aa13e 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -1,7 +1,7 @@
frappe.provide("erpnext.setup");
-frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
- if(frappe.sys_defaults.company) {
+frappe.pages["setup-wizard"].on_page_load = function (wrapper) {
+ if (frappe.sys_defaults.company) {
frappe.set_route("desk");
return;
}
@@ -14,38 +14,42 @@ frappe.setup.on("before_load", function () {
erpnext.setup.slides_settings = [
{
// Organization
- name: 'organization',
+ name: "organization",
title: __("Setup your organization"),
icon: "fa fa-building",
fields: [
{
- fieldname: 'company_name',
- label: __('Company Name'),
- fieldtype: 'Data',
- reqd: 1
+ fieldname: "company_name",
+ label: __("Company Name"),
+ fieldtype: "Data",
+ reqd: 1,
},
{ fieldtype: "Column Break" },
{
- fieldname: 'company_abbr',
- label: __('Company Abbreviation'),
- fieldtype: 'Data',
- reqd: 1
+ fieldname: "company_abbr",
+ label: __("Company Abbreviation"),
+ fieldtype: "Data",
+ reqd: 1,
},
{ fieldtype: "Section Break" },
{
- fieldname: 'chart_of_accounts', label: __('Chart of Accounts'),
- options: "", fieldtype: 'Select'
+ fieldname: "chart_of_accounts",
+ label: __("Chart of Accounts"),
+ options: "",
+ fieldtype: "Select",
},
- { fieldname: 'view_coa', label: __('View Chart of Accounts'), fieldtype: 'Button' },
- { fieldname: 'fy_start_date', label: __('Financial Year Begins On'), fieldtype: 'Date', reqd: 1 },
+ { fieldname: "view_coa", label: __("View Chart of Accounts"), fieldtype: "Button" },
+ { fieldname: "fy_start_date", label: __("Financial Year Begins On"), fieldtype: "Date", reqd: 1 },
// end date should be hidden (auto calculated)
- { fieldname: 'fy_end_date', label: __('End Date'), fieldtype: 'Date', reqd: 1, hidden: 1 },
+ { fieldname: "fy_end_date", label: __("End Date"), fieldtype: "Date", reqd: 1, hidden: 1 },
{ fieldtype: "Section Break" },
{
- fieldname: 'setup_demo',
- label: __('Generate Demo Data for Exploration'),
- fieldtype: 'Check',
- description: __('If checked, we will create demo data for you to explore the system. This demo data can be erased later.')
+ fieldname: "setup_demo",
+ label: __("Generate Demo Data for Exploration"),
+ fieldtype: "Check",
+ description: __(
+ "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
+ ),
},
],
@@ -73,10 +77,10 @@ erpnext.setup.slides_settings = [
return true;
},
- validate_fy_dates: function() {
+ validate_fy_dates: function () {
// validate fiscal year start and end dates
- const invalid = this.values.fy_start_date == 'Invalid date' ||
- this.values.fy_end_date == 'Invalid date';
+ const invalid =
+ this.values.fy_start_date == "Invalid date" || this.values.fy_end_date == "Invalid date";
const start_greater_than_end = this.values.fy_start_date > this.values.fy_end_date;
if (invalid || start_greater_than_end) {
@@ -104,26 +108,24 @@ erpnext.setup.slides_settings = [
next_year = current_year;
current_year -= 1;
}
- slide.get_field("fy_start_date").set_value(current_year + '-' + fy[0]);
- slide.get_field("fy_end_date").set_value(next_year + '-' + fy[1]);
+ slide.get_field("fy_start_date").set_value(current_year + "-" + fy[0]);
+ slide.get_field("fy_end_date").set_value(next_year + "-" + fy[1]);
}
},
-
load_chart_of_accounts: function (slide) {
let country = frappe.wizard.values.country;
if (country) {
frappe.call({
method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
- args: { "country": country, with_standard: true },
+ args: { country: country, with_standard: true },
callback: function (r) {
if (r.message) {
- slide.get_input("chart_of_accounts").empty()
- .add_options(r.message);
+ slide.get_input("chart_of_accounts").empty().add_options(r.message);
}
- }
- })
+ },
+ });
}
},
@@ -131,56 +133,74 @@ erpnext.setup.slides_settings = [
let me = this;
slide.get_input("fy_start_date").on("change", function () {
var start_date = slide.form.fields_dict.fy_start_date.get_value();
- var year_end_date =
- frappe.datetime.add_days(frappe.datetime.add_months(start_date, 12), -1);
+ var year_end_date = frappe.datetime.add_days(frappe.datetime.add_months(start_date, 12), -1);
slide.form.fields_dict.fy_end_date.set_value(year_end_date);
});
- slide.get_input("view_coa").on("click", function() {
+ slide.get_input("view_coa").on("click", function () {
let chart_template = slide.form.fields_dict.chart_of_accounts.get_value();
- if(!chart_template) return;
+ if (!chart_template) return;
me.charts_modal(slide, chart_template);
});
- slide.get_input("company_name").on("input", function () {
- let parts = slide.get_input("company_name").val().split(" ");
- let abbr = $.map(parts, function (p) { return p ? p.substr(0, 1) : null }).join("");
- slide.get_field("company_abbr").set_value(abbr.slice(0, 10).toUpperCase());
- }).val(frappe.boot.sysdefaults.company_name || "").trigger("change");
-
- slide.get_input("company_abbr").on("change", function () {
- let abbr = slide.get_input("company_abbr").val();
- if (abbr.length > 10) {
- frappe.msgprint(__("Company Abbreviation cannot have more than 5 characters"));
- abbr = abbr.slice(0, 10);
- }
- slide.get_field("company_abbr").set_value(abbr);
- }).val(frappe.boot.sysdefaults.company_abbr || "").trigger("change");
+ slide
+ .get_input("company_name")
+ .on("input", function () {
+ let parts = slide.get_input("company_name").val().split(" ");
+ let abbr = $.map(parts, function (p) {
+ return p ? p.substr(0, 1) : null;
+ }).join("");
+ slide.get_field("company_abbr").set_value(abbr.slice(0, 10).toUpperCase());
+ })
+ .val(frappe.boot.sysdefaults.company_name || "")
+ .trigger("change");
+
+ slide
+ .get_input("company_abbr")
+ .on("change", function () {
+ let abbr = slide.get_input("company_abbr").val();
+ if (abbr.length > 10) {
+ frappe.msgprint(__("Company Abbreviation cannot have more than 5 characters"));
+ abbr = abbr.slice(0, 10);
+ }
+ slide.get_field("company_abbr").set_value(abbr);
+ })
+ .val(frappe.boot.sysdefaults.company_abbr || "")
+ .trigger("change");
},
- charts_modal: function(slide, chart_template) {
- let parent = __('All Accounts');
+ charts_modal: function (slide, chart_template) {
+ let parent = __("All Accounts");
let dialog = new frappe.ui.Dialog({
title: chart_template,
fields: [
- {'fieldname': 'expand_all', 'label': __('Expand All'), 'fieldtype': 'Button',
- click: function() {
+ {
+ fieldname: "expand_all",
+ label: __("Expand All"),
+ fieldtype: "Button",
+ click: function () {
// expand all nodes on button click
coa_tree.load_children(coa_tree.root_node, true);
- }
+ },
},
- {'fieldname': 'collapse_all', 'label': __('Collapse All'), 'fieldtype': 'Button',
- click: function() {
+ {
+ fieldname: "collapse_all",
+ label: __("Collapse All"),
+ fieldtype: "Button",
+ click: function () {
// collapse all nodes
- coa_tree.get_all_nodes(coa_tree.root_node.data.value, coa_tree.root_node.is_root)
- .then(data_list => {
- data_list.map(d => { coa_tree.toggle_node(coa_tree.nodes[d.parent]); });
+ coa_tree
+ .get_all_nodes(coa_tree.root_node.data.value, coa_tree.root_node.is_root)
+ .then((data_list) => {
+ data_list.map((d) => {
+ coa_tree.toggle_node(coa_tree.nodes[d.parent]);
+ });
});
- }
- }
- ]
+ },
+ },
+ ],
});
// render tree structure in the dialog modal
@@ -188,49 +208,49 @@ erpnext.setup.slides_settings = [
parent: $(dialog.body),
label: parent,
expandable: true,
- method: 'erpnext.accounts.utils.get_coa',
+ method: "erpnext.accounts.utils.get_coa",
args: {
chart: chart_template,
parent: parent,
- doctype: 'Account'
+ doctype: "Account",
},
- onclick: function(node) {
+ onclick: function (node) {
parent = node.value;
- }
+ },
});
// add class to show buttons side by side
- const form_container = $(dialog.body).find('form');
- const buttons = $(form_container).find('.frappe-control');
- form_container.addClass('flex');
+ const form_container = $(dialog.body).find("form");
+ const buttons = $(form_container).find(".frappe-control");
+ form_container.addClass("flex");
buttons.map((index, button) => {
- $(button).css({"margin-right": "1em"});
- })
+ $(button).css({ "margin-right": "1em" });
+ });
dialog.show();
coa_tree.load_children(coa_tree.root_node, true); // expand all node trigger
- }
- }
+ },
+ },
];
// Source: https://en.wikipedia.org/wiki/Fiscal_year
// default 1st Jan - 31st Dec
erpnext.setup.fiscal_years = {
- "Afghanistan": ["12-21", "12-20"],
- "Australia": ["07-01", "06-30"],
- "Bangladesh": ["07-01", "06-30"],
- "Canada": ["04-01", "03-31"],
+ Afghanistan: ["12-21", "12-20"],
+ Australia: ["07-01", "06-30"],
+ Bangladesh: ["07-01", "06-30"],
+ Canada: ["04-01", "03-31"],
"Costa Rica": ["10-01", "09-30"],
- "Egypt": ["07-01", "06-30"],
+ Egypt: ["07-01", "06-30"],
"Hong Kong": ["04-01", "03-31"],
- "India": ["04-01", "03-31"],
- "Iran": ["06-23", "06-22"],
- "Myanmar": ["04-01", "03-31"],
+ India: ["04-01", "03-31"],
+ Iran: ["06-23", "06-22"],
+ Myanmar: ["04-01", "03-31"],
"New Zealand": ["04-01", "03-31"],
- "Pakistan": ["07-01", "06-30"],
- "Singapore": ["04-01", "03-31"],
+ Pakistan: ["07-01", "06-30"],
+ Singapore: ["04-01", "03-31"],
"South Africa": ["03-01", "02-28"],
- "Thailand": ["10-01", "09-30"],
+ Thailand: ["10-01", "09-30"],
"United Kingdom": ["04-01", "03-31"],
};
diff --git a/erpnext/public/js/sms_manager.js b/erpnext/public/js/sms_manager.js
index a058da23ac40..d3147bb46002 100644
--- a/erpnext/public/js/sms_manager.js
+++ b/erpnext/public/js/sms_manager.js
@@ -3,104 +3,114 @@
erpnext.SMSManager = function SMSManager(doc) {
var me = this;
- this.setup = function() {
+ this.setup = function () {
var default_msg = {
- 'Lead' : '',
- 'Opportunity' : 'Your enquiry has been logged into the system. Ref No: ' + doc.name,
- 'Quotation' : 'Quotation ' + doc.name + ' has been sent via email. Thanks!',
- 'Sales Order' : 'Sales Order ' + doc.name + ' has been created against '
- + (doc.quotation_no ? ('Quote No:' + doc.quotation_no) : '')
- + (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
- 'Delivery Note' : 'Items has been delivered against delivery note: ' + doc.name
- + (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
- 'Sales Invoice': 'Invoice ' + doc.name + ' has been sent via email '
- + (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
- 'Material Request' : 'Material Request ' + doc.name + ' has been raised in the system',
- 'Purchase Order' : 'Purchase Order ' + doc.name + ' has been sent via email',
- 'Purchase Receipt' : 'Items has been received against purchase receipt: ' + doc.name
- }
-
- if (in_list(['Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
- this.show(doc.contact_person, 'Customer', doc.customer, '', default_msg[doc.doctype]);
- else if (doc.doctype === 'Quotation')
- this.show(doc.contact_person, 'Customer', doc.party_name, '', default_msg[doc.doctype]);
- else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype))
- this.show(doc.contact_person, 'Supplier', doc.supplier, '', default_msg[doc.doctype]);
- else if (doc.doctype == 'Lead')
- this.show('', '', '', doc.mobile_no, default_msg[doc.doctype]);
- else if (doc.doctype == 'Opportunity')
- this.show('', '', '', doc.contact_no, default_msg[doc.doctype]);
- else if (doc.doctype == 'Material Request')
- this.show('', '', '', '', default_msg[doc.doctype]);
+ Lead: "",
+ Opportunity: "Your enquiry has been logged into the system. Ref No: " + doc.name,
+ Quotation: "Quotation " + doc.name + " has been sent via email. Thanks!",
+ "Sales Order":
+ "Sales Order " +
+ doc.name +
+ " has been created against " +
+ (doc.quotation_no ? "Quote No:" + doc.quotation_no : "") +
+ (doc.po_no ? " for your PO: " + doc.po_no : ""),
+ "Delivery Note":
+ "Items has been delivered against delivery note: " +
+ doc.name +
+ (doc.po_no ? " for your PO: " + doc.po_no : ""),
+ "Sales Invoice":
+ "Invoice " +
+ doc.name +
+ " has been sent via email " +
+ (doc.po_no ? " for your PO: " + doc.po_no : ""),
+ "Material Request": "Material Request " + doc.name + " has been raised in the system",
+ "Purchase Order": "Purchase Order " + doc.name + " has been sent via email",
+ "Purchase Receipt": "Items has been received against purchase receipt: " + doc.name,
+ };
+ if (in_list(["Sales Order", "Delivery Note", "Sales Invoice"], doc.doctype))
+ this.show(doc.contact_person, "Customer", doc.customer, "", default_msg[doc.doctype]);
+ else if (doc.doctype === "Quotation")
+ this.show(doc.contact_person, "Customer", doc.party_name, "", default_msg[doc.doctype]);
+ else if (in_list(["Purchase Order", "Purchase Receipt"], doc.doctype))
+ this.show(doc.contact_person, "Supplier", doc.supplier, "", default_msg[doc.doctype]);
+ else if (doc.doctype == "Lead") this.show("", "", "", doc.mobile_no, default_msg[doc.doctype]);
+ else if (doc.doctype == "Opportunity")
+ this.show("", "", "", doc.contact_no, default_msg[doc.doctype]);
+ else if (doc.doctype == "Material Request") this.show("", "", "", "", default_msg[doc.doctype]);
};
- this.get_contact_number = function(contact, ref_doctype, ref_name) {
+ this.get_contact_number = function (contact, ref_doctype, ref_name) {
frappe.call({
method: "frappe.core.doctype.sms_settings.sms_settings.get_contact_number",
args: {
contact_name: contact,
ref_doctype: ref_doctype,
- ref_name: ref_name
+ ref_name: ref_name,
},
- callback: function(r) {
- if(r.exc) { frappe.msgprint(r.exc); return; }
+ callback: function (r) {
+ if (r.exc) {
+ frappe.msgprint(r.exc);
+ return;
+ }
me.number = r.message;
me.show_dialog();
- }
+ },
});
};
- this.show = function(contact, ref_doctype, ref_name, mobile_nos, message) {
+ this.show = function (contact, ref_doctype, ref_name, mobile_nos, message) {
this.message = message;
if (mobile_nos) {
me.number = mobile_nos;
me.show_dialog();
- } else if (contact){
- this.get_contact_number(contact, ref_doctype, ref_name)
+ } else if (contact) {
+ this.get_contact_number(contact, ref_doctype, ref_name);
} else {
me.show_dialog();
}
- }
- this.show_dialog = function() {
- if(!me.dialog)
- me.make_dialog();
+ };
+ this.show_dialog = function () {
+ if (!me.dialog) me.make_dialog();
me.dialog.set_values({
- 'message': me.message,
- 'number': me.number
- })
+ message: me.message,
+ number: me.number,
+ });
me.dialog.show();
- }
- this.make_dialog = function() {
+ };
+ this.make_dialog = function () {
var d = new frappe.ui.Dialog({
- title: 'Send SMS',
+ title: "Send SMS",
width: 400,
fields: [
- {fieldname:'number', fieldtype:'Data', label:'Mobile Number', reqd:1},
- {fieldname:'message', fieldtype:'Text', label:'Message', reqd:1},
- {fieldname:'send', fieldtype:'Button', label:'Send'}
- ]
- })
- d.fields_dict.send.input.onclick = function() {
+ { fieldname: "number", fieldtype: "Data", label: "Mobile Number", reqd: 1 },
+ { fieldname: "message", fieldtype: "Text", label: "Message", reqd: 1 },
+ { fieldname: "send", fieldtype: "Button", label: "Send" },
+ ],
+ });
+ d.fields_dict.send.input.onclick = function () {
var btn = d.fields_dict.send.input;
var v = me.dialog.get_values();
- if(v) {
+ if (v) {
$(btn).set_working();
frappe.call({
method: "frappe.core.doctype.sms_settings.sms_settings.send_sms",
args: {
receiver_list: [v.number],
- msg: v.message
+ msg: v.message,
},
- callback: function(r) {
+ callback: function (r) {
$(btn).done_working();
- if(r.exc) {frappe.msgprint(r.exc); return; }
+ if (r.exc) {
+ frappe.msgprint(r.exc);
+ return;
+ }
me.dialog.hide();
- }
+ },
});
}
- }
+ };
this.dialog = d;
- }
+ };
this.setup();
-}
+};
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index 98e7f7849ed7..37f637953692 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -1,68 +1,104 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
erpnext.StockAnalytics = class StockAnalytics extends erpnext.StockGridReport {
constructor(wrapper, opts) {
var args = {
title: __("Stock Analytics"),
- parent: $(wrapper).find('.layout-main'),
+ parent: $(wrapper).find(".layout-main"),
page: wrapper.page,
- doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
- "Fiscal Year", "Serial No"],
+ doctypes: [
+ "Item",
+ "Item Group",
+ "Warehouse",
+ "Stock Ledger Entry",
+ "Brand",
+ "Fiscal Year",
+ "Serial No",
+ ],
tree_grid: {
show: true,
parent_field: "parent_item_group",
- formatter: function(item) {
- if(!item.is_group) {
- return repl("\
- %(value)s ", {
+ %(value)s",
+ {
value: item.name,
- });
+ }
+ );
} else {
return item.name;
}
-
- }
+ },
},
- }
+ };
- if(opts) $.extend(args, opts);
+ if (opts) $.extend(args, opts);
super(args);
this.filters = [
- {fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty",
- options:[{label:__("Value"), value:"Value"}, {label:__("Quantity"), value:"Quantity"}],
- filter: function(val, item, opts, me) {
+ {
+ fieldtype: "Select",
+ label: __("Value or Qty"),
+ fieldname: "value_or_qty",
+ options: [
+ { label: __("Value"), value: "Value" },
+ { label: __("Quantity"), value: "Quantity" },
+ ],
+ filter: function (val, item, opts, me) {
return me.apply_zero_filter(val, item, opts, me);
- }},
- {fieldtype:"Select", label: __("Brand"), link:"Brand", fieldname: "brand",
- default_value: __("Select Brand..."), filter: function(val, item, opts) {
+ },
+ },
+ {
+ fieldtype: "Select",
+ label: __("Brand"),
+ link: "Brand",
+ fieldname: "brand",
+ default_value: __("Select Brand..."),
+ filter: function (val, item, opts) {
return val == opts.default_value || item.brand == val || item._show;
- }, link_formatter: {filter_input: "brand"}},
- {fieldtype:"Select", label: __("Warehouse"), link:"Warehouse", fieldname: "warehouse",
- default_value: __("Select Warehouse...")},
- {fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
- {fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
- {fieldtype:"Select", label: __("Range"), fieldname: "range",
- options:[
- {label:__("Daily"), value:"Daily"},
- {label:__("Weekly"), value:"Weekly"},
- {label:__("Monthly"), value:"Monthly"},
- {label:__("Quarterly"), value:"Quarterly"},
- {label:__("Yearly"), value:"Yearly"},
- ]}
+ },
+ link_formatter: { filter_input: "brand" },
+ },
+ {
+ fieldtype: "Select",
+ label: __("Warehouse"),
+ link: "Warehouse",
+ fieldname: "warehouse",
+ default_value: __("Select Warehouse..."),
+ },
+ { fieldtype: "Date", label: __("From Date"), fieldname: "from_date" },
+ { fieldtype: "Date", label: __("To Date"), fieldname: "to_date" },
+ {
+ fieldtype: "Select",
+ label: __("Range"),
+ fieldname: "range",
+ options: [
+ { label: __("Daily"), value: "Daily" },
+ { label: __("Weekly"), value: "Weekly" },
+ { label: __("Monthly"), value: "Monthly" },
+ { label: __("Quarterly"), value: "Quarterly" },
+ { label: __("Yearly"), value: "Yearly" },
+ ],
+ },
];
}
setup_columns() {
var std_columns = [
- {id: "name", name: __("Item"), field: "name", width: 300},
- {id: "brand", name: __("Brand"), field: "brand", width: 100},
- {id: "stock_uom", name: __("UOM"), field: "stock_uom", width: 100},
- {id: "opening", name: __("Opening"), field: "opening", hidden: true,
- formatter: this.currency_formatter}
+ { id: "name", name: __("Item"), field: "name", width: 300 },
+ { id: "brand", name: __("Brand"), field: "brand", width: 100 },
+ { id: "stock_uom", name: __("UOM"), field: "stock_uom", width: 100 },
+ {
+ id: "opening",
+ name: __("Opening"),
+ field: "opening",
+ hidden: true,
+ formatter: this.currency_formatter,
+ },
];
this.make_date_range_columns();
@@ -79,24 +115,24 @@ erpnext.StockAnalytics = class StockAnalytics extends erpnext.StockGridReport {
}
init_filter_values() {
super.init_filter_values();
- this.filter_inputs.range && this.filter_inputs.range.val('Monthly');
+ this.filter_inputs.range && this.filter_inputs.range.val("Monthly");
}
prepare_data() {
var me = this;
- if(!this.data) {
+ if (!this.data) {
var items = this.prepare_tree("Item", "Item Group");
me.parent_map = {};
me.item_by_name = {};
me.data = [];
- $.each(items, function(i, v) {
+ $.each(items, function (i, v) {
var d = copy_dict(v);
me.data.push(d);
me.item_by_name[d.name] = d;
- if(d.parent_item_group) {
+ if (d.parent_item_group) {
me.parent_map[d.name] = d.parent_item_group;
}
me.reset_item_values(d);
@@ -105,7 +141,7 @@ erpnext.StockAnalytics = class StockAnalytics extends erpnext.StockGridReport {
this.data[0].checked = true;
} else {
// otherwise, only reset values
- $.each(this.data, function(i, d) {
+ $.each(this.data, function (i, d) {
me.reset_item_values(d);
d["closing_qty_value"] = 0;
});
@@ -113,7 +149,6 @@ erpnext.StockAnalytics = class StockAnalytics extends erpnext.StockGridReport {
this.prepare_balances();
this.update_groups();
-
}
prepare_balances() {
var me = this;
@@ -124,24 +159,25 @@ erpnext.StockAnalytics = class StockAnalytics extends erpnext.StockGridReport {
this.item_warehouse = {};
this.serialized_buying_rates = this.get_serialized_buying_rates();
- for(var i=0, j=data.length; i 0) {
+ if (sl.qty > 0) {
// incoming - rate is given
let rate = sl.incoming_rate;
let add_qty = sl.qty;
- if(wh.balance_qty < 0) {
+ if (wh.balance_qty < 0) {
// negative valuation
// only add value of quantity if
// the balance goes above 0
add_qty = wh.balance_qty + sl.qty;
- if(add_qty < 0) {
+ if (add_qty < 0) {
add_qty = 0;
}
}
- if(sl.serial_no) {
+ if (sl.serial_no) {
value_diff = this.get_serialized_value_diff(sl);
} else {
- value_diff = (rate * add_qty);
+ value_diff = rate * add_qty;
}
- if(add_qty)
- wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
+ if (add_qty) wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
} else {
// called everytime for maintaining fifo stack
var fifo_value_diff = this.get_fifo_value_diff(wh, sl);
// outgoing
- if(sl.serial_no) {
+ if (sl.serial_no) {
value_diff = -1 * this.get_serialized_value_diff(sl);
- } else if(is_fifo) {
+ } else if (is_fifo) {
value_diff = fifo_value_diff;
} else {
// average rate for weighted average
- let rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 :
- flt(wh.balance_value) / flt(wh.balance_qty));
+ let rate = wh.balance_qty.toFixed(2) == 0.0 ? 0 : flt(wh.balance_value) / flt(wh.balance_qty);
// no change in value if negative qty
- if((wh.balance_qty + sl.qty).toFixed(2) >= 0.00)
- value_diff = (rate * sl.qty);
- else
- value_diff = -wh.balance_value;
+ if ((wh.balance_qty + sl.qty).toFixed(2) >= 0.0) value_diff = rate * sl.qty;
+ else value_diff = -wh.balance_value;
}
}
@@ -69,14 +68,14 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
var fifo_value_diff = 0.0;
var qty = -sl.qty;
- for(var i=0, j=fifo_stack.length; i= qty) {
+ if (batch[0] >= qty) {
batch[0] = batch[0] - qty;
- fifo_value_diff += (qty * batch[1]);
+ fifo_value_diff += qty * batch[1];
qty = 0.0;
- if(batch[0]) {
+ if (batch[0]) {
// batch still has qty put it back
fifo_stack.push(batch);
}
@@ -85,7 +84,7 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
break;
} else {
// consume this batch fully
- fifo_value_diff += (batch[0] * batch[1]);
+ fifo_value_diff += batch[0] * batch[1];
qty = qty - batch[0];
}
}
@@ -99,8 +98,8 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
var value_diff = 0.0;
- $.each(sl.serial_no.trim().split("\n"), function(i, sr) {
- if(sr) {
+ $.each(sl.serial_no.trim().split("\n"), function (i, sr) {
+ if (sr) {
value_diff += flt(me.serialized_buying_rates[sr.trim().toLowerCase()]);
}
});
@@ -112,7 +111,7 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
var serialized_buying_rates = {};
if (frappe.report_dump.data["Serial No"]) {
- $.each(frappe.report_dump.data["Serial No"], function(i, sn) {
+ $.each(frappe.report_dump.data["Serial No"], function (i, sn) {
serialized_buying_rates[sn.name.toLowerCase()] = flt(sn.incoming_rate);
});
}
diff --git a/erpnext/public/js/telephony.js b/erpnext/public/js/telephony.js
index f4b0b1813742..39d9c0f2f6a6 100644
--- a/erpnext/public/js/telephony.js
+++ b/erpnext/public/js/telephony.js
@@ -1,13 +1,17 @@
-frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlData {
+frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlData {
make_input() {
super.make_input();
- if (this.df.options == 'Phone') {
+ if (this.df.options == "Phone") {
this.setup_phone();
}
if (this.frm && this.frm.fields_dict) {
- Object.values(this.frm.fields_dict).forEach(function(field) {
- if (field.df.read_only === 1 && field.df.options === 'Phone'
- && field.disp_area.style[0] != 'display' && !field.has_icon) {
+ Object.values(this.frm.fields_dict).forEach(function (field) {
+ if (
+ field.df.read_only === 1 &&
+ field.df.options === "Phone" &&
+ field.disp_area.style[0] != "display" &&
+ !field.has_icon
+ ) {
field.setup_phone && field.setup_phone();
field.has_icon = true;
}
@@ -16,15 +20,18 @@ frappe.ui.form.ControlData = class ControlData extends frappe.ui.form.ControlDat
}
setup_phone() {
if (frappe.phone_call.handler) {
- let control = this.df.read_only ? '.control-value' : '.control-input';
- this.$wrapper.find(control)
- .append(`
+ let control = this.df.read_only ? ".control-value" : ".control-input";
+ this.$wrapper
+ .find(control)
+ .append(
+ `
-
- ${frappe.utils.icon('call')}
+
+ ${frappe.utils.icon("call")}
- `)
- .find('.phone-btn')
+ `
+ )
+ .find(".phone-btn")
.click(() => {
frappe.phone_call.handler(this.get_value(), this.frm);
});
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 61b8f353da98..f17f60a0cd33 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -4,44 +4,42 @@ frappe.provide("erpnext");
frappe.provide("erpnext.utils");
$.extend(erpnext, {
- get_currency: function(company) {
- if(!company && cur_frm)
- company = cur_frm.doc.company;
- if(company)
+ get_currency: function (company) {
+ if (!company && cur_frm) company = cur_frm.doc.company;
+ if (company)
return frappe.get_doc(":Company", company)?.default_currency || frappe.boot.sysdefaults.currency;
- else
- return frappe.boot.sysdefaults.currency;
+ else return frappe.boot.sysdefaults.currency;
},
get_presentation_currency_list: () => {
const docs = frappe.boot.docs;
- let currency_list = docs.filter(d => d.doctype === ":Currency").map(d => d.name);
+ let currency_list = docs.filter((d) => d.doctype === ":Currency").map((d) => d.name);
currency_list.unshift("");
return currency_list;
},
- toggle_naming_series: function() {
- if(cur_frm && cur_frm.fields_dict.naming_series) {
- cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
+ toggle_naming_series: function () {
+ if (cur_frm && cur_frm.fields_dict.naming_series) {
+ cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal ? true : false);
}
},
- hide_company: function(frm) {
- if(frm?.fields_dict.company) {
+ hide_company: function (frm) {
+ if (frm?.fields_dict.company) {
var companies = Object.keys(locals[":Company"] || {});
- if(companies.length === 1) {
- if(!frm.doc.company) frm.set_value("company", companies[0]);
+ if (companies.length === 1) {
+ if (!frm.doc.company) frm.set_value("company", companies[0]);
frm.toggle_display("company", false);
- } else if(erpnext.last_selected_company) {
- if(!frm.doc.company) frm.set_value("company", erpnext.last_selected_company);
+ } else if (erpnext.last_selected_company) {
+ if (!frm.doc.company) frm.set_value("company", erpnext.last_selected_company);
}
}
},
- is_perpetual_inventory_enabled: function(company) {
- if(company) {
+ is_perpetual_inventory_enabled: function (company) {
+ if (company) {
let company_local = locals[":Company"] && locals[":Company"][company];
- if(company_local) {
+ if (company_local) {
return cint(company_local.enable_perpetual_inventory);
}
}
@@ -51,301 +49,346 @@ $.extend(erpnext, {
return cint(frappe.boot.sysdefaults.allow_stale);
},
- setup_serial_or_batch_no: function() {
+ setup_serial_or_batch_no: function () {
let grid_row = cur_frm.open_grid_row();
- if (!grid_row || !grid_row.grid_form.fields_dict.serial_no ||
- grid_row.grid_form.fields_dict.serial_no.get_status() !== "Write") return;
+ if (
+ !grid_row ||
+ !grid_row.grid_form.fields_dict.serial_no ||
+ grid_row.grid_form.fields_dict.serial_no.get_status() !== "Write"
+ )
+ return;
- frappe.model.get_value('Item', {'name': grid_row.doc.item_code},
- ['has_serial_no', 'has_batch_no'], ({has_serial_no, has_batch_no}) => {
- Object.assign(grid_row.doc, {has_serial_no, has_batch_no});
+ frappe.model.get_value(
+ "Item",
+ { name: grid_row.doc.item_code },
+ ["has_serial_no", "has_batch_no"],
+ ({ has_serial_no, has_batch_no }) => {
+ Object.assign(grid_row.doc, { has_serial_no, has_batch_no });
if (has_serial_no) {
- attach_selector_button(__("Add Serial No"),
- grid_row.grid_form.fields_dict.serial_no.$wrapper, this, grid_row);
+ attach_selector_button(
+ __("Add Serial No"),
+ grid_row.grid_form.fields_dict.serial_no.$wrapper,
+ this,
+ grid_row
+ );
} else if (has_batch_no) {
- attach_selector_button(__("Pick Batch No"),
- grid_row.grid_form.fields_dict.batch_no.$wrapper, this, grid_row);
+ attach_selector_button(
+ __("Pick Batch No"),
+ grid_row.grid_form.fields_dict.batch_no.$wrapper,
+ this,
+ grid_row
+ );
}
}
);
},
route_to_adjustment_jv: (args) => {
- frappe.model.with_doctype('Journal Entry', () => {
+ frappe.model.with_doctype("Journal Entry", () => {
// route to adjustment Journal Entry to handle Account Balance and Stock Value mismatch
- let journal_entry = frappe.model.get_new_doc('Journal Entry');
+ let journal_entry = frappe.model.get_new_doc("Journal Entry");
args.accounts.forEach((je_account) => {
let child_row = frappe.model.add_child(journal_entry, "accounts");
child_row.account = je_account.account;
child_row.debit_in_account_currency = je_account.debit_in_account_currency;
child_row.credit_in_account_currency = je_account.credit_in_account_currency;
- child_row.party_type = "" ;
+ child_row.party_type = "";
});
- frappe.set_route('Form','Journal Entry', journal_entry.name);
+ frappe.set_route("Form", "Journal Entry", journal_entry.name);
});
},
route_to_pending_reposts: (args) => {
- frappe.set_route('List', 'Repost Item Valuation', args);
+ frappe.set_route("List", "Repost Item Valuation", args);
},
});
-
$.extend(erpnext.utils, {
- set_party_dashboard_indicators: function(frm) {
- if(frm.doc.__onload && frm.doc.__onload.dashboard_info) {
+ set_party_dashboard_indicators: function (frm) {
+ if (frm.doc.__onload && frm.doc.__onload.dashboard_info) {
var company_wise_info = frm.doc.__onload.dashboard_info;
- if(company_wise_info.length > 1) {
- company_wise_info.forEach(function(info) {
+ if (company_wise_info.length > 1) {
+ company_wise_info.forEach(function (info) {
erpnext.utils.add_indicator_for_multicompany(frm, info);
});
} else if (company_wise_info.length === 1) {
- frm.dashboard.add_indicator(__('Annual Billing: {0}',
- [format_currency(company_wise_info[0].billing_this_year, company_wise_info[0].currency)]), 'blue');
- frm.dashboard.add_indicator(__('Total Unpaid: {0}',
- [format_currency(company_wise_info[0].total_unpaid, company_wise_info[0].currency)]),
- company_wise_info[0].total_unpaid ? 'orange' : 'green');
-
- if(company_wise_info[0].loyalty_points) {
- frm.dashboard.add_indicator(__('Loyalty Points: {0}',
- [company_wise_info[0].loyalty_points]), 'blue');
+ frm.dashboard.add_indicator(
+ __("Annual Billing: {0}", [
+ format_currency(
+ company_wise_info[0].billing_this_year,
+ company_wise_info[0].currency
+ ),
+ ]),
+ "blue"
+ );
+ frm.dashboard.add_indicator(
+ __("Total Unpaid: {0}", [
+ format_currency(company_wise_info[0].total_unpaid, company_wise_info[0].currency),
+ ]),
+ company_wise_info[0].total_unpaid ? "orange" : "green"
+ );
+
+ if (company_wise_info[0].loyalty_points) {
+ frm.dashboard.add_indicator(
+ __("Loyalty Points: {0}", [company_wise_info[0].loyalty_points]),
+ "blue"
+ );
}
}
}
},
- view_serial_batch_nos: function(frm) {
+ view_serial_batch_nos: function (frm) {
if (!frm.doc?.items) {
return;
}
- let bundle_ids = frm.doc.items.filter(d => d.serial_and_batch_bundle);
+ let bundle_ids = frm.doc.items.filter((d) => d.serial_and_batch_bundle);
if (bundle_ids?.length) {
- frm.add_custom_button(__('Serial / Batch Nos'), () => {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "voucher_type": frm.doc.doctype,
- "from_date": frm.doc.posting_date || frm.doc.transaction_date,
- "to_date": frm.doc.posting_date || frm.doc.transaction_date,
- "company": frm.doc.company,
- };
- frappe.set_route("query-report", "Serial and Batch Summary");
- }, __('View'));
+ frm.add_custom_button(
+ __("Serial / Batch Nos"),
+ () => {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ voucher_type: frm.doc.doctype,
+ from_date: frm.doc.posting_date || frm.doc.transaction_date,
+ to_date: frm.doc.posting_date || frm.doc.transaction_date,
+ company: frm.doc.company,
+ };
+ frappe.set_route("query-report", "Serial and Batch Summary");
+ },
+ __("View")
+ );
}
},
- add_indicator_for_multicompany: function(frm, info) {
+ add_indicator_for_multicompany: function (frm, info) {
frm.dashboard.stats_area.show();
- frm.dashboard.stats_area_row.addClass('flex');
- frm.dashboard.stats_area_row.css('flex-wrap', 'wrap');
-
- var color = info.total_unpaid ? 'orange' : 'green';
-
- var indicator = $(''+
- '
'+info.company+' '+
-
- '
'+
- 'Annual Billing: '+format_currency(info.billing_this_year, info.currency)+'
'+
-
- '
'+
- 'Total Unpaid: '
- +format_currency(info.total_unpaid, info.currency)+'
'+
-
-
- '
'+
- 'Loyalty Points: '+info.loyalty_points+'
').appendTo(indicator);
+ frm.dashboard.stats_area_row.addClass("flex");
+ frm.dashboard.stats_area_row.css("flex-wrap", "wrap");
+
+ var color = info.total_unpaid ? "orange" : "green";
+
+ var indicator = $(
+ '' +
+ '
' +
+ info.company +
+ " " +
+ '
' +
+ "Annual Billing: " +
+ format_currency(info.billing_this_year, info.currency) +
+ "
" +
+ '
' +
+ 'Total Unpaid: ' +
+ format_currency(info.total_unpaid, info.currency) +
+ "
" +
+ "
' +
+ "Loyalty Points: " +
+ info.loyalty_points +
+ "
"
+ ).appendTo(indicator);
}
return indicator;
},
- get_party_name: function(party_type) {
- var dict = {'Customer': 'customer_name', 'Supplier': 'supplier_name', 'Employee': 'employee_name',
- 'Member': 'member_name'};
+ get_party_name: function (party_type) {
+ var dict = {
+ Customer: "customer_name",
+ Supplier: "supplier_name",
+ Employee: "employee_name",
+ Member: "member_name",
+ };
return dict[party_type];
},
- copy_value_in_all_rows: function(doc, dt, dn, table_fieldname, fieldname) {
+ copy_value_in_all_rows: function (doc, dt, dn, table_fieldname, fieldname) {
var d = locals[dt][dn];
- if(d[fieldname]){
+ if (d[fieldname]) {
var cl = doc[table_fieldname] || [];
- for(var i = 0; i < cl.length; i++) {
- if(!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
+ for (var i = 0; i < cl.length; i++) {
+ if (!cl[i][fieldname]) cl[i][fieldname] = d[fieldname];
}
}
refresh_field(table_fieldname);
},
- get_terms: function(tc_name, doc, callback) {
- if(tc_name) {
+ get_terms: function (tc_name, doc, callback) {
+ if (tc_name) {
return frappe.call({
- method: 'erpnext.setup.doctype.terms_and_conditions.terms_and_conditions.get_terms_and_conditions',
+ method: "erpnext.setup.doctype.terms_and_conditions.terms_and_conditions.get_terms_and_conditions",
args: {
template_name: tc_name,
- doc: doc
+ doc: doc,
+ },
+ callback: function (r) {
+ callback(r);
},
- callback: function(r) {
- callback(r)
- }
});
}
},
- make_bank_account: function(doctype, docname) {
+ make_bank_account: function (doctype, docname) {
frappe.call({
method: "erpnext.accounts.doctype.bank_account.bank_account.make_bank_account",
args: {
doctype: doctype,
- docname: docname
+ docname: docname,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
- add_dimensions: function(report_name, index) {
+ add_dimensions: function (report_name, index) {
let filters = frappe.query_reports[report_name].filters;
frappe.call({
method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimensions",
- callback: function(r) {
+ callback: function (r) {
let accounting_dimensions = r.message[0];
accounting_dimensions.forEach((dimension) => {
- let found = filters.some(el => el.fieldname === dimension['fieldname']);
+ let found = filters.some((el) => el.fieldname === dimension["fieldname"]);
if (!found) {
filters.splice(index, 0, {
- "fieldname": dimension["fieldname"],
- "label": __(dimension["label"]),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: dimension["fieldname"],
+ label: __(dimension["label"]),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
return frappe.db.get_link_options(dimension["document_type"], txt);
},
});
}
});
- }
+ },
});
},
- add_inventory_dimensions: function(report_name, index) {
+ add_inventory_dimensions: function (report_name, index) {
let filters = frappe.query_reports[report_name].filters;
frappe.call({
method: "erpnext.stock.doctype.inventory_dimension.inventory_dimension.get_inventory_dimensions",
- callback: function(r) {
+ callback: function (r) {
if (r.message && r.message.length) {
r.message.forEach((dimension) => {
- let existing_filter = filters.filter(el => el.fieldname === dimension['fieldname']);
+ let existing_filter = filters.filter((el) => el.fieldname === dimension["fieldname"]);
if (!existing_filter.length) {
filters.splice(index, 0, {
- "fieldname": dimension["fieldname"],
- "label": __(dimension["doctype"]),
- "fieldtype": "MultiSelectList",
- get_data: function(txt) {
+ fieldname: dimension["fieldname"],
+ label: __(dimension["doctype"]),
+ fieldtype: "MultiSelectList",
+ get_data: function (txt) {
return frappe.db.get_link_options(dimension["doctype"], txt);
},
});
} else {
- existing_filter[0]['fieldtype'] = "MultiSelectList";
- existing_filter[0]['get_data'] = function(txt) {
+ existing_filter[0]["fieldtype"] = "MultiSelectList";
+ existing_filter[0]["get_data"] = function (txt) {
return frappe.db.get_link_options(dimension["doctype"], txt);
- }
+ };
}
});
}
- }
+ },
});
},
- make_subscription: function(doctype, docname) {
+ make_subscription: function (doctype, docname) {
frappe.call({
method: "frappe.automation.doctype.auto_repeat.auto_repeat.make_auto_repeat",
args: {
doctype: doctype,
- docname: docname
+ docname: docname,
},
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
- make_pricing_rule: function(doctype, docname) {
+ make_pricing_rule: function (doctype, docname) {
frappe.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.make_pricing_rule",
args: {
doctype: doctype,
- docname: docname
+ docname: docname,
},
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
- })
+ },
+ });
},
/**
- * Checks if the first row of a given child table is empty
- * @param child_table - Child table Doctype
- * @return {Boolean}
- **/
- first_row_is_empty: function(child_table){
- if($.isArray(child_table) && child_table.length > 0) {
+ * Checks if the first row of a given child table is empty
+ * @param child_table - Child table Doctype
+ * @return {Boolean}
+ **/
+ first_row_is_empty: function (child_table) {
+ if ($.isArray(child_table) && child_table.length > 0) {
return !child_table[0].item_code;
}
return false;
},
/**
- * Removes the first row of a child table if it is empty
- * @param {_Frm} frm - The current form
- * @param {String} child_table_name - The child table field name
- * @return {Boolean}
- **/
- remove_empty_first_row: function(frm, child_table_name){
- const rows = frm['doc'][child_table_name];
- if (this.first_row_is_empty(rows)){
- frm['doc'][child_table_name] = rows.splice(1);
+ * Removes the first row of a child table if it is empty
+ * @param {_Frm} frm - The current form
+ * @param {String} child_table_name - The child table field name
+ * @return {Boolean}
+ **/
+ remove_empty_first_row: function (frm, child_table_name) {
+ const rows = frm["doc"][child_table_name];
+ if (this.first_row_is_empty(rows)) {
+ frm["doc"][child_table_name] = rows.splice(1);
}
return rows;
},
- get_tree_options: function(option) {
+ get_tree_options: function (option) {
// get valid options for tree based on user permission & locals dict
let unscrub_option = frappe.model.unscrub(option);
let user_permission = frappe.defaults.get_user_permissions();
let options;
- if(user_permission && user_permission[unscrub_option]) {
- options = user_permission[unscrub_option].map(perm => perm.doc);
+ if (user_permission && user_permission[unscrub_option]) {
+ options = user_permission[unscrub_option].map((perm) => perm.doc);
} else {
- options = $.map(locals[`:${unscrub_option}`], function(c) { return c.name; }).sort();
+ options = $.map(locals[`:${unscrub_option}`], function (c) {
+ return c.name;
+ }).sort();
}
// filter unique values, as there may be multiple user permissions for any value
return options.filter((value, index, self) => self.indexOf(value) === index);
},
- get_tree_default: function(option) {
+ get_tree_default: function (option) {
// set default for a field based on user permission
let options = this.get_tree_options(option);
- if(options.includes(frappe.defaults.get_default(option))) {
+ if (options.includes(frappe.defaults.get_default(option))) {
return frappe.defaults.get_default(option);
} else {
return options[0];
}
},
- overrides_parent_value_in_all_rows: function(doc, dt, dn, table_fieldname, fieldname, parent_fieldname) {
+ overrides_parent_value_in_all_rows: function (doc, dt, dn, table_fieldname, fieldname, parent_fieldname) {
if (doc[parent_fieldname]) {
let cl = doc[table_fieldname] || [];
for (let i = 0; i < cl.length; i++) {
@@ -355,7 +398,7 @@ $.extend(erpnext.utils, {
}
},
create_new_doc: function (doctype, update_fields) {
- frappe.model.with_doctype(doctype, function() {
+ frappe.model.with_doctype(doctype, function () {
var new_doc = frappe.model.get_new_doc(doctype);
for (let [key, value] of Object.entries(update_fields)) {
new_doc[key] = value;
@@ -367,183 +410,194 @@ $.extend(erpnext.utils, {
// check if payments app is installed on site, if not warn user.
check_payments_app: () => {
if (frappe.boot.versions && !frappe.boot.versions.payments) {
- const marketplace_link = 'Marketplace '
- const github_link = 'GitHub '
- const msg = __("payments app is not installed. Please install it from {0} or {1}", [marketplace_link, github_link])
+ const marketplace_link =
+ 'Marketplace ';
+ const github_link = 'GitHub ';
+ const msg = __("payments app is not installed. Please install it from {0} or {1}", [
+ marketplace_link,
+ github_link,
+ ]);
frappe.msgprint(msg);
}
-
},
pick_serial_and_batch_bundle(frm, cdt, cdn, type_of_transaction, warehouse_field) {
let item_row = frappe.get_doc(cdt, cdn);
item_row.type_of_transaction = type_of_transaction;
- frappe.db.get_value("Item", item_row.item_code, ["has_batch_no", "has_serial_no"])
- .then((r) => {
- item_row.has_batch_no = r.message.has_batch_no;
- item_row.has_serial_no = r.message.has_serial_no;
-
- frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
- new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
- if (r) {
- let update_values = {
- "serial_and_batch_bundle": r.name,
- "qty": Math.abs(r.total_qty)
- }
+ frappe.db.get_value("Item", item_row.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
+ item_row.has_batch_no = r.message.has_batch_no;
+ item_row.has_serial_no = r.message.has_serial_no;
- if (!warehouse_field) {
- warehouse_field = "warehouse";
- }
+ frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function () {
+ new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
+ if (r) {
+ let update_values = {
+ serial_and_batch_bundle: r.name,
+ qty: Math.abs(r.total_qty),
+ };
- if (r.warehouse) {
- update_values[warehouse_field] = r.warehouse;
- }
+ if (!warehouse_field) {
+ warehouse_field = "warehouse";
+ }
- frappe.model.set_value(item_row.doctype, item_row.name, update_values);
+ if (r.warehouse) {
+ update_values[warehouse_field] = r.warehouse;
}
- });
+
+ frappe.model.set_value(item_row.doctype, item_row.name, update_values);
+ }
});
+ });
});
},
- get_fiscal_year: function(date, with_dates=false, boolean=false) {
- if(!date) {
+ get_fiscal_year: function (date, with_dates = false, boolean = false) {
+ if (!date) {
date = frappe.datetime.get_today();
}
- let fiscal_year = '';
+ let fiscal_year = "";
frappe.call({
method: "erpnext.accounts.utils.get_fiscal_year",
args: {
date: date,
- boolean: boolean
+ boolean: boolean,
},
async: false,
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- if (with_dates)
- fiscal_year = r.message;
- else
- fiscal_year = r.message[0];
+ if (with_dates) fiscal_year = r.message;
+ else fiscal_year = r.message[0];
}
- }
+ },
});
return fiscal_year;
- }
+ },
});
-erpnext.utils.select_alternate_items = function(opts) {
+erpnext.utils.select_alternate_items = function (opts) {
const frm = opts.frm;
- const warehouse_field = opts.warehouse_field || 'warehouse';
- const item_field = opts.item_field || 'item_code';
+ const warehouse_field = opts.warehouse_field || "warehouse";
+ const item_field = opts.item_field || "item_code";
this.data = [];
const dialog = new frappe.ui.Dialog({
title: __("Select Alternate Item"),
fields: [
- {fieldtype:'Section Break', label: __('Items')},
+ { fieldtype: "Section Break", label: __("Items") },
{
- fieldname: "alternative_items", fieldtype: "Table", cannot_add_rows: true,
- in_place_edit: true, data: this.data,
+ fieldname: "alternative_items",
+ fieldtype: "Table",
+ cannot_add_rows: true,
+ in_place_edit: true,
+ data: this.data,
get_data: () => {
return this.data;
},
- fields: [{
- fieldtype:'Data',
- fieldname:"docname",
- hidden: 1
- }, {
- fieldtype:'Link',
- fieldname:"item_code",
- options: 'Item',
- in_list_view: 1,
- read_only: 1,
- label: __('Item Code')
- }, {
- fieldtype:'Link',
- fieldname:"alternate_item",
- options: 'Item',
- default: "",
- in_list_view: 1,
- label: __('Alternate Item'),
- onchange: function() {
- const item_code = this.get_value();
- const warehouse = this.grid_row.on_grid_fields_dict.warehouse.get_value();
- if (item_code && warehouse) {
- frappe.call({
- method: "erpnext.stock.utils.get_latest_stock_qty",
- args: {
- item_code: item_code,
- warehouse: warehouse
- },
- callback: (r) => {
- this.grid_row.on_grid_fields_dict
- .actual_qty.set_value(r.message || 0);
- }
- })
- }
+ fields: [
+ {
+ fieldtype: "Data",
+ fieldname: "docname",
+ hidden: 1,
},
- get_query: (e) => {
- return {
- query: "erpnext.stock.doctype.item_alternative.item_alternative.get_alternative_items",
- filters: {
- item_code: e.item_code
+ {
+ fieldtype: "Link",
+ fieldname: "item_code",
+ options: "Item",
+ in_list_view: 1,
+ read_only: 1,
+ label: __("Item Code"),
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "alternate_item",
+ options: "Item",
+ default: "",
+ in_list_view: 1,
+ label: __("Alternate Item"),
+ onchange: function () {
+ const item_code = this.get_value();
+ const warehouse = this.grid_row.on_grid_fields_dict.warehouse.get_value();
+ if (item_code && warehouse) {
+ frappe.call({
+ method: "erpnext.stock.utils.get_latest_stock_qty",
+ args: {
+ item_code: item_code,
+ warehouse: warehouse,
+ },
+ callback: (r) => {
+ this.grid_row.on_grid_fields_dict.actual_qty.set_value(
+ r.message || 0
+ );
+ },
+ });
}
- };
- }
- }, {
- fieldtype:'Link',
- fieldname:"warehouse",
- options: 'Warehouse',
- default: "",
- in_list_view: 1,
- label: __('Warehouse'),
- onchange: function() {
- const warehouse = this.get_value();
- const item_code = this.grid_row.on_grid_fields_dict.item_code.get_value();
- if (item_code && warehouse) {
- frappe.call({
- method: "erpnext.stock.utils.get_latest_stock_qty",
- args: {
- item_code: item_code,
- warehouse: warehouse
+ },
+ get_query: (e) => {
+ return {
+ query: "erpnext.stock.doctype.item_alternative.item_alternative.get_alternative_items",
+ filters: {
+ item_code: e.item_code,
},
- callback: (r) => {
- this.grid_row.on_grid_fields_dict
- .actual_qty.set_value(r.message || 0);
- }
- })
- }
+ };
+ },
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "warehouse",
+ options: "Warehouse",
+ default: "",
+ in_list_view: 1,
+ label: __("Warehouse"),
+ onchange: function () {
+ const warehouse = this.get_value();
+ const item_code = this.grid_row.on_grid_fields_dict.item_code.get_value();
+ if (item_code && warehouse) {
+ frappe.call({
+ method: "erpnext.stock.utils.get_latest_stock_qty",
+ args: {
+ item_code: item_code,
+ warehouse: warehouse,
+ },
+ callback: (r) => {
+ this.grid_row.on_grid_fields_dict.actual_qty.set_value(
+ r.message || 0
+ );
+ },
+ });
+ }
+ },
},
- }, {
- fieldtype:'Float',
- fieldname:"actual_qty",
- default: 0,
- read_only: 1,
- in_list_view: 1,
- label: __('Available Qty')
- }]
+ {
+ fieldtype: "Float",
+ fieldname: "actual_qty",
+ default: 0,
+ read_only: 1,
+ in_list_view: 1,
+ label: __("Available Qty"),
+ },
+ ],
},
],
- primary_action: function() {
+ primary_action: function () {
const args = this.get_values()["alternative_items"];
- const alternative_items = args.filter(d => {
+ const alternative_items = args.filter((d) => {
if (d.alternate_item && d.item_code != d.alternate_item) {
return true;
}
});
- alternative_items.forEach(d => {
+ alternative_items.forEach((d) => {
let row = frappe.get_doc(opts.child_doctype, d.docname);
let qty = null;
- if (row.doctype === 'Work Order Item') {
+ if (row.doctype === "Work Order Item") {
qty = row.required_qty;
} else {
qty = row.qty;
}
row[item_field] = d.alternate_item;
- frappe.model.set_value(row.doctype, row.name, 'qty', qty);
+ frappe.model.set_value(row.doctype, row.name, "qty", qty);
frappe.model.set_value(row.doctype, row.name, opts.original_item_field, d.item_code);
frm.trigger(item_field, row.doctype, row.name);
});
@@ -551,174 +605,187 @@ erpnext.utils.select_alternate_items = function(opts) {
refresh_field(opts.child_docname);
this.hide();
},
- primary_action_label: __('Update')
+ primary_action_label: __("Update"),
});
- frm.doc[opts.child_docname].forEach(d => {
+ frm.doc[opts.child_docname].forEach((d) => {
if (!opts.condition || opts.condition(d)) {
dialog.fields_dict.alternative_items.df.data.push({
- "docname": d.name,
- "item_code": d[item_field],
- "warehouse": d[warehouse_field],
- "actual_qty": d.actual_qty
+ docname: d.name,
+ item_code: d[item_field],
+ warehouse: d[warehouse_field],
+ actual_qty: d.actual_qty,
});
}
- })
+ });
this.data = dialog.fields_dict.alternative_items.df.data;
dialog.fields_dict.alternative_items.grid.refresh();
dialog.show();
-}
+};
-erpnext.utils.update_child_items = function(opts) {
+erpnext.utils.update_child_items = function (opts) {
const frm = opts.frm;
- const cannot_add_row = (typeof opts.cannot_add_row === 'undefined') ? true : opts.cannot_add_row;
- const child_docname = (typeof opts.cannot_add_row === 'undefined') ? "items" : opts.child_docname;
+ const cannot_add_row = typeof opts.cannot_add_row === "undefined" ? true : opts.cannot_add_row;
+ const child_docname = typeof opts.cannot_add_row === "undefined" ? "items" : opts.child_docname;
const child_meta = frappe.get_meta(`${frm.doc.doctype} Item`);
const has_reserved_stock = opts.has_reserved_stock ? true : false;
- const get_precision = (fieldname) => child_meta.fields.find(f => f.fieldname == fieldname).precision;
+ const get_precision = (fieldname) => child_meta.fields.find((f) => f.fieldname == fieldname).precision;
this.data = frm.doc[opts.child_docname].map((d) => {
return {
- "docname": d.name,
- "name": d.name,
- "item_code": d.item_code,
- "delivery_date": d.delivery_date,
- "schedule_date": d.schedule_date,
- "conversion_factor": d.conversion_factor,
- "qty": d.qty,
- "rate": d.rate,
- "uom": d.uom,
- "fg_item": d.fg_item,
- "fg_item_qty": d.fg_item_qty,
- }
+ docname: d.name,
+ name: d.name,
+ item_code: d.item_code,
+ delivery_date: d.delivery_date,
+ schedule_date: d.schedule_date,
+ conversion_factor: d.conversion_factor,
+ qty: d.qty,
+ rate: d.rate,
+ uom: d.uom,
+ fg_item: d.fg_item,
+ fg_item_qty: d.fg_item_qty,
+ };
});
- const fields = [{
- fieldtype:'Data',
- fieldname:"docname",
- read_only: 1,
- hidden: 1,
- }, {
- fieldtype:'Link',
- fieldname:"item_code",
- options: 'Item',
- in_list_view: 1,
- read_only: 0,
- disabled: 0,
- label: __('Item Code'),
- get_query: function() {
- let filters;
- if (frm.doc.doctype == 'Sales Order') {
- filters = {"is_sales_item": 1};
- } else if (frm.doc.doctype == 'Purchase Order') {
- if (frm.doc.is_subcontracted) {
- if (frm.doc.is_old_subcontracting_flow) {
- filters = {"is_sub_contracted_item": 1};
+ const fields = [
+ {
+ fieldtype: "Data",
+ fieldname: "docname",
+ read_only: 1,
+ hidden: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "item_code",
+ options: "Item",
+ in_list_view: 1,
+ read_only: 0,
+ disabled: 0,
+ label: __("Item Code"),
+ get_query: function () {
+ let filters;
+ if (frm.doc.doctype == "Sales Order") {
+ filters = { is_sales_item: 1 };
+ } else if (frm.doc.doctype == "Purchase Order") {
+ if (frm.doc.is_subcontracted) {
+ if (frm.doc.is_old_subcontracting_flow) {
+ filters = { is_sub_contracted_item: 1 };
+ } else {
+ filters = { is_stock_item: 0 };
+ }
} else {
- filters = {"is_stock_item": 0};
+ filters = { is_purchase_item: 1 };
}
- } else {
- filters = {"is_purchase_item": 1};
}
- }
- return {
- query: "erpnext.controllers.queries.item_query",
- filters: filters
- };
- }
- }, {
- fieldtype:'Link',
- fieldname:'uom',
- options: 'UOM',
- read_only: 0,
- label: __('UOM'),
- reqd: 1,
- onchange: function () {
- frappe.call({
- method: "erpnext.stock.get_item_details.get_conversion_factor",
- args: { item_code: this.doc.item_code, uom: this.value },
- callback: r => {
- if(!r.exc) {
- if (this.doc.conversion_factor == r.message.conversion_factor) return;
-
- const docname = this.doc.docname;
- dialog.fields_dict.trans_items.df.data.some(doc => {
- if (doc.docname == docname) {
- doc.conversion_factor = r.message.conversion_factor;
- dialog.fields_dict.trans_items.grid.refresh();
- return true;
- }
- })
- }
- }
- });
- }
- }, {
- fieldtype:'Float',
- fieldname:"qty",
- default: 0,
- read_only: 0,
- in_list_view: 1,
- label: __('Qty'),
- precision: get_precision("qty")
- }, {
- fieldtype:'Currency',
- fieldname:"rate",
- options: "currency",
- default: 0,
- read_only: 0,
- in_list_view: 1,
- label: __('Rate'),
- precision: get_precision("rate")
- }];
-
- if (frm.doc.doctype == 'Sales Order' || frm.doc.doctype == 'Purchase Order' ) {
+ return {
+ query: "erpnext.controllers.queries.item_query",
+ filters: filters,
+ };
+ },
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "uom",
+ options: "UOM",
+ read_only: 0,
+ label: __("UOM"),
+ reqd: 1,
+ onchange: function () {
+ frappe.call({
+ method: "erpnext.stock.get_item_details.get_conversion_factor",
+ args: { item_code: this.doc.item_code, uom: this.value },
+ callback: (r) => {
+ if (!r.exc) {
+ if (this.doc.conversion_factor == r.message.conversion_factor) return;
+
+ const docname = this.doc.docname;
+ dialog.fields_dict.trans_items.df.data.some((doc) => {
+ if (doc.docname == docname) {
+ doc.conversion_factor = r.message.conversion_factor;
+ dialog.fields_dict.trans_items.grid.refresh();
+ return true;
+ }
+ });
+ }
+ },
+ });
+ },
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "qty",
+ default: 0,
+ read_only: 0,
+ in_list_view: 1,
+ label: __("Qty"),
+ precision: get_precision("qty"),
+ },
+ {
+ fieldtype: "Currency",
+ fieldname: "rate",
+ options: "currency",
+ default: 0,
+ read_only: 0,
+ in_list_view: 1,
+ label: __("Rate"),
+ precision: get_precision("rate"),
+ },
+ ];
+
+ if (frm.doc.doctype == "Sales Order" || frm.doc.doctype == "Purchase Order") {
fields.splice(2, 0, {
- fieldtype: 'Date',
- fieldname: frm.doc.doctype == 'Sales Order' ? "delivery_date" : "schedule_date",
+ fieldtype: "Date",
+ fieldname: frm.doc.doctype == "Sales Order" ? "delivery_date" : "schedule_date",
in_list_view: 1,
- label: frm.doc.doctype == 'Sales Order' ? __("Delivery Date") : __("Reqd by date"),
- default: frm.doc.doctype == 'Sales Order' ? frm.doc.delivery_date : frm.doc.schedule_date,
- reqd: 1
- })
+ label: frm.doc.doctype == "Sales Order" ? __("Delivery Date") : __("Reqd by date"),
+ default: frm.doc.doctype == "Sales Order" ? frm.doc.delivery_date : frm.doc.schedule_date,
+ reqd: 1,
+ });
fields.splice(3, 0, {
- fieldtype: 'Float',
+ fieldtype: "Float",
fieldname: "conversion_factor",
label: __("Conversion Factor"),
- precision: get_precision('conversion_factor')
- })
+ precision: get_precision("conversion_factor"),
+ });
}
- if (frm.doc.doctype == 'Purchase Order' && frm.doc.is_subcontracted && !frm.doc.is_old_subcontracting_flow) {
- fields.push({
- fieldtype:'Link',
- fieldname:'fg_item',
- options: 'Item',
- reqd: 1,
- in_list_view: 0,
- read_only: 0,
- disabled: 0,
- label: __('Finished Good Item'),
- get_query: () => {
- return {
- filters: {
- 'is_stock_item': 1,
- 'is_sub_contracted_item': 1,
- 'default_bom': ['!=', '']
- }
- }
+ if (
+ frm.doc.doctype == "Purchase Order" &&
+ frm.doc.is_subcontracted &&
+ !frm.doc.is_old_subcontracting_flow
+ ) {
+ fields.push(
+ {
+ fieldtype: "Link",
+ fieldname: "fg_item",
+ options: "Item",
+ reqd: 1,
+ in_list_view: 0,
+ read_only: 0,
+ disabled: 0,
+ label: __("Finished Good Item"),
+ get_query: () => {
+ return {
+ filters: {
+ is_stock_item: 1,
+ is_sub_contracted_item: 1,
+ default_bom: ["!=", ""],
+ },
+ };
+ },
},
- }, {
- fieldtype:'Float',
- fieldname:'fg_item_qty',
- reqd: 1,
- default: 0,
- read_only: 0,
- in_list_view: 0,
- label: __('Finished Good Item Qty'),
- precision: get_precision('fg_item_qty')
- })
+ {
+ fieldtype: "Float",
+ fieldname: "fg_item_qty",
+ reqd: 1,
+ default: 0,
+ read_only: 0,
+ in_list_view: 0,
+ label: __("Finished Good Item Qty"),
+ precision: get_precision("fg_item_qty"),
+ }
+ );
}
let dialog = new frappe.ui.Dialog({
@@ -736,99 +803,97 @@ erpnext.utils.update_child_items = function(opts) {
get_data: () => {
return this.data;
},
- fields: fields
+ fields: fields,
},
],
- primary_action: function() {
+ primary_action: function () {
if (frm.doctype == "Sales Order" && has_reserved_stock) {
this.hide();
frappe.confirm(
- __('The reserved stock will be released when you update items. Are you certain you wish to proceed?'),
- () => this.update_items(),
- )
+ __(
+ "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
+ ),
+ () => this.update_items()
+ );
} else {
this.update_items();
}
},
- update_items: function() {
+ update_items: function () {
const trans_items = this.get_values()["trans_items"].filter((item) => !!item.item_code);
frappe.call({
- method: 'erpnext.controllers.accounts_controller.update_child_qty_rate',
+ method: "erpnext.controllers.accounts_controller.update_child_qty_rate",
freeze: true,
args: {
- 'parent_doctype': frm.doc.doctype,
- 'trans_items': trans_items,
- 'parent_doctype_name': frm.doc.name,
- 'child_docname': child_docname
+ parent_doctype: frm.doc.doctype,
+ trans_items: trans_items,
+ parent_doctype_name: frm.doc.name,
+ child_docname: child_docname,
},
- callback: function() {
+ callback: function () {
frm.reload_doc();
- }
+ },
});
this.hide();
refresh_field("items");
},
- primary_action_label: __('Update')
- })
+ primary_action_label: __("Update"),
+ });
dialog.show();
-}
-
-
-
+};
-erpnext.utils.map_current_doc = function(opts) {
+erpnext.utils.map_current_doc = function (opts) {
function _map() {
- if($.isArray(cur_frm.doc.items) && cur_frm.doc.items.length > 0) {
+ if ($.isArray(cur_frm.doc.items) && cur_frm.doc.items.length > 0) {
// remove first item row if empty
- if(!cur_frm.doc.items[0].item_code) {
+ if (!cur_frm.doc.items[0].item_code) {
cur_frm.doc.items = cur_frm.doc.items.splice(1);
}
// find the doctype of the items table
- var items_doctype = frappe.meta.get_docfield(cur_frm.doctype, 'items').options;
+ var items_doctype = frappe.meta.get_docfield(cur_frm.doctype, "items").options;
// find the link fieldname from items table for the given
// source_doctype
var link_fieldname = null;
- frappe.get_meta(items_doctype).fields.forEach(function(d) {
- if(d.options===opts.source_doctype) link_fieldname = d.fieldname; });
+ frappe.get_meta(items_doctype).fields.forEach(function (d) {
+ if (d.options === opts.source_doctype) link_fieldname = d.fieldname;
+ });
// search in existing items if the source_name is already set and full qty fetched
var already_set = false;
var item_qty_map = {};
- $.each(cur_frm.doc.items, function(i, d) {
- opts.source_name.forEach(function(src) {
- if(d[link_fieldname]==src) {
+ $.each(cur_frm.doc.items, function (i, d) {
+ opts.source_name.forEach(function (src) {
+ if (d[link_fieldname] == src) {
already_set = true;
- if (item_qty_map[d.item_code])
- item_qty_map[d.item_code] += flt(d.qty);
- else
- item_qty_map[d.item_code] = flt(d.qty);
+ if (item_qty_map[d.item_code]) item_qty_map[d.item_code] += flt(d.qty);
+ else item_qty_map[d.item_code] = flt(d.qty);
}
});
});
- if(already_set) {
- opts.source_name.forEach(function(src) {
- frappe.model.with_doc(opts.source_doctype, src, function(r) {
+ if (already_set) {
+ opts.source_name.forEach(function (src) {
+ frappe.model.with_doc(opts.source_doctype, src, function (r) {
var source_doc = frappe.model.get_doc(opts.source_doctype, src);
- $.each(source_doc.items || [], function(i, row) {
- if(row.qty > flt(item_qty_map[row.item_code])) {
+ $.each(source_doc.items || [], function (i, row) {
+ if (row.qty > flt(item_qty_map[row.item_code])) {
already_set = false;
return false;
}
- })
- })
+ });
+ });
- if(already_set) {
- frappe.msgprint(__("You have already selected items from {0} {1}",
- [opts.source_doctype, src]));
+ if (already_set) {
+ frappe.msgprint(
+ __("You have already selected items from {0} {1}", [opts.source_doctype, src])
+ );
return;
}
-
- })
+ });
}
}
@@ -836,22 +901,22 @@ erpnext.utils.map_current_doc = function(opts) {
// Sometimes we hit the limit for URL length of a GET request
// as we send the full target_doc. Hence this is a POST request.
type: "POST",
- method: 'frappe.model.mapper.map_docs',
+ method: "frappe.model.mapper.map_docs",
args: {
- "method": opts.method,
- "source_names": opts.source_name,
- "target_doc": cur_frm.doc,
- "args": opts.args
+ method: opts.method,
+ source_names: opts.source_name,
+ target_doc: cur_frm.doc,
+ args: opts.args,
},
freeze: true,
freeze_message: __("Mapping {0} ...", [opts.source_doctype]),
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
frappe.model.sync(r.message);
cur_frm.dirty();
cur_frm.refresh();
}
- }
+ },
});
}
@@ -870,11 +935,11 @@ erpnext.utils.map_current_doc = function(opts) {
if (opts.source_doctype) {
let data_fields = [];
- if(opts.source_doctype == "Purchase Receipt") {
+ if (opts.source_doctype == "Purchase Receipt") {
data_fields.push({
- fieldname: 'merge_taxes',
- fieldtype: 'Check',
- label: __('Merge taxes from multiple documents'),
+ fieldname: "merge_taxes",
+ fieldtype: "Check",
+ label: __("Merge taxes from multiple documents"),
});
}
const d = new frappe.ui.form.MultiSelectDialog({
@@ -889,10 +954,10 @@ erpnext.utils.map_current_doc = function(opts) {
child_fieldname: opts.child_fieldname,
child_columns: opts.child_columns,
size: opts.size,
- action: function(selections, args) {
+ action: function (selections, args) {
let values = selections;
if (values.length === 0) {
- frappe.msgprint(__("Please select {0}", [opts.source_doctype]))
+ frappe.msgprint(__("Please select {0}", [opts.source_doctype]));
return;
}
opts.source_name = values;
@@ -912,11 +977,11 @@ erpnext.utils.map_current_doc = function(opts) {
opts.source_name = [opts.source_name];
_map();
}
-}
+};
-frappe.form.link_formatters['Item'] = function(value, doc) {
+frappe.form.link_formatters["Item"] = function (value, doc) {
if (doc && value && doc.item_name && doc.item_name !== value && doc.item_code === value) {
- return value + ': ' + doc.item_name;
+ return value + ": " + doc.item_name;
} else if (!value && doc.doctype && doc.item_name) {
// format blank value in child table
return doc.item_name;
@@ -924,11 +989,11 @@ frappe.form.link_formatters['Item'] = function(value, doc) {
// if value is blank in report view or item code and name are the same, return as is
return value;
}
-}
+};
-frappe.form.link_formatters['Employee'] = function(value, doc) {
+frappe.form.link_formatters["Employee"] = function (value, doc) {
if (doc && value && doc.employee_name && doc.employee_name !== value && doc.employee === value) {
- return value + ': ' + doc.employee_name;
+ return value + ": " + doc.employee_name;
} else if (!value && doc.doctype && doc.employee_name) {
// format blank value in child table
return doc.employee;
@@ -936,11 +1001,11 @@ frappe.form.link_formatters['Employee'] = function(value, doc) {
// if value is blank in report view or project name and name are the same, return as is
return value;
}
-}
+};
-frappe.form.link_formatters['Project'] = function(value, doc) {
+frappe.form.link_formatters["Project"] = function (value, doc) {
if (doc && value && doc.project_name && doc.project_name !== value && doc.project === value) {
- return value + ': ' + doc.project_name;
+ return value + ": " + doc.project_name;
} else if (!value && doc.doctype && doc.project_name) {
// format blank value in child table
return doc.project;
@@ -951,64 +1016,74 @@ frappe.form.link_formatters['Project'] = function(value, doc) {
};
// add description on posting time
-$(document).on('app_ready', function() {
- if(!frappe.datetime.is_timezone_same()) {
- $.each(["Stock Reconciliation", "Stock Entry", "Stock Ledger Entry",
- "Delivery Note", "Purchase Receipt", "Sales Invoice"], function(i, d) {
- frappe.ui.form.on(d, "onload", function(frm) {
- cur_frm.set_df_property("posting_time", "description",
- frappe.sys_defaults.time_zone);
- });
- });
+$(document).on("app_ready", function () {
+ if (!frappe.datetime.is_timezone_same()) {
+ $.each(
+ [
+ "Stock Reconciliation",
+ "Stock Entry",
+ "Stock Ledger Entry",
+ "Delivery Note",
+ "Purchase Receipt",
+ "Sales Invoice",
+ ],
+ function (i, d) {
+ frappe.ui.form.on(d, "onload", function (frm) {
+ cur_frm.set_df_property("posting_time", "description", frappe.sys_defaults.time_zone);
+ });
+ }
+ );
}
});
// Show SLA dashboard
-$(document).on('app_ready', function() {
- $.each(frappe.boot.service_level_agreement_doctypes, function(_i, d) {
+$(document).on("app_ready", function () {
+ $.each(frappe.boot.service_level_agreement_doctypes, function (_i, d) {
frappe.ui.form.on(d, {
- onload: function(frm) {
- if (!frm.doc.service_level_agreement)
- return;
+ onload: function (frm) {
+ if (!frm.doc.service_level_agreement) return;
frappe.call({
- method: 'erpnext.support.doctype.service_level_agreement.service_level_agreement.get_service_level_agreement_filters',
+ method: "erpnext.support.doctype.service_level_agreement.service_level_agreement.get_service_level_agreement_filters",
args: {
doctype: frm.doc.doctype,
name: frm.doc.service_level_agreement,
- customer: frm.doc.customer
+ customer: frm.doc.customer,
},
callback: function (r) {
if (r && r.message) {
- frm.set_query('priority', function() {
+ frm.set_query("priority", function () {
return {
filters: {
- 'name': ['in', r.message.priority],
- }
+ name: ["in", r.message.priority],
+ },
};
});
- frm.set_query('service_level_agreement', function() {
+ frm.set_query("service_level_agreement", function () {
return {
filters: {
- 'name': ['in', r.message.service_level_agreements],
- }
+ name: ["in", r.message.service_level_agreements],
+ },
};
});
}
- }
+ },
});
},
- refresh: function(frm) {
- if (frm.doc.status !== 'Closed' && frm.doc.service_level_agreement
- && ['First Response Due', 'Resolution Due'].includes(frm.doc.agreement_status)) {
+ refresh: function (frm) {
+ if (
+ frm.doc.status !== "Closed" &&
+ frm.doc.service_level_agreement &&
+ ["First Response Due", "Resolution Due"].includes(frm.doc.agreement_status)
+ ) {
frappe.call({
- 'method': 'frappe.client.get',
+ method: "frappe.client.get",
args: {
- doctype: 'Service Level Agreement',
- name: frm.doc.service_level_agreement
+ doctype: "Service Level Agreement",
+ name: frm.doc.service_level_agreement,
},
- callback: function(data) {
+ callback: function (data) {
let statuses = data.message.pause_sla_on;
const hold_statuses = [];
$.each(statuses, (_i, entry) => {
@@ -1016,32 +1091,46 @@ $(document).on('app_ready', function() {
});
if (hold_statuses.includes(frm.doc.status)) {
frm.dashboard.clear_headline();
- let message = {'indicator': 'orange', 'msg': __('SLA is on hold since {0}', [moment(frm.doc.on_hold_since).fromNow(true)])};
+ let message = {
+ indicator: "orange",
+ msg: __("SLA is on hold since {0}", [
+ moment(frm.doc.on_hold_since).fromNow(true),
+ ]),
+ };
frm.dashboard.set_headline_alert(
'' +
'
' +
- ''+ message.msg +'
' +
- '
' +
+ message.msg +
+ " ' +
'
' +
- ''+ agreement_status.msg +'
' +
- '
' +
+ agreement_status.msg +
+ " ").css({"margin-bottom": "10px", "margin-top": "10px"})
- .appendTo(append_loction);
- let $btn = $(`
${inner_text} `)
- .appendTo($btn_div);
+ let $btn_div = $("
").css({ "margin-bottom": "10px", "margin-top": "10px" }).appendTo(append_loction);
+ let $btn = $(`
${inner_text} `).appendTo($btn_div);
- $btn.on("click", function() {
+ $btn.on("click", function () {
context.show_serial_batch_selector(grid_row.frm, grid_row.doc, "", "", true);
});
}
diff --git a/erpnext/public/js/utils/barcode_scanner.js b/erpnext/public/js/utils/barcode_scanner.js
index 4d1c0c1ad3de..d6ef7944cee0 100644
--- a/erpnext/public/js/utils/barcode_scanner.js
+++ b/erpnext/public/js/utils/barcode_scanner.js
@@ -58,13 +58,15 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
return;
}
- me.update_table(data).then(row => {
- this.play_success_sound();
- resolve(row);
- }).catch(() => {
- this.play_fail_sound();
- reject();
- });
+ me.update_table(data)
+ .then((row) => {
+ this.play_success_sound();
+ resolve(row);
+ })
+ .catch(() => {
+ this.play_fail_sound();
+ reject();
+ });
});
});
}
@@ -87,7 +89,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
frappe.flags.trigger_from_barcode_scanner = true;
- const {item_code, barcode, batch_no, serial_no, uom} = data;
+ const { item_code, barcode, batch_no, serial_no, uom } = data;
let row = this.get_row_to_modify_on_scan(item_code, batch_no, uom, barcode);
@@ -116,16 +118,17 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
frappe.run_serially([
() => this.set_selector_trigger_flag(data),
- () => this.set_item(row, item_code, barcode, batch_no, serial_no).then(qty => {
- this.show_scan_message(row.idx, row.item_code, qty);
- }),
+ () =>
+ this.set_item(row, item_code, barcode, batch_no, serial_no).then((qty) => {
+ this.show_scan_message(row.idx, row.item_code, qty);
+ }),
() => this.set_barcode_uom(row, uom),
() => this.set_serial_no(row, serial_no),
() => this.set_batch_no(row, batch_no),
() => this.set_barcode(row, barcode),
() => this.clean_up(),
() => this.revert_selector_flag(),
- () => resolve(row)
+ () => resolve(row),
]);
});
}
@@ -133,7 +136,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
// batch and serial selector is reduandant when all info can be added by scan
// this flag on item row is used by transaction.js to avoid triggering selector
set_selector_trigger_flag(data) {
- const {batch_no, serial_no, has_batch_no, has_serial_no} = data;
+ const { batch_no, serial_no, has_batch_no, has_serial_no } = data;
const require_selecting_batch = has_batch_no && !batch_no;
const require_selecting_serial = has_serial_no && !serial_no;
@@ -149,17 +152,17 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
set_item(row, item_code, barcode, batch_no, serial_no) {
- return new Promise(resolve => {
+ return new Promise((resolve) => {
const increment = async (value = 1) => {
- const item_data = {item_code: item_code, use_serial_batch_fields: 1.0};
+ const item_data = { item_code: item_code, use_serial_batch_fields: 1.0 };
frappe.flags.trigger_from_barcode_scanner = true;
- item_data[this.qty_field] = Number((row[this.qty_field] || 0)) + Number(value);
+ item_data[this.qty_field] = Number(row[this.qty_field] || 0) + Number(value);
await frappe.model.set_value(row.doctype, row.name, item_data);
return value;
};
if (this.prompt_qty) {
- frappe.prompt(__("Please enter quantity for item {0}", [item_code]), ({value}) => {
+ frappe.prompt(__("Please enter quantity for item {0}", [item_code]), ({ value }) => {
increment(value).then((value) => resolve(value));
});
} else if (this.frm.has_items) {
@@ -175,14 +178,15 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
this.dialog = new frappe.ui.Dialog({
title: __("Scan barcode for item {0}", [item_code]),
fields: me.get_fields_for_dialog(row, item_code, barcode, batch_no, serial_no),
- })
+ });
this.dialog.set_primary_action(__("Update"), () => {
- const item_data = {item_code: item_code};
+ const item_data = { item_code: item_code };
item_data[this.qty_field] = this.dialog.get_value("scanned_qty");
item_data["has_item_scanned"] = 1;
- this.remaining_qty = flt(this.dialog.get_value("qty")) - flt(this.dialog.get_value("scanned_qty"));
+ this.remaining_qty =
+ flt(this.dialog.get_value("qty")) - flt(this.dialog.get_value("scanned_qty"));
frappe.model.set_value(row.doctype, row.name, item_data);
frappe.run_serially([
@@ -190,7 +194,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
() => this.set_barcode(row, this.dialog.get_value("barcode")),
() => this.set_serial_no(row, this.dialog.get_value("serial_no")),
() => this.add_child_for_remaining_qty(row),
- () => this.clean_up()
+ () => this.clean_up(),
]);
this.dialog.hide();
@@ -219,9 +223,9 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (r.message) {
this.update_dialog_values(item_code, r);
}
- })
+ });
}
- }
+ },
},
{
fieldtype: "Section Break",
@@ -245,8 +249,8 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
},
{
fieldtype: "Section Break",
- }
- ]
+ },
+ ];
if (batch_no) {
fields.push({
@@ -256,7 +260,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
label: __("Batch No"),
default: batch_no,
read_only: 1,
- hidden: 1
+ hidden: 1,
});
}
@@ -278,7 +282,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
label: __("Barcode"),
default: barcode,
read_only: 1,
- hidden: 1
+ hidden: 1,
});
}
@@ -286,18 +290,18 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
update_dialog_values(scanned_item, r) {
- const {item_code, barcode, batch_no, serial_no} = r.message;
+ const { item_code, barcode, batch_no, serial_no } = r.message;
this.dialog.set_value("barcode_scanner", "");
- if (item_code === scanned_item &&
- (this.dialog.get_value("barcode") === barcode || batch_no || serial_no)) {
-
+ if (
+ item_code === scanned_item &&
+ (this.dialog.get_value("barcode") === barcode || batch_no || serial_no)
+ ) {
if (batch_no) {
this.dialog.set_value("batch_no", batch_no);
}
if (serial_no) {
-
this.validate_duplicate_serial_no(serial_no);
let serial_nos = this.dialog.get_value("serial_no") + "\n" + serial_no;
this.dialog.set_value("serial_no", serial_nos);
@@ -309,8 +313,9 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
validate_duplicate_serial_no(serial_no) {
- let serial_nos = this.dialog.get_value("serial_no") ?
- this.dialog.get_value("serial_no").split("\n") : [];
+ let serial_nos = this.dialog.get_value("serial_no")
+ ? this.dialog.get_value("serial_no").split("\n")
+ : [];
if (in_list(serial_nos, serial_no)) {
frappe.throw(__("Serial No {0} already scanned", [serial_no]));
@@ -318,12 +323,19 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
}
add_child_for_remaining_qty(prev_row) {
- if (this.remaining_qty && this.remaining_qty >0) {
+ if (this.remaining_qty && this.remaining_qty > 0) {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
let row = frappe.model.add_child(this.frm.doc, cur_grid.doctype, this.items_table_name);
- let ignore_fields = ["name", "idx", "batch_no", "barcode",
- "received_qty", "serial_no", "has_item_scanned"];
+ let ignore_fields = [
+ "name",
+ "idx",
+ "batch_no",
+ "barcode",
+ "received_qty",
+ "serial_no",
+ "has_item_scanned",
+ ];
for (let key in prev_row) {
if (in_list(ignore_fields, key)) {
@@ -379,7 +391,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
if (exist) {
this.show_alert(__("Row #{0}: Qty increased by {1}", [idx, qty]), "green");
} else {
- this.show_alert(__("Row #{0}: Item added", [idx]), "green")
+ this.show_alert(__("Row #{0}: Item added", [idx]), "green");
}
}
@@ -401,17 +413,19 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
const matching_row = (row) => {
const item_match = row.item_code == item_code;
- const batch_match = (!row[this.batch_no_field] || row[this.batch_no_field] == batch_no);
+ const batch_match = !row[this.batch_no_field] || row[this.batch_no_field] == batch_no;
const uom_match = !uom || row[this.uom_field] == uom;
const qty_in_limit = flt(row[this.qty_field]) < flt(row[this.max_qty_field]);
const item_scanned = row.has_item_scanned;
- return item_match
- && uom_match
- && !item_scanned
- && (!is_batch_no_scan || batch_match)
- && (!check_max_qty || qty_in_limit)
- }
+ return (
+ item_match &&
+ uom_match &&
+ !item_scanned &&
+ (!is_batch_no_scan || batch_match) &&
+ (!check_max_qty || qty_in_limit)
+ );
+ };
return this.items_table.find(matching_row) || this.get_existing_blank_row();
}
@@ -432,7 +446,7 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
this.scan_barcode_field.set_value("");
refresh_field(this.items_table_name);
}
- show_alert(msg, indicator, duration=3) {
- frappe.show_alert({message: msg, indicator: indicator}, duration);
+ show_alert(msg, indicator, duration = 3) {
+ frappe.show_alert({ message: msg, indicator: indicator }, duration);
}
-};
\ No newline at end of file
+};
diff --git a/erpnext/public/js/utils/contact_address_quick_entry.js b/erpnext/public/js/utils/contact_address_quick_entry.js
index adabf08c2036..2f61dee19946 100644
--- a/erpnext/public/js/utils/contact_address_quick_entry.js
+++ b/erpnext/public/js/utils/contact_address_quick_entry.js
@@ -1,6 +1,8 @@
-frappe.provide('frappe.ui.form');
+frappe.provide("frappe.ui.form");
-frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm extends frappe.ui.form.QuickEntryForm {
+frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm extends (
+ frappe.ui.form.QuickEntryForm
+) {
constructor(doctype, after_insert, init_callback, doc, force) {
super(doctype, after_insert, init_callback, doc, force);
this.skip_redirect_on_error = true;
@@ -17,8 +19,8 @@ frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm
* Therefor, resulting in the fields being "hidden".
*/
const map_field_names = {
- "email_address": "email_id",
- "mobile_number": "mobile_no",
+ email_address: "email_id",
+ mobile_number: "mobile_no",
};
Object.entries(map_field_names).forEach(([fieldname, new_fieldname]) => {
@@ -30,71 +32,73 @@ frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm
}
get_variant_fields() {
- var variant_fields = [{
- fieldtype: "Section Break",
- label: __("Primary Contact Details"),
- collapsible: 1
- },
- {
- label: __("Email Id"),
- fieldname: "email_address",
- fieldtype: "Data",
- options: "Email",
- },
- {
- fieldtype: "Column Break"
- },
- {
- label: __("Mobile Number"),
- fieldname: "mobile_number",
- fieldtype: "Data"
- },
- {
- fieldtype: "Section Break",
- label: __("Primary Address Details"),
- collapsible: 1
- },
- {
- label: __("Address Line 1"),
- fieldname: "address_line1",
- fieldtype: "Data"
- },
- {
- label: __("Address Line 2"),
- fieldname: "address_line2",
- fieldtype: "Data"
- },
- {
- label: __("ZIP Code"),
- fieldname: "pincode",
- fieldtype: "Data"
- },
- {
- fieldtype: "Column Break"
- },
- {
- label: __("City"),
- fieldname: "city",
- fieldtype: "Data"
- },
- {
- label: __("State"),
- fieldname: "state",
- fieldtype: "Data"
- },
- {
- label: __("Country"),
- fieldname: "country",
- fieldtype: "Link",
- options: "Country"
- },
- {
- label: __("Customer POS Id"),
- fieldname: "customer_pos_id",
- fieldtype: "Data",
- hidden: 1
- }];
+ var variant_fields = [
+ {
+ fieldtype: "Section Break",
+ label: __("Primary Contact Details"),
+ collapsible: 1,
+ },
+ {
+ label: __("Email Id"),
+ fieldname: "email_address",
+ fieldtype: "Data",
+ options: "Email",
+ },
+ {
+ fieldtype: "Column Break",
+ },
+ {
+ label: __("Mobile Number"),
+ fieldname: "mobile_number",
+ fieldtype: "Data",
+ },
+ {
+ fieldtype: "Section Break",
+ label: __("Primary Address Details"),
+ collapsible: 1,
+ },
+ {
+ label: __("Address Line 1"),
+ fieldname: "address_line1",
+ fieldtype: "Data",
+ },
+ {
+ label: __("Address Line 2"),
+ fieldname: "address_line2",
+ fieldtype: "Data",
+ },
+ {
+ label: __("ZIP Code"),
+ fieldname: "pincode",
+ fieldtype: "Data",
+ },
+ {
+ fieldtype: "Column Break",
+ },
+ {
+ label: __("City"),
+ fieldname: "city",
+ fieldtype: "Data",
+ },
+ {
+ label: __("State"),
+ fieldname: "state",
+ fieldtype: "Data",
+ },
+ {
+ label: __("Country"),
+ fieldname: "country",
+ fieldtype: "Link",
+ options: "Country",
+ },
+ {
+ label: __("Customer POS Id"),
+ fieldname: "customer_pos_id",
+ fieldtype: "Data",
+ hidden: 1,
+ },
+ ];
return variant_fields;
}
-}
+};
diff --git a/erpnext/public/js/utils/crm_activities.js b/erpnext/public/js/utils/crm_activities.js
index ec79a10dfaca..a5a225458c09 100644
--- a/erpnext/public/js/utils/crm_activities.js
+++ b/erpnext/public/js/utils/crm_activities.js
@@ -6,21 +6,21 @@ erpnext.utils.CRMActivities = class CRMActivities {
refresh() {
var me = this;
$(this.open_activities_wrapper).empty();
- let cur_form_footer = this.form_wrapper.find('.form-footer');
+ let cur_form_footer = this.form_wrapper.find(".form-footer");
// all activities
- if (!$(this.all_activities_wrapper).find('.form-footer').length) {
+ if (!$(this.all_activities_wrapper).find(".form-footer").length) {
this.all_activities_wrapper.empty();
$(cur_form_footer).appendTo(this.all_activities_wrapper);
// remove frappe-control class to avoid absolute position for action-btn
- $(this.all_activities_wrapper).removeClass('frappe-control');
+ $(this.all_activities_wrapper).removeClass("frappe-control");
// hide new event button
- $('.timeline-actions').find('.btn-default').hide();
+ $(".timeline-actions").find(".btn-default").hide();
// hide new comment box
$(".comment-box").hide();
// show only communications by default
- $($('.timeline-content').find('.nav-link')[0]).tab('show');
+ $($(".timeline-content").find(".nav-link")[0]).tab("show");
}
// open activities
@@ -28,66 +28,70 @@ erpnext.utils.CRMActivities = class CRMActivities {
method: "erpnext.crm.utils.get_open_activities",
args: {
ref_doctype: this.frm.doc.doctype,
- ref_docname: this.frm.doc.name
+ ref_docname: this.frm.doc.name,
},
callback: (r) => {
if (!r.exc) {
- var activities_html = frappe.render_template('crm_activities', {
+ var activities_html = frappe.render_template("crm_activities", {
tasks: r.message.tasks,
- events: r.message.events
+ events: r.message.events,
});
$(activities_html).appendTo(me.open_activities_wrapper);
- $(".open-tasks").find(".completion-checkbox").on("click", function() {
- me.update_status(this, "ToDo");
- });
+ $(".open-tasks")
+ .find(".completion-checkbox")
+ .on("click", function () {
+ me.update_status(this, "ToDo");
+ });
- $(".open-events").find(".completion-checkbox").on("click", function() {
- me.update_status(this, "Event");
- });
+ $(".open-events")
+ .find(".completion-checkbox")
+ .on("click", function () {
+ me.update_status(this, "Event");
+ });
me.create_task();
me.create_event();
}
- }
+ },
});
}
- create_task () {
+ create_task() {
let me = this;
let _create_task = () => {
const args = {
doc: me.frm.doc,
frm: me.frm,
- title: __("New Task")
+ title: __("New Task"),
};
let composer = new frappe.views.InteractionComposer(args);
- composer.dialog.get_field('interaction_type').set_value("ToDo");
+ composer.dialog.get_field("interaction_type").set_value("ToDo");
// hide column having interaction type field
- $(composer.dialog.get_field('interaction_type').wrapper).closest('.form-column').hide();
+ $(composer.dialog.get_field("interaction_type").wrapper).closest(".form-column").hide();
// hide summary field
- $(composer.dialog.get_field('summary').wrapper).closest('.form-section').hide();
+ $(composer.dialog.get_field("summary").wrapper).closest(".form-section").hide();
};
$(".new-task-btn").click(_create_task);
}
- create_event () {
+ create_event() {
let me = this;
let _create_event = () => {
const args = {
doc: me.frm.doc,
frm: me.frm,
- title: __("New Event")
+ title: __("New Event"),
};
let composer = new frappe.views.InteractionComposer(args);
- composer.dialog.get_field('interaction_type').set_value("Event");
- $(composer.dialog.get_field('interaction_type').wrapper).hide();
+ composer.dialog.get_field("interaction_type").set_value("Event");
+ $(composer.dialog.get_field("interaction_type").wrapper).hide();
};
$(".new-event-btn").click(_create_event);
}
- async update_status (input_field, doctype) {
+ async update_status(input_field, doctype) {
let completed = $(input_field).prop("checked") ? 1 : 0;
let docname = $(input_field).attr("name");
if (completed) {
@@ -104,132 +108,129 @@ erpnext.utils.CRMNotes = class CRMNotes {
refresh() {
var me = this;
- this.notes_wrapper.find('.notes-section').remove();
+ this.notes_wrapper.find(".notes-section").remove();
let notes = this.frm.doc.notes || [];
- notes.sort(
- function(a, b) {
- return new Date(b.added_on) - new Date(a.added_on);
- }
- );
-
- let notes_html = frappe.render_template(
- 'crm_notes',
- {
- notes: notes
- }
- );
+ notes.sort(function (a, b) {
+ return new Date(b.added_on) - new Date(a.added_on);
+ });
+
+ let notes_html = frappe.render_template("crm_notes", {
+ notes: notes,
+ });
$(notes_html).appendTo(this.notes_wrapper);
this.add_note();
- $(".notes-section").find(".edit-note-btn").on("click", function() {
- me.edit_note(this);
- });
+ $(".notes-section")
+ .find(".edit-note-btn")
+ .on("click", function () {
+ me.edit_note(this);
+ });
- $(".notes-section").find(".delete-note-btn").on("click", function() {
- me.delete_note(this);
- });
+ $(".notes-section")
+ .find(".delete-note-btn")
+ .on("click", function () {
+ me.delete_note(this);
+ });
}
-
- add_note () {
+ add_note() {
let me = this;
let _add_note = () => {
var d = new frappe.ui.Dialog({
- title: __('Add a Note'),
+ title: __("Add a Note"),
fields: [
{
- "label": "Note",
- "fieldname": "note",
- "fieldtype": "Text Editor",
- "reqd": 1,
- "enable_mentions": true,
- }
+ label: "Note",
+ fieldname: "note",
+ fieldtype: "Text Editor",
+ reqd: 1,
+ enable_mentions: true,
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
frappe.call({
method: "add_note",
doc: me.frm.doc,
args: {
- note: data.note
+ note: data.note,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.frm.refresh_field("notes");
me.refresh();
}
d.hide();
- }
+ },
});
},
- primary_action_label: __('Add')
+ primary_action_label: __("Add"),
});
d.show();
};
$(".new-note-btn").click(_add_note);
}
- edit_note (edit_btn) {
+ edit_note(edit_btn) {
var me = this;
- let row = $(edit_btn).closest('.comment-content');
+ let row = $(edit_btn).closest(".comment-content");
let row_id = row.attr("name");
let row_content = $(row).find(".content").html();
if (row_content) {
var d = new frappe.ui.Dialog({
- title: __('Edit Note'),
+ title: __("Edit Note"),
fields: [
{
- "label": "Note",
- "fieldname": "note",
- "fieldtype": "Text Editor",
- "default": row_content
- }
+ label: "Note",
+ fieldname: "note",
+ fieldtype: "Text Editor",
+ default: row_content,
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
frappe.call({
method: "edit_note",
doc: me.frm.doc,
args: {
note: data.note,
- row_id: row_id
+ row_id: row_id,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.frm.refresh_field("notes");
me.refresh();
d.hide();
}
-
- }
+ },
});
},
- primary_action_label: __('Done')
+ primary_action_label: __("Done"),
});
d.show();
}
}
- delete_note (delete_btn) {
+ delete_note(delete_btn) {
var me = this;
- let row_id = $(delete_btn).closest('.comment-content').attr("name");
+ let row_id = $(delete_btn).closest(".comment-content").attr("name");
frappe.call({
method: "delete_note",
doc: me.frm.doc,
args: {
- row_id: row_id
+ row_id: row_id,
},
freeze: true,
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
me.frm.refresh_field("notes");
me.refresh();
}
- }
+ },
});
}
};
diff --git a/erpnext/public/js/utils/customer_quick_entry.js b/erpnext/public/js/utils/customer_quick_entry.js
index b2532085f652..e9b77a356b2e 100644
--- a/erpnext/public/js/utils/customer_quick_entry.js
+++ b/erpnext/public/js/utils/customer_quick_entry.js
@@ -1,3 +1,3 @@
-frappe.provide('frappe.ui.form');
+frappe.provide("frappe.ui.form");
frappe.ui.form.CustomerQuickEntryForm = frappe.ui.form.ContactAddressQuickEntryForm;
diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js
index 27d00bacb882..36c0f1b51ae6 100644
--- a/erpnext/public/js/utils/dimension_tree_filter.js
+++ b/erpnext/public/js/utils/dimension_tree_filter.js
@@ -1,4 +1,4 @@
-frappe.provide('erpnext.accounts');
+frappe.provide("erpnext.accounts");
erpnext.accounts.dimensions = {
setup_dimension_filters(frm, doctype) {
@@ -12,36 +12,38 @@ erpnext.accounts.dimensions = {
frappe.call({
method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimensions",
args: {
- 'with_cost_center_and_project': true
+ with_cost_center_and_project: true,
},
- callback: function(r) {
+ callback: function (r) {
me.accounting_dimensions = r.message[0];
// Ignoring "Project" as it is already handled specifically in Sales Order and Delivery Note
- me.accounting_dimensions = me.accounting_dimensions.filter(x=>{return x.document_type != "Project"});
+ me.accounting_dimensions = me.accounting_dimensions.filter((x) => {
+ return x.document_type != "Project";
+ });
me.default_dimensions = r.message[1];
me.setup_filters(frm, doctype);
- }
+ },
});
},
setup_filters(frm, doctype) {
- if (doctype == 'Payment Entry' && this.accounting_dimensions) {
- frm.dimension_filters = this.accounting_dimensions
+ if (doctype == "Payment Entry" && this.accounting_dimensions) {
+ frm.dimension_filters = this.accounting_dimensions;
}
if (this.accounting_dimensions) {
this.accounting_dimensions.forEach((dimension) => {
- frappe.model.with_doctype(dimension['document_type'], () => {
+ frappe.model.with_doctype(dimension["document_type"], () => {
let parent_fields = [];
frappe.meta.get_docfields(doctype).forEach((df) => {
- if (df.fieldtype === 'Link' && df.options === 'Account') {
+ if (df.fieldtype === "Link" && df.options === "Account") {
parent_fields.push(df.fieldname);
- } else if (df.fieldtype === 'Table') {
- this.setup_child_filters(frm, df.options, df.fieldname, dimension['fieldname']);
+ } else if (df.fieldtype === "Table") {
+ this.setup_child_filters(frm, df.options, df.fieldname, dimension["fieldname"]);
}
- if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
- this.setup_account_filters(frm, dimension['fieldname'], parent_fields);
+ if (frappe.meta.has_field(doctype, dimension["fieldname"])) {
+ this.setup_account_filters(frm, dimension["fieldname"], parent_fields);
}
});
});
@@ -55,12 +57,12 @@ erpnext.accounts.dimensions = {
if (frappe.meta.has_field(doctype, dimension)) {
frappe.model.with_doctype(doctype, () => {
frappe.meta.get_docfields(doctype).forEach((df) => {
- if (df.fieldtype === 'Link' && df.options === 'Account') {
+ if (df.fieldtype === "Link" && df.options === "Account") {
fields.push(df.fieldname);
}
});
- frm.set_query(dimension, parentfield, function(doc, cdt, cdn) {
+ frm.set_query(dimension, parentfield, function (doc, cdt, cdn) {
let row = locals[cdt][cdn];
return erpnext.queries.get_filtered_dimensions(row, fields, dimension, doc.company);
});
@@ -69,7 +71,7 @@ erpnext.accounts.dimensions = {
},
setup_account_filters(frm, dimension, fields) {
- frm.set_query(dimension, function(doc) {
+ frm.set_query(dimension, function (doc) {
return erpnext.queries.get_filtered_dimensions(doc, fields, dimension, doc.company);
});
},
@@ -78,18 +80,26 @@ erpnext.accounts.dimensions = {
if (this.accounting_dimensions) {
this.accounting_dimensions.forEach((dimension) => {
if (frm.is_new()) {
- if (frm.doc.company && Object.keys(this.default_dimensions || {}).length > 0
- && this.default_dimensions[frm.doc.company]) {
-
- let default_dimension = this.default_dimensions[frm.doc.company][dimension['fieldname']];
+ if (
+ frm.doc.company &&
+ Object.keys(this.default_dimensions || {}).length > 0 &&
+ this.default_dimensions[frm.doc.company]
+ ) {
+ let default_dimension =
+ this.default_dimensions[frm.doc.company][dimension["fieldname"]];
if (default_dimension) {
- if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
- frm.set_value(dimension['fieldname'], default_dimension);
+ if (frappe.meta.has_field(doctype, dimension["fieldname"])) {
+ frm.set_value(dimension["fieldname"], default_dimension);
}
- $.each(frm.doc.items || frm.doc.accounts || [], function(i, row) {
- frappe.model.set_value(row.doctype, row.name, dimension['fieldname'], default_dimension);
+ $.each(frm.doc.items || frm.doc.accounts || [], function (i, row) {
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ dimension["fieldname"],
+ default_dimension
+ );
});
}
}
@@ -102,8 +112,8 @@ erpnext.accounts.dimensions = {
if (frappe.meta.has_field(frm.doctype, fieldname) && this.accounting_dimensions) {
this.accounting_dimensions.forEach((dimension) => {
let row = frappe.get_doc(cdt, cdn);
- frm.script_manager.copy_from_first_row(fieldname, row, [dimension['fieldname']]);
+ frm.script_manager.copy_from_first_row(fieldname, row, [dimension["fieldname"]]);
});
}
- }
+ },
};
diff --git a/erpnext/public/js/utils/item_selector.js b/erpnext/public/js/utils/item_selector.js
index e74d291acd30..d8a4ef4651a5 100644
--- a/erpnext/public/js/utils/item_selector.js
+++ b/erpnext/public/js/utils/item_selector.js
@@ -3,7 +3,7 @@ erpnext.ItemSelector = class ItemSelector {
$.extend(this, opts);
if (!this.item_field) {
- this.item_field = 'item_code';
+ this.item_field = "item_code";
}
if (!this.item_query) {
@@ -16,39 +16,43 @@ erpnext.ItemSelector = class ItemSelector {
setup() {
var me = this;
- if(!this.grid.add_items_button) {
- this.grid.add_items_button = this.grid.add_custom_button(__('Add Items'), function() {
- if(!me.dialog) {
+ if (!this.grid.add_items_button) {
+ this.grid.add_items_button = this.grid.add_custom_button(__("Add Items"), function () {
+ if (!me.dialog) {
me.make_dialog();
}
me.dialog.show();
me.render_items();
- setTimeout(function() { me.dialog.input.focus(); }, 1000);
+ setTimeout(function () {
+ me.dialog.input.focus();
+ }, 1000);
});
}
}
make_dialog() {
this.dialog = new frappe.ui.Dialog({
- title: __('Add Items')
+ title: __("Add Items"),
});
var body = $(this.dialog.body);
- body.html('
');
+ body.html(
+ '
'
+ );
- this.dialog.input = body.find('.form-control');
- this.dialog.results = body.find('.results');
+ this.dialog.input = body.find(".form-control");
+ this.dialog.results = body.find(".results");
var me = this;
- this.dialog.results.on('click', '.image-view-item', function() {
- me.add_item($(this).attr('data-name'));
+ this.dialog.results.on("click", ".image-view-item", function () {
+ me.add_item($(this).attr("data-name"));
});
- this.dialog.input.on('keyup', function() {
- if(me.timeout_id) {
+ this.dialog.input.on("keyup", function () {
+ if (me.timeout_id) {
clearTimeout(me.timeout_id);
}
- me.timeout_id = setTimeout(function() {
+ me.timeout_id = setTimeout(function () {
me.render_items();
me.timeout_id = undefined;
}, 500);
@@ -61,33 +65,34 @@ erpnext.ItemSelector = class ItemSelector {
// find row with item if exists
$.each(this.frm.doc.items || [], (i, d) => {
- if(d[this.item_field]===item_code) {
- frappe.model.set_value(d.doctype, d.name, 'qty', d.qty + 1);
- frappe.show_alert({message: __("Added {0} ({1})", [item_code, d.qty]), indicator: 'green'});
+ if (d[this.item_field] === item_code) {
+ frappe.model.set_value(d.doctype, d.name, "qty", d.qty + 1);
+ frappe.show_alert({ message: __("Added {0} ({1})", [item_code, d.qty]), indicator: "green" });
added = true;
return false;
}
});
- if(!added) {
+ if (!added) {
var d = null;
frappe.run_serially([
- () => { d = this.grid.add_new_row(); },
+ () => {
+ d = this.grid.add_new_row();
+ },
() => frappe.model.set_value(d.doctype, d.name, this.item_field, item_code),
() => frappe.timeout(0.1),
() => {
- frappe.model.set_value(d.doctype, d.name, 'qty', 1);
- frappe.show_alert({message: __("Added {0} ({1})", [item_code, 1]), indicator: 'green'});
- }
+ frappe.model.set_value(d.doctype, d.name, "qty", 1);
+ frappe.show_alert({ message: __("Added {0} ({1})", [item_code, 1]), indicator: "green" });
+ },
]);
}
-
}
render_items() {
let args = {
query: this.item_query,
- filters: {}
+ filters: {},
};
args.txt = this.dialog.input.val();
args.as_dict = 1;
@@ -97,14 +102,14 @@ erpnext.ItemSelector = class ItemSelector {
}
var me = this;
- frappe.link_search("Item", args, function(results) {
- $.each(results, function(i, d) {
- if(!d.image) {
+ frappe.link_search("Item", args, function (results) {
+ $.each(results, function (i, d) {
+ if (!d.image) {
d.abbr = frappe.get_abbr(d.item_name);
d.color = frappe.get_palette(d.item_name);
}
});
- me.dialog.results.html(frappe.render_template('item_selector', {'data': results}));
+ me.dialog.results.html(frappe.render_template("item_selector", { data: results }));
});
}
};
diff --git a/erpnext/public/js/utils/landed_taxes_and_charges_common.js b/erpnext/public/js/utils/landed_taxes_and_charges_common.js
index c71f77d45e91..2cb301604532 100644
--- a/erpnext/public/js/utils/landed_taxes_and_charges_common.js
+++ b/erpnext/public/js/utils/landed_taxes_and_charges_common.js
@@ -1,62 +1,74 @@
-
erpnext.landed_cost_taxes_and_charges = {
- setup_triggers: function(doctype) {
+ setup_triggers: function (doctype) {
frappe.ui.form.on(doctype, {
- refresh: function(frm) {
- let tax_field = frm.doc.doctype == 'Landed Cost Voucher' ? 'taxes' : 'additional_costs';
- frm.set_query("expense_account", tax_field, function() {
+ refresh: function (frm) {
+ let tax_field = frm.doc.doctype == "Landed Cost Voucher" ? "taxes" : "additional_costs";
+ frm.set_query("expense_account", tax_field, function () {
return {
filters: {
- "account_type": ['in', ["Tax", "Chargeable", "Income Account", "Expenses Included In Valuation", "Expenses Included In Asset Valuation"]],
- "company": frm.doc.company
- }
+ account_type: [
+ "in",
+ [
+ "Tax",
+ "Chargeable",
+ "Income Account",
+ "Expenses Included In Valuation",
+ "Expenses Included In Asset Valuation",
+ ],
+ ],
+ company: frm.doc.company,
+ },
};
});
},
- set_account_currency: function(frm, cdt, cdn) {
+ set_account_currency: function (frm, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.expense_account) {
- frappe.db.get_value('Account', row.expense_account, 'account_currency', function(value) {
+ frappe.db.get_value("Account", row.expense_account, "account_currency", function (value) {
frappe.model.set_value(cdt, cdn, "account_currency", value.account_currency);
frm.events.set_exchange_rate(frm, cdt, cdn);
});
}
},
- set_exchange_rate: function(frm, cdt, cdn) {
+ set_exchange_rate: function (frm, cdt, cdn) {
let row = locals[cdt][cdn];
let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
if (row.account_currency == company_currency) {
row.exchange_rate = 1;
- frm.set_df_property('taxes', 'hidden', 1, row.name, 'exchange_rate');
+ frm.set_df_property("taxes", "hidden", 1, row.name, "exchange_rate");
} else if (!row.exchange_rate || row.exchange_rate == 1) {
- frm.set_df_property('taxes', 'hidden', 0, row.name, 'exchange_rate');
+ frm.set_df_property("taxes", "hidden", 0, row.name, "exchange_rate");
frappe.call({
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
args: {
posting_date: frm.doc.posting_date,
account: row.expense_account,
account_currency: row.account_currency,
- company: frm.doc.company
+ company: frm.doc.company,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
}
- }
+ },
});
}
- frm.refresh_field('taxes');
+ frm.refresh_field("taxes");
},
- set_base_amount: function(frm, cdt, cdn) {
+ set_base_amount: function (frm, cdt, cdn) {
let row = locals[cdt][cdn];
- frappe.model.set_value(cdt, cdn, "base_amount",
- flt(flt(row.amount)*row.exchange_rate, precision("base_amount", row)));
- }
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "base_amount",
+ flt(flt(row.amount) * row.exchange_rate, precision("base_amount", row))
+ );
+ },
});
- }
-}
+ },
+};
diff --git a/erpnext/public/js/utils/ledger_preview.js b/erpnext/public/js/utils/ledger_preview.js
index 85d4a7d51e94..6a610dd5065d 100644
--- a/erpnext/public/js/utils/ledger_preview.js
+++ b/erpnext/public/js/utils/ledger_preview.js
@@ -1,60 +1,78 @@
-frappe.provide('erpnext.accounts');
+frappe.provide("erpnext.accounts");
erpnext.accounts.ledger_preview = {
show_accounting_ledger_preview(frm) {
let me = this;
- if(!frm.is_new() && frm.doc.docstatus == 0) {
- frm.add_custom_button(__('Accounting Ledger'), function() {
- frappe.call({
- "type": "GET",
- "method": "erpnext.controllers.stock_controller.show_accounting_ledger_preview",
- "args": {
- "company": frm.doc.company,
- "doctype": frm.doc.doctype,
- "docname": frm.doc.name
- },
- "callback": function(response) {
- me.make_dialog("Accounting Ledger Preview", "accounting_ledger_preview_html", response.message.gl_columns, response.message.gl_data);
- }
- })
- }, __("Preview"));
+ if (!frm.is_new() && frm.doc.docstatus == 0) {
+ frm.add_custom_button(
+ __("Accounting Ledger"),
+ function () {
+ frappe.call({
+ type: "GET",
+ method: "erpnext.controllers.stock_controller.show_accounting_ledger_preview",
+ args: {
+ company: frm.doc.company,
+ doctype: frm.doc.doctype,
+ docname: frm.doc.name,
+ },
+ callback: function (response) {
+ me.make_dialog(
+ "Accounting Ledger Preview",
+ "accounting_ledger_preview_html",
+ response.message.gl_columns,
+ response.message.gl_data
+ );
+ },
+ });
+ },
+ __("Preview")
+ );
}
},
show_stock_ledger_preview(frm) {
- let me = this
- if(!frm.is_new() && frm.doc.docstatus == 0) {
- frm.add_custom_button(__('Stock Ledger'), function() {
- frappe.call({
- "type": "GET",
- "method": "erpnext.controllers.stock_controller.show_stock_ledger_preview",
- "args": {
- "company": frm.doc.company,
- "doctype": frm.doc.doctype,
- "docname": frm.doc.name
- },
- "callback": function(response) {
- me.make_dialog("Stock Ledger Preview", "stock_ledger_preview_html", response.message.sl_columns, response.message.sl_data);
- }
- })
- }, __("Preview"));
+ let me = this;
+ if (!frm.is_new() && frm.doc.docstatus == 0) {
+ frm.add_custom_button(
+ __("Stock Ledger"),
+ function () {
+ frappe.call({
+ type: "GET",
+ method: "erpnext.controllers.stock_controller.show_stock_ledger_preview",
+ args: {
+ company: frm.doc.company,
+ doctype: frm.doc.doctype,
+ docname: frm.doc.name,
+ },
+ callback: function (response) {
+ me.make_dialog(
+ "Stock Ledger Preview",
+ "stock_ledger_preview_html",
+ response.message.sl_columns,
+ response.message.sl_data
+ );
+ },
+ });
+ },
+ __("Preview")
+ );
}
},
make_dialog(label, fieldname, columns, data) {
let me = this;
let dialog = new frappe.ui.Dialog({
- "size": "extra-large",
- "title": __(label),
- "fields": [
+ size: "extra-large",
+ title: __(label),
+ fields: [
{
- "fieldtype": "HTML",
- "fieldname": fieldname,
+ fieldtype: "HTML",
+ fieldname: fieldname,
},
- ]
+ ],
});
- setTimeout(function() {
+ setTimeout(function () {
me.get_datatable(columns, data, dialog.get_field(fieldname).wrapper);
}, 200);
@@ -70,9 +88,6 @@ erpnext.accounts.ledger_preview = {
inlineFilters: true,
};
- new frappe.DataTable(
- wrapper,
- datatable_options
- );
- }
-}
\ No newline at end of file
+ new frappe.DataTable(wrapper, datatable_options);
+ },
+};
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index cba615c0d229..801376b2ed7d 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -3,18 +3,19 @@
frappe.provide("erpnext.utils");
-const SALES_DOCTYPES = ['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'];
-const PURCHASE_DOCTYPES = ['Supplier Quotation','Purchase Order', 'Purchase Receipt', 'Purchase Invoice'];
+const SALES_DOCTYPES = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"];
+const PURCHASE_DOCTYPES = ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"];
-erpnext.utils.get_party_details = function(frm, method, args, callback) {
+erpnext.utils.get_party_details = function (frm, method, args, callback) {
if (!method) {
method = "erpnext.accounts.party.get_party_details";
}
if (!args) {
- if ((frm.doctype != "Purchase Order" && frm.doc.customer)
- || (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) {
-
+ if (
+ (frm.doctype != "Purchase Order" && frm.doc.customer) ||
+ (frm.doc.party_name && in_list(["Quotation", "Opportunity"], frm.doc.doctype))
+ ) {
let party_type = "Customer";
if (frm.doc.quotation_to && in_list(["Lead", "Prospect"], frm.doc.quotation_to)) {
party_type = frm.doc.quotation_to;
@@ -23,14 +24,14 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
args = {
party: frm.doc.customer || frm.doc.party_name,
party_type: party_type,
- price_list: frm.doc.selling_price_list
+ price_list: frm.doc.selling_price_list,
};
} else if (frm.doc.supplier) {
args = {
party: frm.doc.supplier,
party_type: "Supplier",
bill_date: frm.doc.bill_date,
- price_list: frm.doc.buying_price_list
+ price_list: frm.doc.buying_price_list,
};
}
@@ -38,14 +39,14 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
if (in_list(SALES_DOCTYPES, frm.doc.doctype)) {
args = {
party: frm.doc.customer || frm.doc.party_name,
- party_type: 'Customer'
+ party_type: "Customer",
};
}
if (in_list(PURCHASE_DOCTYPES, frm.doc.doctype)) {
args = {
party: frm.doc.supplier,
- party_type: 'Supplier'
+ party_type: "Supplier",
};
}
}
@@ -72,13 +73,26 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
}
}
-
if (frappe.meta.get_docfield(frm.doc.doctype, "taxes")) {
- if (!erpnext.utils.validate_mandatory(frm, "Posting / Transaction Date",
- args.posting_date, args.party_type=="Customer" ? "customer": "supplier")) return;
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Posting / Transaction Date",
+ args.posting_date,
+ args.party_type == "Customer" ? "customer" : "supplier"
+ )
+ )
+ return;
}
- if (!erpnext.utils.validate_mandatory(frm, "Company", frm.doc.company, args.party_type=="Customer" ? "customer": "supplier")) {
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Company",
+ frm.doc.company,
+ args.party_type == "Customer" ? "customer" : "supplier"
+ )
+ ) {
return;
}
@@ -88,7 +102,7 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
frappe.call({
method: method,
args: args,
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
frm.supplier_tds = r.message.supplier_tds;
frm.updating_party_details = true;
@@ -99,28 +113,28 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) {
if (callback) callback();
frm.refresh();
erpnext.utils.add_item(frm);
- }
+ },
]);
}
- }
+ },
});
-}
+};
-erpnext.utils.add_item = function(frm) {
+erpnext.utils.add_item = function (frm) {
if (frm.is_new()) {
var prev_route = frappe.get_prev_route();
- if (prev_route[1]==='Item' && !(frm.doc.items && frm.doc.items.length)) {
+ if (prev_route[1] === "Item" && !(frm.doc.items && frm.doc.items.length)) {
// add row
- var item = frm.add_child('items');
- frm.refresh_field('items');
+ var item = frm.add_child("items");
+ frm.refresh_field("items");
// set item
- frappe.model.set_value(item.doctype, item.name, 'item_code', prev_route[2]);
+ frappe.model.set_value(item.doctype, item.name, "item_code", prev_route[2]);
}
}
-}
+};
-erpnext.utils.get_address_display = function(frm, address_field, display_field, is_your_company_address) {
+erpnext.utils.get_address_display = function (frm, address_field, display_field, is_your_company_address) {
if (frm.updating_party_details) return;
if (!address_field) {
@@ -135,29 +149,46 @@ erpnext.utils.get_address_display = function(frm, address_field, display_field,
if (frm.doc[address_field]) {
frappe.call({
method: "frappe.contacts.doctype.address.address.get_address_display",
- args: {"address_dict": frm.doc[address_field] },
- callback: function(r) {
+ args: { address_dict: frm.doc[address_field] },
+ callback: function (r) {
if (r.message) {
- frm.set_value(display_field, r.message)
+ frm.set_value(display_field, r.message);
}
- }
- })
+ },
+ });
} else {
- frm.set_value(display_field, '');
+ frm.set_value(display_field, "");
}
};
-erpnext.utils.set_taxes_from_address = function(frm, triggered_from_field, billing_address_field, shipping_address_field) {
+erpnext.utils.set_taxes_from_address = function (
+ frm,
+ triggered_from_field,
+ billing_address_field,
+ shipping_address_field
+) {
if (frm.updating_party_details) return;
if (frappe.meta.get_docfield(frm.doc.doctype, "taxes")) {
- if (!erpnext.utils.validate_mandatory(frm, "Lead / Customer / Supplier",
- frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name, triggered_from_field)) {
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Lead / Customer / Supplier",
+ frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name,
+ triggered_from_field
+ )
+ ) {
return;
}
- if (!erpnext.utils.validate_mandatory(frm, "Posting / Transaction Date",
- frm.doc.posting_date || frm.doc.transaction_date, triggered_from_field)) {
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Posting / Transaction Date",
+ frm.doc.posting_date || frm.doc.transaction_date,
+ triggered_from_field
+ )
+ ) {
return;
}
} else {
@@ -167,35 +198,47 @@ erpnext.utils.set_taxes_from_address = function(frm, triggered_from_field, billi
frappe.call({
method: "erpnext.accounts.party.get_address_tax_category",
args: {
- "tax_category": frm.doc.tax_category,
- "billing_address": frm.doc[billing_address_field],
- "shipping_address": frm.doc[shipping_address_field]
+ tax_category: frm.doc.tax_category,
+ billing_address: frm.doc[billing_address_field],
+ shipping_address: frm.doc[shipping_address_field],
},
- callback: function(r) {
- if (!r.exc){
+ callback: function (r) {
+ if (!r.exc) {
if (frm.doc.tax_category != r.message) {
frm.set_value("tax_category", r.message);
} else {
erpnext.utils.set_taxes(frm, triggered_from_field);
}
}
- }
+ },
});
};
-erpnext.utils.set_taxes = function(frm, triggered_from_field) {
+erpnext.utils.set_taxes = function (frm, triggered_from_field) {
if (frappe.meta.get_docfield(frm.doc.doctype, "taxes")) {
if (!erpnext.utils.validate_mandatory(frm, "Company", frm.doc.company, triggered_from_field)) {
return;
}
- if (!erpnext.utils.validate_mandatory(frm, "Lead / Customer / Supplier",
- frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name, triggered_from_field)) {
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Lead / Customer / Supplier",
+ frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name,
+ triggered_from_field
+ )
+ ) {
return;
}
- if (!erpnext.utils.validate_mandatory(frm, "Posting / Transaction Date",
- frm.doc.posting_date || frm.doc.transaction_date, triggered_from_field)) {
+ if (
+ !erpnext.utils.validate_mandatory(
+ frm,
+ "Posting / Transaction Date",
+ frm.doc.posting_date || frm.doc.transaction_date,
+ triggered_from_field
+ )
+ ) {
return;
}
} else {
@@ -204,15 +247,15 @@ erpnext.utils.set_taxes = function(frm, triggered_from_field) {
var party_type, party;
if (frm.doc.lead) {
- party_type = 'Lead';
+ party_type = "Lead";
party = frm.doc.lead;
} else if (frm.doc.customer) {
- party_type = 'Customer';
+ party_type = "Customer";
party = frm.doc.customer;
} else if (frm.doc.supplier) {
- party_type = 'Supplier';
+ party_type = "Supplier";
party = frm.doc.supplier;
- } else if (frm.doc.quotation_to){
+ } else if (frm.doc.quotation_to) {
party_type = frm.doc.quotation_to;
party = frm.doc.party_name;
}
@@ -224,21 +267,22 @@ erpnext.utils.set_taxes = function(frm, triggered_from_field) {
frappe.call({
method: "erpnext.accounts.party.set_taxes",
args: {
- "party": party,
- "party_type": party_type,
- "posting_date": frm.doc.posting_date || frm.doc.transaction_date,
- "company": frm.doc.company,
- "customer_group": frm.doc.customer_group,
- "supplier_group": frm.doc.supplier_group,
- "tax_category": frm.doc.tax_category,
- "billing_address": ((frm.doc.customer || frm.doc.lead) ? (frm.doc.customer_address) : (frm.doc.supplier_address)),
- "shipping_address": frm.doc.shipping_address_name
+ party: party,
+ party_type: party_type,
+ posting_date: frm.doc.posting_date || frm.doc.transaction_date,
+ company: frm.doc.company,
+ customer_group: frm.doc.customer_group,
+ supplier_group: frm.doc.supplier_group,
+ tax_category: frm.doc.tax_category,
+ billing_address:
+ frm.doc.customer || frm.doc.lead ? frm.doc.customer_address : frm.doc.supplier_address,
+ shipping_address: frm.doc.shipping_address_name,
},
- callback: function(r) {
- if (r.message){
- frm.set_value("taxes_and_charges", r.message)
+ callback: function (r) {
+ if (r.message) {
+ frm.set_value("taxes_and_charges", r.message);
}
- }
+ },
});
};
@@ -266,20 +310,23 @@ erpnext.utils.get_contact_details = function (frm) {
}
};
-erpnext.utils.validate_mandatory = function(frm, label, value, trigger_on) {
+erpnext.utils.validate_mandatory = function (frm, label, value, trigger_on) {
if (!value) {
frm.doc[trigger_on] = "";
refresh_field(trigger_on);
- frappe.throw({message:__("Please enter {0} first", [label]), title:__("Mandatory")});
+ frappe.throw({ message: __("Please enter {0} first", [label]), title: __("Mandatory") });
return false;
}
return true;
-}
+};
-erpnext.utils.get_shipping_address = function(frm, callback) {
+erpnext.utils.get_shipping_address = function (frm, callback) {
if (frm.doc.company) {
- if ((frm.doc.inter_company_order_reference || frm.doc.internal_invoice_reference ||
- frm.doc.internal_order_reference)) {
+ if (
+ frm.doc.inter_company_order_reference ||
+ frm.doc.internal_invoice_reference ||
+ frm.doc.internal_order_reference
+ ) {
if (callback) {
return callback();
}
@@ -288,20 +335,20 @@ erpnext.utils.get_shipping_address = function(frm, callback) {
method: "erpnext.accounts.custom.address.get_shipping_address",
args: {
company: frm.doc.company,
- address: frm.doc.shipping_address
+ address: frm.doc.shipping_address,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.set_value("shipping_address", r.message[0]) //Address title or name
- frm.set_value("shipping_address_display", r.message[1]) //Address to be displayed on the page
+ frm.set_value("shipping_address", r.message[0]); //Address title or name
+ frm.set_value("shipping_address_display", r.message[1]); //Address to be displayed on the page
}
- if (callback){
+ if (callback) {
return callback();
}
- }
+ },
});
} else {
frappe.msgprint(__("Select company first"));
}
-}
+};
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
index a957530ec8b3..f2b7331cf3be 100644
--- a/erpnext/public/js/utils/sales_common.js
+++ b/erpnext/public/js/utils/sales_common.js
@@ -4,7 +4,7 @@
frappe.provide("erpnext.selling");
erpnext.sales_common = {
- setup_selling_controller:function() {
+ setup_selling_controller: function () {
erpnext.selling.SellingController = class SellingController extends erpnext.TransactionController {
setup() {
super.setup();
@@ -15,107 +15,123 @@ erpnext.sales_common = {
onload() {
super.onload();
this.setup_queries();
- this.frm.set_query('shipping_rule', function() {
+ this.frm.set_query("shipping_rule", function () {
return {
filters: {
- "shipping_rule_type": "Selling"
- }
+ shipping_rule_type: "Selling",
+ },
};
});
- this.frm.set_query('project', function(doc) {
+ this.frm.set_query("project", function (doc) {
return {
query: "erpnext.controllers.queries.get_project_name",
filters: {
- 'customer': doc.customer
- }
- }
+ customer: doc.customer,
+ },
+ };
});
}
setup_queries() {
var me = this;
- $.each([["customer", "customer"],
- ["lead", "lead"]],
- function(i, opts) {
- if(me.frm.fields_dict[opts[0]])
- me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
- });
+ $.each(
+ [
+ ["customer", "customer"],
+ ["lead", "lead"],
+ ],
+ function (i, opts) {
+ if (me.frm.fields_dict[opts[0]]) me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
+ }
+ );
- me.frm.set_query('contact_person', erpnext.queries.contact_query);
- me.frm.set_query('customer_address', erpnext.queries.address_query);
- me.frm.set_query('shipping_address_name', erpnext.queries.address_query);
- me.frm.set_query('dispatch_address_name', erpnext.queries.dispatch_address_query);
+ me.frm.set_query("contact_person", erpnext.queries.contact_query);
+ me.frm.set_query("customer_address", erpnext.queries.address_query);
+ me.frm.set_query("shipping_address_name", erpnext.queries.address_query);
+ me.frm.set_query("dispatch_address_name", erpnext.queries.dispatch_address_query);
erpnext.accounts.dimensions.setup_dimension_filters(me.frm, me.frm.doctype);
- if(this.frm.fields_dict.selling_price_list) {
- this.frm.set_query("selling_price_list", function() {
+ if (this.frm.fields_dict.selling_price_list) {
+ this.frm.set_query("selling_price_list", function () {
return { filters: { selling: 1 } };
});
}
- if(this.frm.fields_dict.tc_name) {
- this.frm.set_query("tc_name", function() {
+ if (this.frm.fields_dict.tc_name) {
+ this.frm.set_query("tc_name", function () {
return { filters: { selling: 1 } };
});
}
- if(!this.frm.fields_dict["items"]) {
+ if (!this.frm.fields_dict["items"]) {
return;
}
- if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
- this.frm.set_query("item_code", "items", function() {
+ if (this.frm.fields_dict["items"].grid.get_field("item_code")) {
+ this.frm.set_query("item_code", "items", function () {
return {
query: "erpnext.controllers.queries.item_query",
- filters: {'is_sales_item': 1, 'customer': me.frm.doc.customer, 'has_variants': 0}
- }
+ filters: { is_sales_item: 1, customer: me.frm.doc.customer, has_variants: 0 },
+ };
});
}
- if(this.frm.fields_dict["packed_items"] &&
- this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
- this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) {
- return me.set_query_for_batch(doc, cdt, cdn)
+ if (
+ this.frm.fields_dict["packed_items"] &&
+ this.frm.fields_dict["packed_items"].grid.get_field("batch_no")
+ ) {
+ this.frm.set_query("batch_no", "packed_items", function (doc, cdt, cdn) {
+ return me.set_query_for_batch(doc, cdt, cdn);
});
}
- if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
- this.frm.set_query("item_tax_template", "items", function(doc, cdt, cdn) {
- return me.set_query_for_item_tax_template(doc, cdt, cdn)
+ if (this.frm.fields_dict["items"].grid.get_field("item_code")) {
+ this.frm.set_query("item_tax_template", "items", function (doc, cdt, cdn) {
+ return me.set_query_for_item_tax_template(doc, cdt, cdn);
});
}
-
}
refresh() {
super.refresh();
- frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+ frappe.dynamic_link = { doc: this.frm.doc, fieldname: "customer", doctype: "Customer" };
- this.frm.toggle_display("customer_name",
- (this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer));
+ this.frm.toggle_display(
+ "customer_name",
+ this.frm.doc.customer_name && this.frm.doc.customer_name !== this.frm.doc.customer
+ );
this.toggle_editable_price_list_rate();
}
customer() {
var me = this;
- erpnext.utils.get_party_details(this.frm, null, null, function() {
+ erpnext.utils.get_party_details(this.frm, null, null, function () {
me.apply_price_list();
});
}
customer_address() {
erpnext.utils.get_address_display(this.frm, "customer_address");
- erpnext.utils.set_taxes_from_address(this.frm, "customer_address", "customer_address", "shipping_address_name");
+ erpnext.utils.set_taxes_from_address(
+ this.frm,
+ "customer_address",
+ "customer_address",
+ "shipping_address_name"
+ );
}
shipping_address_name() {
erpnext.utils.get_address_display(this.frm, "shipping_address_name", "shipping_address");
- erpnext.utils.set_taxes_from_address(this.frm, "shipping_address_name", "customer_address", "shipping_address_name");
+ erpnext.utils.set_taxes_from_address(
+ this.frm,
+ "shipping_address_name",
+ "customer_address",
+ "shipping_address_name"
+ );
}
dispatch_address_name() {
@@ -138,18 +154,17 @@ erpnext.sales_common = {
discount_percentage(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
item.discount_amount = 0.0;
- this.apply_discount_on_item(doc, cdt, cdn, 'discount_percentage');
+ this.apply_discount_on_item(doc, cdt, cdn, "discount_percentage");
}
discount_amount(doc, cdt, cdn) {
-
- if(doc.name === cdn) {
+ if (doc.name === cdn) {
return;
}
var item = frappe.get_doc(cdt, cdn);
item.discount_percentage = 0.0;
- this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount');
+ this.apply_discount_on_item(doc, cdt, cdn, "discount_amount");
}
commission_rate() {
@@ -157,40 +172,48 @@ erpnext.sales_common = {
}
total_commission() {
- frappe.model.round_floats_in(this.frm.doc, ["amount_eligible_for_commission", "total_commission"]);
+ frappe.model.round_floats_in(this.frm.doc, [
+ "amount_eligible_for_commission",
+ "total_commission",
+ ]);
const { amount_eligible_for_commission } = this.frm.doc;
- if(!amount_eligible_for_commission) return;
+ if (!amount_eligible_for_commission) return;
this.frm.set_value(
- "commission_rate", flt(
- this.frm.doc.total_commission * 100.0 / amount_eligible_for_commission
- )
+ "commission_rate",
+ flt((this.frm.doc.total_commission * 100.0) / amount_eligible_for_commission)
);
}
allocated_percentage(doc, cdt, cdn) {
var sales_person = frappe.get_doc(cdt, cdn);
- if(sales_person.allocated_percentage) {
-
- sales_person.allocated_percentage = flt(sales_person.allocated_percentage,
- precision("allocated_percentage", sales_person));
+ if (sales_person.allocated_percentage) {
+ sales_person.allocated_percentage = flt(
+ sales_person.allocated_percentage,
+ precision("allocated_percentage", sales_person)
+ );
- sales_person.allocated_amount = flt(this.frm.doc.amount_eligible_for_commission *
- sales_person.allocated_percentage / 100.0,
- precision("allocated_amount", sales_person));
- refresh_field(["allocated_amount"], sales_person);
+ sales_person.allocated_amount = flt(
+ (this.frm.doc.amount_eligible_for_commission * sales_person.allocated_percentage) /
+ 100.0,
+ precision("allocated_amount", sales_person)
+ );
+ refresh_field(["allocated_amount"], sales_person);
this.calculate_incentive(sales_person);
- refresh_field(["allocated_percentage", "allocated_amount", "commission_rate","incentives"], sales_person.name,
- sales_person.parentfield);
+ refresh_field(
+ ["allocated_percentage", "allocated_amount", "commission_rate", "incentives"],
+ sales_person.name,
+ sales_person.parentfield
+ );
}
}
sales_person(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
this.calculate_incentive(row);
- refresh_field("incentives",row.name,row.parentfield);
+ refresh_field("incentives", row.name, row.parentfield);
}
warehouse(doc, cdt, cdn) {
@@ -200,35 +223,47 @@ erpnext.sales_common = {
}
toggle_editable_price_list_rate() {
- var df = frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "price_list_rate", this.frm.doc.name);
+ var df = frappe.meta.get_docfield(
+ this.frm.doc.doctype + " Item",
+ "price_list_rate",
+ this.frm.doc.name
+ );
var editable_price_list_rate = cint(frappe.defaults.get_default("editable_price_list_rate"));
- if(df && editable_price_list_rate) {
- const parent_field = frappe.meta.get_parentfield(this.frm.doc.doctype, this.frm.doc.doctype + " Item");
+ if (df && editable_price_list_rate) {
+ const parent_field = frappe.meta.get_parentfield(
+ this.frm.doc.doctype,
+ this.frm.doc.doctype + " Item"
+ );
if (!this.frm.fields_dict[parent_field]) return;
this.frm.fields_dict[parent_field].grid.update_docfield_property(
- 'price_list_rate', 'read_only', 0
+ "price_list_rate",
+ "read_only",
+ 0
);
}
}
calculate_commission() {
- if(!this.frm.fields_dict.commission_rate || this.frm.doc.docstatus === 1) return;
+ if (!this.frm.fields_dict.commission_rate || this.frm.doc.docstatus === 1) return;
- if(this.frm.doc.commission_rate > 100) {
+ if (this.frm.doc.commission_rate > 100) {
this.frm.set_value("commission_rate", 100);
- frappe.throw(`${__(frappe.meta.get_label(
- this.frm.doc.doctype, "commission_rate", this.frm.doc.name
- ))} ${__("cannot be greater than 100")}`);
+ frappe.throw(
+ `${__(
+ frappe.meta.get_label(this.frm.doc.doctype, "commission_rate", this.frm.doc.name)
+ )} ${__("cannot be greater than 100")}`
+ );
}
this.frm.doc.amount_eligible_for_commission = this.frm.doc.items.reduce(
- (sum, item) => item.grant_commission ? sum + item.base_net_amount : sum, 0
- )
+ (sum, item) => (item.grant_commission ? sum + item.base_net_amount : sum),
+ 0
+ );
this.frm.doc.total_commission = flt(
- this.frm.doc.amount_eligible_for_commission * this.frm.doc.commission_rate / 100.0,
+ (this.frm.doc.amount_eligible_for_commission * this.frm.doc.commission_rate) / 100.0,
precision("total_commission")
);
@@ -237,25 +272,24 @@ erpnext.sales_common = {
calculate_contribution() {
var me = this;
- $.each(this.frm.doc.doctype.sales_team || [], function(i, sales_person) {
+ $.each(this.frm.doc.doctype.sales_team || [], function (i, sales_person) {
frappe.model.round_floats_in(sales_person);
if (!sales_person.allocated_percentage) return;
sales_person.allocated_amount = flt(
- me.frm.doc.amount_eligible_for_commission
- * sales_person.allocated_percentage
- / 100.0,
+ (me.frm.doc.amount_eligible_for_commission * sales_person.allocated_percentage) /
+ 100.0,
precision("allocated_amount", sales_person)
);
});
}
calculate_incentive(row) {
- if(row.allocated_amount)
- {
+ if (row.allocated_amount) {
row.incentives = flt(
- row.allocated_amount * row.commission_rate / 100.0,
- precision("incentives", row));
+ (row.allocated_amount * row.commission_rate) / 100.0,
+ precision("incentives", row)
+ );
}
}
@@ -265,37 +299,41 @@ erpnext.sales_common = {
}
set_product_bundle_help(doc) {
- if(!this.frm.fields_dict.packing_list) return;
+ if (!this.frm.fields_dict.packing_list) return;
if ((doc.packed_items || []).length) {
$(this.frm.fields_dict.packing_list.row.wrapper).toggle(true);
- if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- var help_msg = "
" +
- __("For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.")+
- "
";
- frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = help_msg;
+ if (in_list(["Delivery Note", "Sales Invoice"], doc.doctype)) {
+ var help_msg =
+ "
" +
+ __(
+ "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
+ ) +
+ "
";
+ frappe.meta.get_docfield(doc.doctype, "product_bundle_help", doc.name).options =
+ help_msg;
}
} else {
$(this.frm.fields_dict.packing_list.row.wrapper).toggle(false);
- if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
- frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = '';
+ if (in_list(["Delivery Note", "Sales Invoice"], doc.doctype)) {
+ frappe.meta.get_docfield(doc.doctype, "product_bundle_help", doc.name).options = "";
}
}
- refresh_field('product_bundle_help');
+ refresh_field("product_bundle_help");
}
company_address() {
var me = this;
- if(this.frm.doc.company_address) {
+ if (this.frm.doc.company_address) {
frappe.call({
method: "frappe.contacts.doctype.address.address.get_address_display",
- args: {"address_dict": this.frm.doc.company_address },
- callback: function(r) {
- if(r.message) {
- me.frm.set_value("company_address_display", r.message)
+ args: { address_dict: this.frm.doc.company_address },
+ callback: function (r) {
+ if (r.message) {
+ me.frm.set_value("company_address_display", r.message);
}
- }
- })
+ },
+ });
} else {
this.frm.set_value("company_address_display", "");
}
@@ -314,79 +352,96 @@ erpnext.sales_common = {
let me = this;
let path = "assets/erpnext/js/utils/serial_no_batch_selector.js";
- frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
- .then((r) => {
- if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
- item.has_serial_no = r.message.has_serial_no;
- item.has_batch_no = r.message.has_batch_no;
- item.type_of_transaction = item.qty > 0 ? "Outward":"Inward";
+ frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"]).then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ item.has_serial_no = r.message.has_serial_no;
+ item.has_batch_no = r.message.has_batch_no;
+ item.type_of_transaction = item.qty > 0 ? "Outward" : "Inward";
- item.title = item.has_serial_no ?
- __("Select Serial No") : __("Select Batch No");
+ item.title = item.has_serial_no ? __("Select Serial No") : __("Select Batch No");
- if (item.has_serial_no && item.has_batch_no) {
- item.title = __("Select Serial and Batch");
- }
+ if (item.has_serial_no && item.has_batch_no) {
+ item.title = __("Select Serial and Batch");
+ }
- frappe.require(path, function() {
- new erpnext.SerialBatchPackageSelector(
- me.frm, item, (r) => {
- if (r) {
- let qty = Math.abs(r.total_qty);
- if (doc.is_return) {
- qty = qty * -1;
- }
-
- frappe.model.set_value(item.doctype, item.name, {
- "serial_and_batch_bundle": r.name,
- "use_serial_batch_fields": 0,
- "qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
- });
- }
+ frappe.require(path, function () {
+ new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
+ if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
}
- );
+
+ frappe.model.set_value(item.doctype, item.name, {
+ serial_and_batch_bundle: r.name,
+ use_serial_batch_fields: 0,
+ qty:
+ qty /
+ flt(
+ item.conversion_factor || 1,
+ precision("conversion_factor", item)
+ ),
+ });
+ }
});
- }
- });
+ });
+ }
+ });
}
update_auto_repeat_reference(doc) {
if (doc.auto_repeat) {
frappe.call({
- method:"frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
- args:{
+ method: "frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
+ args: {
docname: doc.auto_repeat,
- reference:doc.name
+ reference: doc.name,
},
- callback: function(r){
- if (r.message=="success") {
- frappe.show_alert({message:__("Auto repeat document updated"), indicator:'green'});
+ callback: function (r) {
+ if (r.message == "success") {
+ frappe.show_alert({
+ message: __("Auto repeat document updated"),
+ indicator: "green",
+ });
} else {
- frappe.show_alert({message:__("An error occurred during the update process"), indicator:'red'});
+ frappe.show_alert({
+ message: __("An error occurred during the update process"),
+ indicator: "red",
+ });
}
- }
- })
+ },
+ });
}
}
project() {
let me = this;
- if(in_list(["Delivery Note", "Sales Invoice", "Sales Order"], this.frm.doc.doctype)) {
- if(this.frm.doc.project) {
+ if (in_list(["Delivery Note", "Sales Invoice", "Sales Order"], this.frm.doc.doctype)) {
+ if (this.frm.doc.project) {
frappe.call({
- method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
- args: {project: this.frm.doc.project},
- callback: function(r, rt) {
- if(!r.exc) {
- $.each(me.frm.doc["items"] || [], function(i, row) {
- if(r.message) {
- frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
- frappe.msgprint(__("Cost Center For Item with Item Code {0} has been Changed to {1}", [row.item_name, r.message]));
+ method: "erpnext.projects.doctype.project.project.get_cost_center_name",
+ args: { project: this.frm.doc.project },
+ callback: function (r, rt) {
+ if (!r.exc) {
+ $.each(me.frm.doc["items"] || [], function (i, row) {
+ if (r.message) {
+ frappe.model.set_value(
+ row.doctype,
+ row.name,
+ "cost_center",
+ r.message
+ );
+ frappe.msgprint(
+ __(
+ "Cost Center For Item with Item Code {0} has been Changed to {1}",
+ [row.item_name, r.message]
+ )
+ );
}
- })
+ });
}
- }
- })
+ },
+ });
}
}
}
@@ -396,57 +451,60 @@ erpnext.sales_common = {
this.frm.set_value("additional_discount_percentage", 0);
}
};
- }
-}
+ },
+};
erpnext.pre_sales = {
- set_as_lost: function(doctype) {
+ set_as_lost: function (doctype) {
frappe.ui.form.on(doctype, {
- set_as_lost_dialog: function(frm) {
+ set_as_lost_dialog: function (frm) {
var dialog = new frappe.ui.Dialog({
title: __("Set as Lost"),
fields: [
{
- "fieldtype": "Table MultiSelect",
- "label": __("Lost Reasons"),
- "fieldname": "lost_reason",
- "options": frm.doctype === 'Opportunity' ? 'Opportunity Lost Reason Detail': 'Quotation Lost Reason Detail',
- "reqd": 1
+ fieldtype: "Table MultiSelect",
+ label: __("Lost Reasons"),
+ fieldname: "lost_reason",
+ options:
+ frm.doctype === "Opportunity"
+ ? "Opportunity Lost Reason Detail"
+ : "Quotation Lost Reason Detail",
+ reqd: 1,
},
{
- "fieldtype": "Table MultiSelect",
- "label": __("Competitors"),
- "fieldname": "competitors",
- "options": "Competitor Detail"
+ fieldtype: "Table MultiSelect",
+ label: __("Competitors"),
+ fieldname: "competitors",
+ options: "Competitor Detail",
},
{
- "fieldtype": "Small Text",
- "label": __("Detailed Reason"),
- "fieldname": "detailed_reason"
+ fieldtype: "Small Text",
+ label: __("Detailed Reason"),
+ fieldname: "detailed_reason",
},
],
- primary_action: function() {
+ primary_action: function () {
let values = dialog.get_values();
frm.call({
doc: frm.doc,
- method: 'declare_enquiry_lost',
+ method: "declare_enquiry_lost",
args: {
- 'lost_reasons_list': values.lost_reason,
- 'competitors': values.competitors ? values.competitors : [],
- 'detailed_reason': values.detailed_reason
+ lost_reasons_list: values.lost_reason,
+ competitors: values.competitors ? values.competitors : [],
+ detailed_reason: values.detailed_reason,
},
- callback: function(r) {
+ callback: function (r) {
dialog.hide();
frm.reload_doc();
},
});
},
- primary_action_label: __('Declare Lost')
+ primary_action_label: __("Declare Lost"),
});
dialog.show();
- }
+ },
});
- }
-}
+ },
+};
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index d0064b30c345..24133b8cdc35 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -4,30 +4,30 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
this.item = item;
this.qty = item.qty;
this.callback = callback;
- this.bundle = this.item?.is_rejected ?
- this.item.rejected_serial_and_batch_bundle : this.item.serial_and_batch_bundle;
+ this.bundle = this.item?.is_rejected
+ ? this.item.rejected_serial_and_batch_bundle
+ : this.item.serial_and_batch_bundle;
this.make();
this.render_data();
}
make() {
- let label = this.item?.has_serial_no ? __('Serial Nos') : __('Batch Nos');
- let primary_label = this.bundle
- ? __('Update') : __('Add');
+ let label = this.item?.has_serial_no ? __("Serial Nos") : __("Batch Nos");
+ let primary_label = this.bundle ? __("Update") : __("Add");
if (this.item?.has_serial_no && this.item?.batch_no) {
- label = __('Serial Nos / Batch Nos');
+ label = __("Serial Nos / Batch Nos");
}
- primary_label += ' ' + label;
+ primary_label += " " + label;
this.dialog = new frappe.ui.Dialog({
title: this.item?.title || primary_label,
fields: this.get_dialog_fields(),
primary_action_label: primary_label,
primary_action: () => this.update_bundle_entries(),
- secondary_action_label: __('Edit Full Form'),
+ secondary_action_label: __("Edit Full Form"),
secondary_action: () => this.edit_full_form(),
});
@@ -45,21 +45,21 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
if (qty > 0) {
this.dialog.set_value("qty", qty).then(() => {
if (this.item.serial_no && !this.item.serial_and_batch_bundle) {
- let serial_nos = this.item.serial_no.split('\n');
+ let serial_nos = this.item.serial_no.split("\n");
if (serial_nos.length > 1) {
- serial_nos.forEach(serial_no => {
+ serial_nos.forEach((serial_no) => {
this.dialog.fields_dict.entries.df.data.push({
serial_no: serial_no,
- batch_no: this.item.batch_no
+ batch_no: this.item.batch_no,
});
});
} else {
this.dialog.set_value("scan_serial_no", this.item.serial_no);
}
- frappe.model.set_value(this.item.doctype, this.item.name, 'serial_no', '');
+ frappe.model.set_value(this.item.doctype, this.item.name, "serial_no", "");
} else if (this.item.batch_no && !this.item.serial_and_batch_bundle) {
this.dialog.set_value("scan_batch_no", this.item.batch_no);
- frappe.model.set_value(this.item.doctype, this.item.name, 'batch_no', '');
+ frappe.model.set_value(this.item.doctype, this.item.name, "batch_no", "");
}
this.dialog.fields_dict.entries.grid.refresh();
@@ -68,20 +68,20 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
get_serial_no_filters() {
- let warehouse = this.item?.type_of_transaction === "Outward" ?
- (this.item.warehouse || this.item.s_warehouse) : "";
+ let warehouse =
+ this.item?.type_of_transaction === "Outward" ? this.item.warehouse || this.item.s_warehouse : "";
- if (this.frm.doc.doctype === 'Stock Entry') {
+ if (this.frm.doc.doctype === "Stock Entry") {
warehouse = this.item.s_warehouse || this.item.t_warehouse;
}
- if (!warehouse && this.frm.doc.doctype === 'Stock Reconciliation') {
+ if (!warehouse && this.frm.doc.doctype === "Stock Reconciliation") {
warehouse = this.get_warehouse();
}
return {
- 'item_code': this.item.item_code,
- 'warehouse': ["=", warehouse]
+ item_code: this.item.item_code,
+ warehouse: ["=", warehouse],
};
}
@@ -89,71 +89,70 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
let fields = [];
fields.push({
- fieldtype: 'Link',
- fieldname: 'warehouse',
- label: __('Warehouse'),
- options: 'Warehouse',
+ fieldtype: "Link",
+ fieldname: "warehouse",
+ label: __("Warehouse"),
+ options: "Warehouse",
default: this.get_warehouse(),
onchange: () => {
- this.item.warehouse = this.dialog.get_value('warehouse');
- this.get_auto_data()
+ this.item.warehouse = this.dialog.get_value("warehouse");
+ this.get_auto_data();
},
get_query: () => {
return {
filters: {
- 'is_group': 0,
- 'company': this.frm.doc.company,
- }
+ is_group: 0,
+ company: this.frm.doc.company,
+ },
};
- }
+ },
});
- if (this.frm.doc.doctype === 'Stock Entry'
- && this.frm.doc.purpose === 'Manufacture') {
+ if (this.frm.doc.doctype === "Stock Entry" && this.frm.doc.purpose === "Manufacture") {
fields.push({
- fieldtype: 'Column Break',
+ fieldtype: "Column Break",
});
fields.push({
- fieldtype: 'Link',
- fieldname: 'work_order',
- label: __('For Work Order'),
- options: 'Work Order',
+ fieldtype: "Link",
+ fieldname: "work_order",
+ label: __("For Work Order"),
+ options: "Work Order",
read_only: 1,
default: this.frm.doc.work_order,
});
fields.push({
- fieldtype: 'Section Break',
+ fieldtype: "Section Break",
});
}
fields.push({
- fieldtype: 'Column Break',
+ fieldtype: "Column Break",
});
if (this.item.has_serial_no) {
fields.push({
- fieldtype: 'Data',
- options: 'Barcode',
- fieldname: 'scan_serial_no',
- label: __('Scan Serial No'),
+ fieldtype: "Data",
+ options: "Barcode",
+ fieldname: "scan_serial_no",
+ label: __("Scan Serial No"),
get_query: () => {
return {
- filters: this.get_serial_no_filters()
+ filters: this.get_serial_no_filters(),
};
},
- onchange: () => this.scan_barcode_data()
+ onchange: () => this.scan_barcode_data(),
});
}
if (this.item.has_batch_no && !this.item.has_serial_no) {
fields.push({
- fieldtype: 'Data',
- options: 'Barcode',
- fieldname: 'scan_batch_no',
- label: __('Scan Batch No'),
- onchange: () => this.scan_barcode_data()
+ fieldtype: "Data",
+ options: "Barcode",
+ fieldname: "scan_batch_no",
+ label: __("Scan Batch No"),
+ onchange: () => this.scan_barcode_data(),
});
}
@@ -164,12 +163,12 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
fields.push({
- fieldtype: 'Section Break',
+ fieldtype: "Section Break",
});
fields.push({
- fieldname: 'entries',
- fieldtype: 'Table',
+ fieldname: "entries",
+ fieldtype: "Table",
allow_bulk_edit: true,
data: [],
fields: this.get_dialog_table_fields(),
@@ -179,94 +178,95 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
get_attach_field() {
- let label = this.item?.has_serial_no ? __('Serial Nos') : __('Batch Nos');
- let primary_label = this.bundle
- ? __('Update') : __('Add');
+ let label = this.item?.has_serial_no ? __("Serial Nos") : __("Batch Nos");
+ let primary_label = this.bundle ? __("Update") : __("Add");
if (this.item?.has_serial_no && this.item?.has_batch_no) {
- label = __('Serial Nos / Batch Nos');
+ label = __("Serial Nos / Batch Nos");
}
let fields = [
{
- fieldtype: 'Section Break',
- label: __('{0} {1} via CSV File', [primary_label, label])
- }
- ]
+ fieldtype: "Section Break",
+ label: __("{0} {1} via CSV File", [primary_label, label]),
+ },
+ ];
if (this.item?.has_serial_no) {
- fields = [...fields,
+ fields = [
+ ...fields,
{
- fieldtype: 'Check',
- label: __('Import Using CSV file'),
- fieldname: 'import_using_csv_file',
+ fieldtype: "Check",
+ label: __("Import Using CSV file"),
+ fieldname: "import_using_csv_file",
default: 0,
},
{
- fieldtype: 'Section Break',
- label: __('{0} {1} Manually', [primary_label, label]),
- depends_on: 'eval:doc.import_using_csv_file === 0',
+ fieldtype: "Section Break",
+ label: __("{0} {1} Manually", [primary_label, label]),
+ depends_on: "eval:doc.import_using_csv_file === 0",
},
{
- fieldtype: 'Small Text',
- label: __('Enter Serial Nos'),
- fieldname: 'upload_serial_nos',
- depends_on: 'eval:doc.import_using_csv_file === 0',
- description: __('Enter each serial no in a new line'),
+ fieldtype: "Small Text",
+ label: __("Enter Serial Nos"),
+ fieldname: "upload_serial_nos",
+ depends_on: "eval:doc.import_using_csv_file === 0",
+ description: __("Enter each serial no in a new line"),
},
{
- fieldtype: 'Column Break',
- depends_on: 'eval:doc.import_using_csv_file === 0',
+ fieldtype: "Column Break",
+ depends_on: "eval:doc.import_using_csv_file === 0",
},
{
- fieldtype: 'Button',
- fieldname: 'make_serial_nos',
- label: __('Create Serial Nos'),
- depends_on: 'eval:doc.import_using_csv_file === 0',
+ fieldtype: "Button",
+ fieldname: "make_serial_nos",
+ label: __("Create Serial Nos"),
+ depends_on: "eval:doc.import_using_csv_file === 0",
click: () => {
this.create_serial_nos();
- }
+ },
},
{
- fieldtype: 'Section Break',
- depends_on: 'eval:doc.import_using_csv_file === 1',
- }
+ fieldtype: "Section Break",
+ depends_on: "eval:doc.import_using_csv_file === 1",
+ },
];
}
- fields = [...fields,
+ fields = [
+ ...fields,
{
- fieldtype: 'Button',
- fieldname: 'download_csv',
- label: __('Download CSV Template'),
- click: () => this.download_csv_file()
+ fieldtype: "Button",
+ fieldname: "download_csv",
+ label: __("Download CSV Template"),
+ click: () => this.download_csv_file(),
},
{
- fieldtype: 'Column Break',
+ fieldtype: "Column Break",
},
{
- fieldtype: 'Attach',
- fieldname: 'attach_serial_batch_csv',
- label: __('Attach CSV File'),
- onchange: () => this.upload_csv_file()
- }
+ fieldtype: "Attach",
+ fieldname: "attach_serial_batch_csv",
+ label: __("Attach CSV File"),
+ onchange: () => this.upload_csv_file(),
+ },
];
return fields;
}
create_serial_nos() {
- let {upload_serial_nos} = this.dialog.get_values();
+ let { upload_serial_nos } = this.dialog.get_values();
if (!upload_serial_nos) {
- frappe.throw(__('Please enter Serial Nos'));
+ frappe.throw(__("Please enter Serial Nos"));
}
frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.create_serial_nos',
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.create_serial_nos",
args: {
item_code: this.item.item_code,
- serial_nos: upload_serial_nos
+ serial_nos: upload_serial_nos,
},
callback: (r) => {
if (r.message) {
@@ -274,20 +274,22 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
this.set_data(r.message);
this.update_bundle_entries();
}
- }
+ },
});
}
download_csv_file() {
- let csvFileData = ['Serial No'];
+ let csvFileData = ["Serial No"];
if (this.item.has_serial_no && this.item.has_batch_no) {
- csvFileData = ['Serial No', 'Batch No', 'Quantity'];
+ csvFileData = ["Serial No", "Batch No", "Quantity"];
} else if (this.item.has_batch_no) {
- csvFileData = ['Batch No', 'Quantity'];
+ csvFileData = ["Batch No", "Quantity"];
}
- const method = `/api/method/erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.download_blank_csv_template?content=${encodeURIComponent(JSON.stringify(csvFileData))}`;
+ const method = `/api/method/erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.download_blank_csv_template?content=${encodeURIComponent(
+ JSON.stringify(csvFileData)
+ )}`;
const w = window.open(frappe.urllib.get_full_url(method));
if (!w) {
frappe.msgprint(__("Please enable pop-ups"));
@@ -295,13 +297,13 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
upload_csv_file() {
- const file_path = this.dialog.get_value("attach_serial_batch_csv")
+ const file_path = this.dialog.get_value("attach_serial_batch_csv");
frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.upload_csv_file',
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.upload_csv_file",
args: {
item_code: this.item.item_code,
- file_path: file_path
+ file_path: file_path,
},
callback: (r) => {
if (r.message.serial_nos && r.message.serial_nos.length) {
@@ -309,102 +311,106 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
} else if (r.message.batch_nos && r.message.batch_nos.length) {
this.set_data(r.message.batch_nos);
}
- }
+ },
});
}
get_filter_fields() {
return [
{
- fieldtype: 'Section Break',
- label: __('Auto Fetch')
+ fieldtype: "Section Break",
+ label: __("Auto Fetch"),
},
{
- fieldtype: 'Float',
- fieldname: 'qty',
- label: __('Qty to Fetch'),
- onchange: () => this.get_auto_data()
+ fieldtype: "Float",
+ fieldname: "qty",
+ label: __("Qty to Fetch"),
+ onchange: () => this.get_auto_data(),
},
{
- fieldtype: 'Column Break',
+ fieldtype: "Column Break",
},
{
- fieldtype: 'Select',
- options: ['FIFO', 'LIFO', 'Expiry'],
- default: 'FIFO',
- fieldname: 'based_on',
- label: __('Fetch Based On'),
- onchange: () => this.get_auto_data()
+ fieldtype: "Select",
+ options: ["FIFO", "LIFO", "Expiry"],
+ default: "FIFO",
+ fieldname: "based_on",
+ label: __("Fetch Based On"),
+ onchange: () => this.get_auto_data(),
},
{
- fieldtype: 'Section Break',
+ fieldtype: "Section Break",
},
- ]
-
+ ];
}
get_dialog_table_fields() {
- let fields = []
+ let fields = [];
if (this.item.has_serial_no) {
fields.push({
- fieldtype: 'Link',
- options: 'Serial No',
- fieldname: 'serial_no',
- label: __('Serial No'),
+ fieldtype: "Link",
+ options: "Serial No",
+ fieldname: "serial_no",
+ label: __("Serial No"),
in_list_view: 1,
get_query: () => {
return {
- filters: this.get_serial_no_filters()
- }
- }
- })
+ filters: this.get_serial_no_filters(),
+ };
+ },
+ });
}
- let batch_fields = []
+ let batch_fields = [];
if (this.item.has_batch_no) {
batch_fields = [
{
- fieldtype: 'Link',
- options: 'Batch',
- fieldname: 'batch_no',
- label: __('Batch No'),
+ fieldtype: "Link",
+ options: "Batch",
+ fieldname: "batch_no",
+ label: __("Batch No"),
in_list_view: 1,
get_query: () => {
let is_inward = false;
- if ((["Purchase Receipt", "Purchase Invoice"].includes(this.frm.doc.doctype) && !this.frm.doc.is_return)
- || (this.frm.doc.doctype === 'Stock Entry' && this.frm.doc.purpose === 'Material Receipt')) {
+ if (
+ (["Purchase Receipt", "Purchase Invoice"].includes(this.frm.doc.doctype) &&
+ !this.frm.doc.is_return) ||
+ (this.frm.doc.doctype === "Stock Entry" &&
+ this.frm.doc.purpose === "Material Receipt")
+ ) {
is_inward = true;
}
return {
- query : "erpnext.controllers.queries.get_batch_no",
+ query: "erpnext.controllers.queries.get_batch_no",
filters: {
- 'item_code': this.item.item_code,
- 'warehouse': this.item.s_warehouse || this.item.t_warehouse || this.item.warehouse,
- 'is_inward': is_inward
- }
- }
+ item_code: this.item.item_code,
+ warehouse:
+ this.item.s_warehouse || this.item.t_warehouse || this.item.warehouse,
+ is_inward: is_inward,
+ },
+ };
},
- }
- ]
+ },
+ ];
if (!this.item.has_serial_no) {
batch_fields.push({
- fieldtype: 'Float',
- fieldname: 'qty',
- label: __('Quantity'),
+ fieldtype: "Float",
+ fieldname: "qty",
+ label: __("Quantity"),
in_list_view: 1,
- })
+ });
}
}
fields = [...fields, ...batch_fields];
fields.push({
- fieldtype: 'Data',
- fieldname: 'name',
- label: __('Name'),
+ fieldtype: "Data",
+ fieldname: "name",
+ label: __("Name"),
hidden: 1,
});
@@ -425,26 +431,26 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
if (!based_on) {
- based_on = 'FIFO';
+ based_on = "FIFO";
}
if (qty) {
frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_auto_data',
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_auto_data",
args: {
item_code: this.item.item_code,
warehouse: this.item.warehouse || this.item.s_warehouse,
has_serial_no: this.item.has_serial_no,
has_batch_no: this.item.has_batch_no,
qty: qty,
- based_on: based_on
+ based_on: based_on,
},
callback: (r) => {
if (r.message) {
this.dialog.fields_dict.entries.df.data = r.message;
this.dialog.fields_dict.entries.grid.refresh();
}
- }
+ },
});
}
}
@@ -454,7 +460,7 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
if (scan_serial_no || scan_batch_no) {
frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.is_serial_batch_no_exists',
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.is_serial_batch_no_exists",
args: {
item_code: this.item.item_code,
type_of_transaction: this.item.type_of_transaction,
@@ -463,9 +469,8 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
},
callback: (r) => {
this.update_serial_batch_no();
- }
-
- })
+ },
+ });
}
}
@@ -473,25 +478,25 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
const { scan_serial_no, scan_batch_no } = this.dialog.get_values();
if (scan_serial_no) {
- let existing_row = this.dialog.fields_dict.entries.df.data.filter(d => {
+ let existing_row = this.dialog.fields_dict.entries.df.data.filter((d) => {
if (d.serial_no === scan_serial_no) {
- return d
+ return d;
}
});
if (existing_row?.length) {
- frappe.throw(__('Serial No {0} already exists', [scan_serial_no]));
+ frappe.throw(__("Serial No {0} already exists", [scan_serial_no]));
}
if (!this.item.has_batch_no) {
this.dialog.fields_dict.entries.df.data.push({
- serial_no: scan_serial_no
+ serial_no: scan_serial_no,
});
- this.dialog.fields_dict.scan_serial_no.set_value('');
+ this.dialog.fields_dict.scan_serial_no.set_value("");
} else {
frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_batch_no_from_serial_no',
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_batch_no_from_serial_no",
args: {
serial_no: scan_serial_no,
},
@@ -499,19 +504,18 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
if (r.message) {
this.dialog.fields_dict.entries.df.data.push({
serial_no: scan_serial_no,
- batch_no: r.message
+ batch_no: r.message,
});
- this.dialog.fields_dict.scan_serial_no.set_value('');
+ this.dialog.fields_dict.scan_serial_no.set_value("");
}
- }
-
- })
+ },
+ });
}
} else if (scan_batch_no) {
- let existing_row = this.dialog.fields_dict.entries.df.data.filter(d => {
+ let existing_row = this.dialog.fields_dict.entries.df.data.filter((d) => {
if (d.batch_no === scan_batch_no) {
- return d
+ return d;
}
});
@@ -520,11 +524,11 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
} else {
this.dialog.fields_dict.entries.df.data.push({
batch_no: scan_batch_no,
- qty: 1
+ qty: 1,
});
}
- this.dialog.fields_dict.scan_batch_no.set_value('');
+ this.dialog.fields_dict.scan_batch_no.set_value("");
}
this.dialog.fields_dict.entries.grid.refresh();
@@ -532,33 +536,33 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
update_bundle_entries() {
let entries = this.dialog.get_values().entries;
- let warehouse = this.dialog.get_value('warehouse');
+ let warehouse = this.dialog.get_value("warehouse");
- if (entries && !entries.length || !entries) {
- frappe.throw(__('Please add atleast one Serial No / Batch No'));
+ if ((entries && !entries.length) || !entries) {
+ frappe.throw(__("Please add atleast one Serial No / Batch No"));
}
- frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.add_serial_batch_ledgers',
- args: {
- entries: entries,
- child_row: this.item,
- doc: this.frm.doc,
- warehouse: warehouse,
- }
- }).then(r => {
- this.callback && this.callback(r.message);
- this.frm.save();
- this.dialog.hide();
- })
+ frappe
+ .call({
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.add_serial_batch_ledgers",
+ args: {
+ entries: entries,
+ child_row: this.item,
+ doc: this.frm.doc,
+ warehouse: warehouse,
+ },
+ })
+ .then((r) => {
+ this.callback && this.callback(r.message);
+ this.frm.save();
+ this.dialog.hide();
+ });
}
edit_full_form() {
- let bundle_id = this.item.serial_and_batch_bundle
+ let bundle_id = this.item.serial_and_batch_bundle;
if (!bundle_id) {
- let _new = frappe.model.get_new_doc(
- "Serial and Batch Bundle", null, null, true
- );
+ let _new = frappe.model.get_new_doc("Serial and Batch Bundle", null, null, true);
_new.item_code = this.item.item_code;
_new.warehouse = this.get_warehouse();
@@ -575,34 +579,36 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
get_warehouse() {
- return (this.item?.type_of_transaction === "Outward" ?
- (this.item.warehouse || this.item.s_warehouse)
- : (this.item.warehouse || this.item.t_warehouse));
+ return this.item?.type_of_transaction === "Outward"
+ ? this.item.warehouse || this.item.s_warehouse
+ : this.item.warehouse || this.item.t_warehouse;
}
render_data() {
if (this.bundle) {
- frappe.call({
- method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_serial_batch_ledgers',
- args: {
- item_code: this.item.item_code,
- name: this.bundle,
- voucher_no: !this.frm.is_new() ? this.item.parent : "",
- }
- }).then(r => {
- if (r.message) {
- this.set_data(r.message);
- }
- })
+ frappe
+ .call({
+ method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_serial_batch_ledgers",
+ args: {
+ item_code: this.item.item_code,
+ name: this.bundle,
+ voucher_no: !this.frm.is_new() ? this.item.parent : "",
+ },
+ })
+ .then((r) => {
+ if (r.message) {
+ this.set_data(r.message);
+ }
+ });
}
}
set_data(data) {
- data.forEach(d => {
+ data.forEach((d) => {
d.qty = Math.abs(d.qty);
this.dialog.fields_dict.entries.df.data.push(d);
});
this.dialog.fields_dict.entries.grid.refresh();
}
-}
\ No newline at end of file
+};
diff --git a/erpnext/public/js/utils/supplier_quick_entry.js b/erpnext/public/js/utils/supplier_quick_entry.js
index 687b01454a22..968ef74c3a05 100644
--- a/erpnext/public/js/utils/supplier_quick_entry.js
+++ b/erpnext/public/js/utils/supplier_quick_entry.js
@@ -1,3 +1,3 @@
-frappe.provide('frappe.ui.form');
+frappe.provide("frappe.ui.form");
frappe.ui.form.SupplierQuickEntryForm = frappe.ui.form.ContactAddressQuickEntryForm;
diff --git a/erpnext/public/js/utils/unreconcile.js b/erpnext/public/js/utils/unreconcile.js
index 79490a162d3f..6864e2865d3a 100644
--- a/erpnext/public/js/utils/unreconcile.js
+++ b/erpnext/public/js/utils/unreconcile.js
@@ -1,27 +1,34 @@
-frappe.provide('erpnext.accounts');
+frappe.provide("erpnext.accounts");
erpnext.accounts.unreconcile_payment = {
add_unreconcile_btn(frm) {
if (frm.doc.docstatus == 1) {
- if(((frm.doc.doctype == "Journal Entry") && (frm.doc.voucher_type != "Journal Entry"))
- || !["Purchase Invoice", "Sales Invoice", "Journal Entry", "Payment Entry"].includes(frm.doc.doctype)
- ) {
+ if (
+ (frm.doc.doctype == "Journal Entry" && frm.doc.voucher_type != "Journal Entry") ||
+ !["Purchase Invoice", "Sales Invoice", "Journal Entry", "Payment Entry"].includes(
+ frm.doc.doctype
+ )
+ ) {
return;
}
frappe.call({
- "method": "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.doc_has_references",
- "args": {
- "doctype": frm.doc.doctype,
- "docname": frm.doc.name
+ method: "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.doc_has_references",
+ args: {
+ doctype: frm.doc.doctype,
+ docname: frm.doc.name,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.add_custom_button(__("UnReconcile"), function() {
- erpnext.accounts.unreconcile_payment.build_unreconcile_dialog(frm);
- }, __('Actions'));
+ frm.add_custom_button(
+ __("UnReconcile"),
+ function () {
+ erpnext.accounts.unreconcile_payment.build_unreconcile_dialog(frm);
+ },
+ __("Actions")
+ );
}
- }
+ },
});
}
},
@@ -30,18 +37,18 @@ erpnext.accounts.unreconcile_payment = {
// assuming each row is an individual voucher
// pass this to server side method that creates unreconcile doc for each row
let selection_map = [];
- if (['Sales Invoice', 'Purchase Invoice'].includes(frm.doc.doctype)) {
- selection_map = selections.map(function(elem) {
+ if (["Sales Invoice", "Purchase Invoice"].includes(frm.doc.doctype)) {
+ selection_map = selections.map(function (elem) {
return {
company: elem.company,
voucher_type: elem.voucher_type,
voucher_no: elem.voucher_no,
against_voucher_type: frm.doc.doctype,
- against_voucher_no: frm.doc.name
+ against_voucher_no: frm.doc.name,
};
});
- } else if (['Payment Entry', 'Journal Entry'].includes(frm.doc.doctype)) {
- selection_map = selections.map(function(elem) {
+ } else if (["Payment Entry", "Journal Entry"].includes(frm.doc.doctype)) {
+ selection_map = selections.map(function (elem) {
return {
company: elem.company,
voucher_type: frm.doc.doctype,
@@ -55,18 +62,41 @@ erpnext.accounts.unreconcile_payment = {
},
build_unreconcile_dialog(frm) {
- if (['Sales Invoice', 'Purchase Invoice', 'Payment Entry', 'Journal Entry'].includes(frm.doc.doctype)) {
+ if (
+ ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"].includes(frm.doc.doctype)
+ ) {
let child_table_fields = [
- { label: __("Voucher Type"), fieldname: "voucher_type", fieldtype: "Dynamic Link", options: "DocType", in_list_view: 1, read_only: 1},
- { label: __("Voucher No"), fieldname: "voucher_no", fieldtype: "Link", options: "voucher_type", in_list_view: 1, read_only: 1 },
- { label: __("Allocated Amount"), fieldname: "allocated_amount", fieldtype: "Currency", in_list_view: 1, read_only: 1 , options: "account_currency"},
- { label: __("Currency"), fieldname: "account_currency", fieldtype: "Currency", read_only: 1},
- ]
+ {
+ label: __("Voucher Type"),
+ fieldname: "voucher_type",
+ fieldtype: "Dynamic Link",
+ options: "DocType",
+ in_list_view: 1,
+ read_only: 1,
+ },
+ {
+ label: __("Voucher No"),
+ fieldname: "voucher_no",
+ fieldtype: "Link",
+ options: "voucher_type",
+ in_list_view: 1,
+ read_only: 1,
+ },
+ {
+ label: __("Allocated Amount"),
+ fieldname: "allocated_amount",
+ fieldtype: "Currency",
+ in_list_view: 1,
+ read_only: 1,
+ options: "account_currency",
+ },
+ { label: __("Currency"), fieldname: "account_currency", fieldtype: "Currency", read_only: 1 },
+ ];
let unreconcile_dialog_fields = [
{
- label: __('Allocations'),
- fieldname: 'allocations',
- fieldtype: 'Table',
+ label: __("Allocations"),
+ fieldname: "allocations",
+ fieldtype: "Table",
read_only: 1,
fields: child_table_fields,
},
@@ -74,54 +104,57 @@ erpnext.accounts.unreconcile_payment = {
// get linked payments
frappe.call({
- "method": "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.get_linked_payments_for_doc",
- "args": {
- "company": frm.doc.company,
- "doctype": frm.doc.doctype,
- "docname": frm.doc.name
+ method: "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.get_linked_payments_for_doc",
+ args: {
+ company: frm.doc.company,
+ doctype: frm.doc.doctype,
+ docname: frm.doc.name,
},
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
// populate child table with allocations
unreconcile_dialog_fields[0].data = r.message;
- unreconcile_dialog_fields[0].get_data = function(){ return r.message};
+ unreconcile_dialog_fields[0].get_data = function () {
+ return r.message;
+ };
let d = new frappe.ui.Dialog({
- title: 'UnReconcile Allocations',
+ title: "UnReconcile Allocations",
fields: unreconcile_dialog_fields,
- size: 'large',
+ size: "large",
cannot_add_rows: true,
- primary_action_label: 'UnReconcile',
+ primary_action_label: "UnReconcile",
primary_action(values) {
-
- let selected_allocations = values.allocations.filter(x=>x.__checked);
+ let selected_allocations = values.allocations.filter((x) => x.__checked);
if (selected_allocations.length > 0) {
- let selection_map = erpnext.accounts.unreconcile_payment.build_selection_map(frm, selected_allocations);
- erpnext.accounts.unreconcile_payment.create_unreconcile_docs(selection_map);
+ let selection_map =
+ erpnext.accounts.unreconcile_payment.build_selection_map(
+ frm,
+ selected_allocations
+ );
+ erpnext.accounts.unreconcile_payment.create_unreconcile_docs(
+ selection_map
+ );
d.hide();
-
} else {
frappe.msgprint("No Selection");
}
- }
+ },
});
d.show();
}
- }
+ },
});
}
},
create_unreconcile_docs(selection_map) {
frappe.call({
- "method": "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.create_unreconcile_doc_for_selection",
- "args": {
- "selections": selection_map
+ method: "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.create_unreconcile_doc_for_selection",
+ args: {
+ selections: selection_map,
},
});
- }
-
-
-
-}
+ },
+};
diff --git a/erpnext/public/js/website_theme.js b/erpnext/public/js/website_theme.js
index 0009cacf61eb..9c2b8cd11b97 100644
--- a/erpnext/public/js/website_theme.js
+++ b/erpnext/public/js/website_theme.js
@@ -1,14 +1,15 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
// MIT License. See license.txt
-frappe.ui.form.on('Website Theme', {
+frappe.ui.form.on("Website Theme", {
validate(frm) {
let theme_scss = frm.doc.theme_scss;
- if (theme_scss && theme_scss.includes('frappe/public/scss/website')
- && !theme_scss.includes('erpnext/public/scss/website')
+ if (
+ theme_scss &&
+ theme_scss.includes("frappe/public/scss/website") &&
+ !theme_scss.includes("erpnext/public/scss/website")
) {
- frm.set_value('theme_scss',
- `${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);
+ frm.set_value("theme_scss", `${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);
}
- }
+ },
});
diff --git a/erpnext/public/js/website_utils.js b/erpnext/public/js/website_utils.js
index 2bb5255eebc7..981899f8744b 100644
--- a/erpnext/public/js/website_utils.js
+++ b/erpnext/public/js/website_utils.js
@@ -1,14 +1,14 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-if(!window.erpnext) window.erpnext = {};
+if (!window.erpnext) window.erpnext = {};
-erpnext.subscribe_to_newsletter = function(opts, btn) {
+erpnext.subscribe_to_newsletter = function (opts, btn) {
return frappe.call({
type: "POST",
method: "frappe.email.doctype.newsletter.newsletter.subscribe",
btn: btn,
- args: {"email": opts.email},
- callback: opts.callback
+ args: { email: opts.email },
+ callback: opts.callback,
});
-}
+};
diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss
index 1626b7c894d3..e45ae5038f5c 100644
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -51,7 +51,7 @@
}
// assessment tool
-.frappe-control[data-fieldname='result_html'] {
+.frappe-control[data-fieldname="result_html"] {
overflow: scroll;
}
.assessment-result-tool {
@@ -70,7 +70,9 @@
text-overflow: ellipsis;
}
- .total-score, .grade, .score {
+ .total-score,
+ .grade,
+ .score {
text-align: right;
}
}
@@ -78,13 +80,13 @@
/* pos */
body[data-route="pos"] {
-
.pos-bill-toolbar {
padding: 10px 0px;
height: 51px;
}
- .pos-bill-item:hover, .list-customers-table > .pos-list-row:hover {
+ .pos-bill-item:hover,
+ .list-customers-table > .pos-list-row:hover {
background-color: #f5f7fa;
cursor: pointer;
}
@@ -135,50 +137,52 @@ body[data-route="pos"] {
}
.pos-payment-row .col-xs-6 {
- padding :15px;
+ padding: 15px;
}
.pos-payment-row {
- border-bottom:1px solid var(--border-color);
+ border-bottom: 1px solid var(--border-color);
margin: 2px 0px 5px 0px;
height: 60px;
margin-top: 0px;
margin-bottom: 0px;
}
- .pos-payment-row:hover, .pos-keyboard-key:hover{
+ .pos-payment-row:hover,
+ .pos-keyboard-key:hover {
background-color: var(--bg-color);
cursor: pointer;
}
- .pos-keyboard-key, .delete-btn {
+ .pos-keyboard-key,
+ .delete-btn {
border: 1px solid var(--border-color);
- height:85px;
- width:85px;
- margin:10px 10px;
- font-size:24px;
- font-weight:200;
- background-color: #FDFDFD;
+ height: 85px;
+ width: 85px;
+ margin: 10px 10px;
+ font-size: 24px;
+ font-weight: 200;
+ background-color: #fdfdfd;
border-color: #e8e8e8;
}
.numeric-keypad {
border: 1px solid var(--border-color);
- height:69px;
- width:69px;
- font-size:20px;
- font-weight:200;
- background-color: #FDFDFD;
+ height: 69px;
+ width: 69px;
+ font-size: 20px;
+ font-weight: 200;
+ background-color: #fdfdfd;
border-color: #e8e8e8;
- margin-left:-4px;
+ margin-left: -4px;
}
.pos-pay {
- height:69px;
- width:69px;
- font-size:17px;
- font-weight:200;
- margin-left:-4px;
+ height: 69px;
+ width: 69px;
+ font-size: 17px;
+ font-weight: 200;
+ margin-left: -4px;
}
.numeric-keypad {
@@ -188,7 +192,7 @@ body[data-route="pos"] {
font-weight: 200;
border-radius: 0;
background-color: #fff;
- margin-left:-4px;
+ margin-left: -4px;
@media (max-width: var(--xl-width)) {
height: 45px;
@@ -253,7 +257,8 @@ body[data-route="pos"] {
.amount-row h3 {
font-size: 15px;
}
- .pos-keyboard-key, .delete-btn {
+ .pos-keyboard-key,
+ .delete-btn {
height: 50px;
}
.multimode-payments {
@@ -277,7 +282,8 @@ body[data-route="pos"] {
padding: 15px 10px;
}
- .write_off_amount, .change_amount {
+ .write_off_amount,
+ .change_amount {
margin: 15px;
width: 130px;
}
@@ -301,10 +307,11 @@ body[data-route="pos"] {
}
.subject {
- width: 40%
+ width: 40%;
}
- .list-row-checkbox, .list-select-all {
+ .list-row-checkbox,
+ .list-select-all {
margin-right: 7px;
}
}
@@ -397,7 +404,7 @@ body[data-route="pos"] {
padding-top: 0;
}
- &> .pos-list-row {
+ & > .pos-list-row {
border: none;
@media (max-width: var(--xl-width)) {
@@ -442,13 +449,12 @@ body[data-route="pos"] {
padding: 5px 9px;
border-radius: 3px;
color: #fff;
-
}
// Healthcare
.exercise-card {
- box-shadow: 0 1px 3px rgba(0,0,0,0.30);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border-radius: 2px;
padding: 6px 6px 6px 8px;
margin-top: 10px;
@@ -491,7 +497,9 @@ body[data-route="pos"] {
padding: 10px;
}
-.plant-floor, .workstation-wrapper, .workstation-card p {
+.plant-floor,
+.workstation-wrapper,
+.workstation-card p {
border-radius: var(--border-radius-md);
border: 1px solid var(--border-color);
box-shadow: none;
@@ -511,13 +519,13 @@ body[data-route="pos"] {
.plant-floor-container {
display: grid;
- grid-template-columns: repeat(6,minmax(0,1fr));
+ grid-template-columns: repeat(6, minmax(0, 1fr));
gap: var(--margin-xl);
}
@media screen and (max-width: 620px) {
.plant-floor-container {
- grid-template-columns: repeat(2,minmax(0,1fr));
+ grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@@ -535,8 +543,8 @@ body[data-route="pos"] {
.workstation-abbr {
display: flex;
background-color: var(--control-bg);
- height:100%;
- width:100%;
+ height: 100%;
+ width: 100%;
align-items: center;
justify-content: center;
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/scss/order-page.scss b/erpnext/public/scss/order-page.scss
index 6f5fe5d4d7a9..2b1dae282a32 100644
--- a/erpnext/public/scss/order-page.scss
+++ b/erpnext/public/scss/order-page.scss
@@ -1,115 +1,113 @@
#page-order {
- .main-column {
- .page-content-wrapper {
-
- .breadcrumb-container {
- @media screen and (min-width: 567px) {
- padding-left: var(--padding-sm);
- }
- }
-
- .container.my-4 {
- background-color: var(--fg-color);
-
- @media screen and (min-width: 567px) {
- padding: 1.25rem 1.5rem;
- border-radius: var(--border-radius-md);
- box-shadow: var(--card-shadow);
- }
- }
- }
- }
+ .main-column {
+ .page-content-wrapper {
+ .breadcrumb-container {
+ @media screen and (min-width: 567px) {
+ padding-left: var(--padding-sm);
+ }
+ }
+
+ .container.my-4 {
+ background-color: var(--fg-color);
+
+ @media screen and (min-width: 567px) {
+ padding: 1.25rem 1.5rem;
+ border-radius: var(--border-radius-md);
+ box-shadow: var(--card-shadow);
+ }
+ }
+ }
+ }
}
.indicator-container {
- @media screen and (max-width: 567px) {
- padding-bottom: 0.8rem;
- }
+ @media screen and (max-width: 567px) {
+ padding-bottom: 0.8rem;
+ }
}
.order-items {
- padding: 1.5rem 0;
- border-bottom: 1px solid var(--border-color);
- color: var(--gray-700);
-
- @media screen and (max-width: 567px) {
- align-items: flex-start !important;
- }
- .col-2 {
- @media screen and (max-width: 567px) {
- flex: auto;
- max-width: 28%;
- }
- }
-
- .order-item-name {
- font-size: var(--text-base);
- font-weight: 500;
- }
-
- .btn:focus,
- .btn:hover {
- background-color: var(--control-bg);
- }
-
-
- .col-6 {
- @media screen and (max-width: 567px) {
- max-width: 100%;
- }
-
- &.order-item-name {
- font-size: var(--text-base);
- }
- }
+ padding: 1.5rem 0;
+ border-bottom: 1px solid var(--border-color);
+ color: var(--gray-700);
+
+ @media screen and (max-width: 567px) {
+ align-items: flex-start !important;
+ }
+ .col-2 {
+ @media screen and (max-width: 567px) {
+ flex: auto;
+ max-width: 28%;
+ }
+ }
+
+ .order-item-name {
+ font-size: var(--text-base);
+ font-weight: 500;
+ }
+
+ .btn:focus,
+ .btn:hover {
+ background-color: var(--control-bg);
+ }
+
+ .col-6 {
+ @media screen and (max-width: 567px) {
+ max-width: 100%;
+ }
+
+ &.order-item-name {
+ font-size: var(--text-base);
+ }
+ }
}
.item-grand-total {
- font-size: var(--text-base);
+ font-size: var(--text-base);
}
.list-item-name,
.item-total,
.order-container,
.order-qty {
- font-size: var(--text-md);
+ font-size: var(--text-md);
}
.d-s-n {
- @media screen and (max-width: 567px) {
- display: none;
- }
+ @media screen and (max-width: 567px) {
+ display: none;
+ }
}
.d-l-n {
- @media screen and (min-width: 567px) {
- display: none;
- }
+ @media screen and (min-width: 567px) {
+ display: none;
+ }
}
.border-btm {
- border-bottom: 1px solid var(--border-color);
+ border-bottom: 1px solid var(--border-color);
}
.order-taxes {
- display: flex;
-
- @media screen and (min-width: 567px) {
- justify-content: flex-end;
- }
-
- .col-4 {
- padding-right: 0;
-
- .col-8 {
- padding-left: 0;
- padding-right: 0;
- }
-
- @media screen and (max-width: 567px) {
- padding-left: 0;
- flex: auto;
- max-width: 100%;
- }
- }
-}
\ No newline at end of file
+ display: flex;
+
+ @media screen and (min-width: 567px) {
+ justify-content: flex-end;
+ }
+
+ .col-4 {
+ padding-right: 0;
+
+ .col-8 {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ @media screen and (max-width: 567px) {
+ padding-left: 0;
+ flex: auto;
+ max-width: 100%;
+ }
+ }
+}
diff --git a/erpnext/public/scss/point-of-sale.scss b/erpnext/public/scss/point-of-sale.scss
index ba64b59b46b2..75bbabd98e2a 100644
--- a/erpnext/public/scss/point-of-sale.scss
+++ b/erpnext/public/scss/point-of-sale.scss
@@ -184,7 +184,6 @@
font-weight: 700;
}
}
-
}
}
}
@@ -261,12 +260,12 @@
flex-direction: column;
margin-right: auto;
- >.customer-name {
+ > .customer-name {
font-weight: 700;
font-size: var(--text-lg);
}
- >.customer-desc {
+ > .customer-desc {
font-weight: 500;
font-size: var(--text-sm);
}
@@ -277,7 +276,6 @@
align-items: center;
cursor: pointer;
}
-
}
> .customer-fields-container {
@@ -407,7 +405,6 @@
font-size: var(--text-lg);
}
-
> .item-name-desc {
@extend .nowrap;
display: flex;
@@ -455,7 +452,6 @@
}
}
}
-
}
}
@@ -854,7 +850,7 @@
display: flex;
flex: 1;
height: 100%;
- position: relative;
+ position: relative;
justify-content: flex-end;
> .fields-section {
@@ -1130,7 +1126,6 @@
}
}
-
> .summary-btns {
display: flex;
justify-content: space-between;
@@ -1142,7 +1137,7 @@
> .new-btn {
background-color: var(--blue-500);
- color:white;
+ color: white;
font-weight: 500;
}
}
@@ -1156,13 +1151,14 @@
grid-template-columns: repeat(1, minmax(0, 1fr));
> .items-selector {
- grid-column: span 6 / span 1 !important;
+ grid-column: span 6 / span 1 !important;
> .items-container {
- grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
+ grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
}
}
- > .item-details-container, .customer-cart-container {
+ > .item-details-container,
+ .customer-cart-container {
grid-column: span 6 / span 1;
}
@@ -1179,7 +1175,7 @@
}
}
- > .past-order-summary{
+ > .past-order-summary {
> .invoice-summary-wrapper {
width: 100%;
}
diff --git a/erpnext/public/scss/website.scss b/erpnext/public/scss/website.scss
index b5e97f1c34b8..dd2ae210c769 100644
--- a/erpnext/public/scss/website.scss
+++ b/erpnext/public/scss/website.scss
@@ -1,4 +1,4 @@
-@import './order-page';
+@import "./order-page";
.filter-options {
max-height: 300px;
@@ -52,7 +52,8 @@
border-bottom: 1px solid var(--border-color);
position: relative;
- &:only-child, &:last-child {
+ &:only-child,
+ &:last-child {
border: 0;
}
@@ -80,7 +81,8 @@
}
}
-.list-item-name, .item-total {
+.list-item-name,
+.item-total {
font-size: var(--font-size-sm);
}
@@ -88,4 +90,4 @@
@media screen and (max-width: 567px) {
margin-top: 1rem;
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/quality_management/doctype/non_conformance/non_conformance.js b/erpnext/quality_management/doctype/non_conformance/non_conformance.js
index e7f5eee623e4..5524d7472b20 100644
--- a/erpnext/quality_management/doctype/non_conformance/non_conformance.js
+++ b/erpnext/quality_management/doctype/non_conformance/non_conformance.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Non Conformance', {
+frappe.ui.form.on("Non Conformance", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/quality_management/doctype/quality_action/quality_action.js b/erpnext/quality_management/doctype/quality_action/quality_action.js
index b44f2a203440..8261fab1ab51 100644
--- a/erpnext/quality_management/doctype/quality_action/quality_action.js
+++ b/erpnext/quality_management/doctype/quality_action/quality_action.js
@@ -1,6 +1,4 @@
// Copyright (c) 2018, Frappe and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Action', {
-
-});
+frappe.ui.form.on("Quality Action", {});
diff --git a/erpnext/quality_management/doctype/quality_feedback/quality_feedback.js b/erpnext/quality_management/doctype/quality_feedback/quality_feedback.js
index 6fb326776ed7..8166c257d46c 100644
--- a/erpnext/quality_management/doctype/quality_feedback/quality_feedback.js
+++ b/erpnext/quality_management/doctype/quality_feedback/quality_feedback.js
@@ -1,10 +1,10 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Feedback', {
- template: function(frm) {
+frappe.ui.form.on("Quality Feedback", {
+ template: function (frm) {
if (frm.doc.template) {
- frm.call('set_parameters');
+ frm.call("set_parameters");
}
- }
+ },
});
diff --git a/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.js b/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.js
index 490eed970659..054572a80ebc 100644
--- a/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.js
+++ b/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.js
@@ -1,8 +1,7 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Feedback Template', {
+frappe.ui.form.on("Quality Feedback Template", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/quality_management/doctype/quality_goal/quality_goal.js b/erpnext/quality_management/doctype/quality_goal/quality_goal.js
index 40cb4d924649..5b7cae5d22a2 100644
--- a/erpnext/quality_management/doctype/quality_goal/quality_goal.js
+++ b/erpnext/quality_management/doctype/quality_goal/quality_goal.js
@@ -1,7 +1,7 @@
// Copyright (c) 2018, Frappe and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Goal', {
+frappe.ui.form.on("Quality Goal", {
// refresh: function(frm) {
// }
});
diff --git a/erpnext/quality_management/doctype/quality_meeting/quality_meeting.js b/erpnext/quality_management/doctype/quality_meeting/quality_meeting.js
index eb7a8c32d73c..00ab1e4c37a6 100644
--- a/erpnext/quality_management/doctype/quality_meeting/quality_meeting.js
+++ b/erpnext/quality_management/doctype/quality_meeting/quality_meeting.js
@@ -1,6 +1,4 @@
// Copyright (c) 2018, Frappe and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Meeting', {
-
-});
+frappe.ui.form.on("Quality Meeting", {});
diff --git a/erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js b/erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js
index 5fd1b30eb452..ae3112f3d09e 100644
--- a/erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js
+++ b/erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js
@@ -1,11 +1,10 @@
-frappe.listview_settings['Quality Meeting'] = {
+frappe.listview_settings["Quality Meeting"] = {
add_fields: ["status"],
- get_indicator: function(doc) {
- if(doc.status == "Open") {
+ get_indicator: function (doc) {
+ if (doc.status == "Open") {
return [__("Open"), "red", "status=,Open"];
- }
- else if(doc.status == "Close") {
+ } else if (doc.status == "Close") {
return [__("Close"), "green", ",status=,Close"];
}
- }
+ },
};
diff --git a/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.js b/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.js
index 09989dc643fc..ad037c256514 100644
--- a/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.js
+++ b/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.js
@@ -1,8 +1,7 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Meeting Agenda', {
+frappe.ui.form.on("Quality Meeting Agenda", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
index 79fd2ebdbe96..a2c16dddadbf 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
@@ -1,23 +1,23 @@
// Copyright (c) 2018, Frappe and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Procedure', {
- refresh: function(frm) {
- frm.set_query('procedure', 'processes', (frm) =>{
+frappe.ui.form.on("Quality Procedure", {
+ refresh: function (frm) {
+ frm.set_query("procedure", "processes", (frm) => {
return {
filters: {
- name: ['not in', [frm.parent_quality_procedure, frm.name]]
- }
+ name: ["not in", [frm.parent_quality_procedure, frm.name]],
+ },
};
});
- frm.set_query('parent_quality_procedure', function(){
+ frm.set_query("parent_quality_procedure", function () {
return {
filters: {
is_group: 1,
- name: ['!=', frm.doc.name]
- }
+ name: ["!=", frm.doc.name],
+ },
};
});
- }
+ },
});
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
index 2851fcc5969a..25f9a5906a10 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
@@ -1,18 +1,18 @@
frappe.treeview_settings["Quality Procedure"] = {
- ignore_fields:["parent_quality_procedure"],
- get_tree_nodes: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.get_children',
- add_tree_node: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.add_node',
+ ignore_fields: ["parent_quality_procedure"],
+ get_tree_nodes: "erpnext.quality_management.doctype.quality_procedure.quality_procedure.get_children",
+ add_tree_node: "erpnext.quality_management.doctype.quality_procedure.quality_procedure.add_node",
filters: [
{
fieldname: "parent_quality_procedure",
fieldtype: "Link",
options: "Quality Procedure",
label: __("Quality Procedure"),
- get_query: function() {
+ get_query: function () {
return {
- filters: [["Quality Procedure", 'is_group', '=', 1]]
+ filters: [["Quality Procedure", "is_group", "=", 1]],
};
- }
+ },
},
],
breadcrumb: "Quality Management",
@@ -22,13 +22,13 @@ frappe.treeview_settings["Quality Procedure"] = {
menu_items: [
{
label: __("New Quality Procedure"),
- action: function() {
+ action: function () {
frappe.new_doc("Quality Procedure", true);
},
- condition: 'frappe.boot.user.can_create.indexOf("Quality Procedure") !== -1'
- }
+ condition: 'frappe.boot.user.can_create.indexOf("Quality Procedure") !== -1',
+ },
],
- onload: function(treeview) {
+ onload: function (treeview) {
treeview.make_tree();
},
};
diff --git a/erpnext/quality_management/doctype/quality_review/quality_review.js b/erpnext/quality_management/doctype/quality_review/quality_review.js
index 0e6b7034101d..504f8fceb2ec 100644
--- a/erpnext/quality_management/doctype/quality_review/quality_review.js
+++ b/erpnext/quality_management/doctype/quality_review/quality_review.js
@@ -1,15 +1,15 @@
// Copyright (c) 2018, Frappe and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Quality Review', {
- goal: function(frm) {
+frappe.ui.form.on("Quality Review", {
+ goal: function (frm) {
frappe.call({
- "method": "frappe.client.get",
+ method: "frappe.client.get",
args: {
doctype: "Quality Goal",
- name: frm.doc.goal
+ name: frm.doc.goal,
},
- callback: function(data){
+ callback: function (data) {
frm.fields_dict.reviews.grid.remove_all();
let objectives = data.message.objectives;
for (var i in objectives) {
@@ -19,7 +19,7 @@ frappe.ui.form.on('Quality Review', {
frm.fields_dict.reviews.get_value()[i].uom = objectives[i].uom;
}
frm.refresh();
- }
+ },
});
},
});
diff --git a/erpnext/quality_management/doctype/quality_review/quality_review_list.js b/erpnext/quality_management/doctype/quality_review/quality_review_list.js
index b0be783de56f..3be6c10a89d2 100644
--- a/erpnext/quality_management/doctype/quality_review/quality_review_list.js
+++ b/erpnext/quality_management/doctype/quality_review/quality_review_list.js
@@ -1,12 +1,10 @@
-frappe.listview_settings['Quality Review'] = {
+frappe.listview_settings["Quality Review"] = {
add_fields: ["action"],
- get_indicator: function(doc)
- {
- if(doc.action == "No Action") {
+ get_indicator: function (doc) {
+ if (doc.action == "No Action") {
return [__("No Action"), "green", "action,=,No Action"];
- }
- else if(doc.action == "Action Initialised") {
+ } else if (doc.action == "Action Initialised") {
return [__("Action Initialised"), "red", "action,=,Action Initialised"];
}
- }
+ },
};
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index 5918ec8b3160..5fbb5cb7e010 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -1,39 +1,39 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Import Supplier Invoice', {
- onload: function(frm) {
+frappe.ui.form.on("Import Supplier Invoice", {
+ onload: function (frm) {
frappe.realtime.on("import_invoice_update", function (data) {
frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
if (data.count == data.total) {
- window.setTimeout(title => frm.dashboard.hide_progress(title), 1500, data.title);
+ window.setTimeout((title) => frm.dashboard.hide_progress(title), 1500, data.title);
}
});
},
- setup: function(frm) {
- frm.set_query("tax_account", function(doc) {
+ setup: function (frm) {
+ frm.set_query("tax_account", function (doc) {
return {
filters: {
- account_type: 'Tax',
- company: doc.company
- }
+ account_type: "Tax",
+ company: doc.company,
+ },
};
});
- frm.set_query("default_buying_price_list", function(doc) {
+ frm.set_query("default_buying_price_list", function (doc) {
return {
filters: {
- currency: frappe.get_doc(":Company", doc.company).default_currency
- }
+ currency: frappe.get_doc(":Company", doc.company).default_currency,
+ },
};
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.trigger("toggle_read_only_fields");
},
- toggle_read_only_fields: function(frm) {
+ toggle_read_only_fields: function (frm) {
if (in_list(["File Import Completed", "Processing File Data"], frm.doc.status)) {
cur_frm.set_read_only();
cur_frm.refresh_fields();
@@ -41,6 +41,5 @@ frappe.ui.form.on('Import Supplier Invoice', {
} else {
frm.set_df_property("import_invoices", "hidden", 0);
}
- }
-
+ },
});
diff --git a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.js b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.js
index 8257bf8a969e..02eaff53bb97 100644
--- a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.js
+++ b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Lower Deduction Certificate', {
+frappe.ui.form.on("Lower Deduction Certificate", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.js b/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.js
index e37a61ac853c..86384e41b347 100644
--- a/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.js
+++ b/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.js
@@ -1,23 +1,23 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('South Africa VAT Settings', {
- refresh: function(frm) {
- frm.set_query("company", function() {
+frappe.ui.form.on("South Africa VAT Settings", {
+ refresh: function (frm) {
+ frm.set_query("company", function () {
return {
filters: {
country: "South Africa",
- }
+ },
};
});
- frm.set_query("account", "vat_accounts", function() {
+ frm.set_query("account", "vat_accounts", function () {
return {
filters: {
company: frm.doc.company,
account_type: "Tax",
- is_group: 0
- }
+ is_group: 0,
+ },
};
});
- }
+ },
});
diff --git a/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
index 66531412fafe..c7d0f054b514 100644
--- a/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
+++ b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
@@ -1,14 +1,14 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('UAE VAT Settings', {
- onload: function(frm) {
- frm.set_query('account', 'uae_vat_accounts', function() {
+frappe.ui.form.on("UAE VAT Settings", {
+ onload: function (frm) {
+ frm.set_query("account", "uae_vat_accounts", function () {
return {
filters: {
- 'company': frm.doc.company
- }
+ company: frm.doc.company,
+ },
};
});
- }
+ },
});
diff --git a/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js b/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
index 4fc1be1ff54c..c88348920750 100644
--- a/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
+++ b/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
@@ -1,53 +1,54 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["Electronic Invoice Register"] = {
- "filters": [
+ filters: [
{
- "fieldname":"from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ width: "80",
},
{
- "fieldname":"to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ default: frappe.datetime.get_today(),
},
{
- "fieldname":"customer",
- "label": __("Customer"),
- "fieldtype": "Link",
- "options": "Customer"
+ fieldname: "customer",
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
},
{
- "fieldname":"company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
},
],
- "onload": function(reportview) {
- reportview.page.add_inner_button(__("Export E-Invoices"), function() {
+ onload: function (reportview) {
+ reportview.page.add_inner_button(__("Export E-Invoices"), function () {
//TODO: refactor condition to disallow export if report has no data.
if (!reportview.data.length) {
frappe.msgprint(__("No data to export"));
- return
+ return;
}
var w = window.open(
frappe.urllib.get_full_url(
- "/api/method/erpnext.regional.italy.utils.export_invoices?"
- + "filters=" + JSON.stringify(reportview.get_filter_values())
+ "/api/method/erpnext.regional.italy.utils.export_invoices?" +
+ "filters=" +
+ JSON.stringify(reportview.get_filter_values())
)
);
if (!w) {
- frappe.msgprint(__("Please enable pop-ups")); return;
+ frappe.msgprint(__("Please enable pop-ups"));
+ return;
}
- })
- }
-}
+ });
+ },
+};
diff --git a/erpnext/regional/report/irs_1099/irs_1099.js b/erpnext/regional/report/irs_1099/irs_1099.js
index b3508e40a9f5..385468b58aae 100644
--- a/erpnext/regional/report/irs_1099/irs_1099.js
+++ b/erpnext/regional/report/irs_1099/irs_1099.js
@@ -2,33 +2,33 @@
// License: GNU General Public License v3. See license.txt
frappe.query_reports["IRS 1099"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "default": frappe.defaults.get_user_default("Company"),
- "reqd": 1,
- "width": 80,
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1,
+ width: 80,
},
{
- "fieldname": "fiscal_year",
- "label": __("Fiscal Year"),
- "fieldtype": "Link",
- "options": "Fiscal Year",
- "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
- "reqd": 1,
- "width": 80,
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()),
+ reqd: 1,
+ width: 80,
},
{
- "fieldname": "supplier_group",
- "label": __("Supplier Group"),
- "fieldtype": "Link",
- "options": "Supplier Group",
- "default": "",
- "reqd": 0,
- "width": 80
+ fieldname: "supplier_group",
+ label: __("Supplier Group"),
+ fieldtype: "Link",
+ options: "Supplier Group",
+ default: "",
+ reqd: 0,
+ width: 80,
},
],
@@ -36,12 +36,15 @@ frappe.query_reports["IRS 1099"] = {
query_report.page.add_inner_button(__("Print IRS 1099 Forms"), () => {
build_1099_print(query_report);
});
- }
+ },
};
function build_1099_print(query_report) {
let filters = JSON.stringify(query_report.get_values());
- let w = window.open('/api/method/erpnext.regional.report.irs_1099.irs_1099.irs_1099_print?' +
- '&filters=' + encodeURIComponent(filters));
+ let w = window.open(
+ "/api/method/erpnext.regional.report.irs_1099.irs_1099.irs_1099_print?" +
+ "&filters=" +
+ encodeURIComponent(filters)
+ );
// w.print();
}
diff --git a/erpnext/regional/report/uae_vat_201/uae_vat_201.js b/erpnext/regional/report/uae_vat_201/uae_vat_201.js
index eaefc0420a8b..49060fdf66ac 100644
--- a/erpnext/regional/report/uae_vat_201/uae_vat_201.js
+++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.js
@@ -1,36 +1,38 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["UAE VAT 201"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -3),
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -3),
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.get_today()
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
},
],
- "formatter": function(value, row, column, data, default_formatter) {
- if (data
- && (data.legend=='VAT on Sales and All Other Outputs' || data.legend=='VAT on Expenses and All Other Inputs')
- && data.legend==value) {
+ formatter: function (value, row, column, data, default_formatter) {
+ if (
+ data &&
+ (data.legend == "VAT on Sales and All Other Outputs" ||
+ data.legend == "VAT on Expenses and All Other Inputs") &&
+ data.legend == value
+ ) {
value = $(`
${value} `);
var $value = $(value).css("font-weight", "bold");
value = $value.wrap("
").parent().html();
diff --git a/erpnext/regional/report/vat_audit_report/vat_audit_report.js b/erpnext/regional/report/vat_audit_report/vat_audit_report.js
index 41318f3160c6..de4fde596cd7 100644
--- a/erpnext/regional/report/vat_audit_report/vat_audit_report.js
+++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.js
@@ -1,31 +1,30 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-
frappe.query_reports["VAT Audit Report"] = {
- "filters": [
+ filters: [
{
- "fieldname": "company",
- "label": __("Company"),
- "fieldtype": "Link",
- "options": "Company",
- "reqd": 1,
- "default": frappe.defaults.get_user_default("Company")
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
},
{
- "fieldname": "from_date",
- "label": __("From Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.add_months(frappe.datetime.get_today(), -2),
- "width": "80"
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.add_months(frappe.datetime.get_today(), -2),
+ width: "80",
},
{
- "fieldname": "to_date",
- "label": __("To Date"),
- "fieldtype": "Date",
- "reqd": 1,
- "default": frappe.datetime.get_today()
- }
- ]
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.get_today(),
+ },
+ ],
};
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index ddc7e2af8fb4..50248a985aad 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -2,15 +2,15 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Customer", {
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- "Opportunity": "Opportunity",
- "Quotation": "Quotation",
+ Opportunity: "Opportunity",
+ Quotation: "Quotation",
"Sales Order": "Sales Order",
"Pricing Rule": "Pricing Rule",
};
frm.make_methods = {
- "Quotation": () =>
+ Quotation: () =>
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.customer.customer.make_quotation",
frm: frm,
@@ -21,163 +21,181 @@ frappe.ui.form.on("Customer", {
so.customer = frm.doc.name; // Set the current customer as the SO customer
frappe.set_route("Form", "Sales Order", so.name);
}),
- "Opportunity": () =>
+ Opportunity: () =>
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.customer.customer.make_opportunity",
frm: frm,
}),
- "Pricing Rule": () =>
- erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name),
+ "Pricing Rule": () => erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name),
};
- frm.add_fetch('lead_name', 'company_name', 'customer_name');
- frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
- frm.set_query('customer_group', {'is_group': 0});
- frm.set_query('default_price_list', { 'selling': 1});
- frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
- let d = locals[cdt][cdn];
+ frm.add_fetch("lead_name", "company_name", "customer_name");
+ frm.add_fetch("default_sales_partner", "commission_rate", "default_commission_rate");
+ frm.set_query("customer_group", { is_group: 0 });
+ frm.set_query("default_price_list", { selling: 1 });
+ frm.set_query("account", "accounts", function (doc, cdt, cdn) {
+ let d = locals[cdt][cdn];
let filters = {
- 'account_type': 'Receivable',
- 'root_type': 'Asset',
- 'company': d.company,
- "is_group": 0
+ account_type: "Receivable",
+ root_type: "Asset",
+ company: d.company,
+ is_group: 0,
};
- if(doc.party_account_currency) {
- $.extend(filters, {"account_currency": doc.party_account_currency});
+ if (doc.party_account_currency) {
+ $.extend(filters, { account_currency: doc.party_account_currency });
}
return {
- filters: filters
- }
+ filters: filters,
+ };
});
- frm.set_query('advance_account', 'accounts', function (doc, cdt, cdn) {
+ frm.set_query("advance_account", "accounts", function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
filters: {
- "account_type": 'Receivable',
- "root_type": "Liability",
- "company": d.company,
- "is_group": 0
- }
- }
+ account_type: "Receivable",
+ root_type: "Liability",
+ company: d.company,
+ is_group: 0,
+ },
+ };
});
-
if (frm.doc.__islocal == 1) {
frm.set_value("represents_company", "");
}
- frm.set_query('customer_primary_contact', function(doc) {
+ frm.set_query("customer_primary_contact", function (doc) {
return {
query: "erpnext.selling.doctype.customer.customer.get_customer_primary_contact",
filters: {
- 'customer': doc.name
- }
- }
- })
- frm.set_query('customer_primary_address', function(doc) {
+ customer: doc.name,
+ },
+ };
+ });
+ frm.set_query("customer_primary_address", function (doc) {
return {
filters: {
- 'link_doctype': 'Customer',
- 'link_name': doc.name
- }
- }
- })
+ link_doctype: "Customer",
+ link_name: doc.name,
+ },
+ };
+ });
- frm.set_query('default_bank_account', function() {
+ frm.set_query("default_bank_account", function () {
return {
filters: {
- 'is_company_account': 1
- }
- }
+ is_company_account: 1,
+ },
+ };
});
- frm.set_query("user", "portal_users", function() {
+ frm.set_query("user", "portal_users", function () {
return {
filters: {
- "ignore_user_type": true,
- }
+ ignore_user_type: true,
+ },
};
});
},
- customer_primary_address: function(frm){
- if(frm.doc.customer_primary_address){
+ customer_primary_address: function (frm) {
+ if (frm.doc.customer_primary_address) {
frappe.call({
- method: 'frappe.contacts.doctype.address.address.get_address_display',
+ method: "frappe.contacts.doctype.address.address.get_address_display",
args: {
- "address_dict": frm.doc.customer_primary_address
+ address_dict: frm.doc.customer_primary_address,
},
- callback: function(r) {
+ callback: function (r) {
frm.set_value("primary_address", r.message);
- }
+ },
});
}
- if(!frm.doc.customer_primary_address){
+ if (!frm.doc.customer_primary_address) {
frm.set_value("primary_address", "");
}
},
- is_internal_customer: function(frm) {
+ is_internal_customer: function (frm) {
if (frm.doc.is_internal_customer == 1) {
frm.toggle_reqd("represents_company", true);
- }
- else {
+ } else {
frm.toggle_reqd("represents_company", false);
}
},
- customer_primary_contact: function(frm){
- if(!frm.doc.customer_primary_contact){
+ customer_primary_contact: function (frm) {
+ if (!frm.doc.customer_primary_contact) {
frm.set_value("mobile_no", "");
frm.set_value("email_id", "");
}
},
- loyalty_program: function(frm) {
- if(frm.doc.loyalty_program) {
- frm.set_value('loyalty_program_tier', null);
+ loyalty_program: function (frm) {
+ if (frm.doc.loyalty_program) {
+ frm.set_value("loyalty_program_tier", null);
}
},
- refresh: function(frm) {
- if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
+ refresh: function (frm) {
+ if (frappe.defaults.get_default("cust_master_name") != "Naming Series") {
frm.toggle_display("naming_series", false);
} else {
erpnext.toggle_naming_series();
}
- if(!frm.doc.__islocal) {
+ if (!frm.doc.__islocal) {
frappe.contacts.render_address_and_contact(frm);
// custom buttons
- frm.add_custom_button(__('Accounts Receivable'), function () {
- frappe.set_route('query-report', 'Accounts Receivable', { party_type: "Customer", party: frm.doc.name });
- }, __('View'));
+ frm.add_custom_button(
+ __("Accounts Receivable"),
+ function () {
+ frappe.set_route("query-report", "Accounts Receivable", {
+ party_type: "Customer",
+ party: frm.doc.name,
+ });
+ },
+ __("View")
+ );
- frm.add_custom_button(__('Accounting Ledger'), function () {
- frappe.set_route('query-report', 'General Ledger',
- {party_type: 'Customer', party: frm.doc.name, party_name: frm.doc.customer_name});
- }, __('View'));
+ frm.add_custom_button(
+ __("Accounting Ledger"),
+ function () {
+ frappe.set_route("query-report", "General Ledger", {
+ party_type: "Customer",
+ party: frm.doc.name,
+ party_name: frm.doc.customer_name,
+ });
+ },
+ __("View")
+ );
for (const doctype in frm.make_methods) {
frm.add_custom_button(__(doctype), frm.make_methods[doctype], __("Create"));
}
- frm.add_custom_button(__('Get Customer Group Details'), function () {
- frm.trigger("get_customer_group_details");
- }, __('Actions'));
+ frm.add_custom_button(
+ __("Get Customer Group Details"),
+ function () {
+ frm.trigger("get_customer_group_details");
+ },
+ __("Actions")
+ );
if (cint(frappe.defaults.get_default("enable_common_party_accounting"))) {
- frm.add_custom_button(__('Link with Supplier'), function () {
- frm.trigger('show_party_link_dialog');
- }, __('Actions'));
+ frm.add_custom_button(
+ __("Link with Supplier"),
+ function () {
+ frm.trigger("show_party_link_dialog");
+ },
+ __("Actions")
+ );
}
// indicator
erpnext.utils.set_party_dashboard_indicators(frm);
-
} else {
frappe.contacts.clear_address_and_contact(frm);
}
@@ -186,55 +204,58 @@ frappe.ui.form.on("Customer", {
grid.set_column_disp("allocated_amount", false);
grid.set_column_disp("incentives", false);
},
- validate: function(frm) {
- if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
-
+ validate: function (frm) {
+ if (frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
},
- get_customer_group_details: function(frm) {
+ get_customer_group_details: function (frm) {
frappe.call({
method: "get_customer_group_details",
doc: frm.doc,
- callback: function() {
+ callback: function () {
frm.refresh();
- }
+ },
});
-
},
- show_party_link_dialog: function(frm) {
+ show_party_link_dialog: function (frm) {
const dialog = new frappe.ui.Dialog({
- title: __('Select a Supplier'),
- fields: [{
- fieldtype: 'Link', label: __('Supplier'),
- options: 'Supplier', fieldname: 'supplier', reqd: 1
- }],
- primary_action: function({ supplier }) {
+ title: __("Select a Supplier"),
+ fields: [
+ {
+ fieldtype: "Link",
+ label: __("Supplier"),
+ options: "Supplier",
+ fieldname: "supplier",
+ reqd: 1,
+ },
+ ],
+ primary_action: function ({ supplier }) {
frappe.call({
- method: 'erpnext.accounts.doctype.party_link.party_link.create_party_link',
+ method: "erpnext.accounts.doctype.party_link.party_link.create_party_link",
args: {
- primary_role: 'Customer',
+ primary_role: "Customer",
primary_party: frm.doc.name,
- secondary_party: supplier
+ secondary_party: supplier,
},
freeze: true,
- callback: function() {
+ callback: function () {
dialog.hide();
frappe.msgprint({
- message: __('Successfully linked to Supplier'),
- alert: true
+ message: __("Successfully linked to Supplier"),
+ alert: true,
});
},
- error: function() {
+ error: function () {
dialog.hide();
frappe.msgprint({
- message: __('Linking to Supplier Failed. Please try again.'),
- title: __('Linking Failed'),
- indicator: 'red'
+ message: __("Linking to Supplier Failed. Please try again."),
+ title: __("Linking Failed"),
+ indicator: "red",
});
- }
+ },
});
},
- primary_action_label: __('Create Link')
+ primary_action_label: __("Create Link"),
});
dialog.show();
- }
+ },
});
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js
index 38fc9ad1f13b..6149c6f873d2 100644
--- a/erpnext/selling/doctype/customer/customer_list.js
+++ b/erpnext/selling/doctype/customer/customer_list.js
@@ -1,3 +1,3 @@
-frappe.listview_settings['Customer'] = {
+frappe.listview_settings["Customer"] = {
add_fields: ["customer_name", "territory", "customer_group", "customer_type", "image"],
};
diff --git a/erpnext/selling/doctype/industry_type/industry_type.js b/erpnext/selling/doctype/industry_type/industry_type.js
index 3680906057fa..273e30fd1973 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.js
+++ b/erpnext/selling/doctype/industry_type/industry_type.js
@@ -1,13 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
-
//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-
-}
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
+cur_frm.cscript.onload = function (doc, cdt, cdn) {};
-}
+cur_frm.cscript.refresh = function (doc, cdt, cdn) {};
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 8128c77f8d4d..4e13fa76d5c2 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -1,51 +1,51 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Installation Note', {
- setup: function(frm) {
- frappe.dynamic_link = {doc: frm.doc, fieldname: 'customer', doctype: 'Customer'}
- frm.set_query('customer_address', erpnext.queries.address_query);
- frm.set_query('contact_person', erpnext.queries.contact_query);
- frm.set_query('customer', erpnext.queries.customer);
+frappe.ui.form.on("Installation Note", {
+ setup: function (frm) {
+ frappe.dynamic_link = { doc: frm.doc, fieldname: "customer", doctype: "Customer" };
+ frm.set_query("customer_address", erpnext.queries.address_query);
+ frm.set_query("contact_person", erpnext.queries.contact_query);
+ frm.set_query("customer", erpnext.queries.customer);
frm.set_query("serial_and_batch_bundle", "items", (doc, cdt, cdn) => {
let row = locals[cdt][cdn];
return {
filters: {
- 'item_code': row.item_code,
- 'voucher_type': doc.doctype,
- 'voucher_no': ["in", [doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: row.item_code,
+ voucher_type: doc.doctype,
+ voucher_no: ["in", [doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
},
- onload: function(frm) {
- if(!frm.doc.status) {
- frm.set_value({ status:'Draft'});
+ onload: function (frm) {
+ if (!frm.doc.status) {
+ frm.set_value({ status: "Draft" });
}
- if(frm.doc.__islocal) {
- frm.set_value({inst_date: frappe.datetime.get_today()});
+ if (frm.doc.__islocal) {
+ frm.set_value({ inst_date: frappe.datetime.get_today() });
}
- let sbb_field = frm.get_docfield('items', 'serial_and_batch_bundle');
+ let sbb_field = frm.get_docfield("items", "serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = (row) => {
return {
- 'item_code': row.doc.item_code,
- 'voucher_type': frm.doc.doctype,
- }
+ item_code: row.doc.item_code,
+ voucher_type: frm.doc.doctype,
+ };
};
}
},
- customer: function(frm) {
+ customer: function (frm) {
erpnext.utils.get_party_details(frm);
},
- customer_address: function(frm) {
+ customer_address: function (frm) {
erpnext.utils.get_address_display(frm);
},
- contact_person: function(frm) {
+ contact_person: function (frm) {
erpnext.utils.get_contact_details(frm);
- }
+ },
});
frappe.provide("erpnext.selling");
@@ -54,9 +54,10 @@ frappe.provide("erpnext.selling");
erpnext.selling.InstallationNote = class InstallationNote extends frappe.ui.form.Controller {
refresh() {
var me = this;
- if (this.frm.doc.docstatus===0) {
- this.frm.add_custom_button(__('From Delivery Note'),
- function() {
+ if (this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("From Delivery Note"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note",
source_doctype: "Delivery Note",
@@ -69,13 +70,15 @@ erpnext.selling.InstallationNote = class InstallationNote extends frappe.ui.form
docstatus: 1,
status: ["not in", ["Stopped", "Closed"]],
per_installed: ["<", 99.99],
- company: me.frm.doc.company
- }
- })
- }, "fa fa-download", "btn-default"
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ "fa fa-download",
+ "btn-default"
);
}
}
};
-extend_cscript(cur_frm.cscript, new erpnext.selling.InstallationNote({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.selling.InstallationNote({ frm: cur_frm }));
diff --git a/erpnext/selling/doctype/party_specific_item/party_specific_item.js b/erpnext/selling/doctype/party_specific_item/party_specific_item.js
index 077b93631ecf..0decc70d7ac4 100644
--- a/erpnext/selling/doctype/party_specific_item/party_specific_item.js
+++ b/erpnext/selling/doctype/party_specific_item/party_specific_item.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Party Specific Item', {
+frappe.ui.form.on("Party Specific Item", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 1bc8d6857e97..6e2b72626413 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -6,34 +6,33 @@ erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
erpnext.pre_sales.set_as_lost("Quotation");
erpnext.sales_common.setup_selling_controller();
-frappe.ui.form.on('Quotation', {
- setup: function(frm) {
- frm.custom_make_buttons = {
- 'Sales Order': 'Sales Order'
- },
-
- frm.set_query("quotation_to", function() {
- return{
- "filters": {
- "name": ["in", ["Customer", "Lead", "Prospect"]],
- }
- }
- });
+frappe.ui.form.on("Quotation", {
+ setup: function (frm) {
+ (frm.custom_make_buttons = {
+ "Sales Order": "Sales Order",
+ }),
+ frm.set_query("quotation_to", function () {
+ return {
+ filters: {
+ name: ["in", ["Customer", "Lead", "Prospect"]],
+ },
+ };
+ });
- frm.set_df_property('packed_items', 'cannot_add_rows', true);
- frm.set_df_property('packed_items', 'cannot_delete_rows', true);
+ frm.set_df_property("packed_items", "cannot_add_rows", true);
+ frm.set_df_property("packed_items", "cannot_delete_rows", true);
- frm.set_query('company_address', function(doc) {
- if(!doc.company) {
- frappe.throw(__('Please set Company'));
+ frm.set_query("company_address", function (doc) {
+ if (!doc.company) {
+ frappe.throw(__("Please set Company"));
}
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
- link_doctype: 'Company',
- link_name: doc.company
- }
+ link_doctype: "Company",
+ link_name: doc.company,
+ },
};
});
@@ -41,40 +40,40 @@ frappe.ui.form.on('Quotation', {
let row = locals[cdt][cdn];
return {
filters: {
- 'item_code': row.item_code,
- 'voucher_type': doc.doctype,
- 'voucher_no': ["in", [doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: row.item_code,
+ voucher_type: doc.doctype,
+ voucher_no: ["in", [doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.trigger("set_label");
frm.trigger("set_dynamic_field_label");
- let sbb_field = frm.get_docfield('packed_items', 'serial_and_batch_bundle');
+ let sbb_field = frm.get_docfield("packed_items", "serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = (row) => {
return {
- 'item_code': row.doc.item_code,
- 'warehouse': row.doc.warehouse,
- 'voucher_type': frm.doc.doctype,
- }
+ item_code: row.doc.item_code,
+ warehouse: row.doc.warehouse,
+ voucher_type: frm.doc.doctype,
+ };
};
}
},
- quotation_to: function(frm) {
+ quotation_to: function (frm) {
frm.trigger("set_label");
frm.trigger("toggle_reqd_lead_customer");
frm.trigger("set_dynamic_field_label");
},
- set_label: function(frm) {
+ set_label: function (frm) {
frm.fields_dict.customer_address.set_label(__(frm.doc.quotation_to + " Address"));
- }
+ },
});
erpnext.selling.QuotationController = class QuotationController extends erpnext.selling.SellingController {
@@ -83,11 +82,11 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
}
party_name() {
var me = this;
- erpnext.utils.get_party_details(this.frm, null, null, function() {
+ erpnext.utils.get_party_details(this.frm, null, null, function () {
me.apply_price_list();
});
- if(me.frm.doc.quotation_to=="Lead" && me.frm.doc.party_name) {
+ if (me.frm.doc.quotation_to == "Lead" && me.frm.doc.party_name) {
me.frm.trigger("get_lead_details");
}
}
@@ -95,43 +94,48 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
super.refresh(doc, dt, dn);
frappe.dynamic_link = {
doc: this.frm.doc,
- fieldname: 'party_name',
- doctype: doc.quotation_to == 'Customer' ? 'Customer' : 'Lead',
+ fieldname: "party_name",
+ doctype: doc.quotation_to == "Customer" ? "Customer" : "Lead",
};
var me = this;
if (doc.__islocal && !doc.valid_till) {
- if(frappe.boot.sysdefaults.quotation_valid_till){
- this.frm.set_value('valid_till', frappe.datetime.add_days(doc.transaction_date, frappe.boot.sysdefaults.quotation_valid_till));
+ if (frappe.boot.sysdefaults.quotation_valid_till) {
+ this.frm.set_value(
+ "valid_till",
+ frappe.datetime.add_days(
+ doc.transaction_date,
+ frappe.boot.sysdefaults.quotation_valid_till
+ )
+ );
} else {
- this.frm.set_value('valid_till', frappe.datetime.add_months(doc.transaction_date, 1));
+ this.frm.set_value("valid_till", frappe.datetime.add_months(doc.transaction_date, 1));
}
}
if (doc.docstatus == 1 && !["Lost", "Ordered"].includes(doc.status)) {
- if (frappe.boot.sysdefaults.allow_sales_order_creation_for_expired_quotation
- || (!doc.valid_till)
- || frappe.datetime.get_diff(doc.valid_till, frappe.datetime.get_today()) >= 0) {
- this.frm.add_custom_button(
- __("Sales Order"),
- () => this.make_sales_order(),
- __("Create")
- );
- }
+ if (
+ frappe.boot.sysdefaults.allow_sales_order_creation_for_expired_quotation ||
+ !doc.valid_till ||
+ frappe.datetime.get_diff(doc.valid_till, frappe.datetime.get_today()) >= 0
+ ) {
+ this.frm.add_custom_button(__("Sales Order"), () => this.make_sales_order(), __("Create"));
+ }
- if(doc.status!=="Ordered") {
- this.frm.add_custom_button(__('Set as Lost'), () => {
- this.frm.trigger('set_as_lost_dialog');
- });
- }
+ if (doc.status !== "Ordered") {
+ this.frm.add_custom_button(__("Set as Lost"), () => {
+ this.frm.trigger("set_as_lost_dialog");
+ });
+ }
- cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
+ cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if (this.frm.doc.docstatus===0) {
- this.frm.add_custom_button(__('Opportunity'),
- function() {
+ if (this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("Opportunity"),
+ function () {
erpnext.utils.map_current_doc({
method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
source_doctype: "Opportunity",
@@ -142,26 +146,28 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
fieldname: "party_name",
fieldtype: "Link",
options: me.frm.doc.quotation_to,
- default: me.frm.doc.party_name || undefined
+ default: me.frm.doc.party_name || undefined,
},
{
label: "Opportunity Type",
fieldname: "opportunity_type",
fieldtype: "Link",
options: "Opportunity Type",
- default: me.frm.doc.order_type || undefined
- }
+ default: me.frm.doc.order_type || undefined,
+ },
],
get_query_filters: {
status: ["not in", ["Lost", "Closed"]],
- company: me.frm.doc.company
- }
- })
- }, __("Get Items From"), "btn-default");
+ company: me.frm.doc.company,
+ },
+ });
+ },
+ __("Get Items From"),
+ "btn-default"
+ );
}
this.toggle_reqd_lead_customer();
-
}
make_sales_order() {
@@ -173,20 +179,20 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
} else {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
- frm: me.frm
+ frm: me.frm,
});
}
}
- set_dynamic_field_label(){
+ set_dynamic_field_label() {
if (this.frm.doc.quotation_to == "Customer") {
this.frm.set_df_property("party_name", "label", "Customer");
this.frm.fields_dict.party_name.get_query = null;
} else if (this.frm.doc.quotation_to == "Lead") {
this.frm.set_df_property("party_name", "label", "Lead");
- this.frm.fields_dict.party_name.get_query = function() {
- return{ query: "erpnext.controllers.queries.lead_query" }
- }
+ this.frm.fields_dict.party_name.get_query = function () {
+ return { query: "erpnext.controllers.queries.lead_query" };
+ };
} else if (this.frm.doc.quotation_to == "Prospect") {
this.frm.set_df_property("party_name", "label", "Prospect");
}
@@ -197,8 +203,8 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
// to overwrite the customer_filter trigger from queries.js
this.frm.toggle_reqd("party_name", this.frm.doc.quotation_to);
- this.frm.set_query('customer_address', this.address_query);
- this.frm.set_query('shipping_address_name', this.address_query);
+ this.frm.set_query("customer_address", this.address_query);
+ this.frm.set_query("shipping_address_name", this.address_query);
}
tc_name() {
@@ -207,17 +213,22 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
address_query(doc) {
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
link_doctype: frappe.dynamic_link.doctype,
- link_name: doc.party_name
- }
+ link_name: doc.party_name,
+ },
};
}
validate_company_and_party(party_field) {
- if(!this.frm.doc.quotation_to) {
- frappe.msgprint(__("Please select a value for {0} quotation_to {1}", [this.frm.doc.doctype, this.frm.doc.name]));
+ if (!this.frm.doc.quotation_to) {
+ frappe.msgprint(
+ __("Please select a value for {0} quotation_to {1}", [
+ this.frm.doc.doctype,
+ this.frm.doc.name,
+ ])
+ );
return false;
} else if (this.frm.doc.quotation_to == "Lead") {
return true;
@@ -228,85 +239,84 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
get_lead_details() {
var me = this;
- if(!this.frm.doc.quotation_to === "Lead") {
+ if (!this.frm.doc.quotation_to === "Lead") {
return;
}
frappe.call({
method: "erpnext.crm.doctype.lead.lead.get_lead_details",
args: {
- 'lead': this.frm.doc.party_name,
- 'posting_date': this.frm.doc.transaction_date,
- 'company': this.frm.doc.company,
+ lead: this.frm.doc.party_name,
+ posting_date: this.frm.doc.transaction_date,
+ company: this.frm.doc.company,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
me.frm.updating_party_details = true;
me.frm.set_value(r.message);
me.frm.refresh();
me.frm.updating_party_details = false;
-
}
- }
- })
+ },
+ });
}
show_alternative_items_dialog() {
let me = this;
const table_fields = [
- {
- fieldtype:"Data",
- fieldname:"name",
- label: __("Name"),
- read_only: 1,
- },
- {
- fieldtype:"Link",
- fieldname:"item_code",
- options: "Item",
- label: __("Item Code"),
- read_only: 1,
- in_list_view: 1,
- columns: 2,
- formatter: (value, df, options, doc) => {
- return doc.is_alternative ? `
${value} ` : value;
- }
- },
- {
- fieldtype:"Data",
- fieldname:"description",
- label: __("Description"),
- in_list_view: 1,
- read_only: 1,
- },
- {
- fieldtype:"Currency",
- fieldname:"amount",
- label: __("Amount"),
- options: "currency",
- in_list_view: 1,
- read_only: 1,
- },
- {
- fieldtype:"Check",
- fieldname:"is_alternative",
- label: __("Is Alternative"),
- read_only: 1,
- }];
-
-
- this.data = this.frm.doc.items.filter(
- (item) => item.is_alternative || item.has_alternative_item
- ).map((item) => {
- return {
- "name": item.name,
- "item_code": item.item_code,
- "description": item.description,
- "amount": item.amount,
- "is_alternative": item.is_alternative,
- }
- });
+ {
+ fieldtype: "Data",
+ fieldname: "name",
+ label: __("Name"),
+ read_only: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "item_code",
+ options: "Item",
+ label: __("Item Code"),
+ read_only: 1,
+ in_list_view: 1,
+ columns: 2,
+ formatter: (value, df, options, doc) => {
+ return doc.is_alternative ? `
${value} ` : value;
+ },
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "description",
+ label: __("Description"),
+ in_list_view: 1,
+ read_only: 1,
+ },
+ {
+ fieldtype: "Currency",
+ fieldname: "amount",
+ label: __("Amount"),
+ options: "currency",
+ in_list_view: 1,
+ read_only: 1,
+ },
+ {
+ fieldtype: "Check",
+ fieldname: "is_alternative",
+ label: __("Is Alternative"),
+ read_only: 1,
+ },
+ ];
+
+ this.data = this.frm.doc.items
+ .filter((item) => item.is_alternative || item.has_alternative_item)
+ .map((item) => {
+ return {
+ name: item.name,
+ item_code: item.item_code,
+ description: item.description,
+ amount: item.amount,
+ is_alternative: item.is_alternative,
+ };
+ });
const dialog = new frappe.ui.Dialog({
title: __("Select Alternative Items for Sales Order"),
@@ -314,7 +324,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
{
fieldname: "info",
fieldtype: "HTML",
- read_only: 1
+ read_only: 1,
},
{
fieldname: "alternative_items",
@@ -328,20 +338,20 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
get_data: () => {
return this.data;
},
- fields: table_fields
+ fields: table_fields,
},
],
- primary_action: function() {
+ primary_action: function () {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
frm: me.frm,
args: {
- selected_items: dialog.fields_dict.alternative_items.grid.get_selected_children()
- }
+ selected_items: dialog.fields_dict.alternative_items.grid.get_selected_children(),
+ },
});
dialog.hide();
},
- primary_action_label: __('Continue')
+ primary_action_label: __("Continue"),
});
dialog.fields_dict.info.$wrapper.html(
@@ -349,19 +359,24 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
${__("Alternative Items")}
`
- )
+ );
dialog.show();
}
};
cur_frm.script_manager.make(erpnext.selling.QuotationController);
-frappe.ui.form.on("Quotation Item", "items_on_form_rendered", "packed_items_on_form_rendered", function(frm, cdt, cdn) {
- // enable tax_amount field if Actual
-})
+frappe.ui.form.on(
+ "Quotation Item",
+ "items_on_form_rendered",
+ "packed_items_on_form_rendered",
+ function (frm, cdt, cdn) {
+ // enable tax_amount field if Actual
+ }
+);
-frappe.ui.form.on("Quotation Item", "stock_balance", function(frm, cdt, cdn) {
+frappe.ui.form.on("Quotation Item", "stock_balance", function (frm, cdt, cdn) {
var d = frappe.model.get_doc(cdt, cdn);
- frappe.route_options = {"item_code": d.item_code};
+ frappe.route_options = { item_code: d.item_code };
frappe.set_route("query-report", "Stock Balance");
-})
+});
diff --git a/erpnext/selling/doctype/quotation/quotation_list.js b/erpnext/selling/doctype/quotation/quotation_list.js
index 32fce1f2ad83..ae744b9cba39 100644
--- a/erpnext/selling/doctype/quotation/quotation_list.js
+++ b/erpnext/selling/doctype/quotation/quotation_list.js
@@ -1,38 +1,37 @@
-frappe.listview_settings['Quotation'] = {
- add_fields: ["customer_name", "base_grand_total", "status",
- "company", "currency", 'valid_till'],
+frappe.listview_settings["Quotation"] = {
+ add_fields: ["customer_name", "base_grand_total", "status", "company", "currency", "valid_till"],
- onload: function(listview) {
+ onload: function (listview) {
if (listview.page.fields_dict.quotation_to) {
- listview.page.fields_dict.quotation_to.get_query = function() {
+ listview.page.fields_dict.quotation_to.get_query = function () {
return {
- "filters": {
- "name": ["in", ["Customer", "Lead"]],
- }
+ filters: {
+ name: ["in", ["Customer", "Lead"]],
+ },
};
};
}
- listview.page.add_action_item(__("Sales Order"), ()=>{
+ listview.page.add_action_item(__("Sales Order"), () => {
erpnext.bulk_transaction_processing.create(listview, "Quotation", "Sales Order");
});
- listview.page.add_action_item(__("Sales Invoice"), ()=>{
+ listview.page.add_action_item(__("Sales Invoice"), () => {
erpnext.bulk_transaction_processing.create(listview, "Quotation", "Sales Invoice");
});
},
- get_indicator: function(doc) {
- if(doc.status==="Open") {
+ get_indicator: function (doc) {
+ if (doc.status === "Open") {
return [__("Open"), "orange", "status,=,Open"];
- } else if (doc.status==="Partially Ordered") {
+ } else if (doc.status === "Partially Ordered") {
return [__("Partially Ordered"), "yellow", "status,=,Partially Ordered"];
- } else if(doc.status==="Ordered") {
+ } else if (doc.status === "Ordered") {
return [__("Ordered"), "green", "status,=,Ordered"];
- } else if(doc.status==="Lost") {
+ } else if (doc.status === "Lost") {
return [__("Lost"), "gray", "status,=,Lost"];
- } else if(doc.status==="Expired") {
+ } else if (doc.status === "Expired") {
return [__("Expired"), "gray", "status,=,Expired"];
}
- }
+ },
};
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 1713a7b2c5c1..161a06474cd6 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -6,77 +6,98 @@ erpnext.accounts.taxes.setup_tax_validations("Sales Order");
erpnext.sales_common.setup_selling_controller();
frappe.ui.form.on("Sales Order", {
- setup: function(frm) {
+ setup: function (frm) {
frm.custom_make_buttons = {
- 'Delivery Note': 'Delivery Note',
- 'Pick List': 'Pick List',
- 'Sales Invoice': 'Sales Invoice',
- 'Material Request': 'Material Request',
- 'Purchase Order': 'Purchase Order',
- 'Project': 'Project',
- 'Payment Entry': "Payment",
- 'Work Order': "Work Order"
- }
- frm.add_fetch('customer', 'tax_id', 'tax_id');
+ "Delivery Note": "Delivery Note",
+ "Pick List": "Pick List",
+ "Sales Invoice": "Sales Invoice",
+ "Material Request": "Material Request",
+ "Purchase Order": "Purchase Order",
+ Project: "Project",
+ "Payment Entry": "Payment",
+ "Work Order": "Work Order",
+ };
+ frm.add_fetch("customer", "tax_id", "tax_id");
// formatter for material request item
- frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
+ frm.set_indicator_formatter("item_code", function (doc) {
+ return doc.stock_qty <= doc.delivered_qty ? "green" : "orange";
+ });
- frm.set_query('company_address', function(doc) {
- if(!doc.company) {
- frappe.throw(__('Please set Company'));
+ frm.set_query("company_address", function (doc) {
+ if (!doc.company) {
+ frappe.throw(__("Please set Company"));
}
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
+ query: "frappe.contacts.doctype.address.address.address_query",
filters: {
- link_doctype: 'Company',
- link_name: doc.company
- }
+ link_doctype: "Company",
+ link_name: doc.company,
+ },
};
- })
+ });
- frm.set_query("bom_no", "items", function(doc, cdt, cdn) {
+ frm.set_query("bom_no", "items", function (doc, cdt, cdn) {
var row = locals[cdt][cdn];
return {
filters: {
- "item": row.item_code
- }
- }
+ item: row.item_code,
+ },
+ };
});
- frm.set_df_property('packed_items', 'cannot_add_rows', true);
- frm.set_df_property('packed_items', 'cannot_delete_rows', true);
+ frm.set_df_property("packed_items", "cannot_add_rows", true);
+ frm.set_df_property("packed_items", "cannot_delete_rows", true);
},
- refresh: function(frm) {
- if(frm.doc.docstatus === 1) {
- if (frm.doc.status !== 'Closed' && flt(frm.doc.per_delivered, 2) < 100 && flt(frm.doc.per_billed, 2) < 100) {
- frm.add_custom_button(__('Update Items'), () => {
+ refresh: function (frm) {
+ if (frm.doc.docstatus === 1) {
+ if (
+ frm.doc.status !== "Closed" &&
+ flt(frm.doc.per_delivered, 2) < 100 &&
+ flt(frm.doc.per_billed, 2) < 100
+ ) {
+ frm.add_custom_button(__("Update Items"), () => {
erpnext.utils.update_child_items({
frm: frm,
child_docname: "items",
child_doctype: "Sales Order Detail",
cannot_add_row: false,
- has_reserved_stock: frm.doc.__onload && frm.doc.__onload.has_reserved_stock
- })
+ has_reserved_stock: frm.doc.__onload && frm.doc.__onload.has_reserved_stock,
+ });
});
// Stock Reservation > Reserve button should only be visible if the SO has unreserved stock and no Pick List is created against the SO.
- if (frm.doc.__onload && frm.doc.__onload.has_unreserved_stock && flt(frm.doc.per_picked) === 0) {
- frm.add_custom_button(__('Reserve'), () => frm.events.create_stock_reservation_entries(frm), __('Stock Reservation'));
+ if (
+ frm.doc.__onload &&
+ frm.doc.__onload.has_unreserved_stock &&
+ flt(frm.doc.per_picked) === 0
+ ) {
+ frm.add_custom_button(
+ __("Reserve"),
+ () => frm.events.create_stock_reservation_entries(frm),
+ __("Stock Reservation")
+ );
}
}
// Stock Reservation > Unreserve button will be only visible if the SO has un-delivered reserved stock.
if (frm.doc.__onload && frm.doc.__onload.has_reserved_stock) {
- frm.add_custom_button(__('Unreserve'), () => frm.events.cancel_stock_reservation_entries(frm), __('Stock Reservation'));
+ frm.add_custom_button(
+ __("Unreserve"),
+ () => frm.events.cancel_stock_reservation_entries(frm),
+ __("Stock Reservation")
+ );
}
- frm.doc.items.forEach(item => {
+ frm.doc.items.forEach((item) => {
if (flt(item.stock_reserved_qty) > 0) {
- frm.add_custom_button(__('Reserved Stock'), () => frm.events.show_reserved_stock(frm), __('Stock Reservation'));
+ frm.add_custom_button(
+ __("Reserved Stock"),
+ () => frm.events.show_reserved_stock(frm),
+ __("Stock Reservation")
+ );
return;
}
});
@@ -94,11 +115,11 @@ frappe.ui.form.on("Sales Order", {
frm.set_value("reserve_stock", 0);
frm.set_df_property("reserve_stock", "read_only", 1);
frm.set_df_property("reserve_stock", "hidden", 1);
- frm.fields_dict.items.grid.update_docfield_property('reserve_stock', 'hidden', 1);
- frm.fields_dict.items.grid.update_docfield_property('reserve_stock', 'default', 0);
- frm.fields_dict.items.grid.update_docfield_property('reserve_stock', 'read_only', 1);
+ frm.fields_dict.items.grid.update_docfield_property("reserve_stock", "hidden", 1);
+ frm.fields_dict.items.grid.update_docfield_property("reserve_stock", "default", 0);
+ frm.fields_dict.items.grid.update_docfield_property("reserve_stock", "read_only", 1);
}
- })
+ });
}
}
@@ -109,47 +130,47 @@ frappe.ui.form.on("Sales Order", {
},
get_items_from_internal_purchase_order(frm) {
- frm.add_custom_button(__('Purchase Order'), () => {
- erpnext.utils.map_current_doc({
- method: 'erpnext.buying.doctype.purchase_order.purchase_order.make_inter_company_sales_order',
- source_doctype: 'Purchase Order',
- target: frm,
- setters: [
- {
- label: 'Supplier',
- fieldname: 'supplier',
- fieldtype: 'Link',
- options: 'Supplier'
- }
- ],
- get_query_filters: {
- company: frm.doc.company,
- is_internal_supplier: 1,
- docstatus: 1,
- status: ['!=', 'Completed']
- }
- });
- }, __('Get Items From'));
+ frm.add_custom_button(
+ __("Purchase Order"),
+ () => {
+ erpnext.utils.map_current_doc({
+ method: "erpnext.buying.doctype.purchase_order.purchase_order.make_inter_company_sales_order",
+ source_doctype: "Purchase Order",
+ target: frm,
+ setters: [
+ {
+ label: "Supplier",
+ fieldname: "supplier",
+ fieldtype: "Link",
+ options: "Supplier",
+ },
+ ],
+ get_query_filters: {
+ company: frm.doc.company,
+ is_internal_supplier: 1,
+ docstatus: 1,
+ status: ["!=", "Completed"],
+ },
+ });
+ },
+ __("Get Items From")
+ );
},
- onload: function(frm) {
- if (!frm.doc.transaction_date){
- frm.set_value('transaction_date', frappe.datetime.get_today())
+ onload: function (frm) {
+ if (!frm.doc.transaction_date) {
+ frm.set_value("transaction_date", frappe.datetime.get_today());
}
- erpnext.queries.setup_queries(frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(frm, "Warehouse", function () {
return {
- filters: [
- ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
- ]
+ filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]],
};
});
- frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
- let row = locals[cdt][cdn];
+ frm.set_query("warehouse", "items", function (doc, cdt, cdn) {
+ let row = locals[cdt][cdn];
let query = {
- filters: [
- ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
- ]
+ filters: [["Warehouse", "company", "in", ["", cstr(frm.doc.company)]]],
};
if (row.item_code) {
query.query = "erpnext.controllers.queries.warehouse_query";
@@ -160,15 +181,15 @@ frappe.ui.form.on("Sales Order", {
// On cancel and amending a sales order with advance payment, reset advance paid amount
if (frm.is_new()) {
- frm.set_value("advance_paid", 0)
+ frm.set_value("advance_paid", 0);
}
- frm.ignore_doctypes_on_cancel_all = ['Purchase Order'];
+ frm.ignore_doctypes_on_cancel_all = ["Purchase Order"];
},
- delivery_date: function(frm) {
- $.each(frm.doc.items || [], function(i, d) {
- if(!d.delivery_date) d.delivery_date = frm.doc.delivery_date;
+ delivery_date: function (frm) {
+ $.each(frm.doc.items || [], function (i, d) {
+ if (!d.delivery_date) d.delivery_date = frm.doc.delivery_date;
});
refresh_field("items");
},
@@ -186,9 +207,7 @@ frappe.ui.form.on("Sales Order", {
default: frm.doc.set_warehouse,
get_query: () => {
return {
- filters: [
- ["Warehouse", "is_group", "!=", 1]
- ]
+ filters: [["Warehouse", "is_group", "!=", 1]],
};
},
onchange: () => {
@@ -200,7 +219,7 @@ frappe.ui.form.on("Sales Order", {
}
},
},
- {fieldtype: "Column Break"},
+ { fieldtype: "Column Break" },
{
fieldname: "add_item",
fieldtype: "Link",
@@ -210,19 +229,24 @@ frappe.ui.form.on("Sales Order", {
return {
query: "erpnext.controllers.queries.get_filtered_child_rows",
filters: {
- "parenttype": frm.doc.doctype,
- "parent": frm.doc.name,
- "reserve_stock": 1,
- }
- }
+ parenttype: frm.doc.doctype,
+ parent: frm.doc.name,
+ reserve_stock: 1,
+ },
+ };
},
onchange: () => {
let sales_order_item = dialog.get_value("add_item");
if (sales_order_item) {
- frm.doc.items.forEach(item => {
+ frm.doc.items.forEach((item) => {
if (item.name === sales_order_item) {
- let unreserved_qty = (flt(item.stock_qty) - (item.stock_reserved_qty ? flt(item.stock_reserved_qty) : (flt(item.delivered_qty) * flt(item.conversion_factor)))) / flt(item.conversion_factor);
+ let unreserved_qty =
+ (flt(item.stock_qty) -
+ (item.stock_reserved_qty
+ ? flt(item.stock_reserved_qty)
+ : flt(item.delivered_qty) * flt(item.conversion_factor))) /
+ flt(item.conversion_factor);
if (unreserved_qty > 0) {
dialog.fields_dict.items.df.data.forEach((row) => {
@@ -233,10 +257,10 @@ frappe.ui.form.on("Sales Order", {
}
dialog.fields_dict.items.df.data.push({
- 'sales_order_item': item.name,
- 'item_code': item.item_code,
- 'warehouse': dialog.get_value("set_warehouse") || item.warehouse,
- 'qty_to_reserve': Math.max(unreserved_qty, 0)
+ sales_order_item: item.name,
+ item_code: item.item_code,
+ warehouse: dialog.get_value("set_warehouse") || item.warehouse,
+ qty_to_reserve: Math.max(unreserved_qty, 0),
});
dialog.fields_dict.items.grid.refresh();
dialog.set_value("add_item", undefined);
@@ -245,7 +269,7 @@ frappe.ui.form.on("Sales Order", {
}
},
},
- {fieldtype: "Section Break"},
+ { fieldtype: "Section Break" },
{
fieldname: "items",
fieldtype: "Table",
@@ -265,25 +289,26 @@ frappe.ui.form.on("Sales Order", {
return {
query: "erpnext.controllers.queries.get_filtered_child_rows",
filters: {
- "parenttype": frm.doc.doctype,
- "parent": frm.doc.name,
- "reserve_stock": 1,
- }
- }
+ parenttype: frm.doc.doctype,
+ parent: frm.doc.name,
+ reserve_stock: 1,
+ },
+ };
},
onchange: (event) => {
if (event) {
let name = $(event.currentTarget).closest(".grid-row").attr("data-name");
- let item_row = dialog.fields_dict.items.grid.grid_rows_by_docname[name].doc;
+ let item_row =
+ dialog.fields_dict.items.grid.grid_rows_by_docname[name].doc;
- frm.doc.items.forEach(item => {
+ frm.doc.items.forEach((item) => {
if (item.name === item_row.sales_order_item) {
item_row.item_code = item.item_code;
}
});
dialog.fields_dict.items.grid.refresh();
}
- }
+ },
},
{
fieldname: "item_code",
@@ -303,9 +328,7 @@ frappe.ui.form.on("Sales Order", {
in_list_view: 1,
get_query: () => {
return {
- filters: [
- ["Warehouse", "is_group", "!=", 1]
- ]
+ filters: [["Warehouse", "is_group", "!=", 1]],
};
},
},
@@ -314,14 +337,14 @@ frappe.ui.form.on("Sales Order", {
fieldtype: "Float",
label: __("Qty"),
reqd: 1,
- in_list_view: 1
- }
+ in_list_view: 1,
+ },
],
},
],
primary_action_label: __("Reserve Stock"),
primary_action: () => {
- var data = {items: dialog.fields_dict.items.grid.data};
+ var data = { items: dialog.fields_dict.items.grid.data };
if (data.items && data.items.length > 0) {
frappe.call({
@@ -329,14 +352,14 @@ frappe.ui.form.on("Sales Order", {
method: "create_stock_reservation_entries",
args: {
items_details: data.items,
- notify: true
+ notify: true,
},
freeze: true,
freeze_message: __("Reserving Stock..."),
callback: (r) => {
frm.doc.__onload.has_unreserved_stock = false;
frm.reload_doc();
- }
+ },
});
}
@@ -344,16 +367,21 @@ frappe.ui.form.on("Sales Order", {
},
});
- frm.doc.items.forEach(item => {
+ frm.doc.items.forEach((item) => {
if (item.reserve_stock) {
- let unreserved_qty = (flt(item.stock_qty) - (item.stock_reserved_qty ? flt(item.stock_reserved_qty) : (flt(item.delivered_qty) * flt(item.conversion_factor)))) / flt(item.conversion_factor);
+ let unreserved_qty =
+ (flt(item.stock_qty) -
+ (item.stock_reserved_qty
+ ? flt(item.stock_reserved_qty)
+ : flt(item.delivered_qty) * flt(item.conversion_factor))) /
+ flt(item.conversion_factor);
if (unreserved_qty > 0) {
dialog.fields_dict.items.df.data.push({
- 'sales_order_item': item.name,
- 'item_code': item.item_code,
- 'warehouse': item.warehouse,
- 'qty_to_reserve': unreserved_qty
+ sales_order_item: item.name,
+ item_code: item.item_code,
+ warehouse: item.warehouse,
+ qty_to_reserve: unreserved_qty,
});
}
}
@@ -410,28 +438,28 @@ frappe.ui.form.on("Sales Order", {
label: __("Qty"),
reqd: 1,
read_only: 1,
- in_list_view: 1
- }
- ]
- }
+ in_list_view: 1,
+ },
+ ],
+ },
],
primary_action_label: __("Unreserve Stock"),
primary_action: () => {
- var data = {sr_entries: dialog.fields_dict.sr_entries.grid.data};
+ var data = { sr_entries: dialog.fields_dict.sr_entries.grid.data };
if (data.sr_entries && data.sr_entries.length > 0) {
frappe.call({
doc: frm.doc,
method: "cancel_stock_reservation_entries",
args: {
- sre_list: data.sr_entries.map(item => item.sre),
+ sre_list: data.sr_entries.map((item) => item.sre),
},
freeze: true,
- freeze_message: __('Unreserving Stock...'),
+ freeze_message: __("Unreserving Stock..."),
callback: (r) => {
frm.doc.__onload.has_reserved_stock = false;
frm.reload_doc();
- }
+ },
});
}
@@ -439,35 +467,39 @@ frappe.ui.form.on("Sales Order", {
},
});
- frappe.call({
- method: 'erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry.get_stock_reservation_entries_for_voucher',
- args: {
- voucher_type: frm.doctype,
- voucher_no: frm.docname,
- },
- callback: (r) => {
- if (!r.exc && r.message) {
- r.message.forEach(sre => {
- if (flt(sre.reserved_qty) > flt(sre.delivered_qty)) {
- dialog.fields_dict.sr_entries.df.data.push({
- 'sre': sre.name,
- 'item_code': sre.item_code,
- 'warehouse': sre.warehouse,
- 'qty': (flt(sre.reserved_qty) - flt(sre.delivered_qty))
- });
- }
- });
- }
- }
- }).then(r => {
- dialog.fields_dict.sr_entries.grid.refresh();
- dialog.show();
- });
+ frappe
+ .call({
+ method: "erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry.get_stock_reservation_entries_for_voucher",
+ args: {
+ voucher_type: frm.doctype,
+ voucher_no: frm.docname,
+ },
+ callback: (r) => {
+ if (!r.exc && r.message) {
+ r.message.forEach((sre) => {
+ if (flt(sre.reserved_qty) > flt(sre.delivered_qty)) {
+ dialog.fields_dict.sr_entries.df.data.push({
+ sre: sre.name,
+ item_code: sre.item_code,
+ warehouse: sre.warehouse,
+ qty: flt(sre.reserved_qty) - flt(sre.delivered_qty),
+ });
+ }
+ });
+ }
+ },
+ })
+ .then((r) => {
+ dialog.fields_dict.sr_entries.grid.refresh();
+ dialog.show();
+ });
},
show_reserved_stock(frm) {
// Get the latest modified date from the items table.
- var to_date = moment(new Date(Math.max(...frm.doc.items.map(e => new Date(e.modified))))).format('YYYY-MM-DD');
+ var to_date = moment(new Date(Math.max(...frm.doc.items.map((e) => new Date(e.modified))))).format(
+ "YYYY-MM-DD"
+ );
frappe.route_options = {
company: frm.doc.company,
@@ -475,13 +507,13 @@ frappe.ui.form.on("Sales Order", {
to_date: to_date,
voucher_type: frm.doc.doctype,
voucher_no: frm.doc.name,
- }
+ };
frappe.set_route("query-report", "Reserved Stock");
- }
+ },
});
frappe.ui.form.on("Sales Order Item", {
- item_code: function(frm,cdt,cdn) {
+ item_code: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (frm.doc.delivery_date) {
row.delivery_date = frm.doc.delivery_date;
@@ -490,11 +522,11 @@ frappe.ui.form.on("Sales Order Item", {
frm.script_manager.copy_from_first_row("items", row, ["delivery_date"]);
}
},
- delivery_date: function(frm, cdt, cdn) {
- if(!frm.doc.delivery_date) {
+ delivery_date: function (frm, cdt, cdn) {
+ if (!frm.doc.delivery_date) {
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "items", "delivery_date");
}
- }
+ },
});
erpnext.selling.SalesOrderController = class SalesOrderController extends erpnext.selling.SellingController {
@@ -507,111 +539,185 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
super.refresh();
let allow_delivery = false;
- if (doc.docstatus==1) {
-
- if(this.frm.has_perm("submit")) {
- if(doc.status === 'On Hold') {
- // un-hold
- this.frm.add_custom_button(__('Resume'), function() {
- me.frm.cscript.update_status('Resume', 'Draft')
- }, __("Status"));
+ if (doc.docstatus == 1) {
+ if (this.frm.has_perm("submit")) {
+ if (doc.status === "On Hold") {
+ // un-hold
+ this.frm.add_custom_button(
+ __("Resume"),
+ function () {
+ me.frm.cscript.update_status("Resume", "Draft");
+ },
+ __("Status")
+ );
- if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
- // close
- this.frm.add_custom_button(__('Close'), () => this.close_sales_order(), __("Status"))
- }
+ if (flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
+ // close
+ this.frm.add_custom_button(__("Close"), () => this.close_sales_order(), __("Status"));
+ }
+ } else if (doc.status === "Closed") {
+ // un-close
+ this.frm.add_custom_button(
+ __("Re-open"),
+ function () {
+ me.frm.cscript.update_status("Re-open", "Draft");
+ },
+ __("Status")
+ );
}
- else if(doc.status === 'Closed') {
- // un-close
- this.frm.add_custom_button(__('Re-open'), function() {
- me.frm.cscript.update_status('Re-open', 'Draft')
- }, __("Status"));
- }
}
- if(doc.status !== 'Closed') {
- if(doc.status !== 'On Hold') {
- allow_delivery = this.frm.doc.items.some(item => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty))
- && !this.frm.doc.skip_delivery_note
+ if (doc.status !== "Closed") {
+ if (doc.status !== "On Hold") {
+ allow_delivery =
+ this.frm.doc.items.some(
+ (item) => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty)
+ ) && !this.frm.doc.skip_delivery_note;
if (this.frm.has_perm("submit")) {
- if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
+ if (flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
// hold
- this.frm.add_custom_button(__('Hold'), () => this.hold_sales_order(), __("Status"))
+ this.frm.add_custom_button(
+ __("Hold"),
+ () => this.hold_sales_order(),
+ __("Status")
+ );
// close
- this.frm.add_custom_button(__('Close'), () => this.close_sales_order(), __("Status"))
+ this.frm.add_custom_button(
+ __("Close"),
+ () => this.close_sales_order(),
+ __("Status")
+ );
}
}
if (!doc.__onload || !doc.__onload.has_reserved_stock) {
// Don't show the `Reserve` button if the Sales Order has Picked Items.
if (flt(doc.per_picked, 2) < 100 && flt(doc.per_delivered, 2) < 100) {
- this.frm.add_custom_button(__('Pick List'), () => this.create_pick_list(), __('Create'));
+ this.frm.add_custom_button(
+ __("Pick List"),
+ () => this.create_pick_list(),
+ __("Create")
+ );
}
}
const order_is_a_sale = ["Sales", "Shopping Cart"].indexOf(doc.order_type) !== -1;
const order_is_maintenance = ["Maintenance"].indexOf(doc.order_type) !== -1;
// order type has been customised then show all the action buttons
- const order_is_a_custom_sale = ["Sales", "Shopping Cart", "Maintenance"].indexOf(doc.order_type) === -1;
+ const order_is_a_custom_sale =
+ ["Sales", "Shopping Cart", "Maintenance"].indexOf(doc.order_type) === -1;
// delivery note
- if(flt(doc.per_delivered, 2) < 100 && (order_is_a_sale || order_is_a_custom_sale) && allow_delivery) {
- this.frm.add_custom_button(__('Delivery Note'), () => this.make_delivery_note_based_on_delivery_date(true), __('Create'));
- this.frm.add_custom_button(__('Work Order'), () => this.make_work_order(), __('Create'));
+ if (
+ flt(doc.per_delivered, 2) < 100 &&
+ (order_is_a_sale || order_is_a_custom_sale) &&
+ allow_delivery
+ ) {
+ this.frm.add_custom_button(
+ __("Delivery Note"),
+ () => this.make_delivery_note_based_on_delivery_date(true),
+ __("Create")
+ );
+ this.frm.add_custom_button(
+ __("Work Order"),
+ () => this.make_work_order(),
+ __("Create")
+ );
}
// sales invoice
- if(flt(doc.per_billed, 2) < 100) {
- this.frm.add_custom_button(__('Sales Invoice'), () => me.make_sales_invoice(), __('Create'));
+ if (flt(doc.per_billed, 2) < 100) {
+ this.frm.add_custom_button(
+ __("Sales Invoice"),
+ () => me.make_sales_invoice(),
+ __("Create")
+ );
}
// material request
- if(!doc.order_type || (order_is_a_sale || order_is_a_custom_sale) && flt(doc.per_delivered, 2) < 100) {
- this.frm.add_custom_button(__('Material Request'), () => this.make_material_request(), __('Create'));
- this.frm.add_custom_button(__('Request for Raw Materials'), () => this.make_raw_material_request(), __('Create'));
+ if (
+ !doc.order_type ||
+ ((order_is_a_sale || order_is_a_custom_sale) && flt(doc.per_delivered, 2) < 100)
+ ) {
+ this.frm.add_custom_button(
+ __("Material Request"),
+ () => this.make_material_request(),
+ __("Create")
+ );
+ this.frm.add_custom_button(
+ __("Request for Raw Materials"),
+ () => this.make_raw_material_request(),
+ __("Create")
+ );
}
// Make Purchase Order
if (!this.frm.doc.is_internal_customer) {
- this.frm.add_custom_button(__('Purchase Order'), () => this.make_purchase_order(), __('Create'));
+ this.frm.add_custom_button(
+ __("Purchase Order"),
+ () => this.make_purchase_order(),
+ __("Create")
+ );
}
// maintenance
- if(flt(doc.per_delivered, 2) < 100 && (order_is_maintenance || order_is_a_custom_sale)) {
- this.frm.add_custom_button(__('Maintenance Visit'), () => this.make_maintenance_visit(), __('Create'));
- this.frm.add_custom_button(__('Maintenance Schedule'), () => this.make_maintenance_schedule(), __('Create'));
+ if (flt(doc.per_delivered, 2) < 100 && (order_is_maintenance || order_is_a_custom_sale)) {
+ this.frm.add_custom_button(
+ __("Maintenance Visit"),
+ () => this.make_maintenance_visit(),
+ __("Create")
+ );
+ this.frm.add_custom_button(
+ __("Maintenance Schedule"),
+ () => this.make_maintenance_schedule(),
+ __("Create")
+ );
}
// project
- if(flt(doc.per_delivered, 2) < 100) {
- this.frm.add_custom_button(__('Project'), () => this.make_project(), __('Create'));
+ if (flt(doc.per_delivered, 2) < 100) {
+ this.frm.add_custom_button(__("Project"), () => this.make_project(), __("Create"));
}
if (doc.docstatus === 1 && !doc.inter_company_order_reference) {
let me = this;
let internal = me.frm.doc.is_internal_customer;
if (internal) {
- let button_label = (me.frm.doc.company === me.frm.doc.represents_company) ? "Internal Purchase Order" :
- "Inter Company Purchase Order";
-
- me.frm.add_custom_button(button_label, function() {
- me.make_inter_company_order();
- }, __('Create'));
+ let button_label =
+ me.frm.doc.company === me.frm.doc.represents_company
+ ? "Internal Purchase Order"
+ : "Inter Company Purchase Order";
+
+ me.frm.add_custom_button(
+ button_label,
+ function () {
+ me.make_inter_company_order();
+ },
+ __("Create")
+ );
}
}
}
// payment request
- if(flt(doc.per_billed, precision('per_billed', doc)) < 100 + frappe.boot.sysdefaults.over_billing_allowance) {
- this.frm.add_custom_button(__('Payment Request'), () => this.make_payment_request(), __('Create'));
- this.frm.add_custom_button(__('Payment'), () => this.make_payment_entry(), __('Create'));
+ if (
+ flt(doc.per_billed, precision("per_billed", doc)) <
+ 100 + frappe.boot.sysdefaults.over_billing_allowance
+ ) {
+ this.frm.add_custom_button(
+ __("Payment Request"),
+ () => this.make_payment_request(),
+ __("Create")
+ );
+ this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
}
- this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+ this.frm.page.set_inner_btn_group_as_primary(__("Create"));
}
}
- if (this.frm.doc.docstatus===0) {
- this.frm.add_custom_button(__('Quotation'),
- function() {
+ if (this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(
+ __("Quotation"),
+ function () {
let d = erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
source_doctype: "Quotation",
@@ -622,14 +728,14 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
fieldname: "party_name",
fieldtype: "Link",
options: "Customer",
- default: me.frm.doc.customer || undefined
- }
+ default: me.frm.doc.customer || undefined,
+ },
],
get_query_filters: {
company: me.frm.doc.company,
docstatus: 1,
- status: ["!=", "Lost"]
- }
+ status: ["!=", "Lost"],
+ },
});
setTimeout(() => {
@@ -639,8 +745,9 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
`);
}, 200);
-
- }, __("Get Items From"));
+ },
+ __("Get Items From")
+ );
}
this.order_type(doc);
@@ -649,8 +756,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
create_pick_list() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.create_pick_list",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
make_work_order() {
@@ -661,86 +768,99 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
sales_order: this.frm.docname,
},
freeze: true,
- callback: function(r) {
- if(!r.message) {
+ callback: function (r) {
+ if (!r.message) {
frappe.msgprint({
- title: __('Work Order not created'),
- message: __('No Items with Bill of Materials to Manufacture'),
- indicator: 'orange'
+ title: __("Work Order not created"),
+ message: __("No Items with Bill of Materials to Manufacture"),
+ indicator: "orange",
});
return;
- }
- else {
- const fields = [{
- label: 'Items',
- fieldtype: 'Table',
- fieldname: 'items',
- description: __('Select BOM and Qty for Production'),
- fields: [{
- fieldtype: 'Read Only',
- fieldname: 'item_code',
- label: __('Item Code'),
- in_list_view: 1
- }, {
- fieldtype: 'Link',
- fieldname: 'bom',
- options: 'BOM',
- reqd: 1,
- label: __('Select BOM'),
- in_list_view: 1,
- get_query: function (doc) {
- return { filters: { item: doc.item_code } };
- }
- }, {
- fieldtype: 'Float',
- fieldname: 'pending_qty',
- reqd: 1,
- label: __('Qty'),
- in_list_view: 1
- }, {
- fieldtype: 'Data',
- fieldname: 'sales_order_item',
- reqd: 1,
- label: __('Sales Order Item'),
- hidden: 1
- }],
- data: r.message,
- get_data: () => {
- return r.message
- }
- }]
+ } else {
+ const fields = [
+ {
+ label: "Items",
+ fieldtype: "Table",
+ fieldname: "items",
+ description: __("Select BOM and Qty for Production"),
+ fields: [
+ {
+ fieldtype: "Read Only",
+ fieldname: "item_code",
+ label: __("Item Code"),
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "bom",
+ options: "BOM",
+ reqd: 1,
+ label: __("Select BOM"),
+ in_list_view: 1,
+ get_query: function (doc) {
+ return { filters: { item: doc.item_code } };
+ },
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "pending_qty",
+ reqd: 1,
+ label: __("Qty"),
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "sales_order_item",
+ reqd: 1,
+ label: __("Sales Order Item"),
+ hidden: 1,
+ },
+ ],
+ data: r.message,
+ get_data: () => {
+ return r.message;
+ },
+ },
+ ];
var d = new frappe.ui.Dialog({
- title: __('Select Items to Manufacture'),
+ title: __("Select Items to Manufacture"),
fields: fields,
- primary_action: function() {
- var data = {items: d.fields_dict.items.grid.get_selected_children()};
+ primary_action: function () {
+ var data = { items: d.fields_dict.items.grid.get_selected_children() };
me.frm.call({
- method: 'make_work_orders',
+ method: "make_work_orders",
args: {
items: data,
company: me.frm.doc.company,
sales_order: me.frm.docname,
- project: me.frm.project
+ project: me.frm.project,
},
freeze: true,
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
frappe.msgprint({
- message: __('Work Orders Created: {0}', [r.message.map(function(d) {
- return repl('
%(name)s ', {name:d})
- }).join(', ')]),
- indicator: 'green'
- })
+ message: __("Work Orders Created: {0}", [
+ r.message
+ .map(function (d) {
+ return repl(
+ '
%(name)s ',
+ { name: d }
+ );
+ })
+ .join(", "),
+ ]),
+ indicator: "green",
+ });
}
d.hide();
- }
+ },
});
},
- primary_action_label: __('Create')
+ primary_action_label: __("Create"),
});
d.show();
}
- }
+ },
});
}
@@ -755,8 +875,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
make_material_request() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
skip_delivery_note() {
@@ -764,8 +884,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}
toggle_delivery_date() {
- this.frm.fields_dict.items.grid.toggle_reqd("delivery_date",
- (this.frm.doc.order_type == "Sales" && !this.frm.doc.skip_delivery_note));
+ this.frm.fields_dict.items.grid.toggle_reqd(
+ "delivery_date",
+ this.frm.doc.order_type == "Sales" && !this.frm.doc.skip_delivery_note
+ );
}
make_raw_material_request() {
@@ -774,104 +896,135 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
method: "erpnext.selling.doctype.sales_order.sales_order.get_work_order_items",
args: {
sales_order: this.frm.docname,
- for_raw_material_request: 1
+ for_raw_material_request: 1,
},
- callback: function(r) {
- if(!r.message) {
+ callback: function (r) {
+ if (!r.message) {
frappe.msgprint({
- message: __('No Items with Bill of Materials.'),
- indicator: 'orange'
+ message: __("No Items with Bill of Materials."),
+ indicator: "orange",
});
return;
- }
- else {
+ } else {
me.make_raw_material_request_dialog(r);
}
- }
+ },
});
}
make_raw_material_request_dialog(r) {
var me = this;
var fields = [
- {fieldtype:'Check', fieldname:'include_exploded_items',
- label: __('Include Exploded Items')},
- {fieldtype:'Check', fieldname:'ignore_existing_ordered_qty',
- label: __('Ignore Existing Ordered Qty')},
+ { fieldtype: "Check", fieldname: "include_exploded_items", label: __("Include Exploded Items") },
{
- fieldtype:'Table', fieldname: 'items',
- description: __('Select BOM, Qty and For Warehouse'),
+ fieldtype: "Check",
+ fieldname: "ignore_existing_ordered_qty",
+ label: __("Ignore Existing Ordered Qty"),
+ },
+ {
+ fieldtype: "Table",
+ fieldname: "items",
+ description: __("Select BOM, Qty and For Warehouse"),
fields: [
- {fieldtype:'Read Only', fieldname:'item_code',
- label: __('Item Code'), in_list_view:1},
- {fieldtype:'Link', fieldname:'warehouse', options: 'Warehouse',
- label: __('For Warehouse'), in_list_view:1},
- {fieldtype:'Link', fieldname:'bom', options: 'BOM', reqd: 1,
- label: __('BOM'), in_list_view:1, get_query: function(doc) {
- return {filters: {item: doc.item_code}};
- }
+ {
+ fieldtype: "Read Only",
+ fieldname: "item_code",
+ label: __("Item Code"),
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "warehouse",
+ options: "Warehouse",
+ label: __("For Warehouse"),
+ in_list_view: 1,
+ },
+ {
+ fieldtype: "Link",
+ fieldname: "bom",
+ options: "BOM",
+ reqd: 1,
+ label: __("BOM"),
+ in_list_view: 1,
+ get_query: function (doc) {
+ return { filters: { item: doc.item_code } };
+ },
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "required_qty",
+ reqd: 1,
+ label: __("Qty"),
+ in_list_view: 1,
},
- {fieldtype:'Float', fieldname:'required_qty', reqd: 1,
- label: __('Qty'), in_list_view:1},
],
data: r.message,
- get_data: function() {
- return r.message
- }
- }
- ]
+ get_data: function () {
+ return r.message;
+ },
+ },
+ ];
var d = new frappe.ui.Dialog({
title: __("Items for Raw Material Request"),
fields: fields,
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
me.frm.call({
- method: 'erpnext.selling.doctype.sales_order.sales_order.make_raw_material_request',
+ method: "erpnext.selling.doctype.sales_order.sales_order.make_raw_material_request",
args: {
items: data,
company: me.frm.doc.company,
sales_order: me.frm.docname,
- project: me.frm.project
+ project: me.frm.project,
},
freeze: true,
- callback: function(r) {
- if(r.message) {
- frappe.msgprint(__('Material Request {0} submitted.',
- ['
' + r.message.name+ ' ']));
+ callback: function (r) {
+ if (r.message) {
+ frappe.msgprint(
+ __("Material Request {0} submitted.", [
+ '
' +
+ r.message.name +
+ " ",
+ ])
+ );
}
d.hide();
me.frm.reload_doc();
- }
+ },
});
},
- primary_action_label: __('Create')
+ primary_action_label: __("Create"),
});
d.show();
}
- make_delivery_note_based_on_delivery_date(for_reserved_stock=false) {
+ make_delivery_note_based_on_delivery_date(for_reserved_stock = false) {
var me = this;
- var delivery_dates = this.frm.doc.items.map(i => i.delivery_date);
- delivery_dates = [ ...new Set(delivery_dates) ];
+ var delivery_dates = this.frm.doc.items.map((i) => i.delivery_date);
+ delivery_dates = [...new Set(delivery_dates)];
var today = new Date();
var item_grid = this.frm.fields_dict["items"].grid;
- if(!item_grid.get_selected().length && delivery_dates.length > 1) {
+ if (!item_grid.get_selected().length && delivery_dates.length > 1) {
var dialog = new frappe.ui.Dialog({
title: __("Select Items based on Delivery Date"),
- fields: [{fieldtype: "HTML", fieldname: "dates_html"}]
+ fields: [{ fieldtype: "HTML", fieldname: "dates_html" }],
});
var html = $(`
- ${__('Delivery Date')}
+ ${__("Delivery Date")}
- ${delivery_dates.map(date => `
+ ${delivery_dates
+ .map(
+ (date) => `
@@ -884,18 +1037,22 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
- `).join("")}
+ `
+ )
+ .join("")}
`);
var wrapper = dialog.fields_dict.dates_html.$wrapper;
wrapper.html(html);
- dialog.set_primary_action(__("Select"), function() {
- var dates = wrapper.find('input[type=checkbox]:checked')
- .map((i, el) => $(el).attr('data-date')).toArray();
+ dialog.set_primary_action(__("Select"), function () {
+ var dates = wrapper
+ .find("input[type=checkbox]:checked")
+ .map((i, el) => $(el).attr("data-date"))
+ .toArray();
- if(!dates) return;
+ if (!dates) return;
me.make_delivery_note(dates, for_reserved_stock);
dialog.hide();
@@ -906,61 +1063,64 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}
}
- make_delivery_note(delivery_dates, for_reserved_stock=false) {
+ make_delivery_note(delivery_dates, for_reserved_stock = false) {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
frm: this.frm,
args: {
delivery_dates,
- for_reserved_stock: for_reserved_stock
+ for_reserved_stock: for_reserved_stock,
},
freeze: true,
- freeze_message: __("Creating Delivery Note ...")
- })
+ freeze_message: __("Creating Delivery Note ..."),
+ });
}
make_sales_invoice() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
make_maintenance_schedule() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
make_project() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_project",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
make_inter_company_order() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_inter_company_purchase_order",
- frm: this.frm
+ frm: this.frm,
});
}
make_maintenance_visit() {
frappe.model.open_mapped_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
- frm: this.frm
- })
+ frm: this.frm,
+ });
}
- make_purchase_order(){
- let pending_items = this.frm.doc.items.some((item) =>{
+ make_purchase_order() {
+ let pending_items = this.frm.doc.items.some((item) => {
let pending_qty = flt(item.stock_qty) - flt(item.ordered_qty);
return pending_qty > 0;
- })
- if(!pending_items){
- frappe.throw({message: __("Purchase Order already created for all Sales Order items"), title: __("Note")});
+ });
+ if (!pending_items) {
+ frappe.throw({
+ message: __("Purchase Order already created for all Sales Order items"),
+ title: __("Note"),
+ });
}
var me = this;
@@ -969,115 +1129,122 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
size: "large",
fields: [
{
- "fieldtype": "Check",
- "label": __("Against Default Supplier"),
- "fieldname": "against_default_supplier",
- "default": 0
+ fieldtype: "Check",
+ label: __("Against Default Supplier"),
+ fieldname: "against_default_supplier",
+ default: 0,
},
{
- fieldname: 'items_for_po', fieldtype: 'Table', label: 'Select Items',
+ fieldname: "items_for_po",
+ fieldtype: "Table",
+ label: "Select Items",
fields: [
{
- fieldtype:'Data',
- fieldname:'item_code',
- label: __('Item'),
- read_only:1,
- in_list_view:1
+ fieldtype: "Data",
+ fieldname: "item_code",
+ label: __("Item"),
+ read_only: 1,
+ in_list_view: 1,
},
{
- fieldtype:'Data',
- fieldname:'item_name',
- label: __('Item name'),
- read_only:1,
- in_list_view:1
+ fieldtype: "Data",
+ fieldname: "item_name",
+ label: __("Item name"),
+ read_only: 1,
+ in_list_view: 1,
},
{
- fieldtype:'Float',
- fieldname:'pending_qty',
- label: __('Pending Qty'),
+ fieldtype: "Float",
+ fieldname: "pending_qty",
+ label: __("Pending Qty"),
read_only: 1,
- in_list_view:1
+ in_list_view: 1,
},
{
- fieldtype:'Link',
- read_only:1,
- fieldname:'uom',
- label: __('UOM'),
- in_list_view:1,
+ fieldtype: "Link",
+ read_only: 1,
+ fieldname: "uom",
+ label: __("UOM"),
+ in_list_view: 1,
},
{
- fieldtype:'Data',
- fieldname:'supplier',
- label: __('Supplier'),
- read_only:1,
- in_list_view:1
+ fieldtype: "Data",
+ fieldname: "supplier",
+ label: __("Supplier"),
+ read_only: 1,
+ in_list_view: 1,
},
- ]
- }
+ ],
+ },
],
- primary_action_label: 'Create Purchase Order',
- primary_action (args) {
+ primary_action_label: "Create Purchase Order",
+ primary_action(args) {
if (!args) return;
let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children();
- if(selected_items.length == 0) {
- frappe.throw({message: 'Please select Items from the Table', title: __('Items Required'), indicator:'blue'})
+ if (selected_items.length == 0) {
+ frappe.throw({
+ message: "Please select Items from the Table",
+ title: __("Items Required"),
+ indicator: "blue",
+ });
}
dialog.hide();
- var method = args.against_default_supplier ? "make_purchase_order_for_default_supplier" : "make_purchase_order"
+ var method = args.against_default_supplier
+ ? "make_purchase_order_for_default_supplier"
+ : "make_purchase_order";
return frappe.call({
method: "erpnext.selling.doctype.sales_order.sales_order." + method,
freeze_message: __("Creating Purchase Order ..."),
args: {
- "source_name": me.frm.doc.name,
- "selected_items": selected_items
+ source_name: me.frm.doc.name,
+ selected_items: selected_items,
},
freeze: true,
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
if (!args.against_default_supplier) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
- }
- else {
+ } else {
frappe.route_options = {
- "sales_order": me.frm.doc.name
- }
+ sales_order: me.frm.doc.name,
+ };
frappe.set_route("List", "Purchase Order");
}
}
- }
- })
- }
+ },
+ });
+ },
});
dialog.fields_dict["against_default_supplier"].df.onchange = () => set_po_items_data(dialog);
- function set_po_items_data (dialog) {
+ function set_po_items_data(dialog) {
var against_default_supplier = dialog.get_value("against_default_supplier");
var items_for_po = dialog.get_value("items_for_po");
if (against_default_supplier) {
- let items_with_supplier = items_for_po.filter((item) => item.supplier)
+ let items_with_supplier = items_for_po.filter((item) => item.supplier);
dialog.fields_dict["items_for_po"].df.data = items_with_supplier;
dialog.get_field("items_for_po").refresh();
} else {
let po_items = [];
- me.frm.doc.items.forEach(d => {
+ me.frm.doc.items.forEach((d) => {
let ordered_qty = me.get_ordered_qty(d, me.frm.doc);
let pending_qty = (flt(d.stock_qty) - ordered_qty) / flt(d.conversion_factor);
if (pending_qty > 0) {
po_items.push({
- "doctype": "Sales Order Item",
- "name": d.name,
- "item_name": d.item_name,
- "item_code": d.item_code,
- "pending_qty": pending_qty,
- "uom": d.uom,
- "supplier": d.supplier
+ doctype: "Sales Order Item",
+ name: d.name,
+ item_name: d.item_name,
+ item_code: d.item_code,
+ pending_qty: pending_qty,
+ uom: d.uom,
+ supplier: d.supplier,
});
}
});
@@ -1090,7 +1257,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
set_po_items_data(dialog);
dialog.get_field("items_for_po").grid.only_sortable();
dialog.get_field("items_for_po").refresh();
- dialog.wrapper.find('.grid-heading-row .grid-row-check').click();
+ dialog.wrapper.find(".grid-heading-row .grid-row-check").click();
dialog.show();
}
@@ -1098,71 +1265,66 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
let ordered_qty = item.ordered_qty;
if (so.packed_items && so.packed_items.length) {
// calculate ordered qty based on packed items in case of product bundle
- let packed_items = so.packed_items.filter(
- (pi) => pi.parent_detail_docname == item.name
- );
+ let packed_items = so.packed_items.filter((pi) => pi.parent_detail_docname == item.name);
if (packed_items && packed_items.length) {
- ordered_qty = packed_items.reduce(
- (sum, pi) => sum + flt(pi.ordered_qty),
- 0
- );
+ ordered_qty = packed_items.reduce((sum, pi) => sum + flt(pi.ordered_qty), 0);
ordered_qty = ordered_qty / packed_items.length;
}
}
return ordered_qty;
}
- hold_sales_order(){
+ hold_sales_order() {
var me = this;
var d = new frappe.ui.Dialog({
- title: __('Reason for Hold'),
+ title: __("Reason for Hold"),
fields: [
{
- "fieldname": "reason_for_hold",
- "fieldtype": "Text",
- "reqd": 1,
- }
+ fieldname: "reason_for_hold",
+ fieldtype: "Text",
+ reqd: 1,
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
frappe.call({
method: "frappe.desk.form.utils.add_comment",
args: {
reference_doctype: me.frm.doctype,
reference_name: me.frm.docname,
- content: __('Reason for hold:') + ' ' + data.reason_for_hold,
+ content: __("Reason for hold:") + " " + data.reason_for_hold,
comment_email: frappe.session.user,
- comment_by: frappe.session.user_fullname
+ comment_by: frappe.session.user_fullname,
},
- callback: function(r) {
- if(!r.exc) {
- me.update_status('Hold', 'On Hold')
+ callback: function (r) {
+ if (!r.exc) {
+ me.update_status("Hold", "On Hold");
d.hide();
}
- }
+ },
});
- }
+ },
});
d.show();
}
- close_sales_order(){
- this.frm.cscript.update_status("Close", "Closed")
+ close_sales_order() {
+ this.frm.cscript.update_status("Close", "Closed");
}
- update_status(label, status){
+ update_status(label, status) {
var doc = this.frm.doc;
var me = this;
frappe.ui.form.is_saving = true;
frappe.call({
method: "erpnext.selling.doctype.sales_order.sales_order.update_status",
- args: {status: status, name: doc.name},
- callback: function(r){
+ args: { status: status, name: doc.name },
+ callback: function (r) {
me.frm.reload_doc();
},
- always: function() {
+ always: function () {
frappe.ui.form.is_saving = false;
- }
+ },
});
}
};
-extend_cscript(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
+extend_cscript(cur_frm.cscript, new erpnext.selling.SalesOrderController({ frm: cur_frm }));
diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js
index cb412cfb4a76..f4c0e2ba72a9 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js
@@ -3,43 +3,44 @@
frappe.views.calendar["Sales Order"] = {
field_map: {
- "start": "delivery_date",
- "end": "delivery_date",
- "id": "name",
- "title": "customer_name",
- "allDay": "allDay"
+ start: "delivery_date",
+ end: "delivery_date",
+ id: "name",
+ title: "customer_name",
+ allDay: "allDay",
},
gantt: true,
filters: [
{
- "fieldtype": "Link",
- "fieldname": "customer",
- "options": "Customer",
- "label": __("Customer")
+ fieldtype: "Link",
+ fieldname: "customer",
+ options: "Customer",
+ label: __("Customer"),
},
{
- "fieldtype": "Select",
- "fieldname": "delivery_status",
- "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
- "label": __("Delivery Status")
+ fieldtype: "Select",
+ fieldname: "delivery_status",
+ options: "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
+ label: __("Delivery Status"),
},
{
- "fieldtype": "Select",
- "fieldname": "billing_status",
- "options": "Not Billed\nFully Billed\nPartly Billed\nClosed",
- "label": __("Billing Status")
+ fieldtype: "Select",
+ fieldname: "billing_status",
+ options: "Not Billed\nFully Billed\nPartly Billed\nClosed",
+ label: __("Billing Status"),
},
],
get_events_method: "erpnext.selling.doctype.sales_order.sales_order.get_events",
- get_css_class: function(data) {
- if(data.status=="Closed") {
+ get_css_class: function (data) {
+ if (data.status == "Closed") {
return "success";
- } if(data.delivery_status=="Not Delivered") {
+ }
+ if (data.delivery_status == "Not Delivered") {
return "danger";
- } else if(data.delivery_status=="Partly Delivered") {
+ } else if (data.delivery_status == "Partly Delivered") {
return "warning";
- } else if(data.delivery_status=="Fully Delivered") {
+ } else if (data.delivery_status == "Fully Delivered") {
return "success";
}
- }
-}
+ },
+};
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 53de329b0700..14ba051fc25d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -1,6 +1,17 @@
-frappe.listview_settings['Sales Order'] = {
- add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date",
- "per_delivered", "per_billed", "status", "advance_payment_status", "order_type", "name", "skip_delivery_note"],
+frappe.listview_settings["Sales Order"] = {
+ add_fields: [
+ "base_grand_total",
+ "customer_name",
+ "currency",
+ "delivery_date",
+ "per_delivered",
+ "per_billed",
+ "status",
+ "advance_payment_status",
+ "order_type",
+ "name",
+ "skip_delivery_note",
+ ],
get_indicator: function (doc) {
if (doc.status === "Closed") {
// Closed
@@ -14,70 +25,84 @@ frappe.listview_settings['Sales Order'] = {
return [__("To Pay"), "gray", "advance_payment_status,=,Requested"];
} else if (!doc.skip_delivery_note && flt(doc.per_delivered, 2) < 100) {
if (frappe.datetime.get_diff(doc.delivery_date) < 0) {
- // not delivered & overdue
- return [__("Overdue"), "red",
- "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
+ // not delivered & overdue
+ return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
} else if (flt(doc.grand_total) === 0) {
// not delivered (zeroount order)
- return [__("To Deliver"), "orange",
- "per_delivered,<,100|grand_total,=,0|status,!=,Closed"];
+ return [__("To Deliver"), "orange", "per_delivered,<,100|grand_total,=,0|status,!=,Closed"];
} else if (flt(doc.per_billed, 2) < 100) {
// not delivered & not billed
- return [__("To Deliver and Bill"), "orange",
- "per_delivered,<,100|per_billed,<,100|status,!=,Closed"];
+ return [
+ __("To Deliver and Bill"),
+ "orange",
+ "per_delivered,<,100|per_billed,<,100|status,!=,Closed",
+ ];
} else {
// not billed
- return [__("To Deliver"), "orange",
- "per_delivered,<,100|per_billed,=,100|status,!=,Closed"];
+ return [__("To Deliver"), "orange", "per_delivered,<,100|per_billed,=,100|status,!=,Closed"];
}
- } else if ((flt(doc.per_delivered, 2) === 100) && flt(doc.grand_total) !== 0
- && flt(doc.per_billed, 2) < 100) {
+ } else if (
+ flt(doc.per_delivered, 2) === 100 &&
+ flt(doc.grand_total) !== 0 &&
+ flt(doc.per_billed, 2) < 100
+ ) {
// to bill
- return [__("To Bill"), "orange",
- "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
- } else if (doc.skip_delivery_note && flt(doc.per_billed, 2) < 100){
+ return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
+ } else if (doc.skip_delivery_note && flt(doc.per_billed, 2) < 100) {
return [__("To Bill"), "orange", "per_billed,<,100|status,!=,Closed"];
}
},
- onload: function(listview) {
+ onload: function (listview) {
var method = "erpnext.selling.doctype.sales_order.sales_order.close_or_unclose_sales_orders";
- listview.page.add_menu_item(__("Close"), function() {
- listview.call_for_selected_items(method, {"status": "Closed"});
+ listview.page.add_menu_item(__("Close"), function () {
+ listview.call_for_selected_items(method, { status: "Closed" });
});
- listview.page.add_menu_item(__("Re-open"), function() {
- listview.call_for_selected_items(method, {"status": "Submitted"});
+ listview.page.add_menu_item(__("Re-open"), function () {
+ listview.call_for_selected_items(method, { status: "Submitted" });
});
- listview.page.add_action_item(__("Sales Invoice"), ()=>{
+ listview.page.add_action_item(__("Sales Invoice"), () => {
erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Sales Invoice");
});
- listview.page.add_action_item(__("Delivery Note"), ()=>{
- frappe.db.get_single_value("Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation").then((value) => {
- if (value) {
- var dialog = new frappe.ui.Dialog({
- title: __("Select Items up to Delivery Date"),
- fields: [{fieldtype: "Date", fieldname: "delivery_date", default: frappe.datetime.add_days(frappe.datetime.nowdate(), 1)}]
- });
- dialog.set_primary_action(__("Select"), function(values) {
- var until_delivery_date = values.delivery_date;
- erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note", {
- until_delivery_date
+ listview.page.add_action_item(__("Delivery Note"), () => {
+ frappe.db
+ .get_single_value("Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation")
+ .then((value) => {
+ if (value) {
+ var dialog = new frappe.ui.Dialog({
+ title: __("Select Items up to Delivery Date"),
+ fields: [
+ {
+ fieldtype: "Date",
+ fieldname: "delivery_date",
+ default: frappe.datetime.add_days(frappe.datetime.nowdate(), 1),
+ },
+ ],
});
- dialog.hide();
- });
- dialog.show();
- } else {
- erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note");
- }
- })
+ dialog.set_primary_action(__("Select"), function (values) {
+ var until_delivery_date = values.delivery_date;
+ erpnext.bulk_transaction_processing.create(
+ listview,
+ "Sales Order",
+ "Delivery Note",
+ {
+ until_delivery_date,
+ }
+ );
+ dialog.hide();
+ });
+ dialog.show();
+ } else {
+ erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Delivery Note");
+ }
+ });
});
- listview.page.add_action_item(__("Advance Payment"), ()=>{
+ listview.page.add_action_item(__("Advance Payment"), () => {
erpnext.bulk_transaction_processing.create(listview, "Sales Order", "Payment Entry");
});
-
- }
+ },
};
diff --git a/erpnext/selling/doctype/sales_partner_type/sales_partner_type.js b/erpnext/selling/doctype/sales_partner_type/sales_partner_type.js
index 3e183f6e6fcd..ac5a8134f3cc 100644
--- a/erpnext/selling/doctype/sales_partner_type/sales_partner_type.js
+++ b/erpnext/selling/doctype/sales_partner_type/sales_partner_type.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Sales Partner Type', {
- refresh: function() {
-
- }
+frappe.ui.form.on("Sales Partner Type", {
+ refresh: function () {},
});
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.js b/erpnext/selling/doctype/selling_settings/selling_settings.js
index cf6fb2806eef..4471458fb108 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.js
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.js
@@ -1,8 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Selling Settings', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Selling Settings", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/selling/doctype/sms_center/sms_center.js b/erpnext/selling/doctype/sms_center/sms_center.js
index 974cfc79181e..f513213e71c9 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.js
+++ b/erpnext/selling/doctype/sms_center/sms_center.js
@@ -8,10 +8,10 @@ extend_cscript(cur_frm.cscript, {
if (total_characters > 160) {
total_msg = cint(total_characters / 160);
- total_msg = (total_characters % 160 == 0 ? total_msg : total_msg + 1);
+ total_msg = total_characters % 160 == 0 ? total_msg : total_msg + 1;
}
this.frm.set_value("total_characters", total_characters);
this.frm.set_value("total_messages", this.frm.doc.message ? total_msg : 0);
- }
+ },
});
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 6db4150be942..6e4d1d0a3732 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -1,19 +1,19 @@
-frappe.provide('erpnext.PointOfSale');
+frappe.provide("erpnext.PointOfSale");
-frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
+frappe.pages["point-of-sale"].on_page_load = function (wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
- title: __('Point of Sale'),
- single_column: true
+ title: __("Point of Sale"),
+ single_column: true,
});
- frappe.require('point-of-sale.bundle.js', function() {
+ frappe.require("point-of-sale.bundle.js", function () {
wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
window.cur_pos = wrapper.pos;
});
};
-frappe.pages['point-of-sale'].refresh = function(wrapper) {
+frappe.pages["point-of-sale"].refresh = function (wrapper) {
if (document.scannerDetectionData) {
onScan.detachFrom(document);
wrapper.pos.wrapper.html("");
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 80e1c20ad9e5..f361976c8908 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -1,13 +1,15 @@
erpnext.PointOfSale.Controller = class {
constructor(wrapper) {
- this.wrapper = $(wrapper).find('.layout-main-section');
+ this.wrapper = $(wrapper).find(".layout-main-section");
this.page = wrapper.page;
this.check_opening_entry();
}
fetch_opening_entry() {
- return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.check_opening_entry", { "user": frappe.session.user });
+ return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.check_opening_entry", {
+ user: frappe.session.user,
+ });
}
check_opening_entry() {
@@ -25,50 +27,62 @@ erpnext.PointOfSale.Controller = class {
const me = this;
const table_fields = [
{
- fieldname: "mode_of_payment", fieldtype: "Link",
- in_list_view: 1, label: "Mode of Payment",
- options: "Mode of Payment", reqd: 1
+ fieldname: "mode_of_payment",
+ fieldtype: "Link",
+ in_list_view: 1,
+ label: "Mode of Payment",
+ options: "Mode of Payment",
+ reqd: 1,
},
{
- fieldname: "opening_amount", fieldtype: "Currency",
- in_list_view: 1, label: "Opening Amount",
+ fieldname: "opening_amount",
+ fieldtype: "Currency",
+ in_list_view: 1,
+ label: "Opening Amount",
options: "company:company_currency",
change: function () {
- dialog.fields_dict.balance_details.df.data.some(d => {
+ dialog.fields_dict.balance_details.df.data.some((d) => {
if (d.idx == this.doc.idx) {
d.opening_amount = this.value;
dialog.fields_dict.balance_details.grid.refresh();
return true;
}
});
- }
- }
+ },
+ },
];
const fetch_pos_payment_methods = () => {
const pos_profile = dialog.fields_dict.pos_profile.get_value();
if (!pos_profile) return;
frappe.db.get_doc("POS Profile", pos_profile).then(({ payments }) => {
dialog.fields_dict.balance_details.df.data = [];
- payments.forEach(pay => {
+ payments.forEach((pay) => {
const { mode_of_payment } = pay;
- dialog.fields_dict.balance_details.df.data.push({ mode_of_payment, opening_amount: '0' });
+ dialog.fields_dict.balance_details.df.data.push({ mode_of_payment, opening_amount: "0" });
});
dialog.fields_dict.balance_details.grid.refresh();
});
- }
+ };
const dialog = new frappe.ui.Dialog({
- title: __('Create POS Opening Entry'),
+ title: __("Create POS Opening Entry"),
static: true,
fields: [
{
- fieldtype: 'Link', label: __('Company'), default: frappe.defaults.get_default('company'),
- options: 'Company', fieldname: 'company', reqd: 1
+ fieldtype: "Link",
+ label: __("Company"),
+ default: frappe.defaults.get_default("company"),
+ options: "Company",
+ fieldname: "company",
+ reqd: 1,
},
{
- fieldtype: 'Link', label: __('POS Profile'),
- options: 'POS Profile', fieldname: 'pos_profile', reqd: 1,
+ fieldtype: "Link",
+ label: __("POS Profile"),
+ options: "POS Profile",
+ fieldname: "pos_profile",
+ reqd: 1,
get_query: () => pos_profile_query(),
- onchange: () => fetch_pos_payment_methods()
+ onchange: () => fetch_pos_payment_methods(),
},
{
fieldname: "balance_details",
@@ -78,34 +92,38 @@ erpnext.PointOfSale.Controller = class {
in_place_edit: true,
reqd: 1,
data: [],
- fields: table_fields
- }
+ fields: table_fields,
+ },
],
- primary_action: async function({ company, pos_profile, balance_details }) {
+ primary_action: async function ({ company, pos_profile, balance_details }) {
if (!balance_details.length) {
frappe.show_alert({
message: __("Please add Mode of payments and opening balance details."),
- indicator: 'red'
- })
+ indicator: "red",
+ });
return frappe.utils.play_sound("error");
}
// filter balance details for empty rows
- balance_details = balance_details.filter(d => d.mode_of_payment);
+ balance_details = balance_details.filter((d) => d.mode_of_payment);
const method = "erpnext.selling.page.point_of_sale.point_of_sale.create_opening_voucher";
- const res = await frappe.call({ method, args: { pos_profile, company, balance_details }, freeze:true });
+ const res = await frappe.call({
+ method,
+ args: { pos_profile, company, balance_details },
+ freeze: true,
+ });
!res.exc && me.prepare_app_defaults(res.message);
dialog.hide();
},
- primary_action_label: __('Submit')
+ primary_action_label: __("Submit"),
});
dialog.show();
const pos_profile_query = () => {
return {
- query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
- filters: { company: dialog.fields_dict.company.get_value() }
- }
+ query: "erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query",
+ filters: { company: dialog.fields_dict.company.get_value() },
+ };
};
}
@@ -117,19 +135,19 @@ erpnext.PointOfSale.Controller = class {
this.item_stock_map = {};
this.settings = {};
- frappe.db.get_value('Stock Settings', undefined, 'allow_negative_stock').then(({ message }) => {
+ frappe.db.get_value("Stock Settings", undefined, "allow_negative_stock").then(({ message }) => {
this.allow_negative_stock = flt(message.allow_negative_stock) || false;
});
frappe.call({
method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_profile_data",
- args: { "pos_profile": this.pos_profile },
+ args: { pos_profile: this.pos_profile },
callback: (res) => {
const profile = res.message;
Object.assign(this.settings, profile);
- this.settings.customer_groups = profile.customer_groups.map(group => group.name);
+ this.settings.customer_groups = profile.customer_groups.map((group) => group.name);
this.make_app();
- }
+ },
});
}
@@ -139,7 +157,8 @@ erpnext.PointOfSale.Controller = class {
Opened at ${moment(this.pos_opening_time).format("Do MMMM, h:mma")}
- `);
+ `
+ );
}
make_app() {
@@ -150,11 +169,9 @@ erpnext.PointOfSale.Controller = class {
}
prepare_dom() {
- this.wrapper.append(
- `
`
- );
+ this.wrapper.append(`
`);
- this.$components_wrapper = this.wrapper.find('.point-of-sale-app');
+ this.$components_wrapper = this.wrapper.find(".point-of-sale-app");
}
prepare_components() {
@@ -169,13 +186,18 @@ erpnext.PointOfSale.Controller = class {
prepare_menu() {
this.page.clear_menu();
- this.page.add_menu_item(__("Open Form View"), this.open_form_view.bind(this), false, 'Ctrl+F');
+ this.page.add_menu_item(__("Open Form View"), this.open_form_view.bind(this), false, "Ctrl+F");
- this.page.add_menu_item(__("Toggle Recent Orders"), this.toggle_recent_order.bind(this), false, 'Ctrl+O');
+ this.page.add_menu_item(
+ __("Toggle Recent Orders"),
+ this.toggle_recent_order.bind(this),
+ false,
+ "Ctrl+O"
+ );
- this.page.add_menu_item(__("Save as Draft"), this.save_draft_invoice.bind(this), false, 'Ctrl+S');
+ this.page.add_menu_item(__("Save as Draft"), this.save_draft_invoice.bind(this), false, "Ctrl+S");
- this.page.add_menu_item(__('Close the POS'), this.close_pos.bind(this), false, 'Shift+Ctrl+C');
+ this.page.add_menu_item(__("Close the POS"), this.close_pos.bind(this), false, "Shift+Ctrl+C");
}
open_form_view() {
@@ -184,7 +206,7 @@ erpnext.PointOfSale.Controller = class {
}
toggle_recent_order() {
- const show = this.recent_order_list.$component.is(':hidden');
+ const show = this.recent_order_list.$component.is(":hidden");
this.toggle_recent_order_list(show);
}
@@ -194,31 +216,33 @@ erpnext.PointOfSale.Controller = class {
if (this.frm.doc.items.length == 0) {
frappe.show_alert({
message: __("You must add atleast one item to save it as draft."),
- indicator:'red'
+ indicator: "red",
});
frappe.utils.play_sound("error");
return;
}
- this.frm.save(undefined, undefined, undefined, () => {
- frappe.show_alert({
- message: __("There was an error saving the document."),
- indicator: 'red'
+ this.frm
+ .save(undefined, undefined, undefined, () => {
+ frappe.show_alert({
+ message: __("There was an error saving the document."),
+ indicator: "red",
+ });
+ frappe.utils.play_sound("error");
+ })
+ .then(() => {
+ frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => this.make_new_invoice(),
+ () => frappe.dom.unfreeze(),
+ ]);
});
- frappe.utils.play_sound("error");
- }).then(() => {
- frappe.run_serially([
- () => frappe.dom.freeze(),
- () => this.make_new_invoice(),
- () => frappe.dom.unfreeze(),
- ]);
- });
}
close_pos() {
if (!this.$components_wrapper.is(":visible")) return;
- let voucher = frappe.model.get_new_doc('POS Closing Entry');
+ let voucher = frappe.model.get_new_doc("POS Closing Entry");
voucher.pos_profile = this.frm.doc.pos_profile;
voucher.user = frappe.session.user;
voucher.company = this.frm.doc.company;
@@ -226,7 +250,7 @@ erpnext.PointOfSale.Controller = class {
voucher.period_end_date = frappe.datetime.now_datetime();
voucher.posting_date = frappe.datetime.now_date();
voucher.posting_time = frappe.datetime.now_time();
- frappe.set_route('Form', 'POS Closing Entry', voucher.name);
+ frappe.set_route("Form", "POS Closing Entry", voucher.name);
}
init_item_selector() {
@@ -235,11 +259,11 @@ erpnext.PointOfSale.Controller = class {
pos_profile: this.pos_profile,
settings: this.settings,
events: {
- item_selected: args => this.on_cart_update(args),
+ item_selected: (args) => this.on_cart_update(args),
- get_frm: () => this.frm || {}
- }
- })
+ get_frm: () => this.frm || {},
+ },
+ });
}
init_item_cart() {
@@ -264,9 +288,9 @@ erpnext.PointOfSale.Controller = class {
this.customer_details = details;
// will add/remove LP payment method
this.payment.render_loyalty_points_payment_mode();
- }
- }
- })
+ },
+ },
+ });
}
init_item_details() {
@@ -287,7 +311,7 @@ erpnext.PointOfSale.Controller = class {
const args = {
field,
value,
- item: this.item_details.current_item
+ item: this.item_details.current_item,
};
return this.on_cart_update(args);
}
@@ -304,24 +328,28 @@ erpnext.PointOfSale.Controller = class {
this.cart.toggle_numpad_field_edit(fieldname);
},
set_value_in_current_cart_item: (selector, value) => {
- this.cart.update_selector_value_in_cart_item(selector, value, this.item_details.current_item);
+ this.cart.update_selector_value_in_cart_item(
+ selector,
+ value,
+ this.item_details.current_item
+ );
},
clone_new_batch_item_in_frm: (batch_serial_map, item) => {
// called if serial nos are 'auto_selected' and if those serial nos belongs to multiple batches
// for each unique batch new item row is added in the form & cart
- Object.keys(batch_serial_map).forEach(batch => {
- const item_to_clone = this.frm.doc.items.find(i => i.name == item.name);
+ Object.keys(batch_serial_map).forEach((batch) => {
+ const item_to_clone = this.frm.doc.items.find((i) => i.name == item.name);
const new_row = this.frm.add_child("items", { ...item_to_clone });
// update new serialno and batch
new_row.batch_no = batch;
new_row.serial_no = batch_serial_map[batch].join(`\n`);
new_row.qty = batch_serial_map[batch].length;
- this.frm.doc.items.forEach(row => {
+ this.frm.doc.items.forEach((row) => {
if (item.item_code === row.item_code) {
this.update_cart_html(row);
}
});
- })
+ });
},
remove_item_from_cart: () => this.remove_item_from_cart(),
get_item_stock_map: () => this.item_stock_map,
@@ -330,8 +358,8 @@ erpnext.PointOfSale.Controller = class {
this.cart.prev_action = null;
this.cart.toggle_item_highlight();
},
- get_available_stock: (item_code, warehouse) => this.get_available_stock(item_code, warehouse)
- }
+ get_available_stock: (item_code, warehouse) => this.get_available_stock(item_code, warehouse),
+ },
});
}
@@ -345,7 +373,9 @@ erpnext.PointOfSale.Controller = class {
toggle_other_sections: (show) => {
if (show) {
- this.item_details.$component.is(':visible') ? this.item_details.$component.css('display', 'none') : '';
+ this.item_details.$component.is(":visible")
+ ? this.item_details.$component.css("display", "none")
+ : "";
this.item_selector.toggle_component(false);
} else {
this.item_selector.toggle_component(true);
@@ -353,18 +383,17 @@ erpnext.PointOfSale.Controller = class {
},
submit_invoice: () => {
- this.frm.savesubmit()
- .then((r) => {
- this.toggle_components(false);
- this.order_summary.toggle_component(true);
- this.order_summary.load_summary_of(this.frm.doc, true);
- frappe.show_alert({
- indicator: 'green',
- message: __('POS invoice {0} created successfully', [r.doc.name])
- });
+ this.frm.savesubmit().then((r) => {
+ this.toggle_components(false);
+ this.order_summary.toggle_component(true);
+ this.order_summary.load_summary_of(this.frm.doc, true);
+ frappe.show_alert({
+ indicator: "green",
+ message: __("POS invoice {0} created successfully", [r.doc.name]),
});
- }
- }
+ });
+ },
+ },
});
}
@@ -373,13 +402,13 @@ erpnext.PointOfSale.Controller = class {
wrapper: this.$components_wrapper,
events: {
open_invoice_data: (name) => {
- frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ frappe.db.get_doc("POS Invoice", name).then((doc) => {
this.order_summary.load_summary_of(doc);
});
},
- reset_summary: () => this.order_summary.toggle_summary_placeholder(true)
- }
- })
+ reset_summary: () => this.order_summary.toggle_summary_placeholder(true),
+ },
+ });
}
init_order_summary() {
@@ -390,11 +419,11 @@ erpnext.PointOfSale.Controller = class {
process_return: (name) => {
this.recent_order_list.toggle_component(false);
- frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ frappe.db.get_doc("POS Invoice", name).then((doc) => {
frappe.run_serially([
() => this.make_return_invoice(doc),
() => this.cart.load_invoice(),
- () => this.item_selector.toggle_component(true)
+ () => this.item_selector.toggle_component(true),
]);
});
},
@@ -402,9 +431,9 @@ erpnext.PointOfSale.Controller = class {
this.recent_order_list.toggle_component(false);
frappe.run_serially([
() => this.frm.refresh(name),
- () => this.frm.call('reset_mode_of_payments'),
+ () => this.frm.call("reset_mode_of_payments"),
() => this.cart.load_invoice(),
- () => this.item_selector.toggle_component(true)
+ () => this.item_selector.toggle_component(true),
]);
},
delete_order: (name) => {
@@ -419,9 +448,9 @@ erpnext.PointOfSale.Controller = class {
() => this.item_selector.toggle_component(true),
() => frappe.dom.unfreeze(),
]);
- }
- }
- })
+ },
+ },
+ });
}
toggle_recent_order_list(show) {
@@ -435,7 +464,7 @@ erpnext.PointOfSale.Controller = class {
this.item_selector.toggle_component(show);
// do not show item details or payment if recent order is toggled off
- !show ? (this.item_details.toggle_component(false) || this.payment.toggle_component(false)) : '';
+ !show ? this.item_details.toggle_component(false) || this.payment.toggle_component(false) : "";
}
make_new_invoice() {
@@ -445,23 +474,23 @@ erpnext.PointOfSale.Controller = class {
() => this.set_pos_profile_data(),
() => this.set_pos_profile_status(),
() => this.cart.load_invoice(),
- () => frappe.dom.unfreeze()
+ () => frappe.dom.unfreeze(),
]);
}
make_sales_invoice_frm() {
- const doctype = 'POS Invoice';
- return new Promise(resolve => {
+ const doctype = "POS Invoice";
+ return new Promise((resolve) => {
if (this.frm) {
this.frm = this.get_new_frm(this.frm);
this.frm.doc.items = [];
- this.frm.doc.is_pos = 1
+ this.frm.doc.is_pos = 1;
resolve();
} else {
frappe.model.with_doctype(doctype, () => {
this.frm = this.get_new_frm();
this.frm.doc.items = [];
- this.frm.doc.is_pos = 1
+ this.frm.doc.is_pos = 1;
resolve();
});
}
@@ -469,8 +498,8 @@ erpnext.PointOfSale.Controller = class {
}
get_new_frm(_frm) {
- const doctype = 'POS Invoice';
- const page = $('
');
+ const doctype = "POS Invoice";
+ const page = $("
");
const frm = _frm || new frappe.ui.form.Form(doctype, page, false);
const name = frappe.model.make_new_doc_and_get_name(doctype, true);
frm.refresh(name);
@@ -485,8 +514,8 @@ erpnext.PointOfSale.Controller = class {
return frappe.call({
method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
args: {
- 'source_name': doc.name,
- 'target_doc': this.frm.doc
+ source_name: doc.name,
+ target_doc: this.frm.doc,
},
callback: (r) => {
frappe.model.sync(r.message);
@@ -494,13 +523,16 @@ erpnext.PointOfSale.Controller = class {
this.set_pos_profile_data().then(() => {
frappe.dom.unfreeze();
});
- }
+ },
});
}
set_pos_profile_data() {
if (this.company && !this.frm.doc.company) this.frm.doc.company = this.company;
- if ((this.pos_profile && !this.frm.doc.pos_profile) | (this.frm.doc.is_return && this.pos_profile != this.frm.doc.pos_profile)) {
+ if (
+ (this.pos_profile && !this.frm.doc.pos_profile) |
+ (this.frm.doc.is_return && this.pos_profile != this.frm.doc.pos_profile)
+ ) {
this.frm.doc.pos_profile = this.pos_profile;
}
@@ -521,16 +553,15 @@ erpnext.PointOfSale.Controller = class {
item_row = this.get_item_from_frm(item);
const item_row_exists = !$.isEmptyObject(item_row);
- const from_selector = field === 'qty' && value === "+1";
- if (from_selector)
- value = flt(item_row.stock_qty) + flt(value);
+ const from_selector = field === "qty" && value === "+1";
+ if (from_selector) value = flt(item_row.stock_qty) + flt(value);
if (item_row_exists) {
- if (field === 'qty')
- value = flt(value);
+ if (field === "qty") value = flt(value);
- if (['qty', 'conversion_factor'].includes(field) && value > 0 && !this.allow_negative_stock) {
- const qty_needed = field === 'qty' ? value * item_row.conversion_factor : item_row.qty * value;
+ if (["qty", "conversion_factor"].includes(field) && value > 0 && !this.allow_negative_stock) {
+ const qty_needed =
+ field === "qty" ? value * item_row.conversion_factor : item_row.qty * value;
await this.check_stock_availability(item_row, qty_needed, this.frm.doc.set_warehouse);
}
@@ -538,20 +569,17 @@ erpnext.PointOfSale.Controller = class {
await frappe.model.set_value(item_row.doctype, item_row.name, field, value);
this.update_cart_html(item_row);
}
-
} else {
- if (!this.frm.doc.customer)
- return this.raise_customer_selection_alert();
+ if (!this.frm.doc.customer) return this.raise_customer_selection_alert();
const { item_code, batch_no, serial_no, rate, uom } = item;
- if (!item_code)
- return;
+ if (!item_code) return;
if (rate == undefined || rate == 0) {
frappe.show_alert({
- message: __('Price is not set for the item.'),
- indicator: 'orange'
+ message: __("Price is not set for the item."),
+ indicator: "orange",
});
frappe.utils.play_sound("error");
return;
@@ -560,15 +588,14 @@ erpnext.PointOfSale.Controller = class {
if (serial_no) {
await this.check_serial_no_availablilty(item_code, this.frm.doc.set_warehouse, serial_no);
- new_item['serial_no'] = serial_no;
+ new_item["serial_no"] = serial_no;
}
- if (field === 'serial_no')
- new_item['qty'] = value.split(`\n`).length || 0;
+ if (field === "serial_no") new_item["qty"] = value.split(`\n`).length || 0;
- item_row = this.frm.add_child('items', new_item);
+ item_row = this.frm.add_child("items", new_item);
- if (field === 'qty' && value !== 0 && !this.allow_negative_stock) {
+ if (field === "qty" && value !== 0 && !this.allow_negative_stock) {
const qty_needed = value * item_row.conversion_factor;
await this.check_stock_availability(item_row, qty_needed, this.frm.doc.set_warehouse);
}
@@ -577,13 +604,14 @@ erpnext.PointOfSale.Controller = class {
this.update_cart_html(item_row);
- if (this.item_details.$component.is(':visible'))
- this.edit_item_details_of(item_row);
+ if (this.item_details.$component.is(":visible")) this.edit_item_details_of(item_row);
- if (this.check_serial_batch_selection_needed(item_row) && !this.item_details.$component.is(':visible'))
+ if (
+ this.check_serial_batch_selection_needed(item_row) &&
+ !this.item_details.$component.is(":visible")
+ )
this.edit_item_details_of(item_row);
}
-
} catch (error) {
console.log(error);
} finally {
@@ -595,8 +623,8 @@ erpnext.PointOfSale.Controller = class {
raise_customer_selection_alert() {
frappe.dom.unfreeze();
frappe.show_alert({
- message: __('You must select a customer before adding an item.'),
- indicator: 'orange'
+ message: __("You must select a customer before adding an item."),
+ indicator: "orange",
});
frappe.utils.play_sound("error");
}
@@ -604,17 +632,18 @@ erpnext.PointOfSale.Controller = class {
get_item_from_frm({ name, item_code, batch_no, uom, rate }) {
let item_row = null;
if (name) {
- item_row = this.frm.doc.items.find(i => i.name == name);
+ item_row = this.frm.doc.items.find((i) => i.name == name);
} else {
// if item is clicked twice from item selector
// then "item_code, batch_no, uom, rate" will help in getting the exact item
// to increase the qty by one
- const has_batch_no = (batch_no !== 'null' && batch_no !== null);
+ const has_batch_no = batch_no !== "null" && batch_no !== null;
item_row = this.frm.doc.items.find(
- i => i.item_code === item_code
- && (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
- && (i.uom === uom)
- && (i.rate === flt(rate))
+ (i) =>
+ i.item_code === item_code &&
+ (!has_batch_no || (has_batch_no && i.batch_no === batch_no)) &&
+ i.uom === uom &&
+ i.rate === flt(rate)
);
}
@@ -642,16 +671,19 @@ erpnext.PointOfSale.Controller = class {
const no_serial_selected = !item_row.serial_no;
const no_batch_selected = !item_row.batch_no;
- if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
- (serialized && batched && (no_batch_selected || no_serial_selected))) {
+ if (
+ (serialized && no_serial_selected) ||
+ (batched && no_batch_selected) ||
+ (serialized && batched && (no_batch_selected || no_serial_selected))
+ ) {
return true;
}
return false;
}
async trigger_new_item_events(item_row) {
- await this.frm.script_manager.trigger('item_code', item_row.doctype, item_row.name);
- await this.frm.script_manager.trigger('qty', item_row.doctype, item_row.name);
+ await this.frm.script_manager.trigger("item_code", item_row.doctype, item_row.name);
+ await this.frm.script_manager.trigger("qty", item_row.doctype, item_row.name);
}
async check_stock_availability(item_row, qty_needed, warehouse) {
@@ -663,21 +695,27 @@ erpnext.PointOfSale.Controller = class {
const bold_uom = item_row.stock_uom.bold();
const bold_item_code = item_row.item_code.bold();
const bold_warehouse = warehouse.bold();
- const bold_available_qty = available_qty.toString().bold()
+ const bold_available_qty = available_qty.toString().bold();
if (!(available_qty > 0)) {
if (is_stock_item) {
frappe.model.clear_doc(item_row.doctype, item_row.name);
frappe.throw({
title: __("Not Available"),
- message: __('Item Code: {0} is not available under warehouse {1}.', [bold_item_code, bold_warehouse])
+ message: __("Item Code: {0} is not available under warehouse {1}.", [
+ bold_item_code,
+ bold_warehouse,
+ ]),
});
} else {
return;
}
} else if (is_stock_item && available_qty < qty_needed) {
frappe.throw({
- message: __('Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}.', [bold_item_code, bold_warehouse, bold_available_qty, bold_uom]),
- indicator: 'orange'
+ message: __(
+ "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}.",
+ [bold_item_code, bold_warehouse, bold_available_qty, bold_uom]
+ ),
+ indicator: "orange",
});
frappe.utils.play_sound("error");
}
@@ -686,13 +724,15 @@ erpnext.PointOfSale.Controller = class {
async check_serial_no_availablilty(item_code, warehouse, serial_no) {
const method = "erpnext.stock.doctype.serial_no.serial_no.get_pos_reserved_serial_nos";
- const args = {filters: { item_code, warehouse }}
+ const args = { filters: { item_code, warehouse } };
const res = await frappe.call({ method, args });
if (res.message.includes(serial_no)) {
frappe.throw({
title: __("Not Available"),
- message: __('Serial No: {0} has already been transacted into another POS Invoice.', [serial_no.bold()])
+ message: __("Serial No: {0} has already been transacted into another POS Invoice.", [
+ serial_no.bold(),
+ ]),
});
}
}
@@ -702,21 +742,20 @@ erpnext.PointOfSale.Controller = class {
return frappe.call({
method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.get_stock_availability",
args: {
- 'item_code': item_code,
- 'warehouse': warehouse,
+ item_code: item_code,
+ warehouse: warehouse,
},
callback(res) {
- if (!me.item_stock_map[item_code])
- me.item_stock_map[item_code] = {};
+ if (!me.item_stock_map[item_code]) me.item_stock_map[item_code] = {};
me.item_stock_map[item_code][warehouse] = res.message;
- }
+ },
});
}
update_item_field(value, field_or_action) {
- if (field_or_action === 'checkout') {
+ if (field_or_action === "checkout") {
this.item_details.toggle_item_details_section(null);
- } else if (field_or_action === 'remove') {
+ } else if (field_or_action === "remove") {
this.remove_item_from_cart();
} else {
const field_control = this.item_details[`${field_or_action}_control`];
@@ -730,26 +769,28 @@ erpnext.PointOfSale.Controller = class {
frappe.dom.freeze();
const { doctype, name, current_item } = this.item_details;
- return frappe.model.set_value(doctype, name, 'qty', 0)
+ return frappe.model
+ .set_value(doctype, name, "qty", 0)
.then(() => {
frappe.model.clear_doc(doctype, name);
this.update_cart_html(current_item, true);
this.item_details.toggle_item_details_section(null);
frappe.dom.unfreeze();
})
- .catch(e => console.log(e));
+ .catch((e) => console.log(e));
}
async save_and_checkout() {
if (this.frm.is_dirty()) {
let save_error = false;
- await this.frm.save(null, null, null, () => save_error = true);
+ await this.frm.save(null, null, null, () => (save_error = true));
// only move to payment section if save is successful
!save_error && this.payment.checkout();
// show checkout button on error
- save_error && setTimeout(() => {
- this.cart.toggle_checkout_btn(true);
- }, 300); // wait for save to finish
+ save_error &&
+ setTimeout(() => {
+ this.cart.toggle_checkout_btn(true);
+ }, 300); // wait for save to finish
} else {
this.payment.checkout();
}
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
index bd8579203c05..d95ef5893d9a 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_cart.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -18,11 +18,9 @@ erpnext.PointOfSale.ItemCart = class {
}
prepare_dom() {
- this.wrapper.append(
- `
`
- )
+ this.wrapper.append(`
`);
- this.$component = this.wrapper.find('.customer-cart-container');
+ this.$component = this.wrapper.find(".customer-cart-container");
}
init_child_components() {
@@ -31,16 +29,14 @@ erpnext.PointOfSale.ItemCart = class {
}
init_customer_selector() {
- this.$component.append(
- `
`
- )
- this.$customer_section = this.$component.find('.customer-section');
+ this.$component.append(`
`);
+ this.$customer_section = this.$component.find(".customer-section");
this.make_customer_selector();
}
reset_customer_selector() {
const frm = this.events.get_frm();
- frm.set_value('customer', '');
+ frm.set_value("customer", "");
this.make_customer_selector();
this.customer_field.set_focus();
}
@@ -49,11 +45,11 @@ erpnext.PointOfSale.ItemCart = class {
this.$component.append(
`
-
${__('Item Cart')}
+
${__("Item Cart")}
@@ -61,7 +57,7 @@ erpnext.PointOfSale.ItemCart = class {
`
);
- this.$cart_container = this.$component.find('.cart-container');
+ this.$cart_container = this.$component.find(".cart-container");
this.make_cart_totals_section();
this.make_cart_items_section();
@@ -69,39 +65,35 @@ erpnext.PointOfSale.ItemCart = class {
}
make_cart_items_section() {
- this.$cart_header = this.$component.find('.cart-header');
- this.$cart_items_wrapper = this.$component.find('.cart-items-section');
+ this.$cart_header = this.$component.find(".cart-header");
+ this.$cart_items_wrapper = this.$component.find(".cart-items-section");
this.make_no_items_placeholder();
}
make_no_items_placeholder() {
- this.$cart_header.css('display', 'none');
- this.$cart_items_wrapper.html(
- `
${__('No items in cart')}
`
- );
+ this.$cart_header.css("display", "none");
+ this.$cart_items_wrapper.html(`
${__("No items in cart")}
`);
}
get_discount_icon() {
- return (
- `
+ return `
`
- );
+ `;
}
make_cart_totals_section() {
- this.$totals_section = this.$component.find('.cart-totals-section');
+ this.$totals_section = this.$component.find(".cart-totals-section");
this.$totals_section.append(
`
- ${this.get_discount_icon()} ${__('Add Discount')}
+ ${this.get_discount_icon()} ${__("Add Discount")}
-
${__('Total Items')}
+
${__("Total Items")}
0.00
@@ -110,39 +102,39 @@ erpnext.PointOfSale.ItemCart = class {
-
${__('Grand Total')}
+
${__("Grand Total")}
0.00
-
${__('Checkout')}
-
${__('Edit Cart')}
`
- )
+
${__("Checkout")}
+
${__("Edit Cart")}
`
+ );
this.$add_discount_elem = this.$component.find(".add-discount-wrapper");
}
make_cart_numpad() {
- this.$numpad_section = this.$component.find('.numpad-section');
+ this.$numpad_section = this.$component.find(".numpad-section");
this.number_pad = new erpnext.PointOfSale.NumberPad({
wrapper: this.$numpad_section,
events: {
- numpad_event: this.on_numpad_event.bind(this)
+ numpad_event: this.on_numpad_event.bind(this),
},
cols: 5,
keys: [
- [ 1, 2, 3, 'Quantity' ],
- [ 4, 5, 6, 'Discount' ],
- [ 7, 8, 9, 'Rate' ],
- [ '.', 0, 'Delete', 'Remove' ]
+ [1, 2, 3, "Quantity"],
+ [4, 5, 6, "Discount"],
+ [7, 8, 9, "Rate"],
+ [".", 0, "Delete", "Remove"],
],
css_classes: [
- [ '', '', '', 'col-span-2' ],
- [ '', '', '', 'col-span-2' ],
- [ '', '', '', 'col-span-2' ],
- [ '', '', '', 'col-span-2 remove-btn' ]
+ ["", "", "", "col-span-2"],
+ ["", "", "", "col-span-2"],
+ ["", "", "", "col-span-2"],
+ ["", "", "", "col-span-2 remove-btn"],
],
- fieldnames_map: { 'Quantity': 'qty', 'Discount': 'discount_percentage' }
- })
+ fieldnames_map: { Quantity: "qty", Discount: "discount_percentage" },
+ });
this.$numpad_section.prepend(
`
@@ -150,49 +142,49 @@ erpnext.PointOfSale.ItemCart = class {
`
- )
+ );
this.$numpad_section.append(
- `
${__('Checkout')}
`
- )
+ `
${__("Checkout")}
`
+ );
}
bind_events() {
const me = this;
- this.$customer_section.on('click', '.reset-customer-btn', function () {
+ this.$customer_section.on("click", ".reset-customer-btn", function () {
me.reset_customer_selector();
});
- this.$customer_section.on('click', '.close-details-btn', function () {
+ this.$customer_section.on("click", ".close-details-btn", function () {
me.toggle_customer_info(false);
});
- this.$customer_section.on('click', '.customer-display', function(e) {
- if ($(e.target).closest('.reset-customer-btn').length) return;
+ this.$customer_section.on("click", ".customer-display", function (e) {
+ if ($(e.target).closest(".reset-customer-btn").length) return;
- const show = me.$cart_container.is(':visible');
+ const show = me.$cart_container.is(":visible");
me.toggle_customer_info(show);
});
- this.$cart_items_wrapper.on('click', '.cart-item-wrapper', function() {
+ this.$cart_items_wrapper.on("click", ".cart-item-wrapper", function () {
const $cart_item = $(this);
me.toggle_item_highlight(this);
- const payment_section_hidden = !me.$totals_section.find('.edit-cart-btn').is(':visible');
+ const payment_section_hidden = !me.$totals_section.find(".edit-cart-btn").is(":visible");
if (!payment_section_hidden) {
// payment section is visible
// edit cart first and then open item details section
me.$totals_section.find(".edit-cart-btn").click();
}
- const item_row_name = unescape($cart_item.attr('data-row-name'));
+ const item_row_name = unescape($cart_item.attr("data-row-name"));
me.events.cart_item_clicked({ name: item_row_name });
- this.numpad_value = '';
+ this.numpad_value = "";
});
- this.$component.on('click', '.checkout-btn', async function() {
- if ($(this).attr('style').indexOf('--blue-500') == -1) return;
+ this.$component.on("click", ".checkout-btn", async function () {
+ if ($(this).attr("style").indexOf("--blue-500") == -1) return;
await me.events.checkout();
me.toggle_checkout_btn(false);
@@ -200,18 +192,18 @@ erpnext.PointOfSale.ItemCart = class {
me.allow_discount_change && me.$add_discount_elem.removeClass("d-none");
});
- this.$totals_section.on('click', '.edit-cart-btn', () => {
+ this.$totals_section.on("click", ".edit-cart-btn", () => {
this.events.edit_cart();
this.toggle_checkout_btn(true);
});
- this.$component.on('click', '.add-discount-wrapper', () => {
- const can_edit_discount = this.$add_discount_elem.find('.edit-discount-btn').length;
+ this.$component.on("click", ".add-discount-wrapper", () => {
+ const can_edit_discount = this.$add_discount_elem.find(".edit-discount-btn").length;
- if(!this.discount_field || can_edit_discount) this.show_discount_control();
+ if (!this.discount_field || can_edit_discount) this.show_discount_control();
});
- frappe.ui.form.on("POS Invoice", "paid_amount", frm => {
+ frappe.ui.form.on("POS Invoice", "paid_amount", (frm) => {
// called when discount is applied
this.update_totals_section(frm);
});
@@ -220,43 +212,49 @@ erpnext.PointOfSale.ItemCart = class {
attach_shortcuts() {
for (let row of this.number_pad.keys) {
for (let btn of row) {
- if (typeof btn !== 'string') continue; // do not make shortcuts for numbers
+ if (typeof btn !== "string") continue; // do not make shortcuts for numbers
let shortcut_key = `ctrl+${frappe.scrub(String(btn))[0]}`;
- if (btn === 'Delete') shortcut_key = 'ctrl+backspace';
- if (btn === 'Remove') shortcut_key = 'shift+ctrl+backspace'
- if (btn === '.') shortcut_key = 'ctrl+>';
+ if (btn === "Delete") shortcut_key = "ctrl+backspace";
+ if (btn === "Remove") shortcut_key = "shift+ctrl+backspace";
+ if (btn === ".") shortcut_key = "ctrl+>";
// to account for fieldname map
- const fieldname = this.number_pad.fieldnames[btn] ? this.number_pad.fieldnames[btn] :
- typeof btn === 'string' ? frappe.scrub(btn) : btn;
-
- let shortcut_label = shortcut_key.split('+').map(frappe.utils.to_title_case).join('+');
- shortcut_label = frappe.utils.is_mac() ? shortcut_label.replace('Ctrl', '⌘') : shortcut_label;
- this.$numpad_section.find(`.numpad-btn[data-button-value="${fieldname}"]`).attr("title", shortcut_label);
+ const fieldname = this.number_pad.fieldnames[btn]
+ ? this.number_pad.fieldnames[btn]
+ : typeof btn === "string"
+ ? frappe.scrub(btn)
+ : btn;
+
+ let shortcut_label = shortcut_key.split("+").map(frappe.utils.to_title_case).join("+");
+ shortcut_label = frappe.utils.is_mac() ? shortcut_label.replace("Ctrl", "⌘") : shortcut_label;
+ this.$numpad_section
+ .find(`.numpad-btn[data-button-value="${fieldname}"]`)
+ .attr("title", shortcut_label);
frappe.ui.keys.on(`${shortcut_key}`, () => {
const cart_is_visible = this.$component.is(":visible");
if (cart_is_visible && this.item_is_selected && this.$numpad_section.is(":visible")) {
this.$numpad_section.find(`.numpad-btn[data-button-value="${fieldname}"]`).click();
}
- })
+ });
}
}
- const ctrl_label = frappe.utils.is_mac() ? '⌘' : 'Ctrl';
+ const ctrl_label = frappe.utils.is_mac() ? "⌘" : "Ctrl";
this.$component.find(".checkout-btn").attr("title", `${ctrl_label}+Enter`);
frappe.ui.keys.add_shortcut({
shortcut: "ctrl+enter",
action: () => this.$component.find(".checkout-btn").click(),
- condition: () => this.$component.is(":visible") && !this.$totals_section.find('.edit-cart-btn').is(':visible'),
+ condition: () =>
+ this.$component.is(":visible") && !this.$totals_section.find(".edit-cart-btn").is(":visible"),
description: __("Checkout Order / Submit Order / New Order"),
ignore_inputs: true,
- page: cur_page.page.page
+ page: cur_page.page.page,
});
this.$component.find(".edit-cart-btn").attr("title", `${ctrl_label}+E`);
frappe.ui.keys.on("ctrl+e", () => {
const item_cart_visible = this.$component.is(":visible");
- const checkout_btn_invisible = !this.$totals_section.find('.checkout-btn').is('visible');
+ const checkout_btn_invisible = !this.$totals_section.find(".checkout-btn").is("visible");
if (item_cart_visible && checkout_btn_invisible) {
this.$component.find(".edit-cart-btn").click();
}
@@ -268,7 +266,7 @@ erpnext.PointOfSale.ItemCart = class {
condition: () => this.$add_discount_elem.is(":visible"),
description: __("Add Order Discount"),
ignore_inputs: true,
- page: cur_page.page.page
+ page: cur_page.page.page,
});
frappe.ui.keys.on("escape", () => {
const item_cart_visible = this.$component.is(":visible");
@@ -284,11 +282,11 @@ erpnext.PointOfSale.ItemCart = class {
if (!item || item_is_highlighted) {
this.item_is_selected = false;
- this.$cart_container.find('.cart-item-wrapper').css("background-color", "");
+ this.$cart_container.find(".cart-item-wrapper").css("background-color", "");
} else {
$cart_item.css("background-color", "var(--control-bg)");
this.item_is_selected = true;
- this.$cart_container.find('.cart-item-wrapper').not(item).css("background-color", "");
+ this.$cart_container.find(".cart-item-wrapper").not(item).css("background-color", "");
}
}
@@ -297,38 +295,38 @@ erpnext.PointOfSale.ItemCart = class {
`);
const me = this;
- const query = { query: 'erpnext.controllers.queries.customer_query' };
+ const query = { query: "erpnext.controllers.queries.customer_query" };
const allowed_customer_group = this.allowed_customer_groups || [];
if (allowed_customer_group.length) {
query.filters = {
- customer_group: ['in', allowed_customer_group]
- }
+ customer_group: ["in", allowed_customer_group],
+ };
}
this.customer_field = frappe.ui.form.make_control({
df: {
- label: __('Customer'),
- fieldtype: 'Link',
- options: 'Customer',
- placeholder: __('Search by customer name, phone, email.'),
+ label: __("Customer"),
+ fieldtype: "Link",
+ options: "Customer",
+ placeholder: __("Search by customer name, phone, email."),
get_query: () => query,
- onchange: function() {
+ onchange: function () {
if (this.value) {
const frm = me.events.get_frm();
frappe.dom.freeze();
- frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'customer', this.value);
- frm.script_manager.trigger('customer', frm.doc.doctype, frm.doc.name).then(() => {
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, "customer", this.value);
+ frm.script_manager.trigger("customer", frm.doc.doctype, frm.doc.name).then(() => {
frappe.run_serially([
() => me.fetch_customer_details(this.value),
() => me.events.customer_details_updated(me.customer_info),
() => me.update_customer_section(),
() => me.update_totals_section(),
- () => frappe.dom.unfreeze()
+ () => frappe.dom.unfreeze(),
]);
- })
+ });
}
},
},
- parent: this.$customer_section.find('.customer-field'),
+ parent: this.$customer_section.find(".customer-field"),
render_input: true,
});
this.customer_field.toggle_label(false);
@@ -337,66 +335,81 @@ erpnext.PointOfSale.ItemCart = class {
fetch_customer_details(customer) {
if (customer) {
return new Promise((resolve) => {
- frappe.db.get_value('Customer', customer, ["email_id", "mobile_no", "image", "loyalty_program"]).then(({ message }) => {
- const { loyalty_program } = message;
- // if loyalty program then fetch loyalty points too
- if (loyalty_program) {
- frappe.call({
- method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details_with_points",
- args: { customer, loyalty_program, "silent": true },
- callback: (r) => {
- const { loyalty_points, conversion_factor } = r.message;
- if (!r.exc) {
- this.customer_info = { ...message, customer, loyalty_points, conversion_factor };
- resolve();
- }
- }
- });
- } else {
- this.customer_info = { ...message, customer };
- resolve();
- }
- });
+ frappe.db
+ .get_value("Customer", customer, ["email_id", "mobile_no", "image", "loyalty_program"])
+ .then(({ message }) => {
+ const { loyalty_program } = message;
+ // if loyalty program then fetch loyalty points too
+ if (loyalty_program) {
+ frappe.call({
+ method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details_with_points",
+ args: { customer, loyalty_program, silent: true },
+ callback: (r) => {
+ const { loyalty_points, conversion_factor } = r.message;
+ if (!r.exc) {
+ this.customer_info = {
+ ...message,
+ customer,
+ loyalty_points,
+ conversion_factor,
+ };
+ resolve();
+ }
+ },
+ });
+ } else {
+ this.customer_info = { ...message, customer };
+ resolve();
+ }
+ });
});
} else {
return new Promise((resolve) => {
- this.customer_info = {}
+ this.customer_info = {};
resolve();
});
}
}
show_discount_control() {
- this.$add_discount_elem.css({ 'padding': '0px', 'border': 'none' });
- this.$add_discount_elem.html(
- `
`
- );
+ this.$add_discount_elem.css({ padding: "0px", border: "none" });
+ this.$add_discount_elem.html(`
`);
const me = this;
const frm = me.events.get_frm();
let discount = frm.doc.additional_discount_percentage;
this.discount_field = frappe.ui.form.make_control({
df: {
- label: __('Discount'),
- fieldtype: 'Data',
- placeholder: ( discount ? discount + '%' : __('Enter discount percentage.') ),
- input_class: 'input-xs',
- onchange: function() {
+ label: __("Discount"),
+ fieldtype: "Data",
+ placeholder: discount ? discount + "%" : __("Enter discount percentage."),
+ input_class: "input-xs",
+ onchange: function () {
if (flt(this.value) != 0) {
- frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', flt(this.value));
+ frappe.model.set_value(
+ frm.doc.doctype,
+ frm.doc.name,
+ "additional_discount_percentage",
+ flt(this.value)
+ );
me.hide_discount_control(this.value);
} else {
- frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', 0);
+ frappe.model.set_value(
+ frm.doc.doctype,
+ frm.doc.name,
+ "additional_discount_percentage",
+ 0
+ );
me.$add_discount_elem.css({
- 'border': '1px dashed var(--gray-500)',
- 'padding': 'var(--padding-sm) var(--padding-md)'
+ border: "1px dashed var(--gray-500)",
+ padding: "var(--padding-sm) var(--padding-md)",
});
- me.$add_discount_elem.html(`${me.get_discount_icon()} ${__('Add Discount')}`);
+ me.$add_discount_elem.html(`${me.get_discount_icon()} ${__("Add Discount")}`);
me.discount_field = undefined;
}
},
},
- parent: this.$add_discount_elem.find('.add-discount-field'),
+ parent: this.$add_discount_elem.find(".add-discount-field"),
render_input: true,
});
this.discount_field.toggle_label(false);
@@ -405,14 +418,12 @@ erpnext.PointOfSale.ItemCart = class {
hide_discount_control(discount) {
if (!discount) {
- this.$add_discount_elem.css({ 'padding': '0px', 'border': 'none' });
- this.$add_discount_elem.html(
- `
`
- );
+ this.$add_discount_elem.css({ padding: "0px", border: "none" });
+ this.$add_discount_elem.html(`
`);
} else {
this.$add_discount_elem.css({
- 'border': '1px dashed var(--dark-green-500)',
- 'padding': 'var(--padding-sm) var(--padding-md)'
+ border: "1px dashed var(--dark-green-500)",
+ padding: "var(--padding-sm) var(--padding-md)",
});
this.$add_discount_elem.html(
`
@@ -424,7 +435,7 @@ erpnext.PointOfSale.ItemCart = class {
update_customer_section() {
const me = this;
- const { customer, email_id='', mobile_no='', image } = this.customer_info || {};
+ const { customer, email_id = "", mobile_no = "", image } = this.customer_info || {};
if (customer) {
this.$customer_section.html(
@@ -450,7 +461,7 @@ erpnext.PointOfSale.ItemCart = class {
function get_customer_description() {
if (!email_id && !mobile_no) {
- return `
${__('Click to add email / phone')}
`;
+ return `
${__("Click to add email / phone")}
`;
} else if (email_id && !mobile_no) {
return `
${email_id}
`;
} else if (mobile_no && !email_id) {
@@ -459,7 +470,6 @@ erpnext.PointOfSale.ItemCart = class {
return `
${email_id} - ${mobile_no}
`;
}
}
-
}
get_customer_image() {
@@ -476,7 +486,9 @@ erpnext.PointOfSale.ItemCart = class {
this.render_net_total(frm.doc.net_total);
this.render_total_item_qty(frm.doc.items);
- const grand_total = cint(frappe.sys_defaults.disable_rounded_total) ? frm.doc.grand_total : frm.doc.rounded_total;
+ const grand_total = cint(frappe.sys_defaults.disable_rounded_total)
+ ? frm.doc.grand_total
+ : frm.doc.rounded_total;
this.render_grand_total(grand_total);
this.render_taxes(frm.doc.taxes);
@@ -484,13 +496,13 @@ erpnext.PointOfSale.ItemCart = class {
render_net_total(value) {
const currency = this.events.get_frm().doc.currency;
- this.$totals_section.find('.net-total-container').html(
- `
${__('Net Total')}
${format_currency(value, currency)}
`
- )
+ this.$totals_section
+ .find(".net-total-container")
+ .html(`
${__("Net Total")}
${format_currency(value, currency)}
`);
- this.$numpad_section.find('.numpad-net-total').html(
- `
${__('Net Total')}: ${format_currency(value, currency)}
`
- );
+ this.$numpad_section
+ .find(".numpad-net-total")
+ .html(`
${__("Net Total")}: ${format_currency(value, currency)}
`);
}
render_total_item_qty(items) {
@@ -499,41 +511,47 @@ erpnext.PointOfSale.ItemCart = class {
total_item_qty = total_item_qty + item.qty;
});
- this.$totals_section.find('.item-qty-total-container').html(
- `
${__('Total Quantity')}
${total_item_qty}
`
- );
+ this.$totals_section
+ .find(".item-qty-total-container")
+ .html(`
${__("Total Quantity")}
${total_item_qty}
`);
- this.$numpad_section.find('.numpad-item-qty-total').html(
- `
${__('Total Quantity')}: ${total_item_qty}
`
- );
+ this.$numpad_section
+ .find(".numpad-item-qty-total")
+ .html(`
${__("Total Quantity")}: ${total_item_qty}
`);
}
render_grand_total(value) {
const currency = this.events.get_frm().doc.currency;
- this.$totals_section.find('.grand-total-container').html(
- `
${__('Grand Total')}
${format_currency(value, currency)}
`
- )
+ this.$totals_section
+ .find(".grand-total-container")
+ .html(`
${__("Grand Total")}
${format_currency(value, currency)}
`);
- this.$numpad_section.find('.numpad-grand-total').html(
- `
${__('Grand Total')}: ${format_currency(value, currency)}
`
- );
+ this.$numpad_section
+ .find(".numpad-grand-total")
+ .html(`
${__("Grand Total")}: ${format_currency(value, currency)}
`);
}
render_taxes(taxes) {
if (taxes && taxes.length) {
const currency = this.events.get_frm().doc.currency;
- const taxes_html = taxes.map(t => {
- if (t.tax_amount_after_discount_amount == 0.0) return;
- // if tax rate is 0, don't print it.
- const description = /[0-9]+/.test(t.description) ? t.description : ((t.rate != 0) ? `${t.description} @ ${t.rate}%`: t.description);
- return `
+ const taxes_html = taxes
+ .map((t) => {
+ if (t.tax_amount_after_discount_amount == 0.0) return;
+ // if tax rate is 0, don't print it.
+ const description = /[0-9]+/.test(t.description)
+ ? t.description
+ : t.rate != 0
+ ? `${t.description} @ ${t.rate}%`
+ : t.description;
+ return `
${description}
${format_currency(t.tax_amount_after_discount_amount, currency)}
`;
- }).join('');
- this.$totals_section.find('.taxes-container').css('display', 'flex').html(taxes_html);
+ })
+ .join("");
+ this.$totals_section.find(".taxes-container").css("display", "flex").html(taxes_html);
} else {
- this.$totals_section.find('.taxes-container').css('display', 'none').html('');
+ this.$totals_section.find(".taxes-container").css("display", "none").html("");
}
}
@@ -544,7 +562,7 @@ erpnext.PointOfSale.ItemCart = class {
get_item_from_frm(item) {
const doc = this.events.get_frm().doc;
- return doc.items.find(i => i.name == item.name);
+ return doc.items.find((i) => i.name == item.name);
}
update_item_html(item, remove_item) {
@@ -557,7 +575,7 @@ erpnext.PointOfSale.ItemCart = class {
this.render_cart_item(item_row, $item);
}
- const no_of_cart_items = this.$cart_items_wrapper.find('.cart-item-wrapper').length;
+ const no_of_cart_items = this.$cart_items_wrapper.find(".cart-item-wrapper").length;
this.highlight_checkout_btn(no_of_cart_items > 0);
this.update_empty_cart_section(no_of_cart_items);
@@ -571,7 +589,7 @@ erpnext.PointOfSale.ItemCart = class {
this.$cart_items_wrapper.append(
`
`
- )
+ );
$item_to_update = this.get_cart_item(item_data);
}
@@ -584,7 +602,7 @@ erpnext.PointOfSale.ItemCart = class {
${get_description_html()}
${get_rate_discount_html()}`
- )
+ );
set_dynamic_rate_header_width();
@@ -593,8 +611,7 @@ erpnext.PointOfSale.ItemCart = class {
me.$cart_header.find(".rate-amount-header").css("width", "");
me.$cart_items_wrapper.find(".item-rate-amount").css("width", "");
let max_width = rate_cols.reduce((max_width, elm) => {
- if ($(elm).width() > max_width)
- max_width = $(elm).width();
+ if ($(elm).width() > max_width) max_width = $(elm).width();
return max_width;
}, 0);
@@ -614,7 +631,7 @@ erpnext.PointOfSale.ItemCart = class {
${format_currency(item_data.amount, currency)}
${format_currency(item_data.rate, currency)}
-
`
+
`;
} else {
return `
@@ -622,17 +639,20 @@ erpnext.PointOfSale.ItemCart = class {
${format_currency(item_data.rate, currency)}
-
`
+
`;
}
}
function get_description_html() {
if (item_data.description) {
- if (item_data.description.indexOf('
') != -1) {
+ if (item_data.description.indexOf("
") != -1) {
try {
item_data.description = $(item_data.description).text();
} catch (error) {
- item_data.description = item_data.description.replace(/
/g, ' ').replace(/<\/div>/g, ' ').replace(/ +/g, ' ');
+ item_data.description = item_data.description
+ .replace(/
/g, " ")
+ .replace(/<\/div>/g, " ")
+ .replace(/ +/g, " ");
}
}
item_data.description = frappe.ellipsis(item_data.description, 45);
@@ -657,7 +677,7 @@ erpnext.PointOfSale.ItemCart = class {
}
handle_broken_image($img) {
- const item_abbr = $($img).attr('alt');
+ const item_abbr = $($img).attr("alt");
$($img).parent().replaceWith(`
${item_abbr}
`);
}
@@ -668,44 +688,48 @@ erpnext.PointOfSale.ItemCart = class {
toggle_checkout_btn(show_checkout) {
if (show_checkout) {
- this.$totals_section.find('.checkout-btn').css('display', 'flex');
- this.$totals_section.find('.edit-cart-btn').css('display', 'none');
+ this.$totals_section.find(".checkout-btn").css("display", "flex");
+ this.$totals_section.find(".edit-cart-btn").css("display", "none");
} else {
- this.$totals_section.find('.checkout-btn').css('display', 'none');
- this.$totals_section.find('.edit-cart-btn').css('display', 'flex');
+ this.$totals_section.find(".checkout-btn").css("display", "none");
+ this.$totals_section.find(".edit-cart-btn").css("display", "flex");
}
}
highlight_checkout_btn(toggle) {
if (toggle) {
- this.$add_discount_elem.css('display', 'flex');
- this.$cart_container.find('.checkout-btn').css({
- 'background-color': 'var(--blue-500)'
+ this.$add_discount_elem.css("display", "flex");
+ this.$cart_container.find(".checkout-btn").css({
+ "background-color": "var(--blue-500)",
});
} else {
- this.$add_discount_elem.css('display', 'none');
- this.$cart_container.find('.checkout-btn').css({
- 'background-color': 'var(--blue-200)'
+ this.$add_discount_elem.css("display", "none");
+ this.$cart_container.find(".checkout-btn").css({
+ "background-color": "var(--blue-200)",
});
}
}
update_empty_cart_section(no_of_cart_items) {
- const $no_item_element = this.$cart_items_wrapper.find('.no-item-wrapper');
+ const $no_item_element = this.$cart_items_wrapper.find(".no-item-wrapper");
// if cart has items and no item is present
- no_of_cart_items > 0 && $no_item_element && $no_item_element.remove() && this.$cart_header.css('display', 'flex');
+ no_of_cart_items > 0 &&
+ $no_item_element &&
+ $no_item_element.remove() &&
+ this.$cart_header.css("display", "flex");
no_of_cart_items === 0 && !$no_item_element.length && this.make_no_items_placeholder();
}
on_numpad_event($btn) {
- const current_action = $btn.attr('data-button-value');
- const action_is_field_edit = ['qty', 'discount_percentage', 'rate'].includes(current_action);
- const action_is_allowed = action_is_field_edit ? (
- (current_action == 'rate' && this.allow_rate_change) ||
- (current_action == 'discount_percentage' && this.allow_discount_change) ||
- (current_action == 'qty')) : true;
+ const current_action = $btn.attr("data-button-value");
+ const action_is_field_edit = ["qty", "discount_percentage", "rate"].includes(current_action);
+ const action_is_allowed = action_is_field_edit
+ ? (current_action == "rate" && this.allow_rate_change) ||
+ (current_action == "discount_percentage" && this.allow_discount_change) ||
+ current_action == "qty"
+ : true;
const action_is_pressed_twice = this.prev_action === current_action;
const first_click_event = !this.prev_action;
@@ -713,11 +737,11 @@ erpnext.PointOfSale.ItemCart = class {
if (action_is_field_edit) {
if (!action_is_allowed) {
- const label = current_action == 'rate' ? 'Rate'.bold() : 'Discount'.bold();
- const message = __('Editing {0} is not allowed as per POS Profile settings', [label]);
+ const label = current_action == "rate" ? "Rate".bold() : "Discount".bold();
+ const message = __("Editing {0} is not allowed as per POS Profile settings", [label]);
frappe.show_alert({
- indicator: 'red',
- message: message
+ indicator: "red",
+ message: message,
});
frappe.utils.play_sound("error");
return;
@@ -728,20 +752,22 @@ erpnext.PointOfSale.ItemCart = class {
} else if (action_is_pressed_twice) {
this.prev_action = undefined;
}
- this.numpad_value = '';
-
- } else if (current_action === 'checkout') {
+ this.numpad_value = "";
+ } else if (current_action === "checkout") {
this.prev_action = undefined;
this.toggle_item_highlight();
this.events.numpad_event(undefined, current_action);
return;
- } else if (current_action === 'remove') {
+ } else if (current_action === "remove") {
this.prev_action = undefined;
this.toggle_item_highlight();
this.events.numpad_event(undefined, current_action);
return;
} else {
- this.numpad_value = current_action === 'delete' ? this.numpad_value.slice(0, -1) : this.numpad_value + current_action;
+ this.numpad_value =
+ current_action === "delete"
+ ? this.numpad_value.slice(0, -1)
+ : this.numpad_value + current_action;
this.numpad_value = this.numpad_value || 0;
}
@@ -749,17 +775,17 @@ erpnext.PointOfSale.ItemCart = class {
if (first_click_event_is_not_field_edit) {
frappe.show_alert({
- indicator: 'red',
- message: __('Please select a field to edit from numpad')
+ indicator: "red",
+ message: __("Please select a field to edit from numpad"),
});
frappe.utils.play_sound("error");
return;
}
- if (flt(this.numpad_value) > 100 && this.prev_action === 'discount_percentage') {
+ if (flt(this.numpad_value) > 100 && this.prev_action === "discount_percentage") {
frappe.show_alert({
- message: __('Discount cannot be greater than 100%'),
- indicator: 'orange'
+ message: __("Discount cannot be greater than 100%"),
+ indicator: "orange",
});
frappe.utils.play_sound("error");
this.numpad_value = current_action;
@@ -770,48 +796,48 @@ erpnext.PointOfSale.ItemCart = class {
}
highlight_numpad_btn($btn, curr_action) {
- const curr_action_is_highlighted = $btn.hasClass('highlighted-numpad-btn');
- const curr_action_is_action = ['qty', 'discount_percentage', 'rate', 'done'].includes(curr_action);
+ const curr_action_is_highlighted = $btn.hasClass("highlighted-numpad-btn");
+ const curr_action_is_action = ["qty", "discount_percentage", "rate", "done"].includes(curr_action);
if (!curr_action_is_highlighted) {
- $btn.addClass('highlighted-numpad-btn');
+ $btn.addClass("highlighted-numpad-btn");
}
if (this.prev_action === curr_action && curr_action_is_highlighted) {
// if Qty is pressed twice
- $btn.removeClass('highlighted-numpad-btn');
+ $btn.removeClass("highlighted-numpad-btn");
}
if (this.prev_action && this.prev_action !== curr_action && curr_action_is_action) {
// Order: Qty -> Rate then remove Qty highlight
const prev_btn = $(`[data-button-value='${this.prev_action}']`);
- prev_btn.removeClass('highlighted-numpad-btn');
+ prev_btn.removeClass("highlighted-numpad-btn");
}
- if (!curr_action_is_action || curr_action === 'done') {
+ if (!curr_action_is_action || curr_action === "done") {
// if numbers are clicked
setTimeout(() => {
- $btn.removeClass('highlighted-numpad-btn');
+ $btn.removeClass("highlighted-numpad-btn");
}, 200);
}
}
toggle_numpad(show) {
if (show) {
- this.$totals_section.css('display', 'none');
- this.$numpad_section.css('display', 'flex');
+ this.$totals_section.css("display", "none");
+ this.$numpad_section.css("display", "flex");
} else {
- this.$totals_section.css('display', 'flex');
- this.$numpad_section.css('display', 'none');
+ this.$totals_section.css("display", "flex");
+ this.$numpad_section.css("display", "none");
}
this.reset_numpad();
}
reset_numpad() {
- this.numpad_value = '';
+ this.numpad_value = "";
this.prev_action = undefined;
- this.$numpad_section.find('.highlighted-numpad-btn').removeClass('highlighted-numpad-btn');
+ this.$numpad_section.find(".highlighted-numpad-btn").removeClass("highlighted-numpad-btn");
}
toggle_numpad_field_edit(fieldname) {
- if (['qty', 'discount_percentage', 'rate'].includes(fieldname)) {
+ if (["qty", "discount_percentage", "rate"].includes(fieldname)) {
this.$numpad_section.find(`[data-button-value="${fieldname}"]`).click();
}
}
@@ -820,12 +846,12 @@ erpnext.PointOfSale.ItemCart = class {
if (show) {
const { customer } = this.customer_info || {};
- this.$cart_container.css('display', 'none');
+ this.$cart_container.css("display", "none");
this.$customer_section.css({
- 'height': '100%',
- 'padding-top': '0px'
+ height: "100%",
+ "padding-top": "0px",
});
- this.$customer_section.find('.customer-details').html(
+ this.$customer_section.find(".customer-details").html(
`