[tryton-debian-vcs] tryton-modules-project-revenue branch debian updated. debian/3.4.1-1-2-g9be419b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:05:29 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-project-revenue.git;a=commitdiff;h=debian/3.4.1-1-2-g9be419b
commit 9be419b0c6e18712bf0e00dcb60869b7097566e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:03 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index fb47bac..588c0ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-22
+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 b90c307..ef5ad1c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_project_revenue
-Version: 3.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_project_revenue
=======================
@@ -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 587601f..d66b71d 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 .work import *
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 5264e89..cdf01f9 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -20,7 +20,7 @@ msgstr "Producte"
msgctxt "field:project.work,revenue:"
msgid "Revenue"
-msgstr "Benefici"
+msgstr "Ingressos"
msgctxt "view:project.work:"
msgid "Cost"
@@ -28,4 +28,4 @@ msgstr "Cost"
msgctxt "view:project.work:"
msgid "Revenue"
-msgstr "Benefici"
+msgstr "Ingressos"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index f9c1549..45621a7 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -8,7 +8,7 @@ msgstr "Costo"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de moneda"
+msgstr "Decimales de moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 557d5bf..f679887 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -8,11 +8,11 @@ msgstr "Costo"
msgctxt "field:project.work,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de Moneda"
+msgstr "Decimales de moneda"
msgctxt "field:project.work,list_price:"
msgid "List Price"
-msgstr "Precio de Venta"
+msgstr "Precio de venta"
msgctxt "field:project.work,product:"
msgid "Product"
diff --git a/setup.py b/setup.py
index 4e0e08d..5da1c70 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
@@ -86,6 +86,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 910bb7c..63148b4 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_project_revenue import suite
diff --git a/tests/test_project_revenue.py b/tests/test_project_revenue.py
index bb6d212..a181065 100644
--- a/tests/test_project_revenue.py
+++ b/tests/test_project_revenue.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 ProjectRevenueTestCase(unittest.TestCase):
+class ProjectRevenueTestCase(ModuleTestCase):
'Test ProjectRevenue module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('project_revenue')
-
- def test0005views(self):
- 'Test views'
- test_view('project_revenue')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'project_revenue'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 81eee70..30ea087 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 3435f60..3f36851 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.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_project_revenue
=======================
@@ -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_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index b5c100b..d488472 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_project >= 3.4, < 3.5
-trytond_timesheet >= 3.4, < 3.5
-trytond_timesheet_cost >= 3.4, < 3.5
-trytond_company >= 3.4, < 3.5
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_project >= 3.6, < 3.7
+trytond_timesheet >= 3.6, < 3.7
+trytond_timesheet_cost >= 3.6, < 3.7
+trytond_company >= 3.6, < 3.7
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/work_form.xml b/view/work_form.xml
index 2efe9b5..3872ca0 100644
--- a/view/work_form.xml
+++ b/view/work_form.xml
@@ -2,7 +2,7 @@
<!-- 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='general']/field[@name='effort']"
+ <xpath expr="/form/notebook/page[@id='general']/field[@name='effort_duration']"
position="after">
<label name="product"/>
<field name="product"/>
diff --git a/work.py b/work.py
index b8746a2..bd050a8 100644
--- a/work.py
+++ b/work.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 decimal import Decimal
import datetime
@@ -94,7 +94,7 @@ class Work:
def getter(work):
if work.list_price:
- return work.list_price * Decimal(str(work.effort))
+ return work.list_price * Decimal(str(work.effort_hours))
else:
return Decimal(0)
@@ -115,7 +115,7 @@ class Work:
return company.currency.digits
return 2
- @fields.depends('product', 'party', 'hours', 'company')
+ @fields.depends('product', 'party', 'company')
def on_change_product(self):
pool = Pool()
User = pool.get('res.user')
@@ -124,7 +124,7 @@ class Work:
Currency = pool.get('currency.currency')
if not self.product:
- return {}
+ return
context = {}
@@ -134,14 +134,12 @@ class Work:
hour_uom = Uom(ModelData.get_id('product', 'uom_hour'))
with Transaction().set_context(context):
- list_price = Uom.compute_price(self.product.default_uom,
+ self.list_price = Uom.compute_price(self.product.default_uom,
self.product.list_price, hour_uom)
if self.company:
user = User(Transaction().user)
if user.company != self.company:
if user.company.currency != self.company.currency:
- list_price = Currency.compute(user.company.currency,
- list_price, self.company.currency)
-
- return {'list_price': list_price}
+ self.list_price = Currency.compute(user.company.currency,
+ self.list_price, self.company.currency)
--
tryton-modules-project-revenue
More information about the tryton-debian-vcs
mailing list