[tryton-debian-vcs] tryton-modules-account-deposit branch upstream updated. upstream/4.0.1-1-g57d5d83
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:14:37 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-deposit.git;a=commitdiff;h=upstream/4.0.1-1-g57d5d83
commit 57d5d83aa7b5baf6dcbb4304952307cce8b31bad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:08 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index f8e909e..fa9890a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
+* Support taxes defined on account deposit
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
@@ -9,4 +10,4 @@ Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
Version 3.6.0 - 2015-04-20
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/INSTALL b/INSTALL
index 4f1027a..46173a8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,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 35c7bb2..0e2586f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_deposit
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for accounting deposit
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_deposit
=======================
@@ -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/invoice.py b/invoice.py
index 18871bc..eb471cd 100644
--- a/invoice.py
+++ b/invoice.py
@@ -3,7 +3,7 @@
from trytond.pool import PoolMeta, Pool
from trytond.model import ModelView, Workflow, fields
from trytond.wizard import Wizard, StateView, StateTransition, Button
-from trytond.pyson import Eval, Id
+from trytond.pyson import Eval
from trytond.transaction import Transaction
__all__ = ['Invoice', 'InvoiceLine',
@@ -25,8 +25,6 @@ class Invoice:
cls._buttons.update({
'recall_deposit': {
'invisible': Eval('state') != 'draft',
- 'readonly': ~Eval('groups', []).contains(
- Id('account', 'group_account')),
},
})
@@ -117,26 +115,29 @@ class DepositRecall(Wizard):
if line.account == self.start.account:
to_delete.append(line)
if amount < 0:
- line = self._get_invoice_line(amount)
- line.invoice = invoice
- line.company = invoice.company
+ line = self._get_invoice_line(invoice, amount)
line.sequence = max(l.sequence for l in invoice.lines)
line.save()
if to_delete:
InvoiceLine.delete(to_delete)
return 'end'
- def _get_invoice_line(self, amount):
+ def _get_invoice_line(self, invoice, amount):
pool = Pool()
Line = pool.get('account.invoice.line')
- return Line(
+ line = Line(
+ invoice=invoice,
+ company=invoice.company,
type='line',
quantity=1,
account=self.start.account,
unit_price=amount,
description=self.start.description,
)
+ # Set taxes
+ line.on_change_account()
+ return line
class DepositRecallStart(ModelView):
diff --git a/invoice.xml b/invoice.xml
index 35a9b16..9240c9e 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -20,5 +20,14 @@ this repository contains the full copyright notices and license terms. -->
<field name="inherit" ref="account_invoice.invoice_view_form"/>
<field name="name">invoice_form</field>
</record>
+ <record model="ir.model.button" id="invoice_recall_deposit_button">
+ <field name="name">recall_deposit</field>
+ <field name="model" search="[('model', '=', 'account.invoice')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="invoice_recall_deposit_button_group_account">
+ <field name="button" ref="invoice_recall_deposit_button"/>
+ <field name="group" ref="account.group_account"/>
+ </record>
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 93%
rename from locale/bg_BG.po
rename to locale/bg.po
index c705758..96ccdde 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -46,10 +46,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 93%
rename from locale/ca_ES.po
rename to locale/ca.po
index 418f555..11458e2 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Bestreta"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recupera bestreta"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Recupera bestreta"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 93%
copy from locale/cs_CZ.po
copy to locale/cs.po
index 60c5dea..199545f 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 93%
rename from locale/de_DE.po
rename to locale/de.po
index ca485b5..28a62e4 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Anzahlung"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Anzahlung verrechnen"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Anzahlung verrechnen"
diff --git a/locale/es_EC.po b/locale/es.po
similarity index 93%
rename from locale/es_EC.po
rename to locale/es.po
index e1bd2d7..c4a31c1 100644
--- a/locale/es_EC.po
+++ b/locale/es.po
@@ -44,10 +44,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Anticipo"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Recuperar anticipo"
diff --git a/locale/cs_CZ.po b/locale/es_419.po
similarity index 93%
copy from locale/cs_CZ.po
copy to locale/es_419.po
index 60c5dea..199545f 100644
--- a/locale/cs_CZ.po
+++ b/locale/es_419.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index f93cb7f..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.invoice:"
-msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
-msgstr ""
-"La cuenta «%(account)s» para la entidad «%(party)s» no dispone de anticipo "
-"suficiente."
-
-msgctxt "field:account.invoice.recall_deposit.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.invoice.recall_deposit.start,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.invoice.recall_deposit.start,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.invoice.recall_deposit.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:party.party,deposit:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "model:account.invoice.recall_deposit.start,name:"
-msgid "Recall deposit on Invoice"
-msgstr "Cargar anticipo sobre Factura"
-
-msgctxt "model:ir.action,name:wizard_recall_deposit"
-msgid "Recall Deposit"
-msgstr "Cargar anticipo"
-
-msgctxt "selection:account.account,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Cargar anticipo"
-
-msgctxt "view:account.invoice:"
-msgid "Recall Deposit"
-msgstr "Cargar anticipo"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
-msgid "Recall"
-msgstr "Cargar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index b3f41bb..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.invoice:"
-msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
-msgstr ""
-"La cuenta \"%(account)s\" del tercero \"%(party)s\" no tiene suficiente "
-"depósito."
-
-msgctxt "field:account.invoice.recall_deposit.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.invoice.recall_deposit.start,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:account.invoice.recall_deposit.start,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.invoice.recall_deposit.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:party.party,deposit:"
-msgid "Deposit"
-msgstr "Depósito"
-
-msgctxt "model:account.invoice.recall_deposit.start,name:"
-msgid "Recall deposit on Invoice"
-msgstr "Recordar deposito en Factura"
-
-msgctxt "model:ir.action,name:wizard_recall_deposit"
-msgid "Recall Deposit"
-msgstr "Recordar Deposito"
-
-msgctxt "selection:account.account,kind:"
-msgid "Deposit"
-msgstr "Depósito"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Deposit"
-msgstr "Depósito"
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recordar Depósito"
-
-msgctxt "view:account.invoice:"
-msgid "Recall Deposit"
-msgstr "Recordar Deposito"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
-msgid "Recall"
-msgstr "Recordar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
deleted file mode 100644
index e1bd2d7..0000000
--- a/locale/es_ES.po
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.invoice:"
-msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
-msgstr ""
-"La cuenta \"%(account)s\" del tercero \"%(party)s\" no tiene suficiente "
-"anticipo."
-
-msgctxt "field:account.invoice.recall_deposit.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.invoice.recall_deposit.start,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.invoice.recall_deposit.start,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.invoice.recall_deposit.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:party.party,deposit:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "model:account.invoice.recall_deposit.start,name:"
-msgid "Recall deposit on Invoice"
-msgstr "Recuperación de anticipo en factura"
-
-msgctxt "model:ir.action,name:wizard_recall_deposit"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-msgctxt "selection:account.account,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-msgctxt "view:account.invoice:"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
-msgid "Recall"
-msgstr "Recuperar"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 3e92ea3..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.invoice:"
-msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
-msgstr ""
-"La cuenta \"%(account)s\" de la entidad \"%(party)s\" no tiene suficiente "
-"anticipo."
-
-msgctxt "field:account.invoice.recall_deposit.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.invoice.recall_deposit.start,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.invoice.recall_deposit.start,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:account.invoice.recall_deposit.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:party.party,deposit:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "model:account.invoice.recall_deposit.start,name:"
-msgid "Recall deposit on Invoice"
-msgstr "Recuperación de anticipo en factura"
-
-msgctxt "model:ir.action,name:wizard_recall_deposit"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-msgctxt "selection:account.account,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Deposit"
-msgstr "Anticipo"
-
-#, fuzzy
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-#, fuzzy
-msgctxt "view:account.invoice:"
-msgid "Recall Deposit"
-msgstr "Recuperar anticipo"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
-msgid "Recall"
-msgstr "Recuperar"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 93%
rename from locale/fr_FR.po
rename to locale/fr.po
index 47cc5b3..dbac7fa 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -43,10 +43,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Dépôt"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Rappeler le dépôt"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Rappeler les dépôts"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 60c5dea..f8ce523 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -6,21 +6,25 @@ msgctxt "error:account.invoice:"
msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
msgstr ""
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,account:"
msgid "Account"
-msgstr ""
+msgstr "Számla"
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,company:"
msgid "Company"
-msgstr ""
+msgstr "Társaság"
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,description:"
msgid "Description"
-msgstr ""
+msgstr "Leírás"
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party,deposit:"
msgid "Deposit"
@@ -42,17 +46,14 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
+#, fuzzy
msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
msgid "Recall"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 60c5dea..5974f09 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -5,55 +5,53 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.invoice:"
msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
msgstr ""
+"Il conto \"%(account)s\" per la controparte \"%(party)s\" non ha abbastanza "
+"deposito."
msgctxt "field:account.invoice.recall_deposit.start,account:"
msgid "Account"
-msgstr ""
+msgstr "Conto"
msgctxt "field:account.invoice.recall_deposit.start,company:"
msgid "Company"
-msgstr ""
+msgstr "Azienda"
msgctxt "field:account.invoice.recall_deposit.start,description:"
msgid "Description"
-msgstr ""
+msgstr "Descrizione"
msgctxt "field:account.invoice.recall_deposit.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party,deposit:"
msgid "Deposit"
-msgstr ""
+msgstr "Deposito"
msgctxt "model:account.invoice.recall_deposit.start,name:"
msgid "Recall deposit on Invoice"
-msgstr ""
+msgstr "Richiama il deposito in fattura"
msgctxt "model:ir.action,name:wizard_recall_deposit"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Richiama il deposito"
msgctxt "selection:account.account,kind:"
msgid "Deposit"
-msgstr ""
+msgstr "Deposito"
msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
-msgstr ""
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
+msgstr "Deposito"
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Richiama Deposito"
msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
msgid "Recall"
-msgstr ""
+msgstr "Richiama"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 60c5dea..0fcdadc 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -32,7 +32,7 @@ msgstr ""
msgctxt "model:ir.action,name:wizard_recall_deposit"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Recall Deposit"
msgctxt "selection:account.account,kind:"
msgid "Deposit"
@@ -42,13 +42,10 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
+#, fuzzy
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Recall Deposit"
msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
msgid "Cancel"
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 92%
rename from locale/lo_LA.po
rename to locale/lo.po
index e29acb9..34bf45b 100644
--- a/locale/lo_LA.po
+++ b/locale/lo.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "ເງິນມັດຈໍາ"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "ຮຽກເງິນມັດຈໍາຄືນ"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "ຮຽກເງິນມັດຈໍາຄືນ"
diff --git a/locale/cs_CZ.po b/locale/lt.po
similarity index 93%
copy from locale/cs_CZ.po
copy to locale/lt.po
index 60c5dea..199545f 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
deleted file mode 100644
index 60c5dea..0000000
--- a/locale/lt_LT.po
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:account.invoice:"
-msgid "The account \"%(account)s\" for party \"%(party)s\" has not enough deposit."
-msgstr ""
-
-msgctxt "field:account.invoice.recall_deposit.start,account:"
-msgid "Account"
-msgstr ""
-
-msgctxt "field:account.invoice.recall_deposit.start,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.invoice.recall_deposit.start,description:"
-msgid "Description"
-msgstr ""
-
-msgctxt "field:account.invoice.recall_deposit.start,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:party.party,deposit:"
-msgid "Deposit"
-msgstr ""
-
-msgctxt "model:account.invoice.recall_deposit.start,name:"
-msgid "Recall deposit on Invoice"
-msgstr ""
-
-msgctxt "model:ir.action,name:wizard_recall_deposit"
-msgid "Recall Deposit"
-msgstr ""
-
-msgctxt "selection:account.account,kind:"
-msgid "Deposit"
-msgstr ""
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Deposit"
-msgstr ""
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
-msgctxt "view:account.invoice:"
-msgid "Recall Deposit"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
-msgid "Recall"
-msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 92%
rename from locale/nl_NL.po
rename to locale/nl.po
index f0d52de..d1710f3 100644
--- a/locale/nl_NL.po
+++ b/locale/nl.po
@@ -21,9 +21,10 @@ msgctxt "field:account.invoice.recall_deposit.start,description:"
msgid "Description"
msgstr "Specificatie"
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party,deposit:"
msgid "Deposit"
@@ -45,10 +46,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/pl.po
similarity index 85%
rename from locale/cs_CZ.po
rename to locale/pl.po
index 60c5dea..6ae2999 100644
--- a/locale/cs_CZ.po
+++ b/locale/pl.po
@@ -8,23 +8,23 @@ msgstr ""
msgctxt "field:account.invoice.recall_deposit.start,account:"
msgid "Account"
-msgstr ""
+msgstr "Konto"
msgctxt "field:account.invoice.recall_deposit.start,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:account.invoice.recall_deposit.start,description:"
msgid "Description"
-msgstr ""
+msgstr "Opis"
msgctxt "field:account.invoice.recall_deposit.start,id:"
msgid "ID"
-msgstr ""
+msgstr "Identyfikator"
msgctxt "field:party.party,deposit:"
msgid "Deposit"
-msgstr ""
+msgstr "Wpłata"
msgctxt "model:account.invoice.recall_deposit.start,name:"
msgid "Recall deposit on Invoice"
@@ -32,27 +32,24 @@ msgstr ""
msgctxt "model:ir.action,name:wizard_recall_deposit"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Recall Deposit"
msgctxt "selection:account.account,kind:"
msgid "Deposit"
-msgstr ""
+msgstr "Wpłata"
msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
-msgstr ""
-
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
+msgstr "Wpłata"
+#, fuzzy
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
-msgstr ""
+msgstr "Recall Deposit"
msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
msgid "Recall"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index a16c429..f629972 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -44,10 +44,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Depósito"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Recuperar o depósito"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Recuperar o depósito"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 93%
rename from locale/ru_RU.po
rename to locale/ru.po
index 9271c8b..cff98c0 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -46,10 +46,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 93%
rename from locale/sl_SI.po
rename to locale/sl.po
index fe207bc..74c2c82 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -42,10 +42,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr "Depozit"
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr "Odpoklic depozita"
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr "Odpoklic depozita"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 60c5dea..75ed815 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -14,13 +14,15 @@ msgctxt "field:account.invoice.recall_deposit.start,company:"
msgid "Company"
msgstr ""
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,description:"
msgid "Description"
-msgstr ""
+msgstr "描述"
+#, fuzzy
msgctxt "field:account.invoice.recall_deposit.start,id:"
msgid "ID"
-msgstr ""
+msgstr "编号"
msgctxt "field:party.party,deposit:"
msgid "Deposit"
@@ -42,17 +44,14 @@ msgctxt "selection:account.account.template,kind:"
msgid "Deposit"
msgstr ""
-msgctxt "view:account.invoice.recall_deposit.start:"
-msgid "Recall Deposit"
-msgstr ""
-
msgctxt "view:account.invoice:"
msgid "Recall Deposit"
msgstr ""
+#, fuzzy
msgctxt "wizard_button:account.invoice.recall_deposit,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "取消"
msgctxt "wizard_button:account.invoice.recall_deposit,start,recall:"
msgid "Recall"
diff --git a/setup.py b/setup.py
index d08c304..580d4be 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_deposit.rst b/tests/scenario_deposit.rst
index eea348e..6ad8070 100644
--- a/tests/scenario_deposit.rst
+++ b/tests/scenario_deposit.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import 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, \
@@ -18,19 +19,9 @@ Imports::
... add_deposit_accounts
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install account_deposit::
- >>> Module = Model.get('ir.module')
- >>> deposit_module, = Module.find([
- ... ('name', '=', 'account_deposit'),
- ... ])
- >>> deposit_module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('account_deposit')
Create company::
diff --git a/tests/test_account_deposit.py b/tests/test_account_deposit.py
index 2ee4446..761ef0d 100644
--- a/tests/test_account_deposit.py
+++ b/tests/test_account_deposit.py
@@ -4,7 +4,7 @@ import unittest
import doctest
from trytond.tests.test_tryton import suite as test_suite
from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_teardown
from trytond.tests.test_tryton import doctest_checker
@@ -18,7 +18,7 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountDepositTestCase))
suite.addTests(doctest.DocFileSuite('scenario_deposit.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 8eaf5e2..01e9a6c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
account
account_invoice
diff --git a/trytond_account_deposit.egg-info/PKG-INFO b/trytond_account_deposit.egg-info/PKG-INFO
index 7d0b474..1e36e6f 100644
--- a/trytond_account_deposit.egg-info/PKG-INFO
+++ b/trytond_account_deposit.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-deposit
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for accounting deposit
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_deposit
=======================
@@ -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_deposit.egg-info/SOURCES.txt b/trytond_account_deposit.egg-info/SOURCES.txt
index ecb1690..312ce2f 100644
--- a/trytond_account_deposit.egg-info/SOURCES.txt
+++ b/trytond_account_deposit.egg-info/SOURCES.txt
@@ -36,25 +36,23 @@ tryton.cfg
./party.py
./party.xml
./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_deposit.rst
@@ -65,25 +63,23 @@ tryton.cfg
./view/party_tree.xml
./view/recall_deposit_form.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_deposit.rst
trytond_account_deposit.egg-info/PKG-INFO
diff --git a/trytond_account_deposit.egg-info/requires.txt b/trytond_account_deposit.egg-info/requires.txt
index 0273685..8989582 100644
--- a/trytond_account_deposit.egg-info/requires.txt
+++ b/trytond_account_deposit.egg-info/requires.txt
@@ -1,7 +1,7 @@
python-dateutil
python-sql >= 0.4
-trytond_account >= 4.0, < 4.1
-trytond_account_invoice >= 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_invoice >= 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/recall_deposit_form.xml b/view/recall_deposit_form.xml
index 0401121..47e2116 100644
--- a/view/recall_deposit_form.xml
+++ b/view/recall_deposit_form.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
-<form string="Recall Deposit">
+<form>
<label name="account"/>
<field name="account"/>
<separator name="description" colspan="4"/>
--
tryton-modules-account-deposit
More information about the tryton-debian-vcs
mailing list