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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2015-12-09 14:59:44 +05:30
commit 45a8f9d006
7 changed files with 22 additions and 19 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.12.6' __version__ = '6.12.7'

5
erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
View File

@ -11,7 +11,10 @@
"IVA por Cobrar": {}, "IVA por Cobrar": {},
"Retenciones de IVA recibidas": {} "Retenciones de IVA recibidas": {}
}, },
"Inventario": {} "Inventario": {
"is_group": 1,
"account_type": "Stock"
}
}, },
"No Corriente": { "No Corriente": {
"Activos Fijos": {}, "Activos Fijos": {},

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -24,7 +24,7 @@ class ReceivablePayableReport(object):
if party_naming_by == "Naming Series": if party_naming_by == "Naming Series":
columns += [args.get("party_type") + " Name::110"] 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"] _("Due Date") + ":Date:80"]
if args.get("party_type") == "Supplier": if args.get("party_type") == "Supplier":

2
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -85,7 +85,7 @@ def get_columns(filters):
] ]
columns += [ 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", _("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400" _("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
] ]

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.12.6" app_version = "6.12.7"
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
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -33,7 +33,7 @@ def get_columns():
_("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100", _("Brand") + ":Link/Brand:100", _("Description") + "::200", _("Warehouse") + ":Link/Warehouse:100",
_("Stock UOM") + ":Link/UOM:100", _("Qty") + ":Float:50", _("Balance Qty") + ":Float: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", _("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" _("Serial #") + ":Link/Serial No:100", _("Company") + ":Link/Company:100"
] ]

10
setup.py
View File

@ -1,9 +1,8 @@
from setuptools import setup, find_packages 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="")
with open("requirements.txt", "r") as f:
install_requires = f.readlines()
setup( setup(
name='erpnext', name='erpnext',
@ -14,5 +13,6 @@ setup(
packages=find_packages(), packages=find_packages(),
zip_safe=False, zip_safe=False,
include_package_data=True, include_package_data=True,
install_requires=install_requires install_requires=[str(ir.req) for ir in requirements],
dependency_links=[str(ir._link) for ir in requirements if ir._link]
) )