diff --git a/erpnext/__version__.py b/erpnext/__version__.py index e92734398c..e9e5b2f346 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.27.13' +__version__ = '6.27.14' diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 0eda1db01e..9e7cdb65d0 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -126,9 +126,9 @@ def get_tax_accounts(item_list, columns): for d in item_row_map.get(parent, {}).get(item_code, [])]) for d in item_row_map.get(parent, {}).get(item_code, []): - item_row_tax.setdefault(d.name, {})[account_head] = \ - flt((tax_amount * d.base_net_amount) / item_net_amount) - + item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) if item_net_amount else 0 + item_row_tax.setdefault(d.name, {})[account_head] = item_tax_amount + except ValueError: continue elif charge_type == "Actual" and tax_amount: diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index df71350cc7..beca96e7f6 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -116,14 +116,14 @@ def get_tax_accounts(item_list, columns): for item_code, tax_amount in item_wise_tax_detail.items(): tax_amount = flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount) - + item_net_amount = sum([flt(d.base_net_amount) for d in item_row_map.get(parent, {}).get(item_code, [])]) for d in item_row_map.get(parent, {}).get(item_code, []): - item_row_tax.setdefault(d.name, {})[account_head] = \ - flt((tax_amount * d.base_net_amount) / item_net_amount) - + item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) if item_net_amount else 0 + item_row_tax.setdefault(d.name, {})[account_head] = item_tax_amount + except ValueError: continue elif charge_type == "Actual" and tax_amount: diff --git a/erpnext/hooks.py b/erpnext/hooks.py index d8575121ea..b4f5b76226 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = """ERP made simple""" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.27.13" +app_version = "6.27.14" app_email = "info@erpnext.com" app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" diff --git a/setup.py b/setup.py index 41e0ce181d..27f4604ba8 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.27.13" +version = "6.27.14" requirements = parse_requirements("requirements.txt", session="") setup(