Merge pull request #36318 from barredterra/remove-autoname
chore(Item Group): remove redundant autoname
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 6f4e602..eeb09cb 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -172,9 +172,9 @@
$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
- if (!this.discount_amount_applied && cur_frm) {
- cur_frm.cscript.validate_taxes_and_charges(tax.doctype, tax.name);
- me.validate_inclusive_tax(tax);
+ if (!this.discount_amount_applied) {
+ erpnext.accounts.taxes.validate_taxes_and_charges(tax.doctype, tax.name);
+ erpnext.accounts.taxes.validate_inclusive_tax(tax);
}
frappe.model.round_floats_in(tax);
});
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 6410333..59d2b15 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -991,6 +991,16 @@
this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
}
+ 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);
+ }
+
shipping_rule() {
var me = this;
if(this.frm.doc.shipping_rule) {
@@ -1661,6 +1671,9 @@
() => {
if(args.items.length) {
me._set_values_for_item_list(r.message.children);
+ $.each(r.message.children || [], function(i, d) {
+ me.apply_discount_on_item(d, d.doctype, d.name, 'discount_percentage');
+ });
}
},
() => { me.in_apply_price_list = false; }
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
index 517d871..89dcaa6 100644
--- a/erpnext/public/js/utils/sales_common.js
+++ b/erpnext/public/js/utils/sales_common.js
@@ -142,16 +142,6 @@
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();
}
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index ae39470..ffec57c 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -181,7 +181,7 @@
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
- "options": "\nDraft\nSubmitted\nStopped\nCancelled\nPending\nPartially Ordered\nOrdered\nIssued\nTransferred\nReceived",
+ "options": "\nDraft\nSubmitted\nStopped\nCancelled\nPending\nPartially Ordered\nPartially Received\nOrdered\nIssued\nTransferred\nReceived",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
@@ -356,7 +356,7 @@
"idx": 70,
"is_submittable": 1,
"links": [],
- "modified": "2023-05-07 20:17:29.108095",
+ "modified": "2023-07-25 17:19:31.662662",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",