0) {
// incoming - rate is given
- var rate = sl.incoming_rate;
- var add_qty = sl.qty;
+ let rate = sl.incoming_rate;
+ let add_qty = sl.qty;
if(wh.balance_qty < 0) {
// negative valuation
// only add value of quantity if
@@ -25,10 +27,11 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
add_qty = 0;
}
}
+
if(sl.serial_no) {
- var value_diff = this.get_serialized_value_diff(sl);
+ value_diff = this.get_serialized_value_diff(sl);
} else {
- var value_diff = (rate * add_qty);
+ value_diff = (rate * add_qty);
}
if(add_qty)
@@ -39,19 +42,19 @@ erpnext.StockGridReport = class StockGridReport extends frappe.views.TreeGridRep
// outgoing
if(sl.serial_no) {
- var value_diff = -1 * this.get_serialized_value_diff(sl);
+ value_diff = -1 * this.get_serialized_value_diff(sl);
} else if(is_fifo) {
- var value_diff = fifo_value_diff;
+ value_diff = fifo_value_diff;
} else {
// average rate for weighted average
- var rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 :
+ let rate = (wh.balance_qty.toFixed(2) == 0.00 ? 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)
- var value_diff = (rate * sl.qty);
+ value_diff = (rate * sl.qty);
else
- var value_diff = -wh.balance_value;
+ value_diff = -wh.balance_value;
}
}
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index cc03eca95d8..06e39aacc7c 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -675,7 +675,7 @@ erpnext.utils.update_child_items = function(opts) {
})
}
- new frappe.ui.Dialog({
+ let dialog = new frappe.ui.Dialog({
title: __("Update Items"),
size: "extra-large",
fields: [
@@ -712,7 +712,9 @@ erpnext.utils.update_child_items = function(opts) {
refresh_field("items");
},
primary_action_label: __('Update')
- }).show();
+ })
+
+ dialog.show();
}
erpnext.utils.map_current_doc = function(opts) {
diff --git a/erpnext/public/js/utils/landed_taxes_and_charges_common.js b/erpnext/public/js/utils/landed_taxes_and_charges_common.js
new file mode 100644
index 00000000000..c71f77d45e9
--- /dev/null
+++ b/erpnext/public/js/utils/landed_taxes_and_charges_common.js
@@ -0,0 +1,62 @@
+
+erpnext.landed_cost_taxes_and_charges = {
+ 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() {
+ return {
+ filters: {
+ "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) {
+ let row = locals[cdt][cdn];
+ if (row.expense_account) {
+ 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) {
+ 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');
+ } else if (!row.exchange_rate || row.exchange_rate == 1) {
+ 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
+ },
+ callback: function(r) {
+ if (r.message) {
+ frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
+ }
+ }
+ });
+ }
+
+ frm.refresh_field('taxes');
+ },
+
+ 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)));
+ }
+ });
+ }
+}
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
new file mode 100644
index 00000000000..517d87127a7
--- /dev/null
+++ b/erpnext/public/js/utils/sales_common.js
@@ -0,0 +1,435 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.provide("erpnext.selling");
+
+erpnext.sales_common = {
+ setup_selling_controller:function() {
+ erpnext.selling.SellingController = class SellingController extends erpnext.TransactionController {
+ setup() {
+ super.setup();
+ this.frm.email_field = "contact_email";
+ }
+
+ onload() {
+ super.onload();
+ this.setup_queries();
+ this.frm.set_query('shipping_rule', function() {
+ return {
+ filters: {
+ "shipping_rule_type": "Selling"
+ }
+ };
+ });
+ }
+
+ 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]]);
+ });
+
+ 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() {
+ return { filters: { selling: 1 } };
+ });
+ }
+
+ if(this.frm.fields_dict.tc_name) {
+ this.frm.set_query("tc_name", function() {
+ return { filters: { selling: 1 } };
+ });
+ }
+
+ 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() {
+ return {
+ query: "erpnext.controllers.queries.item_query",
+ 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["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'}
+
+ 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() {
+ 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");
+ }
+
+ 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");
+ }
+
+ dispatch_address_name() {
+ erpnext.utils.get_address_display(this.frm, "dispatch_address_name", "dispatch_address");
+ }
+
+ sales_partner() {
+ this.apply_pricing_rule();
+ }
+
+ campaign() {
+ this.apply_pricing_rule();
+ }
+
+ selling_price_list() {
+ this.apply_price_list();
+ this.set_dynamic_labels();
+ }
+
+ 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');
+ }
+
+ discount_amount(doc, cdt, 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');
+ }
+
+ apply_discount_on_item(doc, cdt, cdn, field) {
+ var item = frappe.get_doc(cdt, cdn);
+ if(!item.price_list_rate) {
+ item[field] = 0.0;
+ } else {
+ this.price_list_rate(doc, cdt, cdn);
+ }
+ this.set_gross_profit(item);
+ }
+
+ commission_rate() {
+ this.calculate_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;
+
+ this.frm.set_value(
+ "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));
+
+ 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);
+ }
+ }
+
+ sales_person(doc, cdt, cdn) {
+ var row = frappe.get_doc(cdt, cdn);
+ this.calculate_incentive(row);
+ refresh_field("incentives",row.name,row.parentfield);
+ }
+
+ toggle_editable_price_list_rate() {
+ 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 (!this.frm.fields_dict[parent_field]) return;
+
+ this.frm.fields_dict[parent_field].grid.update_docfield_property(
+ 'price_list_rate', 'read_only', 0
+ );
+ }
+ }
+
+ calculate_commission() {
+ if(!this.frm.fields_dict.commission_rate || this.frm.doc.docstatus === 1) return;
+
+ 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")}`);
+ }
+
+ this.frm.doc.amount_eligible_for_commission = this.frm.doc.items.reduce(
+ (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,
+ precision("total_commission")
+ );
+
+ refresh_field(["amount_eligible_for_commission", "total_commission"]);
+ }
+
+ calculate_contribution() {
+ var me = this;
+ $.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,
+ precision("allocated_amount", sales_person)
+ );
+ });
+ }
+
+ calculate_incentive(row) {
+ if(row.allocated_amount)
+ {
+ row.incentives = flt(
+ row.allocated_amount * row.commission_rate / 100.0,
+ precision("incentives", row));
+ }
+ }
+
+ set_dynamic_labels() {
+ super.set_dynamic_labels();
+ this.set_product_bundle_help(this.frm.doc);
+ }
+
+ set_product_bundle_help(doc) {
+ 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;
+ }
+ } 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 = '';
+ }
+ }
+ refresh_field('product_bundle_help');
+ }
+
+ company_address() {
+ var me = this;
+ 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)
+ }
+ }
+ })
+ } else {
+ this.frm.set_value("company_address_display", "");
+ }
+ }
+
+ conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate) {
+ super.conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate);
+ }
+
+ qty(doc, cdt, cdn) {
+ super.qty(doc, cdt, cdn);
+ }
+
+ pick_serial_and_batch(doc, cdt, cdn) {
+ let item = locals[cdt][cdn];
+ 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";
+
+ 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");
+ }
+
+ frappe.require(path, function() {
+ new erpnext.SerialBatchPackageSelector(
+ me.frm, item, (r) => {
+ if (r) {
+ frappe.model.set_value(item.doctype, item.name, {
+ "serial_and_batch_bundle": r.name,
+ "qty": Math.abs(r.total_qty)
+ });
+ }
+ }
+ );
+ });
+ }
+ });
+ }
+
+ update_auto_repeat_reference(doc) {
+ if (doc.auto_repeat) {
+ frappe.call({
+ method:"frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
+ args:{
+ docname: doc.auto_repeat,
+ reference:doc.name
+ },
+ 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'});
+ }
+ }
+ })
+ }
+ }
+
+ project() {
+ let me = this;
+ 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]));
+ }
+ })
+ }
+ }
+ })
+ }
+ }
+ }
+ };
+ }
+}
+
+erpnext.pre_sales = {
+ set_as_lost: function(doctype) {
+ frappe.ui.form.on(doctype, {
+ 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": __("Competitors"),
+ "fieldname": "competitors",
+ "options": "Competitor Detail"
+ },
+ {
+ "fieldtype": "Small Text",
+ "label": __("Detailed Reason"),
+ "fieldname": "detailed_reason"
+ },
+ ],
+ primary_action: function() {
+ let values = dialog.get_values();
+
+ frm.call({
+ doc: frm.doc,
+ method: 'declare_enquiry_lost',
+ args: {
+ 'lost_reasons_list': values.lost_reason,
+ 'competitors': values.competitors ? values.competitors : [],
+ 'detailed_reason': values.detailed_reason
+ },
+ callback: function(r) {
+ dialog.hide();
+ frm.reload_doc();
+ },
+ });
+ },
+ primary_action_label: __('Declare Lost')
+ });
+
+ dialog.show();
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 27a7968033b..9267801839b 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -382,7 +382,7 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
edit_full_form() {
let bundle_id = this.item.serial_and_batch_bundle
if (!bundle_id) {
- _new = frappe.model.get_new_doc(
+ let _new = frappe.model.get_new_doc(
"Serial and Batch Bundle", null, null, true
);
diff --git a/erpnext/regional/italy/sales_invoice.js b/erpnext/regional/italy/sales_invoice.js
deleted file mode 100644
index b54ac538126..00000000000
--- a/erpnext/regional/italy/sales_invoice.js
+++ /dev/null
@@ -1,25 +0,0 @@
-erpnext.setup_e_invoice_button = (doctype) => {
- frappe.ui.form.on(doctype, {
- 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/regional/report/electronic_invoice_register/electronic_invoice_register.js b/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
index d7e3ac9a5d3..4fc1be1ff54 100644
--- a/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
+++ b/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Electronic Invoice Register"] = {
"filters": [
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 59574247701..eaefc0420a8 100644
--- a/erpnext/regional/report/uae_vat_201/uae_vat_201.js
+++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["UAE VAT 201"] = {
"filters": [
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 39ef9b563ac..41318f3160c 100644
--- a/erpnext/regional/report/vat_audit_report/vat_audit_report.js
+++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["VAT Audit Report"] = {
"filters": [
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 67c392cc3f3..ea55cb24e71 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -1,8 +1,10 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
-{% include 'erpnext/selling/sales_common.js' %}
+erpnext.accounts.taxes.setup_tax_validations("Sales Taxes and Charges Template");
+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) {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 5d43a07d96c..b57a09464e8 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -1,7 +1,9 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/selling/sales_common.js' %}
+erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
+erpnext.accounts.taxes.setup_tax_validations("Sales Order");
+erpnext.sales_common.setup_selling_controller();
frappe.ui.form.on("Sales Order", {
setup: function(frm) {
@@ -814,7 +816,6 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
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: true,
freeze_message: __("Creating Purchase Order ..."),
args: {
"source_name": me.frm.doc.name,
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 016ebf0cd19..8b37e40e97c 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -579,7 +579,7 @@ erpnext.PointOfSale.Controller = class {
console.log(error);
} finally {
frappe.dom.unfreeze();
- return item_row;
+ return item_row; // eslint-disable-line no-unsafe-finally
}
}
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 12cc629776c..46490c43ae7 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_cart.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -945,7 +945,7 @@ erpnext.PointOfSale.ItemCart = class {
`No recent transactions found
`
)
return;
- };
+ }
const elapsed_time = moment(res[0].posting_date+" "+res[0].posting_time).fromNow();
this.$customer_section.find('.customer-desc').html(`Last transacted ${elapsed_time}`);
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.js b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
index 8aa14d1998e..f81d1c10390 100644
--- a/erpnext/selling/report/address_and_contacts/address_and_contacts.js
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Address And Contacts"] = {
"filters": [
diff --git a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js
index d333c8be65e..2aac3436c07 100644
--- a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js
+++ b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Customer-wise Item Price"] = {
"filters": [
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js
index 073be789791..f63d02ec84b 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js
@@ -1,6 +1,6 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Item-wise Sales History"] = {
"filters": [
diff --git a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js
index 990d736baa4..0203a054f99 100644
--- a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js
+++ b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js
@@ -1,6 +1,6 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
function get_filters() {
let filters = [
@@ -116,7 +116,7 @@ frappe.query_reports["Payment Terms Status for Sales Order"] = {
"filters": get_filters(),
"formatter": function(value, row, column, data, default_formatter){
if(column.fieldname == 'invoices' && value) {
- invoices = value.split(',');
+ let invoices = value.split(',');
const invoice_formatter = (prev_value, curr_value) => {
if(prev_value != "") {
return prev_value + ", " + default_formatter(curr_value, row, column, data);
@@ -128,7 +128,7 @@ frappe.query_reports["Payment Terms Status for Sales Order"] = {
return invoices.reduce(invoice_formatter, "")
}
else if (column.fieldname == 'paid_amount' && value){
- formatted_value = default_formatter(value, row, column, data);
+ let formatted_value = default_formatter(value, row, column, data);
if(value > 0) {
formatted_value = "" + formatted_value + ""
}
diff --git a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.js b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.js
index 37634efb6cd..204205949e9 100644
--- a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.js
+++ b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Pending SO Items For Purchase Request"] = {
}
diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.js b/erpnext/selling/report/sales_analytics/sales_analytics.js
index 87dd02f9915..ace16f4f418 100644
--- a/erpnext/selling/report/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Analytics"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
index f3f931edfdc..ac3d3dbf710 100644
--- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
+++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Order Analysis"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js
index 63d930c1452..f08780ae724 100644
--- a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js
+++ b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Partner Commission Summary"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
index adae47b87da..83934fb3597 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Partner Target Variance based on Item Group"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js
index e404233953e..e443ab39f6a 100644
--- a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js
+++ b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Partner Transaction Summary"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js b/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
index ba6ee784b91..306ef6fffdb 100644
--- a/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
+++ b/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Person Commission Summary"] = {
"filters": [
diff --git a/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
index 2b8443627d5..9414ad6a8f4 100644
--- a/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Sales Person Target Variance Based On Item Group"] = {
"filters": [
diff --git a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
index 9f3d255e662..12bb49fd182 100644
--- a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Territory Target Variance Based On Item Group"] = {
"filters": [
diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
index bef800f1040..c755a75d827 100644
--- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
+++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Territory-wise Sales"] = {
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
deleted file mode 100644
index 87c0fae42ae..00000000000
--- a/erpnext/selling/sales_common.js
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-
-cur_frm.cscript.tax_table = "Sales Taxes and Charges";
-{% include 'erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js' %}
-
-
-cur_frm.email_field = "contact_email";
-
-frappe.provide("erpnext.selling");
-erpnext.selling.SellingController = class SellingController extends erpnext.TransactionController {
- setup() {
- super.setup();
- }
-
- onload() {
- super.onload();
- this.setup_queries();
- this.frm.set_query('shipping_rule', function() {
- return {
- filters: {
- "shipping_rule_type": "Selling"
- }
- };
- });
- }
-
- 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]]);
- });
-
- 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() {
- return { filters: { selling: 1 } };
- });
- }
-
- if(this.frm.fields_dict.tc_name) {
- this.frm.set_query("tc_name", function() {
- return { filters: { selling: 1 } };
- });
- }
-
- 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() {
- return {
- query: "erpnext.controllers.queries.item_query",
- filters: {'is_sales_item': 1, 'customer': cur_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["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'}
-
- 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() {
- 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");
- }
-
- 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");
- }
-
- dispatch_address_name() {
- erpnext.utils.get_address_display(this.frm, "dispatch_address_name", "dispatch_address");
- }
-
- sales_partner() {
- this.apply_pricing_rule();
- }
-
- campaign() {
- this.apply_pricing_rule();
- }
-
- selling_price_list() {
- this.apply_price_list();
- this.set_dynamic_labels();
- }
-
- 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');
- }
-
- discount_amount(doc, cdt, 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');
- }
-
- apply_discount_on_item(doc, cdt, cdn, field) {
- var item = frappe.get_doc(cdt, cdn);
- if(!item.price_list_rate) {
- item[field] = 0.0;
- } else {
- this.price_list_rate(doc, cdt, cdn);
- }
- this.set_gross_profit(item);
- }
-
- commission_rate() {
- this.calculate_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;
-
- this.frm.set_value(
- "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));
-
- 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);
- }
- }
-
- sales_person(doc, cdt, cdn) {
- var row = frappe.get_doc(cdt, cdn);
- this.calculate_incentive(row);
- refresh_field("incentives",row.name,row.parentfield);
- }
-
- toggle_editable_price_list_rate() {
- 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 (!this.frm.fields_dict[parent_field]) return;
-
- this.frm.fields_dict[parent_field].grid.update_docfield_property(
- 'price_list_rate', 'read_only', 0
- );
- }
- }
-
- calculate_commission() {
- if(!this.frm.fields_dict.commission_rate || this.frm.doc.docstatus === 1) return;
-
- 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")}`);
- }
-
- this.frm.doc.amount_eligible_for_commission = this.frm.doc.items.reduce(
- (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,
- precision("total_commission")
- );
-
- refresh_field(["amount_eligible_for_commission", "total_commission"]);
- }
-
- calculate_contribution() {
- var me = this;
- $.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,
- precision("allocated_amount", sales_person)
- );
- });
- }
-
- calculate_incentive(row) {
- if(row.allocated_amount)
- {
- row.incentives = flt(
- row.allocated_amount * row.commission_rate / 100.0,
- precision("incentives", row));
- }
- }
-
- set_dynamic_labels() {
- super.set_dynamic_labels();
- this.set_product_bundle_help(this.frm.doc);
- }
-
- set_product_bundle_help(doc) {
- if(!cur_frm.fields_dict.packing_list) return;
- if ((doc.packed_items || []).length) {
- $(cur_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;
- }
- } else {
- $(cur_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 = '';
- }
- }
- refresh_field('product_bundle_help');
- }
-
- company_address() {
- var me = this;
- 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)
- }
- }
- })
- } else {
- this.frm.set_value("company_address_display", "");
- }
- }
-
- conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate) {
- super.conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate);
- }
-
- qty(doc, cdt, cdn) {
- super.qty(doc, cdt, cdn);
- }
-
- pick_serial_and_batch(doc, cdt, cdn) {
- let item = locals[cdt][cdn];
- 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";
-
- 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");
- }
-
- frappe.require(path, function() {
- new erpnext.SerialBatchPackageSelector(
- me.frm, item, (r) => {
- if (r) {
- frappe.model.set_value(item.doctype, item.name, {
- "serial_and_batch_bundle": r.name,
- "qty": Math.abs(r.total_qty)
- });
- }
- }
- );
- });
- }
- });
- }
-
- update_auto_repeat_reference(doc) {
- if (doc.auto_repeat) {
- frappe.call({
- method:"frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
- args:{
- docname: doc.auto_repeat,
- reference:doc.name
- },
- 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.ui.form.on(cur_frm.doctype,"project", function(frm) {
- if(in_list(["Delivery Note", "Sales Invoice"], frm.doc.doctype)) {
- if(frm.doc.project) {
- frappe.call({
- method:'erpnext.projects.doctype.project.project.get_cost_center_name' ,
- args: { project: frm.doc.project },
- callback: function(r, rt) {
- if(!r.exc) {
- $.each(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]));
- }
- })
- }
- }
- })
- }
- }
-})
-
-frappe.ui.form.on(cur_frm.doctype, {
- 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": __("Competitors"),
- "fieldname": "competitors",
- "options": "Competitor Detail"
- },
- {
- "fieldtype": "Small Text",
- "label": __("Detailed Reason"),
- "fieldname": "detailed_reason"
- },
- ],
- primary_action: function() {
- let values = dialog.get_values();
-
- frm.call({
- doc: frm.doc,
- method: 'declare_enquiry_lost',
- args: {
- 'lost_reasons_list': values.lost_reason,
- 'competitors': values.competitors ? values.competitors : [],
- 'detailed_reason': values.detailed_reason
- },
- callback: function(r) {
- dialog.hide();
- frm.reload_doc();
- },
- });
- },
- primary_action_label: __('Declare Lost')
- });
-
- dialog.show();
- }
-})
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index b09b715275e..e02abb48e5c 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -129,8 +129,6 @@ erpnext.stock.ItemDashboard = class ItemDashboard {
context = this.get_item_dashboard_data(data, this.max_count, true);
}
- this.max_count = this.max_count;
-
// show more button
if (data && data.length === (this.page_length + 1)) {
this.content.find('.more').removeClass('hidden');
diff --git a/erpnext/stock/doctype/batch/batch_list.js b/erpnext/stock/doctype/batch/batch_list.js
index 0de9fd01503..f1a0643cfde 100644
--- a/erpnext/stock/doctype/batch/batch_list.js
+++ b/erpnext/stock/doctype/batch/batch_list.js
@@ -9,6 +9,6 @@ frappe.listview_settings['Batch'] = {
return [__("Expired"), "red", "expiry_date,not in,|expiry_date,<=,Today|batch_qty,>,0|disabled,=,0"]
} else {
return [__("Active"), "green", "batch_qty,>,0|disabled,=,0"];
- };
+ }
}
};
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index a648195933b..eee7972629e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -1,14 +1,17 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/selling/sales_common.js' %};
-
cur_frm.add_fetch('customer', 'tax_id', 'tax_id');
frappe.provide("erpnext.stock");
frappe.provide("erpnext.stock.delivery_note");
frappe.provide("erpnext.accounts.dimensions");
+erpnext.accounts.taxes.setup_tax_filters("Sales Taxes and Charges");
+erpnext.accounts.taxes.setup_tax_validations("Delivery Note");
+erpnext.sales_common.setup_selling_controller();
+
+
frappe.ui.form.on("Delivery Note", {
setup: function(frm) {
frm.custom_make_buttons = {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index 6ff3ed3e8e5..51a899b6991 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -24,7 +24,7 @@ frappe.listview_settings['Delivery Note'] = {
if (!doc.docstatus) {
frappe.throw(__("Cannot create a Delivery Trip from Draft documents."));
}
- };
+ }
frappe.new_doc("Delivery Trip")
.then(() => {
@@ -51,7 +51,7 @@ frappe.listview_settings['Delivery Note'] = {
}
});
})
- };
+ }
};
// doclist.page.add_actions_menu_item(__('Create Delivery Trip'), action, false);
@@ -66,4 +66,4 @@ frappe.listview_settings['Delivery Note'] = {
erpnext.bulk_transaction_processing.create(doclist, "Delivery Note", "Packing Slip");
});
}
-};
+}
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
index a6fbb66aa2b..de503dc73f5 100755
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
@@ -92,7 +92,7 @@ frappe.ui.form.on('Delivery Trip', {
frm.set_value("driver_email", data.message.email);
}
});
- };
+ }
},
optimize_route: function (frm) {
diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
index cec5e218cca..c3edba321c5 100644
--- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
+++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
@@ -24,7 +24,6 @@ class ItemVariantSettings(Document):
"description",
"variant_of",
"valuation_rate",
- "description",
"barcodes",
"has_variants",
"attributes",
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 9c1a809f4df..8215efcad39 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -1,10 +1,9 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/stock/landed_taxes_and_charges_common.js' %};
-
frappe.provide("erpnext.stock");
+erpnext.landed_cost_taxes_and_charges.setup_triggers("Landed Cost Voucher");
erpnext.stock.LandedCostVoucher = class LandedCostVoucher extends erpnext.stock.StockController {
setup() {
var me = this;
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index c1f1b0d1352..989bfd0d1d7 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -3,7 +3,7 @@
// eslint-disable-next-line
frappe.provide("erpnext.accounts.dimensions");
-{% include 'erpnext/public/js/controllers/buying.js' %};
+erpnext.buying.setup_buying_controller();
frappe.ui.form.on('Material Request', {
setup: function(frm) {
@@ -472,13 +472,13 @@ erpnext.buying.MaterialRequestController = class MaterialRequestController exten
set_schedule_date(this.frm);
}
- onload(doc, cdt, cdn) {
- this.frm.set_query("item_code", "items", function() {
+ onload() {
+ this.frm.set_query("item_code", "items", function(doc, cdt, cdn) {
if (doc.material_request_type == "Customer Provided") {
return{
query: "erpnext.controllers.queries.item_query",
filters:{
- 'customer': me.frm.doc.customer,
+ 'customer': doc.customer,
'is_stock_item':1
}
}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 35aad78c1a3..136553ae28e 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -1,10 +1,12 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-{% include 'erpnext/public/js/controllers/buying.js' %};
-
frappe.provide("erpnext.stock");
+erpnext.accounts.taxes.setup_tax_filters("Purchase Taxes and Charges");
+erpnext.accounts.taxes.setup_tax_validations("Purchase Receipt");
+erpnext.buying.setup_buying_controller();
+
frappe.ui.form.on("Purchase Receipt", {
setup: (frm) => {
frm.make_methods = {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 3e83fafcad5..4fb8a10748e 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -3,7 +3,7 @@
frappe.provide("erpnext.stock");
frappe.provide("erpnext.accounts.dimensions");
-{% include 'erpnext/stock/landed_taxes_and_charges_common.js' %};
+erpnext.landed_cost_taxes_and_charges.setup_triggers("Stock Entry");
frappe.ui.form.on('Stock Entry', {
setup: function(frm) {
@@ -56,7 +56,7 @@ frappe.ui.form.on('Stock Entry', {
frappe.db.get_value('Stock Settings', {name: 'Stock Settings'}, 'sample_retention_warehouse', (r) => {
if (r.sample_retention_warehouse) {
- var filters = [
+ let filters = [
["Warehouse", 'company', '=', frm.doc.company],
["Warehouse", "is_group", "=",0],
['Warehouse', 'name', '!=', r.sample_retention_warehouse]
@@ -75,17 +75,19 @@ frappe.ui.form.on('Stock Entry', {
});
frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
- var item = locals[cdt][cdn];
+ let item = locals[cdt][cdn];
+ let filters = {};
+
if(!item.item_code) {
frappe.throw(__("Please enter Item Code to get Batch Number"));
} else {
if (in_list(["Material Transfer for Manufacture", "Manufacture", "Repack", "Send to Subcontractor"], doc.purpose)) {
- var filters = {
+ filters = {
'item_code': item.item_code,
'posting_date': frm.doc.posting_date || frappe.datetime.nowdate()
}
} else {
- var filters = {
+ filters = {
'item_code': item.item_code
}
}
@@ -686,7 +688,6 @@ frappe.ui.form.on('Stock Entry', {
},
process_loss_percentage(frm) {
- debugger
if (frm.doc.process_loss_percentage) {
frm.doc.process_loss_qty = flt((frm.doc.fg_completed_qty * frm.doc.process_loss_percentage) / 100 , precision("process_loss_qty", frm.doc));
refresh_field("process_loss_qty");
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index cb2adf1682a..5452692a24d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -67,6 +67,7 @@ frappe.ui.form.on("Stock Reconciliation", {
},
company: function(frm) {
+ frm.trigger("toggle_display_account_head");
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
@@ -221,9 +222,6 @@ frappe.ui.form.on("Stock Reconciliation", {
frappe.model.set_value(cdt, cdn, "amount_difference", flt(d.amount) - flt(d.current_amount));
}
},
- company: function(frm) {
- frm.trigger("toggle_display_account_head");
- },
toggle_display_account_head: function(frm) {
frm.toggle_display(['expense_account', 'cost_center'],
erpnext.is_perpetual_inventory_enabled(frm.doc.company));
diff --git a/erpnext/stock/landed_taxes_and_charges_common.js b/erpnext/stock/landed_taxes_and_charges_common.js
deleted file mode 100644
index 1d76a3d95a1..00000000000
--- a/erpnext/stock/landed_taxes_and_charges_common.js
+++ /dev/null
@@ -1,61 +0,0 @@
-let document_list = ['Landed Cost Voucher', 'Stock Entry', 'Subcontracting Order', 'Subcontracting Receipt'];
-
-document_list.forEach((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() {
- return {
- filters: {
- "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) {
- let row = locals[cdt][cdn];
- if (row.expense_account) {
- 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) {
- 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');
- } else if (!row.exchange_rate || row.exchange_rate == 1) {
- 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
- },
- callback: function(r) {
- if (r.message) {
- frappe.model.set_value(cdt, cdn, "exchange_rate", r.message);
- }
- }
- });
- }
-
- frm.refresh_field('taxes');
- },
-
- 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)));
- }
- });
-});
diff --git a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
index d7c50a66979..a0322851245 100644
--- a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
+++ b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["COGS By Item Group"] = {
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.js b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
index 40e6abefeb0..cf6e12ff476 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.js
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Delayed Item Report"] = {
"filters": [
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.js b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
index aab0f3d0d1f..cf489c932e4 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.js
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Delayed Order Report"] = {
"filters": [
diff --git a/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.js b/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.js
index 0b8f49653dd..bc869791321 100644
--- a/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.js
+++ b/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.js
@@ -1,6 +1,6 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
const DIFFERNCE_FIELD_NAMES = [
"fifo_qty_diff",
diff --git a/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js b/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js
index bf11277d9c4..0f9120ba2f2 100644
--- a/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js
+++ b/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Incorrect Balance Qty After Transaction"] = {
"filters": [
diff --git a/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js b/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
index c62d48081c2..6325cc85c43 100644
--- a/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
+++ b/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Incorrect Serial No Valuation"] = {
"filters": [
diff --git a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js
index ff424807e3e..174d03317d7 100644
--- a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js
+++ b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Incorrect Stock Value Report"] = {
"filters": [
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.js b/erpnext/stock/report/item_price_stock/item_price_stock.js
index 7af1dab6a0b..c4684daa9f1 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.js
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Item Price Stock"] = {
"filters": [
diff --git a/erpnext/stock/report/item_shortage_report/item_shortage_report.js b/erpnext/stock/report/item_shortage_report/item_shortage_report.js
index ca42a331e91..5642038f3f5 100644
--- a/erpnext/stock/report/item_shortage_report/item_shortage_report.js
+++ b/erpnext/stock/report/item_shortage_report/item_shortage_report.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Item Shortage Report"] = {
"filters": [
diff --git a/erpnext/stock/report/item_variant_details/item_variant_details.js b/erpnext/stock/report/item_variant_details/item_variant_details.js
index 78eab4050c1..b9022948f40 100644
--- a/erpnext/stock/report/item_variant_details/item_variant_details.js
+++ b/erpnext/stock/report/item_variant_details/item_variant_details.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Item Variant Details"] = {
"filters": [
diff --git a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
index 976e5156ada..fe977c6d5cc 100644
--- a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
+++ b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Serial No Ledger"] = {
"filters": [
diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.js b/erpnext/stock/report/stock_analytics/stock_analytics.js
index 78afe6d2642..ea7bf5688e6 100644
--- a/erpnext/stock/report/stock_analytics/stock_analytics.js
+++ b/erpnext/stock/report/stock_analytics/stock_analytics.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Stock Analytics"] = {
"filters": [
@@ -93,11 +93,11 @@ frappe.query_reports["Stock Analytics"] = {
checkboxColumn: true,
events: {
onCheckRow: function(data) {
- row_name = data[2].content;
- row_values = data.slice(7).map(function (column) {
+ let row_name = data[2].content;
+ let row_values = data.slice(7).map(function (column) {
return column.content;
})
- entry = {
+ let entry = {
'name':row_name,
'values':row_values
}
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
index 254f5273be2..ffef11a20e2 100644
--- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Stock and Account Value Comparison"] = {
"filters": [
diff --git a/erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js b/erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js
index 31f389f236e..3447e0a6fa8 100644
--- a/erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js
+++ b/erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
const DIFFERNCE_FIELD_NAMES = [
"difference_in_qty",
diff --git a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
index 2a0fd4025cc..7a487984956 100644
--- a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
+++ b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Stock Qty vs Serial No Count"] = {
"filters": [
diff --git a/erpnext/stock/report/total_stock_summary/total_stock_summary.js b/erpnext/stock/report/total_stock_summary/total_stock_summary.js
index 88054aaea73..3d247f67403 100644
--- a/erpnext/stock/report/total_stock_summary/total_stock_summary.js
+++ b/erpnext/stock/report/total_stock_summary/total_stock_summary.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Total Stock Summary"] = {
"filters": [
diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
index 39cfd7274f2..8d6b283a156 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Warehouse wise Item Balance Age and Value"] = {
"filters": [
diff --git a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
index 752e464e27c..4a77052a904 100644
--- a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
+++ b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js
@@ -1,6 +1,6 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Warehouse Wise Stock Balance"] = {
"filters": [
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
index 15a2ac90912..f2b395ac105 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
@@ -3,7 +3,7 @@
frappe.provide('erpnext.buying');
-{% include 'erpnext/stock/landed_taxes_and_charges_common.js' %};
+erpnext.landed_cost_taxes_and_charges.setup_triggers("Subcontracting Order");
frappe.ui.form.on('Subcontracting Order', {
setup: (frm) => {
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
index 5ee1f7b7169..94a2589b988 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
@@ -3,7 +3,7 @@
frappe.provide('erpnext.buying');
-{% include 'erpnext/stock/landed_taxes_and_charges_common.js' %};
+erpnext.landed_cost_taxes_and_charges.setup_triggers("Subcontracting Receipt");
frappe.ui.form.on('Subcontracting Receipt', {
setup: (frm) => {
diff --git a/erpnext/support/report/first_response_time_for_issues/first_response_time_for_issues.js b/erpnext/support/report/first_response_time_for_issues/first_response_time_for_issues.js
index 18691fe264f..a133770f6d7 100644
--- a/erpnext/support/report/first_response_time_for_issues/first_response_time_for_issues.js
+++ b/erpnext/support/report/first_response_time_for_issues/first_response_time_for_issues.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["First Response Time for Issues"] = {
"filters": [
diff --git a/erpnext/support/report/issue_analytics/issue_analytics.js b/erpnext/support/report/issue_analytics/issue_analytics.js
index 746eee025a5..be45b9b44a5 100644
--- a/erpnext/support/report/issue_analytics/issue_analytics.js
+++ b/erpnext/support/report/issue_analytics/issue_analytics.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Issue Analytics"] = {
"filters": [
@@ -93,11 +93,11 @@ frappe.query_reports["Issue Analytics"] = {
events: {
onCheckRow: function(data) {
if (data && data.length) {
- row_name = data[2].content;
- row_values = data.slice(3).map(function(column) {
+ let row_name = data[2].content;
+ let row_values = data.slice(3).map(function(column) {
return column.content;
})
- entry = {
+ let entry = {
'name': row_name,
'values': row_values
}
diff --git a/erpnext/support/report/issue_summary/issue_summary.js b/erpnext/support/report/issue_summary/issue_summary.js
index a5122d03ad1..aee6f53f17b 100644
--- a/erpnext/support/report/issue_summary/issue_summary.js
+++ b/erpnext/support/report/issue_summary/issue_summary.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Issue Summary"] = {
"filters": [
diff --git a/erpnext/support/report/support_hour_distribution/support_hour_distribution.js b/erpnext/support/report/support_hour_distribution/support_hour_distribution.js
index ae30b6a5507..82ccc73bf96 100644
--- a/erpnext/support/report/support_hour_distribution/support_hour_distribution.js
+++ b/erpnext/support/report/support_hour_distribution/support_hour_distribution.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["Support Hour Distribution"] = {
"filters": [
diff --git a/erpnext/templates/includes/product_list.js b/erpnext/templates/includes/product_list.js
index 2f9d978eb1a..acee36c80cb 100644
--- a/erpnext/templates/includes/product_list.js
+++ b/erpnext/templates/includes/product_list.js
@@ -27,10 +27,10 @@ window.get_product_list = function() {
}
window.render_product_list = function(data) {
- var table = $("#search-list .table");
+ let table = $("#search-list .table");
if(data.length) {
if(!table.length)
- var table = $("").appendTo("#search-list");
+ table = $("").appendTo("#search-list");
$.each(data, function(i, d) {
$(d).appendTo(table);
@@ -38,11 +38,13 @@ window.render_product_list = function(data) {
}
if(data.length < 10) {
if(!table) {
+ let message = __("No products found.");
$(".more-btn")
- .replaceWith("{{ _("No products found.") }}
");
+ .replaceWith(`{{ ${message} }}
`);
} else {
+ let message = __("Nothing more to show.");
$(".more-btn")
- .replaceWith("{{ _("Nothing more to show.") }}
");
+ .replaceWith(`{{ ${message} }}
`);
}
} else {
$(".more-btn").toggle(true)
diff --git a/erpnext/templates/pages/projects.js b/erpnext/templates/pages/projects.js
index bd6bcea7ca0..7149ceea105 100644
--- a/erpnext/templates/pages/projects.js
+++ b/erpnext/templates/pages/projects.js
@@ -72,7 +72,7 @@ frappe.ready(function() {
var more_items = function(item, item_status){
if(item_status) {
- var item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-completed-'+ item)
+ item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-completed-'+ item)
? 'completed' : 'open';
}
$.ajax({
diff --git a/erpnext/utilities/report/youtube_interactions/youtube_interactions.js b/erpnext/utilities/report/youtube_interactions/youtube_interactions.js
index 6e3e4e69800..adf2cf62f74 100644
--- a/erpnext/utilities/report/youtube_interactions/youtube_interactions.js
+++ b/erpnext/utilities/report/youtube_interactions/youtube_interactions.js
@@ -1,6 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-/* eslint-disable */
+
frappe.query_reports["YouTube Interactions"] = {
"filters": [
diff --git a/erpnext/www/book_appointment/index.js b/erpnext/www/book_appointment/index.js
index d02cdad4cf4..71a34d4e135 100644
--- a/erpnext/www/book_appointment/index.js
+++ b/erpnext/www/book_appointment/index.js
@@ -243,7 +243,7 @@ async function submit() {
}
function get_form_data() {
- contact = {};
+ let contact = {};
let inputs = ['name', 'skype', 'number', 'notes', 'email'];
inputs.forEach((id) => contact[id] = document.getElementById(`customer_${id}`).value)
return contact