[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index d768306..e5e0938 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -559,7 +559,7 @@
apply_pricing_rule: function(item, calculate_taxes_and_totals) {
var me = this;
var args = this._get_args(item);
- if (!(args.item_list && args.item_list.length)) {
+ if (!(args.items && args.items.length)) {
if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
return;
}
@@ -579,7 +579,7 @@
_get_args: function(item) {
var me = this;
return {
- "item_list": this._get_item_list(item),
+ "items": this._get_item_list(item),
"customer": me.frm.doc.customer,
"customer_group": me.frm.doc.customer_group,
"territory": me.frm.doc.territory,
@@ -595,8 +595,8 @@
"campaign": me.frm.doc.campaign,
"sales_partner": me.frm.doc.sales_partner,
"ignore_pricing_rule": me.frm.doc.ignore_pricing_rule,
- "parenttype": me.frm.doc.doctype,
- "parent": me.frm.doc.name
+ "doctype": me.frm.doc.doctype,
+ "name": me.frm.doc.name
};
},
@@ -654,7 +654,7 @@
apply_price_list: function(item) {
var me = this;
var args = this._get_args(item);
- if (!((args.item_list && args.item_list.length) || args.price_list)) {
+ if (!((args.items && args.items.length) || args.price_list)) {
return;
}
@@ -668,7 +668,7 @@
me.frm.set_value("plc_conversion_rate", r.message.parent.plc_conversion_rate);
me.in_apply_price_list = false;
- if(args.item_list.length) {
+ if(args.items.length) {
me._set_values_for_item_list(r.message.children);
}
}