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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2016-04-29 18:26:46 +05:30
commit b78adcf279
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.27.13' __version__ = '6.27.14'

6
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@ -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, [])])
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] = \ item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) if item_net_amount else 0
flt((tax_amount * d.base_net_amount) / item_net_amount) item_row_tax.setdefault(d.name, {})[account_head] = item_tax_amount
except ValueError: except ValueError:
continue continue
elif charge_type == "Actual" and tax_amount: elif charge_type == "Actual" and tax_amount:

8
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -116,14 +116,14 @@ def get_tax_accounts(item_list, columns):
for item_code, tax_amount in item_wise_tax_detail.items(): 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) tax_amount = flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
item_net_amount = sum([flt(d.base_net_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, [])])
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] = \ item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) if item_net_amount else 0
flt((tax_amount * d.base_net_amount) / item_net_amount) item_row_tax.setdefault(d.name, {})[account_head] = item_tax_amount
except ValueError: except ValueError:
continue continue
elif charge_type == "Actual" and tax_amount: elif charge_type == "Actual" and tax_amount:

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.27.13" app_version = "6.27.14"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.27.13" version = "6.27.14"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(