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:
Pratik Vyas 2014-11-06 14:36:51 +05:30
commit bc41ce95fc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1 +1 @@
__version__ = '4.10.0' __version__ = '4.11.0'

2
erpnext/hooks.py
View File

@ -4,7 +4,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.10.0" app_version = "4.11.0"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
erpnext/translations/hr.csv
View File

@ -661,7 +661,7 @@ Currency and Price List,Valuta i cjenik
Currency exchange rate master.,Majstor valute . Currency exchange rate master.,Majstor valute .
Current Address,Trenutna adresa Current Address,Trenutna adresa
Current Address Is,Trenutni Adresa je Current Address Is,Trenutni Adresa je
Current Assets,Dugotrajna imovina Current Assets,Trenutna imovina
Current BOM,Trenutni BOM Current BOM,Trenutni BOM
Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
Current Fiscal Year,Tekuće fiskalne godine Current Fiscal Year,Tekuće fiskalne godine

1 (Half Day) (Poludnevni)
661 Currency exchange rate master. Majstor valute .
662 Current Address Trenutna adresa
663 Current Address Is Trenutni Adresa je
664 Current Assets Dugotrajna imovina Trenutna imovina
665 Current BOM Trenutni BOM
666 Current BOM and New BOM can not be same Trenutni troškovnik i novi troškovnik ne mogu biti isti
667 Current Fiscal Year Tekuće fiskalne godine

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
version = "4.10.0" version = "4.11.0"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()