Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 5d7abf5..4d0568b 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/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 f69b0bc..ceb37cc 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": {},
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 3168514..89fc52c 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -24,7 +24,7 @@
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 e11fb0e..bd0bfb0 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -85,7 +85,7 @@
]
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/hooks.py b/erpnext/hooks.py
index 4d7eefb..3c65a80 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
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/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index c2c6d1a..ac4cbbd 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -33,7 +33,7 @@
_("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"
]
diff --git a/setup.py b/setup.py
index 0cca106..50ea375 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()
+version = "6.12.7"
+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]
)