[tryton-debian-vcs] tryton-modules-company branch debian updated. debian/3.8.0-2-5-g65e7f6f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:13:00 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=debian/3.8.0-2-5-g65e7f6f
commit 65e7f6fb4741b8b021c8c1699fe52f5a1514bec5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:21 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index cc2ceb0..9d4c8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-company (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:28:37 +0200
+
tryton-modules-company (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 2f97151232873acceee4c0f69a7164b4d411b7a0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 46caba0..e58742c 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: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 2f7a5776c14cf64f1e9641745e60f2fc654e0fd0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:18 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 577b063..632dbf1 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 53a75e6..bd1dd5c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 4c0afd6..4020ed4 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -48,7 +48,7 @@ msgstr "ຊື່"
msgctxt "field:company.company,timezone:"
msgid "Timezone"
-msgstr ""
+msgstr "ເຂດເວລາ"
msgctxt "field:company.company,write_date:"
msgid "Write Date"
@@ -304,7 +304,7 @@ msgstr "ຍົກເລີກ"
msgctxt "wizard_button:company.company.config,start,company:"
msgid "OK"
-msgstr ""
+msgstr "ຕົກລົງ"
msgctxt "wizard_button:company.company.config,start,end:"
msgid "Cancel"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index ff92f53..0e45739 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -268,7 +268,7 @@ msgstr "Zadeva:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr "Ustvari družbo"
+msgstr "Nova družba"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
diff --git a/tryton.cfg b/tryton.cfg
index 9213246..64285cf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 2a26a32..51e78fe 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index b538977..9481bcd 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -30,11 +30,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/test_company.py
./tests/tools.py
diff --git a/trytond_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index 95c4cf6..5728c4b 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_party >= 4.0, < 4.1
trytond >= 4.0, < 4.1
[timezone]
-pytz
\ No newline at end of file
+pytz
commit 93c637f81e9dc3731903bdb7ba454c43e29b031e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:00 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index ad653a4..577b063 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)
* Remove header_A4.odt style
diff --git a/COPYRIGHT b/COPYRIGHT
index 4c7ddcd..fcc5eeb 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.
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 b5909a8..53a75e6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with companies and employees
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_company
===============
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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/company.py b/company.py
index 4fb2278..5bb98d4 100644
--- a/company.py
+++ b/company.py
@@ -7,7 +7,6 @@ from trytond.report import Report
from trytond.pyson import Eval, If
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
-from trytond.backend.database import CursorInterface
try:
import pytz
@@ -16,12 +15,11 @@ except ImportError:
TIMEZONES = []
TIMEZONES += [(None, '')]
-CursorInterface.cache_keys.update({'company', 'employee'})
+Transaction.cache_keys.update({'company', 'employee'})
__all__ = ['Company', 'Employee', 'UserEmployee', 'User', 'Property',
'Sequence', 'SequenceStrict', 'Date', 'CompanyConfigStart',
'CompanyConfig', 'CompanyReport', 'LetterReport', 'Rule']
-__metaclass__ = PoolMeta
class Company(ModelSQL, ModelView):
@@ -82,6 +80,7 @@ class UserEmployee(ModelSQL):
class User:
+ __metaclass__ = PoolMeta
__name__ = 'res.user'
main_company = fields.Many2One('company.company', 'Main Company')
company = fields.Many2One('company.company', 'Current Company',
@@ -259,6 +258,7 @@ class User:
class Property:
+ __metaclass__ = PoolMeta
__name__ = 'ir.property'
company = fields.Many2One('company.company', 'Company',
domain=[
@@ -288,6 +288,7 @@ class Property:
class Sequence:
+ __metaclass__ = PoolMeta
__name__ = 'ir.sequence'
company = fields.Many2One('company.company', 'Company',
domain=[
@@ -310,6 +311,7 @@ class SequenceStrict(Sequence):
class Date:
+ __metaclass__ = PoolMeta
__name__ = 'ir.date'
@classmethod
@@ -372,6 +374,7 @@ class LetterReport(CompanyReport):
class Rule:
+ __metaclass__ = PoolMeta
__name__ = 'ir.rule'
@classmethod
diff --git a/cron.py b/cron.py
index f4756bf..27b4243 100644
--- a/cron.py
+++ b/cron.py
@@ -6,10 +6,10 @@ from trytond.transaction import Transaction
__all__ = ['Cron', 'CronCompany']
-__metaclass__ = PoolMeta
class Cron:
+ __metaclass__ = PoolMeta
__name__ = "ir.cron"
companies = fields.Many2Many('ir.cron-company.company', 'cron', 'company',
'Companies', help='Companies registered for this cron')
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 8b3d0a4..a4633e0 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -252,19 +252,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Потребител - Служител"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "С уважение,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Дата:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Уважаеми дами и годпода,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Относно:"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 17ad341..e3b5543 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuari - Emprat"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Atentament,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Data:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Estimats senyors i senyores,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Assumpte:"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index d56711e..c84d66b 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f7be140..b145a5e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Benutzer - Mitarbeiter"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Mit freundlichen Grüßen,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Datum:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Sehr geehrte Damen und Herren,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Betreff:"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 71c5ed7..bd66100 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuario - Empleado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Atentamente,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Fecha:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Estimados señores y señoras,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Asunto:"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index adcb91b..b859a42 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuario - Empleado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Atentamente,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Fecha:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Estimados Señores y Señoras,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Asunto:"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index ee38298..6aa5e14 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuario - Empleado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Saludos cordiales,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Fecha:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Estimados señores y señoras,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Asunto:"
@@ -272,7 +272,7 @@ msgstr "Crear empresa"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr "Ahora puede añadir su empresa al sistema."
+msgstr "Ahora puede agregar su empresa al sistema."
msgctxt "view:company.company:"
msgid "Companies"
@@ -296,7 +296,7 @@ msgstr "Empleados"
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
-msgstr "Añadir"
+msgstr "Agregar"
msgctxt "wizard_button:company.company.config,company,end:"
msgid "Cancel"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index d3c4387..1cb37d7 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuario - Empleado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Atentamente,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Fecha:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Estimados señores y señoras,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Asunto:"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 40a0af5..5c7d717 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuario - Empleado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr ""
@@ -274,25 +274,29 @@ msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
msgstr ""
+#, fuzzy
msgctxt "view:company.company:"
msgid "Companies"
-msgstr ""
+msgstr "Empresas"
+#, fuzzy
msgctxt "view:company.company:"
msgid "Company"
-msgstr ""
+msgstr "Empresa"
msgctxt "view:company.company:"
msgid "Reports"
msgstr ""
+#, fuzzy
msgctxt "view:company.employee:"
msgid "Employee"
-msgstr ""
+msgstr "Empleado"
+#, fuzzy
msgctxt "view:company.employee:"
msgid "Employees"
-msgstr ""
+msgstr "Empleados"
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 882f44e..3d60cdc 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Utilisateur - Employé"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Bien cordialement,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Date :"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Chère madame, cher monsieur,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Sujet :"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 916e4d5..b4cc92d 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -250,49 +250,49 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Felhasználó-Alkalmazott"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
-msgstr ""
+msgstr "Üdvözlettel,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
-msgstr ""
+msgstr "Dátum:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
-msgstr ""
+msgstr "Tisztelt Hölgyek és Urak,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
-msgstr ""
+msgstr "Tárgy:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr ""
+msgstr "Vállalat létrehozása"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr ""
+msgstr "Most tudja a rendszerhez hozzáadni a vállalatot."
msgctxt "view:company.company:"
msgid "Companies"
-msgstr ""
+msgstr "Társaságok"
msgctxt "view:company.company:"
msgid "Company"
-msgstr ""
+msgstr "Társaság"
msgctxt "view:company.company:"
msgid "Reports"
-msgstr ""
+msgstr "Jelentések"
msgctxt "view:company.employee:"
msgid "Employee"
-msgstr ""
+msgstr "Alkalmazott"
msgctxt "view:company.employee:"
msgid "Employees"
-msgstr ""
+msgstr "Alkalmazott"
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 73c6848..e05af63 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -281,19 +281,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Utente - Dipendente"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Cordiali Saluti,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Data:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Gentili Signore e Signori,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Oggetto:"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index d56711e..c84d66b 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/lo_LA.po
similarity index 61%
copy from locale/ja_JP.po
copy to locale/lo_LA.po
index d56711e..4c0afd6 100644
--- a/locale/ja_JP.po
+++ b/locale/lo_LA.po
@@ -4,47 +4,47 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,childs:"
msgid "Children"
-msgstr ""
+msgstr "ບໍລິສັດລູກ"
msgctxt "field:company.company,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
msgctxt "field:company.company,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
msgctxt "field:company.company,currency:"
msgid "Currency"
-msgstr ""
+msgstr "ສະກຸນເງິນ"
msgctxt "field:company.company,employees:"
msgid "Employees"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "field:company.company,footer:"
msgid "Footer"
-msgstr ""
+msgstr "ຕີນກະດາດ"
msgctxt "field:company.company,header:"
msgid "Header"
-msgstr ""
+msgstr "ຫົວກະດາດ"
msgctxt "field:company.company,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລກລໍາດັບ"
msgctxt "field:company.company,parent:"
msgid "Parent"
-msgstr ""
+msgstr "ບໍລິສັດແມ່"
msgctxt "field:company.company,party:"
msgid "Party"
-msgstr ""
+msgstr "ພາກສ່ວນ"
msgctxt "field:company.company,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
msgctxt "field:company.company,timezone:"
msgid "Timezone"
@@ -52,255 +52,255 @@ msgstr ""
msgctxt "field:company.company,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
msgctxt "field:company.company,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຊື່ຜູ້ໃຊ້"
msgctxt "field:company.company.config.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລກທີ"
msgctxt "field:company.employee,company:"
msgid "Company"
-msgstr ""
+msgstr "ສຳນັກງານ"
msgctxt "field:company.employee,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
msgctxt "field:company.employee,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
msgctxt "field:company.employee,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລກລຳດັບ"
msgctxt "field:company.employee,party:"
msgid "Party"
-msgstr ""
+msgstr "ພາກສ່ວນ"
msgctxt "field:company.employee,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
msgctxt "field:company.employee,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
msgctxt "field:company.employee,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
msgctxt "field:ir.cron,companies:"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "field:ir.cron-company.company,company:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "field:ir.cron-company.company,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
msgctxt "field:ir.cron-company.company,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
msgctxt "field:ir.cron-company.company,cron:"
msgid "Cron"
-msgstr ""
+msgstr "ຄຣອນ"
msgctxt "field:ir.cron-company.company,id:"
msgid "ID"
-msgstr ""
+msgstr "ບັດ"
msgctxt "field:ir.cron-company.company,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
msgctxt "field:ir.cron-company.company,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
msgctxt "field:ir.cron-company.company,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຊື່ຜູ້ໃຊ້"
msgctxt "field:ir.property,company:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "field:ir.sequence,company:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "field:ir.sequence.strict,company:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "field:res.user,companies:"
msgid "Current Companies"
-msgstr ""
+msgstr "ຜະແນກປະຈໍາການປັດຈຸບັນ"
msgctxt "field:res.user,company:"
msgid "Current Company"
-msgstr ""
+msgstr "ຜະແນກປັດຈຸບັນ"
msgctxt "field:res.user,employee:"
msgid "Current Employee"
-msgstr ""
+msgstr "ພະນັກງານປະຈໍາຜະແນກ"
msgctxt "field:res.user,employees:"
msgid "Employees"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "field:res.user,main_company:"
msgid "Main Company"
-msgstr ""
+msgstr "ບ່ອນປະຈຳການຫຼັກ"
msgctxt "field:res.user-company.employee,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
msgctxt "field:res.user-company.employee,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້"
msgctxt "field:res.user-company.employee,employee:"
msgid "Employee"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "field:res.user-company.employee,id:"
msgid "ID"
-msgstr ""
+msgstr "ບັດ"
msgctxt "field:res.user-company.employee,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "ຊື່"
msgctxt "field:res.user-company.employee,user:"
msgid "User"
-msgstr ""
+msgstr "ຜູ້ໃຊ້"
msgctxt "field:res.user-company.employee,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
msgctxt "field:res.user-company.employee,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຊື່ຜູ້ໃຊ້"
msgctxt "help:ir.cron,companies:"
msgid "Companies registered for this cron"
-msgstr ""
+msgstr "ບໍລິສັດລົງທະບຽນສຳລັບ chronograph ນີ້"
msgctxt "model:company.company,name:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "model:company.company.config.start,name:"
msgid "Company Config"
-msgstr ""
+msgstr "ການຕັ້ງຄ່າບໍລິສັດ"
msgctxt "model:company.employee,name:"
msgid "Employee"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "model:ir.action,name:act_company_config"
msgid "Configure Company"
-msgstr ""
+msgstr "ຕັ້ງຄ່າບໍລິສັດ"
msgctxt "model:ir.action,name:act_company_list"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "model:ir.action,name:act_company_tree"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "model:ir.action,name:act_employee_form"
msgid "Employees"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "model:ir.action,name:report_letter"
msgid "Letter"
-msgstr ""
+msgstr "ຫນັງສື"
msgctxt "model:ir.cron-company.company,name:"
msgid "Cron - Company"
-msgstr ""
+msgstr "ຄຣອນ - ບໍລິສັດ"
msgctxt "model:ir.ui.menu,name:menu_company_list"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "model:ir.ui.menu,name:menu_company_tree"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "model:ir.ui.menu,name:menu_employee_form"
msgid "Employees"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
-msgstr ""
+msgstr "ຜູ້ໃຊ້ - ພະນັກງານ"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
-msgstr ""
+msgstr "ດ້ວຍຄວາມເຄົາລົບ"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
-msgstr ""
+msgstr "ວັນທີ:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
-msgstr ""
+msgstr "ຮຽນ ທ່ານສຸພາບບຸລຸດ ແລະ ສຸພາບສະຕີ,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
-msgstr ""
+msgstr "ເລື່ອງ:"
msgctxt "view:company.company.config.start:"
msgid "Create Company"
-msgstr ""
+msgstr "ສ້າງບໍລິສັດ"
msgctxt "view:company.company.config.start:"
msgid "You can now add your company into the system."
-msgstr ""
+msgstr "ສາມາດຕື່ມບໍລິສັດເຈົ້າເຂົ້າໃນລະບົບໄດ້"
msgctxt "view:company.company:"
msgid "Companies"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "view:company.company:"
msgid "Company"
-msgstr ""
+msgstr "ບໍລິສັດ"
msgctxt "view:company.company:"
msgid "Reports"
-msgstr ""
+msgstr "ລາຍງາຍ"
msgctxt "view:company.employee:"
msgid "Employee"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "view:company.employee:"
msgid "Employees"
-msgstr ""
+msgstr "ພະນັກງານ"
msgctxt "wizard_button:company.company.config,company,add:"
msgid "Add"
-msgstr ""
+msgstr "ຕື່ມ"
msgctxt "wizard_button:company.company.config,company,end:"
msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
msgctxt "wizard_button:company.company.config,start,company:"
msgid "OK"
@@ -308,4 +308,4 @@ msgstr ""
msgctxt "wizard_button:company.company.config,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index d56711e..c84d66b 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 96839b6..303774f 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -257,19 +257,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Met vriendelijke groet,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Datum:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Geachte heer/mevrouw,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Betreft:"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4c49f6a..1421675 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Usuário - Empregado"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "Atenciosamente,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Data:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Caros senhores e senhoras,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Assunto:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 26d28d0..4ba54f7 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -251,19 +251,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Пользователь - Сотрудник"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "С уважением,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Дата:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Уважаемые дамы и годпода,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Тема:"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index b8aec35..ff92f53 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr "Uporabnik - Zaposlenec"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr "S spoštovanjem,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr "Datum:"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr "Spoštovani gospa in gospod,"
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr "Zadeva:"
diff --git a/locale/ja_JP.po b/locale/zh_CN.po
similarity index 97%
copy from locale/ja_JP.po
copy to locale/zh_CN.po
index d56711e..c84d66b 100644
--- a/locale/ja_JP.po
+++ b/locale/zh_CN.po
@@ -250,19 +250,19 @@ msgctxt "model:res.user-company.employee,name:"
msgid "User - Employee"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Best Regards,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Date:"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Dear Madams and Sirs,"
msgstr ""
-msgctxt "odt:party.letter:"
+msgctxt "report:party.letter:"
msgid "Subject:"
msgstr ""
diff --git a/party.py b/party.py
index f6b20df..3b90805 100644
--- a/party.py
+++ b/party.py
@@ -4,10 +4,10 @@ from trytond.pyson import Eval
from trytond.pool import PoolMeta
__all__ = ['PartyConfiguration']
-__metaclass__ = PoolMeta
class PartyConfiguration:
+ __metaclass__ = PoolMeta
__name__ = 'party.configuration'
@classmethod
diff --git a/setup.py b/setup.py
index fcb93f0..52f639a 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 = []
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'))
@@ -76,6 +82,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',
@@ -89,6 +96,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',
@@ -105,4 +115,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 899a23c..8026d9a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +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.
-from .test_company import suite
+try:
+ from trytond.modules.company.tests.test_company import (
+ suite, create_company, set_company)
+except ImportError:
+ from .test_company import suite, create_company, set_company
-__all__ = ['suite']
+__all__ = ['suite', 'create_company', 'set_company']
diff --git a/tests/test_company.py b/tests/test_company.py
index a46735b..1fb0ff1 100644
--- a/tests/test_company.py
+++ b/tests/test_company.py
@@ -1,143 +1,134 @@
# 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 unittest
-import doctest
+from contextlib import contextmanager
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.transaction import Transaction
+from trytond.pool import Pool
+
+from trytond.modules.currency.tests import create_currency, add_currency_rate
+
+
+def create_company(name='Dunder Mifflin', currency=None):
+ pool = Pool()
+ Party = pool.get('party.party')
+ Company = pool.get('company.company')
+
+ if currency is None:
+ currency = create_currency('usd')
+ add_currency_rate(currency, 1)
+
+ party, = Party.create([{
+ 'name': name,
+ 'addresses': [('create', [{}])],
+ }])
+ company = Company(party=party, currency=currency)
+ company.save()
+ return company
+
+
+ at contextmanager
+def set_company(company):
+ pool = Pool()
+ User = pool.get('res.user')
+ User.write([User(Transaction().user)], {
+ 'main_company': company.id,
+ 'company': company.id,
+ })
+ with Transaction().set_context(User.get_preferences(context_only=True)):
+ yield
class CompanyTestCase(ModuleTestCase):
'Test Company module'
module = 'company'
- def setUp(self):
- super(CompanyTestCase, self).setUp()
- self.party = POOL.get('party.party')
- self.company = POOL.get('company.company')
- self.employee = POOL.get('company.employee')
- self.currency = POOL.get('currency.currency')
- self.user = POOL.get('res.user')
-
- def test0010company(self):
+ @with_transaction()
+ def test_company(self):
'Create company'
- with Transaction().start(DB_NAME, USER,
- context=CONTEXT) as transaction:
- currency1, = self.currency.search([
- ('code', '=', 'cu1'),
- ], 0, 1, None)
-
- party1, = self.party.create([{
- 'name': 'Dunder Mifflin',
- 'addresses': [('create', [{}])],
- }])
- company1, = self.company.create([{
- 'party': party1.id,
- 'currency': currency1.id,
- }])
- self.assert_(company1)
- transaction.cursor.commit()
-
- def test0020company_recursion(self):
+ company = create_company()
+ self.assert_(company)
+
+ @with_transaction()
+ def test_company_recursion(self):
'Test company recursion'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- currency1, = self.currency.search([
- ('code', '=', 'cu1'),
- ], 0, 1, None)
-
- company1, = self.company.search([
- ('rec_name', '=', 'Dunder Mifflin'),
- ], 0, 1, None)
-
- party2, = self.party.create([{
- 'name': 'Michael Scott Paper Company',
- }])
- company2, = self.company.create([{
- 'party': party2.id,
- 'parent': company1.id,
- 'currency': currency1.id,
- }])
- self.assert_(company2)
-
- self.assertRaises(Exception, self.company.write,
- [company1], {
- 'parent': company2.id,
- })
-
- def test0030employe(self):
+ pool = Pool()
+ Company = pool.get('company.company')
+
+ company1 = create_company()
+ company2 = create_company('Michael Scott Paper Company')
+ company2.parent = company1
+ company2.save()
+ self.assert_(company2)
+
+ self.assertRaises(Exception, Company.write,
+ [company1], {
+ 'parent': company2.id,
+ })
+
+ @with_transaction()
+ def test_employe(self):
'Create employee'
- with Transaction().start(DB_NAME, USER,
- context=CONTEXT) as transaction:
- company1, = self.company.search([
- ('rec_name', '=', 'Dunder Mifflin'),
- ], 0, 1, None)
-
- party, = self.party.create([{
- 'name': 'Pam Beesly',
- }])
- self.employee.create([{
- 'party': party.id,
- 'company': company1.id,
- }])
- transaction.cursor.commit()
-
- def test0040user(self):
+ pool = Pool()
+ Party = pool.get('party.party')
+ Employee = pool.get('company.employee')
+ company1 = create_company()
+
+ party, = Party.create([{
+ 'name': 'Pam Beesly',
+ }])
+ employee, = Employee.create([{
+ 'party': party.id,
+ 'company': company1.id,
+ }])
+ self.assert_(employee)
+
+ @with_transaction()
+ def test_user(self):
'Test user company'
- with Transaction().start(DB_NAME, USER,
- context=CONTEXT) as transaction:
- currency1, = self.currency.search([
- ('code', '=', 'cu1'),
- ], 0, 1, None)
-
- company1, = self.company.search([
- ('rec_name', '=', 'Dunder Mifflin'),
- ], 0, 1, None)
-
- party2, = self.party.create([{
- 'name': 'Michael Scott Paper Company',
- }])
- company2, = self.company.create([{
- 'party': party2.id,
- 'parent': company1.id,
- 'currency': currency1.id,
- }])
- user1, user2 = self.user.create([{
- 'name': 'Jim Halper',
- 'login': 'jim',
- 'main_company': company1.id,
- 'company': company1.id,
- }, {
- 'name': 'Pam Beesly',
- 'login': 'pam',
- 'main_company': company2.id,
- 'company': company2.id,
- }])
- self.assert_(user1)
-
- with transaction.set_user(user1.id):
- user1, user2 = self.user.browse([user1.id, user2.id])
- self.assertEqual(user1.company, company1)
+ pool = Pool()
+ User = pool.get('res.user')
+ transaction = Transaction()
+
+ company1 = create_company()
+ company2 = create_company('Michael Scott Paper Company',
+ currency=company1.currency)
+ company2.parent = company1
+ company2.save()
+
+ user1, user2 = User.create([{
+ 'name': 'Jim Halper',
+ 'login': 'jim',
+ 'main_company': company1.id,
+ 'company': company1.id,
+ }, {
+ 'name': 'Pam Beesly',
+ 'login': 'pam',
+ 'main_company': company2.id,
+ 'company': company2.id,
+ }])
+ self.assert_(user1)
+
+ with transaction.set_user(user1.id):
+ user1, user2 = User.browse([user1.id, user2.id])
+ self.assertEqual(user1.company, company1)
+ self.assertEqual(user2.company, company2)
+
+ with transaction.set_context({'company': company2.id}):
+ user1, user2 = User.browse([user1.id, user2.id])
+ self.assertEqual(user1.company, company2)
self.assertEqual(user2.company, company2)
- with transaction.set_context({'company': company2.id}):
- user1, user2 = self.user.browse([user1.id, user2.id])
- self.assertEqual(user1.company, company2)
- self.assertEqual(user2.company, company2)
-
- with transaction.set_context({'company': None}):
- user1, user2 = self.user.browse([user1.id, user2.id])
- self.assertEqual(user1.company, None)
- self.assertEqual(user2.company, company2)
+ with transaction.set_context({'company': None}):
+ user1, user2 = User.browse([user1.id, user2.id])
+ self.assertEqual(user1.company, None)
+ self.assertEqual(user2.company, company2)
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.currency.tests import test_currency
- for test in test_currency.suite():
- if test not in suite and not isinstance(test, doctest.DocTestCase):
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
CompanyTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 42852b6..9213246 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index a534e8e..2a26a32 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with companies and employees
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_company
===============
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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_company.egg-info/SOURCES.txt b/trytond_company.egg-info/SOURCES.txt
index 8a3a972..b538977 100644
--- a/trytond_company.egg-info/SOURCES.txt
+++ b/trytond_company.egg-info/SOURCES.txt
@@ -65,11 +65,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_company.egg-info/PKG-INFO
trytond_company.egg-info/SOURCES.txt
trytond_company.egg-info/dependency_links.txt
diff --git a/trytond_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index d3be367..95c4cf6 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_currency >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
+trytond_currency >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
[timezone]
pytz
\ No newline at end of file
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list