[tryton-debian-vcs] tryton-modules-project-revenue branch debian updated. debian/3.8.0-2-5-g0794267

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


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

commit 079426787cc04f39d58ce190eeab4ed8273ebfd9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 1 21:47:28 2016 +0200

    Releasing debian version 4.0.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 09db099..64a6b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-revenue (4.0.1-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 4.0.0.
+  * Merging upstream version 4.0.1.
+  * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 30 May 2016 19:30:31 +0200
+
 tryton-modules-project-revenue (3.8.0-2) unstable; urgency=medium
 
   * Updating to standards version 3.9.7, no changes needed.
commit d475d8ea14ee020db5c5184c7607ab9206abaa5d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 19:01:03 2016 +0200

    Updating the copyright file.

diff --git a/debian/copyright b/debian/copyright
index 4543833..c27e0ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2015 Cédric Krier
-           2008-2015 B2CK SPRL
+Copyright: 2008-2016 Cédric Krier
+           2008-2016 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
 Copyright:
            2009-2012 Daniel Baumann <daniel at debian.org>
-           2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+           2012-2016 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit 59395f972acb046533e886a95c5f32871ba9cf0b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:27 2016 +0200

    Merging upstream version 4.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index 0cdefa7..1a16e08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
 * Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index 3e828cd..b7a644e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_project_revenue
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module to add revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 96c20c5..802ec5c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -20,7 +20,7 @@ msgstr "Producto"
 
 msgctxt "field:project.work,purchase_lines:"
 msgid "Purchase Lines"
-msgstr ""
+msgstr "Líneas de Compra"
 
 msgctxt "field:project.work,revenue:"
 msgid "Revenue"
@@ -28,8 +28,8 @@ msgstr "Ingresos"
 
 msgctxt "field:purchase.line,work:"
 msgid "Work Effort"
-msgstr ""
+msgstr "Esfuerzo de Trabajo"
 
 msgctxt "view:project.work:"
 msgid "Purchases"
-msgstr ""
+msgstr "Compras"
diff --git a/tryton.cfg b/tryton.cfg
index a4999f2..9a4f27b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     ir
     project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 70365af..cdbbe8d 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-project-revenue
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module to add revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index 244c566..1722c0b 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -27,11 +27,13 @@ work.xml
 ./locale/hu_HU.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/lo_LA.po
 ./locale/lt_LT.po
 ./locale/nl_NL.po
 ./locale/pt_BR.po
 ./locale/ru_RU.po
 ./locale/sl_SI.po
+./locale/zh_CN.po
 ./tests/__init__.py
 ./tests/test_project_revenue.py
 ./view/purchase_line_form.xml
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 151f36a..a238334 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -4,4 +4,4 @@ trytond_timesheet >= 4.0, < 4.1
 trytond_timesheet_cost >= 4.0, < 4.1
 trytond_company >= 4.0, < 4.1
 trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit b1ef9a08b7c05e24a6e67c22891ec9aeddd0b154
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:26:12 2016 +0200

    Merging upstream version 4.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index fa2bfee..0cdefa7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
 * Use product price_decimal for list price
diff --git a/COPYRIGHT b/COPYRIGHT
index 0634fbe..00cf5e6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2015 Cédric Krier.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2016 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 7f122c6..3e828cd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_project_revenue
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module to add revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_project_revenue
         =======================
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..281d93e
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,35 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:project.work,cost:"
+msgid "Cost"
+msgstr ""
+
+msgctxt "field:project.work,currency_digits:"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:project.work,list_price:"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:project.work,product:"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:project.work,purchase_lines:"
+msgid "Purchase Lines"
+msgstr ""
+
+msgctxt "field:project.work,revenue:"
+msgid "Revenue"
+msgstr ""
+
+msgctxt "field:purchase.line,work:"
+msgid "Work Effort"
+msgstr ""
+
+msgctxt "view:project.work:"
+msgid "Purchases"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..281d93e
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,35 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:project.work,cost:"
+msgid "Cost"
+msgstr ""
+
+msgctxt "field:project.work,currency_digits:"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:project.work,list_price:"
+msgid "List Price"
+msgstr ""
+
+msgctxt "field:project.work,product:"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:project.work,purchase_lines:"
+msgid "Purchase Lines"
+msgstr ""
+
+msgctxt "field:project.work,revenue:"
+msgid "Revenue"
+msgstr ""
+
+msgctxt "field:purchase.line,work:"
+msgid "Work Effort"
+msgstr ""
+
+msgctxt "view:project.work:"
+msgid "Purchases"
+msgstr ""
diff --git a/setup.py b/setup.py
index 9592760..e09e99b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
 
 requires = ['python-sql']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
@@ -76,6 +82,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
@@ -89,6 +96,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -102,4 +112,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    use_2to3=True,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index 63148b4..0bb6cc0 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
-from .test_project_revenue import suite
+try:
+    from trytond.modules.project_revenue.tests.test_project_revenue import suite
+except ImportError:
+    from .test_project_revenue import suite
 
 __all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 5bbde70..a4999f2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     ir
     project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 4708be3..70365af 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-project-revenue
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module to add revenue on project
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_project_revenue
         =======================
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_project_revenue.egg-info/SOURCES.txt b/trytond_project_revenue.egg-info/SOURCES.txt
index c79505f..244c566 100644
--- a/trytond_project_revenue.egg-info/SOURCES.txt
+++ b/trytond_project_revenue.egg-info/SOURCES.txt
@@ -53,11 +53,13 @@ locale/fr_FR.po
 locale/hu_HU.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/lo_LA.po
 locale/lt_LT.po
 locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+locale/zh_CN.po
 trytond_project_revenue.egg-info/PKG-INFO
 trytond_project_revenue.egg-info/SOURCES.txt
 trytond_project_revenue.egg-info/dependency_links.txt
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index 9228461..151f36a 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,7 +1,7 @@
 python-sql
-trytond_project >= 3.8, < 3.9
-trytond_timesheet >= 3.8, < 3.9
-trytond_timesheet_cost >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_project >= 4.0, < 4.1
+trytond_timesheet >= 4.0, < 4.1
+trytond_timesheet_cost >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/work.py b/work.py
index 7cac750..0f10634 100644
--- a/work.py
+++ b/work.py
@@ -15,10 +15,10 @@ from trytond.tools import reduce_ids, grouped_slice
 from trytond.modules.product import price_digits
 
 __all__ = ['Work']
-__metaclass__ = PoolMeta
 
 
 class Work:
+    __metaclass__ = PoolMeta
     __name__ = 'project.work'
     product = fields.Many2One('product.product', 'Product',
         domain=[
@@ -59,7 +59,7 @@ class Work:
         Line = pool.get('timesheet.line')
         Work = pool.get('timesheet.work')
         transaction = Transaction()
-        cursor = transaction.cursor
+        cursor = transaction.connection.cursor()
 
         costs = dict.fromkeys([w.id for w in works], 0)
 
@@ -104,7 +104,7 @@ class Work:
         Invoice = pool.get('account.invoice')
         Company = pool.get('company.company')
 
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         table = cls.__table__()
         purchase_line = PurchaseLine.__table__()
         invoice_line = InvoiceLine.__table__()
-- 
tryton-modules-project-revenue



More information about the tryton-debian-vcs mailing list