[tryton-debian-vcs] tryton-modules-company-work-time branch upstream updated. upstream/3.8.0-2-gd22b521
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:14:25 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-company-work-time.git;a=commitdiff;h=upstream/3.8.0-2-gd22b521
commit d22b5218212b1bbfd2fbc71dbb76f1c0153662b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:18 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 37ae9d2..0fbc634 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 cb5a47c..9c897cd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company_work_time
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 5704bda..cb12b48 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,20 +4,20 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
-msgstr ""
+msgstr "ຊົ່ວໂມງຕໍ່ມື້ວຽກ"
msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
-msgstr ""
+msgstr "ຊົ່ວໂມງຕໍ່ເດືອນ"
msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
-msgstr ""
+msgstr "ຊົ່ວໂມງຕໍ່ອາທິດ"
msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
-msgstr ""
+msgstr "ຊົ່ວໂມງຕໍ່ປີ"
msgctxt "view:company.company:"
msgid "Work Time"
-msgstr ""
+msgstr "ເວລາວຽກ"
diff --git a/tryton.cfg b/tryton.cfg
index 8435353..d3cbae7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
company
ir
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index c222608..48b7c6e 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-company-work-time
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index 0ee7d42..6df74d1 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -25,11 +25,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_work_time.py
./view/company_form.xml
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index 6f0b35b..90eabaf 100644
--- a/trytond_company_work_time.egg-info/requires.txt
+++ b/trytond_company_work_time.egg-info/requires.txt
@@ -1,2 +1,2 @@
trytond_company >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit fc8ec471deb8337b0b355cec7c82edcaeb47ffb6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:00 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 501f571..37ae9d2 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 718e584..6f27a5e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-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 29bd152..cb5a47c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company_work_time
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add work time on company
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_work_time
=========================
@@ -55,6 +55,8 @@ Classifier: Intended Audience :: Legal Industry
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 +70,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 851f6c4..aa302ed 100644
--- a/company.py
+++ b/company.py
@@ -5,10 +5,10 @@ from trytond.pool import PoolMeta
__all__ = ['Company']
-__metaclass__ = PoolMeta
class Company:
+ __metaclass__ = PoolMeta
__name__ = 'company.company'
hours_per_work_day = fields.Float("Hours per Work Day", required=True)
diff --git a/company.xml b/company.xml
index d985d9b..7fbd0bb 100644
--- a/company.xml
+++ b/company.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="company_view_form">
<field name="model">company.company</field>
- <field name="type">form</field>
+ <field name="type" eval="None"/>
<field name="inherit" ref="company.company_view_form"/>
<field name="name">company_form</field>
</record>
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 44aa256..8a759c8 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -20,4 +20,4 @@ msgstr "Óra per év"
msgctxt "view:company.company:"
msgid "Work Time"
-msgstr ""
+msgstr "Minkaidő"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 83%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
index 44aa256..5704bda 100644
--- a/locale/hu_HU.po
+++ b/locale/lo_LA.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
-msgstr "Óra per nap"
+msgstr ""
msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
-msgstr "Óra per hónap"
+msgstr ""
msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
-msgstr "Óra per hét"
+msgstr ""
msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
-msgstr "Óra per év"
+msgstr ""
msgctxt "view:company.company:"
msgid "Work Time"
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 83%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index 44aa256..5704bda 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
-msgstr "Óra per nap"
+msgstr ""
msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
-msgstr "Óra per hónap"
+msgstr ""
msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
-msgstr "Óra per hét"
+msgstr ""
msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
-msgstr "Óra per év"
+msgstr ""
msgctxt "view:company.company:"
msgid "Work Time"
diff --git a/res.py b/res.py
index 3c12920..f8972fa 100644
--- a/res.py
+++ b/res.py
@@ -4,10 +4,10 @@ from trytond.pool import PoolMeta
__all__ = ['User']
-__metaclass__ = PoolMeta
class User:
+ __metaclass__ = PoolMeta
__name__ = 'res.user'
@classmethod
diff --git a/setup.py b/setup.py
index 5840b2a..45d5fe2 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'))
@@ -75,6 +81,8 @@ setup(name=name,
'Intended Audience :: Manufacturing',
'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',
@@ -88,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',
@@ -101,4 +112,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 23cba96..189b6c7 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_company_work_time import suite
+try:
+ from trytond.modules.company_work_time.tests.test_company_work_time import suite
+except ImportError:
+ from .test_company_work_time import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 0c34954..8435353 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
company
ir
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index 5a6a98e..c222608 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-company-work-time
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add work time on company
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_work_time
=========================
@@ -55,6 +55,8 @@ Classifier: Intended Audience :: Legal Industry
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 +70,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_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index da8e7c8..0ee7d42 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -47,11 +47,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_work_time.egg-info/PKG-INFO
trytond_company_work_time.egg-info/SOURCES.txt
trytond_company_work_time.egg-info/dependency_links.txt
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index b7f3aef..6f0b35b 100644
--- a/trytond_company_work_time.egg-info/requires.txt
+++ b/trytond_company_work_time.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_company >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-company-work-time
More information about the tryton-debian-vcs
mailing list