[tryton-debian-vcs] tryton-modules-product-price-list branch debian updated. debian/3.2.0-1-5-gdcd1e29
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:17:02 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-price-list.git;a=commitdiff;h=debian/3.2.0-1-5-gdcd1e29
commit dcd1e29edeb30e08726465d6d54e2e581eadbb16
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:05 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 19b977f..6fc4e68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-product-price-list (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:16 +0200
+
tryton-modules-product-price-list (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit 5f3b5f5dae3089e83db2a72d4a35af843d192357
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:17 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 48784bd..d070caa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 836c696..a056fdb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_price_list
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module with price list
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_product_price_list
==========================
diff --git a/locale/fr_FR.po b/locale/es_EC.po
similarity index 71%
copy from locale/fr_FR.po
copy to locale/es_EC.po
index b54b6fe..b90bf19 100644
--- a/locale/fr_FR.po
+++ b/locale/es_EC.po
@@ -5,20 +5,20 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
msgstr ""
-"La formule \"%(formula)s\" de la ligne de liste de prix \"%(line)s\" est "
-"invalide."
+"La fórmula \"%(formula)s\" en la línea de lista de precios \"%(line)s\" no "
+"es válida."
msgctxt "field:product.price_list,company:"
msgid "Company"
-msgstr "Société"
+msgstr "Empresa"
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:product.price_list,id:"
msgid "ID"
@@ -26,35 +26,35 @@ msgstr "ID"
msgctxt "field:product.price_list,lines:"
msgid "Lines"
-msgstr "Lignes"
+msgstr "Líneas"
msgctxt "field:product.price_list,name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:product.price_list,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Fecha de Creación"
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Creado por Usuario"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
-msgstr "Formule"
+msgstr "Fórmula"
msgctxt "field:product.price_list.line,id:"
msgid "ID"
@@ -62,76 +62,76 @@ msgstr "ID"
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Liste de prix"
+msgstr "Lista de Precios"
msgctxt "field:product.price_list.line,product:"
msgid "Product"
-msgstr "Produit"
+msgstr "Producto"
msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
-msgstr "Quantité"
+msgstr "Cantidad"
msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Nombre"
msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
-msgstr "Séquence"
+msgstr "Secuencia"
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Décimales de l'unité"
+msgstr "Decimales de Unidad"
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Fecha de Modificación"
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Modificado por Usuario"
msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
msgstr ""
-"Une expression Python qui sera évaluée avec:\n"
-"- unit_price: le prix unitaire original"
+"Expresión de Python que se evaluará con:\n"
+"- unit_price: El precio unitario original"
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Listes de prix"
+msgstr "Listas de Precios"
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Listes de prix"
+msgstr "Listas de Precios"
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Liste de prix"
+msgstr "Lista de Precios"
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Ligne de liste de prix"
+msgstr "Línea de Lista de Precios"
msgctxt "view:party.party:"
msgid "Price List"
-msgstr "Liste de prix"
+msgstr "Lista de Precios"
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr "Ligne de liste de prix"
+msgstr "Línea de Lista de Precios"
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr "Lignes de liste de prix"
+msgstr "Líneas de Lista de Precios"
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr "Liste de prix"
+msgstr "Lista de Precios"
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr "Listes de prix"
+msgstr "Listas de Precios"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index b54b6fe..1a97232 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
msgstr ""
-"La formule \"%(formula)s\" de la ligne de liste de prix \"%(line)s\" est "
+"La formule « %(formula)s » de la ligne de liste de prix « %(line)s » est "
"invalide."
msgctxt "field:product.price_list,company:"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index aa57211..6355f3b 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -12,11 +12,11 @@ msgstr "Družba"
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.price_list,id:"
msgid "ID"
@@ -44,11 +44,11 @@ msgstr "Zapisal"
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
diff --git a/price_list.py b/price_list.py
index 0453ef1..36df54a 100644
--- a/price_list.py
+++ b/price_list.py
@@ -3,7 +3,7 @@
from decimal import Decimal
import tokenize
from StringIO import StringIO
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, MatchMixin, fields
from trytond.tools import safe_eval
from trytond.pyson import If, Eval
from trytond.transaction import Transaction
@@ -110,7 +110,7 @@ class PriceList(ModelSQL, ModelView):
return unit_price
-class PriceListLine(ModelSQL, ModelView):
+class PriceListLine(ModelSQL, ModelView, MatchMixin):
'Price List Line'
__name__ = 'product.price_list.line'
@@ -191,32 +191,11 @@ class PriceListLine(ModelSQL, ModelView):
})
def match(self, pattern):
- '''
- Match line on pattern
-
- :param pattern: a dictonary with price list line field as key
- and match value as value
- :return: a boolean
- '''
- res = True
- for field in pattern.keys():
- if field not in self._fields:
- continue
- if getattr(self, field) is None:
- continue
- if self._fields[field]._type == 'many2one':
- if getattr(self, field).id != pattern[field]:
- res = False
- break
- elif field == 'quantity':
- if getattr(self, field) > pattern[field]:
- res = False
- break
- else:
- if getattr(self, field) != pattern[field]:
- res = False
- break
- return res
+ if 'quantity' in pattern:
+ pattern = pattern.copy()
+ if self.quantity > pattern.pop('quantity'):
+ return False
+ return super(PriceListLine, self).match(pattern)
def get_unit_price(self):
'''
diff --git a/tryton.cfg b/tryton.cfg
index 9c43123..1ce4faf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
company
ir
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index b64077b..aa3c792 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-price-list
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module with price list
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_product_price_list
==========================
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index d772f41..8fd0970 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -9,14 +9,34 @@ setup.py
tryton.cfg
./__init__.py
./price_list.py
+./price_list.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
./tests/test_product_price_list.py
+./view/price_list_form.xml
+./view/price_list_line_form.xml
+./view/price_list_line_tree.xml
+./view/price_list_line_tree_sequence.xml
+./view/price_list_tree.xml
locale/bg_BG.po
locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index c0d54d2..a29faeb 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_company >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_company >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-product-price-list
More information about the tryton-debian-vcs
mailing list