Merge pull request #1058 from jevonearth/master
[fix] [minor] Add cssmin python module to the requirements variable
diff --git a/install_erpnext.py b/install_erpnext.py
index b19fc5a..885ccf1 100644
--- a/install_erpnext.py
+++ b/install_erpnext.py
@@ -10,19 +10,20 @@
root_password = None
requirements = [
- "MySQL-python",
- "pytz==2013b",
- "python-dateutil",
+ "chardet",
+ "cssmin",
+ "dropbox",
+ "google-api-python-client ",
"jinja2",
"markdown2",
- "termcolor",
+ "MySQL-python",
+ "pygeoip",
+ "python-dateutil",
"python-memcached",
+ "pytz==2013b",
"requests",
- "chardet",
- "dropbox",
- "Werkzeug",
- "google-api-python-client ",
- "pygeoip"
+ "termcolor",
+ "Werkzeug"
]
def install(install_path):
@@ -277,17 +278,17 @@
return pwd.getpwnam(username).pw_uid
def setup_cron(install_path):
- erpnext_cron_entries = [
- "*/3 * * * * cd %s && python lib/wnf.py --run_scheduler >> erpnext-sch.log 2>&1" % install_path,
- "0 */6 * * * cd %s && python lib/wnf.py --backup >> erpnext-backup.log 2>&1" % install_path
- ]
- for row in erpnext_cron_entries:
- try:
- existing_cron = exec_in_shell("crontab -l")
- if row not in existing_cron:
- exec_in_shell('{ crontab -l; echo "%s"; } | crontab' % row)
- except:
- exec_in_shell('echo "%s" | crontab' % row)
+ erpnext_cron_entries = [
+ "*/3 * * * * cd %s && python lib/wnf.py --run_scheduler >> erpnext-sch.log 2>&1" % install_path,
+ "0 */6 * * * cd %s && python lib/wnf.py --backup >> erpnext-backup.log 2>&1" % install_path
+ ]
+ for row in erpnext_cron_entries:
+ try:
+ existing_cron = exec_in_shell("crontab -l")
+ if row not in existing_cron:
+ exec_in_shell('{ crontab -l; echo "%s"; } | crontab' % row)
+ except:
+ exec_in_shell('echo "%s" | crontab' % row)
if __name__ == "__main__":
args = parse_args()
diff --git a/selling/doctype/sms_center/sms_center.txt b/selling/doctype/sms_center/sms_center.txt
index bed9cf4..364704c 100644
--- a/selling/doctype/sms_center/sms_center.txt
+++ b/selling/doctype/sms_center/sms_center.txt
@@ -112,7 +112,7 @@
"width": "50%"
},
{
- "description": "Message greater than 160 character will be splitted into multiple mesage",
+ "description": "Messages greater than 160 characters will be split into multiple messages",
"doctype": "DocField",
"fieldname": "message",
"fieldtype": "Text",
@@ -129,4 +129,4 @@
{
"doctype": "DocPerm"
}
-]
\ No newline at end of file
+]
diff --git a/translations/ar.csv b/translations/ar.csv
index 9856580..e019413 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account",دمج غير ممكن إلا إذا عقب \ الخصائص هي نفسها في كل السجلات. مجموعة أو ليدجر، الخصم أو الائتمان، هل الحساب PL
Message,رسالة
Message Parameter,رسالة معلمة
-Message greater than 160 character will be splitted into multiple mesage,سيتم انقسم رسالة أكبر من 160 حرف في mesage متعددة
+Messages greater than 160 characters will be split into multiple messages,سيتم انقسم رسالة أكبر من 160 حرف في mesage متعددة
Messages,رسائل
Method,طريقة
Middle Income,المتوسطة الدخل
diff --git a/translations/de.csv b/translations/de.csv
index 7cf514e..f68cabf 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Merging ist nur möglich, wenn nach \ Eigenschaften sind in beiden Datensätzen gleich. Gruppen-oder Ledger, Debit-oder Kreditkarten, PL Konto"
Message,Nachricht
Message Parameter,Nachricht Parameter
-Message greater than 160 character will be splitted into multiple mesage,Größer als 160 Zeichen Nachricht in mehrere mesage aufgeteilt werden
+Messages greater than 160 characters will be split into multiple messages,Größer als 160 Zeichen Nachricht in mehrere mesage aufgeteilt werden
Messages,Nachrichten
Method,Verfahren
Middle Income,Middle Income
diff --git a/translations/el.csv b/translations/el.csv
index 8b604e7..45eacb8 100644
--- a/translations/el.csv
+++ b/translations/el.csv
@@ -1704,7 +1704,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Η συγχώνευση είναι δυνατή μόνο εάν μετά \ ιδιότητες είναι ίδια και στα δύο αρχεία. Ομάδα ή Ledger, χρεωστικές ή πιστωτικές, είναι PL λογαριασμού"
Message,Μήνυμα
Message Parameter,Παράμετρος στο μήνυμα
-Message greater than 160 character will be splitted into multiple mesage,Μήνυμα μεγαλύτερη από 160 χαρακτήρων που θα χωρίζονται σε πολλαπλές mesage
+Messages greater than 160 characters will be split into multiple messages,Μήνυμα μεγαλύτερη από 160 χαρακτήρων που θα χωρίζονται σε πολλαπλές mesage
Messages,Μηνύματα
Method,Μέθοδος
Middle Income,Μέση εισοδήματος
diff --git a/translations/es.csv b/translations/es.csv
index 4ab32b5..86f213d 100644
--- a/translations/es.csv
+++ b/translations/es.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","La fusión sólo es posible si sigue a \ propiedades son las mismas en ambos registros. Grupo o Ledger, de débito o de crédito, es el relato PL"
Message,Mensaje
Message Parameter,Mensaje de Parámetros
-Message greater than 160 character will be splitted into multiple mesage,Mensaje mayor de 160 caracteres se dividirá en múltiples mesage
+Messages greater than 160 characters will be split into multiple messages,Mensaje mayor de 160 caracteres se dividirá en múltiples mesage
Messages,Mensajes
Method,Método
Middle Income,Ingreso Medio
diff --git a/translations/fr.csv b/translations/fr.csv
index d9c0d87..fc77f69 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","La fusion n'est possible que si à la suite \ propriétés sont les mêmes dans les deux dossiers. Groupe ou Ledger, débit ou de crédit, est le compte PL"
Message,Message
Message Parameter,Paramètre message
-Message greater than 160 character will be splitted into multiple mesage,Un message de plus de 160 caractères sera découpé en plusieurs mesage
+Messages greater than 160 characters will be split into multiple messages,Un message de plus de 160 caractères sera découpé en plusieurs mesage
Messages,Messages
Method,Méthode
Middle Income,Revenu intermédiaire
diff --git a/translations/hi.csv b/translations/hi.csv
index 8e2fcaf..dd967bc 100644
--- a/translations/hi.csv
+++ b/translations/hi.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","\ गुण दोनों रिकॉर्ड में वही कर रहे हैं निम्नलिखित अगर मर्ज ही संभव है. समूह या लेजर, डेबिट या क्रेडिट, पीएल खाता है"
Message,संदेश
Message Parameter,संदेश पैरामीटर
-Message greater than 160 character will be splitted into multiple mesage,160 चरित्र से अधिक संदेश कई mesage में splitted जाएगा
+Messages greater than 160 characters will be split into multiple messages,160 चरित्र से अधिक संदेश कई mesage में split जाएगा
Messages,संदेश
Method,विधि
Middle Income,मध्य आय
diff --git a/translations/hr.csv b/translations/hr.csv
index 20b5cc7..8fd2cb8 100644
--- a/translations/hr.csv
+++ b/translations/hr.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Spajanje je moguće samo ako se slijedi \ svojstva su isti u oba zapisa. Grupa ili knjiga, debitne ili kreditne, Je PL račun"
Message,Poruka
Message Parameter,Poruka parametra
-Message greater than 160 character will be splitted into multiple mesage,Poruka veća od 160 karaktera će biti splitted u više mesage
+Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera će biti split u više mesage
Messages,Poruke
Method,Način
Middle Income,Srednji Prihodi
diff --git a/translations/it.csv b/translations/it.csv
index e9e2106..b567e1d 100644
--- a/translations/it.csv
+++ b/translations/it.csv
Binary files differ
diff --git a/translations/nl.csv b/translations/nl.csv
index c9b5aa2..8aec131 100644
--- a/translations/nl.csv
+++ b/translations/nl.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Samenvoegen is alleen mogelijk als volgt \ eigenschappen zijn hetzelfde in beide records. Groep of Ledger, Debet of Credit, Is PL Account"
Message,Bericht
Message Parameter,Bericht Parameter
-Message greater than 160 character will be splitted into multiple mesage,Bericht van meer dan 160 tekens worden opgesplitst in meerdere mesage
+Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere mesage
Messages,Berichten
Method,Methode
Middle Income,Midden Inkomen
diff --git a/translations/pt-BR.csv b/translations/pt-BR.csv
index 7dfb0a2..2eeebd8 100644
--- a/translations/pt-BR.csv
+++ b/translations/pt-BR.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","A fusão só é possível se seguindo \ propriedades são as mesmas em ambos os registros. Grupo ou Ledger, de débito ou de crédito, é Conta PL"
Message,Mensagem
Message Parameter,Parâmetro da mensagem
-Message greater than 160 character will be splitted into multiple mesage,Mensagens maiores do que 160 caracteres vão ser divididos em múltiplas mensagens
+Messages greater than 160 characters will be split into multiple messages,Mensagens maiores do que 160 caracteres vão ser divididos em múltiplas mensagens
Messages,Mensagens
Method,Método
Middle Income,Rendimento Médio
diff --git a/translations/pt.csv b/translations/pt.csv
index 900d4da..4d12aff 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","A fusão só é possível se seguindo \ propriedades são as mesmas em ambos os registros. Grupo ou Ledger, de débito ou de crédito, é Conta PL"
Message,Mensagem
Message Parameter,Parâmetro mensagem
-Message greater than 160 character will be splitted into multiple mesage,Mensagem maior do que 160 caracteres vai ser dividido em mesage múltipla
+Messages greater than 160 characters will be split into multiple messages,Mensagem maior do que 160 caracteres vai ser dividido em mesage múltipla
Messages,Mensagens
Method,Método
Middle Income,Rendimento Médio
diff --git a/translations/sr.csv b/translations/sr.csv
index fc9513b..9ba2b7d 100644
--- a/translations/sr.csv
+++ b/translations/sr.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","Спајање је могуће само ако је после \ својства су иста у оба записа. Група или Леџер, дебитна или кредитна, ПЛ је налог"
Message,Порука
Message Parameter,Порука Параметар
-Message greater than 160 character will be splitted into multiple mesage,Порука већи од 160 карактера ће бити подељен на више Упис
+Messages greater than 160 characters will be split into multiple messages,Порука већи од 160 карактера ће бити подељен на више Упис
Messages,Поруке
Method,Метод
Middle Income,Средњи приход
diff --git a/translations/ta.csv b/translations/ta.csv
index f21f27b..6fb00b1 100644
--- a/translations/ta.csv
+++ b/translations/ta.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account","\ பண்புகள் இரண்டு பதிவுகளை ஒரே பின்வரும் என்றால் இணைத்தல் மட்டுமே சாத்தியம். குழு அல்லது லெட்ஜர், பற்று அல்லது கடன், பிஎல் கணக்கு உள்ளது"
Message,செய்தி
Message Parameter,செய்தி அளவுரு
-Message greater than 160 character will be splitted into multiple mesage,160 தன்மையை விட செய்தியை பல mesage கொண்டு splitted
+Messages greater than 160 characters will be split into multiple messages,160 தன்மையை விட செய்தியை பல mesage கொண்டு split
Messages,செய்திகள்
Method,வகை
Middle Income,நடுத்தர வருமானம்
diff --git a/translations/th.csv b/translations/th.csv
index 3cf2d9c..d8c5da7 100644
--- a/translations/th.csv
+++ b/translations/th.csv
@@ -1683,7 +1683,7 @@
"Merging is only possible if following \ properties are same in both records. Group or Ledger, Debit or Credit, Is PL Account",ผสานความเป็นไปได้เฉพาะในกรณีดังต่อไปนี้ \ สมบัติเหมือนกันในทั้งประวัติ หรือกลุ่มบัญชีแยกประเภทเดบิตหรือบัตรเครดิตเป็นบัญชี PL
Message,ข่าวสาร
Message Parameter,พารามิเตอร์ข้อความ
-Message greater than 160 character will be splitted into multiple mesage,ข้อความมากขึ้นกว่า 160 ตัวอักษรจะได้รับการลง splitted mesage หลาย
+Messages greater than 160 characters will be split into multiple messages,ข้อความมากขึ้นกว่า 160 ตัวอักษรจะได้รับการลง split mesage หลาย
Messages,ข้อความ
Method,วิธี
Middle Income,มีรายได้ปานกลาง