nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 14:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-08 14:09:23 +05:30
parent 72c5aec68b 4a0c840076
commit 1cc55fbbcb
18 changed files with 326 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/crm/doctype/opportunity/opportunity.py
View File

@@ -205,7 +205,7 @@ def make_quotation(source_name, target_doc=None):
if company_currency == quotation.currency:
exchange_rate = 1
else:
exchange_rate = get_exchange_rate(quotation.currency, company_currency)
exchange_rate = get_exchange_rate(quotation.transaction_date, quotation.currency, company_currency)
quotation.conversion_rate = exchange_rate