[tryton-debian-vcs] tryton-modules-product-measurements branch upstream created. b6b84b64e4d819cd5c6debcc58c89ae26dc9d735
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:05:58 UTC 2013
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=b6b84b64e4d819cd5c6debcc58c89ae26dc9d735
commit b6b84b64e4d819cd5c6debcc58c89ae26dc9d735
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:33 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 79c1c2d..8258af5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f927610..1ef26a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_measurements
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_measurements
============================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..fd170af
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.template,height:"
+msgid "Height"
+msgstr "Višina"
+
+msgctxt "field:product.template,height_digits:"
+msgid "Height Digits"
+msgstr "Decimalke za višino"
+
+msgctxt "field:product.template,height_uom:"
+msgid "Height Uom"
+msgstr "ME za višino"
+
+msgctxt "field:product.template,length:"
+msgid "Length"
+msgstr "Dolžina"
+
+msgctxt "field:product.template,length_digits:"
+msgid "Length Digits"
+msgstr "Decimalke za dolžino"
+
+msgctxt "field:product.template,length_uom:"
+msgid "Length Uom"
+msgstr "ME za dolžino"
+
+msgctxt "field:product.template,weight:"
+msgid "Weight"
+msgstr "Teža"
+
+msgctxt "field:product.template,weight_digits:"
+msgid "Weight Digits"
+msgstr "Decimalke za težo"
+
+msgctxt "field:product.template,weight_uom:"
+msgid "Weight Uom"
+msgstr "ME za težo"
+
+msgctxt "field:product.template,width:"
+msgid "Width"
+msgstr "Širina"
+
+msgctxt "field:product.template,width_digits:"
+msgid "Width Digits"
+msgstr "Decimalke za širino"
+
+msgctxt "field:product.template,width_uom:"
+msgid "Width Uom"
+msgstr "ME za širino"
+
+msgctxt "view:product.template:"
+msgid "Measurements"
+msgstr "Mere"
diff --git a/setup.py b/setup.py
index 3218c87..a06f4b8 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_product_measurements',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index afd8893..a3528d7 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from test_product_measurements import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 64d10a8..a200876 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index 26ad01c..0c1c66f 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_product_measurements
============================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_product_measurements.egg-info/SOURCES.txt b/trytond_product_measurements.egg-info/SOURCES.txt
index 1a81632..171bb25 100644
--- a/trytond_product_measurements.egg-info/SOURCES.txt
+++ b/trytond_product_measurements.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_product_measurements.egg-info/PKG-INFO
trytond_product_measurements.egg-info/SOURCES.txt
trytond_product_measurements.egg-info/dependency_links.txt
diff --git a/trytond_product_measurements.egg-info/requires.txt b/trytond_product_measurements.egg-info/requires.txt
index fd5ae88..a69ed06 100644
--- a/trytond_product_measurements.egg-info/requires.txt
+++ b/trytond_product_measurements.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 19364a4f510d1f9f80f52bbfe646f620e8c6338a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:00 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index c6d5b30..79c1c2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..87a90a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 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/MANIFEST.in b/MANIFEST.in
index e4632a1..732a76e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index aec1ae4..f927610 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product_measurements
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_measurements
============================
diff --git a/locale/es_AR.po b/locale/es_AR.po
index a239be5..b821d50 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -8,11 +8,11 @@ msgstr "Altura"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr "Decimales de altura"
+msgstr "Dígitos de altura"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr "Altura UdM"
+msgstr "UdM de 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 de longitud"
+msgstr "Dígitos de longitud"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr "Longitud UdM"
+msgstr "UdM de 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 del peso"
+msgstr "Dígitos de peso"
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
-msgstr "Peso UdM"
+msgstr "UdM de 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 del ancho"
+msgstr "Dígitos de ancho"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr "Ancho UdM"
+msgstr "UdM de ancho"
msgctxt "view:product.template:"
msgid "Measurements"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index ae236bf..9f06c93 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,56 +4,52 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.template,height:"
msgid "Height"
-msgstr ""
+msgstr "Alto"
msgctxt "field:product.template,height_digits:"
msgid "Height Digits"
-msgstr ""
+msgstr "Decimales de Alto"
msgctxt "field:product.template,height_uom:"
msgid "Height Uom"
-msgstr ""
+msgstr "UdM de Alto"
-#, fuzzy
msgctxt "field:product.template,length:"
msgid "Length"
-msgstr "Longitud"
+msgstr "Largo"
msgctxt "field:product.template,length_digits:"
msgid "Length Digits"
-msgstr ""
+msgstr "Decimales de Largo"
msgctxt "field:product.template,length_uom:"
msgid "Length Uom"
-msgstr ""
+msgstr "UdM de Largo"
-#, fuzzy
msgctxt "field:product.template,weight:"
msgid "Weight"
msgstr "Peso"
msgctxt "field:product.template,weight_digits:"
msgid "Weight Digits"
-msgstr ""
+msgstr "Decimales de Peso"
-#, fuzzy
msgctxt "field:product.template,weight_uom:"
msgid "Weight Uom"
msgstr "UdM de Peso"
-#, fuzzy
msgctxt "field:product.template,width:"
msgid "Width"
msgstr "Ancho"
msgctxt "field:product.template,width_digits:"
msgid "Width Digits"
-msgstr ""
+msgstr "Decimales de Ancho"
msgctxt "field:product.template,width_uom:"
msgid "Width Uom"
-msgstr ""
+msgstr "UdM de Ancho"
msgctxt "view:product.template:"
msgid "Measurements"
-msgstr ""
+msgstr "Medidas"
diff --git a/product.xml b/product.xml
index e083cee..c1be0f0 100644
--- a/product.xml
+++ b/product.xml
@@ -7,31 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="template_view_form">
<field name="model">product.template</field>
<field name="inherit" ref="product.template_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook"
- position="inside">
- <page string="Measurements" col="3" id="measurements"
- states="{'invisible': Eval('type').in_(['service'])}">
- <label name="length"/>
- <field name="length"/>
- <field name="length_uom"/>
- <label name="height"/>
- <field name="height"/>
- <field name="height_uom"/>
- <label name="width"/>
- <field name="width"/>
- <field name="width_uom"/>
- <label name="weight"/>
- <field name="weight"/>
- <field name="weight_uom"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">template_form</field>
</record>
</data>
diff --git a/setup.py b/setup.py
index 3148f82..3218c87 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_product_measurements',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_product_measurements',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.product_measurements': '.'},
packages=[
'trytond.modules.product_measurements',
'trytond.modules.product_measurements.tests',
],
package_data={
- 'trytond.modules.product_measurements': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.product_measurements': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index 760eb94..64d10a8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
product
diff --git a/trytond_product_measurements.egg-info/PKG-INFO b/trytond_product_measurements.egg-info/PKG-INFO
index c51125f..26ad01c 100644
--- a/trytond_product_measurements.egg-info/PKG-INFO
+++ b/trytond_product_measurements.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-product-measurements
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to add measurements to product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_product_measurements
============================
diff --git a/trytond_product_measurements.egg-info/SOURCES.txt b/trytond_product_measurements.egg-info/SOURCES.txt
index 4e782b3..1a81632 100644
--- a/trytond_product_measurements.egg-info/SOURCES.txt
+++ b/trytond_product_measurements.egg-info/SOURCES.txt
@@ -28,4 +28,5 @@ trytond_product_measurements.egg-info/dependency_links.txt
trytond_product_measurements.egg-info/entry_points.txt
trytond_product_measurements.egg-info/not-zip-safe
trytond_product_measurements.egg-info/requires.txt
-trytond_product_measurements.egg-info/top_level.txt
\ No newline at end of file
+trytond_product_measurements.egg-info/top_level.txt
+view/template_form.xml
\ No newline at end of file
diff --git a/trytond_product_measurements.egg-info/requires.txt b/trytond_product_measurements.egg-info/requires.txt
index b077aeb..fd5ae88 100644
--- a/trytond_product_measurements.egg-info/requires.txt
+++ b/trytond_product_measurements.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000..3eb333f
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- 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" position="inside">
+ <page string="Measurements" col="3" id="measurements"
+ states="{'invisible': Eval('type').in_(['service'])}">
+ <label name="length"/>
+ <field name="length"/>
+ <field name="length_uom"/>
+ <label name="height"/>
+ <field name="height"/>
+ <field name="height_uom"/>
+ <label name="width"/>
+ <field name="width"/>
+ <field name="width_uom"/>
+ <label name="weight"/>
+ <field name="weight"/>
+ <field name="weight_uom"/>
+ </page>
+ </xpath>
+</data>
--
tryton-modules-product-measurements
More information about the tryton-debian-vcs
mailing list