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

Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714)

Browse Source 
* unconditionally fetch exchange rate

* Revert "unconditionally fetch exchange rate"

This reverts commit d0d404d342.

* allow for `plc_conversion_rate` field to be reset

* fetch exchange rate using price list currency and company currency not form currency

* clean up
This commit is contained in:
tundebabzy
2018-02-12 10:48:57 +01:00
committed by Nabin Hait
parent 6e7e70c977
commit 6e90f49a35
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -704,7 +704,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
if(!this.in_apply_price_list) {
this.apply_price_list();
this.apply_price_list(null, true);
}
},
@@ -1056,7 +1056,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(!price_list_rate_changed) me.calculate_taxes_and_totals();
},
apply_price_list: function(item) {
apply_price_list: function(item, reset_plc_conversion) {
// We need to reset plc_conversion_rate sometimes because the call to
// `erpnext.stock.get_item_details.apply_price_list` is sensitive to its value
if (!reset_plc_conversion) {
this.frm.set_value("plc_conversion_rate", "");
}
var me = this;
var args = this._get_args(item);
if (!((args.items && args.items.length) || args.price_list)) {