schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow

Browse Source
This commit is contained in:
Deepesh Garg
2022-12-20 11:42:15 +05:30
parent e25b98b620 1ed2230e4c
commit ff48634cbb
63 changed files with 683 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/public/js/controllers/transaction.js
View File

@@ -1130,10 +1130,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
qty(doc, cdt, cdn) {
let item = frappe.get_doc(cdt, cdn);
item.pricing_rules = ''
this.conversion_factor(doc, cdt, cdn, true);
this.calculate_stock_uom_rate(doc, cdt, cdn);
this.apply_pricing_rule(item, true);
// item.pricing_rules = ''
frappe.run_serially([
() => this.remove_pricing_rule(item),
() => this.conversion_factor(doc, cdt, cdn, true),
() => this.calculate_stock_uom_rate(doc, cdt, cdn),
() => this.apply_pricing_rule(item, true)
]);
}
calculate_stock_uom_rate(doc, cdt, cdn) {
@@ -1357,16 +1360,21 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var item_list = [];
$.each(this.frm.doc["items"] || [], function(i, d) {
if (d.item_code && !d.is_free_item) {
item_list.push({
"doctype": d.doctype,
"name": d.name,
"item_code": d.item_code,
"pricing_rules": d.pricing_rules,
"parenttype": d.parenttype,
"parent": d.parent,
"price_list_rate": d.price_list_rate
})
if (d.item_code) {
if (d.is_free_item) {
// Simply remove free items
me.frm.get_field("items").grid.grid_rows[i].remove();
} else {
item_list.push({
"doctype": d.doctype,
"name": d.name,
"item_code": d.item_code,
"pricing_rules": d.pricing_rules,
"parenttype": d.parenttype,
"parent": d.parent,
"price_list_rate": d.price_list_rate
})
}
}
});
return this.frm.call({