[tryton-debian-vcs] tryton-modules-product-classification branch upstream updated. upstream/4.2.0-1-g8898ddf
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:34:13 UTC 2017
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-classification.git;a=commitdiff;h=upstream/4.2.0-1-g8898ddf
commit 8898ddfa4323a3f006779f39be0c057a1d9afa77
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:47 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 122bd23..b6c7bb6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index be9339f..f568502 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2015-2016 Cédric Krier.
-Copyright (C) 2015-2016 B2CK SPRL.
+Copyright (C) 2015-2017 Cédric Krier.
+Copyright (C) 2015-2017 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/PKG-INFO b/PKG-INFO
index a94824e..1b15f47 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_classification
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to implement product classification
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_product_classification
==============================
@@ -49,7 +49,7 @@ Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/es_419.po b/locale/es_419.po
index e683d1c..b7c7d3b 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "field:product.classification.dummy,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:product.classification.dummy,id:"
msgid "ID"
@@ -36,7 +36,7 @@ msgstr ""
msgctxt "field:product.classification.dummy,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:product.classification_tree.dummy,active:"
msgid "Active"
@@ -52,7 +52,7 @@ msgstr ""
msgctxt "field:product.classification_tree.dummy,create_uid:"
msgid "Create User"
-msgstr "Creado por usuario"
+msgstr ""
msgctxt "field:product.classification_tree.dummy,id:"
msgid "ID"
@@ -80,7 +80,7 @@ msgstr ""
msgctxt "field:product.classification_tree.dummy,write_uid:"
msgid "Write User"
-msgstr "Modificado por usuario"
+msgstr ""
msgctxt "field:product.product,classification:"
msgid "Classification"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 95e36c1..71a7d86 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2,128 +2,106 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "field:product.classification.dummy,active:"
msgid "Active"
msgstr "Ativo"
-#, fuzzy
msgctxt "field:product.classification.dummy,create_date:"
msgid "Create Date"
msgstr "Data de criação"
-#, fuzzy
msgctxt "field:product.classification.dummy,create_uid:"
msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
-#, fuzzy
msgctxt "field:product.classification.dummy,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.classification.dummy,name:"
msgid "Name"
msgstr "Nome"
-#, fuzzy
msgctxt "field:product.classification.dummy,rec_name:"
msgid "Name"
msgstr "Nome"
msgctxt "field:product.classification.dummy,selectable:"
msgid "Selectable"
-msgstr ""
+msgstr "Selecionável"
-#, fuzzy
msgctxt "field:product.classification.dummy,write_date:"
msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
-#, fuzzy
msgctxt "field:product.classification.dummy,write_uid:"
msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,active:"
msgid "Active"
msgstr "Ativo"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,childs:"
msgid "Children"
msgstr "Filhos"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,create_date:"
msgid "Create Date"
msgstr "Data de criação"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,create_uid:"
msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,name:"
msgid "Name"
msgstr "Nome"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,parent:"
msgid "Parent"
-msgstr "Parente"
+msgstr "Pai"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,rec_name:"
msgid "Name"
msgstr "Nome"
msgctxt "field:product.classification_tree.dummy,selectable:"
msgid "Selectable"
-msgstr ""
+msgstr "Selecionável"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,write_date:"
msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
-#, fuzzy
msgctxt "field:product.classification_tree.dummy,write_uid:"
msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
-#, fuzzy
msgctxt "field:product.product,classification:"
msgid "Classification"
msgstr "Classificação"
-#, fuzzy
msgctxt "field:product.template,classification:"
msgid "Classification"
msgstr "Classificação"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_classification"
msgid "Classifications"
-msgstr "Classificação"
+msgstr "Classificações"
msgctxt "model:product.classification.dummy,name:"
msgid "Dummy Product Classification"
-msgstr ""
+msgstr "Classificação de Produto Falso"
msgctxt "model:product.classification_tree.dummy,name:"
msgid "Dummy Product Classification Tree"
-msgstr ""
+msgstr "Listagem de Classificação de Produto Falso"
-#, fuzzy
msgctxt "view:product.classification.dummy:"
msgid "Classification"
msgstr "Classificação"
diff --git a/setup.py b/setup.py
index 960fea0..f918af7 100644
--- a/setup.py
+++ b/setup.py
@@ -76,7 +76,7 @@ setup(name=name,
'Environment :: Plugins',
'Framework :: Tryton',
'Intended Audience :: Developers',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 0626ea1..8333695 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
product
diff --git a/trytond_product_classification.egg-info/PKG-INFO b/trytond_product_classification.egg-info/PKG-INFO
index cb27ddd..08a13cc 100644
--- a/trytond_product_classification.egg-info/PKG-INFO
+++ b/trytond_product_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-classification
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to implement product classification
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_product_classification
==============================
@@ -49,7 +49,7 @@ Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_product_classification.egg-info/requires.txt b/trytond_product_classification.egg-info/requires.txt
index db2c649..dd3a913 100644
--- a/trytond_product_classification.egg-info/requires.txt
+++ b/trytond_product_classification.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_product >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/view/classification_form.xml b/view/classification_form.xml
index 40e5cdf..affeda0 100644
--- a/view/classification_form.xml
+++ b/view/classification_form.xml
@@ -4,7 +4,7 @@ this repository contains the full copyright notices and license terms. -->
<form>
<label name="name"/>
<field name="name"/>
- <group id="checkboxes" colspan="2" col="20">
+ <group id="checkboxes" colspan="2" col="-1">
<label name="active"/>
<field name="active" xexpand="0" width="25"/>
<label name="selectable"/>
diff --git a/view/template_form.xml b/view/template_form.xml
index 0669e8f..0a3cc66 100644
--- a/view/template_form.xml
+++ b/view/template_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='consumable']"
+ <xpath expr="/form/notebook/page[@id='general']/group[@id='checkboxes']"
position="after">
<label name="classification"/>
<field name="classification"/>
--
tryton-modules-product-classification
More information about the tryton-debian-vcs
mailing list