Merge pull request #2013 from anandpdoshi/anand-july-31

Fixes and Translations
2014-08-01 11:12:19 +05:30 · 2014-08-01 11:12:19 +05:30 · 6e4efa7edd
commit 6e4efa7edd
parent 3f28ac3205 a66ef778ec
25 changed files with 23563 additions and 13578 deletions
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@ -197,7 +197,6 @@ def get_data():
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "Serial No Service Contract Expiry",
 					"doctype": "Serial No"
 				},
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.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.csv
+++ b/erpnext/translations/es.csv
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.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/kn.csv
+++ b/erpnext/translations/kn.csv
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.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/sr.csv
+++ b/erpnext/translations/sr.csv
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.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