Merge branch 'develop'

2026-02-15 23:54:59 +00:00 · 2016-03-03 11:27:42 +05:30
parent fe3f78b0f6 14b83cf391
commit a289ab75bf
57 changed files with 14615 additions and 14305 deletions
--- a/erpnext/version.py
+++ b/erpnext/version.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.24.0'
+__version__ = '6.24.1'
--- 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.24.0"
+app_version = "6.24.1"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements

-version = "6.24.0"
+version = "6.24.1"
 requirements = parse_requirements("requirements.txt", session="")

 setup(