[tryton-debian-vcs] tryton-modules-account-statement branch debian created. 5a46b8dca5784a6053fc7a4ee6ce1e330f6b9387
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:56:57 UTC 2013
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-statement.git;a=commitdiff;h=5a46b8dca5784a6053fc7a4ee6ce1e330f6b9387
commit 5a46b8dca5784a6053fc7a4ee6ce1e330f6b9387
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:04 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 78f9c10..f54a664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:53:21 +0100
+
tryton-modules-account-statement (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit cc8973406be985b0f082e5f699f80c2362bb5ef8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index c36e6e8..5abe336 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 1b2ed0a145b6f9bfb259685409cecc2c2f771d46
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:20 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 797cf3f..c36e6e8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-account-statement.git
commit c7867617716c079967eca8a008ec9c9ad3c7ab03
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:26 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 593c3b0..7c2419c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
-Version 2.8.1 - 2013-10-01
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
+* Allow to use invoice to fill party and account on statement line
+* Replace move_lines by a relate
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 64425c7..26083d2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_statement
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_statement
=========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 14f0511..89f7e17 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -68,10 +68,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Транзакции"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Редове на движение"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Име"
@@ -204,6 +200,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ред от отчет за сметка"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr ""
+
#, fuzzy
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
@@ -296,6 +296,11 @@ msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Отказ"
+#, fuzzy
+msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Проект"
+
msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Друга информация"
@@ -305,10 +310,6 @@ msgid "Post"
msgstr "Публикуван"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Изпращане в проект"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Отчет"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 450c482..883a1b8 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -70,10 +70,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transaccions"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Apunts"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -206,6 +202,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línia d'extracte bancari"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Apunts"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Tots els extractes"
@@ -294,6 +294,10 @@ msgid "Cancel"
msgstr "Cancel·la"
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Esborrany"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Informació addicional"
@@ -302,10 +306,6 @@ msgid "Post"
msgstr "Confirma"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Restaura a esborrany"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Extracte"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 28be8a5..ca6fb04 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -68,10 +68,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr ""
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr ""
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr ""
@@ -204,6 +200,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr ""
@@ -292,15 +292,15 @@ msgid "Cancel"
msgstr ""
msgctxt "view:account.statement:"
-msgid "Other Info"
+msgid "Draft"
msgstr ""
msgctxt "view:account.statement:"
-msgid "Post"
+msgid "Other Info"
msgstr ""
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
+msgid "Post"
msgstr ""
msgctxt "view:account.statement:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index afdc0e0..9f71231 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -72,10 +72,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transaktionen"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Buchungszeilen"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Name"
@@ -208,6 +204,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Zahlungsverkehr Position"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Buchungsposten"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Zahlungsverkehr"
@@ -296,6 +296,10 @@ msgid "Cancel"
msgstr "Annullieren"
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Entwurf"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Sonstiges"
@@ -304,10 +308,6 @@ msgid "Post"
msgstr "Festschreiben"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Auf Entwurf zurücksetzen"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Kontoauszug"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 99c2105..3d79ce0 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -21,7 +21,7 @@ msgstr "El importe debería ser un valor positivo o negativo."
msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
-"Proporcione una cuenta de haber y de debe en el diario de extracto «%s»."
+"Proporcione una cuenta de crédito y de débito en el diario de extracto «%s»."
msgctxt "error:account.statement:"
msgid "End Balance must be \"%s\"."
@@ -49,7 +49,7 @@ msgstr "Usuario creación"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -71,10 +71,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacciones"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Líneas de asientos"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -109,7 +105,7 @@ msgstr "Usuario creación"
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:account.statement.journal,id:"
msgid "ID"
@@ -207,6 +203,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de extracto bancario"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Líneas de asiento"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Todos los extractos"
@@ -295,6 +295,10 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información adicional"
@@ -303,10 +307,6 @@ msgid "Post"
msgstr "Confirmar"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Extracto"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 63163b8..bb25cb4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -72,10 +72,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacciones"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Líneas de Asiento"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -208,6 +204,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de Estado de Cuenta"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Líneas de Asiento"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Estados de Cuenta"
@@ -296,6 +296,10 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Info Adicional"
@@ -304,10 +308,6 @@ msgid "Post"
msgstr "Confirmar"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Revertir a Borrador"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Estado de Cuenta"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ee035eb..a1ee8d4 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -29,7 +29,7 @@ msgstr "El saldo final debe ser \"%s\"."
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar el extracto \"%s\" antes de borrar."
+msgstr "Debe cancelar el extracto \"%s\" antes de borrarlo."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -71,10 +71,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacciones"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Apuntes"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -207,6 +203,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de extracto bancario"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Apuntes"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Todos los extractos"
@@ -295,6 +295,10 @@ msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información adicional"
@@ -303,10 +307,6 @@ msgid "Post"
msgstr "Confirmar"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Restaurar a borrador"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Extracto"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 03b7936..7f38537 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -74,10 +74,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transactions"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Lignes de mouvement comptable"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -210,6 +206,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ligne de relevé comptable"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Lignes de mouvement"
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr "Relevés"
@@ -262,22 +262,10 @@ msgid "Canceled"
msgstr "Annulé"
msgctxt "selection:account.statement,state:"
-msgid "Canceled"
-msgstr "Annulé"
-
-msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Brouillon"
msgctxt "selection:account.statement,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "selection:account.statement,state:"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Posté"
@@ -285,14 +273,6 @@ msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Validé"
-msgctxt "selection:account.statement,state:"
-msgid "Validated"
-msgstr "Validé"
-
-msgctxt "view:account.statement.journal:"
-msgid "Statement Journal"
-msgstr "Journal de relevés"
-
msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Journal de relevés"
@@ -301,10 +281,6 @@ msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Journaux de relevés"
-msgctxt "view:account.statement.journal:"
-msgid "Statement Journals"
-msgstr "Journaux de relevés"
-
msgctxt "view:account.statement.line:"
msgid "Amount"
msgstr "Montant"
@@ -314,14 +290,6 @@ msgid "Statement Line"
msgstr "Ligne de relevé"
msgctxt "view:account.statement.line:"
-msgid "Statement Line"
-msgstr "Ligne de relevé"
-
-msgctxt "view:account.statement.line:"
-msgid "Statement Lines"
-msgstr "Lignes de relevé"
-
-msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Lignes de relevé"
@@ -330,12 +298,8 @@ msgid "Cancel"
msgstr "Annuler"
msgctxt "view:account.statement:"
-msgid "Cancel"
-msgstr "Annuler"
-
-msgctxt "view:account.statement:"
-msgid "Other Info"
-msgstr "Autre information"
+msgid "Draft"
+msgstr "Brouillon"
msgctxt "view:account.statement:"
msgid "Other Info"
@@ -346,22 +310,6 @@ msgid "Post"
msgstr "Poster"
msgctxt "view:account.statement:"
-msgid "Post"
-msgstr "Poster"
-
-msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Remetter en brouillon"
-
-msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Remetter en brouillon"
-
-msgctxt "view:account.statement:"
-msgid "Statement"
-msgstr "Relevé"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Relevé"
@@ -370,21 +318,9 @@ msgid "Statement Lines"
msgstr "Lignes de relevé"
msgctxt "view:account.statement:"
-msgid "Statement Lines"
-msgstr "Lignes de relevé"
-
-msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Relevés"
msgctxt "view:account.statement:"
-msgid "Statements"
-msgstr "Relevés"
-
-msgctxt "view:account.statement:"
-msgid "Validate"
-msgstr "Valider"
-
-msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Valider"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index f630559..b47120d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -70,10 +70,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacties"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Boekingsregels"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Naam"
@@ -206,6 +202,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Rekeningafschriftregel"
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr ""
+
#, fuzzy
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
@@ -301,6 +301,11 @@ msgstr "Annuleren"
#, fuzzy
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Concept"
+
+#, fuzzy
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Aanvullende informatie"
@@ -309,10 +314,6 @@ msgid "Post"
msgstr "Boeken"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
-
-msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Bankafschrift"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 21c86f9..a637262 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -77,10 +77,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr ""
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr ""
-
#, fuzzy
msgctxt "field:account.statement,rec_name:"
msgid "Name"
@@ -241,6 +237,10 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
msgstr ""
@@ -340,6 +340,11 @@ msgstr "Отменить"
#, fuzzy
msgctxt "view:account.statement:"
+msgid "Draft"
+msgstr "Черновик"
+
+#, fuzzy
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Другая информация"
@@ -348,11 +353,6 @@ msgctxt "view:account.statement:"
msgid "Post"
msgstr "Проводка"
-#, fuzzy
-msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Сброс в черновики"
-
msgctxt "view:account.statement:"
msgid "Statement"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/sl_SI.po
similarity index 75%
copy from locale/nl_NL.po
copy to locale/sl_SI.po
index f630559..7e198fb 100644
--- a/locale/nl_NL.po
+++ b/locale/sl_SI.po
@@ -7,48 +7,49 @@ msgid ""
"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
"one configured as credit or debit on journal \"%(journal)s\"."
msgstr ""
+"Konto \"%(account)s\" v postavki izpiska \"%(line)s\" je enak kontu, ki je "
+"nastavljen v dnevniku \"%(journal)s\" kot kredit ali debet."
msgctxt "error:account.statement.line:"
msgid "Amount \"%s\" is greater than the amount to pay of invoice."
-msgstr ""
+msgstr "Znesek \"%s\" je večji od zneska za plačat na računu."
msgctxt "error:account.statement.line:"
msgid "Amount should be a positive or negative value."
-msgstr ""
+msgstr "Znesek mora biti pozitivna ali negativna vrednost."
msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
+"Prosimo, da nastavite debetni in kreditni konto v dnevniku izpiskov \"%s\"."
msgctxt "error:account.statement:"
msgid "End Balance must be \"%s\"."
-msgstr ""
+msgstr "Končni saldo mora biti \"%s\"."
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion."
-msgstr ""
+msgstr "Izpisek \"%s\" mora biti pred izbrisom preklican."
-#, fuzzy
msgctxt "field:account.statement,balance:"
msgid "Balance"
-msgstr "Balans"
+msgstr "Bilanca"
-#, fuzzy
msgctxt "field:account.statement,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.statement,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.statement,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -56,55 +57,51 @@ msgstr "Datum"
msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
-msgstr "Eindbalans"
+msgstr "Končni saldo"
msgctxt "field:account.statement,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.statement,lines:"
msgid "Transactions"
-msgstr "Transacties"
-
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Boekingsregels"
+msgstr "Transakcije"
msgctxt "field:account.statement,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr "Begin bedrag"
+msgstr "Začetni saldo"
msgctxt "field:account.statement,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.statement,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.statement,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.statement.journal,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.statement.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.statement.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
@@ -112,43 +109,43 @@ msgstr "Valuta"
msgctxt "field:account.statement.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.statement.journal,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.statement.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.statement.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.statement.line,account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "field:account.statement.line,amount:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "field:account.statement.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.statement.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.statement.line,date:"
msgid "Date"
@@ -156,174 +153,171 @@ msgstr "Datum"
msgctxt "field:account.statement.line,description:"
msgid "Description"
-msgstr "Specificatie"
+msgstr "Opis"
msgctxt "field:account.statement.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "Račun"
msgctxt "field:account.statement.line,move:"
msgid "Account Move"
-msgstr "Boeking"
+msgstr "Knjižba"
msgctxt "field:account.statement.line,party:"
msgid "Party"
-msgstr "Relatie"
+msgstr "Stranka"
msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.statement.line,statement:"
msgid "Statement"
-msgstr "Bankafschrift"
+msgstr "Izpisek"
msgctxt "field:account.statement.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.statement.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
-msgstr "Bankafschrift"
+msgstr "Izpisek"
msgctxt "model:account.statement,name:"
msgid "Account Statement"
-msgstr "Rekeningafschrift"
+msgstr "Izpisek"
msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
-msgstr "Dagboek bankafschriften"
+msgstr "Dnevnik izpiskov"
msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
-msgstr "Rekeningafschriftregel"
+msgstr "Postavka izpiska"
+
+msgctxt "model:ir.action,name:act_move_lines_form"
+msgid "Move Lines"
+msgstr "Postavke prometa"
-#, fuzzy
msgctxt "model:ir.action,name:act_statement_form"
msgid "Statements"
-msgstr "Alle bankafschriften"
+msgstr "Izpiski"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
-msgstr "Dagboeken bankafschriften"
+msgstr "Dnevniki izpiskov"
msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
msgid "All"
-msgstr ""
+msgstr "Vse"
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutki"
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
msgid "Posted"
-msgstr "Geboekt"
+msgstr "Knjiženo"
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
msgid "Validated"
-msgstr "Goedgekeurd"
+msgstr "Odobreno"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
-msgstr "Bankafschriften"
+msgstr "Izpiski"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_statement_form"
msgid "Statements"
-msgstr "Alle bankafschriften"
+msgstr "Izpiski"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
msgid "Statement Journals"
-msgstr "Dagboeken bankafschriften"
+msgstr "Dnevniki izpiskov"
msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
-msgstr "Bankafschriften"
+msgstr "Izpiski"
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
-msgstr "Bankafschrift"
+msgstr "Izpisek"
msgctxt "selection:account.statement,state:"
msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "Preklicano"
msgctxt "selection:account.statement,state:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "selection:account.statement,state:"
msgid "Posted"
-msgstr "Geboekt"
+msgstr "Knjiženo"
msgctxt "selection:account.statement,state:"
msgid "Validated"
-msgstr "Goedgekeurd"
+msgstr "Odobreno"
msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
-msgstr "Dagboek bankafschriften"
+msgstr "Dnevnik izpiskov"
msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
-msgstr "Dagboeken bankafschriften"
+msgstr "Dnevniki izpiskov"
-#, fuzzy
msgctxt "view:account.statement.line:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "view:account.statement.line:"
msgid "Statement Line"
-msgstr "Bankafschriftregel"
+msgstr "Postavka izpiska"
msgctxt "view:account.statement.line:"
msgid "Statement Lines"
-msgstr "Bankafschriftregels"
+msgstr "Postavke izpiska"
msgctxt "view:account.statement:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Preklic"
-#, fuzzy
msgctxt "view:account.statement:"
-msgid "Other Info"
-msgstr "Aanvullende informatie"
+msgid "Draft"
+msgstr "Osnutek"
msgctxt "view:account.statement:"
-msgid "Post"
-msgstr "Boeken"
+msgid "Other Info"
+msgstr "Drugo"
msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Terug naar concept"
+msgid "Post"
+msgstr "Knjižba"
msgctxt "view:account.statement:"
msgid "Statement"
-msgstr "Bankafschrift"
+msgstr "Izpisek"
msgctxt "view:account.statement:"
msgid "Statement Lines"
-msgstr "Bankafschriftregels"
+msgstr "Postavke izpiska"
msgctxt "view:account.statement:"
msgid "Statements"
-msgstr "Bankafschriften"
+msgstr "Izpiski"
msgctxt "view:account.statement:"
msgid "Validate"
-msgstr "Goedkeuren"
+msgstr "Odobritev"
diff --git a/setup.py b/setup.py
index caf848d..635b8fd 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ setup(name='trytond_account_statement',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/statement.py b/statement.py
index 5e1383a..15f2e1d 100644
--- a/statement.py
+++ b/statement.py
@@ -2,9 +2,9 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
from trytond.model import Workflow, ModelView, ModelSQL, fields
-from trytond.pyson import Eval, If
+from trytond.pyson import Eval, If, Bool
from trytond.transaction import Transaction
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pool import Pool
__all__ = ['Statement', 'Line']
@@ -19,13 +19,13 @@ class Statement(Workflow, ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=True, states=_STATES, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
],
depends=_DEPENDS)
journal = fields.Many2One('account.statement.journal', 'Journal',
required=True,
domain=[
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'readonly': (Eval('state') != 'draft') | Eval('lines'),
@@ -59,8 +59,6 @@ class Statement(Workflow, ModelSQL, ModelView):
('cancel', 'Canceled'),
('posted', 'Posted'),
], 'State', readonly=True, select=True)
- move_lines = fields.Function(fields.One2Many('account.move.line',
- None, 'Move Lines'), 'get_move_lines')
@classmethod
def __setup__(cls):
@@ -73,6 +71,7 @@ class Statement(Workflow, ModelSQL, ModelView):
})
cls._transitions |= set((
('draft', 'validated'),
+ ('draft', 'cancel'),
('validated', 'posted'),
('validated', 'cancel'),
('cancel', 'draft'),
@@ -88,12 +87,13 @@ class Statement(Workflow, ModelSQL, ModelView):
'invisible': Eval('state') != 'validated',
},
'cancel': {
- 'invisible': Eval('state') != 'validated',
+ 'invisible': ~Eval('state').in_(['draft', 'validated']),
},
})
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
# Migration from 1.8: new field company
@@ -188,18 +188,6 @@ class Statement(Workflow, ModelSQL, ModelView):
return [('id', 'in', [s.id for s in statements])]
return [('journal',) + tuple(clause[1:])]
- def get_move_lines(self, name):
- '''
- Return the move lines that have been generated by the statement.
- '''
- move_lines = []
- for line in self.lines:
- if not line.move:
- continue
- for move_line in line.move.lines:
- move_lines.append(move_line.id)
- return move_lines
-
def get_end_balance(self, name):
end_balance = self.start_balance
for line in self.lines:
@@ -225,27 +213,27 @@ class Statement(Workflow, ModelSQL, ModelView):
invoice_id2amount_to_pay = {}
for invoice in invoices:
with Transaction().set_context(date=invoice.currency_date):
- invoice_id2amount_to_pay[invoice.id] = (
+ if invoice.type in ('out_invoice', 'in_credit_note'):
+ sign = -1
+ else:
+ sign = 1
+ invoice_id2amount_to_pay[invoice.id] = sign * (
Currency.compute(invoice.currency,
invoice.amount_to_pay, self.journal.currency))
for line in self.lines or []:
if line.invoice and line.id:
amount_to_pay = invoice_id2amount_to_pay[line.invoice.id]
- if abs(line.amount) > amount_to_pay:
- res['lines'].setdefault('update', [])
- if self.journal.currency.is_zero(amount_to_pay):
- res['lines']['update'].append({
+ res['lines'].setdefault('update', [])
+ if (not self.journal.currency.is_zero(amount_to_pay)
+ and (line.amount >= 0) == (amount_to_pay <= 0)):
+ res['lines']['update'].append({
'id': line.id,
- 'invoice': None,
- })
- else:
- res['lines']['update'].append({
- 'id': line.id,
- 'amount': (amount_to_pay
- if line.amount >= 0
- else -amount_to_pay),
+ 'amount': (amount_to_pay.copy_sign(line.amount)
+ if abs(line.amount) > abs(amount_to_pay)
+ else line.amount)
})
+ if abs(line.amount) > abs(amount_to_pay):
res['lines'].setdefault('add', [])
vals = {}
for field_name, field in Line._fields.iteritems():
@@ -261,15 +249,19 @@ class Statement(Workflow, ModelSQL, ModelView):
else:
vals[field_name] = value
del vals['id']
- vals['amount'] = (abs(line.amount)
- - amount_to_pay)
- if line.amount < 0:
- vals['amount'] = - vals['amount']
+ vals['amount'] = line.amount + amount_to_pay
vals['invoice'] = None
del vals['invoice.rec_name']
res['lines']['add'].append(vals)
- invoice_id2amount_to_pay[line.invoice.id] = \
- amount_to_pay - abs(line.amount)
+ invoice_id2amount_to_pay[line.invoice.id] = 0
+ else:
+ invoice_id2amount_to_pay[line.invoice.id] = (
+ line.amount + amount_to_pay)
+ else:
+ res['lines']['update'].append({
+ 'id': line.id,
+ 'invoice': None,
+ })
return res
@classmethod
@@ -349,17 +341,15 @@ class Line(ModelSQL, ModelView):
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
+ on_change=['party', 'account', 'invoice'],
domain=[
- ('party', '=', Eval('party')),
- ('account', '=', Eval('account')),
+ If(Bool(Eval('party')), [('party', '=', Eval('party'))], []),
+ If(Bool(Eval('party')), [('account', '=', Eval('account'))], []),
If(Eval('_parent_statement', {}).get('state') == 'draft',
('state', '=', 'posted'),
('state', '!=', '')),
],
- states={
- 'readonly': (~Eval('amount') | ~Eval('party') | ~Eval('account')),
- },
- depends=['party', 'account', 'amount'])
+ depends=['party', 'account'])
@classmethod
def __setup__(cls):
@@ -442,6 +432,17 @@ class Line(ModelSQL, ModelView):
res['invoice'] = None
return res
+ def on_change_invoice(self):
+ changes = {}
+ if self.invoice:
+ if not self.party:
+ changes['party'] = self.invoice.party.id
+ changes['party.rec_name'] = self.invoice.party.rec_name
+ if not self.account:
+ changes['account'] = self.invoice.account.id
+ changes['account.rec_name'] = self.invoice.account.rec_name
+ return changes
+
def get_rec_name(self, name):
return self.statement.rec_name
@@ -490,7 +491,7 @@ class Line(ModelSQL, ModelView):
amount_to_pay = Currency.compute(self.invoice.currency,
self.invoice.amount_to_pay,
self.statement.journal.currency)
- if amount_to_pay < abs(self.amount):
+ if abs(amount_to_pay) < abs(self.amount):
lang, = Lang.search([
('code', '=', Transaction().language),
])
@@ -506,7 +507,7 @@ class Line(ModelSQL, ModelView):
self.amount, self.statement.company.currency)
reconcile_lines = self.invoice.get_reconcile_lines_for_amount(
- abs(amount))
+ amount)
for move_line in move.lines:
if move_line.account == self.invoice.account:
diff --git a/statement.xml b/statement.xml
index b2de6e2..76b7688 100644
--- a/statement.xml
+++ b/statement.xml
@@ -197,5 +197,16 @@ this repository contains the full copyright notices and license terms. -->
<field name="group" ref="account.group_account_admin"/>
</record>
+ <record model="ir.action.act_window" id="act_move_lines_form">
+ <field name="name">Move Lines</field>
+ <field name="res_model">account.move.line</field>
+ <field name="domain">[('origin.statement.id', '=', Eval('id'), 'account.statement.line')]</field>
+ </record>
+ <record model="ir.action.keyword" id="act_move_lines_form_keyword1">
+ <field name="keyword">form_relate</field>
+ <field name="model">account.statement,-1</field>
+ <field name="action" ref="act_move_lines_form"/>
+ </record>
+
</data>
</tryton>
diff --git a/tests/__init__.py b/tests/__init__.py
index 3bbf724..fec38bf 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_account_statement import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_account_statement.rst b/tests/scenario_account_statement.rst
index e272685..e9dd5cd 100644
--- a/tests/scenario_account_statement.rst
+++ b/tests/scenario_account_statement.rst
@@ -89,7 +89,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
>>> AccountJournal = Model.get('account.journal')
- >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
>>> create_chart = Wizard('account.create_chart')
>>> create_chart.execute('account')
>>> create_chart.form.account_template = account_template
@@ -303,3 +303,62 @@ Test invoice state::
>>> supplier_invoice.reload()
>>> supplier_invoice.state
u'paid'
+
+Let's test the negative amount version of the supplier/customer invoices::
+
+ >>> customer_invoice3 = Invoice(type='out_invoice')
+ >>> customer_invoice3.party = customer
+ >>> customer_invoice3.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> customer_invoice3.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('-120')
+ >>> invoice_line.account = revenue
+ >>> invoice_line.description = 'Test'
+ >>> customer_invoice3.save()
+ >>> Invoice.post([customer_invoice3.id], config.context)
+ >>> customer_invoice3.state
+ u'posted'
+
+ >>> supplier_invoice2 = Invoice(type='in_invoice')
+ >>> supplier_invoice2.party = supplier
+ >>> supplier_invoice2.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> supplier_invoice2.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('-40')
+ >>> invoice_line.account = expense
+ >>> invoice_line.description = 'Test'
+ >>> supplier_invoice2.invoice_date = today
+ >>> supplier_invoice2.save()
+ >>> Invoice.post([supplier_invoice2.id], config.context)
+ >>> supplier_invoice2.state
+ u'posted'
+
+ >>> statement = Statement(journal=statement_journal,
+ ... end_balance=Decimal('0'),
+ ... )
+
+ >>> statement_line = StatementLine()
+ >>> statement.lines.append(statement_line)
+ >>> statement_line.date = today
+ >>> statement_line.party = customer
+ >>> statement_line.account = receivable
+ >>> statement_line.amount = Decimal(-120)
+ >>> statement_line.invoice = customer_invoice3
+ >>> statement_line.invoice.id == customer_invoice3.id
+ True
+
+ >>> statement_line = StatementLine()
+ >>> statement.lines.append(statement_line)
+ >>> statement_line.date = today
+ >>> statement_line.party = supplier
+ >>> statement_line.account = payable
+ >>> statement_line.amount = Decimal(50)
+ >>> statement_line.invoice = supplier_invoice2
+ >>> statement_line.amount == Decimal(40)
+ True
+ >>> len(statement.lines)
+ 3
+ >>> statement.lines[-1].amount == Decimal(10)
+ True
diff --git a/tryton.cfg b/tryton.cfg
index 2d96936..93e3864 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
account
account_invoice
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 3d1c83b..956107c 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-statement
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account_statement
=========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index b1b8335..c415379 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
tests/scenario_account_statement.rst
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 3bcde87..90e3032 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 2.8, < 2.9
-trytond_account_invoice >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_account >= 3.0, < 3.1
+trytond_account_invoice >= 3.0, < 3.1
+trytond_company >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/statement_form.xml b/view/statement_form.xml
index 2d0ff2d..9f2aadb 100644
--- a/view/statement_form.xml
+++ b/view/statement_form.xml
@@ -20,18 +20,17 @@ this repository contains the full copyright notices and license terms. -->
<label name="state"/>
<field name="state"/>
<group col="4" colspan="2" id="buttons">
- <button string="Validate" name="validate_statement"/>
- <button string="Cancel" name="cancel"/>
- <button string="Post" name="post"/>
- <button string="Reset to Draft"
- name="draft"/>
+ <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+ <button string="Draft" name="draft" icon="tryton-clear"/>
+ <button string="Validate" name="validate_statement"
+ icon="tryton-go-next"/>
+ <button string="Post" name="post" icon="tryton-ok"/>
</group>
</group>
</page>
<page string="Other Info" id="info">
<label name="company"/>
<field name="company"/>
- <field name="move_lines" colspan="4"/>
</page>
</notebook>
<field name="currency_digits" colspan="4" invisible="1"/>
diff --git a/view/statement_line_tree_editable.xml b/view/statement_line_tree_editable.xml
index b466b20..5aac57e 100644
--- a/view/statement_line_tree_editable.xml
+++ b/view/statement_line_tree_editable.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="date"/>
<field name="amount" sum="Amount"/>
<field name="party"/>
- <field name="account"/>
<field name="invoice"/>
+ <field name="account"/>
<field name="description"/>
</tree>
commit 8b942d9cebf22acc3d80fe228b3a22e62d974f44
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 21:59:18 2013 +0200
Releasing debian version 2.8.1-1.
diff --git a/debian/changelog b/debian/changelog
index b67411f..78f9c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (2.8.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 13 Oct 2013 20:05:33 +0200
+
tryton-modules-account-statement (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 4de35c28383a9f7d307d84517bf89e7c971e0aaa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 20:01:53 2013 +0200
Merging upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 84cd58c..593c3b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 228a0b8..64425c7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_statement
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/statement.py b/statement.py
index 8c0ed32..5e1383a 100644
--- a/statement.py
+++ b/statement.py
@@ -568,8 +568,8 @@ class Line(ModelSQL, ModelView):
if self.account == account:
self.raise_user_error('same_debit_credit_account', {
'account': self.account.rec_name,
- 'line': self.account,
- 'journal': self.journal,
+ 'line': self.rec_name,
+ 'journal': journal,
})
move_lines.append(MoveLine(
description=self.description,
diff --git a/tryton.cfg b/tryton.cfg
index b326056..2d96936 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
account
account_invoice
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index d5a60be..3d1c83b 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-statement
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
commit 63ae0b2de666610a7f7f5bd317d024759c058515
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:42 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index 9eee781..b67411f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:32:17 +0200
+
tryton-modules-account-statement (2.8.0-2) unstable; urgency=low
* Removing needless empty line in rules.
commit 5e3efb35780fd43a65fddbf424ca4138ff0971e7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit a2194e3fd19cc5bcb47cd1a1da4ef9b4571abae8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:24 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index b18835b..9eee781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (2.8.0-2) unstable; urgency=low
+
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:06 +0200
+
tryton-modules-account-statement (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit 2e506c0e8398de0b7d04015e896a45a28a2e5580
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit c2da9479ba55381a74d0bc6fd2a18861f446b76f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:01 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index d063ea0..b18835b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-statement (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:19:36 +0200
+
tryton-modules-account-statement (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704368).
commit 4dcb0386d576013cb79aaae8fcf09e53d260d617
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 5613fab..5f40e66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2012 Cédric Krier
- 2008-2012 Bertrand Chenal
- 2008-2012 B2CK SPRL
+Copyright: 2008-2013 Cédric Krier
+ 2008-2013 Bertrand Chenal
+ 2008-2013 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 6d2e02e940ec166c201be2bdabfd45b16a89b1ab
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:04 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0f1f3b7..84cd58c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
* Allow to use credit note on statement line
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..5d422e0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 Bertrand Chenal.
+Copyright (C) 2008-2013 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/MANIFEST.in b/MANIFEST.in
index d57a2cc..2f9d677 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 8b91883..228a0b8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_account_statement
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_statement
=========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/journal.xml b/journal.xml
index ea913dc..ad9a92b 100644
--- a/journal.xml
+++ b/journal.xml
@@ -6,34 +6,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="statement_journal_view_form">
<field name="model">account.statement.journal</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Statement Journal">
- <label name="name"/>
- <field name="name"/>
- <label name="journal"/>
- <field name="journal"/>
- <label name="currency"/>
- <field name="currency"/>
- <label name="company"/>
- <field name="company"/>
- </form>
- ]]>
- </field>
+ <field name="name">statement_journal_form</field>
</record>
<record model="ir.ui.view" id="statement_journal_view_tree">
<field name="model">account.statement.journal</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Statement Journals">
- <field name="name"/>
- <field name="journal"/>
- <field name="currency"/>
- <field name="company"/>
- </tree>
- ]]>
- </field>
+ <field name="name">statement_journal_tree</field>
</record>
<record model="account.journal.type" id="journal_type_statement">
<field name="name">Statement</field>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 67ac756..14f0511 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,32 +3,30 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "Сумата (%s) е по-голяма от сумата за плащане по фактурата!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "Сумата трябва да бъде положителна или отрицателна стойност!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr ""
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+msgid "Amount should be a positive or negative value."
msgstr ""
-"Кредитната/дебитната сметка на дневника е същата сметката като на ред от "
-"отчета!"
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
-msgstr "Моля укажете дебитна и кредитна сметка за дневника за отчети."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
+msgstr ""
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "Крайния баланс трябва да е %s!"
+msgid "End Balance must be \"%s\"."
+msgstr ""
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "Преди да бъде изтрит отчет \"%s\" трябва да бъде прекратен!"
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr ""
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -206,40 +204,44 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ред от отчет за сметка"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Проект на отчет"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Публикувани отчети"
-
+#, fuzzy
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Всички отчети"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Дневник за отчети"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Проверен отчет"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Проект на отчет"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Проект"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Публикувани отчети"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Публикуван"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Проверен"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Отчети"
+#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Всички отчети"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -250,10 +252,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Отчети"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Проверен отчет"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Отчет"
@@ -295,18 +293,10 @@ msgid "Statement Lines"
msgstr "Редове от отчет"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Сума"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Отказ"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Редове от движение"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Друга информация"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 1999447..450c482 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,32 +3,32 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "L'import (%s) és més gran que l'import a pagar de la factura."
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
+"El compte \"%(account)s\" a la línia d'extracte \"%(line)s\" és la mateixa "
+"que la configurada com a haver o deure al diari \"%(journal)s\"."
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "L'import ha de ser un valor positiu o negatiu."
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr "L'import \"%s\" és més gran que l'import a pagar de la factura."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
-msgstr ""
-"El compte deure o haver del diari és el mateix que el de la línia "
-"d'extracte."
+msgid "Amount should be a positive or negative value."
+msgstr "L'import hauria de ser un valor positiu o negatiu."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
-msgstr "Heu d'indicar els comptes deure i haver en un diari d'extracte."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
+msgstr "Proporcioneu un compte d'haver i de deure al diari d'extracte \"%s\"."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "El saldo final ha de ser %s."
+msgid "End Balance must be \"%s\"."
+msgstr "El saldo final ha de ser \"%s\"."
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "Heu de cancel·lar l'extracte \"%s\" abans d'eliminar-lo."
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "Heu de cancel·lar l'extracte \"%s\"abans de ser eliminat."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -48,7 +48,7 @@ msgstr "Usuari creació"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígits de la moneda"
+msgstr "Decimals de la moneda"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -206,40 +206,39 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línia d'extracte bancari"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractes esborrany"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractes confirmats"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Tots els extractes"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Diaris d'extracte"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractes validats"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Tot"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Esborrany"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractes esborrany"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Confirmat"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractes confirmats"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Validat"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Extractes"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Tots els extractes"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -250,10 +249,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Extractes"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractes validats"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Extracte"
@@ -308,7 +303,7 @@ msgstr "Confirma"
msgctxt "view:account.statement:"
msgid "Reset to Draft"
-msgstr "Restableix a esborrany"
+msgstr "Restaura a esborrany"
msgctxt "view:account.statement:"
msgid "Statement"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 0b3d256..28be8a5 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,29 +3,29 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+msgid "Amount should be a positive or negative value."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
+msgid "End Balance must be \"%s\"."
msgstr ""
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
+msgid "Statement \"%s\" must be cancelled before deletion."
msgstr ""
msgctxt "field:account.statement,balance:"
@@ -204,32 +204,31 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr ""
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr ""
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr ""
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
@@ -237,7 +236,7 @@ msgid "Statements"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -248,10 +247,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr ""
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr ""
@@ -293,10 +288,6 @@ msgid "Statement Lines"
msgstr ""
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr ""
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7803609..afdc0e0 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,33 +3,34 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
+"Konto \"%(account)s\" in Kontoauszugszeile \"%(line)s\" ist dasselbe wie das"
+" als Soll oder Haben eingetragene in Journal \"%(journal)s\"."
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "Betrag sollte ein positiver oder negativer Wert sein!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr "Betrag \"%s\" ist größer als der für die Rechnung zu zahlende Betrag."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
-msgstr ""
-"Haben- oder Sollkonto im Journal ist das selbe Konto wie das des "
-"Zahlungspostens!"
+msgid "Amount should be a positive or negative value."
+msgstr "Der Betrag sollte einen positiven oder negativen Wert aufweisen."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
-msgstr "Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
+msgstr ""
+"Bitte tragen Sie Soll- und Habenkonto für das Kontoauszugsjournal \"%s\" "
+"ein."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "Endsaldo muss %s sein!"
+msgid "End Balance must be \"%s\"."
+msgstr "Endsaldo muss \"%s\" sein."
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr ""
-"Kontoauszug \"%s\" muss annulliert werden, bevor sie gelöscht werden kann."
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "Kontoauszug \"%s\" muss annulliert werden, bevor er gelöscht werden kann."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -207,40 +208,39 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Zahlungsverkehr Position"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Entwürfe Kontoauszüge"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Festgeschriebene Kontoauszüge"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
-msgstr "Alle Kontoauszüge"
+msgid "Statements"
+msgstr "Zahlungsverkehr"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
-msgstr "Journale Kontoauszüge"
+msgstr "Journale Zahlungsverkehr"
+
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Alle"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Geprüfte Kontoauszüge"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Entwurf"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Entwürfe Kontoauszüge"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Festgeschrieben"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Festgeschriebene Kontoauszüge"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Geprüft"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Zahlungsverkehr"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Alle Kontoauszüge"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -251,10 +251,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Zahlungsverkehr"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Geprüfte Kontoauszüge"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Kontoauszug"
@@ -288,10 +284,6 @@ msgid "Amount"
msgstr "Betrag"
msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Posten Kontoauszug"
-
-msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Kontoauszug Position"
@@ -300,30 +292,10 @@ msgid "Statement Lines"
msgstr "Kontoauszug Positionen"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Betrag"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Kontoauszug"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Posten Kontoauszug"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Kontoauszüge"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annullieren"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Buchungszeilen"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Sonstiges"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 186a52d..99c2105 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,37 +3,37 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "¡El importe (%s) es mayor que el importe a pagar de la factura!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
+"La cuenta «%(account)s» en la línea de estracto «%(line)s» es la misma que "
+"la configurada como haber o debe en el diario «%(journal)s»."
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "¡El importe debe ser un valor positivo o negativo!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr "El importe «%s» es mayor que el importe a pagar de la factura."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
-msgstr ""
-"¡La cuenta débito o crédito en el diario es la misma que la de la línea de "
-"extracto!"
+msgid "Amount should be a positive or negative value."
+msgstr "El importe debería ser un valor positivo o negativo."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
-"Por favor indique las cuentas débito y crédito en un diario de extracto."
+"Proporcione una cuenta de haber y de debe en el diario de extracto «%s»."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "¡El balance final debe ser %s!"
+msgid "End Balance must be \"%s\"."
+msgstr "El saldo final debe ser «%s»."
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "¡Debe cancelar el extracto «%s» antes de eliminarlo!"
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el extracto «%s» antes de eliminar."
msgctxt "field:account.statement,balance:"
msgid "Balance"
-msgstr "Balance"
+msgstr "Saldo"
msgctxt "field:account.statement,company:"
msgid "Company"
@@ -49,7 +49,7 @@ msgstr "Usuario creación"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -57,7 +57,7 @@ msgstr "Fecha"
msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
-msgstr "Balance final"
+msgstr "Saldo final"
msgctxt "field:account.statement,id:"
msgid "ID"
@@ -81,7 +81,7 @@ msgstr "Nombre"
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr "Balance inicial"
+msgstr "Saldo inicial"
msgctxt "field:account.statement,state:"
msgid "State"
@@ -207,40 +207,39 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de extracto bancario"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractos borrador"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractos confirmados"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Todos los extractos"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Diarios de extracto"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractos validados"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractos borrador"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Confirmado"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractos confirmados"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Validado"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Todos los extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -251,10 +250,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Extractos"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractos validados"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Extracto"
@@ -288,10 +283,6 @@ msgid "Amount"
msgstr "Importe"
msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
-
-msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Línea de extracto bancario"
@@ -300,30 +291,10 @@ msgid "Statement Lines"
msgstr "Líneas de extracto bancario"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Extracto bancario"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Líneas de extracto bancario"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Líneas de asientos"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información adicional"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index e7b3137..63163b8 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,34 +3,34 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "¡El valor (%s) es mayor que lo que se debe pagar en la factura!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
+"Cuenta \"%(account)s\" en linea de declaración \"%(line)s\" es la misma que "
+"la configurada como crédito o débito en diario \"%(journal)s\"."
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "La cantidad debe ser un valor positivo o negativo!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr "Cantidad \"%s\" es mayor que la cantidad a pagar en la factura."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
-msgstr ""
-"¡Las cuentas crédito o débito en un diario son las mismas que las líneas de "
-"estado de cuenta!"
+msgid "Amount should be a positive or negative value."
+msgstr "La cantidad debe ser un valor positivo o negativo!"
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
"Por favor indique las cuentas débito y crédito en el libro de estado de "
-"cuentas."
+"cuentas \"%s\"."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
+msgid "End Balance must be \"%s\"."
msgstr "El Balance debe ser %s!"
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "El estado de cuenta \"%s\" debe ser cancelado antes de ser eliminado!"
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "El estado de cuenta \"%s\" debe ser cancelado antes de ser eliminado."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -46,7 +46,7 @@ msgstr "Fecha de Creación"
msgctxt "field:account.statement,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
@@ -66,7 +66,7 @@ msgstr "ID"
msgctxt "field:account.statement,journal:"
msgid "Journal"
-msgstr "Diario"
+msgstr "Libro Diario"
msgctxt "field:account.statement,lines:"
msgid "Transactions"
@@ -74,7 +74,7 @@ msgstr "Transacciones"
msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
-msgstr "Líneas de Movimiento"
+msgstr "Líneas de Asiento"
msgctxt "field:account.statement,rec_name:"
msgid "Name"
@@ -90,11 +90,11 @@ msgstr "Estado"
msgctxt "field:account.statement,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:account.statement,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:account.statement.journal,company:"
msgid "Company"
@@ -106,7 +106,7 @@ msgstr "Fecha de Creación"
msgctxt "field:account.statement.journal,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
@@ -118,7 +118,7 @@ msgstr "ID"
msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
-msgstr "Diario"
+msgstr "Libro Diario"
msgctxt "field:account.statement.journal,name:"
msgid "Name"
@@ -130,11 +130,11 @@ msgstr "Nombre"
msgctxt "field:account.statement.journal,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:account.statement.journal,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "field:account.statement.line,account:"
msgid "Account"
@@ -150,7 +150,7 @@ msgstr "Fecha de Creación"
msgctxt "field:account.statement.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:account.statement.line,date:"
msgid "Date"
@@ -170,7 +170,7 @@ msgstr "Factura"
msgctxt "field:account.statement.line,move:"
msgid "Account Move"
-msgstr "Movimiento de Cuenta"
+msgstr "Asiento Contable"
msgctxt "field:account.statement.line,party:"
msgid "Party"
@@ -186,11 +186,11 @@ msgstr "Estado de Cuenta"
msgctxt "field:account.statement.line,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de Modificación"
msgctxt "field:account.statement.line,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por Usuario"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
@@ -208,41 +208,40 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de Estado de Cuenta"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Borrador de Estados de Cuenta"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Estados de Cuenta Autorizados"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
-msgstr "Todos los Estados de Cuenta"
+msgid "Statements"
+msgstr "Estados de Cuenta"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Libros de Estados de Cuenta"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Estados de Cuenta Validados"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Todo"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Estados de Cuenta en Borrador"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Estados de Cuenta Autorizados"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Validado"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Estados de Cuenta"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
-msgstr "Todos los estados de cuenta"
+msgid "Statements"
+msgstr "Estados de Cuenta"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
msgid "Statement Journals"
@@ -252,10 +251,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Estados de Cuenta"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Estados de Cuenta Válidos"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Estado de Cuenta"
@@ -289,10 +284,6 @@ msgid "Amount"
msgstr "Cantidad"
msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
-
-msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Libros de Estados de Cuenta"
@@ -301,30 +292,10 @@ msgid "Statement Lines"
msgstr "Líneas de Estado de Cuenta"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Cantidad"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Extractos Bancarios"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Líneas de extracto bancario"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Extractos Bancarios"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Líneas de Movimiento"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Info Adicional"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index a13930c..ee035eb 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,32 +3,33 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "El importe (%s) es mayor que el importe a pagar de la factura."
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
+"La cuenta \"%(account)s\" en la línea de estracto \"%(line)s\" es la misma "
+"que la configurada como haber o debe en el diario \"%(journal)s\"."
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "El importe debe ser un valor positivo o negativo."
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
+msgstr "El importe \"%s\" es mayor que el importe a pagar de la factura."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
-msgstr ""
-"La cuenta debe o haber en el diario es la misma que la de la línea de "
-"extracto."
+msgid "Amount should be a positive or negative value."
+msgstr "El importe debería ser un valor positivo o negativo."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
-msgstr "Debe indicar las cuentas debe y haber en un diario de extracto."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
+msgstr ""
+"Proporcione una cuenta de haber y de debe en el diario de extracto \"%s\"."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "El saldo final debe ser %s."
+msgid "End Balance must be \"%s\"."
+msgstr "El saldo final debe ser \"%s\"."
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "Debe cancelar el extracto \"%s\" antes de eliminarlo."
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar el extracto \"%s\" antes de borrar."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -206,40 +207,39 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de extracto bancario"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractos borrador"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractos confirmados"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Todos los extractos"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Diarios de extracto"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractos validados"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Extractos borrador"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Confirmado"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Extractos confirmados"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Validado"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Todos los extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -250,10 +250,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Extractos"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Extractos validados"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Extracto"
@@ -287,10 +283,6 @@ msgid "Amount"
msgstr "Importe"
msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
-
-msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Línea de extracto bancario"
@@ -299,30 +291,10 @@ msgid "Statement Lines"
msgstr "Líneas de extracto bancario"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Importe"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Extracto bancario"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Líneas de extracto bancario"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Cancelar"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Apuntes"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información adicional"
@@ -332,7 +304,7 @@ msgstr "Confirmar"
msgctxt "view:account.statement:"
msgid "Reset to Draft"
-msgstr "Restablecer a borrador"
+msgstr "Restaurar a borrador"
msgctxt "view:account.statement:"
msgid "Statement"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 7aae4e2..03b7936 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,54 +3,36 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "Le montant (%s) est plus grand que le montant à payer de la facture !"
-
-msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "Le montant (%s) est plus grand que le montant à payer de la facture !"
-
-msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
-msgstr "Le montant doit être une valeur positive ou négative"
-
-msgctxt "error:account.statement.line:"
msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
msgstr ""
-"Le compte de crédit ou débit sur le journal est le même que celui de la "
-"ligne de relevé !"
+"Le compte \"%(account)s\" sur la ligne de relevé \"%(line)s\" que celui "
+"configuré comme crédit ou débit sur le journal \"%(journal)s\"."
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
msgstr ""
-"Le compte de crédit ou débit sur le journal est le même que celui de la "
-"ligne de relevé !"
+"Le montant \"%s\" est plus grand que le montant restant à payer de la "
+"facture."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
-msgstr ""
-"Veuillez fournir un compte de débit et de crédit pour le journal de relevés."
+msgid "Amount should be a positive or negative value."
+msgstr "Le montant doit être une valeur positive ou négative."
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
-"Veuillez fournir un compte de débit et de crédit pour le journal de relevés."
+"Veuillez remplir les comptes de débit et crédit sur le journal des relevés "
+"\"%s\"."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "Le solde final doit être %s !"
+msgid "End Balance must be \"%s\"."
+msgstr "La balance de fin doit valoir \"%s\""
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "Le solde final doit être %s !"
-
-msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "Le relevé \"%s\" doit être annulé avant suppression"
+msgid "Statement \"%s\" must be cancelled before deletion."
+msgstr "Le relevé \"%s\" doit être annulé avant suppression."
msgctxt "field:account.statement,balance:"
msgid "Balance"
@@ -228,41 +210,40 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ligne de relevé comptable"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Relevés brouillons"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Relevés postés"
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
-msgstr "Tous les relevés"
+msgid "Statements"
+msgstr "Relevés"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Journaux de relevés"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Relevés validés"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Tous"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Brouillon"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Relevés brouillons"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Posté"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Relevés postés"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Validé"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Relevés"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
-msgstr "Tous les relevés"
+msgid "Statements"
+msgstr "Relevés"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
msgid "Statement Journals"
@@ -272,10 +253,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Relevés"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Relevés validés"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Relevé"
@@ -349,10 +326,6 @@ msgid "Statement Lines"
msgstr "Lignes de relevé"
msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Montant"
-
-msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annuler"
@@ -361,10 +334,6 @@ msgid "Cancel"
msgstr "Annuler"
msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Lignes de mouvement comptable"
-
-msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Autre information"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 811eaf2..f630559 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,32 +3,29 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "Het bedrag (%s) is hoger dan het bedrag op de factuur!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
+msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+msgid "Amount should be a positive or negative value."
msgstr ""
-"Credit of debit rekening van het dagboek is dezelfde als van het "
-"bankafschrift!"
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
-"Geef een debit en een credit rekening op voor het dagboek bankafschriften."
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
-msgstr "Eindbalans moet %s zijn!"
+msgid "End Balance must be \"%s\"."
+msgstr ""
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
+msgid "Statement \"%s\" must be cancelled before deletion."
msgstr ""
#, fuzzy
@@ -209,40 +206,44 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Rekeningafschriftregel"
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Concept bankafschriften"
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Geboekte bankafschriften"
-
+#, fuzzy
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Alle bankafschriften"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr "Dagboeken bankafschriften"
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Goedgekeurde bankafschriften"
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr "Concept bankafschriften"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Concept"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Geboekt"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr "Geboekte bankafschriften"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Goedgekeurd"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr "Bankafschriften"
+#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr "Alle bankafschriften"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -253,10 +254,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr "Bankafschriften"
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr "Goedgekeurde bankafschriften"
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Bankafschrift"
@@ -298,19 +295,10 @@ msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Bankafschriftregels"
-#, fuzzy
-msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr "Bedrag"
-
msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Boekingen"
-
#, fuzzy
msgctxt "view:account.statement:"
msgid "Other Info"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 1404530..21c86f9 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,68 +3,75 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
-msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgid ""
+"Account \"%(account)s\" in statement line \"%(line)s\" is the same as the "
+"one configured as credit or debit on journal \"%(journal)s\"."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Amount should be a positive or negative value!"
+msgid "Amount \"%s\" is greater than the amount to pay of invoice."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid ""
-"Credit or debit account on journal is the same than the statement line "
-"account!"
+msgid "Amount should be a positive or negative value."
msgstr ""
msgctxt "error:account.statement.line:"
-msgid "Please provide debit and credit account on statement journal."
+msgid "Please provide debit and credit account on statement journal \"%s\"."
msgstr ""
msgctxt "error:account.statement:"
-msgid "End Balance must be %s!"
+msgid "End Balance must be \"%s\"."
msgstr ""
msgctxt "error:account.statement:"
-msgid "Statement \"%s\" must be cancelled before deletion!"
+msgid "Statement \"%s\" must be cancelled before deletion."
msgstr ""
+#, fuzzy
msgctxt "field:account.statement,balance:"
msgid "Balance"
-msgstr ""
+msgstr "Баланс"
#, fuzzy
msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Учет.орг."
+#, fuzzy
msgctxt "field:account.statement,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:account.statement,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
#, fuzzy
msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Дата"
+#, fuzzy
msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
-msgstr ""
+msgstr "Конец баланса"
+#, fuzzy
msgctxt "field:account.statement,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:account.statement,journal:"
msgid "Journal"
-msgstr ""
+msgstr "Журнал"
msgctxt "field:account.statement,lines:"
msgid "Transactions"
@@ -79,48 +86,55 @@ msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr ""
+msgstr "Начальный баланс"
#, fuzzy
msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Статус"
+#, fuzzy
msgctxt "field:account.statement,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:account.statement,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
#, fuzzy
msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Учет.орг."
+#, fuzzy
msgctxt "field:account.statement.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:account.statement.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
#, fuzzy
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Валюты"
+#, fuzzy
msgctxt "field:account.statement.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
-msgstr ""
+msgstr "Журнал"
#, fuzzy
msgctxt "field:account.statement.journal,name:"
@@ -132,29 +146,35 @@ msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:account.statement.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:account.statement.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
+#, fuzzy
msgctxt "field:account.statement.line,account:"
msgid "Account"
-msgstr ""
+msgstr "Счет"
+#, fuzzy
msgctxt "field:account.statement.line,amount:"
msgid "Amount"
-msgstr ""
+msgstr "Сумма"
+#, fuzzy
msgctxt "field:account.statement.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:account.statement.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
#, fuzzy
msgctxt "field:account.statement.line,date:"
@@ -166,17 +186,20 @@ msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Описание"
+#, fuzzy
msgctxt "field:account.statement.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
-msgstr ""
+msgstr "Инвойс"
+#, fuzzy
msgctxt "field:account.statement.line,move:"
msgid "Account Move"
-msgstr ""
+msgstr "Проводка"
#, fuzzy
msgctxt "field:account.statement.line,party:"
@@ -192,13 +215,15 @@ msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr ""
+#, fuzzy
msgctxt "field:account.statement.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:account.statement.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
@@ -216,40 +241,43 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
-msgctxt "model:ir.action,name:act_draft_statement_form"
-msgid "Draft Statements"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_posted_statement_form"
-msgid "Posted Statements"
-msgstr ""
-
msgctxt "model:ir.action,name:act_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr ""
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
msgstr ""
-msgctxt "model:ir.action,name:act_validated_statement_form"
-msgid "Validated Statement"
-msgstr ""
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_statement_form_domain_all"
+msgid "All"
+msgstr "Все"
-msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
-msgid "Draft Statements"
-msgstr ""
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_draft"
+msgid "Draft"
+msgstr "Черновик"
-msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
-msgid "Posted Statements"
-msgstr ""
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_posted"
+msgid "Posted"
+msgstr "Проведен"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_statement_form_domain_validated"
+msgid "Validated"
+msgstr "Утвержденный"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_statement_form"
-msgid "All Statement"
+msgid "Statements"
msgstr ""
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
@@ -260,10 +288,6 @@ msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
-msgid "Validated Statement"
-msgstr ""
-
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr ""
@@ -278,13 +302,15 @@ msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Черновик"
+#, fuzzy
msgctxt "selection:account.statement,state:"
msgid "Posted"
-msgstr ""
+msgstr "Проведен"
+#, fuzzy
msgctxt "selection:account.statement,state:"
msgid "Validated"
-msgstr ""
+msgstr "Утвержденный"
msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
@@ -294,9 +320,10 @@ msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr ""
+#, fuzzy
msgctxt "view:account.statement.line:"
msgid "Amount"
-msgstr ""
+msgstr "Сумма"
msgctxt "view:account.statement.line:"
msgid "Statement Line"
@@ -306,22 +333,20 @@ msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr ""
-msgctxt "view:account.statement:"
-msgid "Amount"
-msgstr ""
-
#, fuzzy
msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Отменить"
+#, fuzzy
msgctxt "view:account.statement:"
msgid "Other Info"
-msgstr ""
+msgstr "Другая информация"
+#, fuzzy
msgctxt "view:account.statement:"
msgid "Post"
-msgstr ""
+msgstr "Проводка"
#, fuzzy
msgctxt "view:account.statement:"
@@ -340,6 +365,7 @@ msgctxt "view:account.statement:"
msgid "Statements"
msgstr ""
+#, fuzzy
msgctxt "view:account.statement:"
msgid "Validate"
-msgstr ""
+msgstr "Утвердить"
diff --git a/setup.py b/setup.py
index e43a859..caf848d 100644
--- a/setup.py
+++ b/setup.py
@@ -39,16 +39,16 @@ setup(name='trytond_account_statement',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.account_statement': '.'},
packages=[
'trytond.modules.account_statement',
'trytond.modules.account_statement.tests',
],
package_data={
- 'trytond.modules.account_statement': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'tests/*.rst'],
+ 'trytond.modules.account_statement': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -59,6 +59,7 @@ setup(name='trytond_account_statement',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/statement.py b/statement.py
index f2610bc..8c0ed32 100644
--- a/statement.py
+++ b/statement.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
from trytond.model import Workflow, ModelView, ModelSQL, fields
-from trytond.pyson import Eval, If, Bool
+from trytond.pyson import Eval, If
from trytond.transaction import Transaction
from trytond.backend import TableHandler
from trytond.pool import Pool
@@ -67,9 +67,9 @@ class Statement(Workflow, ModelSQL, ModelView):
super(Statement, cls).__setup__()
cls._order[0] = ('id', 'DESC')
cls._error_messages.update({
- 'wrong_end_balance': 'End Balance must be %s!',
- 'delete_cancel': 'Statement "%s" must be cancelled before ' \
- 'deletion!',
+ 'wrong_end_balance': 'End Balance must be "%s".',
+ 'delete_cancel': ('Statement "%s" must be cancelled before '
+ 'deletion.'),
})
cls._transitions |= set((
('draft', 'validated'),
@@ -81,7 +81,7 @@ class Statement(Workflow, ModelSQL, ModelView):
'draft': {
'invisible': Eval('state') != 'cancel',
},
- 'validate': {
+ 'validate_statement': {
'invisible': Eval('state') != 'draft',
},
'post': {
@@ -269,7 +269,7 @@ class Statement(Workflow, ModelSQL, ModelView):
del vals['invoice.rec_name']
res['lines']['add'].append(vals)
invoice_id2amount_to_pay[line.invoice.id] = \
- amount_to_pay - abs(line.amount)
+ amount_to_pay - abs(line.amount)
return res
@classmethod
@@ -278,7 +278,7 @@ class Statement(Workflow, ModelSQL, ModelView):
cls.cancel(statements)
for statement in statements:
if statement.state != 'cancel':
- cls.raise_user_error('delete_cancel', statement.rec_name)
+ cls.raise_user_error('delete_cancel', (statement.rec_name,))
super(Statement, cls).delete(statements)
@classmethod
@@ -290,7 +290,7 @@ class Statement(Workflow, ModelSQL, ModelView):
@classmethod
@ModelView.button
@Workflow.transition('validated')
- def validate(cls, statements):
+ def validate_statement(cls, statements):
Lang = Pool().get('ir.lang')
for statement in statements:
@@ -344,12 +344,8 @@ class Line(ModelSQL, ModelView):
account = fields.Many2One('account.account', 'Account', required=True,
on_change=['account', 'invoice'], domain=[
('company', '=', Eval('_parent_statement', {}).get('company', 0)),
- If(Bool(Eval('party')),
- ('kind', 'in', ['receivable', 'payable']),
- ('kind', 'in', ['payable', 'receivable', 'revenue', 'expense',
- 'other'])),
- ],
- depends=['party', 'amount'])
+ ('kind', '!=', 'view'),
+ ])
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
@@ -357,7 +353,7 @@ class Line(ModelSQL, ModelView):
('party', '=', Eval('party')),
('account', '=', Eval('account')),
If(Eval('_parent_statement', {}).get('state') == 'draft',
- ('state', '=', 'open'),
+ ('state', '=', 'posted'),
('state', '!=', '')),
],
states={
@@ -369,16 +365,17 @@ class Line(ModelSQL, ModelView):
def __setup__(cls):
super(Line, cls).__setup__()
cls._error_messages.update({
- 'debit_credit_account_statement_journal': 'Please provide debit '
- 'and credit account on statement journal.',
- 'same_debit_credit_account': 'Credit or debit account on '
- 'journal is the same than the statement line account!',
- 'amount_greater_invoice_amount_to_pay': 'Amount (%s) greater than '
- 'the amount to pay of invoice!',
- })
+ 'debit_credit_account_statement_journal': ('Please provide '
+ 'debit and credit account on statement journal "%s".'),
+ 'same_debit_credit_account': ('Account "%(account)s" in '
+ 'statement line "%(line)s" is the same as the one '
+ 'configured as credit or debit on journal "%(journal)s".'),
+ 'amount_greater_invoice_amount_to_pay': ('Amount "%s" is '
+ 'greater than the amount to pay of invoice.'),
+ })
cls._sql_constraints += [
('check_statement_line_amount', 'CHECK(amount != 0)',
- 'Amount should be a positive or negative value!'),
+ 'Amount should be a positive or negative value.'),
]
@staticmethod
@@ -566,9 +563,14 @@ class Line(ModelSQL, ModelView):
else:
account = journal.debit_account
if not account:
- self.raise_user_error('debit_credit_account_statement_journal')
+ self.raise_user_error('debit_credit_account_statement_journal',
+ (journal.rec_name,))
if self.account == account:
- self.raise_user_error('same_debit_credit_account')
+ self.raise_user_error('same_debit_credit_account', {
+ 'account': self.account.rec_name,
+ 'line': self.account,
+ 'journal': self.journal,
+ })
move_lines.append(MoveLine(
description=self.description,
debit=amount >= zero and amount or zero,
diff --git a/statement.xml b/statement.xml
index 7eef24a..b2de6e2 100644
--- a/statement.xml
+++ b/statement.xml
@@ -22,131 +22,57 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="statement_view_form">
<field name="model">account.statement</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Statement">
- <label name="journal"/>
- <field name="journal"/>
- <label name="date"/>
- <field name="date"/>
- <label name="start_balance"/>
- <field name="start_balance"/>
- <label name="end_balance"/>
- <field name="end_balance"/>
- <notebook colspan="4">
- <page string="Statement Lines" col="4" id="statement_lines">
- <field name="lines" colspan="4"
- view_ids="account_statement.statement_line_view_tree_editable"/>
- <group col="6" colspan="4" id="state_buttons">
- <label name="balance"/>
- <field name="balance"/>
- <label name="state"/>
- <field name="state"/>
- <group col="4" colspan="2" id="buttons">
- <button string="Validate" name="validate"/>
- <button string="Cancel" name="cancel"/>
- <button string="Post" name="post"/>
- <button string="Reset to Draft"
- name="draft"/>
- </group>
- </group>
- </page>
- <page string="Other Info" id="info">
- <label name="company"/>
- <field name="company"/>
- <field name="move_lines" colspan="4"/>
- </page>
- </notebook>
- <field name="currency_digits" colspan="4" invisible="1"/>
- </form>
- ]]>
- </field>
+ <field name="name">statement_form</field>
</record>
<record model="ir.ui.view" id="statement_view_tree">
<field name="model">account.statement</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Statements">
- <field name="journal"/>
- <field name="date"/>
- <field name="start_balance"/>
- <field name="end_balance"/>
- <field name="state"/>
- </tree>
- ]]>
- </field>
+ <field name="name">statement_tree</field>
</record>
- <record model="ir.action.act_window" id="act_draft_statement_form">
- <field name="name">Draft Statements</field>
+ <record model="ir.action.act_window" id="act_statement_form">
+ <field name="name">Statements</field>
<field name="res_model">account.statement</field>
- <field name="domain">[('state', '=', 'draft')]</field>
</record>
- <record model="ir.action.act_window.view" id="act_draft_statement_form_view1">
+ <record model="ir.action.act_window.view" id="act_statement_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="statement_view_tree"/>
- <field name="act_window" ref="act_draft_statement_form"/>
+ <field name="act_window" ref="act_statement_form"/>
</record>
- <record model="ir.action.act_window.view" id="act_draft_statement_form_view2">
+ <record model="ir.action.act_window.view" id="act_statement_form_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="statement_view_form"/>
- <field name="act_window" ref="act_draft_statement_form"/>
- </record>
- <menuitem parent="menu_statements" sequence="2"
- action="act_draft_statement_form" id="menu_draft_statement_form"/>
-
- <record model="ir.action.act_window" id="act_validated_statement_form">
- <field name="name">Validated Statement</field>
- <field name="res_model">account.statement</field>
- <field name="domain">[('state', '=', 'validated')]</field>
+ <field name="act_window" ref="act_statement_form"/>
</record>
- <record model="ir.action.act_window.view" id="act_validated_statement_form_view1">
+ <record model="ir.action.act_window.domain"
+ id="act_statement_form_domain_draft">
+ <field name="name">Draft</field>
<field name="sequence" eval="10"/>
- <field name="view" ref="statement_view_tree"/>
- <field name="act_window" ref="act_validated_statement_form"/>
+ <field name="domain">[('state', '=', 'draft')]</field>
+ <field name="act_window" ref="act_statement_form"/>
</record>
- <record model="ir.action.act_window.view" id="act_validated_statement_form_view2">
+ <record model="ir.action.act_window.domain"
+ id="act_statement_form_domain_validated">
+ <field name="name">Validated</field>
<field name="sequence" eval="20"/>
- <field name="view" ref="statement_view_form"/>
- <field name="act_window" ref="act_validated_statement_form"/>
+ <field name="domain">[('state', '=', 'validated')]</field>
+ <field name="act_window" ref="act_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="3"
- action="act_validated_statement_form" id="menu_validated_statement_form"/>
-
- <record model="ir.action.act_window" id="act_posted_statement_form">
- <field name="name">Posted Statements</field>
- <field name="res_model">account.statement</field>
+ <record model="ir.action.act_window.domain"
+ id="act_statement_form_domain_posted">
+ <field name="name">Posted</field>
+ <field name="sequence" eval="30"/>
<field name="domain">[('state', '=', 'posted')]</field>
- </record>
- <record model="ir.action.act_window.view" id="act_posted_statement_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="statement_view_tree"/>
- <field name="act_window" ref="act_posted_statement_form"/>
- </record>
- <record model="ir.action.act_window.view" id="act_posted_statement_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="statement_view_form"/>
- <field name="act_window" ref="act_posted_statement_form"/>
- </record>
- <menuitem parent="menu_statements" sequence="4"
- action="act_posted_statement_form" id="menu_posted_statement_form"/>
-
- <record model="ir.action.act_window" id="act_statement_form">
- <field name="name">All Statement</field>
- <field name="res_model">account.statement</field>
- </record>
- <record model="ir.action.act_window.view" id="act_statement_form_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="statement_view_tree"/>
<field name="act_window" ref="act_statement_form"/>
</record>
- <record model="ir.action.act_window.view" id="act_statement_form_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="statement_view_form"/>
+ <record model="ir.action.act_window.domain"
+ id="act_statement_form_domain_all">
+ <field name="name">All</field>
+ <field name="sequence" eval="9999"/>
+ <field name="domain"></field>
<field name="act_window" ref="act_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="5"
+ <menuitem parent="menu_statements" sequence="10"
action="act_statement_form" id="menu_statement_form"/>
<record model="ir.rule.group" id="rule_group_statement">
@@ -154,74 +80,27 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_statement1">
- <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.statement')]"/>
- <field name="operator">=</field>
- <field name="operand">User/Current Company</field>
+ <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="rule_group" ref="rule_group_statement"/>
</record>
<record model="ir.ui.view" id="statement_line_view_form">
<field name="model">account.statement.line</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Statement Line">
- <label name="statement"/>
- <field name="statement" colspan="3"/>
- <label name="date"/>
- <field name="date"/>
- <label name="amount"/>
- <field name="amount"/>
- <label name="party"/>
- <field name="party"/>
- <label name="account"/>
- <field name="account"/>
- <label name="invoice"/>
- <field name="invoice"/>
- <newline/>
- <label name="description"/>
- <field name="description" colspan="3"/>
- <label name="move"/>
- <field name="move"/>
- </form>
- ]]>
- </field>
+ <field name="name">statement_line_form</field>
</record>
<record model="ir.ui.view" id="statement_line_view_tree">
<field name="model">account.statement.line</field>
<field name="type">tree</field>
<field name="priority" eval="10"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Statement Lines">
- <field name="statement"/>
- <field name="date"/>
- <field name="amount"/>
- <field name="party"/>
- <field name="account"/>
- <field name="invoice"/>
- <field name="description"/>
- </tree>
- ]]>
- </field>
+ <field name="name">statement_line_tree</field>
</record>
<record model="ir.ui.view" id="statement_line_view_tree_editable">
<field name="model">account.statement.line</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Statement Lines" editable="bottom">
- <field name="date"/>
- <field name="amount" sum="Amount"/>
- <field name="party"/>
- <field name="account"/>
- <field name="invoice"/>
- <field name="description"/>
- </tree>
- ]]>
- </field>
+ <field name="name">statement_line_tree_editable</field>
</record>
<record model="ir.model.access" id="access_statement_account_admin">
@@ -286,7 +165,7 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="ir.model.button" id="statement_validate_button">
- <field name="name">validate</field>
+ <field name="name">validate_statement</field>
<field name="model"
search="[('model', '=', 'account.statement')]"/>
</record>
diff --git a/tests/scenario_account_statement.rst b/tests/scenario_account_statement.rst
index f581bcb..e272685 100644
--- a/tests/scenario_account_statement.rst
+++ b/tests/scenario_account_statement.rst
@@ -33,10 +33,13 @@ Create company::
>>> Currency = Model.get('currency.currency')
>>> CurrencyRate = Model.get('currency.currency.rate')
>>> Company = Model.get('company.company')
+ >>> Party = Model.get('party.party')
>>> company_config = Wizard('company.company.config')
>>> company_config.execute('company')
>>> company = company_config.form
- >>> company.name = 'B2CK'
+ >>> party = Party(name='B2CK')
+ >>> party.save()
+ >>> company.party = party
>>> currencies = Currency.find([('code', '=', 'EUR')])
>>> if not currencies:
... currency = Currency(name='Euro', symbol=u'€', code='EUR',
@@ -147,9 +150,9 @@ Create 2 customer invoices::
>>> invoice_line.account = revenue
>>> invoice_line.description = 'Test'
>>> customer_invoice1.save()
- >>> Invoice.open([customer_invoice1.id], config.context)
+ >>> Invoice.post([customer_invoice1.id], config.context)
>>> customer_invoice1.state
- u'open'
+ u'posted'
>>> customer_invoice2 = Invoice(type='out_invoice')
>>> customer_invoice2.party = customer
@@ -161,9 +164,9 @@ Create 2 customer invoices::
>>> invoice_line.account = revenue
>>> invoice_line.description = 'Test'
>>> customer_invoice2.save()
- >>> Invoice.open([customer_invoice2.id], config.context)
+ >>> Invoice.post([customer_invoice2.id], config.context)
>>> customer_invoice2.state
- u'open'
+ u'posted'
Create 1 customer credit note::
@@ -177,9 +180,9 @@ Create 1 customer credit note::
>>> invoice_line.account = revenue
>>> invoice_line.description = 'Test'
>>> customer_credit_note.save()
- >>> Invoice.open([customer_credit_note.id], config.context)
+ >>> Invoice.post([customer_credit_note.id], config.context)
>>> customer_credit_note.state
- u'open'
+ u'posted'
Create 1 supplier invoices::
@@ -192,10 +195,11 @@ Create 1 supplier invoices::
>>> invoice_line.unit_price = Decimal('50')
>>> invoice_line.account = expense
>>> invoice_line.description = 'Test'
+ >>> supplier_invoice.invoice_date = today
>>> supplier_invoice.save()
- >>> Invoice.open([supplier_invoice.id], config.context)
+ >>> Invoice.post([supplier_invoice.id], config.context)
>>> supplier_invoice.state
- u'open'
+ u'posted'
Create statement::
@@ -279,7 +283,7 @@ Paid 50 to supplier::
Validate statement::
- >>> Statement.validate([statement.id], config.context)
+ >>> Statement.validate_statement([statement.id], config.context)
>>> statement.state
u'validated'
@@ -290,7 +294,7 @@ Test invoice state::
u'paid'
>>> customer_invoice2.reload()
>>> customer_invoice2.state
- u'open'
+ u'posted'
>>> customer_invoice2.amount_to_pay == Decimal('70')
True
>>> customer_credit_note.reload()
diff --git a/tryton.cfg b/tryton.cfg
index c93be46..b326056 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
account
account_invoice
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 317957b..d5a60be 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-account-statement
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_account_statement
=========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 7c05366..b1b8335 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -31,4 +31,11 @@ trytond_account_statement.egg-info/dependency_links.txt
trytond_account_statement.egg-info/entry_points.txt
trytond_account_statement.egg-info/not-zip-safe
trytond_account_statement.egg-info/requires.txt
-trytond_account_statement.egg-info/top_level.txt
\ No newline at end of file
+trytond_account_statement.egg-info/top_level.txt
+view/statement_form.xml
+view/statement_journal_form.xml
+view/statement_journal_tree.xml
+view/statement_line_form.xml
+view/statement_line_tree.xml
+view/statement_line_tree_editable.xml
+view/statement_tree.xml
\ No newline at end of file
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index c8bf816..3bcde87 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 2.6, < 2.7
-trytond_account_invoice >= 2.6, < 2.7
-trytond_company >= 2.6, < 2.7
-trytond_currency >= 2.6, < 2.7
-trytond_party >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account >= 2.8, < 2.9
+trytond_account_invoice >= 2.8, < 2.9
+trytond_company >= 2.8, < 2.9
+trytond_currency >= 2.8, < 2.9
+trytond_party >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/statement_form.xml b/view/statement_form.xml
new file mode 100644
index 0000000..2d0ff2d
--- /dev/null
+++ b/view/statement_form.xml
@@ -0,0 +1,38 @@
+<?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="Statement">
+ <label name="journal"/>
+ <field name="journal"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="start_balance"/>
+ <field name="start_balance"/>
+ <label name="end_balance"/>
+ <field name="end_balance"/>
+ <notebook colspan="4">
+ <page string="Statement Lines" col="4" id="statement_lines">
+ <field name="lines" colspan="4"
+ view_ids="account_statement.statement_line_view_tree_editable"/>
+ <group col="6" colspan="4" id="state_buttons">
+ <label name="balance"/>
+ <field name="balance"/>
+ <label name="state"/>
+ <field name="state"/>
+ <group col="4" colspan="2" id="buttons">
+ <button string="Validate" name="validate_statement"/>
+ <button string="Cancel" name="cancel"/>
+ <button string="Post" name="post"/>
+ <button string="Reset to Draft"
+ name="draft"/>
+ </group>
+ </group>
+ </page>
+ <page string="Other Info" id="info">
+ <label name="company"/>
+ <field name="company"/>
+ <field name="move_lines" colspan="4"/>
+ </page>
+ </notebook>
+ <field name="currency_digits" colspan="4" invisible="1"/>
+</form>
diff --git a/view/statement_journal_form.xml b/view/statement_journal_form.xml
new file mode 100644
index 0000000..87c89a9
--- /dev/null
+++ b/view/statement_journal_form.xml
@@ -0,0 +1,13 @@
+<?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="Statement Journal">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="journal"/>
+ <field name="journal"/>
+ <label name="currency"/>
+ <field name="currency"/>
+ <label name="company"/>
+ <field name="company"/>
+</form>
diff --git a/view/statement_journal_tree.xml b/view/statement_journal_tree.xml
new file mode 100644
index 0000000..458f49f
--- /dev/null
+++ b/view/statement_journal_tree.xml
@@ -0,0 +1,9 @@
+<?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. -->
+<tree string="Statement Journals">
+ <field name="name"/>
+ <field name="journal"/>
+ <field name="currency"/>
+ <field name="company"/>
+</tree>
diff --git a/view/statement_line_form.xml b/view/statement_line_form.xml
new file mode 100644
index 0000000..8b65af0
--- /dev/null
+++ b/view/statement_line_form.xml
@@ -0,0 +1,22 @@
+<?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="Statement Line">
+ <label name="statement"/>
+ <field name="statement" colspan="3"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="amount"/>
+ <field name="amount"/>
+ <label name="party"/>
+ <field name="party"/>
+ <label name="account"/>
+ <field name="account"/>
+ <label name="invoice"/>
+ <field name="invoice"/>
+ <newline/>
+ <label name="description"/>
+ <field name="description" colspan="3"/>
+ <label name="move"/>
+ <field name="move"/>
+</form>
diff --git a/view/statement_line_tree.xml b/view/statement_line_tree.xml
new file mode 100644
index 0000000..78f984f
--- /dev/null
+++ b/view/statement_line_tree.xml
@@ -0,0 +1,12 @@
+<?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. -->
+<tree string="Statement Lines">
+ <field name="statement"/>
+ <field name="date"/>
+ <field name="amount"/>
+ <field name="party"/>
+ <field name="account"/>
+ <field name="invoice"/>
+ <field name="description"/>
+</tree>
diff --git a/view/statement_line_tree_editable.xml b/view/statement_line_tree_editable.xml
new file mode 100644
index 0000000..b466b20
--- /dev/null
+++ b/view/statement_line_tree_editable.xml
@@ -0,0 +1,11 @@
+<?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. -->
+<tree string="Statement Lines" editable="bottom">
+ <field name="date"/>
+ <field name="amount" sum="Amount"/>
+ <field name="party"/>
+ <field name="account"/>
+ <field name="invoice"/>
+ <field name="description"/>
+</tree>
diff --git a/view/statement_tree.xml b/view/statement_tree.xml
new file mode 100644
index 0000000..d2dd5c0
--- /dev/null
+++ b/view/statement_tree.xml
@@ -0,0 +1,10 @@
+<?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. -->
+<tree string="Statements">
+ <field name="journal"/>
+ <field name="date"/>
+ <field name="start_balance"/>
+ <field name="end_balance"/>
+ <field name="state"/>
+</tree>
commit f957c12b7662feb12531d7dee62ff00fc19192c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:40 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index dc3ddad..d063ea0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-statement (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704368).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:05:23 +0200
+
tryton-modules-account-statement (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 6c7870cf691c1ca675565f3374b3676b77ccb78f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:47 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 9e9ba14..797cf3f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,12 @@ X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account (>= 2.6), tryton-modules-account-invoice (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-currency (>= 2.6),
- tryton-modules-party (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account (>= ${version:major}),
+ tryton-modules-account-invoice (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-currency (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit ca1dd8617e1dfbd8751da8faeec9cf617477d8e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:26:06 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704368).
diff --git a/debian/control b/debian/control
index 8195e60..9e9ba14 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-account-statement
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 517406d563c7c61d40f0532dd39f890805df1e95
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:03:57 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index d1aea86..dc3ddad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-statement (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:00:13 +0100
+
tryton-modules-account-statement (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 38ea68043a563b85288b14d5f0afb0f219c07027
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:32 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9446668
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_account_statement-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 9e62b464e53fd4a69d20e14573cb9d9bbbbeb208
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:08 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index 8ecf10d..8195e60 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account-statement.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-account-statement.git
X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
commit 07c6acdd49332568c91716e60aeb185ef657e777
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:38 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 73bb8ab..d1aea86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:35:46 +0100
+
tryton-modules-account-statement (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit 1d993cd7369939ab35b1c60ce76cdea326265142
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:18 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 4f54669..5613fab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2004-2008 Tiny SPRL
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2012 Bertrand Chenal
2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
License: GPL-3+
Files: debian/*
Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
- 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 4f96616a8f7ea7747d9297d048a9c83118f1e026
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:26 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index d740f87..8ecf10d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account-statement.git
commit 7362b1cafad8e0df59eccbeccb67815ece5226e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 91948c2..d740f87 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit b6a0894e2bde285c5d43df106b2019ff937c2dd4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:01:48 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 95694ab..73bb8ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+ * Adding xz compression to source/options.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:02 +0200
+
tryton-modules-account-statement (2.4.2-2) experimental; urgency=low
[ Daniel Baumann ]
commit c196098517acc53e5928d9bb1d79b700e147b210
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 14:21:49 2012 +0200
Adding xz compression to source/options.
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit e1f8502db1bdedb9ef5b0d05cd60ffd9863c500f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index a067de2..91948c2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,10 @@ X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-account (>= 2.4), tryton-modules-account-invoice (>= 2.4),
- tryton-modules-company (>= 2.4), tryton-modules-currency (>= 2.4),
- tryton-modules-party (>= 2.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-account (>= 2.6), tryton-modules-account-invoice (>= 2.6),
+ tryton-modules-company (>= 2.6), tryton-modules-currency (>= 2.6),
+ tryton-modules-party (>= 2.6), python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 364db8bfba54e3a8c51966c2002e3bc3c9d7fc55
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:27 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 60f09d4..0f1f3b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,6 @@
-Version 2.4.2 - 2012-09-02
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
-
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
+* Allow to use credit note on statement line
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..d57a2cc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,8 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
+include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 0591fbc..8b91883 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 2.4.2
-Summary: Financial and Accounting Module with:
- - Statement
- - Statement journal
-
+Version: 2.6.0
+Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_account_statement
+ =========================
+
+ The account_statement module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index aadcfdc..83f4243 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_account_statement
=========================
The account_statement module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index ad03490..ec6972d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,16 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .journal import *
from .statement import *
+from .account import *
+
+
+def register():
+ Pool.register(
+ Journal,
+ Statement,
+ Line,
+ Move,
+ module='account_statement', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 99fd61a..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,75 +0,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.
-{
- 'name': 'Account Statement',
- 'name_bg_BG': 'Отчет на сметка',
- 'name_ca_ES': 'Extractes comptables',
- 'name_de_DE': 'Buchhaltung Bankauszüge',
- 'name_es_AR': 'Estado de Cuentas',
- 'name_es_CO': 'Estado de Cuentas',
- 'name_es_ES': 'Extractos contables',
- 'name_fr_FR': 'Relevé comptable',
- 'name_nl_NL': 'Bankafschriften',
- 'version': '2.4.2',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Financial and Accounting Module with:
- - Statement
- - Statement journal
-''',
- 'description_bg_BG': '''Финансов и счетоводен модул с:
- - Отчети
- - Дневник на отчети
-''',
- 'description_ca_ES': '''Mòdul financer i comptable amb:
- - Extractes comptables
- - Diari d'extracte
-''',
- 'description_de_DE': '''Modul für Buchhaltung und Bankauszüge mit
- - Abstimmung von Bankauszügen und Rechnungen
-''',
- 'description_es_AR': '''Módulo financiero y contable con:
- - Estado de cuentas
- - Diario de estado de cuentas
-''',
- 'description_es_CO': '''Módulo Financiero y Contable con:
- - Estado de cuentas
- - Diario de estado de cuentas
-''',
- 'description_es_ES': '''Módulo financiero y contable con:
- - Extractos contables
- - Diario de extracto
-''',
- 'description_fr_FR': '''Module financier et comptable avec:
- - Relevé
- - Journal de relevés
- ''',
- 'description_nl_NL': '''Module voor het verwerken van bankafschriften met:
- - bankboeken
- - afletteren van rekeningen
-''',
- 'depends': [
- 'account',
- 'company',
- 'currency',
- 'party',
- 'account_invoice',
- ],
- 'xml': [
- 'statement.xml',
- 'journal.xml',
- ],
- 'translation': [
- '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_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/account.py b/account.py
new file mode 100644
index 0000000..af74f27
--- /dev/null
+++ b/account.py
@@ -0,0 +1,14 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.pool import PoolMeta
+
+__all__ = ['Move']
+__metaclass__ = PoolMeta
+
+
+class Move:
+ __name__ = 'account.move'
+
+ @classmethod
+ def _get_origin(cls):
+ return super(Move, cls)._get_origin() + ['account.statement.line']
diff --git a/journal.py b/journal.py
index 540efb2..15a4c2b 100644
--- a/journal.py
+++ b/journal.py
@@ -4,12 +4,12 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
from trytond.pool import Pool
+__all__ = ['Journal']
+
class Journal(ModelSQL, ModelView):
'Statement Journal'
- _name = 'account.statement.journal'
- _description = __doc__
-
+ __name__ = 'account.statement.journal'
name = fields.Char('Name', required=True)
journal = fields.Many2One('account.journal', 'Journal', required=True,
domain=[('type', '=', 'statement')])
@@ -17,13 +17,13 @@ class Journal(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=True)
- def default_currency(self):
+ @staticmethod
+ def default_currency():
if Transaction().context.get('company'):
- company_obj = Pool().get('company.company')
- company = company_obj.browse(Transaction().context['company'])
+ Company = Pool().get('company.company')
+ company = Company(Transaction().context['company'])
return company.currency.id
- def default_company(self):
+ @staticmethod
+ def default_company():
return Transaction().context.get('company')
-
-Journal()
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 7e0f87c..67ac756 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -8,7 +8,7 @@ msgstr "Сумата (%s) е по-голяма от сумата за плаща
msgctxt "error:account.statement.line:"
msgid "Amount should be a positive or negative value!"
-msgstr ""
+msgstr "Сумата трябва да бъде положителна или отрицателна стойност!"
msgctxt "error:account.statement.line:"
msgid ""
@@ -28,7 +28,7 @@ msgstr "Крайния баланс трябва да е %s!"
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgstr "Преди да бъде изтрит отчет \"%s\" трябва да бъде прекратен!"
msgctxt "field:account.statement,balance:"
msgid "Balance"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 3b4412c..1999447 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,56 +4,51 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "L'import (%s) és superior que la quantitat a pagar de la factura"
+msgstr "L'import (%s) és més gran que l'import a pagar de la factura."
msgctxt "error:account.statement.line:"
msgid "Amount should be a positive or negative value!"
-msgstr ""
+msgstr "L'import ha de ser un valor positiu o negatiu."
msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
msgstr ""
-"Els compte deure o haver del diari és el mateix que el compte de la línia "
+"El compte deure o haver del diari és el mateix que el de la línia "
"d'extracte."
msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
-msgstr ""
-"Si us plau, indiqui els comptes deure i haver en el llibre d'estat de "
-"comptes."
+msgstr "Heu d'indicar els comptes deure i haver en un diari d'extracte."
msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
-msgstr "El balanç final ha de ser %s"
+msgstr "El saldo final ha de ser %s."
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgstr "Heu de cancel·lar l'extracte \"%s\" abans d'eliminar-lo."
-#, fuzzy
msgctxt "field:account.statement,balance:"
msgid "Balance"
-msgstr "Balanç"
+msgstr "Saldo"
-#, fuzzy
msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Empresa"
msgctxt "field:account.statement,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:account.statement,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimals de la divisa"
+msgstr "Dígits de la moneda"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -61,11 +56,11 @@ msgstr "Data"
msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
-msgstr "Balanç final"
+msgstr "Saldo final"
msgctxt "field:account.statement,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement,journal:"
msgid "Journal"
@@ -77,7 +72,7 @@ msgstr "Transaccions"
msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
-msgstr "Línies d'assentament"
+msgstr "Apunts"
msgctxt "field:account.statement,rec_name:"
msgid "Name"
@@ -85,7 +80,7 @@ msgstr "Nom"
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr "Balanç inicial"
+msgstr "Saldo inicial"
msgctxt "field:account.statement,state:"
msgid "State"
@@ -93,11 +88,11 @@ msgstr "Estat"
msgctxt "field:account.statement,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:account.statement,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:account.statement.journal,company:"
msgid "Company"
@@ -105,20 +100,19 @@ msgstr "Empresa"
msgctxt "field:account.statement.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:account.statement.journal,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:account.statement.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
@@ -134,11 +128,11 @@ msgstr "Nom"
msgctxt "field:account.statement.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:account.statement.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:account.statement.line,account:"
msgid "Account"
@@ -146,16 +140,15 @@ msgstr "Compte"
msgctxt "field:account.statement.line,amount:"
msgid "Amount"
-msgstr "Quantitat"
+msgstr "Import"
msgctxt "field:account.statement.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:account.statement.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:account.statement.line,date:"
msgid "Date"
@@ -167,7 +160,7 @@ msgstr "Descripció"
msgctxt "field:account.statement.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
@@ -187,83 +180,83 @@ msgstr "Nom"
msgctxt "field:account.statement.line,statement:"
msgid "Statement"
-msgstr "Extracte de comptes"
+msgstr "Extracte"
msgctxt "field:account.statement.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:account.statement.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
-msgstr "Extracte de comptes"
+msgstr "Extracte"
msgctxt "model:account.statement,name:"
msgid "Account Statement"
-msgstr "Extracte de comptes"
+msgstr "Extracte bancari"
msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
-msgstr "Diari d'estats de compte"
+msgstr "Diari d'extracte"
msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
-msgstr "Línia d'estat de compte"
+msgstr "Línia d'extracte bancari"
msgctxt "model:ir.action,name:act_draft_statement_form"
msgid "Draft Statements"
-msgstr "Estats de compte en esborrany"
+msgstr "Extractes esborrany"
msgctxt "model:ir.action,name:act_posted_statement_form"
msgid "Posted Statements"
-msgstr "Estats de compte confirmats"
+msgstr "Extractes confirmats"
msgctxt "model:ir.action,name:act_statement_form"
msgid "All Statement"
-msgstr "Tots els estats de compte"
+msgstr "Tots els extractes"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
-msgstr "Llibres d'estats de compte"
+msgstr "Diaris d'extracte"
msgctxt "model:ir.action,name:act_validated_statement_form"
msgid "Validated Statement"
-msgstr "Estats de compte validats"
+msgstr "Extractes validats"
msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
msgid "Draft Statements"
-msgstr "Estats de compte en esborrany"
+msgstr "Extractes esborrany"
msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
msgid "Posted Statements"
-msgstr "Estats de compte confirmats"
+msgstr "Extractes confirmats"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
-msgstr "Estats de compte"
+msgstr "Extractes"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
msgid "All Statement"
-msgstr "Tots els estats de compte"
+msgstr "Tots els extractes"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
msgid "Statement Journals"
-msgstr "Diaris d'estats de compte"
+msgstr "Diaris d'extracte"
msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
-msgstr "Estats de compte"
+msgstr "Extractes"
msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
msgid "Validated Statement"
-msgstr "Estats de compte validats"
+msgstr "Extractes validats"
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
-msgstr "Estat de compte"
+msgstr "Extracte"
msgctxt "selection:account.statement,state:"
msgid "Canceled"
@@ -283,74 +276,52 @@ msgstr "Validat"
msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
-msgstr "Llibre d'estats de compte"
+msgstr "Diari d'extracte"
msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
-msgstr "Llibres d'estats de compte"
+msgstr "Diaris d'extracte"
-#, fuzzy
msgctxt "view:account.statement.line:"
msgid "Amount"
-msgstr "Quantitat"
-
-msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Línia d'extracte bancari"
+msgstr "Import"
msgctxt "view:account.statement.line:"
msgid "Statement Line"
-msgstr "Linea d'estat de compte"
+msgstr "Línia extracte"
msgctxt "view:account.statement.line:"
msgid "Statement Lines"
-msgstr "Línies d'estat de compte"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Extracte bancari"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Línies d'extracte bancari"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Extractes bancaris"
+msgstr "Línies extracte"
msgctxt "view:account.statement:"
msgid "Cancel"
-msgstr "Cancel·lar"
-
-msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Línies de seients"
+msgstr "Cancel·la"
-#, fuzzy
msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Informació addicional"
msgctxt "view:account.statement:"
msgid "Post"
-msgstr "Confirmar"
+msgstr "Confirma"
msgctxt "view:account.statement:"
msgid "Reset to Draft"
-msgstr "Restablir a esborrany"
+msgstr "Restableix a esborrany"
msgctxt "view:account.statement:"
msgid "Statement"
-msgstr "Estat de compte"
+msgstr "Extracte"
msgctxt "view:account.statement:"
msgid "Statement Lines"
-msgstr "Línies d'estat de compte"
+msgstr "Línies extracte"
msgctxt "view:account.statement:"
msgid "Statements"
-msgstr "Estats de compte"
+msgstr "Extractes"
msgctxt "view:account.statement:"
msgid "Validate"
-msgstr "Validar"
+msgstr "Valida"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a85b411..186a52d 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -29,7 +29,7 @@ msgstr "¡El balance final debe ser %s!"
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr "¡Debe cancelar el extracto \"%s\" antes de eliminarlo!"
+msgstr "¡Debe cancelar el extracto «%s» antes de eliminarlo!"
msgctxt "field:account.statement,balance:"
msgid "Balance"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1379c4f..e7b3137 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,7 +8,7 @@ msgstr "¡El valor (%s) es mayor que lo que se debe pagar en la factura!"
msgctxt "error:account.statement.line:"
msgid "Amount should be a positive or negative value!"
-msgstr ""
+msgstr "La cantidad debe ser un valor positivo o negativo!"
msgctxt "error:account.statement.line:"
msgid ""
@@ -30,30 +30,27 @@ msgstr "El Balance debe ser %s!"
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgstr "El estado de cuenta \"%s\" debe ser cancelado antes de ser eliminado!"
-#, fuzzy
msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Balance"
-#, fuzzy
msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Compañía"
msgctxt "field:account.statement,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:account.statement,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de Moneda"
+msgstr "Decimales de Moneda"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -65,7 +62,7 @@ msgstr "Balance Final"
msgctxt "field:account.statement,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement,journal:"
msgid "Journal"
@@ -93,11 +90,11 @@ msgstr "Estado"
msgctxt "field:account.statement,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:account.statement,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:account.statement.journal,company:"
msgid "Company"
@@ -105,9 +102,8 @@ msgstr "Compañía"
msgctxt "field:account.statement.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:account.statement.journal,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -118,7 +114,7 @@ msgstr "Moneda"
msgctxt "field:account.statement.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
@@ -134,11 +130,11 @@ msgstr "Nombre"
msgctxt "field:account.statement.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:account.statement.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "field:account.statement.line,account:"
msgid "Account"
@@ -150,9 +146,8 @@ msgstr "Cantidad"
msgctxt "field:account.statement.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:account.statement.line,create_uid:"
msgid "Create User"
msgstr "Crear usuario"
@@ -167,7 +162,7 @@ msgstr "Descripción"
msgctxt "field:account.statement.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
@@ -191,11 +186,11 @@ msgstr "Estado de Cuenta"
msgctxt "field:account.statement.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha modificación"
msgctxt "field:account.statement.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuario modificación"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
@@ -223,7 +218,7 @@ msgstr "Estados de Cuenta Autorizados"
msgctxt "model:ir.action,name:act_statement_form"
msgid "All Statement"
-msgstr "Todos los estados de cuenta"
+msgstr "Todos los Estados de Cuenta"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
@@ -289,7 +284,6 @@ msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Libros de Estados de Cuenta"
-#, fuzzy
msgctxt "view:account.statement.line:"
msgid "Amount"
msgstr "Cantidad"
@@ -306,7 +300,6 @@ msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Líneas de Estado de Cuenta"
-#, fuzzy
msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Cantidad"
@@ -331,10 +324,9 @@ msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Líneas de Movimiento"
-#, fuzzy
msgctxt "view:account.statement:"
msgid "Other Info"
-msgstr "Información Adicional"
+msgstr "Info Adicional"
msgctxt "view:account.statement:"
msgid "Post"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 9a5f035..a13930c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -20,11 +20,11 @@ msgstr ""
msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
-msgstr "Indique las cuentas debe y haber en un diario de extracto."
+msgstr "Debe indicar las cuentas debe y haber en un diario de extracto."
msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
-msgstr "El balance final debe ser %s."
+msgstr "El saldo final debe ser %s."
msgctxt "error:account.statement:"
msgid "Statement \"%s\" must be cancelled before deletion!"
@@ -32,7 +32,7 @@ msgstr "Debe cancelar el extracto \"%s\" antes de eliminarlo."
msgctxt "field:account.statement,balance:"
msgid "Balance"
-msgstr "Balance"
+msgstr "Saldo"
msgctxt "field:account.statement,company:"
msgid "Company"
@@ -48,7 +48,7 @@ msgstr "Usuario creación"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -56,7 +56,7 @@ msgstr "Fecha"
msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
-msgstr "Balance final"
+msgstr "Saldo final"
msgctxt "field:account.statement,id:"
msgid "ID"
@@ -80,7 +80,7 @@ msgstr "Nombre"
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr "Balance inicial"
+msgstr "Saldo inicial"
msgctxt "field:account.statement,state:"
msgid "State"
@@ -108,7 +108,7 @@ msgstr "Usuario creación"
msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:account.statement.journal,id:"
msgid "ID"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 60d52d6..7aae4e2 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -102,7 +102,7 @@ msgstr "Nom"
msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
-msgstr "Solde de départ"
+msgstr "Solde initial"
msgctxt "field:account.statement,state:"
msgid "State"
diff --git a/setup.py b/setup.py
index fcf261e..e43a859 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -24,21 +35,21 @@ tests_require = ['proteus >= %s.%s, < %s.%s' %
setup(name='trytond_account_statement',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module with account statements',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.account_statement': '.'},
packages=[
'trytond.modules.account_statement',
'trytond.modules.account_statement.tests',
- ],
+ ],
package_data={
'trytond.modules.account_statement': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po', 'tests/*.rst'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -60,7 +71,7 @@ setup(name='trytond_account_statement',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -71,4 +82,4 @@ setup(name='trytond_account_statement',
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
-)
+ )
diff --git a/statement.py b/statement.py
index 8c657c0..f2610bc 100644
--- a/statement.py
+++ b/statement.py
@@ -7,15 +7,15 @@ from trytond.transaction import Transaction
from trytond.backend import TableHandler
from trytond.pool import Pool
+__all__ = ['Statement', 'Line']
+
_STATES = {'readonly': Eval('state') != 'draft'}
_DEPENDS = ['state']
class Statement(Workflow, ModelSQL, ModelView):
'Account Statement'
- _name = 'account.statement'
- _description = __doc__
-
+ __name__ = 'account.statement'
company = fields.Many2One('company.company', 'Company', required=True,
select=True, states=_STATES, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
@@ -33,7 +33,7 @@ class Statement(Workflow, ModelSQL, ModelView):
on_change=['journal', 'state', 'lines'], select=True,
depends=['state', 'lines'])
currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['journal']), 'get_currency_digits')
+ on_change_with=['journal']), 'on_change_with_currency_digits')
date = fields.Date('Date', required=True, states=_STATES, depends=_DEPENDS,
select=True)
start_balance = fields.Numeric('Start Balance', required=True,
@@ -47,7 +47,7 @@ class Statement(Workflow, ModelSQL, ModelView):
digits=(16, Eval('currency_digits', 2)),
on_change_with=['start_balance', 'end_balance'],
depends=['currency_digits']),
- 'get_balance')
+ 'on_change_with_balance')
lines = fields.One2Many('account.statement.line', 'statement',
'Transactions', states={
'readonly': (Eval('state') != 'draft') | ~Eval('journal'),
@@ -62,21 +62,22 @@ class Statement(Workflow, ModelSQL, ModelView):
move_lines = fields.Function(fields.One2Many('account.move.line',
None, 'Move Lines'), 'get_move_lines')
- def __init__(self):
- super(Statement, self).__init__()
- self._order[0] = ('id', 'DESC')
- self._error_messages.update({
+ @classmethod
+ def __setup__(cls):
+ super(Statement, cls).__setup__()
+ cls._order[0] = ('id', 'DESC')
+ cls._error_messages.update({
'wrong_end_balance': 'End Balance must be %s!',
'delete_cancel': 'Statement "%s" must be cancelled before ' \
'deletion!',
})
- self._transitions |= set((
+ cls._transitions |= set((
('draft', 'validated'),
('validated', 'posted'),
('validated', 'cancel'),
('cancel', 'draft'),
))
- self._buttons.update({
+ cls._buttons.update({
'draft': {
'invisible': Eval('state') != 'cancel',
},
@@ -91,259 +92,246 @@ class Statement(Workflow, ModelSQL, ModelView):
},
})
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.8: new field company
- table = TableHandler(cursor, self, module_name)
+ table = TableHandler(cursor, cls, module_name)
company_exist = table.column_exist('company')
- super(Statement, self).init(module_name)
+ super(Statement, cls).__register__(module_name)
# Migration from 1.8: fill new field company
if not company_exist:
offset = 0
limit = cursor.IN_MAX
- statement_ids = True
- while statement_ids:
- statement_ids = self.search([], offset=offset, limit=limit)
+ statements = True
+ while statements:
+ statements = cls.search([], offset=offset, limit=limit)
offset += limit
- for statement in self.browse(statement_ids):
- self.write(statement.id, {
- 'company': statement.journal.company.id,
- })
- table = TableHandler(cursor, self, module_name)
+ for statement in statements:
+ cls.write([statement], {
+ 'company': statement.journal.company.id,
+ })
+ table = TableHandler(cursor, cls, module_name)
table.not_null_action('company', action='add')
- def default_company(self):
+ @staticmethod
+ def default_company():
return Transaction().context.get('company')
- def default_state(self):
+ @staticmethod
+ def default_state():
return 'draft'
- def default_date(self):
- date_obj = Pool().get('ir.date')
- return date_obj.today()
+ @staticmethod
+ def default_date():
+ Date = Pool().get('ir.date')
+ return Date.today()
- def default_currency_digits(self):
- company_obj = Pool().get('company.company')
+ @staticmethod
+ def default_currency_digits():
+ Company = Pool().get('company.company')
if Transaction().context.get('company'):
- company = company_obj.browse(Transaction().context['company'])
+ company = Company(Transaction().context['company'])
return company.currency.digits
return 2
- def on_change_journal(self, value):
+ def on_change_journal(self):
res = {}
- if not value.get('journal'):
+ if not self.journal:
return res
- statement_ids = self.search([
- ('journal', '=', value['journal']),
- ], order=[
+ statements = self.search([
+ ('journal', '=', self.journal.id),
+ ], order=[
('date', 'DESC'),
- ], limit=1)
- if not statement_ids:
+ ], limit=1)
+ if not statements:
return res
- statement = self.browse(statement_ids[0])
+ statement, = statements
res['start_balance'] = statement.end_balance
return res
- def on_change_with_currency_digits(self, vals):
- journal_obj = Pool().get('account.statement.journal')
- if vals.get('journal'):
- journal = journal_obj.browse(vals['journal'])
- return journal.currency.digits
+ def on_change_with_currency_digits(self, name=None):
+ if self.journal:
+ return self.journal.currency.digits
return 2
- def get_currency_digits(self, ids, name):
- res = {}
- for statement in self.browse(ids):
- res[statement.id] = statement.journal.currency.digits
- return res
-
- def get_rec_name(self, ids, name):
- lang_obj = Pool().get('ir.lang')
+ @classmethod
+ def get_rec_name(cls, statements, name):
+ Lang = Pool().get('ir.lang')
- if not ids:
- return {}
-
- lang_id, = lang_obj.search([
+ lang, = Lang.search([
('code', '=', Transaction().language),
])
- lang = lang_obj.browse(lang_id)
res = {}
- for statement in self.browse(ids):
- res[statement.id] = statement.journal.name + ' ' + \
- lang.currency(lang, statement.start_balance,
- statement.journal.currency, symbol=False,
- grouping=True) + \
- lang.currency(lang, statement.end_balance,
- statement.journal.currency, symbol=False,
- grouping=True)
+ for statement in statements:
+ res[statement.id] = (statement.journal.name + ' '
+ + Lang.currency(lang, statement.start_balance,
+ statement.journal.currency, symbol=False, grouping=True)
+ + ' - '
+ + Lang.currency(lang, statement.end_balance,
+ statement.journal.currency, symbol=False, grouping=True))
return res
- def search_rec_name(self, name, clause):
- ids = self.search(['OR',
- ('start_balance',) + clause[1:],
- ('end_balance',) + clause[1:],
- ])
- if ids:
- return [('id', 'in', ids)]
- return [('journal',) + clause[1:]]
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ statements = cls.search(['OR',
+ ('start_balance',) + tuple(clause[1:]),
+ ('end_balance',) + tuple(clause[1:]),
+ ])
+ if statements:
+ return [('id', 'in', [s.id for s in statements])]
+ return [('journal',) + tuple(clause[1:])]
- def get_move_lines(self, ids, name):
+ def get_move_lines(self, name):
'''
- Return the move lines that have been generated by the statements.
+ Return the move lines that have been generated by the statement.
'''
- res = {}
- for statement in self.browse(ids):
- res[statement.id] = []
- for line in statement.lines:
- if not line.move:
- continue
- for move_line in line.move.lines:
- res[statement.id].append(move_line.id)
- return res
-
- def get_end_balance(self, ids, name):
- statements = self.browse(ids)
- res = {}
- for statement in statements:
- res[statement.id] = statement.start_balance
- for line in statement.lines:
- res[statement.id] += line.amount
- return res
-
- def get_balance(self, ids, name):
- return dict((s.id, s.end_balance - s.start_balance)
- for s in self.browse(ids))
-
- def on_change_with_balance(self, values):
- if not set(('end_balance', 'start_balance')) <= set(values):
- return Decimal(0)
- else:
- return Decimal(values.get('end_balance') or 0
- - values.get('start_balance') or 0)
-
- def on_change_lines(self, values):
+ move_lines = []
+ for line in self.lines:
+ if not line.move:
+ continue
+ for move_line in line.move.lines:
+ move_lines.append(move_line.id)
+ return move_lines
+
+ def get_end_balance(self, name):
+ end_balance = self.start_balance
+ for line in self.lines:
+ end_balance += line.amount
+ return end_balance
+
+ def on_change_with_balance(self, name=None):
+ return ((getattr(self, 'end_balance', 0) or 0)
+ - (getattr(self, 'start_balance', 0) or 0))
+
+ def on_change_lines(self):
pool = Pool()
- invoice_obj = pool.get('account.invoice')
- journal_obj = pool.get('account.statement.journal')
- currency_obj = pool.get('currency.currency')
+ Currency = pool.get('currency.currency')
+ Line = pool.get('account.statement.line')
res = {
'lines': {},
- }
- if values.get('journal') and values.get('lines'):
- journal = journal_obj.browse(values['journal'])
- invoice_ids = set()
- for line in values['lines']:
- if line['invoice']:
- invoice_ids.add(line['invoice'])
+ }
+ if self.journal and self.lines:
+ invoices = set()
+ for line in self.lines:
+ if line.invoice:
+ invoices.add(line.invoice)
invoice_id2amount_to_pay = {}
- for invoice in invoice_obj.browse(list(invoice_ids)):
+ for invoice in invoices:
with Transaction().set_context(date=invoice.currency_date):
invoice_id2amount_to_pay[invoice.id] = (
- currency_obj.compute(invoice.currency.id,
- invoice.amount_to_pay, journal.currency.id))
+ Currency.compute(invoice.currency,
+ invoice.amount_to_pay, self.journal.currency))
- for line in values['lines']:
- if line['invoice'] and line['id']:
- amount_to_pay = invoice_id2amount_to_pay[line['invoice']]
- if abs(line['amount']) > amount_to_pay:
+ for line in self.lines or []:
+ if line.invoice and line.id:
+ amount_to_pay = invoice_id2amount_to_pay[line.invoice.id]
+ if abs(line.amount) > amount_to_pay:
res['lines'].setdefault('update', [])
- if currency_obj.is_zero(journal.currency,
- amount_to_pay):
+ if self.journal.currency.is_zero(amount_to_pay):
res['lines']['update'].append({
- 'id': line['id'],
+ 'id': line.id,
'invoice': None,
})
else:
res['lines']['update'].append({
- 'id': line['id'],
+ 'id': line.id,
'amount': (amount_to_pay
- if line['amount'] >= 0
+ if line.amount >= 0
else -amount_to_pay),
})
res['lines'].setdefault('add', [])
- vals = line.copy()
+ vals = {}
+ for field_name, field in Line._fields.iteritems():
+ try:
+ value = getattr(line, field_name)
+ except AttributeError:
+ continue
+ if (value and field._type in ('many2one',
+ 'one2one')):
+ vals[field_name] = value.id
+ vals[field_name + '.rec_name'] = \
+ value.rec_name
+ else:
+ vals[field_name] = value
del vals['id']
- vals['amount'] = (abs(line['amount'])
+ vals['amount'] = (abs(line.amount)
- amount_to_pay)
- if line['amount'] < 0:
+ if line.amount < 0:
vals['amount'] = - vals['amount']
vals['invoice'] = None
+ del vals['invoice.rec_name']
res['lines']['add'].append(vals)
- invoice_id2amount_to_pay[line['invoice']] = \
- amount_to_pay - abs(line['amount'])
+ invoice_id2amount_to_pay[line.invoice.id] = \
+ amount_to_pay - abs(line.amount)
return res
- def delete(self, ids):
- if isinstance(ids, (int, long)):
- ids = [ids]
+ @classmethod
+ def delete(cls, statements):
# Cancel before delete
- self.cancel(ids)
- for statement in self.browse(ids):
+ cls.cancel(statements)
+ for statement in statements:
if statement.state != 'cancel':
- self.raise_user_error('delete_cancel', statement.rec_name)
- return super(Statement, self).delete(ids)
+ cls.raise_user_error('delete_cancel', statement.rec_name)
+ super(Statement, cls).delete(statements)
+ @classmethod
@ModelView.button
@Workflow.transition('draft')
- def draft(self, ids):
+ def draft(cls, statements):
pass
+ @classmethod
@ModelView.button
@Workflow.transition('validated')
- def validate(self, ids):
- statement_line_obj = Pool().get('account.statement.line')
- lang_obj = Pool().get('ir.lang')
+ def validate(cls, statements):
+ Lang = Pool().get('ir.lang')
- for statement in self.browse(ids):
+ for statement in statements:
computed_end_balance = statement.start_balance
for line in statement.lines:
computed_end_balance += line.amount
if computed_end_balance != statement.end_balance:
- lang_id, = lang_obj.search([
+ lang, = Lang.search([
('code', '=', Transaction().language),
])
- lang = lang_obj.browse(lang_id)
- amount = lang_obj.format(lang,
+ amount = Lang.format(lang,
'%.' + str(statement.journal.currency.digits) + 'f',
computed_end_balance, True)
- self.raise_user_error('wrong_end_balance',
+ cls.raise_user_error('wrong_end_balance',
error_args=(amount,))
for line in statement.lines:
- statement_line_obj.create_move(line)
+ line.create_move()
+ @classmethod
@ModelView.button
@Workflow.transition('posted')
- def post(self, ids):
- statement_line_obj = Pool().get('account.statement.line')
+ def post(cls, statements):
+ StatementLine = Pool().get('account.statement.line')
- statements = self.browse(ids)
lines = [l for s in statements for l in s.lines]
- statement_line_obj.post_move(lines)
+ StatementLine.post_move(lines)
+ @classmethod
@ModelView.button
@Workflow.transition('cancel')
- def cancel(self, ids):
- statement_line_obj = Pool().get('account.statement.line')
+ def cancel(cls, statements):
+ StatementLine = Pool().get('account.statement.line')
- statements = self.browse(ids)
lines = [l for s in statements for l in s.lines]
- statement_line_obj.delete_move(lines)
-
-Statement()
+ StatementLine.delete_move(lines)
class Line(ModelSQL, ModelView):
'Account Statement Line'
- _name = 'account.statement.line'
- _description = __doc__
-
+ __name__ = 'account.statement.line'
statement = fields.Many2One('account.statement', 'Statement',
required=True, ondelete='CASCADE')
date = fields.Date('Date', required=True)
@@ -357,9 +345,7 @@ class Line(ModelSQL, ModelView):
on_change=['account', 'invoice'], domain=[
('company', '=', Eval('_parent_statement', {}).get('company', 0)),
If(Bool(Eval('party')),
- If(Eval('amount', 0) > 0,
- ('kind', '=', 'receivable'),
- ('kind', '=', 'payable')),
+ ('kind', 'in', ['receivable', 'payable']),
('kind', 'in', ['payable', 'receivable', 'revenue', 'expense',
'other'])),
],
@@ -375,13 +361,14 @@ class Line(ModelSQL, ModelView):
('state', '!=', '')),
],
states={
- 'readonly': ~Eval('amount'),
+ 'readonly': (~Eval('amount') | ~Eval('party') | ~Eval('account')),
},
depends=['party', 'account', 'amount'])
- def __init__(self):
- super(Line, self).__init__()
- self._error_messages.update({
+ @classmethod
+ def __setup__(cls):
+ super(Line, cls).__setup__()
+ cls._error_messages.update({
'debit_credit_account_statement_journal': 'Please provide debit '
'and credit account on statement journal.',
'same_debit_credit_account': 'Credit or debit account on '
@@ -389,214 +376,206 @@ class Line(ModelSQL, ModelView):
'amount_greater_invoice_amount_to_pay': 'Amount (%s) greater than '
'the amount to pay of invoice!',
})
- self._sql_constraints += [
+ cls._sql_constraints += [
('check_statement_line_amount', 'CHECK(amount != 0)',
'Amount should be a positive or negative value!'),
]
- def default_amount(self):
+ @staticmethod
+ def default_amount():
return Decimal(0)
- def on_change_party(self, value):
- party_obj = Pool().get('party.party')
- invoice_obj = Pool().get('account.invoice')
+ def on_change_party(self):
res = {}
- if value.get('party'):
- party = party_obj.browse(value['party'])
- if value.get('amount'):
- if value['amount'] > Decimal("0.0"):
- account = party.account_receivable
+ if self.party:
+ if self.amount:
+ if self.amount > Decimal("0.0"):
+ account = self.party.account_receivable
else:
- account = party.account_payable
+ account = self.party.account_payable
res['account'] = account.id
res['account.rec_name'] = account.rec_name
- if value.get('invoice'):
- if value.get('party'):
- invoice = invoice_obj.browse(value['invoice'])
- if invoice.party != value['party']:
+ if self.invoice:
+ if self.party:
+ if self.invoice.party != self.party:
res['invoice'] = None
else:
res['invoice'] = None
return res
- def on_change_amount(self, value):
- pool = Pool()
- party_obj = pool.get('party.party')
- invoice_obj = pool.get('account.invoice')
- journal_obj = pool.get('account.statement.journal')
- currency_obj = pool.get('currency.currency')
+ def on_change_amount(self):
+ Currency = Pool().get('currency.currency')
res = {}
- if value.get('party'):
- party = party_obj.browse(value['party'])
- if value.get('account') and value['account'] not in (
- party.account_receivable.id, party.account_payable.id):
+ if self.party:
+ if self.account and self.account not in (
+ self.party.account_receivable, self.party.account_payable):
# The user has entered a non-default value, we keep it.
pass
- elif value.get('amount'):
- if value['amount'] > Decimal("0.0"):
- account = party.account_receivable
+ elif self.amount:
+ if self.amount > Decimal("0.0"):
+ account = self.party.account_receivable
else:
- account = party.account_payable
+ account = self.party.account_payable
res['account'] = account.id
res['account.rec_name'] = account.rec_name
- if value.get('invoice'):
- if value.get('amount') and value.get('_parent_statement.journal'):
- invoice = invoice_obj.browse(value['invoice'])
- journal = journal_obj.browse(
- value['_parent_statement.journal'])
+ if self.invoice:
+ if self.amount and self.statement and self.statement.journal:
+ invoice = self.invoice
+ journal = self.statement.journal
with Transaction().set_context(date=invoice.currency_date):
- amount_to_pay = currency_obj.compute(invoice.currency.id,
- invoice.amount_to_pay, journal.currency.id)
- if abs(value['amount']) > amount_to_pay:
+ amount_to_pay = Currency.compute(invoice.currency,
+ invoice.amount_to_pay, journal.currency)
+ if abs(self.amount) > amount_to_pay:
res['invoice'] = None
else:
res['invoice'] = None
return res
- def on_change_account(self, value):
- invoice_obj = Pool().get('account.invoice')
+ def on_change_account(self):
res = {}
- if value.get('invoice'):
- if value.get('account'):
- invoice = invoice_obj.browse(value['invoice'])
- if invoice.account.id != value['account']:
+ if self.invoice:
+ if self.account:
+ if self.invoice.account != self.account:
res['invoice'] = None
else:
res['invoice'] = None
return res
- def create_move(self, line):
+ def get_rec_name(self, name):
+ return self.statement.rec_name
+
+ @classmethod
+ def copy(cls, lines, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('move', None)
+ default.setdefault('invoice', None)
+ return super(Line, cls).copy(lines, default=default)
+
+ def create_move(self):
'''
- Create move for the statement line and return move id if created.
+ Create move for the statement line and return move if created.
'''
pool = Pool()
- move_obj = pool.get('account.move')
- period_obj = pool.get('account.period')
- invoice_obj = pool.get('account.invoice')
- currency_obj = pool.get('currency.currency')
- move_line_obj = pool.get('account.move.line')
- lang_obj = pool.get('ir.lang')
-
- if line.move:
+ Move = pool.get('account.move')
+ Period = pool.get('account.period')
+ Invoice = pool.get('account.invoice')
+ Currency = pool.get('currency.currency')
+ MoveLine = pool.get('account.move.line')
+ Lang = pool.get('ir.lang')
+
+ if self.move:
return
- period_id = period_obj.find(line.statement.company.id,
- date=line.date)
+ period_id = Period.find(self.statement.company.id, date=self.date)
- move_lines = self._get_move_lines(line)
- move_id = move_obj.create({
- 'name': unicode(line.date),
- 'period': period_id,
- 'journal': line.statement.journal.journal.id,
- 'date': line.date,
- 'lines': [('create', x) for x in move_lines],
- })
+ move_lines = self._get_move_lines()
+ move = Move(
+ period=period_id,
+ journal=self.statement.journal.journal,
+ date=self.date,
+ origin=self,
+ lines=move_lines,
+ )
+ move.save()
- self.write(line.id, {
- 'move': move_id,
- })
+ self.write([self], {
+ 'move': move.id,
+ })
- if line.invoice:
- with Transaction().set_context(date=line.invoice.currency_date):
- amount_to_pay = currency_obj.compute(line.invoice.currency.id,
- line.invoice.amount_to_pay,
- line.statement.journal.currency.id)
- if amount_to_pay < abs(line.amount):
- lang_id, = lang_obj.search([
+ if self.invoice:
+ with Transaction().set_context(date=self.invoice.currency_date):
+ amount_to_pay = Currency.compute(self.invoice.currency,
+ self.invoice.amount_to_pay,
+ self.statement.journal.currency)
+ if amount_to_pay < abs(self.amount):
+ lang, = Lang.search([
('code', '=', Transaction().language),
])
- lang = lang_obj.browse(lang_id)
- amount = lang_obj.format(lang,
- '%.' + str(line.statement.journal.currency.digits) + 'f',
- line.amount, True)
+ amount = Lang.format(lang,
+ '%.' + str(self.statement.journal.currency.digits) + 'f',
+ self.amount, True)
self.raise_user_error('amount_greater_invoice_amount_to_pay',
error_args=(amount,))
- with Transaction().set_context(date=line.invoice.currency_date):
- amount = currency_obj.compute(
- line.statement.journal.currency.id, line.amount,
- line.statement.company.currency.id)
+ with Transaction().set_context(date=self.invoice.currency_date):
+ amount = Currency.compute(self.statement.journal.currency,
+ self.amount, self.statement.company.currency)
- reconcile_lines = invoice_obj.get_reconcile_lines_for_amount(
- line.invoice, abs(amount))
+ reconcile_lines = self.invoice.get_reconcile_lines_for_amount(
+ abs(amount))
- move = move_obj.browse(move_id)
- line_id = None
for move_line in move.lines:
- if move_line.account.id == line.invoice.account.id:
- line_id = move_line.id
- invoice_obj.write(line.invoice.id, {
- 'payment_lines': [('add', line_id)],
- })
+ if move_line.account == self.invoice.account:
+ Invoice.write([self.invoice], {
+ 'payment_lines': [('add', [move_line.id])],
+ })
break
if reconcile_lines[1] == Decimal('0.0'):
- line_ids = reconcile_lines[0] + [line_id]
- move_line_obj.reconcile(line_ids)
- return move_id
+ lines = reconcile_lines[0] + [move_line]
+ MoveLine.reconcile(lines)
+ return move
- def post_move(self, lines):
- move_obj = Pool().get('account.move')
- move_obj.post([l.move.id for l in lines if l.move])
+ @classmethod
+ def post_move(cls, lines):
+ Move = Pool().get('account.move')
+ Move.post([l.move for l in lines if l.move])
- def delete_move(self, lines):
- move_obj = Pool().get('account.move')
- move_obj.delete([l.move.id for l in lines if l.move])
+ @classmethod
+ def delete_move(cls, lines):
+ Move = Pool().get('account.move')
+ Move.delete([l.move for l in lines if l.move])
- def _get_move_lines(self, statement_line):
+ def _get_move_lines(self):
'''
- Return the values of the move lines for the statement line
-
- :param statement_line: a BrowseRecord of the statement line
- :return: a list of dictionary of move line values
+ Return the move lines for the statement line
'''
- currency_obj = Pool().get('currency.currency')
+ pool = Pool()
+ MoveLine = pool.get('account.move.line')
+ Currency = Pool().get('currency.currency')
zero = Decimal("0.0")
- amount = currency_obj.compute(
- statement_line.statement.journal.currency, statement_line.amount,
- statement_line.statement.company.currency)
- if statement_line.statement.journal.currency.id != \
- statement_line.statement.company.currency.id:
- second_currency = statement_line.statement.journal.currency.id
- amount_second_currency = abs(statement_line.amount)
+ amount = Currency.compute(self.statement.journal.currency, self.amount,
+ self.statement.company.currency)
+ if self.statement.journal.currency != self.statement.company.currency:
+ second_currency = self.statement.journal.currency.id
+ amount_second_currency = abs(self.amount)
else:
amount_second_currency = None
second_currency = None
- party_id = statement_line.party.id if statement_line.party else None
- vals = []
- vals.append({
- 'name': unicode(statement_line.date),
- 'debit': amount < zero and -amount or zero,
- 'credit': amount >= zero and amount or zero,
- 'account': statement_line.account.id,
- 'party': party_id,
- 'second_currency': second_currency,
- 'amount_second_currency': amount_second_currency,
- })
+ move_lines = []
+ move_lines.append(MoveLine(
+ description=self.description,
+ debit=amount < zero and -amount or zero,
+ credit=amount >= zero and amount or zero,
+ account=self.account,
+ party=self.party,
+ second_currency=second_currency,
+ amount_second_currency=amount_second_currency,
+ ))
- journal = statement_line.statement.journal.journal
- if statement_line.amount >= zero:
+ journal = self.statement.journal.journal
+ if self.amount >= zero:
account = journal.credit_account
else:
account = journal.debit_account
if not account:
self.raise_user_error('debit_credit_account_statement_journal')
- if statement_line.account.id == account.id:
+ if self.account == account:
self.raise_user_error('same_debit_credit_account')
- vals.append({
- 'name': unicode(statement_line.date),
- 'debit': amount >= zero and amount or zero,
- 'credit': amount < zero and -amount or zero,
- 'account': account.id,
- 'party': party_id,
- 'second_currency': second_currency,
- 'amount_second_currency': amount_second_currency,
- })
- return vals
-
-Line()
+ move_lines.append(MoveLine(
+ description=self.description,
+ debit=amount >= zero and amount or zero,
+ credit=amount < zero and -amount or zero,
+ account=account,
+ party=self.party,
+ second_currency=second_currency,
+ amount_second_currency=amount_second_currency,
+ ))
+ return move_lines
diff --git a/statement.xml b/statement.xml
index 6dc6481..7eef24a 100644
--- a/statement.xml
+++ b/statement.xml
@@ -43,14 +43,11 @@ this repository contains the full copyright notices and license terms. -->
<label name="state"/>
<field name="state"/>
<group col="4" colspan="2" id="buttons">
- <button string="Validate" name="validate"
- type="object"/>
- <button string="Cancel" name="cancel"
- type="object"/>
- <button string="Post" name="post"
- type="object"/>
- <button string="Reset to Draft" name="draft"
- type="object"/>
+ <button string="Validate" name="validate"/>
+ <button string="Cancel" name="cancel"/>
+ <button string="Post" name="post"/>
+ <button string="Reset to Draft"
+ name="draft"/>
</group>
</group>
</page>
@@ -169,6 +166,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<form string="Statement Line">
+ <label name="statement"/>
+ <field name="statement" colspan="3"/>
<label name="date"/>
<field name="date"/>
<label name="amount"/>
diff --git a/tests/scenario_account_statement.rst b/tests/scenario_account_statement.rst
new file mode 100644
index 0000000..f581bcb
--- /dev/null
+++ b/tests/scenario_account_statement.rst
@@ -0,0 +1,301 @@
+==========================
+Account Statement Scenario
+==========================
+
+=============
+General Setup
+=============
+
+Imports::
+
+ >>> import datetime
+ >>> from dateutil.relativedelta import relativedelta
+ >>> from decimal import Decimal
+ >>> from proteus import config, Model, Wizard
+ >>> today = datetime.date.today()
+
+Create database::
+
+ >>> config = config.set_trytond()
+ >>> config.pool.test = True
+
+Install account_statement and account_invoice::
+
+ >>> Module = Model.get('ir.module.module')
+ >>> modules = Module.find([
+ ... ('name', 'in', ('account_statement', 'account_invoice')),
+ ... ])
+ >>> Module.install([x.id for x in modules], config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+
+Create company::
+
+ >>> Currency = Model.get('currency.currency')
+ >>> CurrencyRate = Model.get('currency.currency.rate')
+ >>> Company = Model.get('company.company')
+ >>> company_config = Wizard('company.company.config')
+ >>> company_config.execute('company')
+ >>> company = company_config.form
+ >>> company.name = 'B2CK'
+ >>> currencies = Currency.find([('code', '=', 'EUR')])
+ >>> if not currencies:
+ ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
+ ... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
+ ... mon_decimal_point=',')
+ ... currency.save()
+ ... CurrencyRate(date=today + relativedelta(month=1, day=1),
+ ... rate=Decimal('1.0'), currency=currency).save()
+ ... else:
+ ... currency, = currencies
+ >>> company.currency = currency
+ >>> company_config.execute('add')
+ >>> company, = Company.find()
+
+Reload the context::
+
+ >>> User = Model.get('res.user')
+ >>> config._context = User.get_preferences(True, config.context)
+
+Create fiscal year::
+
+ >>> FiscalYear = Model.get('account.fiscalyear')
+ >>> Sequence = Model.get('ir.sequence')
+ >>> SequenceStrict = Model.get('ir.sequence.strict')
+ >>> fiscalyear = FiscalYear(name='%s' % today.year)
+ >>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
+ >>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
+ >>> fiscalyear.company = company
+ >>> post_move_sequence = Sequence(name='%s' % today.year,
+ ... code='account.move',
+ ... company=company)
+ >>> post_move_sequence.save()
+ >>> fiscalyear.post_move_sequence = post_move_sequence
+ >>> invoice_sequence = SequenceStrict(name='%s' % today.year,
+ ... code='account.invoice',
+ ... company=company)
+ >>> invoice_sequence.save()
+ >>> fiscalyear.out_invoice_sequence = invoice_sequence
+ >>> fiscalyear.in_invoice_sequence = invoice_sequence
+ >>> fiscalyear.out_credit_note_sequence = invoice_sequence
+ >>> fiscalyear.in_credit_note_sequence = invoice_sequence
+ >>> fiscalyear.save()
+ >>> FiscalYear.create_period([fiscalyear.id], config.context)
+
+Create chart of accounts::
+
+ >>> AccountTemplate = Model.get('account.account.template')
+ >>> Account = Model.get('account.account')
+ >>> AccountJournal = Model.get('account.journal')
+ >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> create_chart = Wizard('account.create_chart')
+ >>> create_chart.execute('account')
+ >>> create_chart.form.account_template = account_template
+ >>> create_chart.form.company = company
+ >>> create_chart.execute('create_account')
+ >>> receivable, = Account.find([
+ ... ('kind', '=', 'receivable'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> payable, = Account.find([
+ ... ('kind', '=', 'payable'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> revenue, = Account.find([
+ ... ('kind', '=', 'revenue'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> expense, = Account.find([
+ ... ('kind', '=', 'expense'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> cash, = Account.find([
+ ... ('name', '=', 'Main Cash'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> create_chart.form.account_receivable = receivable
+ >>> create_chart.form.account_payable = payable
+ >>> create_chart.execute('create_properties')
+
+Create parties::
+
+ >>> Party = Model.get('party.party')
+ >>> supplier = Party(name='Supplier')
+ >>> supplier.save()
+ >>> customer = Party(name='Customer')
+ >>> customer.save()
+
+Create payment term::
+
+ >>> PaymentTerm = Model.get('account.invoice.payment_term')
+ >>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
+ >>> payment_term = PaymentTerm(name='Direct')
+ >>> payment_term_line = PaymentTermLine(type='remainder', days=0)
+ >>> payment_term.lines.append(payment_term_line)
+ >>> payment_term.save()
+
+Create 2 customer invoices::
+
+ >>> Invoice = Model.get('account.invoice')
+ >>> InvoiceLine = Model.get('account.invoice.line')
+ >>> customer_invoice1 = Invoice(type='out_invoice')
+ >>> customer_invoice1.party = customer
+ >>> customer_invoice1.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> customer_invoice1.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('100')
+ >>> invoice_line.account = revenue
+ >>> invoice_line.description = 'Test'
+ >>> customer_invoice1.save()
+ >>> Invoice.open([customer_invoice1.id], config.context)
+ >>> customer_invoice1.state
+ u'open'
+
+ >>> customer_invoice2 = Invoice(type='out_invoice')
+ >>> customer_invoice2.party = customer
+ >>> customer_invoice2.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> customer_invoice2.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('150')
+ >>> invoice_line.account = revenue
+ >>> invoice_line.description = 'Test'
+ >>> customer_invoice2.save()
+ >>> Invoice.open([customer_invoice2.id], config.context)
+ >>> customer_invoice2.state
+ u'open'
+
+Create 1 customer credit note::
+
+ >>> customer_credit_note = Invoice(type='out_credit_note')
+ >>> customer_credit_note.party = customer
+ >>> customer_credit_note.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> customer_credit_note.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('50')
+ >>> invoice_line.account = revenue
+ >>> invoice_line.description = 'Test'
+ >>> customer_credit_note.save()
+ >>> Invoice.open([customer_credit_note.id], config.context)
+ >>> customer_credit_note.state
+ u'open'
+
+Create 1 supplier invoices::
+
+ >>> supplier_invoice = Invoice(type='in_invoice')
+ >>> supplier_invoice.party = supplier
+ >>> supplier_invoice.payment_term = payment_term
+ >>> invoice_line = InvoiceLine()
+ >>> supplier_invoice.lines.append(invoice_line)
+ >>> invoice_line.quantity = 1
+ >>> invoice_line.unit_price = Decimal('50')
+ >>> invoice_line.account = expense
+ >>> invoice_line.description = 'Test'
+ >>> supplier_invoice.save()
+ >>> Invoice.open([supplier_invoice.id], config.context)
+ >>> supplier_invoice.state
+ u'open'
+
+Create statement::
+
+ >>> StatementJournal = Model.get('account.statement.journal')
+ >>> Statement = Model.get('account.statement')
+ >>> StatementLine = Model.get('account.statement.line')
+
+ >>> sequence = Sequence(name='Satement',
+ ... code='account.journal',
+ ... company=company,
+ ... )
+ >>> sequence.save()
+ >>> account_journal = AccountJournal(name='Statement',
+ ... type='statement',
+ ... credit_account=cash,
+ ... debit_account=cash,
+ ... sequence=sequence,
+ ... )
+ >>> account_journal.save()
+
+ >>> statement_journal = StatementJournal(name='Test',
+ ... journal=account_journal,
+ ... )
+ >>> statement_journal.save()
+
+ >>> statement = Statement(journal=statement_journal,
+ ... start_balance=Decimal('0'),
+ ... end_balance=Decimal('80'),
+ ... )
+
+Received 180 from customer::
+
+ >>> statement_line = StatementLine()
+ >>> statement.lines.append(statement_line)
+ >>> statement_line.date = today
+ >>> statement_line.amount = Decimal('180')
+ >>> statement_line.party = customer
+ >>> statement_line.account == receivable
+ True
+ >>> statement_line.invoice = customer_invoice1
+ >>> statement_line.amount == Decimal('100')
+ True
+ >>> statement_line = statement.lines[-1]
+ >>> statement_line.amount == Decimal('80')
+ True
+ >>> statement_line.party == customer
+ True
+ >>> statement_line.account == receivable
+ True
+ >>> statement_line.invoice = customer_invoice2
+ >>> statement_line.amount == Decimal('80')
+ True
+
+Paid 50 to customer::
+
+ >>> statement_line = StatementLine()
+ >>> statement.lines.append(statement_line)
+ >>> statement_line.date = today
+ >>> statement_line.amount = Decimal('-50')
+ >>> statement_line.party = customer
+ >>> statement_line.account = receivable
+ >>> statement_line.invoice = customer_credit_note
+
+Paid 50 to supplier::
+
+ >>> statement_line = StatementLine()
+ >>> statement.lines.append(statement_line)
+ >>> statement_line.date = today
+ >>> statement_line.amount = Decimal('-60')
+ >>> statement_line.party = supplier
+ >>> statement_line.account == payable
+ True
+ >>> statement_line.invoice = supplier_invoice
+ >>> statement_line.amount == Decimal('-50')
+ True
+ >>> statement_line = statement.lines.pop()
+ >>> statement_line.amount == Decimal('-10')
+ True
+
+ >>> statement.save()
+
+Validate statement::
+
+ >>> Statement.validate([statement.id], config.context)
+ >>> statement.state
+ u'validated'
+
+Test invoice state::
+
+ >>> customer_invoice1.reload()
+ >>> customer_invoice1.state
+ u'paid'
+ >>> customer_invoice2.reload()
+ >>> customer_invoice2.state
+ u'open'
+ >>> customer_invoice2.amount_to_pay == Decimal('70')
+ True
+ >>> customer_credit_note.reload()
+ >>> customer_credit_note.state
+ u'paid'
+ >>> supplier_invoice.reload()
+ >>> supplier_invoice.state
+ u'paid'
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..c93be46
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,11 @@
+[tryton]
+version=2.6.0
+depends:
+ account
+ account_invoice
+ company
+ currency
+ party
+xml:
+ statement.xml
+ journal.xml
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index e72a494..317957b 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 2.4.2
-Summary: Financial and Accounting Module with:
- - Statement
- - Statement journal
-
+Version: 2.6.0
+Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_account_statement
+ =========================
+
+ The account_statement module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 9031f8b..7c05366 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -7,8 +7,9 @@ README
journal.xml
setup.py
statement.xml
+tryton.cfg
./__init__.py
-./__tryton__.py
+./account.py
./journal.py
./statement.py
./tests/__init__.py
@@ -23,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+tests/scenario_account_statement.rst
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
trytond_account_statement.egg-info/dependency_links.txt
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 887e4a4..c8bf816 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 2.4, < 2.5
-trytond_company >= 2.4, < 2.5
-trytond_currency >= 2.4, < 2.5
-trytond_party >= 2.4, < 2.5
-trytond_account_invoice >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_account >= 2.6, < 2.7
+trytond_account_invoice >= 2.6, < 2.7
+trytond_company >= 2.6, < 2.7
+trytond_currency >= 2.6, < 2.7
+trytond_party >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 5978c21f4633ec78b2a0c8e1b4490576f69b5cbd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:17 2012 +0200
Releasing debian version 2.4.2-2.
diff --git a/debian/changelog b/debian/changelog
index 1ebf5ef..95694ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-account-statement (2.4.2-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2 (Closes: #687758).
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 17 Sep 2012 16:40:45 +0200
+
tryton-modules-account-statement (2.4.2-1) experimental; urgency=low
* Merging upstream version 2.4.2.
commit faf98e21a117b353cd6bd4afc8df0d1e7fa2982d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index a9ef4cf..a067de2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
commit 9f52afec45f41c5db55aa323fda1ff7ec18f2f9b
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:53:50 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
commit adb417d170e88700c19dccad338af0ed9b041f3b
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 936d353..4f54669 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- (C) 2004-2008 Tiny SPRL
- (C) 2008-2012 Cedric Krier
- (C) 2008-2012 Bertrand Chenal
- (C) 2008-2012 B2CK SPRL
+Copyright: 2004-2008 Tiny SPRL
+ 2008-2012 Cedric Krier
+ 2008-2012 Bertrand Chenal
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit fa826ab00b0214ddf9cd5d41978564b5736b8868
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:03 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index b327a22..a9ef4cf 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-statement.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account-statement.git
X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
commit b76d8806ffc5095a07a7f6edb31f45b2c933de7d
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:29 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 0732fd4..b327a22 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-account-statement
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 905656ed81e69faf7896b3cd43e2f3b0b709eb93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 14:28:52 2012 +0200
Releasing debian version 2.4.2-1.
diff --git a/debian/changelog b/debian/changelog
index e3be45e..1ebf5ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (2.4.2-1) experimental; urgency=low
+
+ * Merging upstream version 2.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Sep 2012 13:27:09 +0200
+
tryton-modules-account-statement (2.4.1-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 4542ed65dd4141d58298afb6bf87701b31b39ebd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:25:49 2012 +0200
Merging upstream version 2.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 3029811..60f09d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.1 - 2012-04-24
* Restore es_AR translation
diff --git a/PKG-INFO b/PKG-INFO
index 3d34034..0591fbc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 2.4.1
+Version: 2.4.2
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
diff --git a/__tryton__.py b/__tryton__.py
index 7a3939a..99fd61a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_es_ES': 'Extractos contables',
'name_fr_FR': 'Relevé comptable',
'name_nl_NL': 'Bankafschriften',
- 'version': '2.4.1',
+ 'version': '2.4.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/statement.py b/statement.py
index 911d5f0..8c657c0 100644
--- a/statement.py
+++ b/statement.py
@@ -262,7 +262,9 @@ class Statement(Workflow, ModelSQL, ModelView):
else:
res['lines']['update'].append({
'id': line['id'],
- 'amount': amount_to_pay,
+ 'amount': (amount_to_pay
+ if line['amount'] >= 0
+ else -amount_to_pay),
})
res['lines'].setdefault('add', [])
vals = line.copy()
@@ -368,8 +370,9 @@ class Line(ModelSQL, ModelView):
domain=[
('party', '=', Eval('party')),
('account', '=', Eval('account')),
- ('state', '=', If(Eval('_parent_statement', {}).get('state')
- == 'draft', 'open', '')),
+ If(Eval('_parent_statement', {}).get('state') == 'draft',
+ ('state', '=', 'open'),
+ ('state', '!=', '')),
],
states={
'readonly': ~Eval('amount'),
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index ddeaf17..e72a494 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 2.4.1
+Version: 2.4.2
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
commit 1f65210d1fe5638377277ea2fc9c19de1b502048
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:43:13 2012 +0200
Releasing debian version 2.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index 2b50ec5..e3be45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-account-statement (2.4.1-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Merging upstream version 2.4.1.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:35:43 +0200
+
tryton-modules-account-statement (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit b2c968103c99d1fcc1230265681f218161151bd7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:10:55 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index 6cbc5e5..0732fd4 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,10 @@ X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-account (>= 2.2), tryton-modules-account-invoice (>= 2.2),
- tryton-modules-company (>= 2.2), tryton-modules-currency (>= 2.2),
- tryton-modules-party (>= 2.2), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-account (>= 2.4), tryton-modules-account-invoice (>= 2.4),
+ tryton-modules-company (>= 2.4), tryton-modules-currency (>= 2.4),
+ tryton-modules-party (>= 2.4), python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 4695d5eb2789ed1486160607ded2c97384345d97
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:32 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 21a85a7..936d353 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ (C) 2008-2012 Cedric Krier
+ (C) 2008-2012 Bertrand Chenal
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 722f5940c2cbfc8d007720c671b2053e08fdf2e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 11:03:28 2012 +0200
Merging upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 014d85f..3029811 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
* Don't deactivate payment wizard on invoice
diff --git a/PKG-INFO b/PKG-INFO
index 4784c6c..3d34034 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 2.4.0
+Version: 2.4.1
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
diff --git a/__tryton__.py b/__tryton__.py
index 6b6e24b..7a3939a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_es_ES': 'Extractos contables',
'name_fr_FR': 'Relevé comptable',
'name_nl_NL': 'Bankafschriften',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..a85b411 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,352 @@
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "¡El importe (%s) es mayor que el importe a pagar de la factura!"
+
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr "¡El importe debe ser un valor positivo o negativo!"
+
+msgctxt "error:account.statement.line:"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"¡La cuenta débito o crédito en el diario es la misma que la de la línea de "
+"extracto!"
+
+msgctxt "error:account.statement.line:"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Por favor indique las cuentas débito y crédito en un diario de extracto."
+
+msgctxt "error:account.statement:"
+msgid "End Balance must be %s!"
+msgstr "¡El balance final debe ser %s!"
+
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr "¡Debe cancelar el extracto \"%s\" antes de eliminarlo!"
+
+msgctxt "field:account.statement,balance:"
+msgid "Balance"
+msgstr "Balance"
+
+msgctxt "field:account.statement,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:account.statement,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:account.statement,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement,end_balance:"
+msgid "End Balance"
+msgstr "Balance final"
+
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement,journal:"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement,lines:"
+msgid "Transactions"
+msgstr "Transacciones"
+
+msgctxt "field:account.statement,move_lines:"
+msgid "Move Lines"
+msgstr "Líneas de asientos"
+
+msgctxt "field:account.statement,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement,start_balance:"
+msgid "Start Balance"
+msgstr "Balance inicial"
+
+msgctxt "field:account.statement,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:account.statement.journal,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:account.statement.journal,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.journal,journal:"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement.journal,name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.journal,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:account.statement.line,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.statement.line,amount:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:account.statement.line,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement.line,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.line,invoice:"
+msgid "Invoice"
+msgstr "Factura"
+
+msgctxt "field:account.statement.line,move:"
+msgid "Account Move"
+msgstr "Asiento contable"
+
+msgctxt "field:account.statement.line,party:"
+msgid "Party"
+msgstr "Entidad"
+
+msgctxt "field:account.statement.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.line,statement:"
+msgid "Statement"
+msgstr "Extracto"
+
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Extracto"
+
+msgctxt "model:account.statement,name:"
+msgid "Account Statement"
+msgstr "Extracto bancario"
+
+msgctxt "model:account.statement.journal,name:"
+msgid "Statement Journal"
+msgstr "Diario de extracto"
+
+msgctxt "model:account.statement.line,name:"
+msgid "Account Statement Line"
+msgstr "Línea de extracto bancario"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Extractos borrador"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Extractos confirmados"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Todos los extractos"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Diarios de extracto"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Extractos validados"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Extractos borrador"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Extractos confirmados"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Extractos"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Todos los extractos"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Diarios de extracto"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Extractos"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Extractos validados"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Extracto"
+
+msgctxt "selection:account.statement,state:"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "selection:account.statement,state:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:account.statement,state:"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt "selection:account.statement,state:"
+msgid "Validated"
+msgstr "Validado"
+
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journal"
+msgstr "Diario de extracto"
+
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journals"
+msgstr "Diarios de extracto"
+
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "view:account.statement.line:"
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+msgctxt "view:account.statement.line:"
+msgid "Statement Line"
+msgstr "Línea de extracto bancario"
+
+msgctxt "view:account.statement.line:"
+msgid "Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+msgctxt "view:account.statement:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statements"
+msgstr "Extractos bancarios"
+
+msgctxt "view:account.statement:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:account.statement:"
+msgid "Move Lines"
+msgstr "Líneas de asientos"
+
+msgctxt "view:account.statement:"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:account.statement:"
+msgid "Post"
+msgstr "Confirmar"
+
+msgctxt "view:account.statement:"
+msgid "Reset to Draft"
+msgstr "Restablecer a borrador"
+
+msgctxt "view:account.statement:"
+msgid "Statement"
+msgstr "Extracto"
+
+msgctxt "view:account.statement:"
+msgid "Statement Lines"
+msgstr "Líneas de extracto"
+
+msgctxt "view:account.statement:"
+msgid "Statements"
+msgstr "Extractos"
+
+msgctxt "view:account.statement:"
+msgid "Validate"
+msgstr "Validar"
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 1609b8c..ddeaf17 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 2.4.0
+Version: 2.4.1
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
commit 530a1ad42a3d0c6abfdb6046d3aa7626d8d96286
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:37 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index af7659b..014d85f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+* Don't deactivate payment wizard on invoice
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..ede3fac 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 00735f3..d7e3980 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_statement
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 12c55a3..4784c6c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 2.2.0
+Version: 2.4.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 3809ed2..ad03490 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from journal import *
-from statement import *
+from .journal import *
+from .statement import *
diff --git a/__tryton__.py b/__tryton__.py
index 96aebf8..6b6e24b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,12 +3,14 @@
{
'name': 'Account Statement',
'name_bg_BG': 'Отчет на сметка',
+ 'name_ca_ES': 'Extractes comptables',
'name_de_DE': 'Buchhaltung Bankauszüge',
+ 'name_es_AR': 'Estado de Cuentas',
'name_es_CO': 'Estado de Cuentas',
- 'name_es_ES': 'Estado de cuentas',
+ 'name_es_ES': 'Extractos contables',
'name_fr_FR': 'Relevé comptable',
'name_nl_NL': 'Bankafschriften',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -20,17 +22,25 @@
- Отчети
- Дневник на отчети
''',
+ 'description_ca_ES': '''Mòdul financer i comptable amb:
+ - Extractes comptables
+ - Diari d'extracte
+''',
'description_de_DE': '''Modul für Buchhaltung und Bankauszüge mit
- Abstimmung von Bankauszügen und Rechnungen
''',
- 'description_es_CO': '''Módulo Financiero y Contable con:
+ 'description_es_AR': '''Módulo financiero y contable con:
- Estado de cuentas
- Diario de estado de cuentas
''',
- 'description_es_ES': '''Módulo financiero y contable con:
+ 'description_es_CO': '''Módulo Financiero y Contable con:
- Estado de cuentas
- Diario de estado de cuentas
''',
+ 'description_es_ES': '''Módulo financiero y contable con:
+ - Extractos contables
+ - Diario de extracto
+''',
'description_fr_FR': '''Module financier et comptable avec:
- Relevé
- Journal de relevés
@@ -49,12 +59,13 @@
'xml': [
'statement.xml',
'journal.xml',
- 'invoice.xml',
],
'translation': [
'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_ES.po',
'locale/fr_FR.po',
diff --git a/invoice.xml b/invoice.xml
deleted file mode 100644
index d5fed68..0000000
--- a/invoice.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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. -->
-<tryton>
- <data>
- <record model="ir.ui.view" id="invoice_view_form">
- <field name="model">account.invoice</field>
- <field name="type">form</field>
- <field name="inherit" ref="account_invoice.invoice_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page/group/group/group/button[@name="%(account_invoice.wizard_pay_invoice)d"]"
- position="replace">
- </xpath>
- </data>
- ]]>
- </field>
- </record>
- </data>
-</tryton>
diff --git a/journal.py b/journal.py
index d398975..540efb2 100644
--- a/journal.py
+++ b/journal.py
@@ -14,16 +14,16 @@ class Journal(ModelSQL, ModelView):
journal = fields.Many2One('account.journal', 'Journal', required=True,
domain=[('type', '=', 'statement')])
currency = fields.Many2One('currency.currency', 'Currency', required=True)
- company = fields.Many2One('company.company', 'Company', required=True)
+ company = fields.Many2One('company.company', 'Company', required=True,
+ select=True)
def default_currency(self):
if Transaction().context.get('company'):
company_obj = Pool().get('company.company')
company = company_obj.browse(Transaction().context['company'])
return company.currency.id
- return False
def default_company(self):
- return Transaction().context.get('company') or False
+ return Transaction().context.get('company')
Journal()
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 9d151ea..7e0f87c 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,11 +2,15 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr "Сумата (%s) е по-голяма от сумата за плащане по фактурата!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
@@ -14,128 +18,191 @@ msgstr ""
"Кредитната/дебитната сметка на дневника е същата сметката като на ред от "
"отчета!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr "Моля укажете дебитна и кредитна сметка за дневника за отчети."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr "Крайния баланс трябва да е %s!"
-#, fuzzy
-msgctxt "field:account.statement,balance:0"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Баланс"
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Цифри за валута"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Дата"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Краен баланс"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Дневник"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Транзакции"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr "Редове на движение"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Начален баланс"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Състояние"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Валута"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Дневник"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Сметка"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr "Сума"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Дата"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Описание"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Фактура"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Движение по сметка"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Партньор"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Отчет"
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr "Отчет"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr "Отчет за сметка"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr "Дневник за отчети"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ред от отчет за сметка"
@@ -191,95 +258,78 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Отчет"
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Отчет"
-
-msgctxt "model:workflow.activity,name:statement_act_cancel"
-msgid "Canceled"
-msgstr "Отказан"
-
-msgctxt "model:workflow.activity,name:statement_act_draft"
-msgid "Draft"
-msgstr "Проект"
-
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr "Публикуван"
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr "Проверен"
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Отказан"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Проект"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Публикуван"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Проверен"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Дневник за отчети"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Дневник за отчети"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Ред от отчет"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Редове от отчет"
-#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Сума"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Отказ"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Редове от движение"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Друга информация"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Публикуван"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Изпращане в проект"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Отчет"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr "Редове от отчет"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Отчети"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Проверка"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..3b4412c
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,356 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "L'import (%s) és superior que la quantitat a pagar de la factura"
+
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Els compte deure o haver del diari és el mateix que el compte de la línia "
+"d'extracte."
+
+msgctxt "error:account.statement.line:"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Si us plau, indiqui els comptes deure i haver en el llibre d'estat de "
+"comptes."
+
+msgctxt "error:account.statement:"
+msgid "End Balance must be %s!"
+msgstr "El balanç final ha de ser %s"
+
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,balance:"
+msgid "Balance"
+msgstr "Balanç"
+
+#, fuzzy
+msgctxt "field:account.statement,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:account.statement,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:account.statement,date:"
+msgid "Date"
+msgstr "Data"
+
+msgctxt "field:account.statement,end_balance:"
+msgid "End Balance"
+msgstr "Balanç final"
+
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement,journal:"
+msgid "Journal"
+msgstr "Diari"
+
+msgctxt "field:account.statement,lines:"
+msgid "Transactions"
+msgstr "Transaccions"
+
+msgctxt "field:account.statement,move_lines:"
+msgid "Move Lines"
+msgstr "Línies d'assentament"
+
+msgctxt "field:account.statement,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement,start_balance:"
+msgid "Start Balance"
+msgstr "Balanç inicial"
+
+msgctxt "field:account.statement,state:"
+msgid "State"
+msgstr "Estat"
+
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:account.statement.journal,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:"
+msgid "Journal"
+msgstr "Diari"
+
+msgctxt "field:account.statement.journal,name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.journal,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.statement.line,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:account.statement.line,date:"
+msgid "Date"
+msgstr "Data"
+
+msgctxt "field:account.statement.line,description:"
+msgid "Description"
+msgstr "Descripció"
+
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:"
+msgid "Invoice"
+msgstr "Factura"
+
+msgctxt "field:account.statement.line,move:"
+msgid "Account Move"
+msgstr "Assentament comptable"
+
+msgctxt "field:account.statement.line,party:"
+msgid "Party"
+msgstr "Tercer"
+
+msgctxt "field:account.statement.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.line,statement:"
+msgid "Statement"
+msgstr "Extracte de comptes"
+
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Extracte de comptes"
+
+msgctxt "model:account.statement,name:"
+msgid "Account Statement"
+msgstr "Extracte de comptes"
+
+msgctxt "model:account.statement.journal,name:"
+msgid "Statement Journal"
+msgstr "Diari d'estats de compte"
+
+msgctxt "model:account.statement.line,name:"
+msgid "Account Statement Line"
+msgstr "Línia d'estat de compte"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Estats de compte en esborrany"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estats de compte confirmats"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Tots els estats de compte"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Llibres d'estats de compte"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estats de compte validats"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Estats de compte en esborrany"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estats de compte confirmats"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Estats de compte"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Tots els estats de compte"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Diaris d'estats de compte"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Estats de compte"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estats de compte validats"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Estat de compte"
+
+msgctxt "selection:account.statement,state:"
+msgid "Canceled"
+msgstr "Cancel·lat"
+
+msgctxt "selection:account.statement,state:"
+msgid "Draft"
+msgstr "Esborrany"
+
+msgctxt "selection:account.statement,state:"
+msgid "Posted"
+msgstr "Confirmat"
+
+msgctxt "selection:account.statement,state:"
+msgid "Validated"
+msgstr "Validat"
+
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journal"
+msgstr "Llibre d'estats de compte"
+
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journals"
+msgstr "Llibres d'estats de compte"
+
+#, fuzzy
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Quantitat"
+
+msgctxt "view:account.statement.line:"
+msgid "Bank Statement Line"
+msgstr "Línia d'extracte bancari"
+
+msgctxt "view:account.statement.line:"
+msgid "Statement Line"
+msgstr "Linea d'estat de compte"
+
+msgctxt "view:account.statement.line:"
+msgid "Statement Lines"
+msgstr "Línies d'estat de compte"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statement"
+msgstr "Extracte bancari"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statement Lines"
+msgstr "Línies d'extracte bancari"
+
+msgctxt "view:account.statement:"
+msgid "Bank Statements"
+msgstr "Extractes bancaris"
+
+msgctxt "view:account.statement:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+msgctxt "view:account.statement:"
+msgid "Move Lines"
+msgstr "Línies de seients"
+
+#, fuzzy
+msgctxt "view:account.statement:"
+msgid "Other Info"
+msgstr "Informació addicional"
+
+msgctxt "view:account.statement:"
+msgid "Post"
+msgstr "Confirmar"
+
+msgctxt "view:account.statement:"
+msgid "Reset to Draft"
+msgstr "Restablir a esborrany"
+
+msgctxt "view:account.statement:"
+msgid "Statement"
+msgstr "Estat de compte"
+
+msgctxt "view:account.statement:"
+msgid "Statement Lines"
+msgstr "Línies d'estat de compte"
+
+msgctxt "view:account.statement:"
+msgid "Statements"
+msgstr "Estats de compte"
+
+msgctxt "view:account.statement:"
+msgid "Validate"
+msgstr "Validar"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 8113590..0b3d256 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,137 +2,205 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr ""
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
msgstr ""
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr ""
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr ""
-msgctxt "field:account.statement,balance:0"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr ""
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr ""
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr ""
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr ""
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr ""
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr ""
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr ""
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr ""
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr ""
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr ""
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr ""
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr ""
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr ""
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr ""
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr ""
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr ""
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr ""
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr ""
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr ""
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr ""
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr ""
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr ""
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr ""
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr ""
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr ""
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
@@ -188,90 +256,74 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr ""
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:statement_act_cancel"
-msgid "Canceled"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:statement_act_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr ""
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr ""
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr ""
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr ""
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr ""
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr ""
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr ""
+
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr ""
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c244c82..7803609 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,11 +2,15 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr "Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr "Betrag sollte ein positiver oder negativer Wert sein!"
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
@@ -14,127 +18,192 @@ msgstr ""
"Haben- oder Sollkonto im Journal ist das selbe Konto wie das des "
"Zahlungspostens!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr "Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr "Endsaldo muss %s sein!"
-msgctxt "field:account.statement,balance:0"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+"Kontoauszug \"%s\" muss annulliert werden, bevor sie gelöscht werden kann."
+
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Saldo"
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Stellen Währung"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Endsaldo"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Journal"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transaktionen"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr "Buchungszeilen"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Anfangssaldo"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Status"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Währung"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Journal"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Konto"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr "Betrag"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Beschreibung"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Rechnung"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Buchungssatz"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Partei"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Kontoauszug"
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr "Kontoauszug"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr "Zahlungsverkehr"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr "Journal Kontoauszug"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Zahlungsverkehr Position"
@@ -190,110 +259,94 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Kontoauszug"
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Kontoauszug"
-
-msgctxt "model:workflow.activity,name:statement_act_cancel"
-msgid "Canceled"
-msgstr "Annulliert"
-
-msgctxt "model:workflow.activity,name:statement_act_draft"
-msgid "Draft"
-msgstr "Entwurf"
-
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr "Festgeschrieben"
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr "Geprüft"
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Annulliert"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Entwurf"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Festgeschrieben"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Geprüft"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Journal Kontoauszug"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Journale Kontoauszüge"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "view:account.statement.line:"
msgid "Bank Statement Line"
msgstr "Posten Kontoauszug"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Kontoauszug Position"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Kontoauszug Positionen"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Betrag"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement"
msgstr "Kontoauszug"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement Lines"
msgstr "Posten Kontoauszug"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statements"
msgstr "Kontoauszüge"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annullieren"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Buchungszeilen"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Sonstiges"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Festschreiben"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Auf Entwurf zurücksetzen"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Kontoauszug"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr "Kontoauszug Positionen"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Kontoauszüge"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Prüfen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 443a08a..1379c4f 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,11 +2,15 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr "¡El valor (%s) es mayor que lo que se debe pagar en la factura!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
@@ -14,131 +18,198 @@ msgstr ""
"¡Las cuentas crédito o débito en un diario son las mismas que las líneas de "
"estado de cuenta!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr ""
"Por favor indique las cuentas débito y crédito en el libro de estado de "
"cuentas."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr "El Balance debe ser %s!"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
#, fuzzy
-msgctxt "field:account.statement,balance:0"
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Balance"
#, fuzzy
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Dígitos de Moneda"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Balance Final"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Diario"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacciones"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr "Líneas de Movimiento"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Balance Inicial"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Moneda"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Diario"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Cuenta"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr "Cantidad"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Factura"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Movimiento de Cuenta"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Estado de Cuenta"
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr "Estado de Cuenta"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr "Estado de Cuentas"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr "Diario de Estados de Cuenta"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Línea de Estado de Cuenta"
@@ -194,112 +265,97 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Estado de Cuenta"
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Estado de Cuenta"
-
-msgctxt "model:workflow.activity,name:statement_act_cancel"
-msgid "Canceled"
-msgstr "Cancelado"
-
-msgctxt "model:workflow.activity,name:statement_act_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Cancelado"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Confirmado"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Validado"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Libro de Estados de Cuenta"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Libros de Estados de Cuenta"
-msgctxt "view:account.statement.line:0"
+#, fuzzy
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "view:account.statement.line:"
msgid "Bank Statement Line"
msgstr "Línea de extracto bancario"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Libros de Estados de Cuenta"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Líneas de Estado de Cuenta"
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Cantidad"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement"
msgstr "Extractos Bancarios"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement Lines"
msgstr "Líneas de extracto bancario"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statements"
msgstr "Extractos Bancarios"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Líneas de Movimiento"
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información Adicional"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Confirmar"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Revertir a Borrador"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Estado de Cuenta"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr "Líneas de Estado de Cuenta"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Estados de Cuenta"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Validar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 3ca634c..9a5f035 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,303 +2,350 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
-msgstr "La cantidad (%s) es mayor que la cantidad a pagar de la factura"
+msgstr "El importe (%s) es mayor que el importe a pagar de la factura."
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr "El importe debe ser un valor positivo o negativo."
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
msgstr ""
-"Las cuentas debe o haber en el diario son las mismas que las línea de estado"
-" de cuenta"
+"La cuenta debe o haber en el diario es la misma que la de la línea de "
+"extracto."
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
-msgstr ""
-"Por favor indique las cuentas debe y haber en el libro de estado de cuentas."
+msgstr "Indique las cuentas debe y haber en un diario de extracto."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
-msgstr "El balance final debe ser %s"
+msgstr "El balance final debe ser %s."
+
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr "Debe cancelar el extracto \"%s\" antes de eliminarlo."
-#, fuzzy
-msgctxt "field:account.statement,balance:0"
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Balance"
-#, fuzzy
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Balance final"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Diario"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacciones"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
-msgstr "Líneas de asientos"
+msgstr "Apuntes"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Balance inicial"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Divisa"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Diario"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Cuenta"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
+
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Fecha"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Factura"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Asiento contable"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
-msgstr "Estado de cuenta"
+msgstr "Extracto"
+
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
-msgstr "Estado de cuenta"
+msgstr "Extracto"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
-msgstr "Estado de cuentas"
+msgstr "Extracto bancario"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
-msgstr "Diario de estados de cuenta"
+msgstr "Diario de extracto"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
-msgstr "Línea de estado de cuenta"
+msgstr "Línea de extracto bancario"
msgctxt "model:ir.action,name:act_draft_statement_form"
msgid "Draft Statements"
-msgstr "Estados de cuenta en borrador"
+msgstr "Extractos borrador"
msgctxt "model:ir.action,name:act_posted_statement_form"
msgid "Posted Statements"
-msgstr "Estados de cuenta confirmados"
+msgstr "Extractos confirmados"
msgctxt "model:ir.action,name:act_statement_form"
msgid "All Statement"
-msgstr "Todos los estados de cuenta"
+msgstr "Todos los extractos"
msgctxt "model:ir.action,name:act_statement_journal_form"
msgid "Statement Journals"
-msgstr "Libros de estados de cuenta"
+msgstr "Diarios de extracto"
msgctxt "model:ir.action,name:act_validated_statement_form"
msgid "Validated Statement"
-msgstr "Estados de cuenta validados"
+msgstr "Extractos validados"
msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
msgid "Draft Statements"
-msgstr "Estados de cuenta en borrador"
+msgstr "Extractos borrador"
msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
msgid "Posted Statements"
-msgstr "Estados de cuenta confirmados"
+msgstr "Extractos confirmados"
msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
msgid "Statements"
-msgstr "Estados de cuenta"
+msgstr "Extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_form"
msgid "All Statement"
-msgstr "Todos los estados de cuenta"
+msgstr "Todos los extractos"
msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
msgid "Statement Journals"
-msgstr "Diarios de estados de cuenta"
+msgstr "Diarios de extracto"
msgctxt "model:ir.ui.menu,name:menu_statements"
msgid "Statements"
-msgstr "Estados de cuenta"
+msgstr "Extractos"
msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
msgid "Validated Statement"
-msgstr "Estados de cuenta validados"
+msgstr "Extractos validados"
msgctxt "model:res.group,name:group_statement"
msgid "Statement"
-msgstr "Estado de cuenta"
-
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Estado de cuenta"
+msgstr "Extracto"
-msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Cancelado"
-msgctxt "model:workflow.activity,name:statement_act_draft"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "model:workflow.activity,name:statement_act_posted"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Confirmado"
-msgctxt "model:workflow.activity,name:statement_act_validated"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Validado"
-msgctxt "selection:account.statement,state:0"
-msgid "Canceled"
-msgstr "Cancelado"
-
-msgctxt "selection:account.statement,state:0"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:account.statement,state:0"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt "selection:account.statement,state:0"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
-msgstr "Libro de estados de cuenta"
+msgstr "Diario de extracto"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
-msgstr "Libros de estados de cuenta"
+msgstr "Diarios de extracto"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "view:account.statement.line:"
msgid "Bank Statement Line"
msgstr "Línea de extracto bancario"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
-msgstr "Linea de estado de cuenta"
+msgstr "Línea de extracto bancario"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
-msgstr "Líneas de estado de cuenta"
+msgstr "Líneas de extracto bancario"
-#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement"
msgstr "Extracto bancario"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statement Lines"
msgstr "Líneas de extracto bancario"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Bank Statements"
msgstr "Extractos bancarios"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Cancelar"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
-msgstr "Líneas de asientos"
+msgstr "Apuntes"
-#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Información adicional"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Confirmar"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Restablecer a borrador"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
-msgstr "Estado de cuenta"
+msgstr "Extracto"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
-msgstr "Líneas de estado de cuenta"
+msgstr "Líneas de extracto"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
-msgstr "Estados de cuenta"
+msgstr "Extractos"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Validar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 0f7d903..60d52d6 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,11 +2,27 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr "Le montant (%s) est plus grand que le montant à payer de la facture !"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "Le montant (%s) est plus grand que le montant à payer de la facture !"
+
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr "Le montant doit être une valeur positive ou négative"
+
+msgctxt "error:account.statement.line:"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Le compte de crédit ou débit sur le journal est le même que celui de la "
+"ligne de relevé !"
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
@@ -14,128 +30,201 @@ msgstr ""
"Le compte de crédit ou débit sur le journal est le même que celui de la "
"ligne de relevé !"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr ""
"Veuillez fournir un compte de débit et de crédit pour le journal de relevés."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement.line:"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Veuillez fournir un compte de débit et de crédit pour le journal de relevés."
+
+msgctxt "error:account.statement:"
+msgid "End Balance must be %s!"
+msgstr "Le solde final doit être %s !"
+
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr "Le solde final doit être %s !"
-msgctxt "field:account.statement,balance:0"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr "Le relevé \"%s\" doit être annulé avant suppression"
+
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Balance"
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Décimales de la devise"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Date"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Solde final"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Journal"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transactions"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr "Lignes de mouvement comptable"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Solde de départ"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "État"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Devise"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Journal"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Compte"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr "Montant"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Date"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Description"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Facture"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Mouvement comptable"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Tiers"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Relevé"
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr "Relevé"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr "Relevé comptable"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr "Journal de relevés"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Ligne de relevé comptable"
@@ -191,94 +280,142 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Relevé"
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Relevé"
+msgctxt "selection:account.statement,state:"
+msgid "Canceled"
+msgstr "Annulé"
-msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Annulé"
-msgctxt "model:workflow.activity,name:statement_act_draft"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Brouillon"
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr "Validé"
-
-msgctxt "selection:account.statement,state:0"
-msgid "Canceled"
-msgstr "Annulé"
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Brouillon"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
+msgid "Posted"
+msgstr "Posté"
+
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Posté"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
+msgid "Validated"
+msgstr "Validé"
+
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Validé"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journal"
+msgstr "Journal de relevés"
+
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Journal de relevés"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Journaux de relevés"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.journal:"
+msgid "Statement Journals"
+msgstr "Journaux de relevés"
+
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Ligne de relevé"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Statement Line"
+msgstr "Ligne de relevé"
+
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Lignes de relevé"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement.line:"
+msgid "Statement Lines"
+msgstr "Lignes de relevé"
+
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Montant"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annuler"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Lignes de mouvement comptable"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Other Info"
+msgstr "Autre information"
+
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Autre information"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Post"
+msgstr "Poster"
+
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Poster"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Reset to Draft"
+msgstr "Remetter en brouillon"
+
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Remetter en brouillon"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Relevé"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "view:account.statement:"
+msgid "Statement Lines"
+msgstr "Lignes de relevé"
+
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr "Lignes de relevé"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Relevés"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
+msgid "Statements"
+msgstr "Relevés"
+
+msgctxt "view:account.statement:"
+msgid "Validate"
+msgstr "Valider"
+
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Valider"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 2c56208..811eaf2 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,11 +2,15 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr "Het bedrag (%s) is hoger dan het bedrag op de factuur!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
@@ -14,130 +18,194 @@ msgstr ""
"Credit of debit rekening van het dagboek is dezelfde als van het "
"bankafschrift!"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr ""
"Geef een debit en een credit rekening op voor het dagboek bankafschriften."
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr "Eindbalans moet %s zijn!"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
#, fuzzy
-msgctxt "field:account.statement,balance:0"
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr "Balans"
#, fuzzy
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Bedrijf"
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr "Valuta decimalen"
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr "Eindbalans"
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr "Dagboek"
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transacties"
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr "Boekingsregels"
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr "Begin bedrag"
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Status"
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Bedrijf"
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Valuta"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr "Dagboek"
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr "Rekening"
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr "Bedrag"
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Datum"
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Specificatie"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr "Verkoopfactuur"
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr "Boeking"
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Relatie"
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Naam"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Bankafschrift"
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr "Bankafschrift"
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr "Rekeningafschrift"
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr "Dagboek bankafschriften"
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Rekeningafschriftregel"
@@ -193,96 +261,81 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr "Bankafschrift"
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr "Bankafschrift"
-
-msgctxt "model:workflow.activity,name:statement_act_cancel"
-msgid "Canceled"
-msgstr "Geannuleerd"
-
-msgctxt "model:workflow.activity,name:statement_act_draft"
-msgid "Draft"
-msgstr "Concept"
-
-msgctxt "model:workflow.activity,name:statement_act_posted"
-msgid "Posted"
-msgstr "Geboekt"
-
-msgctxt "model:workflow.activity,name:statement_act_validated"
-msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Geannuleerd"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Concept"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr "Geboekt"
-msgctxt "selection:account.statement,state:0"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr "Goedgekeurd"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr "Dagboek bankafschriften"
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr "Dagboeken bankafschriften"
-msgctxt "view:account.statement.line:0"
+#, fuzzy
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr "Bedrag"
+
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr "Bankafschriftregel"
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr "Bankafschriftregels"
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr "Bedrag"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Annuleren"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Move Lines"
msgstr "Boekingen"
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr "Aanvullende informatie"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr "Boeken"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Terug naar concept"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr "Bankafschrift"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr "Bankafschriftregels"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr "Bankafschriften"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Goedkeuren"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 22063ed..1404530 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,149 +2,217 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Amount (%s) greater than the amount to pay of invoice!"
msgstr ""
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
+msgid "Amount should be a positive or negative value!"
+msgstr ""
+
+msgctxt "error:account.statement.line:"
msgid ""
"Credit or debit account on journal is the same than the statement line "
"account!"
msgstr ""
-msgctxt "error:account.statement.line:0"
+msgctxt "error:account.statement.line:"
msgid "Please provide debit and credit account on statement journal."
msgstr ""
-msgctxt "error:account.statement:0"
+msgctxt "error:account.statement:"
msgid "End Balance must be %s!"
msgstr ""
-msgctxt "field:account.statement,balance:0"
+msgctxt "error:account.statement:"
+msgid "Statement \"%s\" must be cancelled before deletion!"
+msgstr ""
+
+msgctxt "field:account.statement,balance:"
msgid "Balance"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement,company:0"
+msgctxt "field:account.statement,company:"
msgid "Company"
msgstr "Учет.орг."
-msgctxt "field:account.statement,currency_digits:0"
+msgctxt "field:account.statement,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement,date:0"
+msgctxt "field:account.statement,date:"
msgid "Date"
msgstr "Дата"
-msgctxt "field:account.statement,end_balance:0"
+msgctxt "field:account.statement,end_balance:"
msgid "End Balance"
msgstr ""
-msgctxt "field:account.statement,journal:0"
+msgctxt "field:account.statement,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement,journal:"
msgid "Journal"
msgstr ""
-msgctxt "field:account.statement,lines:0"
+msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr ""
-msgctxt "field:account.statement,move_lines:0"
+msgctxt "field:account.statement,move_lines:"
msgid "Move Lines"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement,rec_name:0"
+msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:account.statement,start_balance:0"
+msgctxt "field:account.statement,start_balance:"
msgid "Start Balance"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement,state:0"
+msgctxt "field:account.statement,state:"
msgid "State"
msgstr "Статус"
+msgctxt "field:account.statement,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement,write_uid:"
+msgid "Write User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:account.statement.journal,company:0"
+msgctxt "field:account.statement.journal,company:"
msgid "Company"
msgstr "Учет.орг."
+msgctxt "field:account.statement.journal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:account.statement.journal,currency:0"
+msgctxt "field:account.statement.journal,currency:"
msgid "Currency"
msgstr "Валюты"
-msgctxt "field:account.statement.journal,journal:0"
+msgctxt "field:account.statement.journal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:"
msgid "Journal"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement.journal,name:0"
+msgctxt "field:account.statement.journal,name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:account.statement.journal,rec_name:0"
+msgctxt "field:account.statement.journal,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:account.statement.line,account:0"
+msgctxt "field:account.statement.journal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.journal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:"
msgid "Account"
msgstr ""
-msgctxt "field:account.statement.line,amount:0"
+msgctxt "field:account.statement.line,amount:"
msgid "Amount"
msgstr ""
+msgctxt "field:account.statement.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
#, fuzzy
-msgctxt "field:account.statement.line,date:0"
+msgctxt "field:account.statement.line,date:"
msgid "Date"
msgstr "Дата"
#, fuzzy
-msgctxt "field:account.statement.line,description:0"
+msgctxt "field:account.statement.line,description:"
msgid "Description"
msgstr "Описание"
-msgctxt "field:account.statement.line,invoice:0"
+msgctxt "field:account.statement.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:"
msgid "Invoice"
msgstr ""
-msgctxt "field:account.statement.line,move:0"
+msgctxt "field:account.statement.line,move:"
msgid "Account Move"
msgstr ""
#, fuzzy
-msgctxt "field:account.statement.line,party:0"
+msgctxt "field:account.statement.line,party:"
msgid "Party"
msgstr "Организации"
#, fuzzy
-msgctxt "field:account.statement.line,rec_name:0"
+msgctxt "field:account.statement.line,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:account.statement.line,statement:0"
+msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr ""
+msgctxt "field:account.statement.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "model:account.journal.type,name:journal_type_statement"
msgid "Statement"
msgstr ""
-msgctxt "model:account.statement,name:0"
+msgctxt "model:account.statement,name:"
msgid "Account Statement"
msgstr ""
-msgctxt "model:account.statement.journal,name:0"
+msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
msgstr ""
-msgctxt "model:account.statement.line,name:0"
+msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr ""
@@ -200,96 +268,78 @@ msgctxt "model:res.group,name:group_statement"
msgid "Statement"
msgstr ""
-msgctxt "model:workflow,name:wkf_statement"
-msgid "Statement"
-msgstr ""
-
#, fuzzy
-msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgctxt "selection:account.statement,state:"
msgid "Canceled"
msgstr "Отменено"
#, fuzzy
-msgctxt "model:workflow.activity,name:statement_act_draft"
+msgctxt "selection:account.statement,state:"
msgid "Draft"
msgstr "Черновик"
-msgctxt "model:workflow.activity,name:statement_act_posted"
+msgctxt "selection:account.statement,state:"
msgid "Posted"
msgstr ""
-msgctxt "model:workflow.activity,name:statement_act_validated"
+msgctxt "selection:account.statement,state:"
msgid "Validated"
msgstr ""
-#, fuzzy
-msgctxt "selection:account.statement,state:0"
-msgid "Canceled"
-msgstr "Отменено"
-
-#, fuzzy
-msgctxt "selection:account.statement,state:0"
-msgid "Draft"
-msgstr "Черновик"
-
-msgctxt "selection:account.statement,state:0"
-msgid "Posted"
-msgstr ""
-
-msgctxt "selection:account.statement,state:0"
-msgid "Validated"
-msgstr ""
-
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
msgstr ""
-msgctxt "view:account.statement.journal:0"
+msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
msgstr ""
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
+msgid "Amount"
+msgstr ""
+
+msgctxt "view:account.statement.line:"
msgid "Statement Line"
msgstr ""
-msgctxt "view:account.statement.line:0"
+msgctxt "view:account.statement.line:"
msgid "Statement Lines"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Amount"
msgstr ""
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Cancel"
msgstr "Отменить"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Other Info"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Post"
msgstr ""
#, fuzzy
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Reset to Draft"
msgstr "Сброс в черновики"
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statement Lines"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Statements"
msgstr ""
-msgctxt "view:account.statement:0"
+msgctxt "view:account.statement:"
msgid "Validate"
msgstr ""
diff --git a/setup.py b/setup.py
index 0a2dd2e..fcf261e 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/statement.py b/statement.py
index b4d4fd8..911d5f0 100644
--- a/statement.py
+++ b/statement.py
@@ -1,8 +1,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
-from trytond.pyson import Eval, If
+from trytond.model import Workflow, ModelView, ModelSQL, fields
+from trytond.pyson import Eval, If, Bool
from trytond.transaction import Transaction
from trytond.backend import TableHandler
from trytond.pool import Pool
@@ -11,34 +11,35 @@ _STATES = {'readonly': Eval('state') != 'draft'}
_DEPENDS = ['state']
-class Statement(ModelWorkflow, ModelSQL, ModelView):
+class Statement(Workflow, ModelSQL, ModelView):
'Account Statement'
_name = 'account.statement'
_description = __doc__
company = fields.Many2One('company.company', 'Company', required=True,
- select=1, states=_STATES, domain=[
+ select=True, states=_STATES, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
Eval('context', {}).get('company', 0)),
],
depends=_DEPENDS)
- journal = fields.Many2One('account.statement.journal', 'Journal', required=True,
+ journal = fields.Many2One('account.statement.journal', 'Journal',
+ required=True,
domain=[
('company', '=', Eval('context', {}).get('company', 0)),
],
states={
'readonly': (Eval('state') != 'draft') | Eval('lines'),
},
- on_change=['journal', 'state', 'lines'], select=1,
+ on_change=['journal', 'state', 'lines'], select=True,
depends=['state', 'lines'])
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['journal']), 'get_currency_digits')
date = fields.Date('Date', required=True, states=_STATES, depends=_DEPENDS,
- select=1)
- start_balance = fields.Numeric('Start Balance',
+ select=True)
+ start_balance = fields.Numeric('Start Balance', required=True,
digits=(16, Eval('currency_digits', 2)),
states=_STATES, depends=['state', 'currency_digits'])
- end_balance = fields.Numeric('End Balance',
+ end_balance = fields.Numeric('End Balance', required=True,
digits=(16, Eval('currency_digits', 2)),
states=_STATES, depends=['state', 'currency_digits'])
balance = fields.Function(
@@ -57,19 +58,38 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
('validated', 'Validated'),
('cancel', 'Canceled'),
('posted', 'Posted'),
- ], 'State', readonly=True, select=1)
+ ], 'State', readonly=True, select=True)
move_lines = fields.Function(fields.One2Many('account.move.line',
None, 'Move Lines'), 'get_move_lines')
def __init__(self):
super(Statement, self).__init__()
- self._rpc.update({
- 'draft_workflow': True,
- })
self._order[0] = ('id', 'DESC')
self._error_messages.update({
- 'wrong_end_balance': 'End Balance must be %s!',
- })
+ 'wrong_end_balance': 'End Balance must be %s!',
+ 'delete_cancel': 'Statement "%s" must be cancelled before ' \
+ 'deletion!',
+ })
+ self._transitions |= set((
+ ('draft', 'validated'),
+ ('validated', 'posted'),
+ ('validated', 'cancel'),
+ ('cancel', 'draft'),
+ ))
+ self._buttons.update({
+ 'draft': {
+ 'invisible': Eval('state') != 'cancel',
+ },
+ 'validate': {
+ 'invisible': Eval('state') != 'draft',
+ },
+ 'post': {
+ 'invisible': Eval('state') != 'validated',
+ },
+ 'cancel': {
+ 'invisible': Eval('state') != 'validated',
+ },
+ })
def init(self, module_name):
cursor = Transaction().cursor
@@ -96,7 +116,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
table.not_null_action('company', action='add')
def default_company(self):
- return Transaction().context.get('company') or False
+ return Transaction().context.get('company')
def default_state(self):
return 'draft'
@@ -148,13 +168,10 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
if not ids:
return {}
- for code in [Transaction().language, 'en_US']:
- lang_ids = lang_obj.search([
- ('code', '=', code),
+ lang_id, = lang_obj.search([
+ ('code', '=', Transaction().language),
])
- if lang_ids:
- break
- lang = lang_obj.browse(lang_ids[0])
+ lang = lang_obj.browse(lang_id)
res = {}
for statement in self.browse(ids):
@@ -205,9 +222,10 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
def on_change_with_balance(self, values):
if not set(('end_balance', 'start_balance')) <= set(values):
- return 0
+ return Decimal(0)
else:
- return values['end_balance'] - values['start_balance']
+ return Decimal(values.get('end_balance') or 0
+ - values.get('start_balance') or 0)
def on_change_lines(self, values):
pool = Pool()
@@ -226,9 +244,9 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
invoice_id2amount_to_pay = {}
for invoice in invoice_obj.browse(list(invoice_ids)):
with Transaction().set_context(date=invoice.currency_date):
- invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
- invoice.currency.id, invoice.amount_to_pay,
- journal.currency.id)
+ invoice_id2amount_to_pay[invoice.id] = (
+ currency_obj.compute(invoice.currency.id,
+ invoice.amount_to_pay, journal.currency.id))
for line in values['lines']:
if line['invoice'] and line['id']:
@@ -239,7 +257,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
amount_to_pay):
res['lines']['update'].append({
'id': line['id'],
- 'invoice': False,
+ 'invoice': None,
})
else:
res['lines']['update'].append({
@@ -249,63 +267,72 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res['lines'].setdefault('add', [])
vals = line.copy()
del vals['id']
- vals['amount'] = abs(line['amount']) - amount_to_pay
+ vals['amount'] = (abs(line['amount'])
+ - amount_to_pay)
if line['amount'] < 0:
vals['amount'] = - vals['amount']
- vals['invoice'] = False
+ vals['invoice'] = None
res['lines']['add'].append(vals)
invoice_id2amount_to_pay[line['invoice']] = \
amount_to_pay - abs(line['amount'])
return res
- def wkf_validated(self, statement):
+ def delete(self, ids):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ # Cancel before delete
+ self.cancel(ids)
+ for statement in self.browse(ids):
+ if statement.state != 'cancel':
+ self.raise_user_error('delete_cancel', statement.rec_name)
+ return super(Statement, self).delete(ids)
+
+ @ModelView.button
+ @Workflow.transition('draft')
+ def draft(self, ids):
+ pass
+
+ @ModelView.button
+ @Workflow.transition('validated')
+ def validate(self, ids):
statement_line_obj = Pool().get('account.statement.line')
lang_obj = Pool().get('ir.lang')
- computed_end_balance = statement.start_balance
- for line in statement.lines:
- computed_end_balance += line.amount
- if computed_end_balance != statement.end_balance:
- for code in [Transaction().language, 'en_US']:
- lang_ids = lang_obj.search([
- ('code', '=', code),
- ])
- if lang_ids:
- break
- lang = lang_obj.browse(lang_ids[0])
-
- amount = lang_obj.format(lang,
- '%.' + str(statement.journal.currency.digits) + 'f',
- computed_end_balance, True)
- self.raise_user_error('wrong_end_balance', error_args=(amount,))
- for line in statement.lines:
- statement_line_obj.create_move(line)
- self.write(statement.id, {
- 'state':'validated',
- })
+ for statement in self.browse(ids):
+ computed_end_balance = statement.start_balance
+ for line in statement.lines:
+ computed_end_balance += line.amount
+ if computed_end_balance != statement.end_balance:
+ lang_id, = lang_obj.search([
+ ('code', '=', Transaction().language),
+ ])
+ lang = lang_obj.browse(lang_id)
- def wkf_posted(self, statement):
+ amount = lang_obj.format(lang,
+ '%.' + str(statement.journal.currency.digits) + 'f',
+ computed_end_balance, True)
+ self.raise_user_error('wrong_end_balance',
+ error_args=(amount,))
+ for line in statement.lines:
+ statement_line_obj.create_move(line)
+
+ @ModelView.button
+ @Workflow.transition('posted')
+ def post(self, ids):
statement_line_obj = Pool().get('account.statement.line')
- statement_line_obj.post_move(statement.lines)
- self.write(statement.id, {
- 'state':'posted',
- })
+ statements = self.browse(ids)
+ lines = [l for s in statements for l in s.lines]
+ statement_line_obj.post_move(lines)
- def wkf_cancel(self, statement):
+ @ModelView.button
+ @Workflow.transition('cancel')
+ def cancel(self, ids):
statement_line_obj = Pool().get('account.statement.line')
- statement_line_obj.delete_move(statement.lines)
- self.write(statement.id, {
- 'state':'cancel',
- })
-
- def draft_workflow(self, ids):
- self.workflow_trigger_create(ids)
- self.write(ids, {
- 'state': 'draft',
- })
- return True
+ statements = self.browse(ids)
+ lines = [l for s in statements for l in s.lines]
+ statement_line_obj.delete_move(lines)
Statement()
@@ -319,16 +346,22 @@ class Line(ModelSQL, ModelView):
required=True, ondelete='CASCADE')
date = fields.Date('Date', required=True)
amount = fields.Numeric('Amount', required=True,
- digits=(16, Eval('_parent_statement', {}).get( 'currency_digits', 2)),
+ digits=(16, Eval('_parent_statement', {}).get('currency_digits', 2)),
on_change=['amount', 'party', 'account', 'invoice',
'_parent_statement.journal'])
party = fields.Many2One('party.party', 'Party',
on_change=['amount', 'party', 'invoice'])
account = fields.Many2One('account.account', 'Account', required=True,
on_change=['account', 'invoice'], domain=[
- ('kind', '!=', 'view'),
('company', '=', Eval('_parent_statement', {}).get('company', 0)),
- ])
+ If(Bool(Eval('party')),
+ If(Eval('amount', 0) > 0,
+ ('kind', '=', 'receivable'),
+ ('kind', '=', 'payable')),
+ ('kind', 'in', ['payable', 'receivable', 'revenue', 'expense',
+ 'other'])),
+ ],
+ depends=['party', 'amount'])
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
@@ -346,13 +379,20 @@ class Line(ModelSQL, ModelView):
def __init__(self):
super(Line, self).__init__()
self._error_messages.update({
- 'debit_credit_account_statement_journal': 'Please provide debit and ' \
- 'credit account on statement journal.',
- 'same_debit_credit_account': 'Credit or debit account on ' \
- 'journal is the same than the statement line account!',
- 'amount_greater_invoice_amount_to_pay': 'Amount (%s) greater than '\
- 'the amount to pay of invoice!',
+ 'debit_credit_account_statement_journal': 'Please provide debit '
+ 'and credit account on statement journal.',
+ 'same_debit_credit_account': 'Credit or debit account on '
+ 'journal is the same than the statement line account!',
+ 'amount_greater_invoice_amount_to_pay': 'Amount (%s) greater than '
+ 'the amount to pay of invoice!',
})
+ self._sql_constraints += [
+ ('check_statement_line_amount', 'CHECK(amount != 0)',
+ 'Amount should be a positive or negative value!'),
+ ]
+
+ def default_amount(self):
+ return Decimal(0)
def on_change_party(self, value):
party_obj = Pool().get('party.party')
@@ -373,9 +413,9 @@ class Line(ModelSQL, ModelView):
if value.get('party'):
invoice = invoice_obj.browse(value['invoice'])
if invoice.party != value['party']:
- res['invoice'] = False
+ res['invoice'] = None
else:
- res['invoice'] = False
+ res['invoice'] = None
return res
def on_change_amount(self, value):
@@ -402,14 +442,15 @@ class Line(ModelSQL, ModelView):
if value.get('invoice'):
if value.get('amount') and value.get('_parent_statement.journal'):
invoice = invoice_obj.browse(value['invoice'])
- journal = journal_obj.browse(value['_parent_statement.journal'])
+ journal = journal_obj.browse(
+ value['_parent_statement.journal'])
with Transaction().set_context(date=invoice.currency_date):
amount_to_pay = currency_obj.compute(invoice.currency.id,
invoice.amount_to_pay, journal.currency.id)
if abs(value['amount']) > amount_to_pay:
- res['invoice'] = False
+ res['invoice'] = None
else:
- res['invoice'] = False
+ res['invoice'] = None
return res
def on_change_account(self, value):
@@ -420,17 +461,14 @@ class Line(ModelSQL, ModelView):
if value.get('account'):
invoice = invoice_obj.browse(value['invoice'])
if invoice.account.id != value['account']:
- res['invoice'] = False
+ res['invoice'] = None
else:
- res['invoice'] = False
+ res['invoice'] = None
return res
def create_move(self, line):
'''
- Create move for the statement line
-
- :param line: a BrowseRecord of the line
- :return: the move id
+ Create move for the statement line and return move id if created.
'''
pool = Pool()
move_obj = pool.get('account.move')
@@ -440,12 +478,15 @@ class Line(ModelSQL, ModelView):
move_line_obj = pool.get('account.move.line')
lang_obj = pool.get('ir.lang')
+ if line.move:
+ return
+
period_id = period_obj.find(line.statement.company.id,
date=line.date)
move_lines = self._get_move_lines(line)
move_id = move_obj.create({
- 'name': line.date,
+ 'name': unicode(line.date),
'period': period_id,
'journal': line.statement.journal.journal.id,
'date': line.date,
@@ -462,17 +503,14 @@ class Line(ModelSQL, ModelView):
line.invoice.amount_to_pay,
line.statement.journal.currency.id)
if amount_to_pay < abs(line.amount):
- for code in [Transaction().language, 'en_US']:
- lang_ids = lang_obj.search([
- ('code', '=', code),
+ lang_id, = lang_obj.search([
+ ('code', '=', Transaction().language),
])
- if lang_ids:
- break
- lang = lang_obj.browse(lang_ids[0])
+ lang = lang_obj.browse(lang_id)
amount = lang_obj.format(lang,
- '%.' + str(line.statement.journal.currency.digits) + 'f',
- line.amount, True)
+ '%.' + str(line.statement.journal.currency.digits) + 'f',
+ line.amount, True)
self.raise_user_error('amount_greater_invoice_amount_to_pay',
error_args=(amount,))
@@ -523,16 +561,17 @@ class Line(ModelSQL, ModelView):
second_currency = statement_line.statement.journal.currency.id
amount_second_currency = abs(statement_line.amount)
else:
- amount_second_currency = False
+ amount_second_currency = None
second_currency = None
+ party_id = statement_line.party.id if statement_line.party else None
vals = []
vals.append({
- 'name': statement_line.date,
+ 'name': unicode(statement_line.date),
'debit': amount < zero and -amount or zero,
'credit': amount >= zero and amount or zero,
'account': statement_line.account.id,
- 'party': statement_line.party and statement_line.party.id,
+ 'party': party_id,
'second_currency': second_currency,
'amount_second_currency': amount_second_currency,
})
@@ -547,11 +586,11 @@ class Line(ModelSQL, ModelView):
if statement_line.account.id == account.id:
self.raise_user_error('same_debit_credit_account')
vals.append({
- 'name': statement_line.date,
+ 'name': unicode(statement_line.date),
'debit': amount >= zero and amount or zero,
'credit': amount < zero and -amount or zero,
'account': account.id,
- 'party': statement_line.party and statement_line.party.id,
+ 'party': party_id,
'second_currency': second_currency,
'amount_second_currency': amount_second_currency,
})
diff --git a/statement.xml b/statement.xml
index aa7374e..6dc6481 100644
--- a/statement.xml
+++ b/statement.xml
@@ -35,31 +35,22 @@ this repository contains the full copyright notices and license terms. -->
<field name="end_balance"/>
<notebook colspan="4">
<page string="Statement Lines" col="4" id="statement_lines">
- <field name="lines" colspan="4">
- <tree string="Statement Lines" editable="bottom">
- <field name="date"/>
- <field name="amount" sum="Amount"/>
- <field name="party"/>
- <field name="account"/>
- <field name="invoice"/>
- <field name="description"/>
- </tree>
- </field>
+ <field name="lines" colspan="4"
+ view_ids="account_statement.statement_line_view_tree_editable"/>
<group col="6" colspan="4" id="state_buttons">
<label name="balance"/>
<field name="balance"/>
<label name="state"/>
<field name="state"/>
<group col="4" colspan="2" id="buttons">
- <button string="Validate" name="validated"
- states="{'invisible': Not(Equal(Eval('state'), 'draft'))}"/>
+ <button string="Validate" name="validate"
+ type="object"/>
<button string="Cancel" name="cancel"
- states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
- <button string="Post" name="posted"
- states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
- <button string="Reset to Draft" name="draft_workflow"
- type="object"
- states="{'invisible': Not(Equal(Eval('state'), 'cancel'))}"/>
+ type="object"/>
+ <button string="Post" name="post"
+ type="object"/>
+ <button string="Reset to Draft" name="draft"
+ type="object"/>
</group>
</group>
</page>
@@ -200,9 +191,11 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="statement_line_view_tree">
<field name="model">account.statement.line</field>
<field name="type">tree</field>
+ <field name="priority" eval="10"/>
<field name="arch" type="xml">
<![CDATA[
<tree string="Statement Lines">
+ <field name="statement"/>
<field name="date"/>
<field name="amount"/>
<field name="party"/>
@@ -214,51 +207,22 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <!-- Statement workflow -->
- <record model="workflow" id="wkf_statement">
- <field name="name">Statement</field>
- <field name="model">account.statement</field>
- <field name="on_create">True</field>
- </record>
- <record model="workflow.activity" id="statement_act_draft">
- <field name="workflow" ref="wkf_statement"/>
- <field name="flow_start">True</field>
- <field name="name">Draft</field>
- </record>
- <record model="workflow.activity" id="statement_act_validated">
- <field name="workflow" ref="wkf_statement"/>
- <field name="method">wkf_validated</field>
- <field name="name">Validated</field>
- </record>
- <record model="workflow.activity" id="statement_act_posted">
- <field name="workflow" ref="wkf_statement"/>
- <field name="method">wkf_posted</field>
- <field name="name">Posted</field>
- <field name="flow_stop" eval="True"/>
- </record>
- <record model="workflow.activity" id="statement_act_cancel">
- <field name="workflow" ref="wkf_statement"/>
- <field name="method">wkf_cancel</field>
- <field name="name">Canceled</field>
- <field name="flow_stop" eval="True"/>
- </record>
- <record model="workflow.transition" id="statement_trans_draft_validated">
- <field name="act_from" ref="statement_act_draft"/>
- <field name="act_to" ref="statement_act_validated"/>
- <field name="group" ref="account.group_account"/>
- <field name="signal">validated</field>
- </record>
- <record model="workflow.transition" id="statement_trans_validated_posted">
- <field name="act_from" ref="statement_act_validated"/>
- <field name="act_to" ref="statement_act_posted"/>
- <field name="group" ref="account.group_account"/>
- <field name="signal">posted</field>
- </record>
- <record model="workflow.transition" id="statement_trans_validated_cancel">
- <field name="act_from" ref="statement_act_validated"/>
- <field name="act_to" ref="statement_act_cancel"/>
- <field name="group" ref="account.group_account_admin"/>
- <field name="signal">cancel</field>
+ <record model="ir.ui.view" id="statement_line_view_tree_editable">
+ <field name="model">account.statement.line</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="20"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Statement Lines" editable="bottom">
+ <field name="date"/>
+ <field name="amount" sum="Amount"/>
+ <field name="party"/>
+ <field name="account"/>
+ <field name="invoice"/>
+ <field name="description"/>
+ </tree>
+ ]]>
+ </field>
</record>
<record model="ir.model.access" id="access_statement_account_admin">
@@ -311,5 +275,49 @@ this repository contains the full copyright notices and license terms. -->
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.model.button" id="statement_draft_button">
+ <field name="name">draft</field>
+ <field name="model"
+ search="[('model', '=', 'account.statement')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="statement_draft_button_group_account">
+ <field name="button" ref="statement_draft_button"/>
+ <field name="group" ref="account.group_account"/>
+ </record>
+
+ <record model="ir.model.button" id="statement_validate_button">
+ <field name="name">validate</field>
+ <field name="model"
+ search="[('model', '=', 'account.statement')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="statement_validate_button_group_account">
+ <field name="button" ref="statement_validate_button"/>
+ <field name="group" ref="account.group_account"/>
+ </record>
+
+ <record model="ir.model.button" id="statement_post_button">
+ <field name="name">post</field>
+ <field name="model"
+ search="[('model', '=', 'account.statement')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="statement_post_button_group_account">
+ <field name="button" ref="statement_post_button"/>
+ <field name="group" ref="account.group_account"/>
+ </record>
+
+ <record model="ir.model.button" id="statement_cancel_button">
+ <field name="name">cancel</field>
+ <field name="model"
+ search="[('model', '=', 'account.statement')]"/>
+ </record>
+ <record model="ir.model.button-res.group"
+ id="statement_cancel_button_group_account">
+ <field name="button" ref="statement_cancel_button"/>
+ <field name="group" ref="account.group_account_admin"/>
+ </record>
+
</data>
</tryton>
diff --git a/tests/__init__.py b/tests/__init__.py
index db04664..3bbf724 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_account_statement import suite
+from .test_account_statement import suite
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index 010a5cb..889ebb5 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -35,6 +36,7 @@ class AccountStatementTestCase(unittest.TestCase):
'''
test_depends()
+
def doctest_dropdb(test):
'''
Remove sqlite memory database
@@ -47,6 +49,7 @@ def doctest_dropdb(test):
finally:
cursor.close()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 81c0e62..1609b8c 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 2.2.0
+Version: 2.4.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 19d7af2..9031f8b 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-invoice.xml
journal.xml
setup.py
statement.xml
@@ -15,8 +14,10 @@ statement.xml
./tests/__init__.py
./tests/test_account_statement.py
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_ES.po
locale/fr_FR.po
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index cafa5d5..887e4a4 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 2.2, < 2.3
-trytond_company >= 2.2, < 2.3
-trytond_currency >= 2.2, < 2.3
-trytond_party >= 2.2, < 2.3
-trytond_account_invoice >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_account >= 2.4, < 2.5
+trytond_company >= 2.4, < 2.5
+trytond_currency >= 2.4, < 2.5
+trytond_party >= 2.4, < 2.5
+trytond_account_invoice >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit ca9f0b3c5e652a489d3efd3e6bf4644928d6a345
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:17 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index 0ce2e9b..21a85a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
commit b361448d80cda594abc7f6564cd1a6bc72d48df1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:09:12 2012 +0100
Adding myself to copyright.
diff --git a/debian/copyright b/debian/copyright
index 9e33b25..0ce2e9b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,9 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit a2ca9af47ea4dbcfe7294c18d48ae33face1678d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index b2d5d1a..9e33b25 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
License: GPL-3+
License: GPL-3+
commit 8af63572f2370943a7387585375661a42c61d56e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:01 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index a7dbc42..6cbc5e5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit bfe0459ae667f642fa7b4d157416012de4991ac7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:27 2011 +0100
Releasing debian version 2.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index 342573e..2b50ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-statement (2.2.0-1) unstable; urgency=low
+
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Merging upstream version 2.2.0.
+ * Removing deprecated XB-Python-Version for dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 13:59:39 +0100
+
tryton-modules-account-statement (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit f8e05849bbd166c80c3618f06dc99b835d2b349f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:41 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index ad0c132..a7dbc42 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-account-statement
Architecture: all
commit 19d67e4d7a4f6049f642f154f16faba0fcf48dc1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index f70dde8..ad0c132 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,10 @@ X-Python-Version: >= 2.5
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-account (>= 2.0), tryton-modules-account-invoice (>= 2.0),
- tryton-modules-company (>= 2.0), tryton-modules-currency (>= 2.0),
- tryton-modules-party (>= 2.0), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-account (>= 2.2), tryton-modules-account-invoice (>= 2.2),
+ tryton-modules-company (>= 2.2), tryton-modules-currency (>= 2.2),
+ tryton-modules-party (>= 2.2), python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 69dd555ded3ed3f8af8ea675d184ccb707d1da3a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:30 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index ccc376c..af7659b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
* Add company on statement
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 45c81bb..12c55a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 2.0.0
+Version: 2.2.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,23 +9,25 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 14ae2f5..96aebf8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
'name_nl_NL': 'Bankafschriften',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -52,11 +52,13 @@
'invoice.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
- 'nl_NL.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 9fe8f19..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,Крайния баланс трябва да е %s!,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Сумата (%s) е по-голяма от сумата за плащане по фактурата!,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Кредитната/дебитната сметка на дневника е същата сметката като на ред от отчета!,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Моля укажете дебитна и кредитна сметка за дневника за отчети.,0
-field,"account.statement,company",0,Company,Фирма,0
-field,"account.statement,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"account.statement,date",0,Date,Дата,0
-field,"account.statement,end_balance",0,End Balance,Краен баланс,0
-field,"account.statement,journal",0,Journal,Дневник,0
-field,"account.statement,lines",0,Transactions,Транзакции,0
-field,"account.statement,move_lines",0,Move Lines,Редове на движение,0
-field,"account.statement,rec_name",0,Name,Име,0
-field,"account.statement,start_balance",0,Start Balance,Начален баланс,0
-field,"account.statement,state",0,State,Състояние,0
-field,"account.statement.journal,company",0,Company,Фирма,0
-field,"account.statement.journal,currency",0,Currency,Валута,0
-field,"account.statement.journal,journal",0,Journal,Дневник,0
-field,"account.statement.journal,name",0,Name,Име,0
-field,"account.statement.journal,rec_name",0,Name,Име,0
-field,"account.statement.line,account",0,Account,Сметка,0
-field,"account.statement.line,amount",0,Amount,Сума,0
-field,"account.statement.line,date",0,Date,Дата,0
-field,"account.statement.line,description",0,Description,Описание,0
-field,"account.statement.line,invoice",0,Invoice,Фактура,0
-field,"account.statement.line,move",0,Account Move,Движение по сметка,0
-field,"account.statement.line,party",0,Party,Партньор,0
-field,"account.statement.line,rec_name",0,Name,Име,0
-field,"account.statement.line,statement",0,Statement,Отчет,0
-model,"account.journal.type,name",journal_type_statement,Statement,Отчет,0
-model,"account.statement,name",0,Account Statement,Отчет за сметка,0
-model,"account.statement.journal,name",0,Statement Journal,Дневник за отчети,0
-model,"account.statement.line,name",0,Account Statement Line,Ред от отчет за сметка,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Проект на отчет,0
-model,"ir.action,name",act_new_statement_form,New Statement,Нов отчет,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Публикувани отчети,0
-model,"ir.action,name",act_statement_form,All Statement,Всички отчети,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Дневник за отчети,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Проверен отчет,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Проект на отчет,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Нов отчет,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Публикувани отчети,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Отчети,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Всички отчети,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Дневник за отчети,0
-model,"ir.ui.menu,name",menu_statements,Statements,Отчети,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Проверен отчет,0
-model,"res.group,name",group_statement,Statement,Отчет,0
-model,"workflow,name",wkf_statement,Statement,Отчет,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Отказан,0
-model,"workflow.activity,name",statement_act_draft,Draft,Проект,0
-model,"workflow.activity,name",statement_act_posted,Posted,Публикуван,0
-model,"workflow.activity,name",statement_act_validated,Validated,Проверен,0
-selection,"account.statement,state",0,Canceled,Отказан,0
-selection,"account.statement,state",0,Draft,Проект,0
-selection,"account.statement,state",0,Posted,Публикуван,0
-selection,"account.statement,state",0,Validated,Проверен,0
-view,account.statement,0,Cancel,Отказ,0
-view,account.statement,0,Move Lines,Редове от движение,0
-view,account.statement,0,Other Info,Друга информация,0
-view,account.statement,0,Post,Публикуван,0
-view,account.statement,0,Reset to Draft,Изпращане в проект,0
-view,account.statement,0,Statement,Отчет,0
-view,account.statement,0,Statement Lines,Редове от отчет,0
-view,account.statement,0,Statements,Отчети,0
-view,account.statement,0,Validate,Проверка,0
-view,account.statement.journal,0,Statement Journal,Дневник за отчети,0
-view,account.statement.journal,0,Statement Journals,Дневник за отчети,0
-view,account.statement.line,0,Statement Line,Ред от отчет,0
-view,account.statement.line,0,Statement Lines,Редове от отчет,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 46b87b9..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,74 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,Endsaldo muss %s sein!,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Haben- oder Sollkonto im Journal ist das selbe Konto wie das des Zahlungspostens!,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben.,0
-field,"account.statement,company",0,Company,Unternehmen,0
-field,"account.statement,currency_digits",0,Currency Digits,Stellen Währung,0
-field,"account.statement,date",0,Date,Datum,0
-field,"account.statement,end_balance",0,End Balance,Endsaldo,0
-field,"account.statement,journal",0,Journal,Journal,0
-field,"account.statement,lines",0,Transactions,Transaktionen,0
-field,"account.statement,move_lines",0,Move Lines,Buchungszeilen,0
-field,"account.statement,rec_name",0,Name,Name,0
-field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
-field,"account.statement,state",0,State,Status,0
-field,"account.statement.journal,company",0,Company,Unternehmen,0
-field,"account.statement.journal,currency",0,Currency,Währung,0
-field,"account.statement.journal,journal",0,Journal,Journal,0
-field,"account.statement.journal,name",0,Name,Name,0
-field,"account.statement.journal,rec_name",0,Name,Name,0
-field,"account.statement.line,account",0,Account,Konto,0
-field,"account.statement.line,amount",0,Amount,Betrag,0
-field,"account.statement.line,date",0,Date,Datum,0
-field,"account.statement.line,description",0,Description,Beschreibung,0
-field,"account.statement.line,invoice",0,Invoice,Rechnung,0
-field,"account.statement.line,move",0,Account Move,Buchungssatz,0
-field,"account.statement.line,party",0,Party,Partei,0
-field,"account.statement.line,rec_name",0,Name,Name,0
-field,"account.statement.line,statement",0,Statement,Kontoauszug,0
-model,"account.journal.type,name",journal_type_statement,Statement,Kontoauszug,0
-model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
-model,"account.statement.journal,name",0,Statement Journal,Journal Kontoauszug,0
-model,"account.statement.line,name",0,Account Statement Line,Zahlungsverkehr Position,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Entwürfe Kontoauszüge,0
-model,"ir.action,name",act_new_statement_form,New Statement,Neuer Kontoauszug,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Kontoauszüge,0
-model,"ir.action,name",act_statement_form,All Statement,Alle Kontoauszüge,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Kontoauszüge,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Kontoauszüge,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Entwürfe Kontoauszüge,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Neuer Kontoauszug,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Kontoauszüge,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Kontoauszüge,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Kontoauszüge,0
-model,"ir.ui.menu,name",menu_statements,Statements,Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Kontoauszüge,0
-model,"res.group,name",group_statement,Statement,Kontoauszug,0
-model,"workflow,name",wkf_statement,Statement,Kontoauszug,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Annulliert,0
-model,"workflow.activity,name",statement_act_draft,Draft,Entwurf,0
-model,"workflow.activity,name",statement_act_posted,Posted,Festgeschrieben,0
-model,"workflow.activity,name",statement_act_validated,Validated,Geprüft,0
-selection,"account.statement,state",0,Canceled,Annulliert,0
-selection,"account.statement,state",0,Draft,Entwurf,0
-selection,"account.statement,state",0,Posted,Festgeschrieben,0
-selection,"account.statement,state",0,Validated,Geprüft,0
-view,account.statement,0,Bank Statement,Kontoauszug,0
-view,account.statement,0,Bank Statement Lines,Posten Kontoauszug,0
-view,account.statement,0,Bank Statements,Kontoauszüge,0
-view,account.statement,0,Cancel,Annullieren,0
-view,account.statement,0,Move Lines,Buchungszeilen,0
-view,account.statement,0,Other Info,Sonstiges,0
-view,account.statement,0,Post,Festschreiben,0
-view,account.statement,0,Reset to Draft,Auf Entwurf zurücksetzen,0
-view,account.statement,0,Statement,Kontoauszug,0
-view,account.statement,0,Statement Lines,Kontoauszug Positionen,0
-view,account.statement,0,Statements,Kontoauszüge,0
-view,account.statement,0,Validate,Prüfen,0
-view,account.statement.journal,0,Statement Journal,Journal Kontoauszug,0
-view,account.statement.journal,0,Statement Journals,Journale Kontoauszüge,0
-view,account.statement.line,0,Bank Statement Line,Posten Kontoauszug,0
-view,account.statement.line,0,Statement Line,Kontoauszug Position,0
-view,account.statement.line,0,Statement Lines,Kontoauszug Positionen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 8d8ecfe..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,72 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,El Balance debe ser %s!,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,¡El valor (%s) es mayor que lo que se debe pagar en la factura!,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,¡Las cuentas crédito o débito en un diario son las mismas que las líneas de estado de cuenta!,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas débito y crédito en el libro de estado de cuentas.,0
-field,"account.statement,currency_digits",0,Currency Digits,Dígitos de Moneda,0
-field,"account.statement,date",0,Date,Fecha,0
-field,"account.statement,end_balance",0,End Balance,Balance Final,0
-field,"account.statement,journal",0,Journal,Diario,0
-field,"account.statement.journal,company",0,Company,Compañía,0
-field,"account.statement.journal,currency",0,Currency,Moneda,0
-field,"account.statement.journal,journal",0,Journal,Diario,0
-field,"account.statement.journal,name",0,Name,Nombre,0
-field,"account.statement.journal,rec_name",0,Name,Nombre,0
-field,"account.statement.line,account",0,Account,Cuenta,0
-field,"account.statement.line,amount",0,Amount,Cantidad,0
-field,"account.statement.line,date",0,Date,Fecha,0
-field,"account.statement.line,description",0,Description,Descripción,0
-field,"account.statement.line,invoice",0,Invoice,Factura,0
-field,"account.statement.line,move",0,Account Move,Movimiento de Cuenta,0
-field,"account.statement.line,party",0,Party,Tercero,0
-field,"account.statement.line,rec_name",0,Name,Nombre,0
-field,"account.statement,lines",0,Transactions,Transacciones,0
-field,"account.statement.line,statement",0,Statement,Estado de Cuenta,0
-field,"account.statement,move_lines",0,Move Lines,Líneas de Movimiento,0
-field,"account.statement,rec_name",0,Name,Nombre,0
-field,"account.statement,start_balance",0,Start Balance,Balance Inicial,0
-field,"account.statement,state",0,State,Estado,0
-model,"account.journal.type,name",journal_type_statement,Statement,Estado de Cuenta,0
-model,"account.statement.journal,name",0,Statement Journal,Diario de Estados de Cuenta,0
-model,"account.statement.line,name",0,Account Statement Line,Línea de Estado de Cuenta,0
-model,"account.statement,name",0,Account Statement,Estado de Cuentas,0
-model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de Estados de Cuenta,0
-model,"ir.action,name",act_new_statement_form,New Statement,Nuevo Extracto,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de Estados de Cuenta,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de Cuenta Validados,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de Cuenta en Borrador,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nuevo Extracto,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_statements,Statements,Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de Cuenta Válidos,0
-model,"res.group,name",group_statement,Statement,Estado de Cuenta,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Cancelado,0
-model,"workflow.activity,name",statement_act_draft,Draft,Borrador,0
-model,"workflow.activity,name",statement_act_posted,Posted,Confirmado,0
-model,"workflow.activity,name",statement_act_validated,Validated,Validado,0
-model,"workflow,name",wkf_statement,Statement,Estado de Cuenta,0
-selection,"account.statement,state",0,Canceled,Cancelado,0
-selection,"account.statement,state",0,Draft,Borrador,0
-selection,"account.statement,state",0,Posted,Confirmado,0
-selection,"account.statement,state",0,Validated,Validado,0
-view,account.statement,0,Bank Statement,Extractos Bancarios,0
-view,account.statement,0,Bank Statement Lines,Líneas de extracto bancario,0
-view,account.statement,0,Bank Statements,Extractos Bancarios,0
-view,account.statement,0,Cancel,Cancelar,0
-view,account.statement,0,Move Lines,Líneas de Movimiento,0
-view,account.statement,0,Post,Confirmar,0
-view,account.statement,0,Reset to Draft,Revertir a Borrador,0
-view,account.statement,0,Statement,Estado de Cuenta,0
-view,account.statement,0,Statement Lines,Líneas de Estado de Cuenta,0
-view,account.statement,0,Statements,Estados de Cuenta,0
-view,account.statement,0,Validate,Validar,0
-view,account.statement.journal,0,Statement Journal,Libro de Estados de Cuenta,0
-view,account.statement.journal,0,Statement Journals,Libros de Estados de Cuenta,0
-view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
-view,account.statement.line,0,Statement Line,Libros de Estados de Cuenta,0
-view,account.statement.line,0,Statement Lines,Líneas de Estado de Cuenta,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 6ecd6fa..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,72 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,El balance final debe ser %s,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,La cantidad (%s) es mayor que la cantidad a pagar de la factura,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Las cuentas debe o haber en el diario son las mismas que las línea de estado de cuenta,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas debe y haber en el libro de estado de cuentas.,0
-field,"account.statement,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"account.statement,date",0,Date,Fecha,0
-field,"account.statement,end_balance",0,End Balance,Balance final,0
-field,"account.statement,journal",0,Journal,Diario,0
-field,"account.statement.journal,company",0,Company,Empresa,0
-field,"account.statement.journal,currency",0,Currency,Divisa,0
-field,"account.statement.journal,journal",0,Journal,Diario,0
-field,"account.statement.journal,name",0,Name,Nombre,0
-field,"account.statement.journal,rec_name",0,Name,Nombre,0
-field,"account.statement.line,account",0,Account,Cuenta,0
-field,"account.statement.line,amount",0,Amount,Cantidad,0
-field,"account.statement.line,date",0,Date,Fecha,0
-field,"account.statement.line,description",0,Description,Descripción,0
-field,"account.statement.line,invoice",0,Invoice,Factura,0
-field,"account.statement.line,move",0,Account Move,Asiento contable,0
-field,"account.statement.line,party",0,Party,Tercero,0
-field,"account.statement.line,rec_name",0,Name,Nombre,0
-field,"account.statement,lines",0,Transactions,Transacciones,0
-field,"account.statement.line,statement",0,Statement,Estado de cuenta,0
-field,"account.statement,move_lines",0,Move Lines,Líneas de asientos,0
-field,"account.statement,rec_name",0,Name,Nombre,0
-field,"account.statement,start_balance",0,Start Balance,Balance inicial,0
-field,"account.statement,state",0,State,Estado,0
-model,"account.journal.type,name",journal_type_statement,Statement,Estado de cuenta,0
-model,"account.statement.journal,name",0,Statement Journal,Diario de estados de cuenta,0
-model,"account.statement.line,name",0,Account Statement Line,Línea de estado de cuenta,0
-model,"account.statement,name",0,Account Statement,Estado de cuentas,0
-model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Estados de cuenta en borrador,0
-model,"ir.action,name",act_new_statement_form,New Statement,Nuevo estado de cuenta,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de estados de cuenta,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de cuenta validados,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de cuenta en borrador,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nuevo estado de cuenta,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de estados de cuenta,0
-model,"ir.ui.menu,name",menu_statements,Statements,Estados de cuenta,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de cuenta,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de cuenta validados,0
-model,"res.group,name",group_statement,Statement,Estado de cuenta,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Cancelado,0
-model,"workflow.activity,name",statement_act_draft,Draft,Borrador,0
-model,"workflow.activity,name",statement_act_posted,Posted,Confirmado,0
-model,"workflow.activity,name",statement_act_validated,Validated,Validado,0
-model,"workflow,name",wkf_statement,Statement,Estado de cuenta,0
-selection,"account.statement,state",0,Canceled,Cancelado,0
-selection,"account.statement,state",0,Draft,Borrador,0
-selection,"account.statement,state",0,Posted,Confirmado,0
-selection,"account.statement,state",0,Validated,Validado,0
-view,account.statement,0,Bank Statement,Extracto bancario,0
-view,account.statement,0,Bank Statement Lines,Líneas de extracto bancario,0
-view,account.statement,0,Bank Statements,Extractos bancarios,0
-view,account.statement,0,Cancel,Cancelar,0
-view,account.statement,0,Move Lines,Líneas de asientos,0
-view,account.statement,0,Post,Confirmar,0
-view,account.statement,0,Reset to Draft,Restablecer a borrador,0
-view,account.statement,0,Statement,Estado de cuenta,0
-view,account.statement,0,Statement Lines,Líneas de estado de cuenta,0
-view,account.statement,0,Statements,Estados de cuenta,0
-view,account.statement,0,Validate,Validar,0
-view,account.statement.journal,0,Statement Journal,Libro de estados de cuenta,0
-view,account.statement.journal,0,Statement Journals,Libros de estados de cuenta,0
-view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
-view,account.statement.line,0,Statement Line,Linea de estado de cuenta,0
-view,account.statement.line,0,Statement Lines,Líneas de estado de cuenta,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index c71c9e4..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,Le solde final doit être %s !,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Le montant (%s) est plus grand que le montant à payer de la facture !,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Le compte de crédit ou débit sur le journal est le même que celui de la ligne de relevé !,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Veuillez fournir un compte de débit et de crédit pour le journal de relevés.,0
-field,"account.statement,company",0,Company,Société,1
-field,"account.statement,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"account.statement,date",0,Date,Date,0
-field,"account.statement,end_balance",0,End Balance,Solde final,0
-field,"account.statement,journal",0,Journal,Journal,0
-field,"account.statement,lines",0,Transactions,Transactions,0
-field,"account.statement,move_lines",0,Move Lines,Lignes de mouvement comptable,0
-field,"account.statement,rec_name",0,Name,Nom,0
-field,"account.statement,start_balance",0,Start Balance,Solde de départ,0
-field,"account.statement,state",0,State,État,0
-field,"account.statement.journal,company",0,Company,Société,0
-field,"account.statement.journal,currency",0,Currency,Devise,0
-field,"account.statement.journal,journal",0,Journal,Journal,0
-field,"account.statement.journal,name",0,Name,Nom,0
-field,"account.statement.journal,rec_name",0,Name,Nom,0
-field,"account.statement.line,account",0,Account,Compte,0
-field,"account.statement.line,amount",0,Amount,Montant,0
-field,"account.statement.line,date",0,Date,Date,0
-field,"account.statement.line,description",0,Description,Description,0
-field,"account.statement.line,invoice",0,Invoice,Facture,0
-field,"account.statement.line,move",0,Account Move,Mouvement comptable,0
-field,"account.statement.line,party",0,Party,Tiers,0
-field,"account.statement.line,rec_name",0,Name,Nom,0
-field,"account.statement.line,statement",0,Statement,Relevé,0
-model,"account.journal.type,name",journal_type_statement,Statement,Relevé,0
-model,"account.statement,name",0,Account Statement,Relevé comptable,0
-model,"account.statement.journal,name",0,Statement Journal,Journal de relevés,0
-model,"account.statement.line,name",0,Account Statement Line,Ligne de relevé comptable,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Relevés brouillons,0
-model,"ir.action,name",act_new_statement_form,New Statement,Nouveau relevé,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Relevés postés,0
-model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Journaux de relevés,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Relevés validés,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Relevés brouillons,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nouveau relevé,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Relevés postés,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Relevés,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Tous les relevés,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journaux de relevés,0
-model,"ir.ui.menu,name",menu_statements,Statements,Relevés,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Relevés validés,0
-model,"res.group,name",group_statement,Statement,Relevé,0
-model,"workflow,name",wkf_statement,Statement,Relevé,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Annulé,0
-model,"workflow.activity,name",statement_act_draft,Draft,Brouillon,0
-model,"workflow.activity,name",statement_act_posted,Posted,Posté,0
-model,"workflow.activity,name",statement_act_validated,Validated,Validé,0
-selection,"account.statement,state",0,Canceled,Annulé,0
-selection,"account.statement,state",0,Draft,Brouillon,0
-selection,"account.statement,state",0,Posted,Posté,0
-selection,"account.statement,state",0,Validated,Validé,0
-view,account.statement,0,Cancel,Annuler,0
-view,account.statement,0,Move Lines,Lignes de mouvement comptable,0
-view,account.statement,0,Other Info,Autre informations,1
-view,account.statement,0,Post,Poster,0
-view,account.statement,0,Reset to Draft,Remetter en brouillon,0
-view,account.statement,0,Statement,Relevé,0
-view,account.statement,0,Statement Lines,Lignes de relevé,0
-view,account.statement,0,Statements,Relevés,0
-view,account.statement,0,Validate,Valider,0
-view,account.statement.journal,0,Statement Journal,Journal de relevés,0
-view,account.statement.journal,0,Statement Journals,Journaux de relevés,0
-view,account.statement.line,0,Statement Line,Ligne de relevé,0
-view,account.statement.line,0,Statement Lines,Lignes de relevé,0
diff --git a/journal.py b/journal.py
index 318f3ea..d398975 100644
--- a/journal.py
+++ b/journal.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Journal(ModelSQL, ModelView):
@@ -17,7 +18,7 @@ class Journal(ModelSQL, ModelView):
def default_currency(self):
if Transaction().context.get('company'):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
company = company_obj.browse(Transaction().context['company'])
return company.currency.id
return False
diff --git a/journal.xml b/journal.xml
index 6634efc..ea913dc 100644
--- a/journal.xml
+++ b/journal.xml
@@ -27,10 +27,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Statement Journals">
- <field name="name" select="1"/>
- <field name="journal" select="2"/>
- <field name="currency" select="2"/>
- <field name="company" select="1"/>
+ <field name="name"/>
+ <field name="journal"/>
+ <field name="currency"/>
+ <field name="company"/>
</tree>
]]>
</field>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..9d151ea
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,285 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "Сумата (%s) е по-голяма от сумата за плащане по фактурата!"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Кредитната/дебитната сметка на дневника е същата сметката като на ред от "
+"отчета!"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr "Моля укажете дебитна и кредитна сметка за дневника за отчети."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "Крайния баланс трябва да е %s!"
+
+#, fuzzy
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Баланс"
+
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Краен баланс"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Дневник"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Транзакции"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Редове на движение"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Начален баланс"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Състояние"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Валута"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Дневник"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Сметка"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Описание"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Фактура"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Движение по сметка"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Партньор"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Отчет"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Отчет"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Отчет за сметка"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Дневник за отчети"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Ред от отчет за сметка"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Проект на отчет"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Публикувани отчети"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Всички отчети"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Дневник за отчети"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Проверен отчет"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Проект на отчет"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Публикувани отчети"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Отчети"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Всички отчети"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Дневник за отчети"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Отчети"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Проверен отчет"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Отчет"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Отчет"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Отказан"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Проект"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Публикуван"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Проверен"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Отказан"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Проект"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Публикуван"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Проверен"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Дневник за отчети"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Дневник за отчети"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Ред от отчет"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Редове от отчет"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Редове от движение"
+
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Друга информация"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Публикуван"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Изпращане в проект"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Отчет"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Редове от отчет"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Отчети"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Проверка"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..8113590
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,277 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr ""
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr ""
+
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr ""
+
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr ""
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr ""
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr ""
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr ""
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr ""
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr ""
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr ""
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr ""
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr ""
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr ""
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr ""
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr ""
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr ""
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr ""
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr ""
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr ""
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr ""
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr ""
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr ""
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr ""
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..c244c82
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,299 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Haben- oder Sollkonto im Journal ist das selbe Konto wie das des "
+"Zahlungspostens!"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr "Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "Endsaldo muss %s sein!"
+
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Saldo"
+
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Stellen Währung"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Endsaldo"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Transaktionen"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Buchungszeilen"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Anfangssaldo"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Konto"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Beschreibung"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Rechnung"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Buchungssatz"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Kontoauszug"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Kontoauszug"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Zahlungsverkehr"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Journal Kontoauszug"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Zahlungsverkehr Position"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Entwürfe Kontoauszüge"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Festgeschriebene Kontoauszüge"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Alle Kontoauszüge"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Journale Kontoauszüge"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Geprüfte Kontoauszüge"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Entwürfe Kontoauszüge"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Festgeschriebene Kontoauszüge"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Zahlungsverkehr"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Alle Kontoauszüge"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Journale Kontoauszüge"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Zahlungsverkehr"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Geprüfte Kontoauszüge"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Kontoauszug"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Kontoauszug"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Annulliert"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Entwurf"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Festgeschrieben"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Geprüft"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Annulliert"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Entwurf"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Festgeschrieben"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Geprüft"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Journal Kontoauszug"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Journale Kontoauszüge"
+
+msgctxt "view:account.statement.line:0"
+msgid "Bank Statement Line"
+msgstr "Posten Kontoauszug"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Kontoauszug Position"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Kontoauszug Positionen"
+
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement"
+msgstr "Kontoauszug"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement Lines"
+msgstr "Posten Kontoauszug"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statements"
+msgstr "Kontoauszüge"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Annullieren"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Buchungszeilen"
+
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Sonstiges"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Festschreiben"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Auf Entwurf zurücksetzen"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Kontoauszug"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Kontoauszug Positionen"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Kontoauszüge"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Prüfen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..443a08a
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,305 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "¡El valor (%s) es mayor que lo que se debe pagar en la factura!"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"¡Las cuentas crédito o débito en un diario son las mismas que las líneas de "
+"estado de cuenta!"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Por favor indique las cuentas débito y crédito en el libro de estado de "
+"cuentas."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "El Balance debe ser %s!"
+
+#, fuzzy
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Balance"
+
+#, fuzzy
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de Moneda"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Balance Final"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Transacciones"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Líneas de Movimiento"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Balance Inicial"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Factura"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Movimiento de Cuenta"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Estado de Cuentas"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Diario de Estados de Cuenta"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Línea de Estado de Cuenta"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Borrador de Estados de Cuenta"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estados de Cuenta Autorizados"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Todos los estados de cuenta"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Libros de Estados de Cuenta"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estados de Cuenta Validados"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Estados de Cuenta en Borrador"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estados de Cuenta Autorizados"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Estados de Cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Todos los estados de cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Diarios de Estados de Cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Estados de Cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estados de Cuenta Válidos"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Validado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Validado"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Libro de Estados de Cuenta"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Libros de Estados de Cuenta"
+
+msgctxt "view:account.statement.line:0"
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Libros de Estados de Cuenta"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Líneas de Estado de Cuenta"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement"
+msgstr "Extractos Bancarios"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statements"
+msgstr "Extractos Bancarios"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Líneas de Movimiento"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Información Adicional"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Confirmar"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Revertir a Borrador"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Estado de Cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Líneas de Estado de Cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Estados de Cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Validar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..3ca634c
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,304 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "La cantidad (%s) es mayor que la cantidad a pagar de la factura"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Las cuentas debe o haber en el diario son las mismas que las línea de estado"
+" de cuenta"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Por favor indique las cuentas debe y haber en el libro de estado de cuentas."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "El balance final debe ser %s"
+
+#, fuzzy
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Balance"
+
+#, fuzzy
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Balance final"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Transacciones"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Líneas de asientos"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Balance inicial"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Factura"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Asiento contable"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Estado de cuenta"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Estado de cuenta"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Estado de cuentas"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Diario de estados de cuenta"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Línea de estado de cuenta"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Estados de cuenta en borrador"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estados de cuenta confirmados"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Todos los estados de cuenta"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Libros de estados de cuenta"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estados de cuenta validados"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Estados de cuenta en borrador"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Estados de cuenta confirmados"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Estados de cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Todos los estados de cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Diarios de estados de cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Estados de cuenta"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Estados de cuenta validados"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Estado de cuenta"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Estado de cuenta"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Validado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Confirmado"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Validado"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Libro de estados de cuenta"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Libros de estados de cuenta"
+
+msgctxt "view:account.statement.line:0"
+msgid "Bank Statement Line"
+msgstr "Línea de extracto bancario"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Linea de estado de cuenta"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Líneas de estado de cuenta"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+msgctxt "view:account.statement:0"
+msgid "Bank Statements"
+msgstr "Extractos bancarios"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Líneas de asientos"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Información adicional"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Confirmar"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Restablecer a borrador"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Estado de cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Líneas de estado de cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Estados de cuenta"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Validar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..0f7d903
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,284 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "Le montant (%s) est plus grand que le montant à payer de la facture !"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Le compte de crédit ou débit sur le journal est le même que celui de la "
+"ligne de relevé !"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Veuillez fournir un compte de débit et de crédit pour le journal de relevés."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "Le solde final doit être %s !"
+
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Balance"
+
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Solde final"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Transactions"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Lignes de mouvement comptable"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Solde de départ"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "État"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Facture"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Mouvement comptable"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Relevé comptable"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Journal de relevés"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Ligne de relevé comptable"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Relevés brouillons"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Relevés postés"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Tous les relevés"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Journaux de relevés"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Relevés validés"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Relevés brouillons"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Relevés postés"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Relevés"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Tous les relevés"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Journaux de relevés"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Relevés"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Relevés validés"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Annulé"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Brouillon"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Posté"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Validé"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Annulé"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Brouillon"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Posté"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Validé"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Journal de relevés"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Journaux de relevés"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Ligne de relevé"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Lignes de relevé"
+
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Lignes de mouvement comptable"
+
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Autre information"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Poster"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Remetter en brouillon"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Relevé"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Lignes de relevé"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Relevés"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Valider"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..2c56208
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,288 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr "Het bedrag (%s) is hoger dan het bedrag op de factuur!"
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+"Credit of debit rekening van het dagboek is dezelfde als van het "
+"bankafschrift!"
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+"Geef een debit en een credit rekening op voor het dagboek bankafschriften."
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr "Eindbalans moet %s zijn!"
+
+#, fuzzy
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr "Balans"
+
+#, fuzzy
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr "Eindbalans"
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr "Dagboek"
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr "Transacties"
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr "Boekingsregels"
+
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr "Begin bedrag"
+
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Valuta"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr "Dagboek"
+
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr "Rekening"
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Specificatie"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr "Verkoopfactuur"
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr "Boeking"
+
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Relatie"
+
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Naam"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr "Bankafschrift"
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr "Bankafschrift"
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr "Rekeningafschrift"
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr "Dagboek bankafschriften"
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr "Rekeningafschriftregel"
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Concept bankafschriften"
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Geboekte bankafschriften"
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr "Alle bankafschriften"
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Dagboeken bankafschriften"
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Goedgekeurde bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr "Concept bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr "Geboekte bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr "Bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr "Alle bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr "Dagboeken bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr "Bankafschriften"
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr "Goedgekeurde bankafschriften"
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr "Bankafschrift"
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr "Bankafschrift"
+
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Geannuleerd"
+
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr "Geboekt"
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr "Goedgekeurd"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Geannuleerd"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Concept"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr "Geboekt"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr "Goedgekeurd"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr "Dagboek bankafschriften"
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr "Dagboeken bankafschriften"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr "Bankafschriftregel"
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr "Bankafschriftregels"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "view:account.statement:0"
+msgid "Move Lines"
+msgstr "Boekingen"
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr "Aanvullende informatie"
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr "Boeken"
+
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Terug naar concept"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr "Bankafschrift"
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr "Bankafschriftregels"
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr "Bankafschriften"
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr "Goedkeuren"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..22063ed
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,295 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.statement.line:0"
+msgid "Amount (%s) greater than the amount to pay of invoice!"
+msgstr ""
+
+msgctxt "error:account.statement.line:0"
+msgid ""
+"Credit or debit account on journal is the same than the statement line "
+"account!"
+msgstr ""
+
+msgctxt "error:account.statement.line:0"
+msgid "Please provide debit and credit account on statement journal."
+msgstr ""
+
+msgctxt "error:account.statement:0"
+msgid "End Balance must be %s!"
+msgstr ""
+
+msgctxt "field:account.statement,balance:0"
+msgid "Balance"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:account.statement,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,date:0"
+msgid "Date"
+msgstr "Дата"
+
+msgctxt "field:account.statement,end_balance:0"
+msgid "End Balance"
+msgstr ""
+
+msgctxt "field:account.statement,journal:0"
+msgid "Journal"
+msgstr ""
+
+msgctxt "field:account.statement,lines:0"
+msgid "Transactions"
+msgstr ""
+
+msgctxt "field:account.statement,move_lines:0"
+msgid "Move Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:account.statement,start_balance:0"
+msgid "Start Balance"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement,state:0"
+msgid "State"
+msgstr "Статус"
+
+#, fuzzy
+msgctxt "field:account.statement.journal,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+#, fuzzy
+msgctxt "field:account.statement.journal,currency:0"
+msgid "Currency"
+msgstr "Валюты"
+
+msgctxt "field:account.statement.journal,journal:0"
+msgid "Journal"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.journal,name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:account.statement.journal,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:account.statement.line,account:0"
+msgid "Account"
+msgstr ""
+
+msgctxt "field:account.statement.line,amount:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.line,date:0"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:account.statement.line,description:0"
+msgid "Description"
+msgstr "Описание"
+
+msgctxt "field:account.statement.line,invoice:0"
+msgid "Invoice"
+msgstr ""
+
+msgctxt "field:account.statement.line,move:0"
+msgid "Account Move"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.statement.line,party:0"
+msgid "Party"
+msgstr "Организации"
+
+#, fuzzy
+msgctxt "field:account.statement.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:account.statement.line,statement:0"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:account.journal.type,name:journal_type_statement"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:account.statement,name:0"
+msgid "Account Statement"
+msgstr ""
+
+msgctxt "model:account.statement.journal,name:0"
+msgid "Statement Journal"
+msgstr ""
+
+msgctxt "model:account.statement.line,name:0"
+msgid "Account Statement Line"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_draft_statement_form"
+msgid "Draft Statements"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_posted_statement_form"
+msgid "Posted Statements"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_statement_form"
+msgid "All Statement"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_statement_journal_form"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_validated_statement_form"
+msgid "Validated Statement"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_draft_statement_form"
+msgid "Draft Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_posted_statement_form"
+msgid "Posted Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_configuration"
+msgid "Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_form"
+msgid "All Statement"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statement_journal_form"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_statements"
+msgid "Statements"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_validated_statement_form"
+msgid "Validated Statement"
+msgstr ""
+
+msgctxt "model:res.group,name:group_statement"
+msgid "Statement"
+msgstr ""
+
+msgctxt "model:workflow,name:wkf_statement"
+msgid "Statement"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:workflow.activity,name:statement_act_cancel"
+msgid "Canceled"
+msgstr "Отменено"
+
+#, fuzzy
+msgctxt "model:workflow.activity,name:statement_act_draft"
+msgid "Draft"
+msgstr "Черновик"
+
+msgctxt "model:workflow.activity,name:statement_act_posted"
+msgid "Posted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:statement_act_validated"
+msgid "Validated"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:account.statement,state:0"
+msgid "Canceled"
+msgstr "Отменено"
+
+#, fuzzy
+msgctxt "selection:account.statement,state:0"
+msgid "Draft"
+msgstr "Черновик"
+
+msgctxt "selection:account.statement,state:0"
+msgid "Posted"
+msgstr ""
+
+msgctxt "selection:account.statement,state:0"
+msgid "Validated"
+msgstr ""
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journal"
+msgstr ""
+
+msgctxt "view:account.statement.journal:0"
+msgid "Statement Journals"
+msgstr ""
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Line"
+msgstr ""
+
+msgctxt "view:account.statement.line:0"
+msgid "Statement Lines"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "view:account.statement:0"
+msgid "Other Info"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Post"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:account.statement:0"
+msgid "Reset to Draft"
+msgstr "Сброс в черновики"
+
+msgctxt "view:account.statement:0"
+msgid "Statement"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Statement Lines"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Statements"
+msgstr ""
+
+msgctxt "view:account.statement:0"
+msgid "Validate"
+msgstr ""
diff --git a/nl_NL.csv b/nl_NL.csv
deleted file mode 100644
index 94302f6..0000000
--- a/nl_NL.csv
+++ /dev/null
@@ -1,68 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,Eindbalans moet %s zijn!,0
-error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Het bedrag (%s) is hoger dan het bedrag op de factuur!,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Credit of debit rekening van het dagboek is dezelfde als van het bankafschrift!,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Geef een debit en een credit rekening op voor het dagboek bankafschriften.,0
-field,"account.statement,currency_digits",0,Currency Digits,Valuta decimalen,0
-field,"account.statement,date",0,Date,Datum,0
-field,"account.statement,end_balance",0,End Balance,Eindbalans,0
-field,"account.statement,journal",0,Journal,Dagboek,0
-field,"account.statement,lines",0,Transactions,Transacties,0
-field,"account.statement,move_lines",0,Move Lines,Boekingsregels,0
-field,"account.statement,rec_name",0,Name,Naam,0
-field,"account.statement,start_balance",0,Start Balance,Begin bedrag,0
-field,"account.statement,state",0,State,Status,0
-field,"account.statement.journal,company",0,Company,Bedrijf,0
-field,"account.statement.journal,currency",0,Currency,Valuta,0
-field,"account.statement.journal,journal",0,Journal,Dagboek,0
-field,"account.statement.journal,name",0,Name,Naam,0
-field,"account.statement.journal,rec_name",0,Name,Naam,0
-field,"account.statement.line,account",0,Account,Rekening,0
-field,"account.statement.line,amount",0,Amount,Bedrag,0
-field,"account.statement.line,date",0,Date,Datum,0
-field,"account.statement.line,description",0,Description,Specificatie,0
-field,"account.statement.line,invoice",0,Invoice,Verkoopfactuur,0
-field,"account.statement.line,move",0,Account Move,Boeking,0
-field,"account.statement.line,party",0,Party,Relatie,0
-field,"account.statement.line,rec_name",0,Name,Naam,0
-field,"account.statement.line,statement",0,Statement,Bankafschrift,0
-model,"account.journal.type,name",journal_type_statement,Statement,Bankafschrift,0
-model,"account.statement,name",0,Account Statement,Rekeningafschrift,0
-model,"account.statement.journal,name",0,Statement Journal,Dagboek bankafschriften,0
-model,"account.statement.line,name",0,Account Statement Line,Rekeningafschriftregel,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Concept bankafschriften,0
-model,"ir.action,name",act_new_statement_form,New Statement,Nieuw bankafschrift,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Geboekte bankafschriften,0
-model,"ir.action,name",act_statement_form,All Statement,Alle bankafschriften,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Dagboeken bankafschriften,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Goedgekeurde bankafschriften,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Concept bankafschriften,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nieuw bankafschrift,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Geboekte bankafschriften,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Bankafschriften,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle bankafschriften,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Dagboeken bankafschriften,0
-model,"ir.ui.menu,name",menu_statements,Statements,Bankafschriften,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Goedgekeurde bankafschriften,0
-model,"res.group,name",group_statement,Statement,Bankafschrift,0
-model,"workflow,name",wkf_statement,Statement,Bankafschrift,0
-model,"workflow.activity,name",statement_act_cancel,Canceled,Geannuleerd,0
-model,"workflow.activity,name",statement_act_draft,Draft,Concept,0
-model,"workflow.activity,name",statement_act_posted,Posted,Geboekt,0
-model,"workflow.activity,name",statement_act_validated,Validated,Goedgekeurd,0
-selection,"account.statement,state",0,Canceled,Geannuleerd,0
-selection,"account.statement,state",0,Draft,Concept,0
-selection,"account.statement,state",0,Posted,Geboekt,0
-selection,"account.statement,state",0,Validated,Goedgekeurd,0
-view,account.statement,0,Cancel,Annuleren,0
-view,account.statement,0,Move Lines,Boekingen,0
-view,account.statement,0,Post,Boeken,0
-view,account.statement,0,Reset to Draft,Terug naar concept,0
-view,account.statement,0,Statement,Bankafschrift,0
-view,account.statement,0,Statement Lines,Bankafschriftregels,0
-view,account.statement,0,Statements,Bankafschriften,0
-view,account.statement,0,Validate,Goedkeuren,0
-view,account.statement.journal,0,Statement Journal,Dagboek bankafschriften,0
-view,account.statement.journal,0,Statement Journals,Dagboeken bankafschriften,0
-view,account.statement.line,0,Statement Line,Bankafschriftregel,0
-view,account.statement.line,0,Statement Lines,Bankafschriftregels,0
diff --git a/setup.py b/setup.py
index 46a20ed..0a2dd2e 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,9 @@ for dep in info.get('depends', []):
requires.append('trytond >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1))
+tests_require = ['proteus >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1)]
+
setup(name='trytond_account_statement',
version=info.get('version', '0.0.1'),
description=info.get('description', ''),
@@ -39,18 +42,20 @@ setup(name='trytond_account_statement',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
@@ -65,4 +70,5 @@ setup(name='trytond_account_statement',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
)
diff --git a/statement.py b/statement.py
index 1e768b6..b4d4fd8 100644
--- a/statement.py
+++ b/statement.py
@@ -1,13 +1,14 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
from decimal import Decimal
from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval, Or, Bool, Get, If, In
+from trytond.pyson import Eval, If
from trytond.transaction import Transaction
from trytond.backend import TableHandler
+from trytond.pool import Pool
-_STATES = {'readonly': Not(Equal(Eval('state'), 'draft'))}
+_STATES = {'readonly': Eval('state') != 'draft'}
+_DEPENDS = ['state']
class Statement(ModelWorkflow, ModelSQL, ModelView):
@@ -17,31 +18,40 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=1, states=_STATES, domain=[
- ('id', If(In('company', Eval('context', {})), '=', '!='),
- Get(Eval('context', {}), 'company', 0)),
- ])
+ ('id', If(Eval('context', {}).contains('company'), '=', '!='),
+ Eval('context', {}).get('company', 0)),
+ ],
+ depends=_DEPENDS)
journal = fields.Many2One('account.statement.journal', 'Journal', required=True,
domain=[
- ('company', '=', Eval('company')),
- ],
+ ('company', '=', Eval('context', {}).get('company', 0)),
+ ],
states={
- 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
- Bool(Eval('lines'))),
- }, on_change=['journal'], select=1)
+ 'readonly': (Eval('state') != 'draft') | Eval('lines'),
+ },
+ on_change=['journal', 'state', 'lines'], select=1,
+ depends=['state', 'lines'])
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['journal']), 'get_currency_digits')
- date = fields.Date('Date', required=True, states=_STATES, select=1)
+ date = fields.Date('Date', required=True, states=_STATES, depends=_DEPENDS,
+ select=1)
start_balance = fields.Numeric('Start Balance',
- digits=(16, Eval('currency_digits', 2)),
- states=_STATES, depends=['currency_digits'])
+ digits=(16, Eval('currency_digits', 2)),
+ states=_STATES, depends=['state', 'currency_digits'])
end_balance = fields.Numeric('End Balance',
+ digits=(16, Eval('currency_digits', 2)),
+ states=_STATES, depends=['state', 'currency_digits'])
+ balance = fields.Function(
+ fields.Numeric('Balance',
digits=(16, Eval('currency_digits', 2)),
- states=_STATES, depends=['currency_digits'])
+ on_change_with=['start_balance', 'end_balance'],
+ depends=['currency_digits']),
+ 'get_balance')
lines = fields.One2Many('account.statement.line', 'statement',
- 'Transactions', states={
- 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
- Not(Bool(Eval('journal')))),
- }, on_change=['lines', 'journal'])
+ 'Transactions', states={
+ 'readonly': (Eval('state') != 'draft') | ~Eval('journal'),
+ }, on_change=['lines', 'journal'],
+ depends=['state', 'journal'])
state = fields.Selection([
('draft', 'Draft'),
('validated', 'Validated'),
@@ -92,11 +102,11 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
return 'draft'
def default_date(self):
- date_obj = self.pool.get('ir.date')
+ date_obj = Pool().get('ir.date')
return date_obj.today()
def default_currency_digits(self):
- company_obj = self.pool.get('company.company')
+ company_obj = Pool().get('company.company')
if Transaction().context.get('company'):
company = company_obj.browse(Transaction().context['company'])
return company.currency.digits
@@ -120,7 +130,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
return res
def on_change_with_currency_digits(self, vals):
- journal_obj = self.pool.get('account.statement.journal')
+ journal_obj = Pool().get('account.statement.journal')
if vals.get('journal'):
journal = journal_obj.browse(vals['journal'])
return journal.currency.digits
@@ -133,7 +143,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
return res
def get_rec_name(self, ids, name):
- lang_obj = self.pool.get('ir.lang')
+ lang_obj = Pool().get('ir.lang')
if not ids:
return {}
@@ -189,10 +199,21 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res[statement.id] += line.amount
return res
+ def get_balance(self, ids, name):
+ return dict((s.id, s.end_balance - s.start_balance)
+ for s in self.browse(ids))
+
+ def on_change_with_balance(self, values):
+ if not set(('end_balance', 'start_balance')) <= set(values):
+ return 0
+ else:
+ return values['end_balance'] - values['start_balance']
+
def on_change_lines(self, values):
- invoice_obj = self.pool.get('account.invoice')
- journal_obj = self.pool.get('account.statement.journal')
- currency_obj = self.pool.get('currency.currency')
+ pool = Pool()
+ invoice_obj = pool.get('account.invoice')
+ journal_obj = pool.get('account.statement.journal')
+ currency_obj = pool.get('currency.currency')
res = {
'lines': {},
}
@@ -203,7 +224,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
if line['invoice']:
invoice_ids.add(line['invoice'])
invoice_id2amount_to_pay = {}
- for invoice in invoice_obj.browse(invoice_ids):
+ for invoice in invoice_obj.browse(list(invoice_ids)):
with Transaction().set_context(date=invoice.currency_date):
invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
invoice.currency.id, invoice.amount_to_pay,
@@ -237,11 +258,9 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
amount_to_pay - abs(line['amount'])
return res
- def set_state_validated(self, statement_id):
- statement_line_obj = self.pool.get('account.statement.line')
- lang_obj = self.pool.get('ir.lang')
-
- statement = self.browse(statement_id)
+ def wkf_validated(self, statement):
+ statement_line_obj = Pool().get('account.statement.line')
+ lang_obj = Pool().get('ir.lang')
computed_end_balance = statement.start_balance
for line in statement.lines:
@@ -261,25 +280,23 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
self.raise_user_error('wrong_end_balance', error_args=(amount,))
for line in statement.lines:
statement_line_obj.create_move(line)
- self.write(statement_id, {
+ self.write(statement.id, {
'state':'validated',
})
- def set_state_posted(self, statement_id):
- statement_line_obj = self.pool.get('account.statement.line')
+ def wkf_posted(self, statement):
+ statement_line_obj = Pool().get('account.statement.line')
- statement = self.browse(statement_id)
statement_line_obj.post_move(statement.lines)
- self.write(statement_id, {
+ self.write(statement.id, {
'state':'posted',
})
- def set_state_cancel(self, statement_id):
- statement_line_obj = self.pool.get('account.statement.line')
+ def wkf_cancel(self, statement):
+ statement_line_obj = Pool().get('account.statement.line')
- statement = self.browse(statement_id)
statement_line_obj.delete_move(statement.lines)
- self.write(statement_id, {
+ self.write(statement.id, {
'state':'cancel',
})
@@ -302,29 +319,29 @@ class Line(ModelSQL, ModelView):
required=True, ondelete='CASCADE')
date = fields.Date('Date', required=True)
amount = fields.Numeric('Amount', required=True,
- digits=(16, Get(Eval('_parent_statement', {}),
- 'currency_digits', 2)),
- on_change=['amount', 'party', 'account', 'invoice',
- '_parent_statement.journal'])
+ digits=(16, Eval('_parent_statement', {}).get( 'currency_digits', 2)),
+ on_change=['amount', 'party', 'account', 'invoice',
+ '_parent_statement.journal'])
party = fields.Many2One('party.party', 'Party',
on_change=['amount', 'party', 'invoice'])
account = fields.Many2One('account.account', 'Account', required=True,
- on_change=['account', 'invoice'], domain=[
- ('kind', '!=', 'view'),
- ('company', '=', Get(Eval('_parent_statement', {}), 'company')),
+ on_change=['account', 'invoice'], domain=[
+ ('kind', '!=', 'view'),
+ ('company', '=', Eval('_parent_statement', {}).get('company', 0)),
])
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
- domain=[
- ('party', '=', Eval('party')),
- ('account', '=', Eval('account')),
- ('state', '=', If(Equal(Get(Eval('_parent_statement', {}),
- 'state'), 'draft'), 'open', '')),
+ domain=[
+ ('party', '=', Eval('party')),
+ ('account', '=', Eval('account')),
+ ('state', '=', If(Eval('_parent_statement', {}).get('state')
+ == 'draft', 'open', '')),
],
- states={
- 'readonly': Not(Bool(Eval('amount'))),
- })
+ states={
+ 'readonly': ~Eval('amount'),
+ },
+ depends=['party', 'account', 'amount'])
def __init__(self):
super(Line, self).__init__()
@@ -338,8 +355,8 @@ class Line(ModelSQL, ModelView):
})
def on_change_party(self, value):
- party_obj = self.pool.get('party.party')
- invoice_obj = self.pool.get('account.invoice')
+ party_obj = Pool().get('party.party')
+ invoice_obj = Pool().get('account.invoice')
res = {}
if value.get('party'):
@@ -362,10 +379,11 @@ class Line(ModelSQL, ModelView):
return res
def on_change_amount(self, value):
- party_obj = self.pool.get('party.party')
- invoice_obj = self.pool.get('account.invoice')
- journal_obj = self.pool.get('account.statement.journal')
- currency_obj = self.pool.get('currency.currency')
+ pool = Pool()
+ party_obj = pool.get('party.party')
+ invoice_obj = pool.get('account.invoice')
+ journal_obj = pool.get('account.statement.journal')
+ currency_obj = pool.get('currency.currency')
res = {}
if value.get('party'):
@@ -395,7 +413,7 @@ class Line(ModelSQL, ModelView):
return res
def on_change_account(self, value):
- invoice_obj = self.pool.get('account.invoice')
+ invoice_obj = Pool().get('account.invoice')
res = {}
if value.get('invoice'):
@@ -414,12 +432,13 @@ class Line(ModelSQL, ModelView):
:param line: a BrowseRecord of the line
:return: the move id
'''
- move_obj = self.pool.get('account.move')
- period_obj = self.pool.get('account.period')
- invoice_obj = self.pool.get('account.invoice')
- currency_obj = self.pool.get('currency.currency')
- move_line_obj = self.pool.get('account.move.line')
- lang_obj = self.pool.get('ir.lang')
+ pool = Pool()
+ move_obj = pool.get('account.move')
+ period_obj = pool.get('account.period')
+ invoice_obj = pool.get('account.invoice')
+ currency_obj = pool.get('currency.currency')
+ move_line_obj = pool.get('account.move.line')
+ lang_obj = pool.get('ir.lang')
period_id = period_obj.find(line.statement.company.id,
date=line.date)
@@ -480,11 +499,11 @@ class Line(ModelSQL, ModelView):
return move_id
def post_move(self, lines):
- move_obj = self.pool.get('account.move')
+ move_obj = Pool().get('account.move')
move_obj.post([l.move.id for l in lines if l.move])
def delete_move(self, lines):
- move_obj = self.pool.get('account.move')
+ move_obj = Pool().get('account.move')
move_obj.delete([l.move.id for l in lines if l.move])
def _get_move_lines(self, statement_line):
@@ -494,7 +513,7 @@ class Line(ModelSQL, ModelView):
:param statement_line: a BrowseRecord of the statement line
:return: a list of dictionary of move line values
'''
- currency_obj = self.pool.get('currency.currency')
+ currency_obj = Pool().get('currency.currency')
zero = Decimal("0.0")
amount = currency_obj.compute(
statement_line.statement.journal.currency, statement_line.amount,
diff --git a/statement.xml b/statement.xml
index 6585100..aa7374e 100644
--- a/statement.xml
+++ b/statement.xml
@@ -6,6 +6,15 @@ this repository contains the full copyright notices and license terms. -->
<record model="res.group" id="group_statement">
<field name="name">Statement</field>
</record>
+ <record model="res.user-res.group" id="user_admin_group_statement">
+ <field name="user" ref="res.user_admin"/>
+ <field name="group" ref="group_statement"/>
+ </record>
+ <record model="res.user-res.group" id="user_trigger_group_statement">
+ <field name="user" ref="res.user_trigger"/>
+ <field name="group" ref="group_statement"/>
+ </record>
+
<menuitem name="Statements" parent="account.menu_account"
id="menu_statements" sequence="45"/>
<menuitem name="Statements" parent="account.menu_account_configuration"
@@ -29,7 +38,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="lines" colspan="4">
<tree string="Statement Lines" editable="bottom">
<field name="date"/>
- <field name="amount"/>
+ <field name="amount" sum="Amount"/>
<field name="party"/>
<field name="account"/>
<field name="invoice"/>
@@ -37,17 +46,21 @@ this repository contains the full copyright notices and license terms. -->
</tree>
</field>
<group col="6" colspan="4" id="state_buttons">
- <label name="state"/>
- <field name="state"/>
- <button string="Validate" name="validated"
- states="{'invisible': Not(Equal(Eval('state'), 'draft'))}"/>
- <button string="Cancel" name="cancel"
- states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
- <button string="Post" name="posted"
- states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
- <button string="Reset to Draft" name="draft_workflow"
- type="object"
- states="{'invisible': Not(Equal(Eval('state'), 'cancel'))}"/>
+ <label name="balance"/>
+ <field name="balance"/>
+ <label name="state"/>
+ <field name="state"/>
+ <group col="4" colspan="2" id="buttons">
+ <button string="Validate" name="validated"
+ states="{'invisible': Not(Equal(Eval('state'), 'draft'))}"/>
+ <button string="Cancel" name="cancel"
+ states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
+ <button string="Post" name="posted"
+ states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
+ <button string="Reset to Draft" name="draft_workflow"
+ type="object"
+ states="{'invisible': Not(Equal(Eval('state'), 'cancel'))}"/>
+ </group>
</group>
</page>
<page string="Other Info" id="info">
@@ -77,23 +90,6 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
- <record model="ir.action.act_window" id="act_new_statement_form">
- <field name="name">New Statement</field>
- <field name="res_model">account.statement</field>
- </record>
- <record model="ir.action.act_window.view" id="act_new_statement_form_view1">
- <field name="sequence" eval="20"/>
- <field name="view" ref="statement_view_tree"/>
- <field name="act_window" ref="act_new_statement_form"/>
- </record>
- <record model="ir.action.act_window.view" id="act_new_statement_form_view2">
- <field name="sequence" eval="10"/>
- <field name="view" ref="statement_view_form"/>
- <field name="act_window" ref="act_new_statement_form"/>
- </record>
- <menuitem parent="menu_statements" sequence="1"
- action="act_new_statement_form" id="menu_new_statement_form"/>
-
<record model="ir.action.act_window" id="act_draft_statement_form">
<field name="name">Draft Statements</field>
<field name="res_model">account.statement</field>
@@ -231,21 +227,18 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="workflow.activity" id="statement_act_validated">
<field name="workflow" ref="wkf_statement"/>
- <field name="kind">function</field>
- <field name="action">set_state_validated()</field>
+ <field name="method">wkf_validated</field>
<field name="name">Validated</field>
</record>
<record model="workflow.activity" id="statement_act_posted">
<field name="workflow" ref="wkf_statement"/>
- <field name="kind">function</field>
- <field name="action">set_state_posted()</field>
+ <field name="method">wkf_posted</field>
<field name="name">Posted</field>
<field name="flow_stop" eval="True"/>
</record>
<record model="workflow.activity" id="statement_act_cancel">
<field name="workflow" ref="wkf_statement"/>
- <field name="kind">function</field>
- <field name="action">set_state_cancel()</field>
+ <field name="method">wkf_cancel</field>
<field name="name">Canceled</field>
<field name="flow_stop" eval="True"/>
</record>
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index 989dfad..010a5cb 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -11,7 +11,7 @@ if os.path.isdir(DIR):
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
from trytond.backend.sqlite.database import Database as SQLiteDatabase
@@ -29,6 +29,12 @@ class AccountStatementTestCase(unittest.TestCase):
'''
test_view('account_statement')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def doctest_dropdb(test):
'''
Remove sqlite memory database
@@ -46,7 +52,8 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountStatementTestCase))
suite.addTests(doctest.DocFileSuite('scenario_account_statement.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8'))
+ setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
if __name__ == '__main__':
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index d94910f..81c0e62 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 2.0.0
+Version: 2.2.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,23 +9,25 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 3242434..19d7af2 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -4,14 +4,8 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
invoice.xml
journal.xml
-nl_NL.csv
setup.py
statement.xml
./__init__.py
@@ -20,6 +14,14 @@ statement.xml
./statement.py
./tests/__init__.py
./tests/test_account_statement.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
trytond_account_statement.egg-info/dependency_links.txt
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 675ddc5..cafa5d5 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 2.0, < 2.1
-trytond_company >= 2.0, < 2.1
-trytond_currency >= 2.0, < 2.1
-trytond_party >= 2.0, < 2.1
-trytond_account_invoice >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_account >= 2.2, < 2.3
+trytond_company >= 2.2, < 2.3
+trytond_currency >= 2.2, < 2.3
+trytond_party >= 2.2, < 2.3
+trytond_account_invoice >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 5e7ae93213d7dd6126ebeaf66ef495403f74358b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:55 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index 5659b91..f70dde8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Depends:
tryton-modules-account (>= 2.0), tryton-modules-account-invoice (>= 2.0),
tryton-modules-company (>= 2.0), tryton-modules-currency (>= 2.0),
tryton-modules-party (>= 2.0), python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit b52407a34082d5885da87d58cd90594e6e5a7eec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:12:12 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index 2a6485e..342573e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-account-statement (2.0.0-2) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:12:01 +0200
+
tryton-modules-account-statement (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 3d23dd5054140d90f2d6cfbde69d2ba287a2a8f9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 20:28:22 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index a23ab21..5659b91 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
+X-Python-Version: >= 2.5
Package: tryton-modules-account-statement
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 5f693efab7aefce4e98fb3259171cf47088013f5
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index 7341dcd..a23ab21 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-account-statement
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 8a55457bcab422fd22c6bc92b33ae11e58471540
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:39 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index fc13eeb..b2d5d1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,3 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
@@ -10,25 +5,12 @@ Copyright:
(C) 2008-2011 Bertrand Chenal
(C) 2008-2011 B2CK SPRL
License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -42,5 +24,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit e4fa6927addf98a4e0d6dbd916a70c220ff5bb41
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:54 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit d223f31cd7e53bbf346a290bcca16db9f9bb10df
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:02 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit 843636dbec9106954526444e1512eaf35f9e5176
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:00 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index cbcd7dd..2a6485e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-statement (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:31:34 +0200
+
tryton-modules-account-statement (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit 069bc9c6612b1e441918612a1e03cad46c0bd7b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:33 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index 24ec6b9..7341dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-stat
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-account (>= 1.8), tryton-modules-account-invoice (>= 1.8),
- tryton-modules-company (>= 1.8), tryton-modules-currency (>= 1.8),
- tryton-modules-party (>= 1.8), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-account (>= 2.0), tryton-modules-account-invoice (>= 2.0),
+ tryton-modules-company (>= 2.0), tryton-modules-currency (>= 2.0),
+ tryton-modules-party (>= 2.0), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
commit dc3c83bf8fcdd0c28a931b66b21105525f7eef0b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 20:40:03 2011 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index bf68e1b..fc13eeb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2010 Cedric Krier
- (C) 2008-2010 Bertrand Chenal
- (C) 2008-2010 B2CK SPRL
+ (C) 2008-2011 Cedric Krier
+ (C) 2008-2011 Bertrand Chenal
+ (C) 2008-2011 B2CK SPRL
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 26d33fdd07c88b356c0a5588a7a1974c7e0016c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:39 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0d47c34..ccc376c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+* Add company on statement
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 94a43fb..a9feb41 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 339e840..45c81bb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.8.0
+Version: 2.0.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,11 +18,15 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__tryton__.py b/__tryton__.py
index c95a55f..14ae2f5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,13 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Account Statement',
+ 'name_bg_BG': 'Отчет на сметка',
'name_de_DE': 'Buchhaltung Bankauszüge',
'name_es_CO': 'Estado de Cuentas',
'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.8.0',
+ 'name_nl_NL': 'Bankafschriften',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,6 +16,10 @@
- Statement
- Statement journal
''',
+ 'description_bg_BG': '''Финансов и счетоводен модул с:
+ - Отчети
+ - Дневник на отчети
+''',
'description_de_DE': '''Modul für Buchhaltung und Bankauszüge mit
- Abstimmung von Bankauszügen und Rechnungen
''',
@@ -29,6 +35,10 @@
- Relevé
- Journal de relevés
''',
+ 'description_nl_NL': '''Module voor het verwerken van bankafschriften met:
+ - bankboeken
+ - afletteren van rekeningen
+''',
'depends': [
'account',
'company',
@@ -42,9 +52,11 @@
'invoice.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
+ 'nl_NL.csv',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..9fe8f19
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,70 @@
+type,name,res_id,src,value,fuzzy
+error,account.statement,0,End Balance must be %s!,Крайния баланс трябва да е %s!,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Сумата (%s) е по-голяма от сумата за плащане по фактурата!,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Кредитната/дебитната сметка на дневника е същата сметката като на ред от отчета!,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Моля укажете дебитна и кредитна сметка за дневника за отчети.,0
+field,"account.statement,company",0,Company,Фирма,0
+field,"account.statement,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"account.statement,date",0,Date,Дата,0
+field,"account.statement,end_balance",0,End Balance,Краен баланс,0
+field,"account.statement,journal",0,Journal,Дневник,0
+field,"account.statement,lines",0,Transactions,Транзакции,0
+field,"account.statement,move_lines",0,Move Lines,Редове на движение,0
+field,"account.statement,rec_name",0,Name,Име,0
+field,"account.statement,start_balance",0,Start Balance,Начален баланс,0
+field,"account.statement,state",0,State,Състояние,0
+field,"account.statement.journal,company",0,Company,Фирма,0
+field,"account.statement.journal,currency",0,Currency,Валута,0
+field,"account.statement.journal,journal",0,Journal,Дневник,0
+field,"account.statement.journal,name",0,Name,Име,0
+field,"account.statement.journal,rec_name",0,Name,Име,0
+field,"account.statement.line,account",0,Account,Сметка,0
+field,"account.statement.line,amount",0,Amount,Сума,0
+field,"account.statement.line,date",0,Date,Дата,0
+field,"account.statement.line,description",0,Description,Описание,0
+field,"account.statement.line,invoice",0,Invoice,Фактура,0
+field,"account.statement.line,move",0,Account Move,Движение по сметка,0
+field,"account.statement.line,party",0,Party,Партньор,0
+field,"account.statement.line,rec_name",0,Name,Име,0
+field,"account.statement.line,statement",0,Statement,Отчет,0
+model,"account.journal.type,name",journal_type_statement,Statement,Отчет,0
+model,"account.statement,name",0,Account Statement,Отчет за сметка,0
+model,"account.statement.journal,name",0,Statement Journal,Дневник за отчети,0
+model,"account.statement.line,name",0,Account Statement Line,Ред от отчет за сметка,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Проект на отчет,0
+model,"ir.action,name",act_new_statement_form,New Statement,Нов отчет,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Публикувани отчети,0
+model,"ir.action,name",act_statement_form,All Statement,Всички отчети,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Дневник за отчети,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Проверен отчет,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Проект на отчет,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Нов отчет,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Публикувани отчети,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Отчети,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Всички отчети,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Дневник за отчети,0
+model,"ir.ui.menu,name",menu_statements,Statements,Отчети,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Проверен отчет,0
+model,"res.group,name",group_statement,Statement,Отчет,0
+model,"workflow,name",wkf_statement,Statement,Отчет,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Отказан,0
+model,"workflow.activity,name",statement_act_draft,Draft,Проект,0
+model,"workflow.activity,name",statement_act_posted,Posted,Публикуван,0
+model,"workflow.activity,name",statement_act_validated,Validated,Проверен,0
+selection,"account.statement,state",0,Canceled,Отказан,0
+selection,"account.statement,state",0,Draft,Проект,0
+selection,"account.statement,state",0,Posted,Публикуван,0
+selection,"account.statement,state",0,Validated,Проверен,0
+view,account.statement,0,Cancel,Отказ,0
+view,account.statement,0,Move Lines,Редове от движение,0
+view,account.statement,0,Other Info,Друга информация,0
+view,account.statement,0,Post,Публикуван,0
+view,account.statement,0,Reset to Draft,Изпращане в проект,0
+view,account.statement,0,Statement,Отчет,0
+view,account.statement,0,Statement Lines,Редове от отчет,0
+view,account.statement,0,Statements,Отчети,0
+view,account.statement,0,Validate,Проверка,0
+view,account.statement.journal,0,Statement Journal,Дневник за отчети,0
+view,account.statement.journal,0,Statement Journals,Дневник за отчети,0
+view,account.statement.line,0,Statement Line,Ред от отчет,0
+view,account.statement.line,0,Statement Lines,Редове от отчет,0
diff --git a/de_DE.csv b/de_DE.csv
index 03f81a7..46b87b9 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -3,12 +3,13 @@ error,account.statement,0,End Balance must be %s!,Endsaldo muss %s sein!,0
error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!,0
error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Haben- oder Sollkonto im Journal ist das selbe Konto wie das des Zahlungspostens!,0
error,account.statement.line,0,Please provide debit and credit account on statement journal.,Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben.,0
+field,"account.statement,company",0,Company,Unternehmen,0
field,"account.statement,currency_digits",0,Currency Digits,Stellen Währung,0
field,"account.statement,date",0,Date,Datum,0
field,"account.statement,end_balance",0,End Balance,Endsaldo,0
field,"account.statement,journal",0,Journal,Journal,0
field,"account.statement,lines",0,Transactions,Transaktionen,0
-field,"account.statement,move_lines",0,Move Lines,Buchungsposten,0
+field,"account.statement,move_lines",0,Move Lines,Buchungszeilen,0
field,"account.statement,rec_name",0,Name,Name,0
field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
field,"account.statement,state",0,State,Status,0
@@ -25,27 +26,27 @@ field,"account.statement.line,invoice",0,Invoice,Rechnung,0
field,"account.statement.line,move",0,Account Move,Buchungssatz,0
field,"account.statement.line,party",0,Party,Partei,0
field,"account.statement.line,rec_name",0,Name,Name,0
-field,"account.statement.line,statement",0,Statement,Zahlung,0
-model,"account.journal.type,name",journal_type_statement,Statement,Zahlung,0
+field,"account.statement.line,statement",0,Statement,Kontoauszug,0
+model,"account.journal.type,name",journal_type_statement,Statement,Kontoauszug,0
model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
-model,"account.statement.journal,name",0,Statement Journal,Journal Zahlungsverkehr,0
+model,"account.statement.journal,name",0,Statement Journal,Journal Kontoauszug,0
model,"account.statement.line,name",0,Account Statement Line,Zahlungsverkehr Position,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
-model,"ir.action,name",act_new_statement_form,New Statement,Neue Zahlung,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
-model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
-model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Neue Zahlung,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Entwürfe Kontoauszüge,0
+model,"ir.action,name",act_new_statement_form,New Statement,Neuer Kontoauszug,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Kontoauszüge,0
+model,"ir.action,name",act_statement_form,All Statement,Alle Kontoauszüge,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Kontoauszüge,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Kontoauszüge,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Entwürfe Kontoauszüge,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Neuer Kontoauszug,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Kontoauszüge,0
model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Kontoauszüge,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Kontoauszüge,0
model,"ir.ui.menu,name",menu_statements,Statements,Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
-model,"res.group,name",group_statement,Statement,Zahlung,0
-model,"workflow,name",wkf_statement,Statement,Zahlung,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Kontoauszüge,0
+model,"res.group,name",group_statement,Statement,Kontoauszug,0
+model,"workflow,name",wkf_statement,Statement,Kontoauszug,0
model,"workflow.activity,name",statement_act_cancel,Canceled,Annulliert,0
model,"workflow.activity,name",statement_act_draft,Draft,Entwurf,0
model,"workflow.activity,name",statement_act_posted,Posted,Festgeschrieben,0
@@ -54,19 +55,20 @@ selection,"account.statement,state",0,Canceled,Annulliert,0
selection,"account.statement,state",0,Draft,Entwurf,0
selection,"account.statement,state",0,Posted,Festgeschrieben,0
selection,"account.statement,state",0,Validated,Geprüft,0
-view,account.statement,0,Bank Statement,Bankauszug,0
-view,account.statement,0,Bank Statement Lines,Posten Bankauszüge,0
-view,account.statement,0,Bank Statements,Bankauszüge,0
+view,account.statement,0,Bank Statement,Kontoauszug,0
+view,account.statement,0,Bank Statement Lines,Posten Kontoauszug,0
+view,account.statement,0,Bank Statements,Kontoauszüge,0
view,account.statement,0,Cancel,Annullieren,0
-view,account.statement,0,Move Lines,Buchungsposten,0
+view,account.statement,0,Move Lines,Buchungszeilen,0
+view,account.statement,0,Other Info,Sonstiges,0
view,account.statement,0,Post,Festschreiben,0
view,account.statement,0,Reset to Draft,Auf Entwurf zurücksetzen,0
-view,account.statement,0,Statement,Zahlung,0
-view,account.statement,0,Statement Lines,Zahlungsposten,0
-view,account.statement,0,Statements,Zahlungsverkehr,0
+view,account.statement,0,Statement,Kontoauszug,0
+view,account.statement,0,Statement Lines,Kontoauszug Positionen,0
+view,account.statement,0,Statements,Kontoauszüge,0
view,account.statement,0,Validate,Prüfen,0
-view,account.statement.journal,0,Statement Journal,Journal Zahlungsverkehr,0
-view,account.statement.journal,0,Statement Journals,Journale Zahlungsverkehr,0
-view,account.statement.line,0,Bank Statement Line,Posten Bankauszüge,0
-view,account.statement.line,0,Statement Line,Zahlungsposten,0
-view,account.statement.line,0,Statement Lines,Zahlungsposten,0
+view,account.statement.journal,0,Statement Journal,Journal Kontoauszug,0
+view,account.statement.journal,0,Statement Journals,Journale Kontoauszüge,0
+view,account.statement.line,0,Bank Statement Line,Posten Kontoauszug,0
+view,account.statement.line,0,Statement Line,Kontoauszug Position,0
+view,account.statement.line,0,Statement Lines,Kontoauszug Positionen,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 951aeac..c71c9e4 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -3,10 +3,16 @@ error,account.statement,0,End Balance must be %s!,Le solde final doit être %s !
error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Le montant (%s) est plus grand que le montant à payer de la facture !,0
error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Le compte de crédit ou débit sur le journal est le même que celui de la ligne de relevé !,0
error,account.statement.line,0,Please provide debit and credit account on statement journal.,Veuillez fournir un compte de débit et de crédit pour le journal de relevés.,0
+field,"account.statement,company",0,Company,Société,1
field,"account.statement,currency_digits",0,Currency Digits,Décimales de la devise,0
field,"account.statement,date",0,Date,Date,0
field,"account.statement,end_balance",0,End Balance,Solde final,0
field,"account.statement,journal",0,Journal,Journal,0
+field,"account.statement,lines",0,Transactions,Transactions,0
+field,"account.statement,move_lines",0,Move Lines,Lignes de mouvement comptable,0
+field,"account.statement,rec_name",0,Name,Nom,0
+field,"account.statement,start_balance",0,Start Balance,Solde de départ,0
+field,"account.statement,state",0,State,État,0
field,"account.statement.journal,company",0,Company,Société,0
field,"account.statement.journal,currency",0,Currency,Devise,0
field,"account.statement.journal,journal",0,Journal,Journal,0
@@ -20,42 +26,38 @@ field,"account.statement.line,invoice",0,Invoice,Facture,0
field,"account.statement.line,move",0,Account Move,Mouvement comptable,0
field,"account.statement.line,party",0,Party,Tiers,0
field,"account.statement.line,rec_name",0,Name,Nom,0
-field,"account.statement,lines",0,Transactions,Transactions,0
field,"account.statement.line,statement",0,Statement,Relevé,0
-field,"account.statement,move_lines",0,Move Lines,Lignes de mouvement comptable,0
-field,"account.statement,rec_name",0,Name,Nom,0
-field,"account.statement,start_balance",0,Start Balance,Solde de départ,0
-field,"account.statement,state",0,State,État,0
model,"account.journal.type,name",journal_type_statement,Statement,Relevé,0
+model,"account.statement,name",0,Account Statement,Relevé comptable,0
model,"account.statement.journal,name",0,Statement Journal,Journal de relevés,0
model,"account.statement.line,name",0,Account Statement Line,Ligne de relevé comptable,0
-model,"account.statement,name",0,Account Statement,Relevé comptable,0
-model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Relevés brouillons,0
model,"ir.action,name",act_new_statement_form,New Statement,Nouveau relevé,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Relevés postés,0
+model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Journaux de relevés,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Relevés validés,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Tous les relevés,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Relevés brouillons,0
model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nouveau relevé,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Relevés postés,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Relevés,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Tous les relevés,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journaux de relevés,0
model,"ir.ui.menu,name",menu_statements,Statements,Relevés,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Relevés,0
model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Relevés validés,0
model,"res.group,name",group_statement,Statement,Relevé,0
+model,"workflow,name",wkf_statement,Statement,Relevé,0
model,"workflow.activity,name",statement_act_cancel,Canceled,Annulé,0
model,"workflow.activity,name",statement_act_draft,Draft,Brouillon,0
model,"workflow.activity,name",statement_act_posted,Posted,Posté,0
model,"workflow.activity,name",statement_act_validated,Validated,Validé,0
-model,"workflow,name",wkf_statement,Statement,Relevé,0
selection,"account.statement,state",0,Canceled,Annulé,0
selection,"account.statement,state",0,Draft,Brouillon,0
selection,"account.statement,state",0,Posted,Posté,0
selection,"account.statement,state",0,Validated,Validé,0
view,account.statement,0,Cancel,Annuler,0
view,account.statement,0,Move Lines,Lignes de mouvement comptable,0
+view,account.statement,0,Other Info,Autre informations,1
view,account.statement,0,Post,Poster,0
view,account.statement,0,Reset to Draft,Remetter en brouillon,0
view,account.statement,0,Statement,Relevé,0
diff --git a/journal.xml b/journal.xml
index 899ec9c..6634efc 100644
--- a/journal.xml
+++ b/journal.xml
@@ -43,7 +43,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_statement_journal_form">
<field name="name">Statement Journals</field>
<field name="res_model">account.statement.journal</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_statement_journal_form_view1">
<field name="sequence" eval="10"/>
diff --git a/nl_NL.csv b/nl_NL.csv
new file mode 100644
index 0000000..94302f6
--- /dev/null
+++ b/nl_NL.csv
@@ -0,0 +1,68 @@
+type,name,res_id,src,value,fuzzy
+error,account.statement,0,End Balance must be %s!,Eindbalans moet %s zijn!,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Het bedrag (%s) is hoger dan het bedrag op de factuur!,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Credit of debit rekening van het dagboek is dezelfde als van het bankafschrift!,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Geef een debit en een credit rekening op voor het dagboek bankafschriften.,0
+field,"account.statement,currency_digits",0,Currency Digits,Valuta decimalen,0
+field,"account.statement,date",0,Date,Datum,0
+field,"account.statement,end_balance",0,End Balance,Eindbalans,0
+field,"account.statement,journal",0,Journal,Dagboek,0
+field,"account.statement,lines",0,Transactions,Transacties,0
+field,"account.statement,move_lines",0,Move Lines,Boekingsregels,0
+field,"account.statement,rec_name",0,Name,Naam,0
+field,"account.statement,start_balance",0,Start Balance,Begin bedrag,0
+field,"account.statement,state",0,State,Status,0
+field,"account.statement.journal,company",0,Company,Bedrijf,0
+field,"account.statement.journal,currency",0,Currency,Valuta,0
+field,"account.statement.journal,journal",0,Journal,Dagboek,0
+field,"account.statement.journal,name",0,Name,Naam,0
+field,"account.statement.journal,rec_name",0,Name,Naam,0
+field,"account.statement.line,account",0,Account,Rekening,0
+field,"account.statement.line,amount",0,Amount,Bedrag,0
+field,"account.statement.line,date",0,Date,Datum,0
+field,"account.statement.line,description",0,Description,Specificatie,0
+field,"account.statement.line,invoice",0,Invoice,Verkoopfactuur,0
+field,"account.statement.line,move",0,Account Move,Boeking,0
+field,"account.statement.line,party",0,Party,Relatie,0
+field,"account.statement.line,rec_name",0,Name,Naam,0
+field,"account.statement.line,statement",0,Statement,Bankafschrift,0
+model,"account.journal.type,name",journal_type_statement,Statement,Bankafschrift,0
+model,"account.statement,name",0,Account Statement,Rekeningafschrift,0
+model,"account.statement.journal,name",0,Statement Journal,Dagboek bankafschriften,0
+model,"account.statement.line,name",0,Account Statement Line,Rekeningafschriftregel,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Concept bankafschriften,0
+model,"ir.action,name",act_new_statement_form,New Statement,Nieuw bankafschrift,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Geboekte bankafschriften,0
+model,"ir.action,name",act_statement_form,All Statement,Alle bankafschriften,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Dagboeken bankafschriften,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Goedgekeurde bankafschriften,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Concept bankafschriften,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nieuw bankafschrift,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Geboekte bankafschriften,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Bankafschriften,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle bankafschriften,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Dagboeken bankafschriften,0
+model,"ir.ui.menu,name",menu_statements,Statements,Bankafschriften,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Goedgekeurde bankafschriften,0
+model,"res.group,name",group_statement,Statement,Bankafschrift,0
+model,"workflow,name",wkf_statement,Statement,Bankafschrift,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Geannuleerd,0
+model,"workflow.activity,name",statement_act_draft,Draft,Concept,0
+model,"workflow.activity,name",statement_act_posted,Posted,Geboekt,0
+model,"workflow.activity,name",statement_act_validated,Validated,Goedgekeurd,0
+selection,"account.statement,state",0,Canceled,Geannuleerd,0
+selection,"account.statement,state",0,Draft,Concept,0
+selection,"account.statement,state",0,Posted,Geboekt,0
+selection,"account.statement,state",0,Validated,Goedgekeurd,0
+view,account.statement,0,Cancel,Annuleren,0
+view,account.statement,0,Move Lines,Boekingen,0
+view,account.statement,0,Post,Boeken,0
+view,account.statement,0,Reset to Draft,Terug naar concept,0
+view,account.statement,0,Statement,Bankafschrift,0
+view,account.statement,0,Statement Lines,Bankafschriftregels,0
+view,account.statement,0,Statements,Bankafschriften,0
+view,account.statement,0,Validate,Goedkeuren,0
+view,account.statement.journal,0,Statement Journal,Dagboek bankafschriften,0
+view,account.statement.journal,0,Statement Journals,Dagboeken bankafschriften,0
+view,account.statement.line,0,Statement Line,Bankafschriftregel,0
+view,account.statement.line,0,Statement Lines,Bankafschriftregels,0
diff --git a/setup.py b/setup.py
index 725e799..46a20ed 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,16 @@ setup(name='trytond_account_statement',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/statement.py b/statement.py
index 668c678..1e768b6 100644
--- a/statement.py
+++ b/statement.py
@@ -1,9 +1,11 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from __future__ import with_statement
from decimal import Decimal
from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval, Or, Bool, Get, If
+from trytond.pyson import Not, Equal, Eval, Or, Bool, Get, If, In
from trytond.transaction import Transaction
+from trytond.backend import TableHandler
_STATES = {'readonly': Not(Equal(Eval('state'), 'draft'))}
@@ -13,11 +15,19 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
_name = 'account.statement'
_description = __doc__
+ company = fields.Many2One('company.company', 'Company', required=True,
+ select=1, states=_STATES, domain=[
+ ('id', If(In('company', Eval('context', {})), '=', '!='),
+ Get(Eval('context', {}), 'company', 0)),
+ ])
journal = fields.Many2One('account.statement.journal', 'Journal', required=True,
- states={
- 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
- Bool(Eval('lines'))),
- }, on_change=['journal'], select=1)
+ domain=[
+ ('company', '=', Eval('company')),
+ ],
+ states={
+ 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
+ Bool(Eval('lines'))),
+ }, on_change=['journal'], select=1)
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['journal']), 'get_currency_digits')
date = fields.Date('Date', required=True, states=_STATES, select=1)
@@ -51,6 +61,33 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
'wrong_end_balance': 'End Balance must be %s!',
})
+ def init(self, module_name):
+ cursor = Transaction().cursor
+
+ # Migration from 1.8: new field company
+ table = TableHandler(cursor, self, module_name)
+ company_exist = table.column_exist('company')
+
+ super(Statement, self).init(module_name)
+
+ # Migration from 1.8: fill new field company
+ if not company_exist:
+ offset = 0
+ limit = cursor.IN_MAX
+ statement_ids = True
+ while statement_ids:
+ statement_ids = self.search([], offset=offset, limit=limit)
+ offset += limit
+ for statement in self.browse(statement_ids):
+ self.write(statement.id, {
+ 'company': statement.journal.company.id,
+ })
+ table = TableHandler(cursor, self, module_name)
+ table.not_null_action('company', action='add')
+
+ def default_company(self):
+ return Transaction().context.get('company') or False
+
def default_state(self):
return 'draft'
@@ -167,9 +204,10 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
invoice_ids.add(line['invoice'])
invoice_id2amount_to_pay = {}
for invoice in invoice_obj.browse(invoice_ids):
- invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
- invoice.currency, invoice.amount_to_pay,
- journal.currency)
+ with Transaction().set_context(date=invoice.currency_date):
+ invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
+ invoice.currency.id, invoice.amount_to_pay,
+ journal.currency.id)
for line in values['lines']:
if line['invoice'] and line['id']:
@@ -271,7 +309,10 @@ class Line(ModelSQL, ModelView):
party = fields.Many2One('party.party', 'Party',
on_change=['amount', 'party', 'invoice'])
account = fields.Many2One('account.account', 'Account', required=True,
- on_change=['account', 'invoice'], domain=[('kind', '!=', 'view')])
+ on_change=['account', 'invoice'], domain=[
+ ('kind', '!=', 'view'),
+ ('company', '=', Get(Eval('_parent_statement', {}), 'company')),
+ ])
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
@@ -344,8 +385,9 @@ class Line(ModelSQL, ModelView):
if value.get('amount') and value.get('_parent_statement.journal'):
invoice = invoice_obj.browse(value['invoice'])
journal = journal_obj.browse(value['_parent_statement.journal'])
- amount_to_pay = currency_obj.compute(invoice.currency,
- invoice.amount_to_pay, journal.currency)
+ with Transaction().set_context(date=invoice.currency_date):
+ amount_to_pay = currency_obj.compute(invoice.currency.id,
+ invoice.amount_to_pay, journal.currency.id)
if abs(value['amount']) > amount_to_pay:
res['invoice'] = False
else:
@@ -379,7 +421,7 @@ class Line(ModelSQL, ModelView):
move_line_obj = self.pool.get('account.move.line')
lang_obj = self.pool.get('ir.lang')
- period_id = period_obj.find(line.statement.journal.company.id,
+ period_id = period_obj.find(line.statement.company.id,
date=line.date)
move_lines = self._get_move_lines(line)
@@ -396,9 +438,10 @@ class Line(ModelSQL, ModelView):
})
if line.invoice:
-
- amount_to_pay = currency_obj.compute(line.invoice.currency,
- line.invoice.amount_to_pay, line.statement.journal.currency)
+ with Transaction().set_context(date=line.invoice.currency_date):
+ amount_to_pay = currency_obj.compute(line.invoice.currency.id,
+ line.invoice.amount_to_pay,
+ line.statement.journal.currency.id)
if amount_to_pay < abs(line.amount):
for code in [Transaction().language, 'en_US']:
lang_ids = lang_obj.search([
@@ -414,8 +457,10 @@ class Line(ModelSQL, ModelView):
self.raise_user_error('amount_greater_invoice_amount_to_pay',
error_args=(amount,))
- amount = currency_obj.compute(line.statement.journal.currency,
- line.amount, line.statement.journal.company.currency)
+ with Transaction().set_context(date=line.invoice.currency_date):
+ amount = currency_obj.compute(
+ line.statement.journal.currency.id, line.amount,
+ line.statement.company.currency.id)
reconcile_lines = invoice_obj.get_reconcile_lines_for_amount(
line.invoice, abs(amount))
@@ -453,9 +498,9 @@ class Line(ModelSQL, ModelView):
zero = Decimal("0.0")
amount = currency_obj.compute(
statement_line.statement.journal.currency, statement_line.amount,
- statement_line.statement.journal.company.currency)
+ statement_line.statement.company.currency)
if statement_line.statement.journal.currency.id != \
- statement_line.statement.journal.company.currency.id:
+ statement_line.statement.company.currency.id:
second_currency = statement_line.statement.journal.currency.id
amount_second_currency = abs(statement_line.amount)
else:
diff --git a/statement.xml b/statement.xml
index 1c1914c..6585100 100644
--- a/statement.xml
+++ b/statement.xml
@@ -50,8 +50,10 @@ this repository contains the full copyright notices and license terms. -->
states="{'invisible': Not(Equal(Eval('state'), 'cancel'))}"/>
</group>
</page>
- <page string="Move Lines" col="1" id="move_lines">
- <field name="move_lines"/>
+ <page string="Other Info" id="info">
+ <label name="company"/>
+ <field name="company"/>
+ <field name="move_lines" colspan="4"/>
</page>
</notebook>
<field name="currency_digits" colspan="4" invisible="1"/>
@@ -78,7 +80,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_new_statement_form">
<field name="name">New Statement</field>
<field name="res_model">account.statement</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_new_statement_form_view1">
<field name="sequence" eval="20"/>
@@ -96,7 +97,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_draft_statement_form">
<field name="name">Draft Statements</field>
<field name="res_model">account.statement</field>
- <field name="view_type">form</field>
<field name="domain">[('state', '=', 'draft')]</field>
</record>
<record model="ir.action.act_window.view" id="act_draft_statement_form_view1">
@@ -115,7 +115,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_validated_statement_form">
<field name="name">Validated Statement</field>
<field name="res_model">account.statement</field>
- <field name="view_type">form</field>
<field name="domain">[('state', '=', 'validated')]</field>
</record>
<record model="ir.action.act_window.view" id="act_validated_statement_form_view1">
@@ -134,7 +133,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_posted_statement_form">
<field name="name">Posted Statements</field>
<field name="res_model">account.statement</field>
- <field name="view_type">form</field>
<field name="domain">[('state', '=', 'posted')]</field>
</record>
<record model="ir.action.act_window.view" id="act_posted_statement_form_view1">
@@ -153,7 +151,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_statement_form">
<field name="name">All Statement</field>
<field name="res_model">account.statement</field>
- <field name="view_type">form</field>
</record>
<record model="ir.action.act_window.view" id="act_statement_form_view1">
<field name="sequence" eval="10"/>
@@ -168,6 +165,17 @@ this repository contains the full copyright notices and license terms. -->
<menuitem parent="menu_statements" sequence="5"
action="act_statement_form" id="menu_statement_form"/>
+ <record model="ir.rule.group" id="rule_group_statement">
+ <field name="model" search="[('model', '=', 'account.statement')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_statement1">
+ <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'account.statement')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Current Company</field>
+ <field name="rule_group" ref="rule_group_statement"/>
+ </record>
+
<record model="ir.ui.view" id="statement_line_view_form">
<field name="model">account.statement.line</field>
<field name="type">form</field>
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index 1bcec2a..989dfad 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -9,8 +9,10 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view
+from trytond.backend.sqlite.database import Database as SQLiteDatabase
class AccountStatementTestCase(unittest.TestCase):
@@ -27,10 +29,24 @@ class AccountStatementTestCase(unittest.TestCase):
'''
test_view('account_statement')
+def doctest_dropdb(test):
+ '''
+ Remove sqlite memory database
+ '''
+ database = SQLiteDatabase().connect()
+ cursor = database.cursor(autocommit=True)
+ try:
+ database.drop(cursor, ':memory:')
+ cursor.commit()
+ finally:
+ cursor.close()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountStatementTestCase))
+ suite.addTests(doctest.DocFileSuite('scenario_account_statement.rst',
+ setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8'))
return suite
if __name__ == '__main__':
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 9af5639..d94910f 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.8.0
+Version: 2.0.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -18,11 +18,15 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 3fa4570..3242434 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -4,12 +4,14 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
fr_FR.csv
invoice.xml
journal.xml
+nl_NL.csv
setup.py
statement.xml
./__init__.py
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 9ff2b17..675ddc5 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 1.8, < 1.9
-trytond_company >= 1.8, < 1.9
-trytond_currency >= 1.8, < 1.9
-trytond_party >= 1.8, < 1.9
-trytond_account_invoice >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_account >= 2.0, < 2.1
+trytond_company >= 2.0, < 2.1
+trytond_currency >= 2.0, < 2.1
+trytond_party >= 2.0, < 2.1
+trytond_account_invoice >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit f2b29c3d4211e64e12236eb804120464f2c2a9d5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:52 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index 66d973f..24ec6b9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit 9e3df1b1583af000e95aa006813ed59ed8cf517d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:06:09 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index c788e22..cbcd7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:05:54 +0100
+
tryton-modules-account-statement (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit fc82f80cf9d011e3476c5f6f0a01aaedf3945b24
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:40 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 6146982..bf68e1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 586277b9c256f08e414c38e7b87750005438fe96
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:16 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit 401b47d1a9503358ba99cfeacb4dea91acb0154f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:52 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index 1049410..66d973f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit baf3238036ebe7cfb936be5655a53deab8ea01f5
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 12:54:08 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 281482b..c788e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-account-statement (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 12:54:00 +0100
+
tryton-modules-account-statement (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit 181d3a8d4ec998c9d8b1c1ccf1be723d5d8bef67
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index a7a7d0a..1049410 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-stat
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-account (>= 1.6), tryton-modules-account-invoice (>= 1.6),
- tryton-modules-company (>= 1.6), tryton-modules-currency (>= 1.6),
- tryton-modules-party (>= 1.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-account (>= 1.8), tryton-modules-account-invoice (>= 1.8),
+ tryton-modules-company (>= 1.8), tryton-modules-currency (>= 1.8),
+ tryton-modules-party (>= 1.8), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
commit 186681f038722ebe68e61e204c06db83d0d23c03
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:23 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5b2be5f..0d47c34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 8f3a35b..00735f3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_statement
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 0c16eaa..339e840 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.6.0
+Version: 1.8.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index aa71f2e..c95a55f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Estado de Cuentas',
'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index 9b859fb..03f81a7 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -7,6 +7,11 @@ field,"account.statement,currency_digits",0,Currency Digits,Stellen Währung,0
field,"account.statement,date",0,Date,Datum,0
field,"account.statement,end_balance",0,End Balance,Endsaldo,0
field,"account.statement,journal",0,Journal,Journal,0
+field,"account.statement,lines",0,Transactions,Transaktionen,0
+field,"account.statement,move_lines",0,Move Lines,Buchungsposten,0
+field,"account.statement,rec_name",0,Name,Name,0
+field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
+field,"account.statement,state",0,State,Status,0
field,"account.statement.journal,company",0,Company,Unternehmen,0
field,"account.statement.journal,currency",0,Currency,Währung,0
field,"account.statement.journal,journal",0,Journal,Journal,0
@@ -20,36 +25,31 @@ field,"account.statement.line,invoice",0,Invoice,Rechnung,0
field,"account.statement.line,move",0,Account Move,Buchungssatz,0
field,"account.statement.line,party",0,Party,Partei,0
field,"account.statement.line,rec_name",0,Name,Name,0
-field,"account.statement,lines",0,Transactions,Transaktionen,0
field,"account.statement.line,statement",0,Statement,Zahlung,0
-field,"account.statement,move_lines",0,Move Lines,Buchungsposten,0
-field,"account.statement,rec_name",0,Name,Name,0
-field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
-field,"account.statement,state",0,State,Status,0
model,"account.journal.type,name",journal_type_statement,Statement,Zahlung,0
+model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
model,"account.statement.journal,name",0,Statement Journal,Journal Zahlungsverkehr,0
model,"account.statement.line,name",0,Account Statement Line,Zahlungsverkehr Position,0
-model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
-model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
model,"ir.action,name",act_new_statement_form,New Statement,Neue Zahlung,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
+model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
-model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Neue Zahlung,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungsverkehr,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
model,"ir.ui.menu,name",menu_statements,Statements,Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungsverkehr,0
model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
model,"res.group,name",group_statement,Statement,Zahlung,0
+model,"workflow,name",wkf_statement,Statement,Zahlung,0
model,"workflow.activity,name",statement_act_cancel,Canceled,Annulliert,0
model,"workflow.activity,name",statement_act_draft,Draft,Entwurf,0
model,"workflow.activity,name",statement_act_posted,Posted,Festgeschrieben,0
model,"workflow.activity,name",statement_act_validated,Validated,Geprüft,0
-model,"workflow,name",wkf_statement,Statement,Zahlung,0
selection,"account.statement,state",0,Canceled,Annulliert,0
selection,"account.statement,state",0,Draft,Entwurf,0
selection,"account.statement,state",0,Posted,Festgeschrieben,0
diff --git a/journal.py b/journal.py
index 15da197..318f3ea 100644
--- a/journal.py
+++ b/journal.py
@@ -1,7 +1,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.
-"Statement Journal"
from trytond.model import ModelView, ModelSQL, fields
+from trytond.transaction import Transaction
class Journal(ModelSQL, ModelView):
@@ -15,18 +15,14 @@ class Journal(ModelSQL, ModelView):
currency = fields.Many2One('currency.currency', 'Currency', required=True)
company = fields.Many2One('company.company', 'Company', required=True)
- def default_currency(self, cursor, user, context=None):
- if context and context.get('company'):
+ def default_currency(self):
+ if Transaction().context.get('company'):
company_obj = self.pool.get('company.company')
- currency_obj = self.pool.get('currency.currency')
- company = company_obj.browse(cursor, user, context['company'],
- context=context)
+ company = company_obj.browse(Transaction().context['company'])
return company.currency.id
return False
- def default_company(self, cursor, user, context=None):
- if context and context.get('company'):
- return context['company']
- return False
+ def default_company(self):
+ return Transaction().context.get('company') or False
Journal()
diff --git a/statement.py b/statement.py
index 16c6c94..668c678 100644
--- a/statement.py
+++ b/statement.py
@@ -1,9 +1,9 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Statement"
+from decimal import Decimal
from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
from trytond.pyson import Not, Equal, Eval, Or, Bool, Get, If
-from decimal import Decimal
+from trytond.transaction import Transaction
_STATES = {'readonly': Not(Equal(Eval('state'), 'draft'))}
@@ -51,73 +51,66 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
'wrong_end_balance': 'End Balance must be %s!',
})
- def default_state(self, cursor, user, context=None):
+ def default_state(self):
return 'draft'
- def default_date(self, cursor, user, context=None):
+ def default_date(self):
date_obj = self.pool.get('ir.date')
- return date_obj.today(cursor, user, context=context)
+ return date_obj.today()
- def default_currency_digits(self, cursor, user, context=None):
+ def default_currency_digits(self):
company_obj = self.pool.get('company.company')
- if context is None:
- context = {}
- if context.get('company'):
- company = company_obj.browse(cursor, user, context['company'],
- context=context)
+ if Transaction().context.get('company'):
+ company = company_obj.browse(Transaction().context['company'])
return company.currency.digits
return 2
- def on_change_journal(self, cursor, user, value, context=None):
+ def on_change_journal(self, value):
res = {}
if not value.get('journal'):
return res
- statement_ids = self.search(cursor, user, [
+ statement_ids = self.search([
('journal', '=', value['journal']),
], order=[
('date', 'DESC'),
- ], limit=1, context=context)
+ ], limit=1)
if not statement_ids:
return res
- statement = self.browse(cursor, user, statement_ids[0], context=context)
+ statement = self.browse(statement_ids[0])
res['start_balance'] = statement.end_balance
return res
- def on_change_with_currency_digits(self, cursor, user, vals, context=None):
+ def on_change_with_currency_digits(self, vals):
journal_obj = self.pool.get('account.statement.journal')
if vals.get('journal'):
- journal = journal_obj.browse(cursor, user, vals['journal'],
- context=context)
+ journal = journal_obj.browse(vals['journal'])
return journal.currency.digits
return 2
- def get_currency_digits(self, cursor, user, ids, name, context=None):
+ def get_currency_digits(self, ids, name):
res = {}
- for statement in self.browse(cursor, user, ids, context=context):
+ for statement in self.browse(ids):
res[statement.id] = statement.journal.currency.digits
return res
- def get_rec_name(self, cursor, user, ids, name, context=None):
+ def get_rec_name(self, ids, name):
lang_obj = self.pool.get('ir.lang')
- if context is None:
- context = {}
-
if not ids:
return {}
- for code in [context.get('language', False) or 'en_US', 'en_US']:
- lang_ids = lang_obj.search(cursor, user, [
+ for code in [Transaction().language, 'en_US']:
+ lang_ids = lang_obj.search([
('code', '=', code),
- ], context=context)
+ ])
if lang_ids:
break
- lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+ lang = lang_obj.browse(lang_ids[0])
res = {}
- for statement in self.browse(cursor, user, ids, context=context):
+ for statement in self.browse(ids):
res[statement.id] = statement.journal.name + ' ' + \
lang.currency(lang, statement.start_balance,
statement.journal.currency, symbol=False,
@@ -127,21 +120,21 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
grouping=True)
return res
- def search_rec_name(self, cursor, user, name, clause, context=None):
- ids = self.search(cursor, user, ['OR',
+ def search_rec_name(self, name, clause):
+ ids = self.search(['OR',
('start_balance',) + clause[1:],
('end_balance',) + clause[1:],
- ], context=context)
+ ])
if ids:
return [('id', 'in', ids)]
return [('journal',) + clause[1:]]
- def get_move_lines(self, cursor, user, ids, name, context=None):
+ def get_move_lines(self, ids, name):
'''
Return the move lines that have been generated by the statements.
'''
res = {}
- for statement in self.browse(cursor, user, ids, context=context):
+ for statement in self.browse(ids):
res[statement.id] = []
for line in statement.lines:
if not line.move:
@@ -150,8 +143,8 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res[statement.id].append(move_line.id)
return res
- def get_end_balance(self, cursor, user, ids, name, context=None):
- statements = self.browse(cursor, user, ids, context=context)
+ def get_end_balance(self, ids, name):
+ statements = self.browse(ids)
res = {}
for statement in statements:
res[statement.id] = statement.start_balance
@@ -159,7 +152,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res[statement.id] += line.amount
return res
- def on_change_lines(self, cursor, user, values, context=None):
+ def on_change_lines(self, values):
invoice_obj = self.pool.get('account.invoice')
journal_obj = self.pool.get('account.statement.journal')
currency_obj = self.pool.get('currency.currency')
@@ -167,25 +160,23 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
'lines': {},
}
if values.get('journal') and values.get('lines'):
- journal = journal_obj.browse(cursor, user, values['journal'],
- context=context)
+ journal = journal_obj.browse(values['journal'])
invoice_ids = set()
for line in values['lines']:
if line['invoice']:
invoice_ids.add(line['invoice'])
invoice_id2amount_to_pay = {}
- for invoice in invoice_obj.browse(cursor, user, invoice_ids,
- context=context):
+ for invoice in invoice_obj.browse(invoice_ids):
invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
- cursor, user, invoice.currency, invoice.amount_to_pay,
- journal.currency, context=context)
+ invoice.currency, invoice.amount_to_pay,
+ journal.currency)
for line in values['lines']:
if line['invoice'] and line['id']:
amount_to_pay = invoice_id2amount_to_pay[line['invoice']]
if abs(line['amount']) > amount_to_pay:
res['lines'].setdefault('update', [])
- if currency_obj.is_zero(cursor, user, journal.currency,
+ if currency_obj.is_zero(journal.currency,
amount_to_pay):
res['lines']['update'].append({
'id': line['id'],
@@ -208,63 +199,57 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
amount_to_pay - abs(line['amount'])
return res
- def set_state_validated(self, cursor, user, statement_id, context=None):
+ def set_state_validated(self, statement_id):
statement_line_obj = self.pool.get('account.statement.line')
lang_obj = self.pool.get('ir.lang')
- if context is None:
- context = {}
-
- statement = self.browse(cursor, user, statement_id, context=context)
+ statement = self.browse(statement_id)
computed_end_balance = statement.start_balance
for line in statement.lines:
computed_end_balance += line.amount
if computed_end_balance != statement.end_balance:
- for code in [context.get('language', False) or 'en_US', 'en_US']:
- lang_ids = lang_obj.search(cursor, user, [
+ for code in [Transaction().language, 'en_US']:
+ lang_ids = lang_obj.search([
('code', '=', code),
- ], context=context)
+ ])
if lang_ids:
break
- lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+ lang = lang_obj.browse(lang_ids[0])
amount = lang_obj.format(lang,
'%.' + str(statement.journal.currency.digits) + 'f',
computed_end_balance, True)
- self.raise_user_error(cursor, 'wrong_end_balance',
- error_args=(amount,), context=context)
+ self.raise_user_error('wrong_end_balance', error_args=(amount,))
for line in statement.lines:
- statement_line_obj.create_move(cursor, user, line, context=context)
- self.write(cursor, user, statement_id, {
+ statement_line_obj.create_move(line)
+ self.write(statement_id, {
'state':'validated',
- }, context=context)
+ })
- def set_state_posted(self, cursor, user, statement_id, context=None):
+ def set_state_posted(self, statement_id):
statement_line_obj = self.pool.get('account.statement.line')
- statement = self.browse(cursor, user, statement_id, context=context)
- statement_line_obj.post_move(cursor, user, statement.lines,
- context=context)
- self.write(cursor, user, statement_id, {
+ statement = self.browse(statement_id)
+ statement_line_obj.post_move(statement.lines)
+ self.write(statement_id, {
'state':'posted',
- }, context=context)
+ })
- def set_state_cancel(self, cursor, user, statement_id, context=None):
+ def set_state_cancel(self, statement_id):
statement_line_obj = self.pool.get('account.statement.line')
- statement = self.browse(cursor, user, statement_id, context=context)
- statement_line_obj.delete_move(cursor, user, statement.lines,
- context=context)
- self.write(cursor, user, statement_id, {
+ statement = self.browse(statement_id)
+ statement_line_obj.delete_move(statement.lines)
+ self.write(statement_id, {
'state':'cancel',
- }, context=context)
+ })
- def draft_workflow(self, cursor, user, ids, context=None):
- self.workflow_trigger_create(cursor, user, ids, context=context)
- self.write(cursor, user, ids, {
+ def draft_workflow(self, ids):
+ self.workflow_trigger_create(ids)
+ self.write(ids, {
'state': 'draft',
- }, context=context)
+ })
return True
Statement()
@@ -311,15 +296,13 @@ class Line(ModelSQL, ModelView):
'the amount to pay of invoice!',
})
- def on_change_party(self, cursor, user, value, context=None):
+ def on_change_party(self, value):
party_obj = self.pool.get('party.party')
- account_obj = self.pool.get('account.account')
invoice_obj = self.pool.get('account.invoice')
res = {}
if value.get('party'):
- party = party_obj.browse(cursor, user, value['party'],
- context=context)
+ party = party_obj.browse(value['party'])
if value.get('amount'):
if value['amount'] > Decimal("0.0"):
account = party.account_receivable
@@ -330,24 +313,22 @@ class Line(ModelSQL, ModelView):
if value.get('invoice'):
if value.get('party'):
- invoice = invoice_obj.browse(cursor, user, value['invoice'],
- context=context)
+ invoice = invoice_obj.browse(value['invoice'])
if invoice.party != value['party']:
res['invoice'] = False
else:
res['invoice'] = False
return res
- def on_change_amount(self, cursor, user, value, context=None):
+ def on_change_amount(self, value):
party_obj = self.pool.get('party.party')
- account_obj = self.pool.get('account.account')
invoice_obj = self.pool.get('account.invoice')
journal_obj = self.pool.get('account.statement.journal')
currency_obj = self.pool.get('currency.currency')
res = {}
if value.get('party'):
- party = party_obj.browse(cursor, user, value['party'], context=context)
+ party = party_obj.browse(value['party'])
if value.get('account') and value['account'] not in (
party.account_receivable.id, party.account_payable.id):
# The user has entered a non-default value, we keep it.
@@ -361,41 +342,34 @@ class Line(ModelSQL, ModelView):
res['account.rec_name'] = account.rec_name
if value.get('invoice'):
if value.get('amount') and value.get('_parent_statement.journal'):
- invoice = invoice_obj.browse(cursor, user, value['invoice'],
- context=context)
- journal = journal_obj.browse(cursor, user,
- value['_parent_statement.journal'], context=context)
- amount_to_pay = currency_obj.compute(cursor, user,
- invoice.currency, invoice.amount_to_pay,
- journal.currency, context=context)
+ invoice = invoice_obj.browse(value['invoice'])
+ journal = journal_obj.browse(value['_parent_statement.journal'])
+ amount_to_pay = currency_obj.compute(invoice.currency,
+ invoice.amount_to_pay, journal.currency)
if abs(value['amount']) > amount_to_pay:
res['invoice'] = False
else:
res['invoice'] = False
return res
- def on_change_account(self, cursor, user, value, context=None):
+ def on_change_account(self, value):
invoice_obj = self.pool.get('account.invoice')
res = {}
if value.get('invoice'):
if value.get('account'):
- invoice = invoice_obj.browse(cursor, user, value['invoice'],
- context=context)
+ invoice = invoice_obj.browse(value['invoice'])
if invoice.account.id != value['account']:
res['invoice'] = False
else:
res['invoice'] = False
return res
- def create_move(self, cursor, user, line, context=None):
+ def create_move(self, line):
'''
Create move for the statement line
- :param cursor: the database cursor
- :param user: the user id
:param line: a BrowseRecord of the line
- :param context: the contest
:return: the move id
'''
move_obj = self.pool.get('account.move')
@@ -405,95 +379,81 @@ class Line(ModelSQL, ModelView):
move_line_obj = self.pool.get('account.move.line')
lang_obj = self.pool.get('ir.lang')
- if context is None:
- context = {}
-
- period_id = period_obj.find(cursor, user,
- line.statement.journal.company.id, date=line.date,
- context=context)
+ period_id = period_obj.find(line.statement.journal.company.id,
+ date=line.date)
- move_lines = self._get_move_lines(cursor, user, line, context=context)
- move_id = move_obj.create(cursor, user, {
+ move_lines = self._get_move_lines(line)
+ move_id = move_obj.create({
'name': line.date,
'period': period_id,
'journal': line.statement.journal.journal.id,
'date': line.date,
'lines': [('create', x) for x in move_lines],
- }, context=context)
+ })
- self.write(cursor, user, line.id, {
+ self.write(line.id, {
'move': move_id,
- }, context=context)
+ })
if line.invoice:
- amount_to_pay = currency_obj.compute(cursor, user,
- line.invoice.currency, line.invoice.amount_to_pay,
- line.statement.journal.currency, context=context)
+ amount_to_pay = currency_obj.compute(line.invoice.currency,
+ line.invoice.amount_to_pay, line.statement.journal.currency)
if amount_to_pay < abs(line.amount):
- for code in [context.get('language', False) or 'en_US', 'en_US']:
- lang_ids = lang_obj.search(cursor, user, [
+ for code in [Transaction().language, 'en_US']:
+ lang_ids = lang_obj.search([
('code', '=', code),
- ], context=context)
+ ])
if lang_ids:
break
- lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+ lang = lang_obj.browse(lang_ids[0])
amount = lang_obj.format(lang,
'%.' + str(line.statement.journal.currency.digits) + 'f',
line.amount, True)
- self.raise_user_error(cursor,
- 'amount_greater_invoice_amount_to_pay',
- error_args=(amount,), context=context)
+ self.raise_user_error('amount_greater_invoice_amount_to_pay',
+ error_args=(amount,))
- amount = currency_obj.compute(cursor, user,
- line.statement.journal.currency, line.amount,
- line.statement.journal.company.currency,
- context=context)
+ amount = currency_obj.compute(line.statement.journal.currency,
+ line.amount, line.statement.journal.company.currency)
- reconcile_lines = invoice_obj.get_reconcile_lines_for_amount(cursor,
- user, line.invoice, abs(amount))
+ reconcile_lines = invoice_obj.get_reconcile_lines_for_amount(
+ line.invoice, abs(amount))
- move = move_obj.browse(cursor, user, move_id, context=context)
+ move = move_obj.browse(move_id)
line_id = None
for move_line in move.lines:
if move_line.account.id == line.invoice.account.id:
line_id = move_line.id
- invoice_obj.write(cursor, user, line.invoice.id, {
+ invoice_obj.write(line.invoice.id, {
'payment_lines': [('add', line_id)],
- }, context=context)
+ })
break
if reconcile_lines[1] == Decimal('0.0'):
line_ids = reconcile_lines[0] + [line_id]
- move_line_obj.reconcile(cursor, user, line_ids, context=context)
+ move_line_obj.reconcile(line_ids)
return move_id
- def post_move(self, cursor, user, lines, context=None):
+ def post_move(self, lines):
move_obj = self.pool.get('account.move')
- move_obj.post(cursor, user, [l.move.id for l in lines if l.move],
- context=context)
+ move_obj.post([l.move.id for l in lines if l.move])
- def delete_move(self, cursor, user, lines, context=None):
+ def delete_move(self, lines):
move_obj = self.pool.get('account.move')
- move_obj.delete(cursor, user, [l.move.id for l in lines if l.move],
- context=context)
+ move_obj.delete([l.move.id for l in lines if l.move])
- def _get_move_lines(self, cursor, user, statement_line, context=None):
+ def _get_move_lines(self, statement_line):
'''
Return the values of the move lines for the statement line
- :param cursor: the database cursor
- :param user: the user id
:param statement_line: a BrowseRecord of the statement line
- :param context: the context
:return: a list of dictionary of move line values
'''
currency_obj = self.pool.get('currency.currency')
zero = Decimal("0.0")
amount = currency_obj.compute(
- cursor, user, statement_line.statement.journal.currency,
- statement_line.amount,
- statement_line.statement.journal.company.currency, context=context)
+ statement_line.statement.journal.currency, statement_line.amount,
+ statement_line.statement.journal.company.currency)
if statement_line.statement.journal.currency.id != \
statement_line.statement.journal.company.currency.id:
second_currency = statement_line.statement.journal.currency.id
@@ -519,12 +479,9 @@ class Line(ModelSQL, ModelView):
else:
account = journal.debit_account
if not account:
- self.raise_user_error(cursor,
- 'debit_credit_account_statement_journal',
- context=context)
+ self.raise_user_error('debit_credit_account_statement_journal')
if statement_line.account.id == account.id:
- self.raise_user_error(cursor, 'same_debit_credit_account',
- context=context)
+ self.raise_user_error('same_debit_credit_account')
vals.append({
'name': statement_line.date,
'debit': amount >= zero and amount or zero,
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index f3ea934..1bcec2a 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -25,7 +25,7 @@ class AccountStatementTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('account_statement'))
+ test_view('account_statement')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index bb1cac6..9af5639 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.6.0
+Version: 1.8.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 68e6fb7..9ff2b17 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account >= 1.6, < 1.7
-trytond_company >= 1.6, < 1.7
-trytond_currency >= 1.6, < 1.7
-trytond_party >= 1.6, < 1.7
-trytond_account_invoice >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_account >= 1.8, < 1.9
+trytond_company >= 1.8, < 1.9
+trytond_currency >= 1.8, < 1.9
+trytond_party >= 1.8, < 1.9
+trytond_account_invoice >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 6b7052b9ba917681f0ce06f04776d523289f2015
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:26:18 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit 09789d5d44de7e63319e2c8c0dedff5cb82c3b0d
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 59a90f8..a7a7d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit ea284587e9119832dcee7571c41e1c94eb7ffa6b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:04 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 2f0f17c..59a90f8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
commit d734394e1ac8ea7e03112254c58142de83e4a968
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:29 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index d7ffe13..2f0f17c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit 047bfe453dff7940f878f3f3bad9e3f0b19cd607
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:50:42 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 3614fcd..281482b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-account-statement (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Thu, 13 May 2010 11:50:21 +0200
+
tryton-modules-account-statement (1.4.1-2) unstable; urgency=low
* Updating year in copyright file.
commit 4d4918c5ef3d7570c263a26433abf344a4f2e67f
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:50:08 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index 498cd14..d7ffe13 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-stat
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-account (>= 1.4), tryton-modules-account-invoice (>= 1.4),
- tryton-modules-company (>= 1.4), tryton-modules-currency (>= 1.4),
- tryton-modules-party (>= 1.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-account (>= 1.6), tryton-modules-account-invoice (>= 1.6),
+ tryton-modules-company (>= 1.6), tryton-modules-currency (>= 1.6),
+ tryton-modules-party (>= 1.6), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
commit 852db5b8fedc1cae33f73da18ff2e5271c631556
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:50:03 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 9a3e6c5..6146982 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,9 +6,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2009 Cedric Krier
- (C) 2008-2009 Bertrand Chenal
- (C) 2008-2009 B2CK SPRL
+ (C) 2008-2010 Cedric Krier
+ (C) 2008-2010 Bertrand Chenal
+ (C) 2008-2010 B2CK SPRL
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit c693da05a7a1d493e1159b8a56cbc89c1ad456f5
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:28:47 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index c25842e..5b2be5f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.4.1 - 2009-11-23
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index da277a9..94a43fb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 Bertrand Chenal.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index d68db89..0c16eaa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.4.1
+Version: 1.6.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 8300848..aa71f2e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Estado de Cuentas',
'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.4.1',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index 8c743c6..9b859fb 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -17,7 +17,7 @@ field,"account.statement.line,amount",0,Amount,Betrag,0
field,"account.statement.line,date",0,Date,Datum,0
field,"account.statement.line,description",0,Description,Beschreibung,0
field,"account.statement.line,invoice",0,Invoice,Rechnung,0
-field,"account.statement.line,move",0,Account Move,Buchung,0
+field,"account.statement.line,move",0,Account Move,Buchungssatz,0
field,"account.statement.line,party",0,Party,Partei,0
field,"account.statement.line,rec_name",0,Name,Name,0
field,"account.statement,lines",0,Transactions,Transaktionen,0
diff --git a/journal.py b/journal.py
index a3c16d6..15da197 100644
--- a/journal.py
+++ b/journal.py
@@ -25,7 +25,6 @@ class Journal(ModelSQL, ModelView):
return False
def default_company(self, cursor, user, context=None):
- company_obj = self.pool.get('company.company')
if context and context.get('company'):
return context['company']
return False
diff --git a/setup.py b/setup.py
index c88c645..725e799 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_account_statement',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_account_statement',
package_dir={'trytond.modules.account_statement': '.'},
packages=[
'trytond.modules.account_statement',
+ 'trytond.modules.account_statement.tests',
],
package_data={
'trytond.modules.account_statement': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_account_statement',
[trytond.modules]
account_statement = trytond.modules.account_statement
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/statement.py b/statement.py
index 5ae70ca..16c6c94 100644
--- a/statement.py
+++ b/statement.py
@@ -2,9 +2,10 @@
#this repository contains the full copyright notices and license terms.
"Statement"
from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
+from trytond.pyson import Not, Equal, Eval, Or, Bool, Get, If
from decimal import Decimal
-_STATES = {'readonly': 'state != "draft"'}
+_STATES = {'readonly': Not(Equal(Eval('state'), 'draft'))}
class Statement(ModelWorkflow, ModelSQL, ModelView):
@@ -14,18 +15,22 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
journal = fields.Many2One('account.statement.journal', 'Journal', required=True,
states={
- 'readonly': "(state != 'draft') or (bool(lines))",
+ 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
+ Bool(Eval('lines'))),
}, on_change=['journal'], select=1)
- currency_digits = fields.Function('get_currency_digits', type='integer',
- string='Currency Digits', on_change_with=['journal'])
+ currency_digits = fields.Function(fields.Integer('Currency Digits',
+ on_change_with=['journal']), 'get_currency_digits')
date = fields.Date('Date', required=True, states=_STATES, select=1)
- start_balance = fields.Numeric('Start Balance', digits="(16, currency_digits)",
+ start_balance = fields.Numeric('Start Balance',
+ digits=(16, Eval('currency_digits', 2)),
states=_STATES, depends=['currency_digits'])
- end_balance = fields.Numeric('End Balance', digits="(16, currency_digits)",
+ end_balance = fields.Numeric('End Balance',
+ digits=(16, Eval('currency_digits', 2)),
states=_STATES, depends=['currency_digits'])
lines = fields.One2Many('account.statement.line', 'statement',
'Transactions', states={
- 'readonly': "(state != 'draft') or (not bool(journal))",
+ 'readonly': Or(Not(Equal(Eval('state'), 'draft')),
+ Not(Bool(Eval('journal')))),
}, on_change=['lines', 'journal'])
state = fields.Selection([
('draft', 'Draft'),
@@ -33,8 +38,8 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
('cancel', 'Canceled'),
('posted', 'Posted'),
], 'State', readonly=True, select=1)
- move_lines = fields.Function('get_move_lines', type='one2many',
- relation='account.move.line', string='Move Lines')
+ move_lines = fields.Function(fields.One2Many('account.move.line',
+ None, 'Move Lines'), 'get_move_lines')
def __init__(self):
super(Statement, self).__init__()
@@ -63,7 +68,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
return company.currency.digits
return 2
- def on_change_journal(self, cursor, user, ids, value, context=None):
+ def on_change_journal(self, cursor, user, value, context=None):
res = {}
if not value.get('journal'):
return res
@@ -80,8 +85,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res['start_balance'] = statement.end_balance
return res
- def on_change_with_currency_digits(self, cursor, user, ids, vals,
- context=None):
+ def on_change_with_currency_digits(self, cursor, user, vals, context=None):
journal_obj = self.pool.get('account.statement.journal')
if vals.get('journal'):
journal = journal_obj.browse(cursor, user, vals['journal'],
@@ -89,13 +93,13 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
return journal.currency.digits
return 2
- def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ def get_currency_digits(self, cursor, user, ids, name, context=None):
res = {}
for statement in self.browse(cursor, user, ids, context=context):
res[statement.id] = statement.journal.currency.digits
return res
- def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+ def get_rec_name(self, cursor, user, ids, name, context=None):
lang_obj = self.pool.get('ir.lang')
if context is None:
@@ -123,22 +127,16 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
grouping=True)
return res
- def search_rec_name(self, cursor, user, name, args, context=None):
- args2 = []
- i = 0
- while i < len(args):
- ids = self.search(cursor, user, ['OR',
- ('start_balance', args[i][1], args[i][2]),
- ('end_balance', args[i][1], args[i][2]),
- ], context=context)
- if ids:
- args2.append(('id', 'in', ids))
- else:
- args2.append(('journal', args[i][1], args[i][2]))
- i += 1
- return args2
+ def search_rec_name(self, cursor, user, name, clause, context=None):
+ ids = self.search(cursor, user, ['OR',
+ ('start_balance',) + clause[1:],
+ ('end_balance',) + clause[1:],
+ ], context=context)
+ if ids:
+ return [('id', 'in', ids)]
+ return [('journal',) + clause[1:]]
- def get_move_lines(self, cursor, user, ids, name, args, context=None):
+ def get_move_lines(self, cursor, user, ids, name, context=None):
'''
Return the move lines that have been generated by the statements.
'''
@@ -152,7 +150,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res[statement.id].append(move_line.id)
return res
- def get_end_balance(self, cursor, user, ids, name, arg, context=None):
+ def get_end_balance(self, cursor, user, ids, name, context=None):
statements = self.browse(cursor, user, ids, context=context)
res = {}
for statement in statements:
@@ -161,7 +159,7 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
res[statement.id] += line.amount
return res
- def on_change_lines(self, cursor, user, ids, values, context=None):
+ def on_change_lines(self, cursor, user, values, context=None):
invoice_obj = self.pool.get('account.invoice')
journal_obj = self.pool.get('account.statement.journal')
currency_obj = self.pool.get('currency.currency')
@@ -281,7 +279,8 @@ class Line(ModelSQL, ModelView):
required=True, ondelete='CASCADE')
date = fields.Date('Date', required=True)
amount = fields.Numeric('Amount', required=True,
- digits="(16, _parent_statement.currency_digits)",
+ digits=(16, Get(Eval('_parent_statement', {}),
+ 'currency_digits', 2)),
on_change=['amount', 'party', 'account', 'invoice',
'_parent_statement.journal'])
party = fields.Many2One('party.party', 'Party',
@@ -291,11 +290,14 @@ class Line(ModelSQL, ModelView):
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
- domain=["('party', '=', party)", "('account', '=', account)",
- "('state', '=', _parent_statement.state == 'draft' and " \
- "'open' or False)"],
+ domain=[
+ ('party', '=', Eval('party')),
+ ('account', '=', Eval('account')),
+ ('state', '=', If(Equal(Get(Eval('_parent_statement', {}),
+ 'state'), 'draft'), 'open', '')),
+ ],
states={
- 'readonly': "not bool(amount)",
+ 'readonly': Not(Bool(Eval('amount'))),
})
def __init__(self):
@@ -309,7 +311,7 @@ class Line(ModelSQL, ModelView):
'the amount to pay of invoice!',
})
- def on_change_party(self, cursor, user, ids, value, context=None):
+ def on_change_party(self, cursor, user, value, context=None):
party_obj = self.pool.get('party.party')
account_obj = self.pool.get('account.account')
invoice_obj = self.pool.get('account.invoice')
@@ -336,7 +338,7 @@ class Line(ModelSQL, ModelView):
res['invoice'] = False
return res
- def on_change_amount(self, cursor, user, ids, value, context=None):
+ def on_change_amount(self, cursor, user, value, context=None):
party_obj = self.pool.get('party.party')
account_obj = self.pool.get('account.account')
invoice_obj = self.pool.get('account.invoice')
@@ -372,7 +374,7 @@ class Line(ModelSQL, ModelView):
res['invoice'] = False
return res
- def on_change_account(self, cursor, user, ids, value, context=None):
+ def on_change_account(self, cursor, user, value, context=None):
invoice_obj = self.pool.get('account.invoice')
res = {}
diff --git a/statement.xml b/statement.xml
index 1f26691..1c1914c 100644
--- a/statement.xml
+++ b/statement.xml
@@ -40,14 +40,14 @@ this repository contains the full copyright notices and license terms. -->
<label name="state"/>
<field name="state"/>
<button string="Validate" name="validated"
- states="{'invisible': '''state != 'draft' '''}"/>
+ states="{'invisible': Not(Equal(Eval('state'), 'draft'))}"/>
<button string="Cancel" name="cancel"
- states="{'invisible': '''state != 'validated' '''}"/>
+ states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
<button string="Post" name="posted"
- states="{'invisible': '''state != 'validated' '''}"/>
+ states="{'invisible': Not(Equal(Eval('state'), 'validated'))}"/>
<button string="Reset to Draft" name="draft_workflow"
type="object"
- states="{'invisible': '''state != 'cancel' '''}"/>
+ states="{'invisible': Not(Equal(Eval('state'), 'cancel'))}"/>
</group>
</page>
<page string="Move Lines" col="1" id="move_lines">
diff --git a/tests/__init__.py b/tests/__init__.py
index bf3bc8c..db04664 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_account_statement import *
+from test_account_statement import suite
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
index 965e80a..f3ea934 100644
--- a/tests/test_account_statement.py
+++ b/tests/test_account_statement.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class AccountStatementTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class AccountStatementTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('account_statement'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(AccountStatementTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ AccountStatementTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteAccountStatement = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteAccountStatement])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 3adfbbf..bb1cac6 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.4.1
+Version: 1.6.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 9ef37d2..3fa4570 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -16,8 +16,8 @@ statement.xml
./__tryton__.py
./journal.py
./statement.py
-tests/__init__.py
-tests/test_account_statement.py
+./tests/__init__.py
+./tests/test_account_statement.py
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
trytond_account_statement.egg-info/dependency_links.txt
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 8c96867..68e6fb7 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -1,7 +1,6 @@
-trytond_account
-trytond_company
-trytond_currency
-trytond_party
-trytond_account_invoice
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_account >= 1.6, < 1.7
+trytond_company >= 1.6, < 1.7
+trytond_currency >= 1.6, < 1.7
+trytond_party >= 1.6, < 1.7
+trytond_account_invoice >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 1b1eedd95558f2ae2663f1cc57f87e87b51c9f76
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:32 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index a05abe6..498cd14 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit c5deeb6fc4ddaeaa673c072be0485bfb3f9af065
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:03:51 2010 +0100
Releasing debian version 1.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index c224b07..3614fcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (1.4.1-2) unstable; urgency=low
+
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:03:47 +0100
+
tryton-modules-account-statement (1.4.1-1) unstable; urgency=low
* Making depends versioned for tryton 1.4.
commit c22c98757a2f5ad5d2ee408362a0f8b3ca58b7c3
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:20 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index 484efdf..a05abe6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit ebd9fe43dd25e3d45c832305ee42ad1a72c4ed40
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:27 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index 7272994..484efdf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
commit f5eed4811e2d6ac4566f4ad386384578cca8584a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:02 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index b18de59..9a3e6c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,7 +27,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 44c51ebf1b4fc63b130b4d08cd2cfdfe716feb7f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 12:56:55 2009 +0100
Releasing debian version 1.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index c9d65f5..c224b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-statement (1.4.1-1) unstable; urgency=low
+
+ * Making depends versioned for tryton 1.4.
+ * Merging upstream version 1.4.1.
+ * Updating README.source.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 25 Nov 2009 12:56:46 +0100
+
tryton-modules-account-statement (1.4.0-1) unstable; urgency=low
* Merging upstream version 1.4.0.
commit 40f024232e2743743dc8ac70fe798e2857cef91c
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 12:56:38 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit 86cc49622d7eeda0a80134178c6a480412fe430f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 12:56:30 2009 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit ec5280d360337b079a5424e35567c37bbac86dcd
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 12:55:45 2009 +0100
Merging upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 38b87ed..c25842e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.1 - 2009-11-23
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
* Fix digits of start and end balance
diff --git a/PKG-INFO b/PKG-INFO
index 99a9419..d68db89 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.4.0
+Version: 1.4.1
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
diff --git a/__tryton__.py b/__tryton__.py
index 6247d34..8300848 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Estado de Cuentas',
'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.4.0',
+ 'version': '1.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/statement.py b/statement.py
index bc7f5a3..5ae70ca 100644
--- a/statement.py
+++ b/statement.py
@@ -287,7 +287,7 @@ class Line(ModelSQL, ModelView):
party = fields.Many2One('party.party', 'Party',
on_change=['amount', 'party', 'invoice'])
account = fields.Many2One('account.account', 'Account', required=True,
- on_change=['account', 'invoice'])
+ on_change=['account', 'invoice'], domain=[('kind', '!=', 'view')])
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 5a94fdd..3adfbbf 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.4.0
+Version: 1.4.1
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
commit 9319ab5ce5711c74ebdb6d9032919824b01060e4
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:19 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index afefcb4..7272994 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,10 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-stat
Package: tryton-modules-account-statement
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account,
- tryton-modules-account-invoice, tryton-modules-company,
- tryton-modules-currency, tryton-modules-party, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-account (>= 1.4), tryton-modules-account-invoice (>= 1.4),
+ tryton-modules-company (>= 1.4), tryton-modules-currency (>= 1.4),
+ tryton-modules-party (>= 1.4), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
commit 1f39c947447f6cf8fb463165c1a3c0bfe2f23d00
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 21:38:59 2009 +0200
Releasing debian version 1.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 9cb0d43..c9d65f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (1.4.0-1) unstable; urgency=low
+
+ * Merging upstream version 1.4.0.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 19 Oct 2009 21:38:50 +0200
+
tryton-modules-account-statement (1.2.0-4) unstable; urgency=low
* Updating to standards version 3.8.3.
commit 61e23b699b0eb65ef99c358d56cd7ad8e1e15cfa
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 21:38:18 2009 +0200
Merging upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6889003..38b87ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+* Fix digits of start and end balance
+
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 9fff72f..8f3a35b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..c61b52d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index bf04c99..99a9419 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.2.0
+Version: 1.4.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index b9e0b91..3809ed2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
from journal import *
from statement import *
diff --git a/__tryton__.py b/__tryton__.py
index 58a993e..6247d34 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,9 +4,9 @@
'name': 'Account Statement',
'name_de_DE': 'Buchhaltung Bankauszüge',
'name_es_CO': 'Estado de Cuentas',
- 'name_es_ES': 'Estado de Cuentas',
+ 'name_es_ES': 'Estado de cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.2.0',
+ 'version': '1.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -21,7 +21,7 @@
- Estado de cuentas
- Diario de estado de cuentas
''',
- 'description_es_ES': '''Módulo Financiero y Contable con:
+ 'description_es_ES': '''Módulo financiero y contable con:
- Estado de cuentas
- Diario de estado de cuentas
''',
diff --git a/de_DE.csv b/de_DE.csv
index 63babe4..8c743c6 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -32,11 +32,13 @@ model,"account.statement.line,name",0,Account Statement Line,Zahlungsverkehr Pos
model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
+model,"ir.action,name",act_new_statement_form,New Statement,Neue Zahlung,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Neue Zahlung,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
model,"ir.ui.menu,name",menu_statements,Statements,Zahlungsverkehr,0
@@ -67,4 +69,4 @@ view,account.statement.journal,0,Statement Journal,Journal Zahlungsverkehr,0
view,account.statement.journal,0,Statement Journals,Journale Zahlungsverkehr,0
view,account.statement.line,0,Bank Statement Line,Posten Bankauszüge,0
view,account.statement.line,0,Statement Line,Zahlungsposten,0
-view,statement.statement.line,0,Statement Lines,Zahlungsposten,0
+view,account.statement.line,0,Statement Lines,Zahlungsposten,0
diff --git a/es_CO.csv b/es_CO.csv
index 0c7e9b2..8d8ecfe 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -32,11 +32,13 @@ model,"account.statement.line,name",0,Account Statement Line,Línea de Estado de
model,"account.statement,name",0,Account Statement,Estado de Cuentas,0
model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de Estados de Cuenta,0
+model,"ir.action,name",act_new_statement_form,New Statement,Nuevo Extracto,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de Estados de Cuenta,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de Cuenta Validados,0
model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de Cuenta en Borrador,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nuevo Extracto,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de Estados de Cuenta,0
model,"ir.ui.menu,name",menu_statements,Statements,Estados de Cuenta,0
@@ -67,3 +69,4 @@ view,account.statement.journal,0,Statement Journal,Libro de Estados de Cuenta,0
view,account.statement.journal,0,Statement Journals,Libros de Estados de Cuenta,0
view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
view,account.statement.line,0,Statement Line,Libros de Estados de Cuenta,0
+view,account.statement.line,0,Statement Lines,Líneas de Estado de Cuenta,0
diff --git a/es_ES.csv b/es_ES.csv
index b37a351..6ecd6fa 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,8 +1,8 @@
type,name,res_id,src,value,fuzzy
-error,account.statement,0,End Balance must be %s!,El final del balance debe ser %s,0
+error,account.statement,0,End Balance must be %s!,El balance final debe ser %s,0
error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,La cantidad (%s) es mayor que la cantidad a pagar de la factura,0
-error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Las cuentas crédito o débito en el diario son las mismas que las línea de estado de cuenta,0
-error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas de débito y crédito en el libro de estado de cuentas.,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Las cuentas debe o haber en el diario son las mismas que las línea de estado de cuenta,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas debe y haber en el libro de estado de cuentas.,0
field,"account.statement,currency_digits",0,Currency Digits,Decimales de la divisa,0
field,"account.statement,date",0,Date,Fecha,0
field,"account.statement,end_balance",0,End Balance,Balance final,0
@@ -17,7 +17,7 @@ field,"account.statement.line,amount",0,Amount,Cantidad,0
field,"account.statement.line,date",0,Date,Fecha,0
field,"account.statement.line,description",0,Description,Descripción,0
field,"account.statement.line,invoice",0,Invoice,Factura,0
-field,"account.statement.line,move",0,Account Move,Asiento de cuenta,0
+field,"account.statement.line,move",0,Account Move,Asiento contable,0
field,"account.statement.line,party",0,Party,Tercero,0
field,"account.statement.line,rec_name",0,Name,Nombre,0
field,"account.statement,lines",0,Transactions,Transacciones,0
@@ -31,12 +31,14 @@ model,"account.statement.journal,name",0,Statement Journal,Diario de estados de
model,"account.statement.line,name",0,Account Statement Line,Línea de estado de cuenta,0
model,"account.statement,name",0,Account Statement,Estado de cuentas,0
model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de estados de cuenta,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Estados de cuenta en borrador,0
+model,"ir.action,name",act_new_statement_form,New Statement,Nuevo estado de cuenta,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de estados de cuenta,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de cuenta validados,0
model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de cuenta en borrador,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nuevo estado de cuenta,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de estados de cuenta,0
model,"ir.ui.menu,name",menu_statements,Statements,Estados de cuenta,0
@@ -67,3 +69,4 @@ view,account.statement.journal,0,Statement Journal,Libro de estados de cuenta,0
view,account.statement.journal,0,Statement Journals,Libros de estados de cuenta,0
view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
view,account.statement.line,0,Statement Line,Linea de estado de cuenta,0
+view,account.statement.line,0,Statement Lines,Líneas de estado de cuenta,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 21a9130..951aeac 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -7,7 +7,7 @@ field,"account.statement,currency_digits",0,Currency Digits,Décimales de la dev
field,"account.statement,date",0,Date,Date,0
field,"account.statement,end_balance",0,End Balance,Solde final,0
field,"account.statement,journal",0,Journal,Journal,0
-field,"account.statement.journal,company",0,Company,Compagnie,0
+field,"account.statement.journal,company",0,Company,Société,0
field,"account.statement.journal,currency",0,Currency,Devise,0
field,"account.statement.journal,journal",0,Journal,Journal,0
field,"account.statement.journal,name",0,Name,Nom,0
@@ -32,11 +32,13 @@ model,"account.statement.line,name",0,Account Statement Line,Ligne de relevé co
model,"account.statement,name",0,Account Statement,Relevé comptable,0
model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Relevés brouillons,0
+model,"ir.action,name",act_new_statement_form,New Statement,Nouveau relevé,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Relevés postés,0
model,"ir.action,name",act_statement_journal_form,Statement Journals,Journaux de relevés,0
model,"ir.action,name",act_validated_statement_form,Validated Statement,Relevés validés,0
model,"ir.ui.menu,name",menu_statement_form,All Statement,Tous les relevés,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Relevés brouillons,0
+model,"ir.ui.menu,name",menu_new_statement_form,New Statement,Nouveau relevé,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Relevés postés,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journaux de relevés,0
model,"ir.ui.menu,name",menu_statements,Statements,Relevés,0
@@ -63,3 +65,4 @@ view,account.statement,0,Validate,Valider,0
view,account.statement.journal,0,Statement Journal,Journal de relevés,0
view,account.statement.journal,0,Statement Journals,Journaux de relevés,0
view,account.statement.line,0,Statement Line,Ligne de relevé,0
+view,account.statement.line,0,Statement Lines,Lignes de relevé,0
diff --git a/journal.py b/journal.py
index 77b3c9e..a3c16d6 100644
--- a/journal.py
+++ b/journal.py
@@ -11,7 +11,7 @@ class Journal(ModelSQL, ModelView):
name = fields.Char('Name', required=True)
journal = fields.Many2One('account.journal', 'Journal', required=True,
- domain="[('type', '=', 'statement')]")
+ domain=[('type', '=', 'statement')])
currency = fields.Many2One('currency.currency', 'Currency', required=True)
company = fields.Many2One('company.company', 'Company', required=True)
diff --git a/setup.py b/setup.py
index da1d31e..c88c645 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
setup(name='trytond_account_statement',
version=info.get('version', '0.0.1'),
diff --git a/statement.py b/statement.py
index 848296c..bc7f5a3 100644
--- a/statement.py
+++ b/statement.py
@@ -19,9 +19,10 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
currency_digits = fields.Function('get_currency_digits', type='integer',
string='Currency Digits', on_change_with=['journal'])
date = fields.Date('Date', required=True, states=_STATES, select=1)
- start_balance = fields.Numeric('Start Balance', digits=(16, 2),
- states=_STATES)
- end_balance = fields.Numeric('End Balance', digits=(16, 2), states=_STATES)
+ start_balance = fields.Numeric('Start Balance', digits="(16, currency_digits)",
+ states=_STATES, depends=['currency_digits'])
+ end_balance = fields.Numeric('End Balance', digits="(16, currency_digits)",
+ states=_STATES, depends=['currency_digits'])
lines = fields.One2Many('account.statement.line', 'statement',
'Transactions', states={
'readonly': "(state != 'draft') or (not bool(journal))",
@@ -290,9 +291,9 @@ class Line(ModelSQL, ModelView):
description = fields.Char('Description')
move = fields.Many2One('account.move', 'Account Move', readonly=True)
invoice = fields.Many2One('account.invoice', 'Invoice',
- domain="[('party', '=', party), ('account', '=', account)] " \
- "+ (_parent_statement.state == 'draft' and " \
- "[('state', '=', 'open')] or [])",
+ domain=["('party', '=', party)", "('account', '=', account)",
+ "('state', '=', _parent_statement.state == 'draft' and " \
+ "'open' or False)"],
states={
'readonly': "not bool(amount)",
})
diff --git a/statement.xml b/statement.xml
index 48208e8..1f26691 100644
--- a/statement.xml
+++ b/statement.xml
@@ -74,6 +74,25 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
+
+ <record model="ir.action.act_window" id="act_new_statement_form">
+ <field name="name">New Statement</field>
+ <field name="res_model">account.statement</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_new_statement_form_view1">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_view_tree"/>
+ <field name="act_window" ref="act_new_statement_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_new_statement_form_view2">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_view_form"/>
+ <field name="act_window" ref="act_new_statement_form"/>
+ </record>
+ <menuitem parent="menu_statements" sequence="1"
+ action="act_new_statement_form" id="menu_new_statement_form"/>
+
<record model="ir.action.act_window" id="act_draft_statement_form">
<field name="name">Draft Statements</field>
<field name="res_model">account.statement</field>
@@ -90,7 +109,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="statement_view_form"/>
<field name="act_window" ref="act_draft_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="1"
+ <menuitem parent="menu_statements" sequence="2"
action="act_draft_statement_form" id="menu_draft_statement_form"/>
<record model="ir.action.act_window" id="act_validated_statement_form">
@@ -109,7 +128,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="statement_view_form"/>
<field name="act_window" ref="act_validated_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="2"
+ <menuitem parent="menu_statements" sequence="3"
action="act_validated_statement_form" id="menu_validated_statement_form"/>
<record model="ir.action.act_window" id="act_posted_statement_form">
@@ -128,7 +147,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="statement_view_form"/>
<field name="act_window" ref="act_posted_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="3"
+ <menuitem parent="menu_statements" sequence="4"
action="act_posted_statement_form" id="menu_posted_statement_form"/>
<record model="ir.action.act_window" id="act_statement_form">
@@ -146,7 +165,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="view" ref="statement_view_form"/>
<field name="act_window" ref="act_statement_form"/>
</record>
- <menuitem parent="menu_statements" sequence="4"
+ <menuitem parent="menu_statements" sequence="5"
action="act_statement_form" id="menu_statement_form"/>
<record model="ir.ui.view" id="statement_line_view_form">
@@ -175,7 +194,7 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
<record model="ir.ui.view" id="statement_line_view_tree">
- <field name="model">statement.statement.line</field>
+ <field name="model">account.statement.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<![CDATA[
@@ -194,7 +213,7 @@ this repository contains the full copyright notices and license terms. -->
<!-- Statement workflow -->
<record model="workflow" id="wkf_statement">
<field name="name">Statement</field>
- <field name="osv">account.statement</field>
+ <field name="model">account.statement</field>
<field name="on_create">True</field>
</record>
<record model="workflow.activity" id="statement_act_draft">
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..bf3bc8c
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_account_statement import *
diff --git a/tests/test_account_statement.py b/tests/test_account_statement.py
new file mode 100644
index 0000000..965e80a
--- /dev/null
+++ b/tests/test_account_statement.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class AccountStatementTestCase(unittest.TestCase):
+ '''
+ Test AccountStatement module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('account_statement')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('account_statement'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(AccountStatementTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteAccountStatement = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteAccountStatement])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 99834af..5a94fdd 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.2.0
+Version: 1.4.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index cf7c6a1..9ef37d2 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -16,6 +16,8 @@ statement.xml
./__tryton__.py
./journal.py
./statement.py
+tests/__init__.py
+tests/test_account_statement.py
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
trytond_account_statement.egg-info/dependency_links.txt
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index eb42a2d..8c96867 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -3,5 +3,5 @@ trytond_company
trytond_currency
trytond_party
trytond_account_invoice
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit 2173fa461065bd57e8e2bfc3ca05166cb0f1a95c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:38:36 2009 +0200
Releasing debian version 1.2.0-4.
diff --git a/debian/changelog b/debian/changelog
index 96047a3..9cb0d43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-account-statement (1.2.0-4) unstable; urgency=low
+
+ * Updating to standards version 3.8.3.
+ * Adding maintainer homepage field to control.
+ * Adding README.source.
+ * Moving maintainer homepage field to copyright.
+ * Updating README.source.
+ * Using ascii only characters in copyright.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 05 Sep 2009 09:38:33 +0200
+
tryton-modules-account-statement (1.2.0-3) unstable; urgency=low
* Updating maintainer field.
commit ee93b9a7e956cd6c2ea44a1b3fd2bbf3d41df9fa
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:34:33 2009 +0200
Using ascii only characters in copyright.
diff --git a/debian/copyright b/debian/copyright
index 0308b4e..b18de59 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2009 Cédric Krier
+ (C) 2008-2009 Cedric Krier
(C) 2008-2009 Bertrand Chenal
(C) 2008-2009 B2CK SPRL
License: GPL-3+
commit 948f47a2d949f96db1712bf44539d299aac91845
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:31:18 2009 +0200
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index 259f923..dcc7ba3 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,7 +4,7 @@ Package Repositories
Backports for the current stable debian distribution as well as snapshots of
unreleased versions may be available in repositories listed on the maintainers
homepage. The current URL of the maintainer homepage can be seen in
-debian/control.
+debian/copyright.
Source Access
commit 91957b7e60982aec5d291fbcd2f605eaf2dd113a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Sep 5 09:27:03 2009 +0200
Moving maintainer homepage field to copyright.
diff --git a/debian/control b/debian/control
index 1f5bdcc..afefcb4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
-XSBC-Maintainer-Homepage: http://tryton.debian-maintainers.org/
Package: tryton-modules-account-statement
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index fceabb1..0308b4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
-Author: Tryton Project <http://www.tryton.org/>
-Download: http://www.tryton.org/downloads.html
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
commit 082c08676f7fa7dab36cf85898ca6f1668b0e28e
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 25 08:18:21 2009 +0200
Adding README.source.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..259f923
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/control.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
commit cc60a6840fed239d3b7c04f5c293ef404901cef6
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 24 17:49:53 2009 +0200
Adding maintainer homepage field to control.
diff --git a/debian/control b/debian/control
index afefcb4..1f5bdcc 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
+XSBC-Maintainer-Homepage: http://tryton.debian-maintainers.org/
Package: tryton-modules-account-statement
Architecture: all
commit bbf73c94d8f2e71d272912107cdbf300f089d52d
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Aug 16 10:12:56 2009 +0200
Updating to standards version 3.8.3.
diff --git a/debian/control b/debian/control
index 85ee151..afefcb4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
commit 70cd9ec966ffda4d0c702ca063195f7076567827
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 10 19:56:27 2009 +0200
Releasing debian version 1.2.0-3.
diff --git a/debian/changelog b/debian/changelog
index e3e8270..96047a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-statement (1.2.0-3) unstable; urgency=low
+
+ * Updating maintainer field.
+ * Updating vcs fields.
+ * Wrapping lines in control.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 10 Aug 2009 19:56:25 +0200
+
tryton-modules-account-statement (1.2.0-2) unstable; urgency=low
* Updating package to standards version 3.8.2.
commit cc88cbf6ebd26cbd4435875f001c4b0ed135030f
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 10 19:56:23 2009 +0200
Wrapping lines in control.
diff --git a/debian/control b/debian/control
index e4cc2e6..85ee151 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: tryton-modules-account-statement
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
commit 1ec0d45bf3f0c5a81ce2824768de1a1a4dd18825
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 8 23:26:50 2009 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index d064827..e4cc2e6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.git
-Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account-statement.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-statement.git
Package: tryton-modules-account-statement
Architecture: all
commit 940ce75409b015538291f351a390e417a6e0d757
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 8 23:19:30 2009 +0200
Updating maintainer field.
diff --git a/debian/control b/debian/control
index 49ba022..d064827 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: tryton-modules-account-statement
Section: python
Priority: optional
-Maintainer: Daniel Baumann <daniel at debian.org>
-Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
commit 5efdf0687124632abb034a2f1ac71b05da9065eb
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 26 20:07:21 2009 +0200
Releasing debian version 1.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index 03ecdb9..e3e8270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-statement (1.2.0-2) unstable; urgency=low
+
+ * Updating package to standards version 3.8.2.
+ * Minimizing rules file.
+ * Not using line breaks for vcs fiels in control in order to avoid
+ overly stupid lintian false-positives.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 26 Jul 2009 20:07:18 +0200
+
tryton-modules-account-statement (1.2.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit c82ef5a701016ab94e892f7980e6c61f59abf288
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 26 20:07:04 2009 +0200
Not using line breaks for vcs fiels in control in order to avoid overly stupid lintian false-positives.
diff --git a/debian/control b/debian/control
index 261b2e9..49ba022 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,8 @@ Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.2
Homepage: http://www.tryton.org/
-Vcs-Browser:
- http://git.debian.net/?p=debian/tryton-modules-account-statement.git
-Vcs-Git:
- git://git.debian.net/git/debian/tryton-modules-account-statement.git
+Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.git
+Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
Package: tryton-modules-account-statement
Architecture: all
commit 9735a7ff7b64cd0713f986f28884731ac4b15695
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 26 20:03:06 2009 +0200
Minimizing rules file.
diff --git a/debian/rules b/debian/rules
index aa8a3aa..000210b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,4 @@
#!/usr/bin/make -f
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- python setup.py clean
- rm -rf dist build trytond_account_statement.egg-info
-
- dh_clean
-
-build:
-
-install:
- dh_testdir
- dh_testroot
- dh_prep
-
- python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-account-statement --install-lib /usr/share/python-support/tryton-modules-account-statement
-
- find debian/tryton-modules-account-statement -type f -name "*.pyc" | xargs rm -f
-
-binary: binary-indep
-
-binary-arch:
-
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_pysupport
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-.PHONY: clean build install binary binary-arch binary-indep
+%:
+ dh ${@}
commit 7549918adbffb04e5c54d5f15cfbbf52f898aaaf
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 10 14:09:15 2009 +0200
Updating package to standards version 3.8.2.
diff --git a/debian/control b/debian/control
index ed33bbf..261b2e9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Daniel Baumann <daniel at debian.org>
Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends:
debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Homepage: http://www.tryton.org/
Vcs-Browser:
http://git.debian.net/?p=debian/tryton-modules-account-statement.git
commit 01185c3fdff9b03b0a1239e7a878e15754aea93e
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 20:32:01 2009 +0200
Releasing debian version 1.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index 615ccb1..03ecdb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tryton-modules-account-statement (1.2.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Merging upstream version 1.2.0.
+ * Tidy rules file.
+ * Updating copyright file for new upstream release.
+
+ [ Mathias Behrle ]
+ * Updating application description.
+
+ [ Daniel Baumann ]
+ * Correcting wrapping of control file.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 21 Apr 2009 20:31:00 +0200
+
tryton-modules-account-statement (1.0.0-4) unstable; urgency=low
* Adding Mathias to uploaders.
commit b26b3e6691546ec7e9011ebf6a8694f4378816c3
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 20:31:41 2009 +0200
Correcting wrapping of control file.
diff --git a/debian/control b/debian/control
index d96659b..ed33bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,26 @@ Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.git
-Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
+Vcs-Browser:
+ http://git.debian.net/?p=debian/tryton-modules-account-statement.git
+Vcs-Git:
+ git://git.debian.net/git/debian/tryton-modules-account-statement.git
Package: tryton-modules-account-statement
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, tryton-modules-account-invoice, tryton-modules-company, tryton-modules-currency, tryton-modules-party, python-pkg-resources
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account,
+ tryton-modules-account-invoice, tryton-modules-company,
+ tryton-modules-currency, tryton-modules-party, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
- and using PostgreSQL as database engine. It is the core base of a complete business solution.
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
.
This package contains the financial and accounting module with:
.
commit 57d5f84758be61af1bb5a43a10f32c50130c67cb
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue Apr 21 17:17:04 2009 +0200
Updating application description.
diff --git a/debian/control b/debian/control
index 64755f0..d96659b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-accou
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
- and using PostgreSQL as database engine. It is the core base of an ERP.
+ and using PostgreSQL as database engine. It is the core base of a complete business solution.
.
This package contains the financial and accounting module with:
.
commit e0f4085a86a28499e43633872f339eb064e8ea6e
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:41:42 2009 +0200
Updating copyright file for new upstream release.
diff --git a/debian/copyright b/debian/copyright
index 0088eff..fceabb1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,9 @@ Download: http://www.tryton.org/downloads.html
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008 Cedric Krier
- (C) 2008 Bertrand Chenal
- (C) 2008 B2CK SPRL
+ (C) 2008-2009 Cédric Krier
+ (C) 2008-2009 Bertrand Chenal
+ (C) 2008-2009 B2CK SPRL
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
commit 0300d32e7632c5a4f7662b8781390cfde3668781
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:35:45 2009 +0200
Tidy rules file.
diff --git a/debian/rules b/debian/rules
index cdc9b97..aa8a3aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ install:
dh_testdir
dh_testroot
dh_prep
- dh_installdirs
python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-account-statement --install-lib /usr/share/python-support/tryton-modules-account-statement
commit 9294cfc000664433f31413939617933da7b0d866
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:11:06 2009 +0200
Merging upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 0a72d70..6889003 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
+
Version 1.0.0 - 2009-05-01
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 7dac30b..bf04c99 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account_statement
-Version: 1.0.0
+Version: 1.2.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 3e5adbe..58a993e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,9 +3,10 @@
{
'name': 'Account Statement',
'name_de_DE': 'Buchhaltung Bankauszüge',
+ 'name_es_CO': 'Estado de Cuentas',
'name_es_ES': 'Estado de Cuentas',
'name_fr_FR': 'Relevé comptable',
- 'version': '1.0.0',
+ 'version': '1.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -16,6 +17,10 @@
'description_de_DE': '''Modul für Buchhaltung und Bankauszüge mit
- Abstimmung von Bankauszügen und Rechnungen
''',
+ 'description_es_CO': '''Módulo Financiero y Contable con:
+ - Estado de cuentas
+ - Diario de estado de cuentas
+''',
'description_es_ES': '''Módulo Financiero y Contable con:
- Estado de cuentas
- Diario de estado de cuentas
@@ -38,6 +43,7 @@
],
'translation': [
'de_DE.csv',
+ 'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
],
diff --git a/de_DE.csv b/de_DE.csv
index 4517fed..63babe4 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,15 +1,17 @@
type,name,res_id,src,value,fuzzy
error,account.statement,0,End Balance must be %s!,Endsaldo muss %s sein!,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Der eingegebene Betrag (%s) ist größer als der Rechnungsbetrag!,0
error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Haben- oder Sollkonto im Journal ist das selbe Konto wie das des Zahlungspostens!,0
-error,account.statement.line,0,Please provide debit and credit account on bank journal.,Bitte Soll- und Habenkonto für das Bankjournal eingeben.,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Bitte Soll- und Habenkonto im Journal Zahlungsverkehr angeben.,0
field,"account.statement,currency_digits",0,Currency Digits,Stellen Währung,0
field,"account.statement,date",0,Date,Datum,0
field,"account.statement,end_balance",0,End Balance,Endsaldo,0
field,"account.statement,journal",0,Journal,Journal,0
field,"account.statement.journal,company",0,Company,Unternehmen,0
field,"account.statement.journal,currency",0,Currency,Währung,0
-field,"account.statement.journal,journal",0,Journal,Journal Zahlungsverkehr,1
+field,"account.statement.journal,journal",0,Journal,Journal,0
field,"account.statement.journal,name",0,Name,Name,0
+field,"account.statement.journal,rec_name",0,Name,Name,0
field,"account.statement.line,account",0,Account,Konto,0
field,"account.statement.line,amount",0,Amount,Betrag,0
field,"account.statement.line,date",0,Date,Datum,0
@@ -17,12 +19,17 @@ field,"account.statement.line,description",0,Description,Beschreibung,0
field,"account.statement.line,invoice",0,Invoice,Rechnung,0
field,"account.statement.line,move",0,Account Move,Buchung,0
field,"account.statement.line,party",0,Party,Partei,0
+field,"account.statement.line,rec_name",0,Name,Name,0
field,"account.statement,lines",0,Transactions,Transaktionen,0
field,"account.statement.line,statement",0,Statement,Zahlung,0
field,"account.statement,move_lines",0,Move Lines,Buchungsposten,0
+field,"account.statement,rec_name",0,Name,Name,0
field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
field,"account.statement,state",0,State,Status,0
-model,"account.journal.type,name",journal_type_bank,Statement,Zahlung,0
+model,"account.journal.type,name",journal_type_statement,Statement,Zahlung,0
+model,"account.statement.journal,name",0,Statement Journal,Journal Zahlungsverkehr,0
+model,"account.statement.line,name",0,Account Statement Line,Zahlungsverkehr Position,0
+model,"account.statement,name",0,Account Statement,Zahlungsverkehr,0
model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
@@ -32,16 +39,16 @@ model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
-model,"ir.ui.menu,name",menu_statements,Statements,Zahlungen,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungen,0
+model,"ir.ui.menu,name",menu_statements,Statements,Zahlungsverkehr,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungsverkehr,0
model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
model,"res.group,name",group_statement,Statement,Zahlung,0
-model,"workflow.activity,name",statement_act_cancel,Cancel,Annullieren,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Annulliert,0
model,"workflow.activity,name",statement_act_draft,Draft,Entwurf,0
model,"workflow.activity,name",statement_act_posted,Posted,Festgeschrieben,0
model,"workflow.activity,name",statement_act_validated,Validated,Geprüft,0
model,"workflow,name",wkf_statement,Statement,Zahlung,0
-selection,"account.statement,state",0,Cancel,Annulliert,0
+selection,"account.statement,state",0,Canceled,Annulliert,0
selection,"account.statement,state",0,Draft,Entwurf,0
selection,"account.statement,state",0,Posted,Festgeschrieben,0
selection,"account.statement,state",0,Validated,Geprüft,0
@@ -54,9 +61,10 @@ view,account.statement,0,Post,Festschreiben,0
view,account.statement,0,Reset to Draft,Auf Entwurf zurücksetzen,0
view,account.statement,0,Statement,Zahlung,0
view,account.statement,0,Statement Lines,Zahlungsposten,0
-view,account.statement,0,Statements,Zahlungen,0
+view,account.statement,0,Statements,Zahlungsverkehr,0
view,account.statement,0,Validate,Prüfen,0
view,account.statement.journal,0,Statement Journal,Journal Zahlungsverkehr,0
view,account.statement.journal,0,Statement Journals,Journale Zahlungsverkehr,0
view,account.statement.line,0,Bank Statement Line,Posten Bankauszüge,0
view,account.statement.line,0,Statement Line,Zahlungsposten,0
+view,statement.statement.line,0,Statement Lines,Zahlungsposten,0
diff --git a/es_ES.csv b/es_CO.csv
similarity index 62%
copy from es_ES.csv
copy to es_CO.csv
index 2f0b99c..0c7e9b2 100644
--- a/es_ES.csv
+++ b/es_CO.csv
@@ -1,27 +1,35 @@
type,name,res_id,src,value,fuzzy
-error,account.statement,0,"Wrong End balance:
- * Expected: %s
- * Computed: %s",Balance Final erróneo:,0
-error,account.statement.line,0,Please provide debit and credit account on bank journal.,Por favor indique las cuentas débito y crédito para el libro diario de bancos.,0
+error,account.statement,0,End Balance must be %s!,El Balance debe ser %s!,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,¡El valor (%s) es mayor que lo que se debe pagar en la factura!,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,¡Las cuentas crédito o débito en un diario son las mismas que las líneas de estado de cuenta!,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas débito y crédito en el libro de estado de cuentas.,0
+field,"account.statement,currency_digits",0,Currency Digits,Dígitos de Moneda,0
field,"account.statement,date",0,Date,Fecha,0
field,"account.statement,end_balance",0,End Balance,Balance Final,0
field,"account.statement,journal",0,Journal,Diario,0
field,"account.statement.journal,company",0,Company,Compañía,0
field,"account.statement.journal,currency",0,Currency,Moneda,0
-field,"account.statement.journal,journal",0,Bank Journal,Libro de Banco,0
+field,"account.statement.journal,journal",0,Journal,Diario,0
field,"account.statement.journal,name",0,Name,Nombre,0
+field,"account.statement.journal,rec_name",0,Name,Nombre,0
field,"account.statement.line,account",0,Account,Cuenta,0
field,"account.statement.line,amount",0,Amount,Cantidad,0
field,"account.statement.line,date",0,Date,Fecha,0
field,"account.statement.line,description",0,Description,Descripción,0
+field,"account.statement.line,invoice",0,Invoice,Factura,0
field,"account.statement.line,move",0,Account Move,Movimiento de Cuenta,0
field,"account.statement.line,party",0,Party,Tercero,0
+field,"account.statement.line,rec_name",0,Name,Nombre,0
field,"account.statement,lines",0,Transactions,Transacciones,0
field,"account.statement.line,statement",0,Statement,Estado de Cuenta,0
field,"account.statement,move_lines",0,Move Lines,Líneas de Movimiento,0
+field,"account.statement,rec_name",0,Name,Nombre,0
field,"account.statement,start_balance",0,Start Balance,Balance Inicial,0
field,"account.statement,state",0,State,Estado,0
-model,"account.journal.type,name",journal_type_bank,Bank,Banco,0
+model,"account.journal.type,name",journal_type_statement,Statement,Estado de Cuenta,0
+model,"account.statement.journal,name",0,Statement Journal,Diario de Estados de Cuenta,0
+model,"account.statement.line,name",0,Account Statement Line,Línea de Estado de Cuenta,0
+model,"account.statement,name",0,Account Statement,Estado de Cuentas,0
model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de Estados de Cuenta,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
@@ -34,7 +42,13 @@ model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios d
model,"ir.ui.menu,name",menu_statements,Statements,Estados de Cuenta,0
model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de Cuenta,0
model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de Cuenta Válidos,0
-selection,"account.statement,state",0,Cancel,Cancelar,0
+model,"res.group,name",group_statement,Statement,Estado de Cuenta,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Cancelado,0
+model,"workflow.activity,name",statement_act_draft,Draft,Borrador,0
+model,"workflow.activity,name",statement_act_posted,Posted,Confirmado,0
+model,"workflow.activity,name",statement_act_validated,Validated,Validado,0
+model,"workflow,name",wkf_statement,Statement,Estado de Cuenta,0
+selection,"account.statement,state",0,Canceled,Cancelado,0
selection,"account.statement,state",0,Draft,Borrador,0
selection,"account.statement,state",0,Posted,Confirmado,0
selection,"account.statement,state",0,Validated,Validado,0
@@ -45,9 +59,11 @@ view,account.statement,0,Cancel,Cancelar,0
view,account.statement,0,Move Lines,Líneas de Movimiento,0
view,account.statement,0,Post,Confirmar,0
view,account.statement,0,Reset to Draft,Revertir a Borrador,0
+view,account.statement,0,Statement,Estado de Cuenta,0
view,account.statement,0,Statement Lines,Líneas de Estado de Cuenta,0
+view,account.statement,0,Statements,Estados de Cuenta,0
view,account.statement,0,Validate,Validar,0
view,account.statement.journal,0,Statement Journal,Libro de Estados de Cuenta,0
view,account.statement.journal,0,Statement Journals,Libros de Estados de Cuenta,0
view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
-view,statement.statement.line,0,Statement Lines,Líneas de Estado de Cuenta,0
+view,account.statement.line,0,Statement Line,Libros de Estados de Cuenta,0
diff --git a/es_ES.csv b/es_ES.csv
index 2f0b99c..b37a351 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,53 +1,69 @@
type,name,res_id,src,value,fuzzy
-error,account.statement,0,"Wrong End balance:
- * Expected: %s
- * Computed: %s",Balance Final erróneo:,0
-error,account.statement.line,0,Please provide debit and credit account on bank journal.,Por favor indique las cuentas débito y crédito para el libro diario de bancos.,0
+error,account.statement,0,End Balance must be %s!,El final del balance debe ser %s,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,La cantidad (%s) es mayor que la cantidad a pagar de la factura,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Las cuentas crédito o débito en el diario son las mismas que las línea de estado de cuenta,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Por favor indique las cuentas de débito y crédito en el libro de estado de cuentas.,0
+field,"account.statement,currency_digits",0,Currency Digits,Decimales de la divisa,0
field,"account.statement,date",0,Date,Fecha,0
-field,"account.statement,end_balance",0,End Balance,Balance Final,0
+field,"account.statement,end_balance",0,End Balance,Balance final,0
field,"account.statement,journal",0,Journal,Diario,0
-field,"account.statement.journal,company",0,Company,Compañía,0
-field,"account.statement.journal,currency",0,Currency,Moneda,0
-field,"account.statement.journal,journal",0,Bank Journal,Libro de Banco,0
+field,"account.statement.journal,company",0,Company,Empresa,0
+field,"account.statement.journal,currency",0,Currency,Divisa,0
+field,"account.statement.journal,journal",0,Journal,Diario,0
field,"account.statement.journal,name",0,Name,Nombre,0
+field,"account.statement.journal,rec_name",0,Name,Nombre,0
field,"account.statement.line,account",0,Account,Cuenta,0
field,"account.statement.line,amount",0,Amount,Cantidad,0
field,"account.statement.line,date",0,Date,Fecha,0
field,"account.statement.line,description",0,Description,Descripción,0
-field,"account.statement.line,move",0,Account Move,Movimiento de Cuenta,0
+field,"account.statement.line,invoice",0,Invoice,Factura,0
+field,"account.statement.line,move",0,Account Move,Asiento de cuenta,0
field,"account.statement.line,party",0,Party,Tercero,0
+field,"account.statement.line,rec_name",0,Name,Nombre,0
field,"account.statement,lines",0,Transactions,Transacciones,0
-field,"account.statement.line,statement",0,Statement,Estado de Cuenta,0
-field,"account.statement,move_lines",0,Move Lines,Líneas de Movimiento,0
-field,"account.statement,start_balance",0,Start Balance,Balance Inicial,0
+field,"account.statement.line,statement",0,Statement,Estado de cuenta,0
+field,"account.statement,move_lines",0,Move Lines,Líneas de asientos,0
+field,"account.statement,rec_name",0,Name,Nombre,0
+field,"account.statement,start_balance",0,Start Balance,Balance inicial,0
field,"account.statement,state",0,State,Estado,0
-model,"account.journal.type,name",journal_type_bank,Bank,Banco,0
+model,"account.journal.type,name",journal_type_statement,Statement,Estado de cuenta,0
+model,"account.statement.journal,name",0,Statement Journal,Diario de estados de cuenta,0
+model,"account.statement.line,name",0,Account Statement Line,Línea de estado de cuenta,0
+model,"account.statement,name",0,Account Statement,Estado de cuentas,0
model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de Estados de Cuenta,0
-model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
-model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de Estados de Cuenta,0
-model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de Cuenta Validados,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de estados de cuenta,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de estados de cuenta,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de cuenta validados,0
model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
-model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de Cuenta en Borrador,0
-model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
-model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_statements,Statements,Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de Cuenta,0
-model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de Cuenta Válidos,0
-selection,"account.statement,state",0,Cancel,Cancelar,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de cuenta en borrador,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de cuenta confirmados,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de estados de cuenta,0
+model,"ir.ui.menu,name",menu_statements,Statements,Estados de cuenta,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de cuenta,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de cuenta validados,0
+model,"res.group,name",group_statement,Statement,Estado de cuenta,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Cancelado,0
+model,"workflow.activity,name",statement_act_draft,Draft,Borrador,0
+model,"workflow.activity,name",statement_act_posted,Posted,Confirmado,0
+model,"workflow.activity,name",statement_act_validated,Validated,Validado,0
+model,"workflow,name",wkf_statement,Statement,Estado de cuenta,0
+selection,"account.statement,state",0,Canceled,Cancelado,0
selection,"account.statement,state",0,Draft,Borrador,0
selection,"account.statement,state",0,Posted,Confirmado,0
selection,"account.statement,state",0,Validated,Validado,0
-view,account.statement,0,Bank Statement,Extractos Bancarios,0
+view,account.statement,0,Bank Statement,Extracto bancario,0
view,account.statement,0,Bank Statement Lines,Líneas de extracto bancario,0
-view,account.statement,0,Bank Statements,Extractos Bancarios,0
+view,account.statement,0,Bank Statements,Extractos bancarios,0
view,account.statement,0,Cancel,Cancelar,0
-view,account.statement,0,Move Lines,Líneas de Movimiento,0
+view,account.statement,0,Move Lines,Líneas de asientos,0
view,account.statement,0,Post,Confirmar,0
-view,account.statement,0,Reset to Draft,Revertir a Borrador,0
-view,account.statement,0,Statement Lines,Líneas de Estado de Cuenta,0
+view,account.statement,0,Reset to Draft,Restablecer a borrador,0
+view,account.statement,0,Statement,Estado de cuenta,0
+view,account.statement,0,Statement Lines,Líneas de estado de cuenta,0
+view,account.statement,0,Statements,Estados de cuenta,0
view,account.statement,0,Validate,Validar,0
-view,account.statement.journal,0,Statement Journal,Libro de Estados de Cuenta,0
-view,account.statement.journal,0,Statement Journals,Libros de Estados de Cuenta,0
+view,account.statement.journal,0,Statement Journal,Libro de estados de cuenta,0
+view,account.statement.journal,0,Statement Journals,Libros de estados de cuenta,0
view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
-view,statement.statement.line,0,Statement Lines,Líneas de Estado de Cuenta,0
+view,account.statement.line,0,Statement Line,Linea de estado de cuenta,0
diff --git a/fr_FR.csv b/fr_FR.csv
index c504e61..21a9130 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -11,6 +11,7 @@ field,"account.statement.journal,company",0,Company,Compagnie,0
field,"account.statement.journal,currency",0,Currency,Devise,0
field,"account.statement.journal,journal",0,Journal,Journal,0
field,"account.statement.journal,name",0,Name,Nom,0
+field,"account.statement.journal,rec_name",0,Name,Nom,0
field,"account.statement.line,account",0,Account,Compte,0
field,"account.statement.line,amount",0,Amount,Montant,0
field,"account.statement.line,date",0,Date,Date,0
@@ -18,12 +19,17 @@ field,"account.statement.line,description",0,Description,Description,0
field,"account.statement.line,invoice",0,Invoice,Facture,0
field,"account.statement.line,move",0,Account Move,Mouvement comptable,0
field,"account.statement.line,party",0,Party,Tiers,0
+field,"account.statement.line,rec_name",0,Name,Nom,0
field,"account.statement,lines",0,Transactions,Transactions,0
field,"account.statement.line,statement",0,Statement,Relevé,0
field,"account.statement,move_lines",0,Move Lines,Lignes de mouvement comptable,0
+field,"account.statement,rec_name",0,Name,Nom,0
field,"account.statement,start_balance",0,Start Balance,Solde de départ,0
field,"account.statement,state",0,State,État,0
model,"account.journal.type,name",journal_type_statement,Statement,Relevé,0
+model,"account.statement.journal,name",0,Statement Journal,Journal de relevés,0
+model,"account.statement.line,name",0,Account Statement Line,Ligne de relevé comptable,0
+model,"account.statement,name",0,Account Statement,Relevé comptable,0
model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
model,"ir.action,name",act_draft_statement_form,Draft Statements,Relevés brouillons,0
model,"ir.action,name",act_posted_statement_form,Posted Statements,Relevés postés,0
@@ -37,12 +43,12 @@ model,"ir.ui.menu,name",menu_statements,Statements,Relevés,0
model,"ir.ui.menu,name",menu_statement_configuration,Statements,Relevés,0
model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Relevés validés,0
model,"res.group,name",group_statement,Statement,Relevé,0
-model,"workflow.activity,name",statement_act_cancel,Cancel,Annulé,0
+model,"workflow.activity,name",statement_act_cancel,Canceled,Annulé,0
model,"workflow.activity,name",statement_act_draft,Draft,Brouillon,0
model,"workflow.activity,name",statement_act_posted,Posted,Posté,0
model,"workflow.activity,name",statement_act_validated,Validated,Validé,0
model,"workflow,name",wkf_statement,Statement,Relevé,0
-selection,"account.statement,state",0,Cancel,Annuler,0
+selection,"account.statement,state",0,Canceled,Annulé,0
selection,"account.statement,state",0,Draft,Brouillon,0
selection,"account.statement,state",0,Posted,Posté,0
selection,"account.statement,state",0,Validated,Validé,0
diff --git a/invoice.xml b/invoice.xml
index b11c50e..d5fed68 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -11,7 +11,7 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
- expr="/form/notebook/page/group/group/button[@name="%(account_invoice.wizard_pay_invoice)d"]"
+ expr="/form/notebook/page/group/group/group/button[@name="%(account_invoice.wizard_pay_invoice)d"]"
position="replace">
</xpath>
</data>
diff --git a/journal.py b/journal.py
index 0051fc4..77b3c9e 100644
--- a/journal.py
+++ b/journal.py
@@ -1,11 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
"Statement Journal"
+from trytond.model import ModelView, ModelSQL, fields
-from trytond.osv import fields, OSV
-
-class Journal(OSV):
+class Journal(ModelSQL, ModelView):
'Statement Journal'
_name = 'account.statement.journal'
_description = __doc__
@@ -22,15 +21,13 @@ class Journal(OSV):
currency_obj = self.pool.get('currency.currency')
company = company_obj.browse(cursor, user, context['company'],
context=context)
- return currency_obj.name_get(cursor, user, company.currency.id,
- context=context)[0]
+ return company.currency.id
return False
def default_company(self, cursor, user, context=None):
company_obj = self.pool.get('company.company')
if context and context.get('company'):
- return company_obj.name_get(cursor, user, context['company'],
- context=context)[0]
+ return context['company']
return False
Journal()
diff --git a/statement.py b/statement.py
index ad8b345..848296c 100644
--- a/statement.py
+++ b/statement.py
@@ -1,15 +1,13 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
"Statement"
-
-from trytond.osv import fields, OSV
-from trytond.netsvc import LocalService
+from trytond.model import ModelWorkflow, ModelView, ModelSQL, fields
from decimal import Decimal
_STATES = {'readonly': 'state != "draft"'}
-class Statement(OSV):
+class Statement(ModelWorkflow, ModelSQL, ModelView):
'Account Statement'
_name = 'account.statement'
_description = __doc__
@@ -31,7 +29,7 @@ class Statement(OSV):
state = fields.Selection([
('draft', 'Draft'),
('validated', 'Validated'),
- ('cancel', 'Cancel'),
+ ('cancel', 'Canceled'),
('posted', 'Posted'),
], 'State', readonly=True, select=1)
move_lines = fields.Function('get_move_lines', type='one2many',
@@ -39,9 +37,9 @@ class Statement(OSV):
def __init__(self):
super(Statement, self).__init__()
- self._rpc_allowed += [
- 'draft_workflow',
- ]
+ self._rpc.update({
+ 'draft_workflow': True,
+ })
self._order[0] = ('id', 'DESC')
self._error_messages.update({
'wrong_end_balance': 'End Balance must be %s!',
@@ -96,14 +94,14 @@ class Statement(OSV):
res[statement.id] = statement.journal.currency.digits
return res
- def name_get(self, cursor, user, ids, context=None):
+ def get_rec_name(self, cursor, user, ids, name, arg, context=None):
lang_obj = self.pool.get('ir.lang')
if context is None:
context = {}
if not ids:
- return []
+ return {}
for code in [context.get('language', False) or 'en_US', 'en_US']:
lang_ids = lang_obj.search(cursor, user, [
@@ -113,31 +111,31 @@ class Statement(OSV):
break
lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
- if isinstance(ids, (int, long)):
- ids = [ids]
- res = []
+ res = {}
for statement in self.browse(cursor, user, ids, context=context):
- res.append((statement.id, statement.journal.name + ' ' + \
+ res[statement.id] = statement.journal.name + ' ' + \
lang.currency(lang, statement.start_balance,
statement.journal.currency, symbol=False,
grouping=True) + \
lang.currency(lang, statement.end_balance,
statement.journal.currency, symbol=False,
- grouping=True)))
+ grouping=True)
return res
- def name_search(self, cursor, user, name='', args=None, operator='ilike',
- context=None, limit=None):
- if args is None:
- args = []
- ids = []
- if name:
- ids = self.search(cursor, user, [['OR',
- ('journal', operator, name),
- ('start_balance', operator, name),
- ('end_balance', operator, name),
- ], args], limit=limit, context=context)
- return self.name_get(cursor, user, ids, context=context)
+ def search_rec_name(self, cursor, user, name, args, context=None):
+ args2 = []
+ i = 0
+ while i < len(args):
+ ids = self.search(cursor, user, ['OR',
+ ('start_balance', args[i][1], args[i][2]),
+ ('end_balance', args[i][1], args[i][2]),
+ ], context=context)
+ if ids:
+ args2.append(('id', 'in', ids))
+ else:
+ args2.append(('journal', args[i][1], args[i][2]))
+ i += 1
+ return args2
def get_move_lines(self, cursor, user, ids, name, args, context=None):
'''
@@ -232,8 +230,9 @@ class Statement(OSV):
break
lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
- amount = lang_obj.currency(lang, computed_end_balance,
- statement.journal.currency, symbol=False, grouping=True)
+ amount = lang_obj.format(lang,
+ '%.' + str(statement.journal.currency.digits) + 'f',
+ computed_end_balance, True)
self.raise_user_error(cursor, 'wrong_end_balance',
error_args=(amount,), context=context)
for line in statement.lines:
@@ -263,19 +262,16 @@ class Statement(OSV):
}, context=context)
def draft_workflow(self, cursor, user, ids, context=None):
- workflow_service = LocalService('workflow')
- for statement in self.browse(cursor, user, ids, context=context):
- workflow_service.trg_create(user, self._name, statement.id, cursor,
- context=context)
- self.write(cursor, user, statement.id, {
- 'state': 'draft',
- }, context=context)
+ self.workflow_trigger_create(cursor, user, ids, context=context)
+ self.write(cursor, user, ids, {
+ 'state': 'draft',
+ }, context=context)
return True
Statement()
-class Line(OSV):
+class Line(ModelSQL, ModelView):
'Account Statement Line'
_name = 'account.statement.line'
_description = __doc__
@@ -326,8 +322,8 @@ class Line(OSV):
account = party.account_receivable
else:
account = party.account_payable
- res['account'] = account_obj.name_get(cursor, user, account.id,
- context=context)[0]
+ res['account'] = account.id
+ res['account.rec_name'] = account.rec_name
if value.get('invoice'):
if value.get('party'):
@@ -358,8 +354,8 @@ class Line(OSV):
account = party.account_receivable
else:
account = party.account_payable
- res['account'] = account_obj.name_get(cursor, user, account.id,
- context=context)[0]
+ res['account'] = account.id
+ res['account.rec_name'] = account.rec_name
if value.get('invoice'):
if value.get('amount') and value.get('_parent_statement.journal'):
invoice = invoice_obj.browse(cursor, user, value['invoice'],
@@ -440,8 +436,9 @@ class Line(OSV):
break
lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
- amount = lang_obj.currency(lang, line.amount,
- line.statement.journal.currency, symbol=False, grouping=True)
+ amount = lang_obj.format(lang,
+ '%.' + str(line.statement.journal.currency.digits) + 'f',
+ line.amount, True)
self.raise_user_error(cursor,
'amount_greater_invoice_amount_to_pay',
error_args=(amount,), context=context)
diff --git a/statement.xml b/statement.xml
index 6cf4b13..48208e8 100644
--- a/statement.xml
+++ b/statement.xml
@@ -25,7 +25,7 @@ this repository contains the full copyright notices and license terms. -->
<label name="end_balance"/>
<field name="end_balance"/>
<notebook colspan="4">
- <page string="Statement Lines" col="4">
+ <page string="Statement Lines" col="4" id="statement_lines">
<field name="lines" colspan="4">
<tree string="Statement Lines" editable="bottom">
<field name="date"/>
@@ -36,7 +36,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="description"/>
</tree>
</field>
- <group col="6" colspan="4">
+ <group col="6" colspan="4" id="state_buttons">
<label name="state"/>
<field name="state"/>
<button string="Validate" name="validated"
@@ -50,7 +50,7 @@ this repository contains the full copyright notices and license terms. -->
states="{'invisible': '''state != 'cancel' '''}"/>
</group>
</page>
- <page string="Move Lines" col="1">
+ <page string="Move Lines" col="1" id="move_lines">
<field name="move_lines"/>
</page>
</notebook>
@@ -219,7 +219,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="workflow" ref="wkf_statement"/>
<field name="kind">function</field>
<field name="action">set_state_cancel()</field>
- <field name="name">Cancel</field>
+ <field name="name">Canceled</field>
<field name="flow_stop" eval="True"/>
</record>
<record model="workflow.transition" id="statement_trans_draft_validated">
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index c462778..99834af 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account-statement
-Version: 1.0.0
+Version: 1.2.0
Summary: Financial and Accounting Module with:
- Statement
- Statement journal
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 8e7ee5a..cf7c6a1 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
de_DE.csv
+es_CO.csv
es_ES.csv
fr_FR.csv
invoice.xml
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
index 7e8251d..eb42a2d 100644
--- a/trytond_account_statement.egg-info/requires.txt
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -3,5 +3,5 @@ trytond_company
trytond_currency
trytond_party
trytond_account_invoice
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
commit dc0dc4cce816748bcd3a9ec4bfbd42ff87f2f2ec
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Mar 28 16:22:14 2009 +0100
Releasing debian version 1.0.0-4.
diff --git a/debian/changelog b/debian/changelog
index 548c235..615ccb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (1.0.0-4) unstable; urgency=low
+
+ * Adding Mathias to uploaders.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 28 Mar 2009 16:21:00 +0100
+
tryton-modules-account-statement (1.0.0-3) unstable; urgency=low
* Updating standards to 3.8.1.
commit 2f4d9c489eec97dc1ace11e4888a43bc14512255
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Mar 28 16:13:15 2009 +0100
Adding Mathias to uploaders.
diff --git a/debian/control b/debian/control
index a09ad96..64755f0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: tryton-modules-account-statement
Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
+Uploaders: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
commit ad02e4791052b3acce5d30f00d17cd0a3f40e0ec
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 06:21:50 2009 +0100
Releasing debian version 1.0.0-3.
diff --git a/debian/changelog b/debian/changelog
index e49249c..548c235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-statement (1.0.0-3) unstable; urgency=low
+
+ * Updating standards to 3.8.1.
+ * Making package arch all as it should be (Closes: #520811).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 23 Mar 2009 06:21:00 +0100
+
tryton-modules-account-statement (1.0.0-2) unstable; urgency=low
* Correcting depends to tryton-modules-currency.
commit c3921cfcf95abc8efaaddbab11944c27ec806f18
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 06:21:06 2009 +0100
Making package arch all as it should be (Closes: #520811).
diff --git a/debian/control b/debian/control
index 5289d87..a09ad96 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.gi
Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
Package: tryton-modules-account-statement
-Architecture: any
+Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, tryton-modules-account-invoice, tryton-modules-company, tryton-modules-currency, tryton-modules-party, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
commit 871540e2dbf3c774e084399a3d97b5bbd88ed7cd
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 06:20:32 2009 +0100
Updating standards to 3.8.1.
diff --git a/debian/control b/debian/control
index cee4682..5289d87 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
Priority: optional
Maintainer: Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.git
Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
commit c0d29d2fa1216be81e94600697ba36cf6114384b
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 22 17:45:22 2009 +0100
Releasing debian version 1.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index c178811..e49249c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-statement (1.0.0-2) unstable; urgency=low
+
+ * Correcting depends to tryton-modules-currency.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 22 Mar 2009 17:45:00 +0100
+
tryton-modules-account-statement (1.0.0-1) unstable; urgency=low
* Initial release (Closes: #506095).
commit cc20e61f4d8d94ad829e78209bdc9869125c734d
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 22 17:44:44 2009 +0100
Correcting depends to tryton-modules-currency.
diff --git a/debian/control b/debian/control
index 37b86eb..cee4682 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
Package: tryton-modules-account-statement
Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, tryton-modules-account-invoice, tryton-modules-company, tryton-modules-currenty, tryton-modules-party, python-pkg-resources
+Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, tryton-modules-account-invoice, tryton-modules-company, tryton-modules-currency, tryton-modules-party, python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
commit 5d36cbb02e0d722382982f5e38a3c3962085fa90
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 12 21:29:47 2009 +0100
Adding debian version 1.0.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..0a72d70
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2009-05-01
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..da277a9
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,17 @@
+Copyright (C) 2004-2008 Tiny SPRL.
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 Bertrand Chenal.
+Copyright (C) 2008-2009 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..9fff72f
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,34 @@
+Installing trytond_account_statement
+====================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_account (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+ * trytond_currency (http://www.tryton.org/)
+ * trytond_account_invoice (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_account_statement source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+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://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name account_statement.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..7dac30b
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,28 @@
+Metadata-Version: 1.0
+Name: trytond_account_statement
+Version: 1.0.0
+Summary: Financial and Accounting Module with:
+ - Statement
+ - Statement journal
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/README b/README
new file mode 100644
index 0000000..aadcfdc
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_account_statement
+=========================
+
+The account_statement module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..b9e0b91
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+
+from journal import *
+from statement import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..3e5adbe
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,44 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Account Statement',
+ 'name_de_DE': 'Buchhaltung Bankauszüge',
+ 'name_es_ES': 'Estado de Cuentas',
+ 'name_fr_FR': 'Relevé comptable',
+ 'version': '1.0.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Financial and Accounting Module with:
+ - Statement
+ - Statement journal
+''',
+ 'description_de_DE': '''Modul für Buchhaltung und Bankauszüge mit
+ - Abstimmung von Bankauszügen und Rechnungen
+''',
+ 'description_es_ES': '''Módulo Financiero y Contable con:
+ - Estado de cuentas
+ - Diario de estado de cuentas
+''',
+ 'description_fr_FR': '''Module financier et comptable avec:
+ - Relevé
+ - Journal de relevés
+ ''',
+ 'depends': [
+ 'account',
+ 'company',
+ 'currency',
+ 'party',
+ 'account_invoice',
+ ],
+ 'xml': [
+ 'statement.xml',
+ 'journal.xml',
+ 'invoice.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..4517fed
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,62 @@
+type,name,res_id,src,value,fuzzy
+error,account.statement,0,End Balance must be %s!,Endsaldo muss %s sein!,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Haben- oder Sollkonto im Journal ist das selbe Konto wie das des Zahlungspostens!,0
+error,account.statement.line,0,Please provide debit and credit account on bank journal.,Bitte Soll- und Habenkonto für das Bankjournal eingeben.,0
+field,"account.statement,currency_digits",0,Currency Digits,Stellen Währung,0
+field,"account.statement,date",0,Date,Datum,0
+field,"account.statement,end_balance",0,End Balance,Endsaldo,0
+field,"account.statement,journal",0,Journal,Journal,0
+field,"account.statement.journal,company",0,Company,Unternehmen,0
+field,"account.statement.journal,currency",0,Currency,Währung,0
+field,"account.statement.journal,journal",0,Journal,Journal Zahlungsverkehr,1
+field,"account.statement.journal,name",0,Name,Name,0
+field,"account.statement.line,account",0,Account,Konto,0
+field,"account.statement.line,amount",0,Amount,Betrag,0
+field,"account.statement.line,date",0,Date,Datum,0
+field,"account.statement.line,description",0,Description,Beschreibung,0
+field,"account.statement.line,invoice",0,Invoice,Rechnung,0
+field,"account.statement.line,move",0,Account Move,Buchung,0
+field,"account.statement.line,party",0,Party,Partei,0
+field,"account.statement,lines",0,Transactions,Transaktionen,0
+field,"account.statement.line,statement",0,Statement,Zahlung,0
+field,"account.statement,move_lines",0,Move Lines,Buchungsposten,0
+field,"account.statement,start_balance",0,Start Balance,Anfangssaldo,0
+field,"account.statement,state",0,State,Status,0
+model,"account.journal.type,name",journal_type_bank,Statement,Zahlung,0
+model,"ir.action,name",act_statement_form,All Statement,Alle Zahlungen,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Alle Zahlungen,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Zahlungsentwürfe,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Festgeschriebene Zahlungen,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journale Zahlungsverkehr,0
+model,"ir.ui.menu,name",menu_statements,Statements,Zahlungen,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Zahlungen,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Geprüfte Zahlungen,0
+model,"res.group,name",group_statement,Statement,Zahlung,0
+model,"workflow.activity,name",statement_act_cancel,Cancel,Annullieren,0
+model,"workflow.activity,name",statement_act_draft,Draft,Entwurf,0
+model,"workflow.activity,name",statement_act_posted,Posted,Festgeschrieben,0
+model,"workflow.activity,name",statement_act_validated,Validated,Geprüft,0
+model,"workflow,name",wkf_statement,Statement,Zahlung,0
+selection,"account.statement,state",0,Cancel,Annulliert,0
+selection,"account.statement,state",0,Draft,Entwurf,0
+selection,"account.statement,state",0,Posted,Festgeschrieben,0
+selection,"account.statement,state",0,Validated,Geprüft,0
+view,account.statement,0,Bank Statement,Bankauszug,0
+view,account.statement,0,Bank Statement Lines,Posten Bankauszüge,0
+view,account.statement,0,Bank Statements,Bankauszüge,0
+view,account.statement,0,Cancel,Annullieren,0
+view,account.statement,0,Move Lines,Buchungsposten,0
+view,account.statement,0,Post,Festschreiben,0
+view,account.statement,0,Reset to Draft,Auf Entwurf zurücksetzen,0
+view,account.statement,0,Statement,Zahlung,0
+view,account.statement,0,Statement Lines,Zahlungsposten,0
+view,account.statement,0,Statements,Zahlungen,0
+view,account.statement,0,Validate,Prüfen,0
+view,account.statement.journal,0,Statement Journal,Journal Zahlungsverkehr,0
+view,account.statement.journal,0,Statement Journals,Journale Zahlungsverkehr,0
+view,account.statement.line,0,Bank Statement Line,Posten Bankauszüge,0
+view,account.statement.line,0,Statement Line,Zahlungsposten,0
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..c178811
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-account-statement (1.0.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #506095).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 12 Jan 2009 15:49:00 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..37b86eb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,22 @@
+Source: tryton-modules-account-statement
+Section: python
+Priority: optional
+Maintainer: Daniel Baumann <daniel at debian.org>
+Build-Depends: debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.0
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian.net/?p=debian/tryton-modules-account-statement.git
+Vcs-Git: git://git.debian.net/git/debian/tryton-modules-account-statement.git
+
+Package: tryton-modules-account-statement
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-account, tryton-modules-account-invoice, tryton-modules-company, tryton-modules-currenty, tryton-modules-party, python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Financial and Accounting Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of an ERP.
+ .
+ This package contains the financial and accounting module with:
+ .
+ * Statement
+ * Statement journal
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0088eff
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Author: Tryton Project <http://www.tryton.org/>
+Download: http://www.tryton.org/downloads.html
+
+Files: *
+Copyright:
+ (C) 2004-2008 Tiny SPRL
+ (C) 2008 Cedric Krier
+ (C) 2008 Bertrand Chenal
+ (C) 2008 B2CK SPRL
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..cdc9b97
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ python setup.py clean
+ rm -rf dist build trytond_account_statement.egg-info
+
+ dh_clean
+
+build:
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ python setup.py install --single-version-externally-managed --root=$(CURDIR)/debian/tryton-modules-account-statement --install-lib /usr/share/python-support/tryton-modules-account-statement
+
+ find debian/tryton-modules-account-statement -type f -name "*.pyc" | xargs rm -f
+
+binary: binary-indep
+
+binary-arch:
+
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGELOG
+ dh_installdocs
+ dh_pysupport
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+.PHONY: clean build install binary binary-arch binary-indep
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..2f0b99c
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,53 @@
+type,name,res_id,src,value,fuzzy
+error,account.statement,0,"Wrong End balance:
+ * Expected: %s
+ * Computed: %s",Balance Final erróneo:,0
+error,account.statement.line,0,Please provide debit and credit account on bank journal.,Por favor indique las cuentas débito y crédito para el libro diario de bancos.,0
+field,"account.statement,date",0,Date,Fecha,0
+field,"account.statement,end_balance",0,End Balance,Balance Final,0
+field,"account.statement,journal",0,Journal,Diario,0
+field,"account.statement.journal,company",0,Company,Compañía,0
+field,"account.statement.journal,currency",0,Currency,Moneda,0
+field,"account.statement.journal,journal",0,Bank Journal,Libro de Banco,0
+field,"account.statement.journal,name",0,Name,Nombre,0
+field,"account.statement.line,account",0,Account,Cuenta,0
+field,"account.statement.line,amount",0,Amount,Cantidad,0
+field,"account.statement.line,date",0,Date,Fecha,0
+field,"account.statement.line,description",0,Description,Descripción,0
+field,"account.statement.line,move",0,Account Move,Movimiento de Cuenta,0
+field,"account.statement.line,party",0,Party,Tercero,0
+field,"account.statement,lines",0,Transactions,Transacciones,0
+field,"account.statement.line,statement",0,Statement,Estado de Cuenta,0
+field,"account.statement,move_lines",0,Move Lines,Líneas de Movimiento,0
+field,"account.statement,start_balance",0,Start Balance,Balance Inicial,0
+field,"account.statement,state",0,State,Estado,0
+model,"account.journal.type,name",journal_type_bank,Bank,Banco,0
+model,"ir.action,name",act_statement_form,All Statement,Todos los estados de cuenta,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Borrador de Estados de Cuenta,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Libros de Estados de Cuenta,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Estados de Cuenta Validados,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Todos los estados de cuenta,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Estados de Cuenta en Borrador,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Estados de Cuenta Autorizados,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Diarios de Estados de Cuenta,0
+model,"ir.ui.menu,name",menu_statements,Statements,Estados de Cuenta,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Estados de Cuenta,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Estados de Cuenta Válidos,0
+selection,"account.statement,state",0,Cancel,Cancelar,0
+selection,"account.statement,state",0,Draft,Borrador,0
+selection,"account.statement,state",0,Posted,Confirmado,0
+selection,"account.statement,state",0,Validated,Validado,0
+view,account.statement,0,Bank Statement,Extractos Bancarios,0
+view,account.statement,0,Bank Statement Lines,Líneas de extracto bancario,0
+view,account.statement,0,Bank Statements,Extractos Bancarios,0
+view,account.statement,0,Cancel,Cancelar,0
+view,account.statement,0,Move Lines,Líneas de Movimiento,0
+view,account.statement,0,Post,Confirmar,0
+view,account.statement,0,Reset to Draft,Revertir a Borrador,0
+view,account.statement,0,Statement Lines,Líneas de Estado de Cuenta,0
+view,account.statement,0,Validate,Validar,0
+view,account.statement.journal,0,Statement Journal,Libro de Estados de Cuenta,0
+view,account.statement.journal,0,Statement Journals,Libros de Estados de Cuenta,0
+view,account.statement.line,0,Bank Statement Line,Línea de extracto bancario,0
+view,statement.statement.line,0,Statement Lines,Líneas de Estado de Cuenta,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..c504e61
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,59 @@
+type,name,res_id,src,value,fuzzy
+error,account.statement,0,End Balance must be %s!,Le solde final doit être %s !,0
+error,account.statement.line,0,Amount (%s) greater than the amount to pay of invoice!,Le montant (%s) est plus grand que le montant à payer de la facture !,0
+error,account.statement.line,0,Credit or debit account on journal is the same than the statement line account!,Le compte de crédit ou débit sur le journal est le même que celui de la ligne de relevé !,0
+error,account.statement.line,0,Please provide debit and credit account on statement journal.,Veuillez fournir un compte de débit et de crédit pour le journal de relevés.,0
+field,"account.statement,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"account.statement,date",0,Date,Date,0
+field,"account.statement,end_balance",0,End Balance,Solde final,0
+field,"account.statement,journal",0,Journal,Journal,0
+field,"account.statement.journal,company",0,Company,Compagnie,0
+field,"account.statement.journal,currency",0,Currency,Devise,0
+field,"account.statement.journal,journal",0,Journal,Journal,0
+field,"account.statement.journal,name",0,Name,Nom,0
+field,"account.statement.line,account",0,Account,Compte,0
+field,"account.statement.line,amount",0,Amount,Montant,0
+field,"account.statement.line,date",0,Date,Date,0
+field,"account.statement.line,description",0,Description,Description,0
+field,"account.statement.line,invoice",0,Invoice,Facture,0
+field,"account.statement.line,move",0,Account Move,Mouvement comptable,0
+field,"account.statement.line,party",0,Party,Tiers,0
+field,"account.statement,lines",0,Transactions,Transactions,0
+field,"account.statement.line,statement",0,Statement,Relevé,0
+field,"account.statement,move_lines",0,Move Lines,Lignes de mouvement comptable,0
+field,"account.statement,start_balance",0,Start Balance,Solde de départ,0
+field,"account.statement,state",0,State,État,0
+model,"account.journal.type,name",journal_type_statement,Statement,Relevé,0
+model,"ir.action,name",act_statement_form,All Statement,Tous les relevés,0
+model,"ir.action,name",act_draft_statement_form,Draft Statements,Relevés brouillons,0
+model,"ir.action,name",act_posted_statement_form,Posted Statements,Relevés postés,0
+model,"ir.action,name",act_statement_journal_form,Statement Journals,Journaux de relevés,0
+model,"ir.action,name",act_validated_statement_form,Validated Statement,Relevés validés,0
+model,"ir.ui.menu,name",menu_statement_form,All Statement,Tous les relevés,0
+model,"ir.ui.menu,name",menu_draft_statement_form,Draft Statements,Relevés brouillons,0
+model,"ir.ui.menu,name",menu_posted_statement_form,Posted Statements,Relevés postés,0
+model,"ir.ui.menu,name",menu_statement_journal_form,Statement Journals,Journaux de relevés,0
+model,"ir.ui.menu,name",menu_statements,Statements,Relevés,0
+model,"ir.ui.menu,name",menu_statement_configuration,Statements,Relevés,0
+model,"ir.ui.menu,name",menu_validated_statement_form,Validated Statement,Relevés validés,0
+model,"res.group,name",group_statement,Statement,Relevé,0
+model,"workflow.activity,name",statement_act_cancel,Cancel,Annulé,0
+model,"workflow.activity,name",statement_act_draft,Draft,Brouillon,0
+model,"workflow.activity,name",statement_act_posted,Posted,Posté,0
+model,"workflow.activity,name",statement_act_validated,Validated,Validé,0
+model,"workflow,name",wkf_statement,Statement,Relevé,0
+selection,"account.statement,state",0,Cancel,Annuler,0
+selection,"account.statement,state",0,Draft,Brouillon,0
+selection,"account.statement,state",0,Posted,Posté,0
+selection,"account.statement,state",0,Validated,Validé,0
+view,account.statement,0,Cancel,Annuler,0
+view,account.statement,0,Move Lines,Lignes de mouvement comptable,0
+view,account.statement,0,Post,Poster,0
+view,account.statement,0,Reset to Draft,Remetter en brouillon,0
+view,account.statement,0,Statement,Relevé,0
+view,account.statement,0,Statement Lines,Lignes de relevé,0
+view,account.statement,0,Statements,Relevés,0
+view,account.statement,0,Validate,Valider,0
+view,account.statement.journal,0,Statement Journal,Journal de relevés,0
+view,account.statement.journal,0,Statement Journals,Journaux de relevés,0
+view,account.statement.line,0,Statement Line,Ligne de relevé,0
diff --git a/invoice.xml b/invoice.xml
new file mode 100644
index 0000000..b11c50e
--- /dev/null
+++ b/invoice.xml
@@ -0,0 +1,22 @@
+<?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. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="invoice_view_form">
+ <field name="model">account.invoice</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="account_invoice.invoice_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page/group/group/button[@name="%(account_invoice.wizard_pay_invoice)d"]"
+ position="replace">
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/journal.py b/journal.py
new file mode 100644
index 0000000..0051fc4
--- /dev/null
+++ b/journal.py
@@ -0,0 +1,36 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Statement Journal"
+
+from trytond.osv import fields, OSV
+
+
+class Journal(OSV):
+ 'Statement Journal'
+ _name = 'account.statement.journal'
+ _description = __doc__
+
+ name = fields.Char('Name', required=True)
+ journal = fields.Many2One('account.journal', 'Journal', required=True,
+ domain="[('type', '=', 'statement')]")
+ currency = fields.Many2One('currency.currency', 'Currency', required=True)
+ company = fields.Many2One('company.company', 'Company', required=True)
+
+ def default_currency(self, cursor, user, context=None):
+ if context and context.get('company'):
+ company_obj = self.pool.get('company.company')
+ currency_obj = self.pool.get('currency.currency')
+ company = company_obj.browse(cursor, user, context['company'],
+ context=context)
+ return currency_obj.name_get(cursor, user, company.currency.id,
+ context=context)[0]
+ return False
+
+ def default_company(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context and context.get('company'):
+ return company_obj.name_get(cursor, user, context['company'],
+ context=context)[0]
+ return False
+
+Journal()
diff --git a/journal.xml b/journal.xml
new file mode 100644
index 0000000..899ec9c
--- /dev/null
+++ b/journal.xml
@@ -0,0 +1,78 @@
+<?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. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="statement_journal_view_form">
+ <field name="model">account.statement.journal</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Statement Journal">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="journal"/>
+ <field name="journal"/>
+ <label name="currency"/>
+ <field name="currency"/>
+ <label name="company"/>
+ <field name="company"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="statement_journal_view_tree">
+ <field name="model">account.statement.journal</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Statement Journals">
+ <field name="name" select="1"/>
+ <field name="journal" select="2"/>
+ <field name="currency" select="2"/>
+ <field name="company" select="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="account.journal.type" id="journal_type_statement">
+ <field name="name">Statement</field>
+ <field name="code">statement</field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_statement_journal_form">
+ <field name="name">Statement Journals</field>
+ <field name="res_model">account.statement.journal</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_statement_journal_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_journal_view_tree"/>
+ <field name="act_window" ref="act_statement_journal_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_statement_journal_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_journal_view_form"/>
+ <field name="act_window" ref="act_statement_journal_form"/>
+ </record>
+ <menuitem parent="menu_statement_configuration" sequence="1"
+ action="act_statement_journal_form" id="menu_statement_journal_form"/>
+
+ <record model="ir.model.access" id="access_statement_journal">
+ <field name="model" search="[('model', '=', 'account.statement.journal')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_statement_journal_admin">
+ <field name="model" search="[('model', '=', 'account.statement.journal')]"/>
+ <field name="group" ref="account.group_account_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..da1d31e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_account_statement',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.account_statement': '.'},
+ packages=[
+ 'trytond.modules.account_statement',
+ ],
+ package_data={
+ 'trytond.modules.account_statement': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ 'Topic :: Office/Business :: Financial :: Accounting',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ account_statement = trytond.modules.account_statement
+ """,
+)
diff --git a/statement.py b/statement.py
new file mode 100644
index 0000000..ad8b345
--- /dev/null
+++ b/statement.py
@@ -0,0 +1,539 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Statement"
+
+from trytond.osv import fields, OSV
+from trytond.netsvc import LocalService
+from decimal import Decimal
+
+_STATES = {'readonly': 'state != "draft"'}
+
+
+class Statement(OSV):
+ 'Account Statement'
+ _name = 'account.statement'
+ _description = __doc__
+
+ journal = fields.Many2One('account.statement.journal', 'Journal', required=True,
+ states={
+ 'readonly': "(state != 'draft') or (bool(lines))",
+ }, on_change=['journal'], select=1)
+ currency_digits = fields.Function('get_currency_digits', type='integer',
+ string='Currency Digits', on_change_with=['journal'])
+ date = fields.Date('Date', required=True, states=_STATES, select=1)
+ start_balance = fields.Numeric('Start Balance', digits=(16, 2),
+ states=_STATES)
+ end_balance = fields.Numeric('End Balance', digits=(16, 2), states=_STATES)
+ lines = fields.One2Many('account.statement.line', 'statement',
+ 'Transactions', states={
+ 'readonly': "(state != 'draft') or (not bool(journal))",
+ }, on_change=['lines', 'journal'])
+ state = fields.Selection([
+ ('draft', 'Draft'),
+ ('validated', 'Validated'),
+ ('cancel', 'Cancel'),
+ ('posted', 'Posted'),
+ ], 'State', readonly=True, select=1)
+ move_lines = fields.Function('get_move_lines', type='one2many',
+ relation='account.move.line', string='Move Lines')
+
+ def __init__(self):
+ super(Statement, self).__init__()
+ self._rpc_allowed += [
+ 'draft_workflow',
+ ]
+ self._order[0] = ('id', 'DESC')
+ self._error_messages.update({
+ 'wrong_end_balance': 'End Balance must be %s!',
+ })
+
+ def default_state(self, cursor, user, context=None):
+ return 'draft'
+
+ def default_date(self, cursor, user, context=None):
+ date_obj = self.pool.get('ir.date')
+ return date_obj.today(cursor, user, context=context)
+
+ def default_currency_digits(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context is None:
+ context = {}
+ if context.get('company'):
+ company = company_obj.browse(cursor, user, context['company'],
+ context=context)
+ return company.currency.digits
+ return 2
+
+ def on_change_journal(self, cursor, user, ids, value, context=None):
+ res = {}
+ if not value.get('journal'):
+ return res
+
+ statement_ids = self.search(cursor, user, [
+ ('journal', '=', value['journal']),
+ ], order=[
+ ('date', 'DESC'),
+ ], limit=1, context=context)
+ if not statement_ids:
+ return res
+
+ statement = self.browse(cursor, user, statement_ids[0], context=context)
+ res['start_balance'] = statement.end_balance
+ return res
+
+ def on_change_with_currency_digits(self, cursor, user, ids, vals,
+ context=None):
+ journal_obj = self.pool.get('account.statement.journal')
+ if vals.get('journal'):
+ journal = journal_obj.browse(cursor, user, vals['journal'],
+ context=context)
+ return journal.currency.digits
+ return 2
+
+ def get_currency_digits(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for statement in self.browse(cursor, user, ids, context=context):
+ res[statement.id] = statement.journal.currency.digits
+ return res
+
+ def name_get(self, cursor, user, ids, context=None):
+ lang_obj = self.pool.get('ir.lang')
+
+ if context is None:
+ context = {}
+
+ if not ids:
+ return []
+
+ for code in [context.get('language', False) or 'en_US', 'en_US']:
+ lang_ids = lang_obj.search(cursor, user, [
+ ('code', '=', code),
+ ], context=context)
+ if lang_ids:
+ break
+ lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ res = []
+ for statement in self.browse(cursor, user, ids, context=context):
+ res.append((statement.id, statement.journal.name + ' ' + \
+ lang.currency(lang, statement.start_balance,
+ statement.journal.currency, symbol=False,
+ grouping=True) + \
+ lang.currency(lang, statement.end_balance,
+ statement.journal.currency, symbol=False,
+ grouping=True)))
+ return res
+
+ def name_search(self, cursor, user, name='', args=None, operator='ilike',
+ context=None, limit=None):
+ if args is None:
+ args = []
+ ids = []
+ if name:
+ ids = self.search(cursor, user, [['OR',
+ ('journal', operator, name),
+ ('start_balance', operator, name),
+ ('end_balance', operator, name),
+ ], args], limit=limit, context=context)
+ return self.name_get(cursor, user, ids, context=context)
+
+ def get_move_lines(self, cursor, user, ids, name, args, context=None):
+ '''
+ Return the move lines that have been generated by the statements.
+ '''
+ res = {}
+ for statement in self.browse(cursor, user, ids, context=context):
+ res[statement.id] = []
+ for line in statement.lines:
+ if not line.move:
+ continue
+ for move_line in line.move.lines:
+ res[statement.id].append(move_line.id)
+ return res
+
+ def get_end_balance(self, cursor, user, ids, name, arg, context=None):
+ statements = self.browse(cursor, user, ids, context=context)
+ res = {}
+ for statement in statements:
+ res[statement.id] = statement.start_balance
+ for line in statement.lines:
+ res[statement.id] += line.amount
+ return res
+
+ def on_change_lines(self, cursor, user, ids, values, context=None):
+ invoice_obj = self.pool.get('account.invoice')
+ journal_obj = self.pool.get('account.statement.journal')
+ currency_obj = self.pool.get('currency.currency')
+ res = {
+ 'lines': {},
+ }
+ if values.get('journal') and values.get('lines'):
+ journal = journal_obj.browse(cursor, user, values['journal'],
+ context=context)
+ invoice_ids = set()
+ for line in values['lines']:
+ if line['invoice']:
+ invoice_ids.add(line['invoice'])
+ invoice_id2amount_to_pay = {}
+ for invoice in invoice_obj.browse(cursor, user, invoice_ids,
+ context=context):
+ invoice_id2amount_to_pay[invoice.id] = currency_obj.compute(
+ cursor, user, invoice.currency, invoice.amount_to_pay,
+ journal.currency, context=context)
+
+ for line in values['lines']:
+ if line['invoice'] and line['id']:
+ amount_to_pay = invoice_id2amount_to_pay[line['invoice']]
+ if abs(line['amount']) > amount_to_pay:
+ res['lines'].setdefault('update', [])
+ if currency_obj.is_zero(cursor, user, journal.currency,
+ amount_to_pay):
+ res['lines']['update'].append({
+ 'id': line['id'],
+ 'invoice': False,
+ })
+ else:
+ res['lines']['update'].append({
+ 'id': line['id'],
+ 'amount': amount_to_pay,
+ })
+ res['lines'].setdefault('add', [])
+ vals = line.copy()
+ del vals['id']
+ vals['amount'] = abs(line['amount']) - amount_to_pay
+ if line['amount'] < 0:
+ vals['amount'] = - vals['amount']
+ vals['invoice'] = False
+ res['lines']['add'].append(vals)
+ invoice_id2amount_to_pay[line['invoice']] = \
+ amount_to_pay - abs(line['amount'])
+ return res
+
+ def set_state_validated(self, cursor, user, statement_id, context=None):
+ statement_line_obj = self.pool.get('account.statement.line')
+ lang_obj = self.pool.get('ir.lang')
+
+ if context is None:
+ context = {}
+
+ statement = self.browse(cursor, user, statement_id, context=context)
+
+ computed_end_balance = statement.start_balance
+ for line in statement.lines:
+ computed_end_balance += line.amount
+ if computed_end_balance != statement.end_balance:
+ for code in [context.get('language', False) or 'en_US', 'en_US']:
+ lang_ids = lang_obj.search(cursor, user, [
+ ('code', '=', code),
+ ], context=context)
+ if lang_ids:
+ break
+ lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+
+ amount = lang_obj.currency(lang, computed_end_balance,
+ statement.journal.currency, symbol=False, grouping=True)
+ self.raise_user_error(cursor, 'wrong_end_balance',
+ error_args=(amount,), context=context)
+ for line in statement.lines:
+ statement_line_obj.create_move(cursor, user, line, context=context)
+ self.write(cursor, user, statement_id, {
+ 'state':'validated',
+ }, context=context)
+
+ def set_state_posted(self, cursor, user, statement_id, context=None):
+ statement_line_obj = self.pool.get('account.statement.line')
+
+ statement = self.browse(cursor, user, statement_id, context=context)
+ statement_line_obj.post_move(cursor, user, statement.lines,
+ context=context)
+ self.write(cursor, user, statement_id, {
+ 'state':'posted',
+ }, context=context)
+
+ def set_state_cancel(self, cursor, user, statement_id, context=None):
+ statement_line_obj = self.pool.get('account.statement.line')
+
+ statement = self.browse(cursor, user, statement_id, context=context)
+ statement_line_obj.delete_move(cursor, user, statement.lines,
+ context=context)
+ self.write(cursor, user, statement_id, {
+ 'state':'cancel',
+ }, context=context)
+
+ def draft_workflow(self, cursor, user, ids, context=None):
+ workflow_service = LocalService('workflow')
+ for statement in self.browse(cursor, user, ids, context=context):
+ workflow_service.trg_create(user, self._name, statement.id, cursor,
+ context=context)
+ self.write(cursor, user, statement.id, {
+ 'state': 'draft',
+ }, context=context)
+ return True
+
+Statement()
+
+
+class Line(OSV):
+ 'Account Statement Line'
+ _name = 'account.statement.line'
+ _description = __doc__
+
+ statement = fields.Many2One('account.statement', 'Statement',
+ required=True, ondelete='CASCADE')
+ date = fields.Date('Date', required=True)
+ amount = fields.Numeric('Amount', required=True,
+ digits="(16, _parent_statement.currency_digits)",
+ on_change=['amount', 'party', 'account', 'invoice',
+ '_parent_statement.journal'])
+ party = fields.Many2One('party.party', 'Party',
+ on_change=['amount', 'party', 'invoice'])
+ account = fields.Many2One('account.account', 'Account', required=True,
+ on_change=['account', 'invoice'])
+ description = fields.Char('Description')
+ move = fields.Many2One('account.move', 'Account Move', readonly=True)
+ invoice = fields.Many2One('account.invoice', 'Invoice',
+ domain="[('party', '=', party), ('account', '=', account)] " \
+ "+ (_parent_statement.state == 'draft' and " \
+ "[('state', '=', 'open')] or [])",
+ states={
+ 'readonly': "not bool(amount)",
+ })
+
+ def __init__(self):
+ super(Line, self).__init__()
+ self._error_messages.update({
+ 'debit_credit_account_statement_journal': 'Please provide debit and ' \
+ 'credit account on statement journal.',
+ 'same_debit_credit_account': 'Credit or debit account on ' \
+ 'journal is the same than the statement line account!',
+ 'amount_greater_invoice_amount_to_pay': 'Amount (%s) greater than '\
+ 'the amount to pay of invoice!',
+ })
+
+ def on_change_party(self, cursor, user, ids, value, context=None):
+ party_obj = self.pool.get('party.party')
+ account_obj = self.pool.get('account.account')
+ invoice_obj = self.pool.get('account.invoice')
+ res = {}
+
+ if value.get('party'):
+ party = party_obj.browse(cursor, user, value['party'],
+ context=context)
+ if value.get('amount'):
+ if value['amount'] > Decimal("0.0"):
+ account = party.account_receivable
+ else:
+ account = party.account_payable
+ res['account'] = account_obj.name_get(cursor, user, account.id,
+ context=context)[0]
+
+ if value.get('invoice'):
+ if value.get('party'):
+ invoice = invoice_obj.browse(cursor, user, value['invoice'],
+ context=context)
+ if invoice.party != value['party']:
+ res['invoice'] = False
+ else:
+ res['invoice'] = False
+ return res
+
+ def on_change_amount(self, cursor, user, ids, value, context=None):
+ party_obj = self.pool.get('party.party')
+ account_obj = self.pool.get('account.account')
+ invoice_obj = self.pool.get('account.invoice')
+ journal_obj = self.pool.get('account.statement.journal')
+ currency_obj = self.pool.get('currency.currency')
+ res = {}
+
+ if value.get('party'):
+ party = party_obj.browse(cursor, user, value['party'], context=context)
+ if value.get('account') and value['account'] not in (
+ party.account_receivable.id, party.account_payable.id):
+ # The user has entered a non-default value, we keep it.
+ pass
+ elif value.get('amount'):
+ if value['amount'] > Decimal("0.0"):
+ account = party.account_receivable
+ else:
+ account = party.account_payable
+ res['account'] = account_obj.name_get(cursor, user, account.id,
+ context=context)[0]
+ if value.get('invoice'):
+ if value.get('amount') and value.get('_parent_statement.journal'):
+ invoice = invoice_obj.browse(cursor, user, value['invoice'],
+ context=context)
+ journal = journal_obj.browse(cursor, user,
+ value['_parent_statement.journal'], context=context)
+ amount_to_pay = currency_obj.compute(cursor, user,
+ invoice.currency, invoice.amount_to_pay,
+ journal.currency, context=context)
+ if abs(value['amount']) > amount_to_pay:
+ res['invoice'] = False
+ else:
+ res['invoice'] = False
+ return res
+
+ def on_change_account(self, cursor, user, ids, value, context=None):
+ invoice_obj = self.pool.get('account.invoice')
+ res = {}
+
+ if value.get('invoice'):
+ if value.get('account'):
+ invoice = invoice_obj.browse(cursor, user, value['invoice'],
+ context=context)
+ if invoice.account.id != value['account']:
+ res['invoice'] = False
+ else:
+ res['invoice'] = False
+ return res
+
+ def create_move(self, cursor, user, line, context=None):
+ '''
+ Create move for the statement line
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param line: a BrowseRecord of the line
+ :param context: the contest
+ :return: the move id
+ '''
+ move_obj = self.pool.get('account.move')
+ period_obj = self.pool.get('account.period')
+ invoice_obj = self.pool.get('account.invoice')
+ currency_obj = self.pool.get('currency.currency')
+ move_line_obj = self.pool.get('account.move.line')
+ lang_obj = self.pool.get('ir.lang')
+
+ if context is None:
+ context = {}
+
+ period_id = period_obj.find(cursor, user,
+ line.statement.journal.company.id, date=line.date,
+ context=context)
+
+ move_lines = self._get_move_lines(cursor, user, line, context=context)
+ move_id = move_obj.create(cursor, user, {
+ 'name': line.date,
+ 'period': period_id,
+ 'journal': line.statement.journal.journal.id,
+ 'date': line.date,
+ 'lines': [('create', x) for x in move_lines],
+ }, context=context)
+
+ self.write(cursor, user, line.id, {
+ 'move': move_id,
+ }, context=context)
+
+ if line.invoice:
+
+ amount_to_pay = currency_obj.compute(cursor, user,
+ line.invoice.currency, line.invoice.amount_to_pay,
+ line.statement.journal.currency, context=context)
+ if amount_to_pay < abs(line.amount):
+ for code in [context.get('language', False) or 'en_US', 'en_US']:
+ lang_ids = lang_obj.search(cursor, user, [
+ ('code', '=', code),
+ ], context=context)
+ if lang_ids:
+ break
+ lang = lang_obj.browse(cursor, user, lang_ids[0], context=context)
+
+ amount = lang_obj.currency(lang, line.amount,
+ line.statement.journal.currency, symbol=False, grouping=True)
+ self.raise_user_error(cursor,
+ 'amount_greater_invoice_amount_to_pay',
+ error_args=(amount,), context=context)
+
+ amount = currency_obj.compute(cursor, user,
+ line.statement.journal.currency, line.amount,
+ line.statement.journal.company.currency,
+ context=context)
+
+ reconcile_lines = invoice_obj.get_reconcile_lines_for_amount(cursor,
+ user, line.invoice, abs(amount))
+
+ move = move_obj.browse(cursor, user, move_id, context=context)
+ line_id = None
+ for move_line in move.lines:
+ if move_line.account.id == line.invoice.account.id:
+ line_id = move_line.id
+ invoice_obj.write(cursor, user, line.invoice.id, {
+ 'payment_lines': [('add', line_id)],
+ }, context=context)
+ break
+ if reconcile_lines[1] == Decimal('0.0'):
+ line_ids = reconcile_lines[0] + [line_id]
+ move_line_obj.reconcile(cursor, user, line_ids, context=context)
+ return move_id
+
+ def post_move(self, cursor, user, lines, context=None):
+ move_obj = self.pool.get('account.move')
+ move_obj.post(cursor, user, [l.move.id for l in lines if l.move],
+ context=context)
+
+ def delete_move(self, cursor, user, lines, context=None):
+ move_obj = self.pool.get('account.move')
+ move_obj.delete(cursor, user, [l.move.id for l in lines if l.move],
+ context=context)
+
+ def _get_move_lines(self, cursor, user, statement_line, context=None):
+ '''
+ Return the values of the move lines for the statement line
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param statement_line: a BrowseRecord of the statement line
+ :param context: the context
+ :return: a list of dictionary of move line values
+ '''
+ currency_obj = self.pool.get('currency.currency')
+ zero = Decimal("0.0")
+ amount = currency_obj.compute(
+ cursor, user, statement_line.statement.journal.currency,
+ statement_line.amount,
+ statement_line.statement.journal.company.currency, context=context)
+ if statement_line.statement.journal.currency.id != \
+ statement_line.statement.journal.company.currency.id:
+ second_currency = statement_line.statement.journal.currency.id
+ amount_second_currency = abs(statement_line.amount)
+ else:
+ amount_second_currency = False
+ second_currency = None
+
+ vals = []
+ vals.append({
+ 'name': statement_line.date,
+ 'debit': amount < zero and -amount or zero,
+ 'credit': amount >= zero and amount or zero,
+ 'account': statement_line.account.id,
+ 'party': statement_line.party and statement_line.party.id,
+ 'second_currency': second_currency,
+ 'amount_second_currency': amount_second_currency,
+ })
+
+ journal = statement_line.statement.journal.journal
+ if statement_line.amount >= zero:
+ account = journal.credit_account
+ else:
+ account = journal.debit_account
+ if not account:
+ self.raise_user_error(cursor,
+ 'debit_credit_account_statement_journal',
+ context=context)
+ if statement_line.account.id == account.id:
+ self.raise_user_error(cursor, 'same_debit_credit_account',
+ context=context)
+ vals.append({
+ 'name': statement_line.date,
+ 'debit': amount >= zero and amount or zero,
+ 'credit': amount < zero and -amount or zero,
+ 'account': account.id,
+ 'party': statement_line.party and statement_line.party.id,
+ 'second_currency': second_currency,
+ 'amount_second_currency': amount_second_currency,
+ })
+ return vals
+
+Line()
diff --git a/statement.xml b/statement.xml
new file mode 100644
index 0000000..6cf4b13
--- /dev/null
+++ b/statement.xml
@@ -0,0 +1,295 @@
+<?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. -->
+<tryton>
+ <data>
+ <record model="res.group" id="group_statement">
+ <field name="name">Statement</field>
+ </record>
+ <menuitem name="Statements" parent="account.menu_account"
+ id="menu_statements" sequence="45"/>
+ <menuitem name="Statements" parent="account.menu_account_configuration"
+ id="menu_statement_configuration" sequence="70"/>
+ <record model="ir.ui.view" id="statement_view_form">
+ <field name="model">account.statement</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Statement">
+ <label name="journal"/>
+ <field name="journal"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="start_balance"/>
+ <field name="start_balance"/>
+ <label name="end_balance"/>
+ <field name="end_balance"/>
+ <notebook colspan="4">
+ <page string="Statement Lines" col="4">
+ <field name="lines" colspan="4">
+ <tree string="Statement Lines" editable="bottom">
+ <field name="date"/>
+ <field name="amount"/>
+ <field name="party"/>
+ <field name="account"/>
+ <field name="invoice"/>
+ <field name="description"/>
+ </tree>
+ </field>
+ <group col="6" colspan="4">
+ <label name="state"/>
+ <field name="state"/>
+ <button string="Validate" name="validated"
+ states="{'invisible': '''state != 'draft' '''}"/>
+ <button string="Cancel" name="cancel"
+ states="{'invisible': '''state != 'validated' '''}"/>
+ <button string="Post" name="posted"
+ states="{'invisible': '''state != 'validated' '''}"/>
+ <button string="Reset to Draft" name="draft_workflow"
+ type="object"
+ states="{'invisible': '''state != 'cancel' '''}"/>
+ </group>
+ </page>
+ <page string="Move Lines" col="1">
+ <field name="move_lines"/>
+ </page>
+ </notebook>
+ <field name="currency_digits" colspan="4" invisible="1"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="statement_view_tree">
+ <field name="model">account.statement</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Statements">
+ <field name="journal"/>
+ <field name="date"/>
+ <field name="start_balance"/>
+ <field name="end_balance"/>
+ <field name="state"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.action.act_window" id="act_draft_statement_form">
+ <field name="name">Draft Statements</field>
+ <field name="res_model">account.statement</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('state', '=', 'draft')]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_draft_statement_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_view_tree"/>
+ <field name="act_window" ref="act_draft_statement_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_draft_statement_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_view_form"/>
+ <field name="act_window" ref="act_draft_statement_form"/>
+ </record>
+ <menuitem parent="menu_statements" sequence="1"
+ action="act_draft_statement_form" id="menu_draft_statement_form"/>
+
+ <record model="ir.action.act_window" id="act_validated_statement_form">
+ <field name="name">Validated Statement</field>
+ <field name="res_model">account.statement</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('state', '=', 'validated')]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_validated_statement_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_view_tree"/>
+ <field name="act_window" ref="act_validated_statement_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_validated_statement_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_view_form"/>
+ <field name="act_window" ref="act_validated_statement_form"/>
+ </record>
+ <menuitem parent="menu_statements" sequence="2"
+ action="act_validated_statement_form" id="menu_validated_statement_form"/>
+
+ <record model="ir.action.act_window" id="act_posted_statement_form">
+ <field name="name">Posted Statements</field>
+ <field name="res_model">account.statement</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('state', '=', 'posted')]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_posted_statement_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_view_tree"/>
+ <field name="act_window" ref="act_posted_statement_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_posted_statement_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_view_form"/>
+ <field name="act_window" ref="act_posted_statement_form"/>
+ </record>
+ <menuitem parent="menu_statements" sequence="3"
+ action="act_posted_statement_form" id="menu_posted_statement_form"/>
+
+ <record model="ir.action.act_window" id="act_statement_form">
+ <field name="name">All Statement</field>
+ <field name="res_model">account.statement</field>
+ <field name="view_type">form</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_statement_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="statement_view_tree"/>
+ <field name="act_window" ref="act_statement_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_statement_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="statement_view_form"/>
+ <field name="act_window" ref="act_statement_form"/>
+ </record>
+ <menuitem parent="menu_statements" sequence="4"
+ action="act_statement_form" id="menu_statement_form"/>
+
+ <record model="ir.ui.view" id="statement_line_view_form">
+ <field name="model">account.statement.line</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Statement Line">
+ <label name="date"/>
+ <field name="date"/>
+ <label name="amount"/>
+ <field name="amount"/>
+ <label name="party"/>
+ <field name="party"/>
+ <label name="account"/>
+ <field name="account"/>
+ <label name="invoice"/>
+ <field name="invoice"/>
+ <newline/>
+ <label name="description"/>
+ <field name="description" colspan="3"/>
+ <label name="move"/>
+ <field name="move"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="statement_line_view_tree">
+ <field name="model">statement.statement.line</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Statement Lines">
+ <field name="date"/>
+ <field name="amount"/>
+ <field name="party"/>
+ <field name="account"/>
+ <field name="invoice"/>
+ <field name="description"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <!-- Statement workflow -->
+ <record model="workflow" id="wkf_statement">
+ <field name="name">Statement</field>
+ <field name="osv">account.statement</field>
+ <field name="on_create">True</field>
+ </record>
+ <record model="workflow.activity" id="statement_act_draft">
+ <field name="workflow" ref="wkf_statement"/>
+ <field name="flow_start">True</field>
+ <field name="name">Draft</field>
+ </record>
+ <record model="workflow.activity" id="statement_act_validated">
+ <field name="workflow" ref="wkf_statement"/>
+ <field name="kind">function</field>
+ <field name="action">set_state_validated()</field>
+ <field name="name">Validated</field>
+ </record>
+ <record model="workflow.activity" id="statement_act_posted">
+ <field name="workflow" ref="wkf_statement"/>
+ <field name="kind">function</field>
+ <field name="action">set_state_posted()</field>
+ <field name="name">Posted</field>
+ <field name="flow_stop" eval="True"/>
+ </record>
+ <record model="workflow.activity" id="statement_act_cancel">
+ <field name="workflow" ref="wkf_statement"/>
+ <field name="kind">function</field>
+ <field name="action">set_state_cancel()</field>
+ <field name="name">Cancel</field>
+ <field name="flow_stop" eval="True"/>
+ </record>
+ <record model="workflow.transition" id="statement_trans_draft_validated">
+ <field name="act_from" ref="statement_act_draft"/>
+ <field name="act_to" ref="statement_act_validated"/>
+ <field name="group" ref="account.group_account"/>
+ <field name="signal">validated</field>
+ </record>
+ <record model="workflow.transition" id="statement_trans_validated_posted">
+ <field name="act_from" ref="statement_act_validated"/>
+ <field name="act_to" ref="statement_act_posted"/>
+ <field name="group" ref="account.group_account"/>
+ <field name="signal">posted</field>
+ </record>
+ <record model="workflow.transition" id="statement_trans_validated_cancel">
+ <field name="act_from" ref="statement_act_validated"/>
+ <field name="act_to" ref="statement_act_cancel"/>
+ <field name="group" ref="account.group_account_admin"/>
+ <field name="signal">cancel</field>
+ </record>
+
+ <record model="ir.model.access" id="access_statement_account_admin">
+ <field name="model" search="[('model', '=', 'account.statement')]"/>
+ <field name="group" ref="account.group_account_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+ <record model="ir.model.access" id="access_statement_account">
+ <field name="model" search="[('model', '=', 'account.statement')]"/>
+ <field name="group" ref="account.group_account"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+ <record model="ir.model.access" id="access_statement_statement">
+ <field name="model" search="[('model', '=', 'account.statement')]"/>
+ <field name="group" ref="group_statement"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.model.access" id="access_statement_line_account_admin">
+ <field name="model" search="[('model', '=', 'account.statement.line')]"/>
+ <field name="group" ref="account.group_account_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+ <record model="ir.model.access" id="access_statement_line_account">
+ <field name="model" search="[('model', '=', 'account.statement.line')]"/>
+ <field name="group" ref="account.group_account"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+ <record model="ir.model.access" id="access_statement_line_statement">
+ <field name="model" search="[('model', '=', 'account.statement.line')]"/>
+ <field name="group" ref="group_statement"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
new file mode 100644
index 0000000..c462778
--- /dev/null
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -0,0 +1,28 @@
+Metadata-Version: 1.0
+Name: trytond-account-statement
+Version: 1.0.0
+Summary: Financial and Accounting Module with:
+ - Statement
+ - Statement journal
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
new file mode 100644
index 0000000..8e7ee5a
--- /dev/null
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -0,0 +1,24 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+invoice.xml
+journal.xml
+setup.py
+statement.xml
+./__init__.py
+./__tryton__.py
+./journal.py
+./statement.py
+trytond_account_statement.egg-info/PKG-INFO
+trytond_account_statement.egg-info/SOURCES.txt
+trytond_account_statement.egg-info/dependency_links.txt
+trytond_account_statement.egg-info/entry_points.txt
+trytond_account_statement.egg-info/not-zip-safe
+trytond_account_statement.egg-info/requires.txt
+trytond_account_statement.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_account_statement.egg-info/dependency_links.txt b/trytond_account_statement.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_account_statement.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_account_statement.egg-info/entry_points.txt b/trytond_account_statement.egg-info/entry_points.txt
new file mode 100644
index 0000000..2ca4f5e
--- /dev/null
+++ b/trytond_account_statement.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ account_statement = trytond.modules.account_statement
+
\ No newline at end of file
diff --git a/trytond_account_statement.egg-info/not-zip-safe b/trytond_account_statement.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_account_statement.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_account_statement.egg-info/requires.txt b/trytond_account_statement.egg-info/requires.txt
new file mode 100644
index 0000000..7e8251d
--- /dev/null
+++ b/trytond_account_statement.egg-info/requires.txt
@@ -0,0 +1,7 @@
+trytond_account
+trytond_company
+trytond_currency
+trytond_party
+trytond_account_invoice
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_account_statement.egg-info/top_level.txt b/trytond_account_statement.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_account_statement.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-account-statement
More information about the tryton-debian-vcs
mailing list