From dea96eae34a9d55c73f34a740654fe999c7bfedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:18:57 +0200 Subject: [PATCH 01/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6b6e24b027..7a3939a664 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@b2ck.com', 'website': 'http://www.tryton.org/', From cfbbfce97ace0eb8a8fff34e538da4d90bef4b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Apr 2012 22:02:40 +0200 Subject: [PATCH 02/15] Restore es_AR translation (transplanted from f1f85428687492ec3486fe1820a8496dd1e5f5d9) --- locale/es_AR.po | 349 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) diff --git a/locale/es_AR.po b/locale/es_AR.po index 542f2921b5..a85b411abd 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" From 52497f71aad11682745b9b859eeb6fd9c22a9aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 19:58:22 +0200 Subject: [PATCH 03/15] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 014d85f636..30298114ba 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 From c65de070088773c33cc2914616734fcbc5192648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 19:58:27 +0200 Subject: [PATCH 04/15] Added tag 2.4.1 for changeset e0cb8c3e202d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 663e412a84..0b48191b97 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ aa5eeb9ec42c629a6d02fb161fe77cffa0f30f6d 1.8.0 4fee0aa595f576ab1bda4b322a7afe39fee21e6e 2.0.0 4cc691e92efa06c6181cee5bd81a5207cc92a158 2.2.0 2b72735a85dd1b934817593acb1c00d086ef87c9 2.4.0 +e0cb8c3e202d8b3b53d9549411a604644855b130 2.4.1 From 7db712430caf9aeb2937634f98ea24d6c8b7d4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 19:59:06 +0200 Subject: [PATCH 05/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7a3939a664..99fd61aa02 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@b2ck.com', 'website': 'http://www.tryton.org/', From 429dbc62c0b03d4a2047b378a71cb4102043e554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 1 Jun 2012 23:44:37 +0200 Subject: [PATCH 06/15] Fix domain for invoice on statement line The invoice state could be any once the statement is no more draft. issue2453 review386001 (transplanted from f6ebbb745664ddb9de3081a4cb31d0fd99986b6c) --- statement.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/statement.py b/statement.py index 911d5f0b0a..c9503901c2 100644 --- a/statement.py +++ b/statement.py @@ -368,8 +368,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'), From 8af6c5fda8f7eb3807028c65061c268aac658fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 16 Aug 2012 14:54:26 +0200 Subject: [PATCH 07/15] Fix sign of the amount to pay on line issue2746 review464003 (transplanted from e61b42e38133c3e8351bb8b445c18e153859dc01) --- statement.py | 4 +++- tests/scenario_account_statement.rst | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/statement.py b/statement.py index c9503901c2..8c657c0d5c 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() diff --git a/tests/scenario_account_statement.rst b/tests/scenario_account_statement.rst index c9afb5a2e4..e864539fc2 100644 --- a/tests/scenario_account_statement.rst +++ b/tests/scenario_account_statement.rst @@ -239,11 +239,16 @@ Paid 50 to supplier:: >>> statement_line = StatementLine() >>> statement.lines.append(statement_line) >>> statement_line.date = today - >>> statement_line.amount = Decimal('-50') + >>> 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() From c24465884f3980b1100d2dc0a95e1b1153b0fe22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:29:05 +0200 Subject: [PATCH 08/15] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 30298114ba..60f09d4e3b 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 From bbb267ba410fdf226fae992a20dca7d83ba19614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:29:06 +0200 Subject: [PATCH 09/15] Added tag 2.4.2 for changeset 7b9cff035ee1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0b48191b97..9ef96312df 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ aa5eeb9ec42c629a6d02fb161fe77cffa0f30f6d 1.8.0 4cc691e92efa06c6181cee5bd81a5207cc92a158 2.2.0 2b72735a85dd1b934817593acb1c00d086ef87c9 2.4.0 e0cb8c3e202d8b3b53d9549411a604644855b130 2.4.1 +7b9cff035ee1e852d18069e8675eec0da6f9d210 2.4.2 From 6d400f9eecf98b086ea450df39d5cbedb32b127f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 15:29:13 +0200 Subject: [PATCH 10/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 99fd61aa02..e60df09e1e 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.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b7618f1a55d1218786d8e733adde6ab6f7bb553a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 Sep 2012 15:26:40 +0200 Subject: [PATCH 11/15] Reset move and invoice when copying Statement Line review496003 (transplanted from a89a6197ea147bdb1a07529e7a91dd021959d174) --- statement.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/statement.py b/statement.py index 8c657c0d5c..cf263f81a9 100644 --- a/statement.py +++ b/statement.py @@ -469,6 +469,14 @@ class Line(ModelSQL, ModelView): res['invoice'] = None return res + def copy(self, ids, default=None): + if default is None: + default = {} + default = default.copy() + default.setdefault('move', None) + default.setdefault('invoice', None) + return super(Line, self).copy(ids, default=default) + def create_move(self, line): ''' Create move for the statement line and return move id if created. From 50cdb79a12aa8a03972357e8560421017cd85cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 19 Sep 2012 22:19:04 +0200 Subject: [PATCH 12/15] Fix domain concatenation between list and tuple (transplanted from 41a25660ece8cf25bb018f07b79cd676189eba76) --- statement.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/statement.py b/statement.py index cf263f81a9..4c89156399 100644 --- a/statement.py +++ b/statement.py @@ -186,12 +186,12 @@ class Statement(Workflow, ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('start_balance',) + clause[1:], - ('end_balance',) + clause[1:], + ('start_balance',) + tuple(clause[1:]), + ('end_balance',) + tuple(clause[1:]), ]) if ids: return [('id', 'in', ids)] - return [('journal',) + clause[1:]] + return [('journal',) + tuple(clause[1:])] def get_move_lines(self, ids, name): ''' From 6b51d3d45135502b0ce16dd4d9201397bb1ab1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:56:15 +0100 Subject: [PATCH 13/15] Prepare release 2.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 60f09d4e3b..b6ce97967f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2012-09-02 * Bug fixes (see mercurial logs for details) From 3ea8835b1be5b6e3bc4861288145a3521d662d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:56:16 +0100 Subject: [PATCH 14/15] Added tag 2.4.3 for changeset a86f6e7ffd51 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9ef96312df..2ea7448591 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ aa5eeb9ec42c629a6d02fb161fe77cffa0f30f6d 1.8.0 2b72735a85dd1b934817593acb1c00d086ef87c9 2.4.0 e0cb8c3e202d8b3b53d9549411a604644855b130 2.4.1 7b9cff035ee1e852d18069e8675eec0da6f9d210 2.4.2 +a86f6e7ffd51eb2eb9e3e46759820d274c303e1d 2.4.3 From 49f2e9ab93c412a9d38597784c83974480562e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 17:56:24 +0100 Subject: [PATCH 15/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index e60df09e1e..25fa65935c 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.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',