Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[opt] transaction.js

Browse Source
This commit is contained in:
Rushabh Mehta 2016-03-29 17:52:22 +05:30
parent 652dee45a6
commit bb8c6de043
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,10 +441,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.frm.toggle_reqd("plc_conversion_rate", this.frm.toggle_reqd("plc_conversion_rate",
!!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency)); !!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
var company_currency = this.get_company_currency(); if(this.frm.doc_currency!==this.frm.doc.currency) {
this.change_form_labels(company_currency); // reset names only when the currency is different
this.change_grid_labels(company_currency);
this.frm.refresh_fields(); var company_currency = this.get_company_currency();
this.change_form_labels(company_currency);
this.change_grid_labels(company_currency);
this.frm.refresh_fields();
this.frm.doc_currency = this.frm.doc.currency;
}
}, },
change_form_labels: function(company_currency) { change_form_labels: function(company_currency) {
@ -648,7 +653,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), d.doctype){ if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), d.doctype){
item_list[0]["margin_type"] = d.margin_type item_list[0]["margin_type"] = d.margin_type
item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount
} }
} }
}; };
@ -851,7 +856,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(!this.frm.doc.recurring_id) { if(!this.frm.doc.recurring_id) {
this.frm.set_value('recurring_id', this.frm.doc.name); this.frm.set_value('recurring_id', this.frm.doc.name);
} }
var owner_email = this.frm.doc.owner=="Administrator" var owner_email = this.frm.doc.owner=="Administrator"
? frappe.user_info("Administrator").email ? frappe.user_info("Administrator").email
: this.frm.doc.owner; : this.frm.doc.owner;
@ -879,7 +884,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
} }
}, },
set_gross_profit: function(item) { set_gross_profit: function(item) {
if (this.frm.doc.doctype == "Sales Order" && item.valuation_rate) { if (this.frm.doc.doctype == "Sales Order" && item.valuation_rate) {
rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1); rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
@ -897,7 +902,7 @@ frappe.ui.form.on(cur_frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
} else { } else {
item.discount_percentage = 0.0; item.discount_percentage = 0.0;
} }
cur_frm.cscript.set_gross_profit(item); cur_frm.cscript.set_gross_profit(item);
cur_frm.cscript.calculate_taxes_and_totals(); cur_frm.cscript.calculate_taxes_and_totals();
}) })