[tryton-debian-vcs] tryton-modules-project-invoice branch debian updated. debian/4.4.0-4-5-g92b316a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:14:22 UTC 2017
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/4.4.0-4-5-g92b316a
commit 92b316a4e8e14d6afe89794c0538d84d2ba9c446
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:24:52 2017 +0100
Releasing debian version 4.6.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 6e421b2..9ea29ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-project-invoice (4.6.0-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Bump the Standards-Version to 4.1.1, no changes needed.
+ * Merging upstream version 4.6.0.
+ * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 07 Nov 2017 10:20:22 +0100
+
tryton-modules-project-invoice (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit 462ec7ad01c2b68e147868c49a5526ef58dc62ad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 10:16:46 2017 +0100
Use https in the watch file.
diff --git a/debian/watch b/debian/watch
index eb5978d..7f7f6fc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_project_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_project_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 71ad0a50dd9457d051a6699e88f95374e8570d68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:08 2017 +0100
Merging upstream version 4.6.0.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index fba5484..b3bdf0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 68cb561..be08318 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_invoice
-Version: 4.4.0
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_project_invoice
=======================
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg.po b/locale/bg.po
index bfe7f1f..5f01751 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -77,10 +77,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Ред от фактура"
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/ca.po b/locale/ca.po
index 9b9e517..6d853cc 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Línia de factura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/cs.po b/locale/cs.po
index ad92da6..0520b1d 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -70,10 +70,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/de.po b/locale/de.po
index 5be9aff..9940305 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Rechnungsposition"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/es.po b/locale/es.po
index 226046d..ee47242 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Línea de factura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/es_419.po b/locale/es_419.po
index 0b32136..d782b98 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -72,7 +72,7 @@ msgid "Invoice Line"
msgstr ""
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/fr.po b/locale/fr.po
index fbd15f8..d62e870 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Ligne de facture"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 4e1568b..3e02338 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -73,10 +73,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index f0e7158..035a6e7 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -75,10 +75,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Riga fattura"
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 10d05a4..6da74e0 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,7 +71,7 @@ msgid "Invoice Line"
msgstr ""
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/lo.po b/locale/lo.po
index c3aaddd..ab00d19 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -75,10 +75,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "ລາຍການ"
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/lt.po b/locale/lt.po
index ad92da6..0520b1d 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -70,10 +70,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/nl.po b/locale/nl.po
index 25ec95b..75fb4c4 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -77,10 +77,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Factuurregel"
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/pl.po b/locale/pl.po
index 10d05a4..c448ae8 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -28,7 +28,7 @@ msgstr ""
msgctxt "field:project.work,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Wiersz faktury"
msgctxt "field:project.work,invoice_method:"
msgid "Invoice Method"
@@ -52,11 +52,11 @@ msgstr ""
msgctxt "field:project.work.invoiced_progress,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:project.work.invoiced_progress,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:project.work.invoiced_progress,effort_duration:"
msgid "Effort"
@@ -64,31 +64,31 @@ msgstr ""
msgctxt "field:project.work.invoiced_progress,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Wiersz faktury"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
-msgstr ""
+msgstr "Praca"
msgctxt "field:project.work.invoiced_progress,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:project.work.invoiced_progress,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:timesheet.line,invoice_line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Wiersz faktury"
msgctxt "model:ir.action,name:act_timesheet_line_form_invoice"
msgid "Timesheet Lines"
@@ -96,7 +96,7 @@ msgstr "Timesheet Lines"
msgctxt "model:ir.action,name:open_invoice"
msgid "Invoices"
-msgstr "Invoices"
+msgstr "Faktury"
msgctxt "model:project.work.invoiced_progress,name:"
msgid "Work Invoiced Progress"
@@ -104,7 +104,7 @@ msgstr ""
msgctxt "model:res.group,name:group_project_invoice"
msgid "Project Invoice"
-msgstr "Project Invoice"
+msgstr ""
msgctxt "selection:project.work,invoice_method:"
msgid "Manual"
@@ -138,7 +138,6 @@ msgctxt "selection:project.work,project_invoice_method:"
msgid "On Timesheet"
msgstr ""
-#, fuzzy
msgctxt "view:project.work:"
msgid "Invoice"
-msgstr "Invoices"
+msgstr "Faktura"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index fbfb9fd..eb8f565 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Linha de Fatura"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/ru.po b/locale/ru.po
index 9452334..2736e23 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -77,10 +77,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr "Строка инвойса"
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:project.work.invoiced_progress,work:"
diff --git a/locale/sl.po b/locale/sl.po
index d134dc4..30ab410 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Invoice Line"
msgstr "Postavka računa"
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index b385da7..626a4b6 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -73,10 +73,9 @@ msgctxt "field:project.work.invoiced_progress,invoice_line:"
msgid "Invoice Line"
msgstr ""
-#, fuzzy
msgctxt "field:project.work.invoiced_progress,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:project.work.invoiced_progress,work:"
msgid "Work"
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 167cdaf..8ee967d 100644
--- a/setup.py
+++ b/setup.py
@@ -103,9 +103,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 :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/scenario_project_invoice_effort.rst b/tests/scenario_project_invoice_effort.rst
index 182f2ba..0f399cc 100644
--- a/tests/scenario_project_invoice_effort.rst
+++ b/tests/scenario_project_invoice_effort.rst
@@ -8,7 +8,7 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import Model, Wizard
- >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.tests.tools import activate_modules, set_user
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -83,23 +83,20 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> hour, = ProductUom.find([('name', '=', 'Hour')])
- >>> Product = Model.get('product.product')
>>> ProductTemplate = Model.get('product.template')
- >>> product = Product()
+
>>> template = ProductTemplate()
>>> template.name = 'Service'
>>> template.default_uom = hour
>>> template.type = 'service'
>>> template.list_price = Decimal('20')
- >>> template.cost_price = Decimal('5')
>>> template.account_revenue = revenue
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
Create a Project::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> ProjectWork = Model.get('project.work')
>>> project = ProjectWork()
>>> project.name = 'Test effort'
@@ -147,7 +144,7 @@ Check project duration::
Invoice project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 18000)
@@ -158,7 +155,7 @@ Invoice project::
Do project::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> task_no_effort.state = 'done'
>>> task_no_effort.save()
>>> project.state = 'done'
@@ -176,7 +173,7 @@ Check project duration::
Invoice again project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 21600)
diff --git a/tests/scenario_project_invoice_progress.rst b/tests/scenario_project_invoice_progress.rst
index 1230565..4ba44bb 100644
--- a/tests/scenario_project_invoice_progress.rst
+++ b/tests/scenario_project_invoice_progress.rst
@@ -8,7 +8,7 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import Model, Wizard
- >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.tests.tools import activate_modules, set_user
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -83,23 +83,20 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> hour, = ProductUom.find([('name', '=', 'Hour')])
- >>> Product = Model.get('product.product')
>>> ProductTemplate = Model.get('product.template')
- >>> product = Product()
+
>>> template = ProductTemplate()
>>> template.name = 'Service'
>>> template.default_uom = hour
>>> template.type = 'service'
>>> template.list_price = Decimal('20')
- >>> template.cost_price = Decimal('5')
>>> template.account_revenue = revenue
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
Create a Project::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> ProjectWork = Model.get('project.work')
>>> TimesheetWork = Model.get('timesheet.work')
>>> project = ProjectWork()
@@ -153,7 +150,7 @@ Check project duration::
Invoice project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 9000)
@@ -164,7 +161,7 @@ Invoice project::
Do 75% of task and 100% of project::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> task.progress = 0.75
>>> task.save()
>>> project.progress = 1.
@@ -182,7 +179,7 @@ Check project duration::
Invoice again project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 17100)
diff --git a/tests/scenario_project_invoice_timesheet.rst b/tests/scenario_project_invoice_timesheet.rst
index 500d7fd..59d819d 100644
--- a/tests/scenario_project_invoice_timesheet.rst
+++ b/tests/scenario_project_invoice_timesheet.rst
@@ -8,7 +8,7 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from proteus import Model, Wizard
- >>> from trytond.tests.tools import activate_modules
+ >>> from trytond.tests.tools import activate_modules, set_user
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_chart, \
@@ -83,23 +83,20 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> hour, = ProductUom.find([('name', '=', 'Hour')])
- >>> Product = Model.get('product.product')
>>> ProductTemplate = Model.get('product.template')
- >>> product = Product()
+
>>> template = ProductTemplate()
>>> template.name = 'Service'
>>> template.default_uom = hour
>>> template.type = 'service'
>>> template.list_price = Decimal('20')
- >>> template.cost_price = Decimal('5')
>>> template.account_revenue = revenue
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
Create a Project::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> ProjectWork = Model.get('project.work')
>>> project = ProjectWork()
>>> project.name = 'Test timesheet'
@@ -150,7 +147,7 @@ Check project duration::
Invoice project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 18000)
@@ -161,7 +158,7 @@ Invoice project::
Create more timesheets::
- >>> config.user = project_user.id
+ >>> set_user(project_user)
>>> TimesheetLine = Model.get('timesheet.line')
>>> line = TimesheetLine()
>>> line.employee = employee
@@ -181,7 +178,7 @@ Check project duration::
Invoice again project::
- >>> config.user = project_invoice_user.id
+ >>> set_user(project_invoice_user)
>>> project.click('invoice')
>>> project.invoiced_duration
datetime.timedelta(0, 32400)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index bd5ce75..631b8f9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
ir
project
diff --git a/trytond_project_invoice.egg-info/PKG-INFO b/trytond_project_invoice.egg-info/PKG-INFO
index 7693212..30ad994 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: 4.4.0
+Version: 4.6.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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_project_invoice
=======================
@@ -70,9 +70,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
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 52bfc93..93eee1d 100644
--- a/trytond_project_invoice.egg-info/SOURCES.txt
+++ b/trytond_project_invoice.egg-info/SOURCES.txt
@@ -1,13 +1,20 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+invoice.py
project.xml
setup.py
+timesheet.py
timesheet.xml
+tox.ini
tryton.cfg
+work.py
work.xml
./__init__.py
./invoice.py
@@ -62,9 +69,11 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_project_invoice_effort.rst
tests/scenario_project_invoice_progress.rst
tests/scenario_project_invoice_timesheet.rst
+tests/test_project_invoice.py
trytond_project_invoice.egg-info/PKG-INFO
trytond_project_invoice.egg-info/SOURCES.txt
trytond_project_invoice.egg-info/dependency_links.txt
diff --git a/trytond_project_invoice.egg-info/requires.txt b/trytond_project_invoice.egg-info/requires.txt
index 48fc471..f42b5bb 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 >= 4.4, < 4.5
-trytond_project_revenue >= 4.4, < 4.5
-trytond_timesheet >= 4.4, < 4.5
-trytond_account >= 4.4, < 4.5
-trytond_account_invoice >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_project >= 4.6, < 4.7
+trytond_project_revenue >= 4.6, < 4.7
+trytond_timesheet >= 4.6, < 4.7
+trytond_account >= 4.6, < 4.7
+trytond_account_invoice >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
diff --git a/work.py b/work.py
index 2934599..23b94aa 100644
--- a/work.py
+++ b/work.py
@@ -412,7 +412,7 @@ class Work:
party=self.party,
invoice_address=self.party.address_get(type='invoice'),
currency=self.company.currency,
- account=self.party.account_receivable,
+ account=self.party.account_receivable_used,
payment_term=self.party.customer_payment_term,
description=self.name,
)
--
tryton-modules-project-invoice
More information about the tryton-debian-vcs
mailing list