[tryton-debian-vcs] tryton-modules-project-invoice branch debian updated. debian/3.8.1-1-4-g8a45753
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:23:27 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-invoice.git;a=commitdiff;h=debian/3.8.1-1-4-g8a45753
commit 8a45753a5118608e5a5be51abaf0dce7eeff28ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:27 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 3fd5d55..fe0ab40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project-invoice (4.0.1-1) unstable; urgency=medium
+
+ * 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:27 +0200
+
tryton-modules-project-invoice (3.8.1-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit 1d866041d18864f649a264cddec51687101d0c58
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 f1b4b7d..5585219 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ 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 be83ebadbbd8009466f7764ce116ec3a484ead40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:26 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 0cb6f95..8b2187e 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 2d2211e..8003244 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_invoice
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 85a0832..8b7d67a 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -40,11 +40,11 @@ msgstr "Valor Facturado"
msgctxt "field:project.work,invoiced_duration:"
msgid "Invoiced Duration"
-msgstr ""
+msgstr "Duración de la Facturación"
msgctxt "field:project.work,invoiced_progress:"
msgid "Invoiced Progress"
-msgstr ""
+msgstr "Progreso de la Facturación"
msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
@@ -52,19 +52,19 @@ msgstr "Método de Facturación"
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Creado por Usuario"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
-msgstr ""
+msgstr "Esfuerzo"
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
@@ -72,19 +72,19 @@ msgstr "Línea de Factura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nombre"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Tarea"
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
@@ -100,7 +100,7 @@ msgstr "Facturas"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
-msgstr ""
+msgstr "Progreso de Tareas Facturadas"
msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
@@ -116,7 +116,7 @@ msgstr "Por Esfuerzo"
msgctxt "selection:project.work,invoice_method:"
msgid "On Progress"
-msgstr ""
+msgstr "En Progreso"
msgctxt "selection:project.work,invoice_method:"
msgid "On Timesheet"
@@ -132,7 +132,7 @@ msgstr "Por Esfuerzo"
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Progress"
-msgstr ""
+msgstr "En Progreso"
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
@@ -140,11 +140,11 @@ msgstr "Por Registro de Tiempo"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progress"
-msgstr ""
+msgstr "Progreso de Tareas Facturadas"
msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
-msgstr ""
+msgstr "Progresos de Tareas Facturadas"
msgctxt "view:project.work:"
msgid "Invoice"
diff --git a/tryton.cfg b/tryton.cfg
index 520ff6c..fb70f6d 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_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index a5b236c..1c4bde7 100644
--- a/trytond_project_invoice.egg-info/PKG-INFO
+++ b/trytond_project_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-invoice
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to invoice projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_project_invoice.egg-info/SOURCES.txt b/trytond_project_invoice.egg-info/SOURCES.txt
index 0bf9122..6b6866a 100644
--- a/trytond_project_invoice.egg-info/SOURCES.txt
+++ b/trytond_project_invoice.egg-info/SOURCES.txt
@@ -30,11 +30,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/scenario_project_invoice_effort.rst
./tests/scenario_project_invoice_progress.rst
diff --git a/trytond_project_invoice.egg-info/requires.txt b/trytond_project_invoice.egg-info/requires.txt
index b6cc14d..1c8794a 100644
--- a/trytond_project_invoice.egg-info/requires.txt
+++ b/trytond_project_invoice.egg-info/requires.txt
@@ -5,4 +5,4 @@ trytond_timesheet >= 4.0, < 4.1
trytond_account >= 4.0, < 4.1
trytond_account_invoice >= 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 2a667ba1375cbbf7ee6cf3c75faad280f878eb37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:11 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index b8c3049..0cb6f95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 3.8.1 - 2016-03-14
+Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
+* Add Python3 support
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fb81651..2d2211e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_invoice
-Version: 3.8.1
+Version: 4.0.0
Summary: Tryton module to invoice projects
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_invoice
=======================
@@ -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/bg_BG.po b/locale/bg_BG.po
index 5f320d4..0510abb 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -69,9 +69,10 @@ msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Ред от фактура"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
@@ -154,6 +155,7 @@ msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Фактури"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b13dc79..85a0832 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -68,7 +68,7 @@ msgstr ""
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Línea de Factura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 95c828b..7f9b83b 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -66,9 +66,10 @@ msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Línea de factura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
@@ -146,6 +147,7 @@ msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Facturas"
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 92%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index 05db6aa..846a933 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -26,15 +26,13 @@ msgctxt "field:project.work,duration_to_invoice:"
msgid "Duration to Invoice"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
msgctxt "field:project.work,invoiced_amount:"
msgid "Invoiced Amount"
@@ -48,10 +46,9 @@ msgctxt "field:project.work,invoiced_progress:"
msgid "Invoiced Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
@@ -89,20 +86,17 @@ msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr "Tijdregistratieregels"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgstr ""
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -112,10 +106,9 @@ msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr ""
msgctxt "selection:project.work,invoice_method:"
msgid "On Effort"
@@ -129,10 +122,9 @@ msgctxt "selection:project.work,invoice_method:"
msgid "On Timesheet"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,project_invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr ""
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Effort"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 05db6aa..dea9f68 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -69,9 +69,10 @@ msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Factuurregel"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
@@ -154,6 +155,7 @@ msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Verkoopfacturen"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 72a7716..9485ca1 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -69,9 +69,10 @@ msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
msgstr ""
+#, fuzzy
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Строка инвойса"
msgctxt "field:project.work.invoiced_progress,rec_name:"
msgid "Name"
@@ -154,6 +155,7 @@ msgctxt "view:project.work.invoiced_progress:"
msgid "Work Invoiced Progresses"
msgstr ""
+#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr ""
+msgstr "Инвойсы"
diff --git a/locale/nl_NL.po b/locale/zh_CN.po
similarity index 92%
copy from locale/nl_NL.po
copy to locale/zh_CN.po
index 05db6aa..846a933 100644
--- a/locale/nl_NL.po
+++ b/locale/zh_CN.po
@@ -26,15 +26,13 @@ msgctxt "field:project.work,duration_to_invoice:"
msgid "Duration to Invoice"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr ""
-#, fuzzy
msgctxt "field:project.work,invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
msgctxt "field:project.work,invoiced_amount:"
msgid "Invoiced Amount"
@@ -48,10 +46,9 @@ msgctxt "field:project.work,invoiced_progress:"
msgid "Invoiced Progress"
msgstr ""
-#, fuzzy
msgctxt "field:project.work,project_invoice_method:"
msgid "Invoice Method"
-msgstr "Factuur afhandeling"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
@@ -89,20 +86,17 @@ msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
msgstr ""
-#, fuzzy
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
-msgstr "Tijdregistratieregels"
+msgstr ""
-#, fuzzy
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgstr ""
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -112,10 +106,9 @@ msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr ""
msgctxt "selection:project.work,invoice_method:"
msgid "On Effort"
@@ -129,10 +122,9 @@ msgctxt "selection:project.work,invoice_method:"
msgid "On Timesheet"
msgstr ""
-#, fuzzy
msgctxt "selection:project.work,project_invoice_method:"
msgid "Manual"
-msgstr "Handmatig"
+msgstr ""
msgctxt "selection:project.work,project_invoice_method:"
msgid "On Effort"
diff --git a/setup.py b/setup.py
index f0e34c0..e8b4c60 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 >= 0.4']
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'))
@@ -82,6 +88,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',
@@ -95,6 +102,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',
@@ -110,4 +120,10 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=[
+ 'tests/scenario_project_invoice_timesheet.rst',
+ 'tests/scenario_project_invoice_progress.rst',
+ 'tests/scenario_project_invoice_effort.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 738b8b4..44e3a00 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_invoice import suite
+try:
+ from trytond.modules.project_invoice.tests.test_project_invoice import suite
+except ImportError:
+ from .test_project_invoice import suite
__all__ = ['suite']
diff --git a/tests/scenario_project_invoice_effort.rst b/tests/scenario_project_invoice_effort.rst
index 4dd1d22..9ad3fc1 100644
--- a/tests/scenario_project_invoice_effort.rst
+++ b/tests/scenario_project_invoice_effort.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
... get_accounts
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... create_payment_term
>>> today = datetime.date.today()
diff --git a/tests/scenario_project_invoice_progress.rst b/tests/scenario_project_invoice_progress.rst
index 30c1c92..1aa003d 100644
--- a/tests/scenario_project_invoice_progress.rst
+++ b/tests/scenario_project_invoice_progress.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
... get_accounts
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... create_payment_term
>>> today = datetime.date.today()
diff --git a/tests/scenario_project_invoice_timesheet.rst b/tests/scenario_project_invoice_timesheet.rst
index 2a51769..0fe65e1 100644
--- a/tests/scenario_project_invoice_timesheet.rst
+++ b/tests/scenario_project_invoice_timesheet.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
... get_accounts
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... create_payment_term
>>> today = datetime.date.today()
@@ -137,6 +137,13 @@ Create a Project::
>>> project.save()
>>> task, = project.children
+Add a task without timesheet work::
+
+ >>> task2 = project.children.new()
+ >>> task2.name = 'Task 2'
+ >>> task2.type = 'task'
+ >>> project.save()
+
Create timesheets::
>>> TimesheetLine = Model.get('timesheet.line')
diff --git a/tests/test_project_invoice.py b/tests/test_project_invoice.py
index 9b259c9..66a03a1 100644
--- a/tests/test_project_invoice.py
+++ b/tests/test_project_invoice.py
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class ProjectInvoiceTestCase(ModuleTestCase):
@@ -19,13 +20,16 @@ def suite():
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_timesheet.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_effort.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
suite.addTests(doctest.DocFileSuite(
'scenario_project_invoice_progress.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/timesheet.py b/timesheet.py
index bbf6cc3..4eda487 100644
--- a/timesheet.py
+++ b/timesheet.py
@@ -5,10 +5,10 @@ from trytond.pool import PoolMeta
__all__ = ['TimesheetLine']
-__metaclass__ = PoolMeta
class TimesheetLine:
+ __metaclass__ = PoolMeta
__name__ = 'timesheet.line'
invoice_line = fields.Many2One('account.invoice.line', 'Invoice Line',
readonly=True)
diff --git a/tryton.cfg b/tryton.cfg
index 4350e12..520ff6c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.1
+version=4.0.0
depends:
ir
project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index 57e8e8b..a5b236c 100644
--- a/trytond_project_invoice.egg-info/PKG-INFO
+++ b/trytond_project_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-project-invoice
-Version: 3.8.1
+Version: 4.0.0
Summary: Tryton module to invoice projects
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_invoice
=======================
@@ -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_invoice.egg-info/SOURCES.txt b/trytond_project_invoice.egg-info/SOURCES.txt
index 644c204..0bf9122 100644
--- a/trytond_project_invoice.egg-info/SOURCES.txt
+++ b/trytond_project_invoice.egg-info/SOURCES.txt
@@ -57,11 +57,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
tests/scenario_project_invoice_effort.rst
tests/scenario_project_invoice_progress.rst
tests/scenario_project_invoice_timesheet.rst
diff --git a/trytond_project_invoice.egg-info/requires.txt b/trytond_project_invoice.egg-info/requires.txt
index 3ef8868..b6cc14d 100644
--- a/trytond_project_invoice.egg-info/requires.txt
+++ b/trytond_project_invoice.egg-info/requires.txt
@@ -1,8 +1,8 @@
python-sql >= 0.4
-trytond_project >= 3.8, < 3.9
-trytond_project_revenue >= 3.8, < 3.9
-trytond_timesheet >= 3.8, < 3.9
-trytond_account >= 3.8, < 3.9
-trytond_account_invoice >= 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_project_revenue >= 4.0, < 4.1
+trytond_timesheet >= 4.0, < 4.1
+trytond_account >= 4.0, < 4.1
+trytond_account_invoice >= 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 cf8b05f..6fb5765 100644
--- a/work.py
+++ b/work.py
@@ -20,7 +20,6 @@ from trytond.tools import reduce_ids, grouped_slice
__all__ = ['Work', 'WorkInvoicedProgress', 'OpenInvoice']
-__metaclass__ = PoolMeta
INVOICE_METHODS = [
('manual', 'Manual'),
@@ -31,6 +30,7 @@ INVOICE_METHODS = [
class Work:
+ __metaclass__ = PoolMeta
__name__ = 'project.work'
project_invoice_method = fields.Selection(INVOICE_METHODS,
'Invoice Method',
@@ -205,7 +205,7 @@ class Work:
Company = pool.get('company.company')
Currency = pool.get('currency.currency')
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
table = cls.__table__()
progress = Progress.__table__()
invoice_line = InvoiceLine.__table__()
@@ -257,7 +257,7 @@ class Work:
Company = pool.get('company.company')
Currency = pool.get('currency.currency')
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
table = cls.__table__()
timesheet_work = TimesheetWork.__table__()
timesheet_line = TimesheetLine.__table__()
@@ -303,7 +303,7 @@ class Work:
def _get_duration_timesheet(works, invoiced):
pool = Pool()
TimesheetLine = pool.get('timesheet.line')
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
line = TimesheetLine.__table__()
durations = {}
@@ -402,7 +402,7 @@ class Work:
return Invoice(
company=self.company,
- type='out_invoice',
+ type='out',
journal=journal,
party=self.party,
invoice_address=self.party.address_get(type='invoice'),
--
tryton-modules-project-invoice
More information about the tryton-debian-vcs
mailing list