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

Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue

Browse Source 
fix: multi-currency issue
This commit is contained in:
rohitwaghchaure 2021-07-13 23:01:30 +05:30 committed by GitHub
commit 96eb147bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -713,7 +713,8 @@ def get_bom_item_rate(args, bom_doc):
"conversion_rate": 1, # Passed conversion rate as 1 purposefully, as conversion rate is applied at the end of the function "conversion_rate": 1, # Passed conversion rate as 1 purposefully, as conversion rate is applied at the end of the function
"conversion_factor": args.get("conversion_factor") or 1, "conversion_factor": args.get("conversion_factor") or 1,
"plc_conversion_rate": 1, "plc_conversion_rate": 1,
"ignore_party": True "ignore_party": True,
"ignore_conversion_rate": True
}) })
item_doc = frappe.get_cached_doc("Item", args.get("item_code")) item_doc = frappe.get_cached_doc("Item", args.get("item_code"))
out = frappe._dict() out = frappe._dict()

10
erpnext/stock/get_item_details.py
View File

@ -441,7 +441,7 @@ def get_item_tax_info(company, tax_category, item_codes, item_rates=None, item_t
if item_tax_templates is None: if item_tax_templates is None:
item_tax_templates = {} item_tax_templates = {}
if item_rates is None: if item_rates is None:
item_rates = {} item_rates = {}
@ -807,10 +807,14 @@ def check_packing_list(price_list_rate_name, desired_qty, item_code):
def validate_conversion_rate(args, meta): def validate_conversion_rate(args, meta):
from erpnext.controllers.accounts_controller import validate_conversion_rate from erpnext.controllers.accounts_controller import validate_conversion_rate
if (not args.conversion_rate company_currency = frappe.get_cached_value('Company', args.company, "default_currency")
and args.currency==frappe.get_cached_value('Company', args.company, "default_currency")): if (not args.conversion_rate and args.currency==company_currency):
args.conversion_rate = 1.0 args.conversion_rate = 1.0
if (not args.ignore_conversion_rate and args.conversion_rate == 1 and args.currency!=company_currency):
args.conversion_rate = get_exchange_rate(args.currency,
company_currency, args.transaction_date, "for_buying") or 1.0
# validate currency conversion rate # validate currency conversion rate
validate_conversion_rate(args.currency, args.conversion_rate, validate_conversion_rate(args.currency, args.conversion_rate,
meta.get_label("conversion_rate"), args.company) meta.get_label("conversion_rate"), args.company)