[tryton-debian-vcs] tryton-modules-account-dunning-letter branch upstream updated. upstream/4.0.1-1-g4c746ca
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:15:42 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-dunning-letter.git;a=commitdiff;h=upstream/4.0.1-1-g4c746ca
commit 4c746ca4af471b58a0bf54c1d07591af61bed977
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:10 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 9dacc70..7ced214 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
diff --git a/INSTALL b/INSTALL
index fb37480..99d5f4d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index 3f507aa..99f7c44 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_dunning_letter
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for account dunning letter
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_account_dunning_letter
==============================
@@ -62,6 +62,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/dunning.py b/dunning.py
index cf91cbf..9f28839 100644
--- a/dunning.py
+++ b/dunning.py
@@ -47,6 +47,11 @@ class Letter(CompanyReport):
__name__ = 'account.dunning.letter'
@classmethod
+ def execute(cls, ids, data):
+ with Transaction().set_context(address_with_party=True):
+ return super(Letter, cls).execute(ids, data)
+
+ @classmethod
def get_context(cls, records, data):
report_context = super(Letter, cls).get_context(records, data)
@@ -92,6 +97,10 @@ class Letter(CompanyReport):
self.dunnings = dunnings
self.payments = payments
+ @property
+ def fees(self):
+ return {}
+
def highest_levels(self):
'Yield each procedure and the highest level'
key = attrgetter('procedure')
diff --git a/letter.odt b/letter.odt
index 423c365..b5084b5 100644
Binary files a/letter.odt and b/letter.odt differ
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 69%
copy from locale/bg_BG.po
copy to locale/bg.po
index aa57d3e..1b76823 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -10,34 +10,49 @@ msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Amount"
-msgstr ""
+msgstr "Сума"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "Дата"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Дата:"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "Описание"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
+msgstr "Дата на изпълнение"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
msgstr ""
msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Reference"
-msgstr ""
+msgstr "Препратка"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr ""
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 84%
rename from locale/ca_ES.po
rename to locale/ca.po
index 31c5352..8bf7180 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -28,7 +28,11 @@ msgstr "Descripció"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
-msgstr "Data de venciment"
+msgstr "Data venciment"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr "Despeses:"
msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
@@ -41,3 +45,7 @@ msgstr "Referència"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Avís recordatori"
+
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 92%
copy from locale/cs_CZ.po
copy to locale/cs.po
index aa57d3e..a65490a 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 86%
rename from locale/de_DE.po
rename to locale/de.po
index f674007..b7a6262 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr "Fälligkeitsdatum"
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr "Gebühren:"
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr "Erhaltene Zahlungen"
@@ -41,3 +45,7 @@ msgstr "Beleg-Nr."
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Erinnerung"
+
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 84%
rename from locale/es_ES.po
rename to locale/es.po
index 5ed62c2..c334488 100644
--- a/locale/es_ES.po
+++ b/locale/es.po
@@ -28,7 +28,11 @@ msgstr "Descripción"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
-msgstr "Fecha de vencimiento"
+msgstr "Fecha vencimiento"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr "Gastos:"
msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
@@ -41,3 +45,7 @@ msgstr "Referencia"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Aviso recordatorio"
+
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/cs_CZ.po b/locale/es_419.po
similarity index 87%
copy from locale/cs_CZ.po
copy to locale/es_419.po
index aa57d3e..71c505e 100644
--- a/locale/cs_CZ.po
+++ b/locale/es_419.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
-msgstr ""
+msgstr "Carta de cobro"
msgctxt "report:account.dunning.letter:"
msgid "Amount"
@@ -28,6 +28,10 @@ msgstr ""
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
msgstr ""
msgctxt "report:account.dunning.letter:"
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index 2909d93..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr "Imprimir en una carta"
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr "Carta de Reclamo"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr "Fecha:"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr "Fecha vencimiento"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr "Pagos pendientes recibidos"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr "Referencia"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr "Aviso recordatorio"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index f6b6258..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr "Imprimir en Carta"
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr "Carta de Cobro"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr "Valor"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr "Fecha:"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr "Fecha Esperada"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr "Pagos Pendientes Recibidos"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr "Referencia"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr "Aviso Recordatorio"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 0a6434c..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr "Imprimir en una carta"
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr "Carta de cobro"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr "Fecha:"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr "Fecha de vencimiento"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr "Pagos pendientes recibidos"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr "Referencia"
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr "Aviso recordatorio"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 87%
rename from locale/fr_FR.po
rename to locale/fr.po
index 86b2413..a0f45e2 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr "Date d'échéance"
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr "Frais :"
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr "Paiements en attente reçus"
@@ -41,3 +45,7 @@ msgstr "Référence"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Avis de rappel"
+
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index aa57d3e..36cb04b 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -14,23 +14,30 @@ msgctxt "report:account.dunning.letter:"
msgid "Amount"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "Dátum"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Dátum:"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "Leírás"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
@@ -41,3 +48,8 @@ msgstr ""
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr ""
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index aa57d3e..4052d15 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,40 +4,44 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.dunning.level,print_on_letter:"
msgid "Print on Letter"
-msgstr ""
+msgstr "Stampare su lettera"
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
-msgstr ""
+msgstr "Sollecito"
msgctxt "report:account.dunning.letter:"
msgid "Amount"
-msgstr ""
+msgstr "Importo"
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "Data"
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Data"
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "Descrizione"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
-msgstr ""
+msgstr "Scadenza"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr "Spese"
msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
-msgstr ""
+msgstr "Pagamenti parziali ricevuti"
msgctxt "report:account.dunning.letter:"
msgid "Reference"
-msgstr ""
+msgstr "Riferimento"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
-msgstr ""
+msgstr "Avviso promemoria"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index aa57d3e..35bdfb8 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
-msgstr ""
+msgstr "Dunning Letter"
msgctxt "report:account.dunning.letter:"
msgid "Amount"
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 88%
rename from locale/lo_LA.po
rename to locale/lo.po
index e4ec947..c9199b8 100644
--- a/locale/lo_LA.po
+++ b/locale/lo.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr "ວັນທີຕ້ອງຈ່າຍ"
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr "ຈຳນວນເງິນຄ້າງຊໍາລະທີ່ໄດ້ຮັບ"
@@ -41,3 +45,8 @@ msgstr "ເອກະສານອ້າງອີງ"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "ໜັງສືແຈ້ງເຕືອນ"
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "ວິນາທີ"
diff --git a/locale/bg_BG.po b/locale/lt.po
similarity index 92%
copy from locale/bg_BG.po
copy to locale/lt.po
index aa57d3e..a65490a 100644
--- a/locale/bg_BG.po
+++ b/locale/lt.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
deleted file mode 100644
index aa57d3e..0000000
--- a/locale/lt_LT.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr ""
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr ""
diff --git a/locale/es_MX.po b/locale/nl.po
similarity index 79%
rename from locale/es_MX.po
rename to locale/nl.po
index d823a4a..7fc3527 100644
--- a/locale/es_MX.po
+++ b/locale/nl.po
@@ -4,39 +4,48 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.dunning.level,print_on_letter:"
msgid "Print on Letter"
-msgstr "Imprimir en una carta"
+msgstr ""
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
-msgstr "Carta de reclamación"
+msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "Vervaldatum"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Datum:"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "Specificatie"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Reference"
-msgstr ""
+msgstr "Referentie"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
deleted file mode 100644
index aa57d3e..0000000
--- a/locale/nl_NL.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr ""
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr ""
diff --git a/locale/cs_CZ.po b/locale/pl.po
similarity index 90%
rename from locale/cs_CZ.po
rename to locale/pl.po
index aa57d3e..35bdfb8 100644
--- a/locale/cs_CZ.po
+++ b/locale/pl.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
-msgstr ""
+msgstr "Dunning Letter"
msgctxt "report:account.dunning.letter:"
msgid "Amount"
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 11331f0..ed53a6c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr "Data de vencimento"
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr "Pagamentos pendentes recebidos"
@@ -41,3 +45,8 @@ msgstr "Referência"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Lembrete"
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/bg_BG.po b/locale/ru.po
similarity index 70%
rename from locale/bg_BG.po
rename to locale/ru.po
index aa57d3e..e0320c3 100644
--- a/locale/bg_BG.po
+++ b/locale/ru.po
@@ -10,34 +10,49 @@ msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Amount"
-msgstr ""
+msgstr "Сумма"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "Дата"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Дата:"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "Описание"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
+msgstr "Срок сдачи"
+
+msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
msgstr ""
msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Reference"
-msgstr ""
+msgstr "Ссылка"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr ""
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "с"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
deleted file mode 100644
index aa57d3e..0000000
--- a/locale/ru_RU.po
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:account.dunning.level,print_on_letter:"
-msgid "Print on Letter"
-msgstr ""
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Dunning Letter"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Amount"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Date:"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Description"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Due Date"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Pending Payments Received"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reference"
-msgstr ""
-
-msgctxt "report:account.dunning.letter:"
-msgid "Reminder Notice"
-msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 86%
rename from locale/sl_SI.po
rename to locale/sl.po
index db75710..c7627da 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -31,6 +31,10 @@ msgid "Due Date"
msgstr "Zapadlost"
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr "Dosedanja plačila"
@@ -41,3 +45,8 @@ msgstr "Sklic"
msgctxt "report:account.dunning.letter:"
msgid "Reminder Notice"
msgstr "Opomin"
+
+#, fuzzy
+msgctxt "report:account.dunning.letter:"
+msgid "s"
+msgstr "s"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index aa57d3e..c0fd14f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -14,23 +14,30 @@ msgctxt "report:account.dunning.letter:"
msgid "Amount"
msgstr ""
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date"
-msgstr ""
+msgstr "日期格式"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Date:"
-msgstr ""
+msgstr "日期格式"
+#, fuzzy
msgctxt "report:account.dunning.letter:"
msgid "Description"
-msgstr ""
+msgstr "描述"
msgctxt "report:account.dunning.letter:"
msgid "Due Date"
msgstr ""
msgctxt "report:account.dunning.letter:"
+msgid "Fees:"
+msgstr ""
+
+msgctxt "report:account.dunning.letter:"
msgid "Pending Payments Received"
msgstr ""
diff --git a/setup.py b/setup.py
index c1dacfd..6a4c1d5 100644
--- a/setup.py
+++ b/setup.py
@@ -96,6 +96,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tests/scenario_account_dunning_letter.rst b/tests/scenario_account_dunning_letter.rst
index 7ed0b1c..10d72de 100644
--- a/tests/scenario_account_dunning_letter.rst
+++ b/tests/scenario_account_dunning_letter.rst
@@ -8,25 +8,16 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import config, Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install account_dunning_letter::
- >>> Module = Model.get('ir.module')
- >>> module, = Module.find([
- ... ('name', '=', 'account_dunning_letter'),
- ... ])
- >>> module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('account_dunning_letter')
Create company::
@@ -91,13 +82,13 @@ Create dunning procedure::
>>> procedure = Procedure(name='Procedure')
>>> level = procedure.levels.new()
>>> level.sequence = 1
- >>> level.days = 5
+ >>> level.overdue = datetime.timedelta(5)
>>> level = procedure.levels.new()
>>> level.sequence = 2
- >>> level.days = 20
+ >>> level.overdue = datetime.timedelta(20)
>>> level = procedure.levels.new()
>>> level.sequence = 3
- >>> level.days = 40
+ >>> level.overdue = datetime.timedelta(40)
>>> procedure.save()
Create parties::
diff --git a/tests/test_account_dunning_letter.py b/tests/test_account_dunning_letter.py
index d5b3feb..cbdca16 100644
--- a/tests/test_account_dunning_letter.py
+++ b/tests/test_account_dunning_letter.py
@@ -4,8 +4,7 @@ import unittest
import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import doctest_setup, doctest_teardown
-from trytond.tests.test_tryton import doctest_checker
+from trytond.tests.test_tryton import doctest_teardown, doctest_checker
class AccountDunningLetterTestCase(ModuleTestCase):
@@ -18,7 +17,7 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountDunningLetterTestCase))
suite.addTests(doctest.DocFileSuite('scenario_account_dunning_letter.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ tearDown=doctest_teardown, encoding='utf-8',
checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 1344b9f..2784825 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
account
account_dunning
diff --git a/trytond_account_dunning_letter.egg-info/PKG-INFO b/trytond_account_dunning_letter.egg-info/PKG-INFO
index 07b8c65..0e838d4 100644
--- a/trytond_account_dunning_letter.egg-info/PKG-INFO
+++ b/trytond_account_dunning_letter.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-dunning-letter
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for account dunning letter
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_account_dunning_letter
==============================
@@ -62,6 +62,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_account_dunning_letter.egg-info/SOURCES.txt b/trytond_account_dunning_letter.egg-info/SOURCES.txt
index 9079133..9ca2595 100644
--- a/trytond_account_dunning_letter.egg-info/SOURCES.txt
+++ b/trytond_account_dunning_letter.egg-info/SOURCES.txt
@@ -13,25 +13,23 @@ tryton.cfg
./dunning.xml
./letter.odt
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lo_LA.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_account_dunning_letter.rst
@@ -39,25 +37,23 @@ tryton.cfg
./view/dunning_level_form.xml
./view/dunning_level_list.xml
doc/index.rst
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
tests/scenario_account_dunning_letter.rst
trytond_account_dunning_letter.egg-info/PKG-INFO
diff --git a/trytond_account_dunning_letter.egg-info/requires.txt b/trytond_account_dunning_letter.egg-info/requires.txt
index 24c1589..7d46fa2 100644
--- a/trytond_account_dunning_letter.egg-info/requires.txt
+++ b/trytond_account_dunning_letter.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_account >= 4.0, < 4.1
-trytond_account_dunning >= 4.0, < 4.1
-trytond_company >= 4.0, < 4.1
-trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_account >= 4.2, < 4.3
+trytond_account_dunning >= 4.2, < 4.3
+trytond_company >= 4.2, < 4.3
+trytond_party >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/view/dunning_level_form.xml b/view/dunning_level_form.xml
index f8831ac..0869baa 100644
--- a/view/dunning_level_form.xml
+++ b/view/dunning_level_form.xml
@@ -2,7 +2,7 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='days']" position="after">
+ <xpath expr="/form/field[@name='overdue']" position="after">
<label name="print_on_letter"/>
<field name="print_on_letter"/>
</xpath>
diff --git a/view/dunning_level_list.xml b/view/dunning_level_list.xml
index 425b74f..7ed0e58 100644
--- a/view/dunning_level_list.xml
+++ b/view/dunning_level_list.xml
@@ -2,7 +2,7 @@
<!-- this file is part of tryton. the copyright file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/tree/field[@name='days']" position="after">
+ <xpath expr="/tree/field[@name='overdue']" position="after">
<field name="print_on_letter"/>
</xpath>
</data>
--
tryton-modules-account-dunning-letter
More information about the tryton-debian-vcs
mailing list