[tryton-debian-vcs] tryton-modules-company-work-time branch debian updated. debian/3.4.1-1-2-g8797c90

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:03:41 UTC 2015


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=debian/3.4.1-1-2-g8797c90

commit 8797c909d10a5cf2bee1341b59c56b18564208d6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 16:59:56 2015 +0200

    Merging upstream version 3.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index cece8ad..1cc4e46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-28
+Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index a76cb31..f5a16f4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_company_work_time
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add work time on company
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
 Description: trytond_company_work_time
         =========================
         
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 0074019..c501b41 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.
+# 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 *
diff --git a/company.py b/company.py
index 3206618..851f6c4 100644
--- a/company.py
+++ b/company.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.
+# 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 fields
 from trytond.pool import PoolMeta
 
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 01635b0..43feb64 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.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 "Horas por Día de Trabajo"
+msgstr "Horas por día de trabajo"
 
 msgctxt "field:company.company,hours_per_work_month:"
 msgid "Hours per Work Month"
-msgstr "Horas por Mes de Trabajo"
+msgstr "Horas por mes de trabajo"
 
 msgctxt "field:company.company,hours_per_work_week:"
 msgid "Hours per Work Week"
-msgstr "Horas por Semana de Trabajo"
+msgstr "Horas por semana de trabajo"
 
 msgctxt "field:company.company,hours_per_work_year:"
 msgid "Hours per Work Year"
-msgstr "Horas por Año de Trabajo"
+msgstr "Horas por año de trabajo"
 
 msgctxt "view:company.company:"
 msgid "Work Time"
-msgstr "Tiempo de Trabajo"
+msgstr "Tiempo de trabajo"
diff --git a/res.py b/res.py
index 519cc64..3c12920 100644
--- a/res.py
+++ b/res.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.
+# 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 PoolMeta
 
 
@@ -16,9 +16,12 @@ class User:
             context_only=context_only)
         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,
+                'Y': user.company.hours_per_work_year * 60 * 60,
+                'M': user.company.hours_per_work_month * 60 * 60,
+                'w': user.company.hours_per_work_week * 60 * 60,
+                'd': user.company.hours_per_work_day * 60 * 60,
+                'h': 60 * 60,
+                'm': 60,
+                's': 1,
             }
         return res
diff --git a/setup.py b/setup.py
index dfb8010..4e0c507 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/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.
+# 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
 import re
@@ -85,6 +85,8 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index a2eb4f5..23cba96 100644
--- a/tests/__init__.py
+++ b/tests/__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.
+# 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
 
diff --git a/tests/test_company_work_time.py b/tests/test_company_work_time.py
index ee526ec..0f44b08 100644
--- a/tests/test_company_work_time.py
+++ b/tests/test_company_work_time.py
@@ -1,23 +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.
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
 
 
-class CompanyWorkTimeTestCase(unittest.TestCase):
+class CompanyWorkTimeTestCase(ModuleTestCase):
     'Test CompanyWorkTime module'
-
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('company_work_time')
-
-    def test0005views(self):
-        'Test views'
-        test_view('company_work_time')
-
-    def test0006depends(self):
-        'Test depends'
-        test_depends()
+    module = 'company_work_time'
 
 
 def suite():
diff --git a/tryton.cfg b/tryton.cfg
index d3367f6..57b32be 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.6.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 6a96b04..656e848 100644
--- a/trytond_company_work_time.egg-info/PKG-INFO
+++ b/trytond_company_work_time.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-company-work-time
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add work time on company
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
 Description: trytond_company_work_time
         =========================
         
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_company_work_time.egg-info/requires.txt b/trytond_company_work_time.egg-info/requires.txt
index a6404ec..cad961d 100644
--- a/trytond_company_work_time.egg-info/requires.txt
+++ b/trytond_company_work_time.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_company >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_company >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
-- 
tryton-modules-company-work-time



More information about the tryton-debian-vcs mailing list