nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get exchange rate only if date and currency is present (#8712)

Browse Source 
* Get exchange rate only if date and currency is present

* Update transaction.js
This commit is contained in:
Nabin Hait
2017-05-06 12:45:16 +05:30
committed by GitHub
parent b7e740ff45
commit 6e7407962f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -204,7 +204,7 @@ class PurchaseInvoice(BuyingController):
if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes': if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes':
for d in self.get('items'): for d in self.get('items'):
if not d.purchase_order: if not d.purchase_order:
throw(_("Purchse Order number required for Item {0}").format(d.item_code)) throw(_("Purchase Order number required for Item {0}").format(d.item_code))
def pr_required(self): def pr_required(self):
stock_items = self.get_stock_items() stock_items = self.get_stock_items()

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

@@ -500,6 +500,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
get_exchange_rate: function(transaction_date, from_currency, to_currency, callback) { get_exchange_rate: function(transaction_date, from_currency, to_currency, callback) {
if !(transaction_date && from_currency && to_currency) return;
return frappe.call({ return frappe.call({
method: "erpnext.setup.utils.get_exchange_rate", method: "erpnext.setup.utils.get_exchange_rate",
args: { args: {
@@ -762,7 +763,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(calculate_taxes_and_totals) me.calculate_taxes_and_totals(); if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
return; return;
} }
return this.frm.call({ return this.frm.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule", method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule",
args: { args: args }, args: { args: args },
@@ -1117,4 +1117,4 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return method return method
}, },
}); });