[tryton-debian-vcs] tryton-modules-company-work-time branch debian created. 156a89f7f563cd057b7a9c7a28c1e1a5e4fafc03
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00:58 UTC 2013
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-work-time.git;a=commitdiff;h=156a89f7f563cd057b7a9c7a28c1e1a5e4fafc03
commit 156a89f7f563cd057b7a9c7a28c1e1a5e4fafc03
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:12 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 389eecb..5d5860a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company-work-time (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:53:58 +0100
+
tryton-modules-company-work-time (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit ca7ef4c3eafbb998a6ace26fb2188ecb75103bc5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 38091bb..bc54c21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 6e8be0b2e3ec1606ce41a1179fc8bdbc65a440fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 4a43961..38091bb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-company-work-time.git
commit 02a858bfd42c54aaabcf059858a1cf635e524a4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:00 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index f55732b..46280a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8ccebe9..d634d49 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_company_work_time
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_company_work_time
=========================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c0d3cca..b957183 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -21,7 +21,3 @@ msgstr "Heures par année de travail"
msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Temps de travail"
-
-msgctxt "view:company.company:"
-msgid "Work Time"
-msgstr "Temps de travail"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 63%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index c0d3cca..b939cf5 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,24 +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 "Heures par journée de travail"
+msgstr "Ure na delovni dan"
msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
-msgstr "Heures par mois de travail"
+msgstr "Ure na delovni mesec"
msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
-msgstr "Heures par semaine de travail"
+msgstr "Ure na delovni teden"
msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
-msgstr "Heures par année de travail"
+msgstr "Ure na delovno leto"
msgctxt "view:company.company:"
msgid "Work Time"
-msgstr "Temps de travail"
-
-msgctxt "view:company.company:"
-msgid "Work Time"
-msgstr "Temps de travail"
+msgstr "Delovni čas"
diff --git a/setup.py b/setup.py
index 61f3939..1f0b65f 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_company_work_time',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index ad29fa8..a2eb4f5 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_company_work_time import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 97bcda9..96bd8a0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.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 a3e8658..fdc22d5 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_company_work_time
=========================
@@ -60,6 +60,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index 849af7d..0932723 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -23,6 +23,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.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 f513636..d73da32 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 >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_company >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit cc40421a96fdfb2d994c8b8ad1b598548ebd302a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 6 16:20:51 2013 +0200
Releasing debian version 2.8.0-3.
diff --git a/debian/changelog b/debian/changelog
index dcfd7b2..389eecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-company-work-time (2.8.0-3) unstable; urgency=low
+
+ * Adapting the rules file to work also with git-buildpackage.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 06 Aug 2013 13:32:47 +0200
+
tryton-modules-company-work-time (2.8.0-2) unstable; urgency=low
* Adding doc/ to docs file.
commit b159d210b8a2e029748657d19c4fe25837728bbf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Aug 5 18:06:36 2013 +0200
Adapting the rules file to work also with git-buildpackage.
diff --git a/debian/rules b/debian/rules
index a6a1fb8..30074ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := $(shell python setup.py --name)
%:
dh ${@} --with python2
override_dh_auto_clean:
dh_auto_clean
+
+override_dh_auto_build:
+ mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
+ mv PKG-INFO PKG-INFO.hen
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
rm -rf *.egg-info
+ mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
+ mv PKG-INFO.hen PKG-INFO
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 2c321d691c82a9d451a2a4ad6ff8ac4cd8e1e444
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 31 19:57:27 2013 +0200
Releasing debian version 2.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index c72b76e..dcfd7b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company-work-time (2.8.0-2) unstable; urgency=low
+
+ * Adding doc/ to docs file.
+ * Simplifying package layout by renaming <pkg_name>.docs to docs.
+ * Removing needless empty line in rules.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 31 May 2013 17:26:25 +0200
+
tryton-modules-company-work-time (2.8.0-1) experimental; urgency=low
* Merging upstream version 2.8.0.
commit b4f2d82c904bde25388d1cdbbc7e24d2e37a6ca5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:19:29 2013 +0200
Removing needless empty line in rules.
diff --git a/debian/rules b/debian/rules
index 0f63ab4..a6a1fb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
override_dh_auto_clean:
dh_auto_clean
-
rm -rf *.egg-info
override_dh_gencontrol:
commit 2d8739ac4c1cca204bfd85bcb3386c9680bf63d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 29 17:01:48 2013 +0200
Simplifying package layout by renaming <pkg_name>.docs to docs.
Thanks to Andreas Tille for this proposal. Since tryton module packages
will most probably stay simple binary packages this change simplifies the
package layout.
diff --git a/debian/tryton-modules-company-work-time.docs b/debian/docs
similarity index 100%
rename from debian/tryton-modules-company-work-time.docs
rename to debian/docs
commit cff716d8a8d14b312d3e0e7be0daa14a743cbd91
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 14 18:54:41 2013 +0200
Adding doc/ to docs file.
diff --git a/debian/tryton-modules-company-work-time.docs b/debian/tryton-modules-company-work-time.docs
new file mode 100644
index 0000000..a2e6bd4
--- /dev/null
+++ b/debian/tryton-modules-company-work-time.docs
@@ -0,0 +1 @@
+doc/
commit 02609a5eb455ecdcde47e850c10e18afd634893f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 17:27:05 2013 +0200
Releasing debian version 2.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 36e0b3b..c72b76e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-company-work-time (2.8.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.8.0.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 02 May 2013 15:20:03 +0200
+
tryton-modules-company-work-time (2.6.0-4) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704378).
commit 814169951a4464edbf8bc968166e3e2ff4986e4a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 14:13:10 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index cbad1dd..34d373e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2012 Cédric Krier
+Copyright: 2009-2013 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2012 B2CK SPRL
+ 2009-2013 B2CK SPRL
License: GPL-3+
Files: debian/*
commit fbd9ba55c5fef6a361dacbf2bc9680f626353a60
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:57 2013 +0200
Merging upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 69d70f9..f55732b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 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/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 88c8da7..8ccebe9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_company_work_time
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_company_work_time
=========================
diff --git a/company.xml b/company.xml
index 688c39e..d985d9b 100644
--- a/company.xml
+++ b/company.xml
@@ -8,26 +8,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">company.company</field>
<field name="type">form</field>
<field name="inherit" ref="company.company_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id="general"]"
- position="after">
- <page string="Work Time" id="work_time">
- <label name="hours_per_work_day"/>
- <field name="hours_per_work_day"/>
- <label name="hours_per_work_week"/>
- <field name="hours_per_work_week"/>
- <label name="hours_per_work_month"/>
- <field name="hours_per_work_month"/>
- <label name="hours_per_work_year"/>
- <field name="hours_per_work_year"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">company_form</field>
</record>
</data>
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 5704bda..fe171bb 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.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/setup.py b/setup.py
index 4a4671a..61f3939 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_company_work_time',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_company_work_time',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.company_work_time': '.'},
packages=[
'trytond.modules.company_work_time',
'trytond.modules.company_work_time.tests',
],
package_data={
- 'trytond.modules.company_work_time': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.company_work_time': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index 877bb3a..97bcda9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.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 f91773d..a3e8658 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.0
+Metadata-Version: 1.1
Name: trytond-company-work-time
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_company_work_time
=========================
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index 4e138e6..849af7d 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -29,4 +29,5 @@ trytond_company_work_time.egg-info/dependency_links.txt
trytond_company_work_time.egg-info/entry_points.txt
trytond_company_work_time.egg-info/not-zip-safe
trytond_company_work_time.egg-info/requires.txt
-trytond_company_work_time.egg-info/top_level.txt
\ No newline at end of file
+trytond_company_work_time.egg-info/top_level.txt
+view/company_form.xml
\ No newline at end of file
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index d5f26de..f513636 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 >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_company >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/company_form.xml b/view/company_form.xml
new file mode 100644
index 0000000..c4335ce
--- /dev/null
+++ b/view/company_form.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/notebook/page[@id='company']" position="after">
+ <page string="Work Time" id="work_time">
+ <label name="hours_per_work_day"/>
+ <field name="hours_per_work_day"/>
+ <label name="hours_per_work_week"/>
+ <field name="hours_per_work_week"/>
+ <label name="hours_per_work_month"/>
+ <field name="hours_per_work_month"/>
+ <label name="hours_per_work_year"/>
+ <field name="hours_per_work_year"/>
+ </page>
+ </xpath>
+</data>
commit 3147e023ee2101b687df0406a0dd43e481511535
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 18:44:44 2013 +0200
Releasing debian version 2.6.0-4.
diff --git a/debian/changelog b/debian/changelog
index 7295041..36e0b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-company-work-time (2.6.0-4) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704378).
+ * Improving update of major version in Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 27 Apr 2013 15:06:53 +0200
+
tryton-modules-company-work-time (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 9592c440208fe3aeee0b5278dc16beb676db930e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 27 14:54:48 2013 +0200
Improving update of major version in Depends.
Pulling the major version for Depends directly from the package version.
Thanks to Ilya Melnikov for pushing the idea.
diff --git a/debian/control b/debian/control
index 8e24ac5..4a43961 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
%:
dh ${@} --with python2
@@ -8,5 +10,8 @@ override_dh_auto_clean:
rm -rf *.egg-info
+override_dh_gencontrol:
+ dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
override_dh_builddeb:
dh_builddeb -- -Zxz -z9
commit 28ab407715e06b4f7918aba649a17063dc955a7e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Apr 21 23:30:01 2013 +0200
Removing Daniel from Uploaders. Thanks for your work! (Closes: #704378).
diff --git a/debian/control b/debian/control
index 55bf484..8e24ac5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tryton-modules-company-work-time
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
-Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 52db05fbf6721f95d308ac70461a3f0638a746fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 15:04:03 2013 +0100
Releasing debian version 2.6.0-3.
diff --git a/debian/changelog b/debian/changelog
index 76c6ff7..7295041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-company-work-time (2.6.0-3) experimental; urgency=low
+
+ * Updating Vcs-Git to correct address.
+ * Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 Mar 2013 14:00:33 +0100
+
tryton-modules-company-work-time (2.6.0-2) experimental; urgency=low
* Removing obsolete Dm-Upload-Allowed
commit 062ca323ed481a185dd00957b5e953c4865e8934
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Mar 23 13:52:32 2013 +0100
Adding watch file. Thanks to Bart Martens <bartm at debian.org>.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..fba2ceb
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://downloads.tryton.org/current/ .*trytond_company_work_time-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit fe35f0725c66b79e8f7927950704be1b4a6de388
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 23 20:08:09 2013 +0100
Updating Vcs-Git to correct address.
diff --git a/debian/control b/debian/control
index ce19fae..55bf484 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
-Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-company-work-time.git
+Vcs-Git: git://debian.tryton.org/packages/tryton-modules-company-work-time.git
X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
commit dea723e1c99d90c7c958be2da45244aa72d12558
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 17 13:50:40 2013 +0100
Releasing debian version 2.6.0-2.
diff --git a/debian/changelog b/debian/changelog
index 4c1bb64..76c6ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company-work-time (2.6.0-2) experimental; urgency=low
+
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 16 Feb 2013 21:38:17 +0100
+
tryton-modules-company-work-time (2.6.0-1) experimental; urgency=low
* Merging upstream version 2.6.0.
commit 512d7753e20334f7b065fd8ef1be53e059e5ca0d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Feb 16 21:29:19 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 99aff32..cbad1dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2009-2012 Cedric Krier
+Copyright: 2009-2012 Cédric Krier
2009-2012 Bertrand Chenal
2009-2012 B2CK SPRL
License: GPL-3+
@@ -10,7 +9,7 @@ License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2013 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 88c3639c15a5549c47f6b4d60b6671c038f12957
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 19:28:28 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 2fe90a9..ce19fae 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-company-work-time.git
commit 7f7d47da0d39f04198a04e7ac995e0d63aae63a4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 13 21:37:13 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index f315905..2fe90a9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
commit 6b5a6e8288b60e48ff6948d4f36c120dedddce79
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 22:01:55 2012 +0200
Releasing debian version 2.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index b17593d..4c1bb64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-company-work-time (2.6.0-1) experimental; urgency=low
+
+ * Merging upstream version 2.6.0.
+ * Bumping versioned tryton depends to 2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 24 Oct 2012 14:24:22 +0200
+
tryton-modules-company-work-time (2.4.0-2) experimental; urgency=low
[ Daniel Baumann ]
commit bc41422725135b89d37934fd85a04d1cb5a0063a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:59:46 2012 +0200
Bumping versioned tryton depends to 2.6.
diff --git a/debian/control b/debian/control
index 0ede62e..f315905 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
- tryton-modules-company (>= 2.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ tryton-modules-company (>= 2.6), python-pkg-resources
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 39ce5dd38d03aba0f734a73b75ddc84684c83af6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:31 2012 +0200
Merging upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index da82946..69d70f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 67e2bb4..88c8da7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,49 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 2.4.0
-Summary:
-
+Version: 2.6.0
+Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_company_work_time
+ =========================
+
+ The company_work_time module of the Tryton application platform. See
+ __tryton__.py
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/__init__.py b/__init__.py
index 5f6f7fa..0074019 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,13 @@
#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 trytond.pool import Pool
from .company import *
from .res import *
+
+
+def register():
+ Pool.register(
+ Company,
+ User,
+ module='company_work_time', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 0687ad5..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Company Work Time',
- 'name_bg_BG': 'Работно време на фирма',
- 'name_ca_ES': 'Hores de treball a l''empresa',
- 'name_de_DE': 'Unternehmen Arbeitszeit',
- 'name_es_AR': 'Tiempo de trabajo en la empresa',
- 'name_es_CO': 'Tiempo de Trabajo en la Compañía',
- 'name_es_ES': 'Tiempo de trabajo en la empresa',
- 'name_fr_FR': 'Temps de travail dans la société',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''
-''',
- 'description_ca_ES': '''Afegeix les hores de treball al dia, setmana, mes i
-any per empresa.
-''',
- 'description_es_AR': '''Añade horas de trabajo por día, semana, mes y
-año por empresa.
-''',
- 'description_es_ES': '''Añade las horas de trabajo por día, semana, mes y
-año por empresa.
-''',
- 'depends': [
- 'ir',
- 'company',
- ],
- 'xml': [
- 'company.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/company.py b/company.py
index 732da26..3206618 100644
--- a/company.py
+++ b/company.py
@@ -1,27 +1,33 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-"Company"
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import fields
+from trytond.pool import PoolMeta
-class Company(ModelSQL, ModelView):
- _name = 'company.company'
+__all__ = ['Company']
+__metaclass__ = PoolMeta
+
+
+class Company:
+ __name__ = 'company.company'
hours_per_work_day = fields.Float("Hours per Work Day", required=True)
hours_per_work_week = fields.Float("Hours per Work Week", required=True)
hours_per_work_month = fields.Float("Hours per Work Month", required=True)
hours_per_work_year = fields.Float("Hours per Work Year", required=True)
- def default_hours_per_work_day(self):
+ @staticmethod
+ def default_hours_per_work_day():
return 8
- def default_hours_per_work_week(self):
+ @staticmethod
+ def default_hours_per_work_week():
return 40
- def default_hours_per_work_month(self):
+ @staticmethod
+ def default_hours_per_work_month():
return 160
- def default_hours_per_work_year(self):
+ @staticmethod
+ def default_hours_per_work_year():
return 1920
-
-Company()
diff --git a/res.py b/res.py
index e0950f6..519cc64 100644
--- a/res.py
+++ b/res.py
@@ -1,13 +1,18 @@
#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 trytond.model import ModelView, ModelSQL
+from trytond.pool import PoolMeta
-class User(ModelSQL, ModelView):
- _name = 'res.user'
+__all__ = ['User']
+__metaclass__ = PoolMeta
- def _get_preferences(self, user, context_only=False):
- res = super(User, self)._get_preferences(user,
+
+class User:
+ __name__ = 'res.user'
+
+ @classmethod
+ def _get_preferences(cls, user, context_only=False):
+ res = super(User, cls)._get_preferences(user,
context_only=context_only)
if user.company:
res['company_work_time'] = {
@@ -17,5 +22,3 @@ class User(ModelSQL, ModelView):
'd': user.company.hours_per_work_day,
}
return res
-
-User()
diff --git a/setup.py b/setup.py
index 2cddf42..4a4671a 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_company_work_time',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add work time on company',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.company_work_time': '.'},
packages=[
'trytond.modules.company_work_time',
'trytond.modules.company_work_time.tests',
- ],
+ ],
package_data={
'trytond.modules.company_work_time': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_company_work_time',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_company_work_time',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..877bb3a
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,7 @@
+[tryton]
+version=2.6.0
+depends:
+ company
+ ir
+xml:
+ company.xml
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index 48c1ab1..f91773d 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,14 +1,49 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 2.4.0
-Summary:
-
+Version: 2.6.0
+Summary: Tryton module to add work time on company
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_company_work_time
+ =========================
+
+ The company_work_time module of the Tryton application platform. See
+ __tryton__.py
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index 931feaf..4e138e6 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
company.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./company.py
./res.py
./tests/__init__.py
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index f91438d..d5f26de 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 >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_company >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit b32804e1d270c3327afce994c926b5cc7885d6e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 18 16:07:19 2012 +0200
Releasing debian version 2.4.0-2.
diff --git a/debian/changelog b/debian/changelog
index aa2e14c..b17593d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tryton-modules-company-work-time (2.4.0-2) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ [ Mathias Behrle ]
+ * Merging branch debian-wheezy-2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 18 Sep 2012 13:36:11 +0200
+
tryton-modules-company-work-time (2.4.0-1) experimental; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit c22407edee22d1dcac927cda2cccba3e088902a4
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 07f043e..0ede62e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
commit adae44851838b8c8f19713414d31f1789f029341
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 3420e9132fbc694462c9b69adcc76204569a9a9d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 3ec403d..99aff32 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2012 Cedric Krier
- (C) 2009-2012 Bertrand Chenal
- (C) 2009-2012 B2CK SPRL
+ 2009-2012 Cedric Krier
+ 2009-2012 Bertrand Chenal
+ 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 48b4b074d8e045ae3b1f5e21d27ab74f76811869
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index e53ac9c..07f043e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company-work-time.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-company-work-time.git
X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
commit 72e010d79ab3367ea6f70ec8e34ce3210f69484e
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:30 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 67a0c9a..e53ac9c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-company-work-time
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 1920c4488eb19017b25450dd9ebbc91df343a886
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 28 12:43:58 2012 +0200
Releasing debian version 2.4.0-1.
diff --git a/debian/changelog b/debian/changelog
index 8194c85..aa2e14c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-company-work-time (2.4.0-1) experimental; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.4.0.
+ * Updating Copyright.
+ * Bumping versioned tryton depends to 2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 26 Apr 2012 19:29:28 +0200
+
tryton-modules-company-work-time (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit a4303adba479a43ab15ba63e1f993716a7f4f046
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 26 19:11:44 2012 +0200
Bumping versioned tryton depends to 2.4.
diff --git a/debian/control b/debian/control
index ea2b04b..67a0c9a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
- tryton-modules-company (>= 2.2), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.4),
+ tryton-modules-company (>= 2.4), python-pkg-resources
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 6bdfa84eed4720b5234a62cd184dcc5e87d0f943
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 20:08:13 2012 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 31cd674..3ec403d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2011 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ (C) 2009-2012 Cedric Krier
+ (C) 2009-2012 Bertrand Chenal
+ (C) 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 4ac65a31dd5aa9c0148c6b1ad7b4b9a50d9d3902
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:41 2012 +0200
Merging upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 06decad..da82946 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..8ad4b79 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 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/INSTALL b/INSTALL
index ec7062d..5a1bb82 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_company_work_time
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 8da7e60..67e2bb4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 2.2.0
+Version: 2.4.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 74b0386..5f6f7fa 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#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 company import *
-from res import *
+from .company import *
+from .res import *
diff --git a/__tryton__.py b/__tryton__.py
index e0384e4..0687ad5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,16 +3,27 @@
{
'name': 'Company Work Time',
'name_bg_BG': 'Работно време на фирма',
+ 'name_ca_ES': 'Hores de treball a l''empresa',
'name_de_DE': 'Unternehmen Arbeitszeit',
+ 'name_es_AR': 'Tiempo de trabajo en la empresa',
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''
''',
+ 'description_ca_ES': '''Afegeix les hores de treball al dia, setmana, mes i
+any per empresa.
+''',
+ 'description_es_AR': '''Añade horas de trabajo por día, semana, mes y
+año por empresa.
+''',
+ 'description_es_ES': '''Añade las horas de trabajo por día, semana, mes y
+año por empresa.
+''',
'depends': [
'ir',
'company',
@@ -22,8 +33,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 34dd12c..a89af8c 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Работни часове за ден"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Работни часове за месец"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Часове по работна седмица"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Работни часове за година"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Работно време"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..503e458
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:"
+msgid "Hours per Work Day"
+msgstr "Hores per dia de treball"
+
+msgctxt "field:company.company,hours_per_work_month:"
+msgid "Hours per Work Month"
+msgstr "Hores per mes de treball"
+
+msgctxt "field:company.company,hours_per_work_week:"
+msgid "Hours per Work Week"
+msgstr "Hores per setmana de treball"
+
+msgctxt "field:company.company,hours_per_work_year:"
+msgid "Hours per Work Year"
+msgstr "Hores per any de treball"
+
+msgctxt "view:company.company:"
+msgid "Work Time"
+msgstr "Temps de treball"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 6f630c5..5704bda 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr ""
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr ""
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr ""
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr ""
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index f69eb63..a38388e 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Stunden pro Personentag"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Stunden pro Personenmonat"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Stunden pro Personenwoche"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Stunden pro Personenjahr"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Arbeitszeit"
diff --git a/locale/es_ES.po b/locale/es_AR.po
similarity index 59%
copy from locale/es_ES.po
copy to locale/es_AR.po
index eaba639..43feb64 100644
--- a/locale/es_ES.po
+++ b/locale/es_AR.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Horas por día de trabajo"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Horas por mes de trabajo"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Horas por semana de trabajo"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Horas por año de trabajo"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Tiempo de trabajo"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 259a65b..01635b0 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Horas por Día de Trabajo"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Horas por Mes de Trabajo"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Horas por Semana de Trabajo"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Horas por Año de Trabajo"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Tiempo de Trabajo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index eaba639..43feb64 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Horas por día de trabajo"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Horas por mes de trabajo"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Horas por semana de trabajo"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Horas por año de trabajo"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Tiempo de trabajo"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 9b2f1fa..c0d3cca 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,22 +2,26 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr "Heures par journée de travail"
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr "Heures par mois de travail"
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr "Heures par semaine de travail"
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr "Heures par année de travail"
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
+msgid "Work Time"
+msgstr "Temps de travail"
+
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr "Temps de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 6f630c5..5704bda 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr ""
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr ""
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr ""
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr ""
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 6f630c5..5704bda 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,22 +2,22 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:company.company,hours_per_work_day:0"
+msgctxt "field:company.company,hours_per_work_day:"
msgid "Hours per Work Day"
msgstr ""
-msgctxt "field:company.company,hours_per_work_month:0"
+msgctxt "field:company.company,hours_per_work_month:"
msgid "Hours per Work Month"
msgstr ""
-msgctxt "field:company.company,hours_per_work_week:0"
+msgctxt "field:company.company,hours_per_work_week:"
msgid "Hours per Work Week"
msgstr ""
-msgctxt "field:company.company,hours_per_work_year:0"
+msgctxt "field:company.company,hours_per_work_year:"
msgid "Hours per Work Year"
msgstr ""
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
msgid "Work Time"
msgstr ""
diff --git a/res.py b/res.py
index 5ccef56..e0950f6 100644
--- a/res.py
+++ b/res.py
@@ -7,7 +7,7 @@ class User(ModelSQL, ModelView):
_name = 'res.user'
def _get_preferences(self, user, context_only=False):
- res = super(User, self)._get_preferences(user,
+ res = super(User, self)._get_preferences(user,
context_only=context_only)
if user.company:
res['company_work_time'] = {
diff --git a/setup.py b/setup.py
index a3447c1..2cddf42 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 608b1ab..ad29fa8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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
+from .test_company_work_time import suite
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
index 4b2cc9e..cea5fc5 100644
--- a/tests/test_company_work_time.py
+++ b/tests/test_company_work_time.py
@@ -2,7 +2,8 @@
#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 sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class CompanyWorkTimeTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index afb3811..48c1ab1 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 2.2.0
+Version: 2.4.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index 38171cf..931feaf 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -14,8 +14,10 @@ setup.py
./tests/test_company_work_time.py
doc/index.rst
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index eb856f1..f91438d 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 >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_company >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 41408dc478eb26120e921ebc3195b93284c319ed
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Mar 25 15:28:18 2012 +0200
Adding Format header for DEP5.
diff --git a/debian/copyright b/debian/copyright
index c905bbf..31cd674 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,5 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
Files: *
Copyright:
(C) 2009-2011 Cedric Krier
commit 3311c0c984016fc5a11e48c477568a9df9cec593
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:09:12 2012 +0100
Adding myself to copyright.
diff --git a/debian/copyright b/debian/copyright
index 6d5ec8c..c905bbf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,9 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+Copyright:
+ (C) 2009-2012 Daniel Baumann <daniel at debian.org>
+ (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 66a15f934805a29beaf84432c56cc7b34725717d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 14:01:03 2012 +0100
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 6da6058..6d5ec8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
License: GPL-3+
Files: debian/*
-Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2012 Daniel Baumann <daniel at debian.org>
License: GPL-3+
License: GPL-3+
commit 4eafa9a42947f330605e5cd0984a3b93f4d64037
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 24 13:47:01 2012 +0100
Updating to Standards-Version: 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index e9c0913..ea2b04b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
commit 2d7e09b2c5a95986cebc59d69eaf71a8e2e34845
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 26 18:09:29 2011 +0100
Releasing debian version 2.2.0-1.
diff --git a/debian/changelog b/debian/changelog
index d481c37..8194c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-company-work-time (2.2.0-1) unstable; urgency=low
+
+ * Bumping X-Python-Version to >=2.6.
+ * Updating versioned tryton depends to 2.2.
+ * Merging upstream version 2.2.0.
+ * Removing deprecated XB-Python-Version for dh_python2.
+ * Improving package long description to be lintian clean.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 26 Dec 2011 14:00:42 +0100
+
tryton-modules-company-work-time (2.0.0-2) unstable; urgency=low
[ Daniel Baumann ]
commit c3baf880c20638b0cf8f444367d49ed2f7bf94ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Dec 17 13:59:42 2011 +0100
Bumping X-Python-Version to >=2.6.
diff --git a/debian/control b/debian/control
index 61309fe..e9c0913 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
Package: tryton-modules-company-work-time
Architecture: all
commit 6274eb554f6241e69d6305b60d634e90b892ded6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 1 15:19:31 2011 +0100
Updating versioned tryton depends to 2.2.
diff --git a/debian/control b/debian/control
index 960c30e..61309fe 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ X-Python-Version: >= 2.5
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
- tryton-modules-company (>= 2.0), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2),
+ tryton-modules-company (>= 2.2), python-pkg-resources
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 3a61a8c8e0a33e27384d87166be09787f3bc6033
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:45 2011 +0100
Merging upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 154bd85..06decad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 2e0a688..8da7e60 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,29 +1,32 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 2.0.0
+Version: 2.2.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
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 :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index fc7c7ef..e0384e4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -21,10 +21,13 @@
'company.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 5a7aa04..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"company.company,hours_per_work_day",0,Hours per Work Day,Работни часове за ден,0
-field,"company.company,hours_per_work_month",0,Hours per Work Month,Работни часове за месец,0
-field,"company.company,hours_per_work_week",0,Hours per Work Week,Часове по работна седмица,0
-field,"company.company,hours_per_work_year",0,Hours per Work Year,Работни часове за година,0
-view,company.company,0,Work Time,Работно време,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index b9a9fdb..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"company.company,hours_per_work_day",0,Hours per Work Day,Stunden pro Personentag,0
-field,"company.company,hours_per_work_month",0,Hours per Work Month,Stunden pro Personenmonat,0
-field,"company.company,hours_per_work_week",0,Hours per Work Week,Stunden pro Personenwoche,0
-field,"company.company,hours_per_work_year",0,Hours per Work Year,Stunden pro Personenjahr,0
-view,company.company,0,Work Time,Arbeitszeit,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 8ce783c..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"company.company,hours_per_work_day",0,Hours per Work Day,Horas por Día de Trabajo,0
-field,"company.company,hours_per_work_month",0,Hours per Work Month,Horas por Mes de Trabajo,0
-field,"company.company,hours_per_work_week",0,Hours per Work Week,Horas por Semana de Trabajo,0
-field,"company.company,hours_per_work_year",0,Hours per Work Year,Horas por Año de Trabajo,0
-view,company.company,0,Work Time,Tiempo de Trabajo,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index dab3ff5..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"company.company,hours_per_work_day",0,Hours per Work Day,Horas por día de trabajo,0
-field,"company.company,hours_per_work_month",0,Hours per Work Month,Horas por mes de trabajo,0
-field,"company.company,hours_per_work_week",0,Hours per Work Week,Horas por semana de trabajo,0
-field,"company.company,hours_per_work_year",0,Hours per Work Year,Horas por año de trabajo,0
-view,company.company,0,Work Time,Tiempo de trabajo,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 87c14a5..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"company.company,hours_per_work_day",0,Hours per Work Day,Heures par journée de travail,0
-field,"company.company,hours_per_work_month",0,Hours per Work Month,Heures par mois de travail,0
-field,"company.company,hours_per_work_week",0,Hours per Work Week,Heures par semaine de travail,0
-field,"company.company,hours_per_work_year",0,Hours per Work Year,Heures par année de travail,0
-view,company.company,0,Work Time,Temps de travail,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..34dd12c
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr "Работни часове за ден"
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr "Работни часове за месец"
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr "Часове по работна седмица"
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr "Работни часове за година"
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr "Работно време"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..6f630c5
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr ""
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..f69eb63
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr "Stunden pro Personentag"
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr "Stunden pro Personenmonat"
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr "Stunden pro Personenwoche"
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr "Stunden pro Personenjahr"
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr "Arbeitszeit"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..259a65b
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr "Horas por Día de Trabajo"
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr "Horas por Mes de Trabajo"
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr "Horas por Semana de Trabajo"
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr "Horas por Año de Trabajo"
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr "Tiempo de Trabajo"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..eaba639
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr "Horas por día de trabajo"
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr "Horas por mes de trabajo"
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr "Horas por semana de trabajo"
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr "Horas por año de trabajo"
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr "Tiempo de trabajo"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..9b2f1fa
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr "Heures par journée de travail"
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr "Heures par mois de travail"
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr "Heures par semaine de travail"
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr "Heures par année de travail"
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr "Temps de travail"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..6f630c5
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr ""
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..6f630c5
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:company.company,hours_per_work_day:0"
+msgid "Hours per Work Day"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_month:0"
+msgid "Hours per Work Month"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_week:0"
+msgid "Hours per Work Week"
+msgstr ""
+
+msgctxt "field:company.company,hours_per_work_year:0"
+msgid "Hours per Work Year"
+msgstr ""
+
+msgctxt "view:company.company:0"
+msgid "Work Time"
+msgstr ""
diff --git a/setup.py b/setup.py
index a1aad5e..a3447c1 100644
--- a/setup.py
+++ b/setup.py
@@ -39,18 +39,21 @@ setup(name='trytond_company_work_time',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
index 686143f..4b2cc9e 100644
--- a/tests/test_company_work_time.py
+++ b/tests/test_company_work_time.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class CompanyWorkTimeTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class CompanyWorkTimeTestCase(unittest.TestCase):
'''
test_view('company_work_time')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index 672d189..afb3811 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,29 +1,32 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 2.0.0
+Version: 2.2.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
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 :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
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 e0ba10a..38171cf 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -4,12 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
company.xml
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
setup.py
./__init__.py
./__tryton__.py
@@ -18,6 +13,14 @@ setup.py
./tests/__init__.py
./tests/test_company_work_time.py
doc/index.rst
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.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 14250d9..eb856f1 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 >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_company >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 38f718ecb92f6c05ba56da44ed1ee42d61180832
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Jul 22 12:26:57 2011 +0200
Removing deprecated XB-Python-Version for dh_python2.
diff --git a/debian/control b/debian/control
index 4193180..960c30e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Architecture: all
Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
tryton-modules-company (>= 2.0), python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 391dd9daa1536cfbd6287a0e8688bc7555b93a45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jul 17 14:32:17 2011 +0200
Improving package long description to be lintian clean.
diff --git a/debian/control b/debian/control
index 6e0d1b6..4193180 100644
--- a/debian/control
+++ b/debian/control
@@ -22,4 +22,4 @@ Description: Tryton Application Platform (Company Work Time Module)
and using PostgreSQL as database engine. It is the core base of a complete
business solution.
.
- This package allows to define the company work time.
+ This package allows one to define the company work time.
commit 505df42541f83cff0aac6a80592d956b5e388b87
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 14 01:14:08 2011 +0200
Releasing debian version 2.0.0-2.
diff --git a/debian/changelog b/debian/changelog
index 95264e1..d481c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-company-work-time (2.0.0-2) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing for new source package version obsoleted README.source file.
+ * Adding options for source package.
+ * Compacting copyright file.
+ * Not wrapping uploaders field, it does not exceed 80 chars.
+
+ [ Mathias Behrle ]
+ * Moving from deprecated python-support to dh_python2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 14 Jul 2011 01:14:05 +0200
+
tryton-modules-company-work-time (2.0.0-1) unstable; urgency=low
* Updating to standards version 3.9.2.
commit 5cda599b5a38e5c70f69c1c02bab7fe0ee8aa357
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jul 13 20:28:22 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 646197f..6e0d1b6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
+X-Python-Version: >= 2.5
Package: tryton-modules-company-work-time
Architecture: all
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit a9fcb551db39bb4ca2d1a8dc99bd5336e50bf3e7
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 16:01:11 2011 +0200
Not wrapping uploaders field, it does not exceed 80 chars.
diff --git a/debian/control b/debian/control
index ad2919f..646197f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,7 @@ Source: tryton-modules-company-work-time
Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Uploaders:
- Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at m9s.biz>
+Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.2
commit 861f566216d190c629543b236f5aaba31ed088dc
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:54:39 2011 +0200
Compacting copyright file.
diff --git a/debian/copyright b/debian/copyright
index 04f8161..6da6058 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,15 @@
-Upstream-Contact: Tryton project <tryton at googlegroups.com>
-Upstream-Homepage: http://downloads.tryton.org/
-Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
-Maintainer-Homepage: http://tryton.debian-maintainers.org/
-
Files: *
Copyright:
(C) 2009-2011 Cedric Krier
(C) 2009-2011 Bertrand Chenal
(C) 2009-2011 B2CK SPRL
License: GPL-3+
- 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
+
+License: GPL-3+
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
the Free Software Foundation, either version 3 of the License, or
@@ -41,5 +23,5 @@ License: GPL-3+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
commit a05f8bb32f1254f8b98b3a4d4fd2e3871e6aafdd
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:54 2011 +0200
Adding options for source package.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..d053b65
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9
commit c958a0163496b6bfa9748d9246eb32cf239e64e3
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Jul 10 15:38:02 2011 +0200
Removing for new source package version obsoleted README.source file.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b24..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-Package Repositories
---------------------
-
-Backports for the current stable debian distribution as well as snapshots of
-unreleased versions may be available in repositories listed on the maintainers
-homepage. The current URL of the maintainer homepage can be seen in
-debian/copyright.
-
-
-Source Access
--------------
-
-You can obtain the sources of this package with:
-
- $ apt-get source ${PACKAGE}
-
-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
-
-This package is maintained with the Git version control system. The current git
-source tree can be obtained with:
-
- $ git clone ${GIT_URI}
-
-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
-repository. The current Git URI can be seen in debian/control in the extracted
-package sources.
-
-More information about Git can be found in the git-core package.
-
-This package may use the Quilt patch system to manage all modifications to the
-upstream source. Changes, if any, are stored in the source package as diffs in
-debian/diff and are applied during the build. Current modifications can be
-applied to the source tree with:
-
- $ QUILT_PATCHES=debian/patches quilt push -a
-
-More information about Quilt can be found in the quilt package.
commit 7f56818d43518cdf25e32ebfbc78e29fe10d9654
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:40:02 2011 +0200
Releasing debian version 2.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index d8dd9a4..95264e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-company-work-time (2.0.0-1) unstable; urgency=low
+
+ * Updating to standards version 3.9.2.
+ * Merging upstream version 2.0.0.
+ * Updating Copyright.
+ * Updating versioned tryton depends to 2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 May 2011 21:33:11 +0200
+
tryton-modules-company-work-time (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit b4a3fe7ce7139f261b0737ac38602702528b6d37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 21:21:34 2011 +0200
Updating versioned tryton depends to 2.0.
diff --git a/debian/control b/debian/control
index ae40deb..ad2919f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
- tryton-modules-company (>= 1.8), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.0),
+ tryton-modules-company (>= 2.0), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
commit 51f45d008ea9a3ec92acef6c9a621f0046848306
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 20:40:03 2011 +0200
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 213e426..04f8161 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2009-2010 Cedric Krier
- (C) 2009-2010 Bertrand Chenal
- (C) 2009-2010 B2CK SPRL
+ (C) 2009-2011 Cedric Krier
+ (C) 2009-2011 Bertrand Chenal
+ (C) 2009-2011 B2CK SPRL
License: GPL-3+
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
commit d09a317c728d6b3ceca4feb28c0b57c6cc2e720a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:46 2011 +0200
Merging upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 3ecb7d4..154bd85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 6e6811c..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 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 c43eed3..2e0a688 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 1.8.0
+Version: 2.0.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -17,9 +17,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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 :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index d85ee05..fc7c7ef 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,12 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Company Work Time',
+ 'name_bg_BG': 'Работно време на фирма',
'name_de_DE': 'Unternehmen Arbeitszeit',
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -20,6 +21,7 @@
'company.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..5a7aa04
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+field,"company.company,hours_per_work_day",0,Hours per Work Day,Работни часове за ден,0
+field,"company.company,hours_per_work_month",0,Hours per Work Month,Работни часове за месец,0
+field,"company.company,hours_per_work_week",0,Hours per Work Week,Часове по работна седмица,0
+field,"company.company,hours_per_work_year",0,Hours per Work Year,Работни часове за година,0
+view,company.company,0,Work Time,Работно време,0
diff --git a/setup.py b/setup.py
index a16f229..a1aad5e 100644
--- a/setup.py
+++ b/setup.py
@@ -44,11 +44,15 @@ setup(name='trytond_company_work_time',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index f3c1807..672d189 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 1.8.0
+Version: 2.0.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -17,9 +17,13 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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 :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
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 caaf34f..e0ba10a 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
company.xml
de_DE.csv
es_CO.csv
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index 1d279cc..14250d9 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 >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_company >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 1117b442796595f850e5cb795f536b288f88562d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 26 21:08:53 2011 +0200
Updating to standards version 3.9.2.
diff --git a/debian/control b/debian/control
index df965cd..ae40deb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
commit 0e72ac37f081099ac954738b9d189f4b115905ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 13:09:23 2011 +0100
Releasing debian version 1.8.0-2.
diff --git a/debian/changelog b/debian/changelog
index e533757..d8dd9a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company-work-time (1.8.0-2) unstable; urgency=low
+
+ * Changing my email address.
+ * Setting minimal Python version to 2.5.
+ * Updating Copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Feb 2011 13:09:12 +0100
+
tryton-modules-company-work-time (1.8.0-1) experimental; urgency=low
* Updating standards version to 3.9.0.
commit 0a6bd25d7fd51ad0e27bcfd8d658a34ed884e213
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 12:38:41 2011 +0100
Updating Copyright.
diff --git a/debian/copyright b/debian/copyright
index 489b0a2..213e426 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2011 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 96af204d414999ebf120855ac1f7bdd9c2c52ac6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Jan 15 17:27:17 2011 +0100
Setting minimal Python version to 2.5.
diff --git a/debian/pyversions b/debian/pyversions
index 8b253bc..b3dc41e 100644
--- a/debian/pyversions
+++ b/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.5-
commit e98e7996e3d7d020c7d7bc074be4d1181c757ca8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 11:48:53 2010 +0100
Changing my email address.
diff --git a/debian/control b/debian/control
index 4ad8624..df965cd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.1
commit f5a15131e65273074b4ff94c37f9243e036333ef
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Nov 12 12:58:57 2010 +0100
Releasing debian version 1.8.0-1.
diff --git a/debian/changelog b/debian/changelog
index 32a7c23..e533757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-company-work-time (1.8.0-1) experimental; urgency=low
+
+ * Updating standards version to 3.9.0.
+ * Updating to debhelper version 8.
+ * Updating to standards version 3.9.1.
+ * Switching to source format 3.0 (quilt).
+ * Merging upstream version 1.8.0.
+ * Updating versioned tryton depends to 1.8.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 12 Nov 2010 12:58:50 +0100
+
tryton-modules-company-work-time (1.6.0-1) unstable; urgency=low
[ Daniel Baumann ]
commit b46a9905236897a3c252332e2d37539102691467
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:16:01 2010 +0100
Updating versioned tryton depends to 1.8.
diff --git a/debian/control b/debian/control
index f6b59a2..4ad8624 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
- tryton-modules-company (>= 1.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
+ tryton-modules-company (>= 1.8), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
commit 76e2ca4b65e249b07c8873539f8cc3001386095e
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:13:24 2010 +0100
Merging upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 71af51b..3ecb7d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-11
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 6d06136..ec7062d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_company_work_time
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 2a720f6..c43eed3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 1.6.0
+Version: 1.8.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 20226e2..d85ee05 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/company.py b/company.py
index fcbcdd9..732da26 100644
--- a/company.py
+++ b/company.py
@@ -12,16 +12,16 @@ class Company(ModelSQL, ModelView):
hours_per_work_month = fields.Float("Hours per Work Month", required=True)
hours_per_work_year = fields.Float("Hours per Work Year", required=True)
- def default_hours_per_work_day(self, cursor, user, context=None):
+ def default_hours_per_work_day(self):
return 8
- def default_hours_per_work_week(self, cursor, user, context=None):
+ def default_hours_per_work_week(self):
return 40
- def default_hours_per_work_month(self, cursor, user, context=None):
+ def default_hours_per_work_month(self):
return 160
- def default_hours_per_work_year(self, cursor, user, context=None):
+ def default_hours_per_work_year(self):
return 1920
Company()
diff --git a/res.py b/res.py
index 41b92b2..5ccef56 100644
--- a/res.py
+++ b/res.py
@@ -6,10 +6,9 @@ from trytond.model import ModelView, ModelSQL
class User(ModelSQL, ModelView):
_name = 'res.user'
- def _get_preferences(self, cursor, user_id, user, context_only=False,
- context=None):
- res = super(User, self)._get_preferences(cursor, user_id, user,
- context_only=context_only, context=context)
+ def _get_preferences(self, user, context_only=False):
+ res = super(User, self)._get_preferences(user,
+ context_only=context_only)
if user.company:
res['company_work_time'] = {
'Y': user.company.hours_per_work_year,
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
index 3b6b0bd..686143f 100644
--- a/tests/test_company_work_time.py
+++ b/tests/test_company_work_time.py
@@ -25,7 +25,7 @@ class CompanyWorkTimeTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('company_work_time'))
+ test_view('company_work_time')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index 5143d2f..f3c1807 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 1.6.0
+Version: 1.8.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index e1a5824..1d279cc 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 >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_company >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit f2f8a1dcbea24f92e590d63f500e0e37b070ab6b
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 2 14:26:39 2010 +0100
Switching to source format 3.0 (quilt).
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
commit 1400db33bfdfe8764c14d111a3a9f7b5f5d116e2
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:05:32 2010 +0200
Updating to standards version 3.9.1.
diff --git a/debian/control b/debian/control
index 7df4963..f6b59a2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
commit 29e529e521707bffdd80e7708dae6acc8310ff43
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 30 01:04:04 2010 +0200
Updating to debhelper version 8.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 8f2c6a8..7df4963 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
commit 6458a6bb2d68e4b93ca9b38f98a1553b67b397c5
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 28 20:35:30 2010 +0200
Updating standards version to 3.9.0.
diff --git a/debian/control b/debian/control
index 7f34746..8f2c6a8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
commit 2af5a59c4309cec107622b4d3bc902fd1d081fd4
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 13:31:51 2010 +0200
Releasing debian version 1.6.0-1.
diff --git a/debian/changelog b/debian/changelog
index 1587c91..32a7c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-company-work-time (1.6.0-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding Dm-Upload-Allowed in control in preparation for Mathias.
+
+ [ Mathias Behrle ]
+ * Merging upstream version 1.6.0.
+ * Updating copyright.
+ * Updating depends.
+
+ -- Mathias Behrle <mathiasb at mbsolutions.selfip.biz> Wed, 12 May 2010 13:31:29 +0200
+
tryton-modules-company-work-time (1.4.1-2) unstable; urgency=low
* Updating year in copyright file.
commit 0a53a2b876b7e0616eb64258aaf80e0b56c2b769
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 13:31:02 2010 +0200
Updating depends.
diff --git a/debian/control b/debian/control
index cb15771..7f34746 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
- tryton-modules-company (>= 1.4), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.6),
+ tryton-modules-company (>= 1.6), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
commit d494c54fec147bc1432ee6ab25fc9269d0c5b082
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 13:30:24 2010 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 9a830a0..489b0a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,9 @@ Maintainer-Homepage: http://tryton.debian-maintainers.org/
Files: *
Copyright:
- (C) 2009 Cedric Krier
- (C) 2009 B2CK SPRL
+ (C) 2009-2010 Cedric Krier
+ (C) 2009-2010 Bertrand Chenal
+ (C) 2009-2010 B2CK SPRL
License: GPL-3+
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
commit ecc72cb371d70e7e98060312e9b92905d7f6228e
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 13:27:48 2010 +0200
Merging upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8ce1b25..71af51b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.4.1 - 2009-11-24
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 - 2010-05-11
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d49280..6e6811c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 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/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index fe04e40..2a720f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 1.4.1
+Version: 1.6.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index bdc4b29..20226e2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '1.4.1',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index 2de5b82..a16f229 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#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 setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_company_work_time',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_company_work_time',
package_dir={'trytond.modules.company_work_time': '.'},
packages=[
'trytond.modules.company_work_time',
+ 'trytond.modules.company_work_time.tests',
],
package_data={
'trytond.modules.company_work_time': info.get('xml', []) \
@@ -54,4 +58,6 @@ setup(name='trytond_company_work_time',
[trytond.modules]
company_work_time = trytond.modules.company_work_time
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 42ba832..608b1ab 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 *
+from test_company_work_time import suite
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
index bffccd2..3b6b0bd 100644
--- a/tests/test_company_work_time.py
+++ b/tests/test_company_work_time.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class CompanyWorkTimeTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class CompanyWorkTimeTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('company_work_time'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(CompanyWorkTimeTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ CompanyWorkTimeTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteCompanyWorkTime = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteCompanyWorkTime])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index db8559e..5143d2f 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-company-work-time
-Version: 1.4.1
+Version: 1.6.0
Summary:
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
index a8c031e..caaf34f 100644
--- a/trytond_company_work_time.egg-info/SOURCES.txt
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -14,9 +14,9 @@ setup.py
./__tryton__.py
./company.py
./res.py
+./tests/__init__.py
+./tests/test_company_work_time.py
doc/index.rst
-tests/__init__.py
-tests/test_company_work_time.py
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 2de3870..e1a5824 100644
--- a/trytond_company_work_time.egg-info/requires.txt
+++ b/trytond_company_work_time.egg-info/requires.txt
@@ -1,3 +1,2 @@
-trytond_company
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_company >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 010f2f4270a4f90ce9ddac110b022e248a25bf74
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 9 14:31:33 2010 +0200
Adding Dm-Upload-Allowed in control in preparation for Mathias.
diff --git a/debian/control b/debian/control
index 36eb3cc..cb15771 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
commit dba66777b1137087dbda31e05cf4919a5618a714
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:23:54 2010 +0100
Releasing debian version 1.4.1-2.
diff --git a/debian/changelog b/debian/changelog
index dc72329..1587c91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company-work-time (1.4.1-2) unstable; urgency=low
+
+ * Updating year in copyright file.
+ * Removing unneeded python-all-dev from build-depends.
+ * Updating to standards 3.8.4.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Feb 2010 10:23:51 +0100
+
tryton-modules-company-work-time (1.4.1-1) unstable; urgency=low
[ Mathias Behrle ]
commit 2e418540581dca659995f6003a402696ff7c2284
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jan 28 07:53:21 2010 +0100
Updating to standards 3.8.4.
diff --git a/debian/control b/debian/control
index e0b9d6e..36eb3cc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
commit 2576c78dbd6242ca996bfd803e55de49b0e27bda
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jan 25 10:12:27 2010 +0100
Removing unneeded python-all-dev from build-depends.
diff --git a/debian/control b/debian/control
index 464789a..e0b9d6e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
-Build-Depends:
- debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
Standards-Version: 3.8.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
commit 95ca508981e50b388fe8691b040256e8051be96b
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 2 11:35:14 2010 +0100
Updating year in copyright file.
diff --git a/debian/copyright b/debian/copyright
index e0ccef3..9a830a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ License: GPL-3+
can be found in /usr/share/common-licenses/GPL-3 file.
Files: debian/*
-Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+Copyright: (C) 2009-2010 Daniel Baumann <daniel at debian.org>
License: GPL-3+
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
commit 9b38863b82bad708dfbc7fc339152c9a6983be35
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:06:38 2009 +0100
Releasing debian version 1.4.1-1.
diff --git a/debian/changelog b/debian/changelog
index 5ff34a7..dc72329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-company-work-time (1.4.1-1) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Improving package long description.
+
+ [ Daniel Baumann ]
+ * Making depends versioned for tryton 1.4.
+ * Merging upstream version 1.4.1.
+ * Updating README.source.
+ * Adding explicit debian source version 1.0 until switch to 3.0.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 25 Nov 2009 13:06:31 +0100
+
tryton-modules-company-work-time (1.4.0-1) unstable; urgency=low
* Initial release.
commit 328dfbe056c4aef7cec7e7cfa80a6fccae908203
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:06:17 2009 +0100
Adding explicit debian source version 1.0 until switch to 3.0.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit 2d6c940e72ac2147c4d31ac85a02ccf0b7736dd9
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:06:10 2009 +0100
Updating README.source.
diff --git a/debian/README.source b/debian/README.source
index dcc7ba3..18b6b24 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -32,6 +32,6 @@ upstream source. Changes, if any, are stored in the source package as diffs in
debian/diff and are applied during the build. Current modifications can be
applied to the source tree with:
- $ quilt push -a
+ $ QUILT_PATCHES=debian/patches quilt push -a
More information about Quilt can be found in the quilt package.
commit b6a95c24c4bb8397b60f12a086399f4e4a9fee38
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:06:02 2009 +0100
Merging upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..8ce1b25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.1 - 2009-11-24
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index a9cb78e..fe04e40 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_company_work_time
-Version: 1.4.0
+Version: 1.4.1
Summary:
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index b778493..bdc4b29 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Tiempo de Trabajo en la Compañía',
'name_es_ES': 'Tiempo de trabajo en la empresa',
'name_fr_FR': 'Temps de travail dans la société',
- 'version': '1.4.0',
+ 'version': '1.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/company.py b/company.py
index 360e2cc..fcbcdd9 100644
--- a/company.py
+++ b/company.py
@@ -22,6 +22,6 @@ class Company(ModelSQL, ModelView):
return 160
def default_hours_per_work_year(self, cursor, user, context=None):
- return 4800
+ return 1920
Company()
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
index 2a75969..db8559e 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.0
Name: trytond-company-work-time
-Version: 1.4.0
+Version: 1.4.1
Summary:
Home-page: http://www.tryton.org/
commit 360a8d2b5d9eee3a0f46f06b68fcd17b909e2fe1
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 4 12:22:20 2009 +0100
Making depends versioned for tryton 1.4.
diff --git a/debian/control b/debian/control
index 900cb3f..464789a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work
Package: tryton-modules-company-work-time
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-company,
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= 1.4),
+ tryton-modules-company (>= 1.4), python-pkg-resources
XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Company Work Time Module)
Tryton is a high-level general purpose application platform written in Python
commit 5f79173d97c75cee81a1548f0c666285fd690760
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Tue Oct 20 14:45:41 2009 +0200
Improving package long description.
diff --git a/debian/control b/debian/control
index 78acc6e..900cb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,4 +23,4 @@ Description: Tryton Application Platform (Company Work Time Module)
and using PostgreSQL as database engine. It is the core base of a complete
business solution.
.
- This package defines the company work time.
+ This package allows to define the company work time.
commit 8bba09a0770e39217ca391add0e8d7480c7308ac
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:46 2009 +0200
Adding debian version 1.4.0-1.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3d49280
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..6d06136
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_company_work_time
+====================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_company_work_time
+source release, enter the directory where the archive was unpacked,
+and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name company_work_time.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..a9cb78e
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_company_work_time
+Version: 1.4.0
+Summary:
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..eaa6876
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_company_work_time
+=========================
+
+The company_work_time module of the Tryton application platform. See
+__tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..74b0386
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#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 company import *
+from res import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..b778493
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,28 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Company Work Time',
+ 'name_de_DE': 'Unternehmen Arbeitszeit',
+ 'name_es_CO': 'Tiempo de Trabajo en la Compañía',
+ 'name_es_ES': 'Tiempo de trabajo en la empresa',
+ 'name_fr_FR': 'Temps de travail dans la société',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''
+''',
+ 'depends': [
+ 'ir',
+ 'company',
+ ],
+ 'xml': [
+ 'company.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/company.py b/company.py
new file mode 100644
index 0000000..360e2cc
--- /dev/null
+++ b/company.py
@@ -0,0 +1,27 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Company"
+from trytond.model import ModelView, ModelSQL, fields
+
+
+class Company(ModelSQL, ModelView):
+ _name = 'company.company'
+
+ hours_per_work_day = fields.Float("Hours per Work Day", required=True)
+ hours_per_work_week = fields.Float("Hours per Work Week", required=True)
+ hours_per_work_month = fields.Float("Hours per Work Month", required=True)
+ hours_per_work_year = fields.Float("Hours per Work Year", required=True)
+
+ def default_hours_per_work_day(self, cursor, user, context=None):
+ return 8
+
+ def default_hours_per_work_week(self, cursor, user, context=None):
+ return 40
+
+ def default_hours_per_work_month(self, cursor, user, context=None):
+ return 160
+
+ def default_hours_per_work_year(self, cursor, user, context=None):
+ return 4800
+
+Company()
diff --git a/company.xml b/company.xml
new file mode 100644
index 0000000..688c39e
--- /dev/null
+++ b/company.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+
+ <record model="ir.ui.view" id="company_view_form">
+ <field name="model">company.company</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="company.company_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page[@id="general"]"
+ position="after">
+ <page string="Work Time" id="work_time">
+ <label name="hours_per_work_day"/>
+ <field name="hours_per_work_day"/>
+ <label name="hours_per_work_week"/>
+ <field name="hours_per_work_week"/>
+ <label name="hours_per_work_month"/>
+ <field name="hours_per_work_month"/>
+ <label name="hours_per_work_year"/>
+ <field name="hours_per_work_year"/>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..b9a9fdb
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+field,"company.company,hours_per_work_day",0,Hours per Work Day,Stunden pro Personentag,0
+field,"company.company,hours_per_work_month",0,Hours per Work Month,Stunden pro Personenmonat,0
+field,"company.company,hours_per_work_week",0,Hours per Work Week,Stunden pro Personenwoche,0
+field,"company.company,hours_per_work_year",0,Hours per Work Year,Stunden pro Personenjahr,0
+view,company.company,0,Work Time,Arbeitszeit,0
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dcc7ba3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+ $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+ $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+ $ quilt push -a
+
+More information about Quilt can be found in the quilt package.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..5ff34a7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+tryton-modules-company-work-time (1.4.0-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org> Tue, 20 Oct 2009 06:50:27 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..78acc6e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: tryton-modules-company-work-time
+Section: python
+Priority: optional
+Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Uploaders:
+ Daniel Baumann <daniel at debian.org>,
+ Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+Build-Depends:
+ debhelper (>= 7), python, python-all-dev, python-setuptools, python-support
+Standards-Version: 3.8.3
+Homepage: http://www.tryton.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-company-work-time.git
+Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company-work-time.git
+
+Package: tryton-modules-company-work-time
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python:Depends}, tryton-server, tryton-modules-company,
+ python-pkg-resources
+XB-Python-Version: ${python:Versions}
+Description: Tryton Application Platform (Company Work Time Module)
+ Tryton is a high-level general purpose application platform written in Python
+ and using PostgreSQL as database engine. It is the core base of a complete
+ business solution.
+ .
+ This package defines the company work time.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e0ccef3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Upstream-Contact: Tryton project <tryton at googlegroups.com>
+Upstream-Homepage: http://downloads.tryton.org/
+Maintainer-Contact: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer-Homepage: http://tryton.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 2009 Cedric Krier
+ (C) 2009 B2CK SPRL
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2009 Daniel Baumann <daniel at debian.org>
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..8b253bc
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..000210b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..677f02f
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,7 @@
+Company Work Time Module
+########################
+
+The Company Work Time module adds 4 new fields (Hours per Work Day,
+Hours per Work Week, Hours per Work Month, Hours per Work Year) on the
+company form that allow to define how much hours are spent by an
+employee in a day, a week, a month and a year of work.
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..8ce783c
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+field,"company.company,hours_per_work_day",0,Hours per Work Day,Horas por Día de Trabajo,0
+field,"company.company,hours_per_work_month",0,Hours per Work Month,Horas por Mes de Trabajo,0
+field,"company.company,hours_per_work_week",0,Hours per Work Week,Horas por Semana de Trabajo,0
+field,"company.company,hours_per_work_year",0,Hours per Work Year,Horas por Año de Trabajo,0
+view,company.company,0,Work Time,Tiempo de Trabajo,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..dab3ff5
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+field,"company.company,hours_per_work_day",0,Hours per Work Day,Horas por día de trabajo,0
+field,"company.company,hours_per_work_month",0,Hours per Work Month,Horas por mes de trabajo,0
+field,"company.company,hours_per_work_week",0,Hours per Work Week,Horas por semana de trabajo,0
+field,"company.company,hours_per_work_year",0,Hours per Work Year,Horas por año de trabajo,0
+view,company.company,0,Work Time,Tiempo de trabajo,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..87c14a5
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,6 @@
+type,name,res_id,src,value,fuzzy
+field,"company.company,hours_per_work_day",0,Hours per Work Day,Heures par journée de travail,0
+field,"company.company,hours_per_work_month",0,Hours per Work Month,Heures par mois de travail,0
+field,"company.company,hours_per_work_week",0,Hours per Work Week,Heures par semaine de travail,0
+field,"company.company,hours_per_work_year",0,Hours per Work Year,Heures par année de travail,0
+view,company.company,0,Work Time,Temps de travail,0
diff --git a/res.py b/res.py
new file mode 100644
index 0000000..41b92b2
--- /dev/null
+++ b/res.py
@@ -0,0 +1,22 @@
+#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 trytond.model import ModelView, ModelSQL
+
+
+class User(ModelSQL, ModelView):
+ _name = 'res.user'
+
+ def _get_preferences(self, cursor, user_id, user, context_only=False,
+ context=None):
+ res = super(User, self)._get_preferences(cursor, user_id, user,
+ context_only=context_only, context=context)
+ if user.company:
+ res['company_work_time'] = {
+ 'Y': user.company.hours_per_work_year,
+ 'M': user.company.hours_per_work_month,
+ 'w': user.company.hours_per_work_week,
+ 'd': user.company.hours_per_work_day,
+ }
+ return res
+
+User()
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..2de5b82
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#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 setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_company_work_time',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.company_work_time': '.'},
+ packages=[
+ 'trytond.modules.company_work_time',
+ ],
+ package_data={
+ 'trytond.modules.company_work_time': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ company_work_time = trytond.modules.company_work_time
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..42ba832
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#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 *
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
new file mode 100644
index 0000000..bffccd2
--- /dev/null
+++ b/tests/test_company_work_time.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#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 sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class CompanyWorkTimeTestCase(unittest.TestCase):
+ '''
+ Test CompanyWorkTime module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('company_work_time')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('company_work_time'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(CompanyWorkTimeTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteCompanyWorkTime = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteCompanyWorkTime])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_company_work_time.egg-info/PKG-INFO b/trytond_company_work_time.egg-info/PKG-INFO
new file mode 100644
index 0000000..2a75969
--- /dev/null
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-company-work-time
+Version: 1.4.0
+Summary:
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_company_work_time.egg-info/SOURCES.txt b/trytond_company_work_time.egg-info/SOURCES.txt
new file mode 100644
index 0000000..a8c031e
--- /dev/null
+++ b/trytond_company_work_time.egg-info/SOURCES.txt
@@ -0,0 +1,26 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+company.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+./__init__.py
+./__tryton__.py
+./company.py
+./res.py
+doc/index.rst
+tests/__init__.py
+tests/test_company_work_time.py
+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
+trytond_company_work_time.egg-info/entry_points.txt
+trytond_company_work_time.egg-info/not-zip-safe
+trytond_company_work_time.egg-info/requires.txt
+trytond_company_work_time.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_company_work_time.egg-info/dependency_links.txt b/trytond_company_work_time.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_company_work_time.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_company_work_time.egg-info/entry_points.txt b/trytond_company_work_time.egg-info/entry_points.txt
new file mode 100644
index 0000000..5645d46
--- /dev/null
+++ b/trytond_company_work_time.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ company_work_time = trytond.modules.company_work_time
+
\ No newline at end of file
diff --git a/trytond_company_work_time.egg-info/not-zip-safe b/trytond_company_work_time.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_company_work_time.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
new file mode 100644
index 0000000..2de3870
--- /dev/null
+++ b/trytond_company_work_time.egg-info/requires.txt
@@ -0,0 +1,3 @@
+trytond_company
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_company_work_time.egg-info/top_level.txt b/trytond_company_work_time.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_company_work_time.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-company-work-time
More information about the tryton-debian-vcs
mailing list