[tryton-debian-vcs] tryton-modules-product-measurements branch upstream updated. upstream/3.4.1-1-gf7dae0b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:05:02 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-measurements.git;a=commitdiff;h=upstream/3.4.1-1-gf7dae0b
commit f7dae0b535289d2a868e2330a3e7cf1858fce60a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:01 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 9a5529d..9ad7c30 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 3af0449..e3d54f9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_measurements
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add measurements to product
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_product_measurements
============================
@@ -64,4 +64,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 1fc42cf..7a21528 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 product import *
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index bc16215..b55d717 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.template,height:"
msgid "Height"
-msgstr "Alt"
+msgstr "Altura"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr "Decimals alt"
+msgstr "Decimals de l'altura"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr "UdM alt"
+msgstr "UdM de l'altura"
msgctxt "field:product.template,length:"
msgid "Length"
@@ -20,11 +20,11 @@ msgstr "Longitud"
msgctxt "field:product.template,length_digits:"
msgid "Length Digits"
-msgstr "Decimals longitud"
+msgstr "Decimals de la longitud"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr "UdM longitud"
+msgstr "UdM de la longitud"
msgctxt "field:product.template,weight:"
msgid "Weight"
@@ -32,23 +32,23 @@ msgstr "Pes"
msgctxt "field:product.template,weight_digits:"
msgid "Weight Digits"
-msgstr "Decimals pes"
+msgstr "Decimals del pes"
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
-msgstr "UdM pes"
+msgstr "UdM del pes"
msgctxt "field:product.template,width:"
msgid "Width"
-msgstr "Ample"
+msgstr "Amplada"
msgctxt "field:product.template,width_digits:"
msgid "Width Digits"
-msgstr "Decimals ample"
+msgstr "Decimals de l'amplada"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr "UdM ample"
+msgstr "UdM de l'amplada"
msgctxt "view:product.template:"
msgid "Measurements"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 76660f1..8bd43be 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.template,height:"
msgid "Height"
-msgstr "Alto"
+msgstr "Altura"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr "Decimales alto"
+msgstr "Decimales de la altura"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr "UdM alto"
+msgstr "UdM de la altura"
msgctxt "field:product.template,length:"
msgid "Length"
@@ -20,11 +20,11 @@ msgstr "Longitud"
msgctxt "field:product.template,length_digits:"
msgid "Length Digits"
-msgstr "Decimales longitud"
+msgstr "Decimales de la longitud"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr "UdM longitud"
+msgstr "UdM de la longitud"
msgctxt "field:product.template,weight:"
msgid "Weight"
@@ -32,11 +32,11 @@ msgstr "Peso"
msgctxt "field:product.template,weight_digits:"
msgid "Weight Digits"
-msgstr "Decimales peso"
+msgstr "Decimales del peso"
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
-msgstr "UdM peso"
+msgstr "UdM del peso"
msgctxt "field:product.template,width:"
msgid "Width"
@@ -44,11 +44,11 @@ msgstr "Ancho"
msgctxt "field:product.template,width_digits:"
msgid "Width Digits"
-msgstr "Decimales ancho"
+msgstr "Decimales del ancho"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr "UdM ancho"
+msgstr "UdM del ancho"
msgctxt "view:product.template:"
msgid "Measurements"
diff --git a/product.py b/product.py
index bb1bd4a..535b3a5 100644
--- a/product.py
+++ b/product.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.pyson import Eval, Bool, Id
from trytond.pool import PoolMeta
@@ -109,3 +109,10 @@ class Template:
@staticmethod
def default_weight_digits():
return 2
+
+ @classmethod
+ def view_attributes(cls):
+ return super(Template, cls).view_attributes() + [
+ ('//page[@id="measurements"]', 'states', {
+ 'invisible': Eval('type').in_(NON_MEASURABLE),
+ })]
diff --git a/setup.py b/setup.py
index 2029088..fd1b48a 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 a3528d7..8e2859c 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_product_measurements import suite
diff --git a/tests/test_product_measurements.py b/tests/test_product_measurements.py
index 2e29bfa..02b898f 100644
--- a/tests/test_product_measurements.py
+++ b/tests/test_product_measurements.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 ProductMeasurementsTestCase(unittest.TestCase):
+class ProductMeasurementsTestCase(ModuleTestCase):
'Test ProductMeasurements module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('product_measurements')
-
- def test0005views(self):
- 'Test views'
- test_view('product_measurements')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'product_measurements'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index fd9651b..939432b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index fd0ee1f..897adcb 100644
--- a/trytond_product_measurements.egg-info/PKG-INFO
+++ b/trytond_product_measurements.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-measurements
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add measurements to product
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_product_measurements
============================
@@ -64,4 +64,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_product_measurements.egg-info/requires.txt b/trytond_product_measurements.egg-info/requires.txt
index 019b751..110e9bb 100644
--- a/trytond_product_measurements.egg-info/requires.txt
+++ b/trytond_product_measurements.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/template_form.xml b/view/template_form.xml
index 3eb333f..ce01d7c 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -3,8 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form/notebook" position="inside">
- <page string="Measurements" col="3" id="measurements"
- states="{'invisible': Eval('type').in_(['service'])}">
+ <page string="Measurements" col="3" id="measurements">
<label name="length"/>
<field name="length"/>
<field name="length_uom"/>
--
tryton-modules-product-measurements
More information about the tryton-debian-vcs
mailing list