From ac907aeb65bfba35f7f0cd8688a3fd0bc2d0c619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:01 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d06fafcb45..8e80c87a9c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Contabilidad Analítica', 'name_es_ES': 'Contabilidad analítica', 'name_fr_FR': 'Comptabilité analytique', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8468bc0bfc2d20c9ea51a255e3e13818552cfc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Apr 2012 22:02:42 +0200 Subject: [PATCH 2/9] Restore es_AR translation (transplanted from 79c9c9dcae9472392afbd0e5cb3b75ccaf0a5b33) --- locale/es_AR.po | 420 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 420 insertions(+) diff --git a/locale/es_AR.po b/locale/es_AR.po index 542f2921b5..3efd35156c 100644 --- a/locale/es_AR.po +++ b/locale/es_AR.po @@ -1,3 +1,423 @@ # msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "error:analytic_account.account.selection:" +msgid "" +"Can not have many accounts with the same root or a missing mandatory root " +"account!" +msgstr "" +"¡No puede tener varias cuentas con la misma cuenta raiz o falta una cuenta " +"raiz obligatoria!" + +msgctxt "error:analytic_account.account:" +msgid "You can not create recursive accounts!" +msgstr "¡No puede crear cuentas recursivas!" + +msgctxt "error:analytic_account.line:" +msgid "Wrong credit/debit values!" +msgstr "¡Los valores debe/haber son incorrectos!" + +msgctxt "error:analytic_account.line:" +msgid "" +"You can not create move line\n" +"on view/inactive account!" +msgstr "" +"¡No puede crear una linea de asiento\n" +"en una cuenta vista/inactiva!" + +msgctxt "field:account.move.line,analytic_lines:" +msgid "Analytic Lines" +msgstr "Líneas analíticas" + +msgctxt "field:analytic_account.account,active:" +msgid "Active" +msgstr "Activa" + +msgctxt "field:analytic_account.account,balance:" +msgid "Balance" +msgstr "Balance" + +msgctxt "field:analytic_account.account,childs:" +msgid "Children" +msgstr "Hijos" + +msgctxt "field:analytic_account.account,code:" +msgid "Code" +msgstr "Código" + +msgctxt "field:analytic_account.account,company:" +msgid "Company" +msgstr "Empresa" + +msgctxt "field:analytic_account.account,create_date:" +msgid "Create Date" +msgstr "Fecha creación" + +msgctxt "field:analytic_account.account,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +msgctxt "field:analytic_account.account,credit:" +msgid "Credit" +msgstr "Haber" + +msgctxt "field:analytic_account.account,currency:" +msgid "Currency" +msgstr "Divisa" + +msgctxt "field:analytic_account.account,currency_digits:" +msgid "Currency Digits" +msgstr "Decimales de la divisa" + +msgctxt "field:analytic_account.account,debit:" +msgid "Debit" +msgstr "Debe" + +msgctxt "field:analytic_account.account,display_balance:" +msgid "Display Balance" +msgstr "Mostrar balance" + +msgctxt "field:analytic_account.account,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:analytic_account.account,mandatory:" +msgid "Mandatory" +msgstr "Obligatorio" + +msgctxt "field:analytic_account.account,name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:analytic_account.account,note:" +msgid "Note" +msgstr "Nota" + +msgctxt "field:analytic_account.account,parent:" +msgid "Parent" +msgstr "Padre" + +msgctxt "field:analytic_account.account,rec_name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:analytic_account.account,root:" +msgid "Root" +msgstr "Raíz" + +msgctxt "field:analytic_account.account,state:" +msgid "State" +msgstr "Estado" + +msgctxt "field:analytic_account.account,type:" +msgid "Type" +msgstr "Tipo" + +msgctxt "field:analytic_account.account,write_date:" +msgid "Write Date" +msgstr "Fecha modificación" + +msgctxt "field:analytic_account.account,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "" +"field:analytic_account.account-analytic_account.account.selection,account:" +msgid "Account" +msgstr "Cuenta" + +msgctxt "" +"field:analytic_account.account-" +"analytic_account.account.selection,create_date:" +msgid "Create Date" +msgstr "Fecha creación" + +msgctxt "" +"field:analytic_account.account-" +"analytic_account.account.selection,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +msgctxt "" +"field:analytic_account.account-analytic_account.account.selection,id:" +msgid "ID" +msgstr "ID" + +msgctxt "" +"field:analytic_account.account-analytic_account.account.selection,rec_name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "" +"field:analytic_account.account-analytic_account.account.selection,selection:" +msgid "Selection" +msgstr "Selección" + +msgctxt "" +"field:analytic_account.account-" +"analytic_account.account.selection,write_date:" +msgid "Write Date" +msgstr "Fecha modificación" + +msgctxt "" +"field:analytic_account.account-analytic_account.account.selection,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "field:analytic_account.account.selection,accounts:" +msgid "Accounts" +msgstr "Cuentas" + +msgctxt "field:analytic_account.account.selection,create_date:" +msgid "Create Date" +msgstr "Fecha creación" + +msgctxt "field:analytic_account.account.selection,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +msgctxt "field:analytic_account.account.selection,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:analytic_account.account.selection,rec_name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:analytic_account.account.selection,write_date:" +msgid "Write Date" +msgstr "Fecha modificación" + +msgctxt "field:analytic_account.account.selection,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "field:analytic_account.line,account:" +msgid "Account" +msgstr "Cuenta" + +msgctxt "field:analytic_account.line,active:" +msgid "Active" +msgstr "Activa" + +msgctxt "field:analytic_account.line,create_date:" +msgid "Create Date" +msgstr "Fecha creación" + +msgctxt "field:analytic_account.line,create_uid:" +msgid "Create User" +msgstr "Usuario creación" + +msgctxt "field:analytic_account.line,credit:" +msgid "Credit" +msgstr "Haber" + +msgctxt "field:analytic_account.line,currency:" +msgid "Currency" +msgstr "Divisa" + +msgctxt "field:analytic_account.line,currency_digits:" +msgid "Currency Digits" +msgstr "Decimales de la divisa" + +msgctxt "field:analytic_account.line,date:" +msgid "Date" +msgstr "Fecha" + +msgctxt "field:analytic_account.line,debit:" +msgid "Debit" +msgstr "Debe" + +msgctxt "field:analytic_account.line,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:analytic_account.line,journal:" +msgid "Journal" +msgstr "Diario" + +msgctxt "field:analytic_account.line,move_line:" +msgid "Account Move Line" +msgstr "Linea de asiento contable" + +msgctxt "field:analytic_account.line,name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:analytic_account.line,party:" +msgid "Party" +msgstr "Entidad" + +msgctxt "field:analytic_account.line,rec_name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:analytic_account.line,reference:" +msgid "Reference" +msgstr "Referencia" + +msgctxt "field:analytic_account.line,write_date:" +msgid "Write Date" +msgstr "Fecha modificación" + +msgctxt "field:analytic_account.line,write_uid:" +msgid "Write User" +msgstr "Usuario modificación" + +msgctxt "field:analytic_account.open_chart.start,end_date:" +msgid "End Date" +msgstr "Fecha final" + +msgctxt "field:analytic_account.open_chart.start,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:analytic_account.open_chart.start,start_date:" +msgid "Start Date" +msgstr "Fecha inicio" + +msgctxt "model:analytic_account.account,name:" +msgid "Analytic Account" +msgstr "Cuenta analítica" + +msgctxt "" +"model:analytic_account.account-analytic_account.account.selection,name:" +msgid "Analytic Account - Analytic Account Selection" +msgstr "Cuenta analítica - Selección de cuenta analítica" + +msgctxt "model:analytic_account.account.selection,name:" +msgid "Analytic Account Selection" +msgstr "Selección de cuenta analítica" + +msgctxt "model:analytic_account.line,name:" +msgid "Analytic Line" +msgstr "Línea analítica" + +msgctxt "model:analytic_account.open_chart.start,name:" +msgid "Open Chart of Accounts" +msgstr "Abrir plan contable" + +msgctxt "model:ir.action,name:act_account_list" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "model:ir.action,name:act_account_tree" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "model:ir.action,name:act_account_tree2" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "model:ir.action,name:act_line_form" +msgid "Analytic Lines" +msgstr "Líneas analíticas" + +msgctxt "model:ir.action,name:act_open_account" +msgid "Open Account" +msgstr "Abrir cuenta" + +msgctxt "model:ir.action,name:act_open_chart" +msgid "Open Chart of Analytic Accounts" +msgstr "Abrir plan de cuentas análiticas" + +msgctxt "model:ir.ui.menu,name:menu_account_list" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "model:ir.ui.menu,name:menu_account_tree" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "model:ir.ui.menu,name:menu_analytic_account_configuration" +msgid "Analytic Account" +msgstr "Cuenta analítica" + +msgctxt "model:ir.ui.menu,name:menu_open_chart" +msgid "Open Chart of Analytic Accounts" +msgstr "Abrir plan de cuentas análiticas" + +msgctxt "model:res.group,name:group_analytic_admin" +msgid "Analytic Administration" +msgstr "Administración analítica" + +msgctxt "selection:analytic_account.account,display_balance:" +msgid "Credit - Debit" +msgstr "Haber - Debe" + +msgctxt "selection:analytic_account.account,display_balance:" +msgid "Debit - Credit" +msgstr "Debe - Haber" + +msgctxt "selection:analytic_account.account,state:" +msgid "Closed" +msgstr "Cerrada" + +msgctxt "selection:analytic_account.account,state:" +msgid "Draft" +msgstr "Borrador" + +msgctxt "selection:analytic_account.account,state:" +msgid "Opened" +msgstr "Abierta" + +msgctxt "selection:analytic_account.account,type:" +msgid "Normal" +msgstr "Normal" + +msgctxt "selection:analytic_account.account,type:" +msgid "Root" +msgstr "Raíz" + +msgctxt "selection:analytic_account.account,type:" +msgid "View" +msgstr "Vista" + +msgctxt "view:account.move.line:" +msgid "Analytic" +msgstr "Analítica" + +msgctxt "view:account.move:" +msgid "Analytic" +msgstr "Analítica" + +msgctxt "view:analytic_account.account:" +msgid "Analytic Account" +msgstr "Cuenta analítica" + +msgctxt "view:analytic_account.account:" +msgid "Analytic Accounts" +msgstr "Cuentas analíticas" + +msgctxt "view:analytic_account.account:" +msgid "General Information" +msgstr "Información general" + +msgctxt "view:analytic_account.account:" +msgid "Notes" +msgstr "Notas" + +msgctxt "view:analytic_account.line:" +msgid "Analytic Line" +msgstr "Línea analítica" + +msgctxt "view:analytic_account.line:" +msgid "Analytic Lines" +msgstr "Líneas analíticas" + +msgctxt "view:analytic_account.line:" +msgid "General Information" +msgstr "Información general" + +msgctxt "view:analytic_account.open_chart.start:" +msgid "Open Chart of Analytic Accounts" +msgstr "Abrir plan de cuentas análiticas" + +msgctxt "wizard_button:analytic_account.open_chart,start,end:" +msgid "Cancel" +msgstr "Cancelar" + +msgctxt "wizard_button:analytic_account.open_chart,start,open_:" +msgid "Open" +msgstr "Abrir" From a019f7aebacda13ae2202d855f4e380f166c31b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:04:04 +0200 Subject: [PATCH 3/9] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6e38f481ac..43b24269e9 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) From 6baca63308771261ce5165e65b5b719d488150a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:04:22 +0200 Subject: [PATCH 4/9] Added tag 2.4.1 for changeset 817ba4df150c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4d6255c427..3106696c91 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ bd0deaee51d39f2ec3db0c089b332ad74b9e7209 1.6.0 9f98f48801a86c3076c42977e52214af5f24ff9c 2.0.0 d8590ee13df03c3f5e3677ef2b57765a72c09092 2.2.0 e932d19259f45e1454a217efad818a041796e29b 2.4.0 +817ba4df150c193e5c456cb9549ba6d50eaa0641 2.4.1 From f81598ea4349f47367dc87f5d561d83c9f1a9c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 20:05:02 +0200 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 8e80c87a9c..1b728cd510 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Contabilidad Analítica', 'name_es_ES': 'Contabilidad analítica', 'name_fr_FR': 'Comptabilité analytique', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 911e6a3035729fff4e9773404fa9298c81ad3dc1 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:42:26 +0200 Subject: [PATCH 6/9] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from 20bb1b1c90b49ad77a699bc0138165e9beb0dc2d) --- account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/account.py b/account.py index ca6457af21..102c44d800 100644 --- a/account.py +++ b/account.py @@ -241,11 +241,11 @@ class Account(ModelSQL, ModelView): return res def search_rec_name(self, name, clause): - ids = self.search([('code',) + clause[1:]], limit=1) + ids = self.search([('code',) + tuple(clause[1:])], limit=1) if ids: - return [('code',) + clause[1:]] + return [('code',) + tuple(clause[1:])] else: - return [(self._rec_name,) + clause[1:]] + return [(self._rec_name,) + tuple(clause[1:])] def convert_view(self, tree): res = tree.xpath('//field[@name=\'analytic_accounts\']') From 20068ae31385ddd3037cff0900db0279d377718d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:31:47 +0100 Subject: [PATCH 7/9] Prepare release 2.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 43b24269e9..ce93def969 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-04-24 * Restore es_AR translation From 21ec4246e11d2135c935a62627cf1d922a63263f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:31:48 +0100 Subject: [PATCH 8/9] Added tag 2.4.2 for changeset 698334e69c7e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3106696c91..8f21ba0b18 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ bd0deaee51d39f2ec3db0c089b332ad74b9e7209 1.6.0 d8590ee13df03c3f5e3677ef2b57765a72c09092 2.2.0 e932d19259f45e1454a217efad818a041796e29b 2.4.0 817ba4df150c193e5c456cb9549ba6d50eaa0641 2.4.1 +698334e69c7e2766f5a3bab0666129c9e6d96c7a 2.4.2 From ffc9a2d964bdaa313bc8ee1b835eefebc302ceff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:32:02 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1b728cd510..53638373ab 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_CO': 'Contabilidad Analítica', 'name_es_ES': 'Contabilidad analítica', 'name_fr_FR': 'Comptabilité analytique', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',