[tryton-debian-vcs] tryton-modules-analytic-account branch upstream updated. upstream/3.8.0-2-g3e0856b

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:09:11 UTC 2016


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-account.git;a=commitdiff;h=upstream/3.8.0-2-g3e0856b

commit 3e0856b5ad942133abf1cc24ef2a98d0e37d5441
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:13 2016 +0200

    Adding upstream version 4.0.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index b59215a..333de1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
 * Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index 7f6da81..932e2ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_account
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 0e929f0..848763c 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -68,7 +68,7 @@ msgstr "Aktivno"
 
 msgctxt "field:analytic_account.account,balance:"
 msgid "Balance"
-msgstr "Bilanca"
+msgstr "Saldo"
 
 msgctxt "field:analytic_account.account,childs:"
 msgid "Children"
diff --git a/tryton.cfg b/tryton.cfg
index c595c8a..19714e3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     account
     company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index 158a7a3..0c6f207 100644
--- a/trytond_analytic_account.egg-info/PKG-INFO
+++ b/trytond_analytic_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-account
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_analytic_account.egg-info/SOURCES.txt b/trytond_analytic_account.egg-info/SOURCES.txt
index 18ebf27..4bb52a3 100644
--- a/trytond_analytic_account.egg-info/SOURCES.txt
+++ b/trytond_analytic_account.egg-info/SOURCES.txt
@@ -29,11 +29,13 @@ tryton.cfg
 ./locale/hu_HU.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/lo_LA.po
 ./locale/lt_LT.po
 ./locale/nl_NL.po
 ./locale/pt_BR.po
 ./locale/ru_RU.po
 ./locale/sl_SI.po
+./locale/zh_CN.po
 ./tests/__init__.py
 ./tests/scenario_analytic_account.rst
 ./tests/test_analytic_account.py
diff --git a/trytond_analytic_account.egg-info/requires.txt b/trytond_analytic_account.egg-info/requires.txt
index 681ae14..1b64634 100644
--- a/trytond_analytic_account.egg-info/requires.txt
+++ b/trytond_analytic_account.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_account >= 4.0, < 4.1
 trytond_company >= 4.0, < 4.1
 trytond_currency >= 4.0, < 4.1
 trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 88151c4a1bab88e03e38f9df3bc86c67558561a1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:25:54 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index c602458..b59215a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 987f2d8..7f6da81 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_account
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_analytic_account
         ========================
         
@@ -54,6 +54,7 @@ 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 :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/account.py b/account.py
index 2bd86bb..eb6111e 100644
--- a/account.py
+++ b/account.py
@@ -129,7 +129,7 @@ class Account(ModelSQL, ModelView):
         Account = pool.get('account.account')
         Company = pool.get('company.company')
         Currency = pool.get('currency.currency')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         table = cls.__table__()
         line = Line.__table__()
         move_line = MoveLine.__table__()
@@ -205,7 +205,7 @@ class Account(ModelSQL, ModelView):
         Account = pool.get('account.account')
         Company = pool.get('company.company')
         Currency = pool.get('currency.currency')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         table = cls.__table__()
         line = Line.__table__()
         move_line = MoveLine.__table__()
@@ -330,17 +330,17 @@ class AnalyticAccountEntry(ModelView, ModelSQL):
         pool = Pool()
         Account = pool.get('analytic_account.account')
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
 
         # Migration from 3.4: use origin as the key for One2Many
         migration_3_4 = False
         old_table = 'analytic_account_account_selection_rel'
-        if TableHandler.table_exist(cursor, old_table):
-            TableHandler.table_rename(cursor, old_table, cls._table)
+        if TableHandler.table_exist(old_table):
+            TableHandler.table_rename(old_table, cls._table)
             migration_3_4 = True
 
         # Don't create table before renaming
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
 
         super(AnalyticAccountEntry, cls).__register__(module_name)
 
@@ -409,11 +409,11 @@ class AnalyticMixin(ModelSQL):
         pool = Pool()
         AccountEntry = pool.get('analytic.account.entry')
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
 
         super(AnalyticMixin, cls).__register__(module_name)
 
-        handler = TableHandler(cursor, cls, module_name)
+        handler = TableHandler(cls, module_name)
         # Migration from 3.4: analytic accounting changed to reference field
         if handler.column_exist('analytic_accounts'):
             entry = AccountEntry.__table__()
diff --git a/line.py b/line.py
index 4e7e966..21bff6b 100644
--- a/line.py
+++ b/line.py
@@ -9,7 +9,6 @@ from trytond.transaction import Transaction
 from trytond.pool import Pool, PoolMeta
 
 __all__ = ['Line', 'Move', 'MoveLine', 'OpenAccount']
-__metaclass__ = PoolMeta
 
 
 class Line(ModelSQL, ModelView):
@@ -67,8 +66,7 @@ class Line(ModelSQL, ModelView):
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
         super(Line, cls).__register__(module_name)
-        cursor = Transaction().cursor
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
 
         # Migration from 1.2 currency has been changed in function field
         table.not_null_action('currency', action='remove')
@@ -135,6 +133,7 @@ class Line(ModelSQL, ModelView):
 
 
 class Move:
+    __metaclass__ = PoolMeta
     __name__ = 'account.move'
 
     def cancel(self, default=None):
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 240e5e9..91866af 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -22,58 +22,6 @@ msgctxt "field:account.move.line,analytic_lines:"
 msgid "Analytic Lines"
 msgstr "Kostenstelle Zeilen"
 
-msgctxt "field:account.statement,end_balance:"
-msgid "End Balance"
-msgstr "Endsaldo"
-
-msgctxt "field:account.statement,lines:"
-msgid "Transactions"
-msgstr "Transaktionen"
-
-msgctxt "field:account.statement,start_balance:"
-msgid "Start Balance"
-msgstr "Anfangssaldo"
-
-msgctxt "field:account.statement.journal,journal:"
-msgid "Journal"
-msgstr "Journal"
-
-msgctxt "field:account.statement.journal,name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt "field:account.statement.journal,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt "field:account.statement.line,amount:"
-msgid "Amount"
-msgstr "Betrag"
-
-msgctxt "field:account.statement.line,date:"
-msgid "Date"
-msgstr "Datum"
-
-msgctxt "field:account.statement.line,description:"
-msgid "Description"
-msgstr "Beschreibung"
-
-msgctxt "field:account.statement.line,invoice:"
-msgid "Invoice"
-msgstr "Rechnung"
-
-msgctxt "field:account.statement.line,move:"
-msgid "Account Move"
-msgstr "Buchungssatz"
-
-msgctxt "field:account.statement.line,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt "field:account.statement.line,statement:"
-msgid "Statement"
-msgstr "Zahlung"
-
 msgctxt "field:analytic.account.entry,account:"
 msgid "Account"
 msgstr "Konto"
@@ -294,18 +242,6 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-msgctxt "model:account.statement,name:"
-msgid "Account Statement"
-msgstr "Bankauszug"
-
-msgctxt "model:account.statement.journal,name:"
-msgid "Statement Journal"
-msgstr "Bankauszugsjournal"
-
-msgctxt "model:account.statement.line,name:"
-msgid "Account Statement Line"
-msgstr "Bankauszugsposition"
-
 msgctxt "model:analytic.account.entry,name:"
 msgid "Analytic Account Entry"
 msgstr "Kostenstelleneintrag"
@@ -366,18 +302,6 @@ msgctxt "model:res.group,name:group_analytic_admin"
 msgid "Analytic Administration"
 msgstr "Kostenstellen Administration"
 
-msgctxt "selection:account.statement,state:"
-msgid "Canceled"
-msgstr "Annulliert"
-
-msgctxt "selection:account.statement,state:"
-msgid "Posted"
-msgstr "Festgeschrieben"
-
-msgctxt "selection:account.statement,state:"
-msgid "Validated"
-msgstr "Geprüft"
-
 msgctxt "selection:analytic_account.account,display_balance:"
 msgid "Credit - Debit"
 msgstr "Haben - Soll"
@@ -414,70 +338,6 @@ msgctxt "view:account.move.line:"
 msgid "Analytic"
 msgstr "Kostenstelle"
 
-msgctxt "view:account.move:"
-msgid "Analytic"
-msgstr "Kostenstelle"
-
-msgctxt "view:account.statement.journal:"
-msgid "Statement Journal"
-msgstr "Bankauszugsjournal"
-
-msgctxt "view:account.statement.journal:"
-msgid "Statement Journals"
-msgstr "Bankauszugsjournale"
-
-msgctxt "view:account.statement.line:"
-msgid "Bank Statement Line"
-msgstr "Posten Bankauszüge"
-
-msgctxt "view:account.statement.line:"
-msgid "Statement Line"
-msgstr "Bankauszugszeile"
-
-msgctxt "view:account.statement.line:"
-msgid "Statement Lines"
-msgstr "Bankauszugszeilen"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement"
-msgstr "Bankauszug"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statement Lines"
-msgstr "Posten Bankauszüge"
-
-msgctxt "view:account.statement:"
-msgid "Bank Statements"
-msgstr "Bankauszüge"
-
-msgctxt "view:account.statement:"
-msgid "Move Lines"
-msgstr "Buchungszeilen"
-
-msgctxt "view:account.statement:"
-msgid "Post"
-msgstr "Festschreiben"
-
-msgctxt "view:account.statement:"
-msgid "Reset to Draft"
-msgstr "Auf Entwurf zurücksetzen"
-
-msgctxt "view:account.statement:"
-msgid "Statement"
-msgstr "Zahlung"
-
-msgctxt "view:account.statement:"
-msgid "Statement Lines"
-msgstr "Bankauszugszeilen"
-
-msgctxt "view:account.statement:"
-msgid "Statements"
-msgstr "Bankauszüge"
-
-msgctxt "view:account.statement:"
-msgid "Validate"
-msgstr "Prüfen"
-
 msgctxt "view:analytic.account.entry:"
 msgid "Analytic Entry"
 msgstr "Kostenstelleneintrag"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 90d5451..54e7b67 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -343,37 +343,43 @@ msgctxt "view:analytic.account.entry:"
 msgid "Analytic Entry"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:analytic_account.account:"
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cuenta analítica"
 
+#, fuzzy
 msgctxt "view:analytic_account.account:"
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Cuentas analíticas"
 
 msgctxt "view:analytic_account.account:"
 msgid "General Information"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:analytic_account.account:"
 msgid "Notes"
-msgstr ""
+msgstr "Nota"
 
+#, fuzzy
 msgctxt "view:analytic_account.line:"
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línea analítica"
 
+#, fuzzy
 msgctxt "view:analytic_account.line:"
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Líneas analíticas"
 
 msgctxt "view:analytic_account.line:"
 msgid "General Information"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:analytic_account.open_chart.start:"
 msgid "Open Chart of Analytic Accounts"
-msgstr ""
+msgstr "Abrir plan analítico"
 
 msgctxt "wizard_button:analytic_account.open_chart,start,end:"
 msgid "Cancel"
diff --git a/locale/es_MX.po b/locale/lo_LA.po
similarity index 77%
copy from locale/es_MX.po
copy to locale/lo_LA.po
index 90d5451..b666376 100644
--- a/locale/es_MX.po
+++ b/locale/lo_LA.po
@@ -5,335 +5,334 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 msgctxt "error:analytic.account.entry:"
 msgid "Only one account is allowed per analytic root and origin."
 msgstr ""
-"Sólo se puede seleccionar una cuenta por cada origen y raíz analítica."
 
 msgctxt "error:analytic_account.line:"
 msgid "Wrong credit/debit values."
-msgstr "Valores de haber/debe erróneos."
+msgstr ""
 
 msgctxt "error:analytic_account.line:"
 msgid "You can not create a move line using inactive account \"%s\"."
-msgstr "No puede crear un apunte usando una cuenta inactiva \"%s\"."
+msgstr ""
 
 msgctxt "error:analytic_account.line:"
 msgid "You can not create a move line using view account \"%s\"."
-msgstr "No puede crear un apunte utilizando la cuenta tipo vista \"%s\"."
+msgstr ""
 
 msgctxt "field:account.move.line,analytic_lines:"
 msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,account:"
 msgid "Account"
-msgstr "Cuenta"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,origin:"
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,required:"
 msgid "Required"
-msgstr "Requerido"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,root:"
 msgid "Root Analytic"
-msgstr "Cuenta raíz analítica"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,active:"
 msgid "Active"
-msgstr "Activa"
+msgstr ""
 
 msgctxt "field:analytic_account.account,balance:"
 msgid "Balance"
-msgstr "Saldo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,childs:"
 msgid "Children"
-msgstr "Hijos"
+msgstr ""
 
 msgctxt "field:analytic_account.account,code:"
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 msgctxt "field:analytic_account.account,company:"
 msgid "Company"
-msgstr "Empresa"
+msgstr ""
 
 msgctxt "field:analytic_account.account,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,credit:"
 msgid "Credit"
-msgstr "Haber"
+msgstr ""
 
 msgctxt "field:analytic_account.account,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.account,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.account,debit:"
 msgid "Debit"
-msgstr "Debe"
+msgstr ""
 
 msgctxt "field:analytic_account.account,display_balance:"
 msgid "Display Balance"
-msgstr "Mostrar saldo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.account,mandatory:"
 msgid "Mandatory"
-msgstr "Obligatorio"
+msgstr ""
 
 msgctxt "field:analytic_account.account,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,note:"
 msgid "Note"
-msgstr "Nota"
+msgstr ""
 
 msgctxt "field:analytic_account.account,parent:"
 msgid "Parent"
-msgstr "Padre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,root:"
 msgid "Root"
-msgstr "Raíz"
+msgstr ""
 
 msgctxt "field:analytic_account.account,state:"
 msgid "State"
-msgstr "Estado"
+msgstr ""
 
 msgctxt "field:analytic_account.account,type:"
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,account:"
 msgid "Account"
-msgstr "Cuenta"
+msgstr ""
 
 msgctxt "field:analytic_account.line,active:"
 msgid "Active"
-msgstr "Activa"
+msgstr ""
 
 msgctxt "field:analytic_account.line,company:"
 msgid "Company"
-msgstr "Empresa"
+msgstr ""
 
 msgctxt "field:analytic_account.line,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,credit:"
 msgid "Credit"
-msgstr "Haber"
+msgstr ""
 
 msgctxt "field:analytic_account.line,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.line,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.line,date:"
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
 
 msgctxt "field:analytic_account.line,debit:"
 msgid "Debit"
-msgstr "Debe"
+msgstr ""
 
 msgctxt "field:analytic_account.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.line,journal:"
 msgid "Journal"
-msgstr "Diario"
+msgstr ""
 
 msgctxt "field:analytic_account.line,move_line:"
 msgid "Account Move Line"
-msgstr "Apunte contable"
+msgstr ""
 
 msgctxt "field:analytic_account.line,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.line,party:"
 msgid "Party"
-msgstr "Entidad"
+msgstr ""
 
 msgctxt "field:analytic_account.line,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.line,reference:"
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 msgctxt "field:analytic_account.line,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,end_date:"
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr ""
 
 msgctxt "model:analytic.account.entry,name:"
 msgid "Analytic Account Entry"
-msgstr "Asiento cuenta analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.account,name:"
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.line,name:"
 msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.open_chart.start,name:"
 msgid "Open Chart of Accounts"
-msgstr "Abrir plan contable"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_list"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_tree"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_tree2"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_line_form"
 msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_open_account"
 msgid "Open Account"
-msgstr "Abrir cuenta"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_open_chart"
 msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_account_list"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_account_tree"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_analytic_account_configuration"
 msgid "Analytic Account"
-msgstr "Contabilidad analítica"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_open_chart"
 msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr ""
 
 msgctxt "model:res.group,name:group_analytic_admin"
 msgid "Analytic Administration"
-msgstr "Administración de analítica"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,display_balance:"
 msgid "Credit - Debit"
-msgstr "Haber - Debe"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,display_balance:"
 msgid "Debit - Credit"
-msgstr "Debe - Haber"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Closed"
-msgstr "Cerrada"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Opened"
-msgstr "Abierta"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "Normal"
-msgstr "Normal"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "Root"
-msgstr "Raíz"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "View"
-msgstr "Vista"
+msgstr ""
 
 msgctxt "view:account.move.line:"
 msgid "Analytic"
@@ -377,8 +376,8 @@ msgstr ""
 
 msgctxt "wizard_button:analytic_account.open_chart,start,end:"
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 msgctxt "wizard_button:analytic_account.open_chart,start,open_:"
 msgid "Open"
-msgstr "Abrir"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index a28ebad..1d340fd 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -334,7 +334,7 @@ msgstr "Raiz"
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "View"
-msgstr "Exibir"
+msgstr "Sumário"
 
 msgctxt "view:account.move.line:"
 msgid "Analytic"
diff --git a/locale/es_MX.po b/locale/zh_CN.po
similarity index 77%
copy from locale/es_MX.po
copy to locale/zh_CN.po
index 90d5451..b666376 100644
--- a/locale/es_MX.po
+++ b/locale/zh_CN.po
@@ -5,335 +5,334 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 msgctxt "error:analytic.account.entry:"
 msgid "Only one account is allowed per analytic root and origin."
 msgstr ""
-"Sólo se puede seleccionar una cuenta por cada origen y raíz analítica."
 
 msgctxt "error:analytic_account.line:"
 msgid "Wrong credit/debit values."
-msgstr "Valores de haber/debe erróneos."
+msgstr ""
 
 msgctxt "error:analytic_account.line:"
 msgid "You can not create a move line using inactive account \"%s\"."
-msgstr "No puede crear un apunte usando una cuenta inactiva \"%s\"."
+msgstr ""
 
 msgctxt "error:analytic_account.line:"
 msgid "You can not create a move line using view account \"%s\"."
-msgstr "No puede crear un apunte utilizando la cuenta tipo vista \"%s\"."
+msgstr ""
 
 msgctxt "field:account.move.line,analytic_lines:"
 msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,account:"
 msgid "Account"
-msgstr "Cuenta"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,origin:"
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,required:"
 msgid "Required"
-msgstr "Requerido"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,root:"
 msgid "Root Analytic"
-msgstr "Cuenta raíz analítica"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic.account.entry,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,active:"
 msgid "Active"
-msgstr "Activa"
+msgstr ""
 
 msgctxt "field:analytic_account.account,balance:"
 msgid "Balance"
-msgstr "Saldo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,childs:"
 msgid "Children"
-msgstr "Hijos"
+msgstr ""
 
 msgctxt "field:analytic_account.account,code:"
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 msgctxt "field:analytic_account.account,company:"
 msgid "Company"
-msgstr "Empresa"
+msgstr ""
 
 msgctxt "field:analytic_account.account,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,credit:"
 msgid "Credit"
-msgstr "Haber"
+msgstr ""
 
 msgctxt "field:analytic_account.account,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.account,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.account,debit:"
 msgid "Debit"
-msgstr "Debe"
+msgstr ""
 
 msgctxt "field:analytic_account.account,display_balance:"
 msgid "Display Balance"
-msgstr "Mostrar saldo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.account,mandatory:"
 msgid "Mandatory"
-msgstr "Obligatorio"
+msgstr ""
 
 msgctxt "field:analytic_account.account,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,note:"
 msgid "Note"
-msgstr "Nota"
+msgstr ""
 
 msgctxt "field:analytic_account.account,parent:"
 msgid "Parent"
-msgstr "Padre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.account,root:"
 msgid "Root"
-msgstr "Raíz"
+msgstr ""
 
 msgctxt "field:analytic_account.account,state:"
 msgid "State"
-msgstr "Estado"
+msgstr ""
 
 msgctxt "field:analytic_account.account,type:"
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
 
 msgctxt "field:analytic_account.account,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.account,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,account:"
 msgid "Account"
-msgstr "Cuenta"
+msgstr ""
 
 msgctxt "field:analytic_account.line,active:"
 msgid "Active"
-msgstr "Activa"
+msgstr ""
 
 msgctxt "field:analytic_account.line,company:"
 msgid "Company"
-msgstr "Empresa"
+msgstr ""
 
 msgctxt "field:analytic_account.line,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,credit:"
 msgid "Credit"
-msgstr "Haber"
+msgstr ""
 
 msgctxt "field:analytic_account.line,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.line,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:analytic_account.line,date:"
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
 
 msgctxt "field:analytic_account.line,debit:"
 msgid "Debit"
-msgstr "Debe"
+msgstr ""
 
 msgctxt "field:analytic_account.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.line,journal:"
 msgid "Journal"
-msgstr "Diario"
+msgstr ""
 
 msgctxt "field:analytic_account.line,move_line:"
 msgid "Account Move Line"
-msgstr "Apunte contable"
+msgstr ""
 
 msgctxt "field:analytic_account.line,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.line,party:"
 msgid "Party"
-msgstr "Entidad"
+msgstr ""
 
 msgctxt "field:analytic_account.line,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:analytic_account.line,reference:"
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 msgctxt "field:analytic_account.line,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.line,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,end_date:"
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:analytic_account.open_chart.start,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr ""
 
 msgctxt "model:analytic.account.entry,name:"
 msgid "Analytic Account Entry"
-msgstr "Asiento cuenta analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.account,name:"
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.line,name:"
 msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr ""
 
 msgctxt "model:analytic_account.open_chart.start,name:"
 msgid "Open Chart of Accounts"
-msgstr "Abrir plan contable"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_list"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_tree"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_account_tree2"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_line_form"
 msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_open_account"
 msgid "Open Account"
-msgstr "Abrir cuenta"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_open_chart"
 msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_account_list"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_account_tree"
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_analytic_account_configuration"
 msgid "Analytic Account"
-msgstr "Contabilidad analítica"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_open_chart"
 msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr ""
 
 msgctxt "model:res.group,name:group_analytic_admin"
 msgid "Analytic Administration"
-msgstr "Administración de analítica"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,display_balance:"
 msgid "Credit - Debit"
-msgstr "Haber - Debe"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,display_balance:"
 msgid "Debit - Credit"
-msgstr "Debe - Haber"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Closed"
-msgstr "Cerrada"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,state:"
 msgid "Opened"
-msgstr "Abierta"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "Normal"
-msgstr "Normal"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "Root"
-msgstr "Raíz"
+msgstr ""
 
 msgctxt "selection:analytic_account.account,type:"
 msgid "View"
-msgstr "Vista"
+msgstr ""
 
 msgctxt "view:account.move.line:"
 msgid "Analytic"
@@ -377,8 +376,8 @@ msgstr ""
 
 msgctxt "wizard_button:analytic_account.open_chart,start,end:"
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 msgctxt "wizard_button:analytic_account.open_chart,start,open_:"
 msgid "Open"
-msgstr "Abrir"
+msgstr ""
diff --git a/setup.py b/setup.py
index 4232203..47d7a00 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
 
 requires = ['python-sql']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
@@ -81,6 +87,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
@@ -94,6 +101,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -110,4 +120,6 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
+    convert_2to3_doctests=['tests/scenario_analytic_account.rst'],
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 0a5d66b..678a810 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +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.
 
-from .test_analytic_account import suite
+try:
+    from trytond.modules.analytic_account.tests.test_analytic_account import suite
+except ImportError:
+    from .test_analytic_account import suite
 
 __all__ = ['suite']
diff --git a/tests/test_analytic_account.py b/tests/test_analytic_account.py
index 7806b4f..f3802bd 100644
--- a/tests/test_analytic_account.py
+++ b/tests/test_analytic_account.py
@@ -4,59 +4,66 @@ import unittest
 import doctest
 from decimal import Decimal
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
 from trytond.transaction import Transaction
+from trytond.pool import Pool
+
+from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.account.tests import create_chart, get_fiscalyear
 
 
 class AnalyticAccountTestCase(ModuleTestCase):
     'Test AnalyticAccount module'
     module = 'analytic_account'
 
-    def setUp(self):
-        super(AnalyticAccountTestCase, self).setUp()
-        self.fiscalyear = POOL.get('account.fiscalyear')
-        self.journal = POOL.get('account.journal')
-        self.move = POOL.get('account.move')
-        self.account = POOL.get('account.account')
-        self.analytic_account = POOL.get('analytic_account.account')
-        self.party = POOL.get('party.party')
-
-    def test0010account_debit_credit(self):
+    @with_transaction()
+    def test_account_debit_credit(self):
         'Test account debit/credit'
-        with Transaction().start(DB_NAME, USER,
-                context=CONTEXT) as transaction:
-            party = self.party(name='Party')
-            party.save()
-            root, = self.analytic_account.create([{
+        pool = Pool()
+        Party = pool.get('party.party')
+        AnalyticAccount = pool.get('analytic_account.account')
+        Journal = pool.get('account.journal')
+        Account = pool.get('account.account')
+        Move = pool.get('account.move')
+        transaction = Transaction()
+
+        party = Party(name='Party')
+        party.save()
+        company = create_company()
+        with set_company(company):
+            root, = AnalyticAccount.create([{
                         'type': 'root',
                         'name': 'Root',
                         }])
-            analytic_account, = self.analytic_account.create([{
+            analytic_account, = AnalyticAccount.create([{
                         'type': 'normal',
                         'name': 'Analytic Account',
                         'parent': root.id,
                         'root': root.id,
                         }])
-            fiscalyear, = self.fiscalyear.search([])
+            create_chart(company)
+            fiscalyear = get_fiscalyear(company)
+            fiscalyear.save()
+            fiscalyear.create_period([fiscalyear])
             period = fiscalyear.periods[0]
-            journal_revenue, = self.journal.search([
+            journal_revenue, = Journal.search([
                     ('code', '=', 'REV'),
                     ])
-            journal_expense, = self.journal.search([
+            journal_expense, = Journal.search([
                     ('code', '=', 'EXP'),
                     ])
-            revenue, = self.account.search([
+            revenue, = Account.search([
                     ('kind', '=', 'revenue'),
                     ])
-            receivable, = self.account.search([
+            receivable, = Account.search([
                     ('kind', '=', 'receivable'),
                     ])
-            expense, = self.account.search([
+            expense, = Account.search([
                     ('kind', '=', 'expense'),
                     ])
-            payable, = self.account.search([
+            payable, = Account.search([
                     ('kind', '=', 'payable'),
                     ])
 
@@ -111,21 +118,21 @@ class AnalyticAccountTestCase(ModuleTestCase):
                         ],
                     },
                 ]
-            self.move.create(vlist)
+            Move.create(vlist)
 
             self.assertEqual((analytic_account.debit, analytic_account.credit),
                 (Decimal(30), Decimal(100)))
             self.assertEqual(analytic_account.balance, Decimal(70))
 
             with transaction.set_context(start_date=period.end_date):
-                analytic_account = self.analytic_account(analytic_account.id)
+                analytic_account = AnalyticAccount(analytic_account.id)
                 self.assertEqual((analytic_account.debit,
                         analytic_account.credit),
                     (Decimal(0), Decimal(0)))
                 self.assertEqual(analytic_account.balance, Decimal(0))
 
             with transaction.set_context(end_date=period.end_date):
-                analytic_account = self.analytic_account(analytic_account.id)
+                analytic_account = AnalyticAccount(analytic_account.id)
                 self.assertEqual((analytic_account.debit,
                         analytic_account.credit),
                     (Decimal(30), Decimal(100)))
@@ -134,13 +141,10 @@ class AnalyticAccountTestCase(ModuleTestCase):
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
-    from trytond.modules.account.tests import test_account
-    for test in test_account.suite():
-        if test not in suite and not isinstance(test, doctest.DocTestCase):
-            suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         AnalyticAccountTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_analytic_account.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index 47f37a8..c595c8a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     account
     company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index 296291b..158a7a3 100644
--- a/trytond_analytic_account.egg-info/PKG-INFO
+++ b/trytond_analytic_account.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-account
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for analytic accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_analytic_account
         ========================
         
@@ -54,6 +54,7 @@ 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 :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_analytic_account.egg-info/SOURCES.txt b/trytond_analytic_account.egg-info/SOURCES.txt
index dc7f6b1..18ebf27 100644
--- a/trytond_analytic_account.egg-info/SOURCES.txt
+++ b/trytond_analytic_account.egg-info/SOURCES.txt
@@ -60,11 +60,13 @@ locale/fr_FR.po
 locale/hu_HU.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/lo_LA.po
 locale/lt_LT.po
 locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+locale/zh_CN.po
 trytond_analytic_account.egg-info/PKG-INFO
 trytond_analytic_account.egg-info/SOURCES.txt
 trytond_analytic_account.egg-info/dependency_links.txt
diff --git a/trytond_analytic_account.egg-info/requires.txt b/trytond_analytic_account.egg-info/requires.txt
index 16b862e..681ae14 100644
--- a/trytond_analytic_account.egg-info/requires.txt
+++ b/trytond_analytic_account.egg-info/requires.txt
@@ -1,6 +1,6 @@
 python-sql
-trytond_account >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_currency >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_currency >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
-- 
tryton-modules-analytic-account



More information about the tryton-debian-vcs mailing list