From 49fe7af6de8fe3b370b43d4a9ebe5138306eb7e2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 9 Dec 2015 11:27:01 +0530 Subject: [PATCH 1/4] [fix] Stock account identified in COA of Guatamala --- .../chart_of_accounts/verified/gt_cuentas_plantilla.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json index f69b0bc5d24..ceb37cc6381 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json @@ -11,7 +11,10 @@ "IVA por Cobrar": {}, "Retenciones de IVA recibidas": {} }, - "Inventario": {} + "Inventario": { + "is_group": 1, + "account_type": "Stock" + } }, "No Corriente": { "Activos Fijos": {}, From 29fe53f63c8fae263243abfd3c5138c6a943bd98 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 9 Dec 2015 12:15:20 +0530 Subject: [PATCH 2/4] [fix] use pip parse requirements in setup.py --- setup.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py index 0cca10682de..d81e7b7ead2 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,18 @@ from setuptools import setup, find_packages +from pip.req import parse_requirements version = "6.12.6" - -with open("requirements.txt", "r") as f: - install_requires = f.readlines() +requirements = parse_requirements("requirements.txt", session="") setup( - name='erpnext', - version=version, - description='Open Source ERP', - author='Frappe Technologies', - author_email='info@erpnext.com', - packages=find_packages(), - zip_safe=False, - include_package_data=True, - install_requires=install_requires + name='erpnext', + version=version, + description='Open Source ERP', + author='Frappe Technologies', + author_email='info@erpnext.com', + packages=find_packages(), + zip_safe=False, + include_package_data=True, + install_requires=[str(ir.req) for ir in requirements], + dependency_links=[str(ir._link) for ir in requirements if ir._link] ) From 5de53eb0eb2a0e50ee62204aa8f01b94a84e9b39 Mon Sep 17 00:00:00 2001 From: Giovanni Lion Date: Wed, 9 Dec 2015 15:45:40 +0800 Subject: [PATCH 3/4] Voucher dynamic link fix to allow links to work if user language is not english --- .../accounts/report/accounts_receivable/accounts_receivable.py | 2 +- erpnext/accounts/report/general_ledger/general_ledger.py | 2 +- erpnext/stock/report/stock_ledger/stock_ledger.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 31685143524..89fc52c610d 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -24,7 +24,7 @@ class ReceivablePayableReport(object): if party_naming_by == "Naming Series": columns += [args.get("party_type") + " Name::110"] - columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/Voucher Type:120", + columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120", _("Due Date") + ":Date:80"] if args.get("party_type") == "Supplier": diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index e11fb0e00a0..bd0bfb01ae4 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -85,7 +85,7 @@ def get_columns(filters): ] columns += [ - _("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/Voucher Type:160", + _("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160", _("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150", _("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400" ] diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index c2c6d1ae7f5..ac4cbbd2e02 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -33,7 +33,7 @@ def get_columns(): _("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100", _("Stock UOM") + ":Link/UOM:100", _("Qty") + ":Float:50", _("Balance Qty") + ":Float:100", _("Incoming Rate") + ":Currency:110", _("Valuation Rate") + ":Currency:110", _("Balance Value") + ":Currency:110", - _("Voucher Type") + "::110", _("Voucher #") + ":Dynamic Link/Voucher Type:100", _("Batch") + ":Link/Batch:100", + _("Voucher Type") + "::110", _("Voucher #") + ":Dynamic Link/"+_("Voucher Type")+":100", _("Batch") + ":Link/Batch:100", _("Serial #") + ":Link/Serial No:100", _("Company") + ":Link/Company:100" ] From 1b0c797817edc299b973db6c0b4331af0a3e3078 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 9 Dec 2015 15:29:44 +0600 Subject: [PATCH 4/4] bumped to version 6.12.7 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 5d7abf5ec8f..4d0568b0478 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.12.6' +__version__ = '6.12.7' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 4d7eefbc8f5..3c65a80c333 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.12.6" +app_version = "6.12.7" 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 d81e7b7ead2..50ea375ee32 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.12.6" +version = "6.12.7" requirements = parse_requirements("requirements.txt", session="") setup(