nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into enable-discount-accounting

Browse Source
This commit is contained in:
Ganga Manoj
2021-07-17 20:01:09 +05:30
committed by GitHub
parent d6956ff075 70a7252469
commit bfb7256143
141 changed files with 3866 additions and 2235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/get_item_details.py
View File

@@ -442,7 +442,7 @@ def get_item_tax_info(company, tax_category, item_codes, item_rates=None, item_t
if item_tax_templates is None:
item_tax_templates = {}
if item_rates is None:
item_rates = {}
@@ -812,10 +812,14 @@ def check_packing_list(price_list_rate_name, desired_qty, item_code):
def validate_conversion_rate(args, meta):
from erpnext.controllers.accounts_controller import validate_conversion_rate
if (not args.conversion_rate
and args.currency==frappe.get_cached_value('Company', args.company, "default_currency")):
company_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
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_conversion_rate(args.currency, args.conversion_rate,
meta.get_label("conversion_rate"), args.company)