[tryton-debian-vcs] tryton-modules-product-price-list branch upstream created. 3d34b59b748044117782eb8108d4138b3d3732bd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:06:15 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-price-list.git;a=commitdiff;h=3d34b59b748044117782eb8108d4138b3d3732bd
commit 3d34b59b748044117782eb8108d4138b3d3732bd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:34 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7f34659..7d5a2bd 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 2ecf527..3f58bda 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_price_list
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module with price list
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_price_list
==========================
@@ -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/es_CO.po b/locale/es_CO.po
index ff8eb04..5de9bc8 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -52,7 +52,7 @@ msgstr "Creado por Usuario"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
-msgstr "Formula"
+msgstr "Fórmula"
msgctxt "field:product.price_list.line,id:"
msgid "ID"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f974d55..b54b6fe 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -120,14 +120,6 @@ msgctxt "view:party.party:"
msgid "Price List"
msgstr "Liste de prix"
-msgctxt "view:party.party:"
-msgid "Price List"
-msgstr "Liste de prix"
-
-msgctxt "view:product.price_list.line:"
-msgid "Price List Line"
-msgstr "Ligne de liste de prix"
-
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr "Ligne de liste de prix"
@@ -136,14 +128,6 @@ msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr "Lignes de liste de prix"
-msgctxt "view:product.price_list.line:"
-msgid "Price List Lines"
-msgstr "Lignes de liste de prix"
-
-msgctxt "view:product.price_list:"
-msgid "Price List"
-msgstr "Liste de prix"
-
msgctxt "view:product.price_list:"
msgid "Price List"
msgstr "Liste de prix"
@@ -151,7 +135,3 @@ msgstr "Liste de prix"
msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Listes de prix"
-
-msgctxt "view:product.price_list:"
-msgid "Price Lists"
-msgstr "Listes de prix"
diff --git a/locale/es_CO.po b/locale/sl_SI.po
similarity index 71%
copy from locale/es_CO.po
copy to locale/sl_SI.po
index ff8eb04..fcb638f 100644
--- a/locale/es_CO.po
+++ b/locale/sl_SI.po
@@ -4,19 +4,19 @@ 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 "Fómula inválida \"%(formula)s\" en línea de lista de precios \"%(line)s\"."
+msgstr "Neveljavna formula \"%(formula)s\" v postavki cenika \"%(line)s\"."
msgctxt "field:product.price_list,company:"
msgid "Company"
-msgstr "Compañía"
+msgstr "Podjetje"
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.price_list,id:"
msgid "ID"
@@ -24,31 +24,31 @@ msgstr "ID"
msgctxt "field:product.price_list,lines:"
msgid "Lines"
-msgstr "Líneas"
+msgstr "Postavke"
msgctxt "field:product.price_list,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Naziv"
msgctxt "field:product.price_list,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Ustvarjeno"
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Ustvaril"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
@@ -60,74 +60,72 @@ msgstr "ID"
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Lista de Precios"
+msgstr "Cenik"
msgctxt "field:product.price_list.line,product:"
msgid "Product"
-msgstr "Producto"
+msgstr "Izdelek"
msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
-msgstr "Cantidad"
+msgstr "Količina"
msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
-msgstr "Secuencia"
+msgstr "Zap.št."
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de Unidad"
+msgstr "Decimalke"
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Zapisano"
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Zapisal"
msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
-msgstr "La expresion python que será evaluada con:"
+msgstr ""
+"Pythonski izraz, preračunan z:\n"
+"- unit_price: izvorna cena "
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Listas de Precios"
+msgstr "Ceniki"
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Listas de Precios"
+msgstr "Ceniki"
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Lista de Precios"
+msgstr "Cenik"
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Linea de Lista de Precios"
-
-msgctxt "view:party.party:"
-msgid "Price List"
-msgstr "Lista de Precios"
+msgstr "Postavka cenika"
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr "Linea de Lista de Precios"
+msgstr "Postavka cenika"
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr "Lineas de Lista de Precios"
+msgstr "Postavke cenika"
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr "Lista de Precios"
+msgstr "Cenik"
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr "Listas de Precios"
+msgstr "Ceniki"
diff --git a/party.xml b/party.xml
deleted file mode 100644
index dd6f1fd..0000000
--- a/party.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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. -->
-<tryton>
- <data>
-
- <record model="ir.ui.view" id="party_view_form">
- <field name="model">party.party</field>
- <field name="inherit" ref="party.party_view_form"/>
- <field name="name">party_form</field>
- </record>
-
- </data>
-</tryton>
diff --git a/price_list.py b/price_list.py
index a1e9650..bc3fa15 100644
--- a/price_list.py
+++ b/price_list.py
@@ -8,7 +8,7 @@ from trytond.tools import safe_eval
from trytond.pyson import If, Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
-from trytond.backend import TableHandler
+from trytond import backend
__all__ = ['PriceList', 'PriceListLine']
@@ -52,7 +52,7 @@ class PriceList(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=True, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
@@ -117,9 +117,7 @@ class PriceListLine(ModelSQL, ModelView):
price_list = fields.Many2One('product.price_list', 'Price List',
required=True, ondelete='CASCADE')
product = fields.Many2One('product.product', 'Product')
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
quantity = fields.Float('Quantity', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
unit_digits = fields.Function(fields.Integer('Unit Digits',
@@ -140,6 +138,7 @@ class PriceListLine(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -149,6 +148,11 @@ class PriceListLine(ModelSQL, ModelView):
table.not_null_action('sequence', action='remove')
@staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
+ @staticmethod
def default_formula():
return 'unit_price'
@@ -197,7 +201,7 @@ class PriceListLine(ModelSQL, ModelView):
for field in pattern.keys():
if field not in self._fields:
continue
- if not getattr(self, field):
+ if getattr(self, field) is None:
continue
if self._fields[field]._type == 'many2one':
if getattr(self, field).id != pattern[field]:
diff --git a/setup.py b/setup.py
index b4b955e..70464d6 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_product_price_list',
'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 b481128..761c2f5 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_price_list import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 215a99b..39dabf5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,10 +1,8 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
company
ir
- party
product
xml:
price_list.xml
- party.xml
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 7b45fac..a368e53 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module with price list
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_price_list
==========================
@@ -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_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index bc4ca47..d772f41 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-party.xml
price_list.xml
setup.py
tryton.cfg
@@ -22,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_product_price_list.egg-info/PKG-INFO
trytond_product_price_list.egg-info/SOURCES.txt
trytond_product_price_list.egg-info/dependency_links.txt
@@ -29,7 +29,6 @@ trytond_product_price_list.egg-info/entry_points.txt
trytond_product_price_list.egg-info/not-zip-safe
trytond_product_price_list.egg-info/requires.txt
trytond_product_price_list.egg-info/top_level.txt
-view/party_form.xml
view/price_list_form.xml
view/price_list_line_form.xml
view/price_list_line_tree.xml
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index ff78698..0394306 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_company >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_company >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/party_form.xml b/view/party_form.xml
deleted file mode 100644
index 2c93670..0000000
--- a/view/party_form.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/page[@id='accounting']" position="after">
- <page string="Price List" id="price_list">
- </page>
- </xpath>
-</data>
commit 367295ca2caf1b585fe52115c9a5bdc40cbd757b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:03 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2a0dd2b..7f34659 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 8ad4b79..a005001 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2013 Bertrand Chenal.
+Copyright (C) 2009-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 97a9596..2569955 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 cfe0044..2ecf527 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product_price_list
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with price list
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_price_list
==========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 5b304a7..9a5bfec 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Невалидна формула!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr ""
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -131,9 +131,5 @@ msgid "Price List"
msgstr "Ценова листа"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Редове от ценова листа"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Ценови листи"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index e79b236..fe78fbc 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Fórmula invàlida"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr "Formula \"%(formula)s\" a línia de tarifa \"%(line)s\" incorrecta."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -131,9 +131,5 @@ msgid "Price List"
msgstr "Tarifa"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Línies de tarifa"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Tarifes"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index b087c21..96113f8 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
msgstr ""
msgctxt "field:product.price_list,company:"
@@ -129,9 +129,5 @@ msgid "Price List"
msgstr ""
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr ""
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 78b8788..0b9d077 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Ungültige Formel!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr "Ungültige Formel \"%(formula)s\" in Preislistenzeile \"%(line)s\"."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -131,9 +131,5 @@ msgid "Price List"
msgstr "Preisliste"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Preisliste Zeilen"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Preislisten"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 391e573..bef1285 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,9 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "¡Formula inválida!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr ""
+"Fórmula «%(formula)s» en línea de precio de lista «%(line)s» no es correcta."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -80,7 +81,7 @@ msgstr "Secuencia"
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de la unidad"
+msgstr "Dígitos de unidad"
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
@@ -131,9 +132,5 @@ msgid "Price List"
msgstr "Lista de precios"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Líneas de lista de precios"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Listas de precios"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 9a22d46..ff8eb04 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Invalida formula!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr "Fómula inválida \"%(formula)s\" en línea de lista de precios \"%(line)s\"."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -129,9 +129,5 @@ msgid "Price List"
msgstr "Lista de Precios"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Lineas de Lista de Precios"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Listas de Precios"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index f713fa9..8e94c01 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "La fórmula no es correcta."
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
+msgstr "Formula \"%(formula)s\" en línea de tarifa \"%(line)s\" no es correcta."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -131,9 +131,5 @@ msgid "Price List"
msgstr "Tarifa"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Líneas de tarifa"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Tarifas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 7528766..f974d55 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,12 +3,10 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Formule non-valide !"
-
-msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
-msgstr "Formule non-valide !"
+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."
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -151,10 +149,6 @@ msgid "Price List"
msgstr "Liste de prix"
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr "Lignes de liste de prix"
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Listes de prix"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 28a920d..9af3e50 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
msgstr ""
#, fuzzy
@@ -138,9 +138,5 @@ msgid "Price List"
msgstr ""
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr ""
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index eb295ce..ea19633 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
-msgid "Invalid formula!"
+msgid "Invalid formula \"%(formula)s\" in price list line \"%(line)s\"."
msgstr ""
#, fuzzy
@@ -11,17 +11,20 @@ msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Учет.орг."
+#, fuzzy
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:product.price_list,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
#, fuzzy
msgctxt "field:product.price_list,lines:"
@@ -38,29 +41,34 @@ msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
+#, fuzzy
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr ""
+#, fuzzy
msgctxt "field:product.price_list.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
@@ -91,13 +99,15 @@ msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Группа цифр"
+#, fuzzy
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "help:product.price_list.line,formula:"
msgid ""
@@ -138,9 +148,5 @@ msgid "Price List"
msgstr ""
msgctxt "view:product.price_list:"
-msgid "Price List Lines"
-msgstr ""
-
-msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/party.xml b/party.xml
index 1c22b63..dd6f1fd 100644
--- a/party.xml
+++ b/party.xml
@@ -7,18 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="party_view_form">
<field name="model">party.party</field>
<field name="inherit" ref="party.party_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page[@id="accounting"]"
- position="after">
- <page string="Price List" id="price_list">
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">party_form</field>
</record>
</data>
diff --git a/price_list.py b/price_list.py
index 33f3b90..a1e9650 100644
--- a/price_list.py
+++ b/price_list.py
@@ -30,7 +30,7 @@ def decistmt(s):
result = []
# tokenize the string
g = tokenize.generate_tokens(StringIO(s).readline)
- for toknum, tokval, _, _, _ in g:
+ for toknum, tokval, _, _, _ in g:
# replace NUMBER tokens
if toknum == tokenize.NUMBER and '.' in tokval:
result.extend([
@@ -125,19 +125,17 @@ class PriceListLine(ModelSQL, ModelView):
unit_digits = fields.Function(fields.Integer('Unit Digits',
on_change_with=['product']), 'on_change_with_unit_digits')
formula = fields.Char('Formula', required=True,
- help='Python expression that will be evaluated with:\n' \
- '- unit_price: the original unit_price')
+ help=('Python expression that will be evaluated with:\n'
+ '- unit_price: the original unit_price'))
@classmethod
def __setup__(cls):
super(PriceListLine, cls).__setup__()
cls._order.insert(0, ('price_list', 'ASC'))
cls._order.insert(0, ('sequence', 'ASC'))
- cls._constraints += [
- ('check_formula', 'invalid_formula'),
- ]
cls._error_messages.update({
- 'invalid_formula': 'Invalid formula!',
+ 'invalid_formula': ('Invalid formula "%(formula)s" in price '
+ 'list line "%(line)s".'),
})
@classmethod
@@ -159,6 +157,12 @@ class PriceListLine(ModelSQL, ModelView):
return self.product.default_uom.digits
return 2
+ @classmethod
+ def validate(cls, lines):
+ super(PriceListLine, cls).validate(lines)
+ for line in lines:
+ line.check_formula()
+
def check_formula(self):
'''
Check formula
@@ -171,10 +175,15 @@ class PriceListLine(ModelSQL, ModelView):
with Transaction().set_context(**context):
try:
if not isinstance(self.get_unit_price(), Decimal):
- return False
+ self.raise_user_error('invalid_formula', {
+ 'formula': self.formula,
+ 'line': self.rec_name,
+ })
except Exception:
- return False
- return True
+ self.raise_user_error('invalid_formula', {
+ 'formula': self.formula,
+ 'line': self.rec_name,
+ })
def match(self, pattern):
'''
diff --git a/price_list.xml b/price_list.xml
index bd446a1..88b3a00 100644
--- a/price_list.xml
+++ b/price_list.xml
@@ -7,30 +7,13 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="price_list_view_form">
<field name="model">product.price_list</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Price List">
- <label name="name"/>
- <field name="name"/>
- <label name="company"/>
- <field name="company"/>
- <field name="lines" colspan="4"
- view_ids="product_price_list.price_list_line_view_tree_sequence"/>
- </form>
- ]]>
- </field>
+ <field name="name">price_list_form</field>
</record>
<record model="ir.ui.view" id="price_list_view_tree">
<field name="model">product.price_list</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Price Lists">
- <field name="name"/>
- </tree>
- ]]>
- </field>
+ <field name="name">price_list_tree</field>
</record>
<record model="ir.action.act_window" id="act_price_list_form">
@@ -73,64 +56,27 @@ this repository contains the full copyright notices and license terms. -->
<field name="global_p" eval="True"/>
</record>
<record model="ir.rule" id="rule_product_list1">
- <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'product.price_list')]"/>
- <field name="operator">=</field>
- <field name="operand">User/Current Company</field>
+ <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
<field name="rule_group" ref="rule_group_product_list"/>
</record>
<record model="ir.ui.view" id="price_list_line_view_form">
<field name="model">product.price_list.line</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Price List Line">
- <label name="price_list"/>
- <field name="price_list"/>
- <newline/>
- <label name="product"/>
- <field name="product"/>
- <label name="quantity"/>
- <field name="quantity"/>
- <label name="sequence"/>
- <field name="sequence"/>
- <newline/>
- <label name="formula"/>
- <field name="formula" colspan="3"/>
- </form>
- ]]>
- </field>
+ <field name="name">price_list_line_form</field>
</record>
<record model="ir.ui.view" id="price_list_line_view_tree">
<field name="model">product.price_list.line</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Price List Lines">
- <field name="price_list"/>
- <field name="sequence"/>
- <field name="product"/>
- <field name="quantity"/>
- <field name="formula"/>
- </tree>
- ]]>
- </field>
+ <field name="name">price_list_line_tree</field>
</record>
<record model="ir.ui.view" id="price_list_line_view_tree_sequence">
<field name="model">product.price_list.line</field>
<field name="type">tree</field>
<field name="priority" eval="20"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Price List Lines" sequence="sequence">
- <field name="product"/>
- <field name="quantity"/>
- <field name="formula"/>
- </tree>
- ]]>
- </field>
+ <field name="name">price_list_line_tree_sequence</field>
</record>
<record model="ir.model.access" id="access_price_list_line">
diff --git a/setup.py b/setup.py
index 9fe1365..b4b955e 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_price_list',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_product_price_list',
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_price_list': '.'},
packages=[
'trytond.modules.product_price_list',
'trytond.modules.product_price_list.tests',
],
package_data={
- 'trytond.modules.product_price_list': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.product_price_list': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_product_price_list',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 2af48fd..215a99b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.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 3c9714d..7b45fac 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.0
+Metadata-Version: 1.1
Name: trytond-product-price-list
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module with price list
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_price_list
==========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index b00521a..bc4ca47 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -28,4 +28,10 @@ trytond_product_price_list.egg-info/dependency_links.txt
trytond_product_price_list.egg-info/entry_points.txt
trytond_product_price_list.egg-info/not-zip-safe
trytond_product_price_list.egg-info/requires.txt
-trytond_product_price_list.egg-info/top_level.txt
\ No newline at end of file
+trytond_product_price_list.egg-info/top_level.txt
+view/party_form.xml
+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
\ No newline at end of file
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index fae173c..ff78698 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_company >= 2.6, < 2.7
-trytond_party >= 2.6, < 2.7
-trytond_product >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_company >= 2.8, < 2.9
+trytond_party >= 2.8, < 2.9
+trytond_product >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/party_form.xml b/view/party_form.xml
new file mode 100644
index 0000000..2c93670
--- /dev/null
+++ b/view/party_form.xml
@@ -0,0 +1,9 @@
+<?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/page[@id='accounting']" position="after">
+ <page string="Price List" id="price_list">
+ </page>
+ </xpath>
+</data>
diff --git a/view/price_list_form.xml b/view/price_list_form.xml
new file mode 100644
index 0000000..403dc0a
--- /dev/null
+++ b/view/price_list_form.xml
@@ -0,0 +1,11 @@
+<?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. -->
+<form string="Price List">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="company"/>
+ <field name="company"/>
+ <field name="lines" colspan="4"
+ view_ids="product_price_list.price_list_line_view_tree_sequence"/>
+</form>
diff --git a/view/price_list_line_form.xml b/view/price_list_line_form.xml
new file mode 100644
index 0000000..bd068ea
--- /dev/null
+++ b/view/price_list_line_form.xml
@@ -0,0 +1,17 @@
+<?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. -->
+<form string="Price List Line">
+ <label name="price_list"/>
+ <field name="price_list"/>
+ <newline/>
+ <label name="product"/>
+ <field name="product"/>
+ <label name="quantity"/>
+ <field name="quantity"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <newline/>
+ <label name="formula"/>
+ <field name="formula" colspan="3"/>
+</form>
diff --git a/view/price_list_line_tree.xml b/view/price_list_line_tree.xml
new file mode 100644
index 0000000..03011a5
--- /dev/null
+++ b/view/price_list_line_tree.xml
@@ -0,0 +1,10 @@
+<?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. -->
+<tree string="Price List Lines">
+ <field name="price_list"/>
+ <field name="sequence"/>
+ <field name="product"/>
+ <field name="quantity"/>
+ <field name="formula"/>
+</tree>
diff --git a/view/price_list_line_tree_sequence.xml b/view/price_list_line_tree_sequence.xml
new file mode 100644
index 0000000..b15dd22
--- /dev/null
+++ b/view/price_list_line_tree_sequence.xml
@@ -0,0 +1,8 @@
+<?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. -->
+<tree string="Price List Lines" sequence="sequence">
+ <field name="product"/>
+ <field name="quantity"/>
+ <field name="formula"/>
+</tree>
diff --git a/view/price_list_tree.xml b/view/price_list_tree.xml
new file mode 100644
index 0000000..9cab295
--- /dev/null
+++ b/view/price_list_tree.xml
@@ -0,0 +1,6 @@
+<?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. -->
+<tree string="Price Lists">
+ <field name="name"/>
+</tree>
commit 9064d06692de3b14af974b19d8ca80fd4f391035
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:38 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 15c3081..2a0dd2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 9e9fa1b..cfe0044 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 2.4.0
-Summary: Define price list rules by parties.
+Version: 2.6.0
+Summary: Tryton module with price list
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_product_price_list
+ ==========================
+
+ The product_price_list module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 9efe67a..611b860 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_product_price_list
==========================
The product_price_list module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 1ccdb55..598261a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,11 @@
#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 .price_list import *
+
+
+def register():
+ Pool.register(
+ PriceList,
+ PriceListLine,
+ module='product_price_list', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index a3f4ec6..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,48 +0,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.
-{
- 'name': 'Product Price List',
- 'name_bg_BG': 'Ценова листа на продукт',
- 'name_ca_ES': 'Tarifes de producte',
- 'name_de_DE': 'Artikel Preisliste',
- 'name_es_AR': 'Lista de precios de producto',
- 'name_es_CO': 'Lista de precios de producto',
- 'name_es_ES': 'Tarifas de producto',
- 'name_fr_FR': 'Liste de prix produit',
- 'version': '2.4.0',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Define price list rules by parties.''',
- 'description_bg_BG': 'Задаване на правила на ценова листа по партньор.',
- 'description_ca_ES': '''Defineix regles de tarifa per tercer.''',
- 'description_de_DE': '''Preislisten für Artikel
- - Ermöglicht die Definition von Preislisten für Parteien.
-''',
- 'description_es_AR': 'Define reglas de lista de precios por tercero.',
- 'description_es_CO': 'Define reglas de lista de precios por tercero.',
- 'description_es_ES': 'Define reglas de tarifa por tercero.',
- 'description_fr_FR': '''Défini des listes de prix par tiers''',
- 'depends': [
- 'ir',
- 'product',
- 'party',
- 'company',
- ],
- 'xml': [
- 'price_list.xml',
- 'party.xml',
- ],
- 'translation': [
- '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_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ea0ac3d..e79b236 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -12,16 +12,15 @@ msgstr "Empresa"
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.price_list,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.price_list,lines:"
msgid "Lines"
@@ -37,20 +36,19 @@ msgstr "Nom"
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
@@ -58,11 +56,11 @@ msgstr "Fórmula"
msgctxt "field:product.price_list.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Llista de preus"
+msgstr "Tarifa"
msgctxt "field:product.price_list.line,product:"
msgid "Product"
@@ -86,11 +84,11 @@ msgstr "Decimals de la unitat"
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "help:product.price_list.line,formula:"
msgid ""
@@ -102,40 +100,40 @@ msgstr ""
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Llistes de preus"
+msgstr "Tarifes"
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Llistes de preus"
+msgstr "Tarifes"
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Llista de preus"
+msgstr "Tarifa"
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Línia de llista de preus"
+msgstr "Línia de tarifa"
msgctxt "view:party.party:"
msgid "Price List"
-msgstr "Llista de preus"
+msgstr "Tarifa"
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr "Línia de llista de preus"
+msgstr "Línia de tarifa"
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr "Línies de llista de preus"
+msgstr "Línies de tarifa"
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr "Llista de preus"
+msgstr "Tarifa"
msgctxt "view:product.price_list:"
msgid "Price List Lines"
-msgstr "Línies de llista de preus"
+msgstr "Línies de tarifa"
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr "Llistes de preus"
+msgstr "Tarifes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 9edf968..9a22d46 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
-msgstr ""
+msgstr "Invalida formula!"
msgctxt "field:product.price_list,company:"
msgid "Company"
@@ -12,16 +12,15 @@ msgstr "Compañía"
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.price_list,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.price_list,lines:"
msgid "Lines"
@@ -37,32 +36,31 @@ msgstr "Nombre"
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
-msgstr ""
+msgstr "Formula"
msgctxt "field:product.price_list.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Lista de Precios"
msgctxt "field:product.price_list.line,product:"
msgid "Product"
@@ -82,58 +80,58 @@ msgstr "Secuencia"
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Dígitos de Unidad"
+msgstr "Decimales de Unidad"
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr ""
+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 ""
+msgstr "La expresion python que será evaluada con:"
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr ""
+msgstr "Listas de Precios"
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr ""
+msgstr "Listas de Precios"
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr ""
+msgstr "Lista de Precios"
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr ""
+msgstr "Linea de Lista de Precios"
msgctxt "view:party.party:"
msgid "Price List"
-msgstr ""
+msgstr "Lista de Precios"
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr ""
+msgstr "Linea de Lista de Precios"
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr ""
+msgstr "Lineas de Lista de Precios"
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Lista de Precios"
msgctxt "view:product.price_list:"
msgid "Price List Lines"
-msgstr ""
+msgstr "Lineas de Lista de Precios"
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr ""
+msgstr "Listas de Precios"
diff --git a/price_list.py b/price_list.py
index 04884fd..33f3b90 100644
--- a/price_list.py
+++ b/price_list.py
@@ -8,6 +8,9 @@ from trytond.tools import safe_eval
from trytond.pyson import If, Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.backend import TableHandler
+
+__all__ = ['PriceList', 'PriceListLine']
# code snippet taken from http://docs.python.org/library/tokenize.html
@@ -43,8 +46,8 @@ def decistmt(s):
class PriceList(ModelSQL, ModelView):
'Price List'
- _name = 'product.price_list'
- _description = __doc__
+ __name__ = 'product.price_list'
+
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
select=True, domain=[
@@ -53,7 +56,8 @@ class PriceList(ModelSQL, ModelView):
])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
- def default_company(self):
+ @staticmethod
+ def default_company():
return Transaction().context.get('company')
def _get_context_price_list_line(self, party, product, unit_price,
@@ -73,165 +77,137 @@ class PriceList(ModelSQL, ModelView):
'unit_price': unit_price,
}
- def compute(self, price_list, party, product, unit_price, quantity, uom,
+ def compute(self, party, product, unit_price, quantity, uom,
pattern=None):
'''
Compute price based on price list of party
- :param price_list: the price list id or the BrowseRecord of the
- product.price_list
- :param party: the party id or the BrowseRecord of the party.party
- :param product: the product id or the BrowseRecord of the
- product.product
:param unit_price: a Decimal for the default unit price in the
company's currency and default uom of the product
:param quantity: the quantity of product
- :param uom: the UOM id or the BrowseRecord of the product.uom
+ :param uom: a instance of the product.uom
:param pattern: a dictionary with price list field as key
and match value as value
:return: the computed unit price
'''
- pool = Pool()
- party_obj = pool.get('party.party')
- product_obj = pool.get('product.product')
- uom_obj = pool.get('product.uom')
- price_list_line_obj = pool.get('product.price_list.line')
-
- if not price_list:
- return unit_price
- if isinstance(price_list, (int, long)):
- price_list = self.browse(price_list)
-
- if isinstance(party, (int, long)):
- party = party_obj.browse(party)
-
- if isinstance(product, (int, long)):
- product = product_obj.browse(product)
-
- if isinstance(uom, (int, long)):
- uom = uom_obj.browse(uom)
+ Uom = Pool().get('product.uom')
if pattern is None:
pattern = {}
pattern = pattern.copy()
pattern['product'] = product and product.id or None
- pattern['quantity'] = uom_obj.compute_qty(uom, quantity,
+ pattern['quantity'] = Uom.compute_qty(uom, quantity,
product.default_uom, round=False)
- for line in price_list.lines:
- if price_list_line_obj.match(line, pattern):
+ for line in self.lines:
+ if line.match(pattern):
with Transaction().set_context(
self._get_context_price_list_line(party, product,
unit_price, quantity, uom)):
- return price_list_line_obj.get_unit_price(line)
+ return line.get_unit_price()
return unit_price
-PriceList()
-
class PriceListLine(ModelSQL, ModelView):
'Price List Line'
- _name = 'product.price_list.line'
- _description = __doc__
+ __name__ = 'product.price_list.line'
+
price_list = fields.Many2One('product.price_list', 'Price List',
required=True, ondelete='CASCADE')
product = fields.Many2One('product.product', 'Product')
- sequence = fields.Integer('Sequence', required=True)
+ sequence = fields.Integer('Sequence',
+ order_field='(%(table)s.sequence IS NULL) %(order)s, '
+ '%(table)s.sequence %(order)s')
quantity = fields.Float('Quantity', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
unit_digits = fields.Function(fields.Integer('Unit Digits',
- on_change_with=['product']), 'get_unit_digits')
+ on_change_with=['product']), 'on_change_with_unit_digits')
formula = fields.Char('Formula', required=True,
help='Python expression that will be evaluated with:\n' \
'- unit_price: the original unit_price')
- def __init__(self):
- super(PriceListLine, self).__init__()
- self._order.insert(0, ('price_list', 'ASC'))
- self._order.insert(0, ('sequence', 'ASC'))
- self._constraints += [
- ('check_formula', 'invalid_formula'),
- ]
- self._error_messages.update({
- 'invalid_formula': 'Invalid formula!',
- })
-
- def default_formula(self):
+ @classmethod
+ def __setup__(cls):
+ super(PriceListLine, cls).__setup__()
+ cls._order.insert(0, ('price_list', 'ASC'))
+ cls._order.insert(0, ('sequence', 'ASC'))
+ cls._constraints += [
+ ('check_formula', 'invalid_formula'),
+ ]
+ cls._error_messages.update({
+ 'invalid_formula': 'Invalid formula!',
+ })
+
+ @classmethod
+ def __register__(cls, module_name):
+ cursor = Transaction().cursor
+ table = TableHandler(cursor, cls, module_name)
+
+ super(PriceListLine, cls).__register__(module_name)
+
+ # Migration from 2.4: drop required on sequence
+ table.not_null_action('sequence', action='remove')
+
+ @staticmethod
+ def default_formula():
return 'unit_price'
- def on_change_with_unit_digits(self, vals):
- product_obj = Pool().get('product.product')
- if vals.get('product'):
- product = product_obj.browse(vals['product'])
- return product.default_uom.digits
+ def on_change_with_unit_digits(self, name=None):
+ if self.product:
+ return self.product.default_uom.digits
return 2
- def get_unit_digits(self, ids, name):
- res = {}
- for line in self.browse(ids):
- if line.product:
- res[line.id] = line.product.default_uom.digits
- else:
- res[line.id] = 2
- return res
-
- def check_formula(self, ids):
+ def check_formula(self):
'''
Check formula
'''
- price_list_obj = Pool().get('product.price_list')
- context = price_list_obj._get_context_price_list_line(None, None,
+ pool = Pool()
+ PriceList = pool.get('product.price_list')
+ context = PriceList()._get_context_price_list_line(None, None,
Decimal('0.0'), 0, None)
- lines = self.browse(ids)
+
with Transaction().set_context(**context):
- for line in lines:
- try:
- if not isinstance(self.get_unit_price(line), Decimal):
- return False
- except Exception:
+ try:
+ if not isinstance(self.get_unit_price(), Decimal):
return False
+ except Exception:
+ return False
return True
- def match(self, line, pattern):
+ def match(self, pattern):
'''
Match line on pattern
- :param line: a BrowseRecord of price list line
: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._columns:
+ if field not in self._fields:
continue
- if not line[field]:
+ if not getattr(self, field):
continue
- if self._columns[field]._type == 'many2one':
- if line[field].id != pattern[field]:
+ if self._fields[field]._type == 'many2one':
+ if getattr(self, field).id != pattern[field]:
res = False
break
elif field == 'quantity':
- if line[field] > pattern[field]:
+ if getattr(self, field) > pattern[field]:
res = False
break
else:
- if line[field] != pattern[field]:
+ if getattr(self, field) != pattern[field]:
res = False
break
return res
- def get_unit_price(self, line):
+ def get_unit_price(self):
'''
- Return unit price for a line
-
- :param line: a BrowseRecord of price list line
- :return: a Decimal
+ Return unit price (as Decimal)
'''
context = Transaction().context.copy()
context['Decimal'] = Decimal
- return safe_eval(decistmt(line.formula), context)
-
-PriceListLine()
+ return safe_eval(decistmt(self.formula), context)
diff --git a/setup.py b/setup.py
index 100ffdc..9fe1365 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,20 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_product_price_list',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module with price list',
+ 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] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.product_price_list': '.'},
packages=[
'trytond.modules.product_price_list',
- ],
+ 'trytond.modules.product_price_list.tests',
+ ],
package_data={
'trytond.modules.product_price_list': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -55,7 +67,7 @@ setup(name='trytond_product_price_list',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -65,4 +77,4 @@ setup(name='trytond_product_price_list',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/__init__.py b/tests/__init__.py
similarity index 76%
copy from __init__.py
copy to tests/__init__.py
index 1ccdb55..b481128 100644
--- a/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 .price_list import *
+from .test_product_price_list import suite
diff --git a/tests/test_product_price_list.py b/tests/test_product_price_list.py
new file mode 100644
index 0000000..3318b26
--- /dev/null
+++ b/tests/test_product_price_list.py
@@ -0,0 +1,45 @@
+#!/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.
+
+import sys
+import os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import test_view, test_depends
+
+
+class ProductPriceListTestCase(unittest.TestCase):
+ '''
+ Test ProductPriceList module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('product_price_list')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ test_view('product_price_list')
+
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
+
+def suite():
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ ProductPriceListTestCase))
+ return suite
+
+if __name__ == '__main__':
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..2af48fd
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,10 @@
+[tryton]
+version=2.6.0
+depends:
+ company
+ ir
+ party
+ product
+xml:
+ price_list.xml
+ party.xml
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 2a6d2c4..3c9714d 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond-product-price-list
-Version: 2.4.0
-Summary: Define price list rules by parties.
+Version: 2.6.0
+Summary: Tryton module with price list
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_product_price_list
+ ==========================
+
+ The product_price_list module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index 10cb3fb..b00521a 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -7,9 +7,11 @@ README
party.xml
price_list.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./price_list.py
+./tests/__init__.py
+./tests/test_product_price_list.py
locale/bg_BG.po
locale/ca_ES.po
locale/cs_CZ.po
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index bc24137..fae173c 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 2.4, < 2.5
-trytond_party >= 2.4, < 2.5
-trytond_company >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_company >= 2.6, < 2.7
+trytond_party >= 2.6, < 2.7
+trytond_product >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 06c2b37a5acf5e41cd2b24cf75fff458c07007f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:57 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 06decad..15c3081 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..8ad4b79 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 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/INSTALL b/INSTALL
index 0dbdc01..f090c9c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product_price_list
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 4e0b7b8..9e9fa1b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 2.2.0
+Version: 2.4.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 3e64526..1ccdb55 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
#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 price_list import *
+from .price_list import *
diff --git a/__tryton__.py b/__tryton__.py
index 51fdf89..a3f4ec6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,23 +2,27 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Product Price List',
- 'name_bg_BG' : 'Ценова листа на продукт',
- 'name_de_DE' : 'Artikel Preisliste',
+ 'name_bg_BG': 'Ценова листа на продукт',
+ 'name_ca_ES': 'Tarifes de producte',
+ 'name_de_DE': 'Artikel Preisliste',
+ 'name_es_AR': 'Lista de precios de producto',
'name_es_CO': 'Lista de precios de producto',
- 'name_es_ES': 'Lista de precios de producto',
- 'name_fr_FR' : 'Liste de prix produit',
- 'version': '2.2.0',
+ 'name_es_ES': 'Tarifas de producto',
+ 'name_fr_FR': 'Liste de prix produit',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Define price list rules by parties.''',
'description_bg_BG': 'Задаване на правила на ценова листа по партньор.',
- 'description_de_DE' : '''Preislisten für Artikel
+ 'description_ca_ES': '''Defineix regles de tarifa per tercer.''',
+ 'description_de_DE': '''Preislisten für Artikel
- Ermöglicht die Definition von Preislisten für Parteien.
''',
+ 'description_es_AR': 'Define reglas de lista de precios por tercero.',
'description_es_CO': 'Define reglas de lista de precios por tercero.',
- 'description_es_ES': 'Define reglas de lista de precios por tercero.',
- 'description_fr_FR' : '''Défini des listes de prix par tiers''',
+ 'description_es_ES': 'Define reglas de tarifa por tercero.',
+ 'description_fr_FR': '''Défini des listes de prix par tiers''',
'depends': [
'ir',
'product',
@@ -31,8 +35,10 @@
],
'translation': [
'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_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 7a0f178..5b304a7 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,55 +2,95 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr "Невалидна формула!"
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Фирма"
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Редове"
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr "Формула"
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr "Ценова листа"
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Продукт"
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Количество"
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Последователност"
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Десетични единици"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -66,34 +106,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr "Ценови листи"
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr "Ценова листа"
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr "Ред от ценова листа"
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr "Ценова листа"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr "Ред от ценова листа"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr "Редове от ценова листа"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr "Ценова листа"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr "Редове от ценова листа"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Ценови листи"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..ea0ac3d
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,141 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:"
+msgid "Invalid formula!"
+msgstr "Fórmula invàlida"
+
+msgctxt "field:product.price_list,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list,lines:"
+msgid "Lines"
+msgstr "Línies"
+
+msgctxt "field:product.price_list,name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:product.price_list.line,formula:"
+msgid "Formula"
+msgstr "Fórmula"
+
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:"
+msgid "Price List"
+msgstr "Llista de preus"
+
+msgctxt "field:product.price_list.line,product:"
+msgid "Product"
+msgstr "Producte"
+
+msgctxt "field:product.price_list.line,quantity:"
+msgid "Quantity"
+msgstr "Quantitat"
+
+msgctxt "field:product.price_list.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list.line,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:product.price_list.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Decimals de la unitat"
+
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+"Expressió de Python que s'avaluarà amb:\n"
+"- unit_price: El preu per unitat original"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Llistes de preus"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Llistes de preus"
+
+msgctxt "model:product.price_list,name:"
+msgid "Price List"
+msgstr "Llista de preus"
+
+msgctxt "model:product.price_list.line,name:"
+msgid "Price List Line"
+msgstr "Línia de llista de preus"
+
+msgctxt "view:party.party:"
+msgid "Price List"
+msgstr "Llista de preus"
+
+msgctxt "view:product.price_list.line:"
+msgid "Price List Line"
+msgstr "Línia de llista de preus"
+
+msgctxt "view:product.price_list.line:"
+msgid "Price List Lines"
+msgstr "Línies de llista de preus"
+
+msgctxt "view:product.price_list:"
+msgid "Price List"
+msgstr "Llista de preus"
+
+msgctxt "view:product.price_list:"
+msgid "Price List Lines"
+msgstr "Línies de llista de preus"
+
+msgctxt "view:product.price_list:"
+msgid "Price Lists"
+msgstr "Llistes de preus"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index e98a42f..b087c21 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,55 +2,95 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr ""
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr ""
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr ""
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr ""
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr ""
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr ""
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr ""
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr ""
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr ""
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -64,34 +104,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr ""
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr ""
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index eef4094..78b8788 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,55 +2,95 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr "Ungültige Formel!"
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Unternehmen"
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Zeilen"
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr "Formel"
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr "Preisliste"
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Artikel"
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Anzahl"
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Reihenfolge"
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Anzahl Stellen"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -66,34 +106,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr "Preislisten"
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr "Preisliste"
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr "Preisliste Zeile"
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr "Preisliste"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr "Preisliste Zeile"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr "Preisliste Zeilen"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr "Preisliste"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr "Preisliste Zeilen"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Preislisten"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..391e573
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,139 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:"
+msgid "Invalid formula!"
+msgstr "¡Formula inválida!"
+
+msgctxt "field:product.price_list,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:product.price_list,name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.price_list.line,formula:"
+msgid "Formula"
+msgstr "Fórmula"
+
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list.line,price_list:"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "field:product.price_list.line,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:product.price_list.line,quantity:"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:product.price_list.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list.line,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:product.price_list.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Decimales de la unidad"
+
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.price_list.line,formula:"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+"Expresión de Python que se evaluará con:\n"
+"- unit_price: El precio por unidad original"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Listas de precios"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Listas de precios"
+
+msgctxt "model:product.price_list,name:"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "model:product.price_list.line,name:"
+msgid "Price List Line"
+msgstr "Línea de lista de precios"
+
+msgctxt "view:party.party:"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "view:product.price_list.line:"
+msgid "Price List Line"
+msgstr "Línea de lista de precios"
+
+msgctxt "view:product.price_list.line:"
+msgid "Price List Lines"
+msgstr "Líneas de lista de precios"
+
+msgctxt "view:product.price_list:"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "view:product.price_list:"
+msgid "Price List Lines"
+msgstr "Líneas de lista de precios"
+
+msgctxt "view:product.price_list:"
+msgid "Price Lists"
+msgstr "Listas de precios"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b60f207..9edf968 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,55 +2,97 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr ""
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Líneas"
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr ""
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr ""
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Cantidad"
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígitos de Unidad"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -64,34 +106,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr ""
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr ""
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 70b8817..f713fa9 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,98 +2,138 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
-msgstr "Formula inválida"
+msgstr "La fórmula no es correcta."
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Líneas"
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr "Fórmula"
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Tarifa"
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Cantidad"
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Decimales de la unidad"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
msgstr ""
-"Expresión de Python que se evaluará con:\n"
+"Expresión de Python que se evaluará como:\n"
"- unit_price: El precio por unidad original"
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Listas de precios"
+msgstr "Tarifas"
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Listas de precios"
+msgstr "Tarifas"
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Tarifa"
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Línea de lista de precios"
+msgstr "Línea de tarifa"
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Tarifa"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr "Línea de lista de precios"
+msgstr "Línea de tarifa"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr "Líneas de lista de precios"
+msgstr "Líneas de tarifa"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Tarifa"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
-msgstr "Líneas de lista de precios"
+msgstr "Líneas de tarifa"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr "Listas de precios"
+msgstr "Tarifas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f854396..7528766 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,55 +2,99 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr "Formule non-valide !"
-msgctxt "field:product.price_list,company:0"
+msgctxt "error:product.price_list.line:"
+msgid "Invalid formula!"
+msgstr "Formule non-valide !"
+
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Société"
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Lignes"
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr "Formule"
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr "Liste de prix"
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Produit"
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Quantité"
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Séquence"
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Décimales de l'unité"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -66,34 +110,54 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr "Listes de prix"
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr "Liste de prix"
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr "Ligne de liste de prix"
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "view:party.party:"
msgid "Price List"
msgstr "Liste de prix"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr "Ligne de liste de prix"
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
+msgid "Price List Line"
+msgstr "Ligne de liste de prix"
+
+msgctxt "view:product.price_list.line:"
+msgid "Price List Lines"
+msgstr "Lignes de liste de prix"
+
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr "Lignes de liste de prix"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr "Liste de prix"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr "Lignes de liste de prix"
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
+msgid "Price Lists"
+msgstr "Listes de prix"
+
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr "Listes de prix"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index ff03826..28a920d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,64 +2,104 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr ""
#, fuzzy
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Bedrijf"
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Regels"
#, fuzzy
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Naam bijlage"
#, fuzzy
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr ""
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr ""
#, fuzzy
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Producten"
#, fuzzy
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Hoeveelheid"
#, fuzzy
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
#, fuzzy
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Reeks"
#, fuzzy
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Decimalen eenheid"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -73,34 +113,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr ""
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr ""
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 9771b5a..eb295ce 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,64 +2,104 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:product.price_list.line:0"
+msgctxt "error:product.price_list.line:"
msgid "Invalid formula!"
msgstr ""
#, fuzzy
-msgctxt "field:product.price_list,company:0"
+msgctxt "field:product.price_list,company:"
msgid "Company"
msgstr "Учет.орг."
+msgctxt "field:product.price_list,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:product.price_list,lines:0"
+msgctxt "field:product.price_list,lines:"
msgid "Lines"
msgstr "Строки"
#, fuzzy
-msgctxt "field:product.price_list,name:0"
+msgctxt "field:product.price_list,name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:product.price_list,rec_name:0"
+msgctxt "field:product.price_list,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:product.price_list.line,formula:0"
+msgctxt "field:product.price_list,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
msgstr ""
-msgctxt "field:product.price_list.line,price_list:0"
+msgctxt "field:product.price_list.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
msgstr ""
#, fuzzy
-msgctxt "field:product.price_list.line,product:0"
+msgctxt "field:product.price_list.line,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
#, fuzzy
-msgctxt "field:product.price_list.line,quantity:0"
+msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
msgstr "Кол-во"
#, fuzzy
-msgctxt "field:product.price_list.line,rec_name:0"
+msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:product.price_list.line,sequence:0"
+msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
msgstr "Последовательность"
#, fuzzy
-msgctxt "field:product.price_list.line,unit_digits:0"
+msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
msgstr "Группа цифр"
-msgctxt "help:product.price_list.line,formula:0"
+msgctxt "field:product.price_list.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:product.price_list.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
@@ -73,34 +113,34 @@ msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
msgstr ""
-msgctxt "model:product.price_list,name:0"
+msgctxt "model:product.price_list,name:"
msgid "Price List"
msgstr ""
-msgctxt "model:product.price_list.line,name:0"
+msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:party.party:0"
+msgctxt "view:party.party:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr ""
-msgctxt "view:product.price_list.line:0"
+msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price List Lines"
msgstr ""
-msgctxt "view:product.price_list:0"
+msgctxt "view:product.price_list:"
msgid "Price Lists"
msgstr ""
diff --git a/price_list.py b/price_list.py
index 826f2c0..04884fd 100644
--- a/price_list.py
+++ b/price_list.py
@@ -47,14 +47,14 @@ class PriceList(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
- select=1, domain=[
+ select=True, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
Eval('context', {}).get('company', 0)),
])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
def default_company(self):
- return Transaction().context.get('company') or False
+ return Transaction().context.get('company')
def _get_context_price_list_line(self, party, product, unit_price,
quantity, uom):
@@ -116,7 +116,7 @@ class PriceList(ModelSQL, ModelView):
pattern = {}
pattern = pattern.copy()
- pattern['product'] = product and product.id or False
+ pattern['product'] = product and product.id or None
pattern['quantity'] = uom_obj.compute_qty(uom, quantity,
product.default_uom, round=False)
@@ -138,7 +138,7 @@ class PriceListLine(ModelSQL, ModelView):
price_list = fields.Many2One('product.price_list', 'Price List',
required=True, ondelete='CASCADE')
product = fields.Many2One('product.product', 'Product')
- sequence = fields.Integer('Sequence')
+ sequence = fields.Integer('Sequence', required=True)
quantity = fields.Float('Quantity', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
unit_digits = fields.Function(fields.Integer('Unit Digits',
diff --git a/price_list.xml b/price_list.xml
index bc8df13..bd446a1 100644
--- a/price_list.xml
+++ b/price_list.xml
@@ -14,14 +14,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="name"/>
<label name="company"/>
<field name="company"/>
- <field name="lines" colspan="4">
- <tree string="Price List Lines"
- sequence="sequence">
- <field name="product"/>
- <field name="quantity"/>
- <field name="formula"/>
- </tree>
- </field>
+ <field name="lines" colspan="4"
+ view_ids="product_price_list.price_list_line_view_tree_sequence"/>
</form>
]]>
</field>
@@ -124,6 +118,21 @@ this repository contains the full copyright notices and license terms. -->
</field>
</record>
+ <record model="ir.ui.view" id="price_list_line_view_tree_sequence">
+ <field name="model">product.price_list.line</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="20"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Price List Lines" sequence="sequence">
+ <field name="product"/>
+ <field name="quantity"/>
+ <field name="formula"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
<record model="ir.model.access" id="access_price_list_line">
<field name="model" search="[('model', '=', 'product.price_list.line')]"/>
<field name="perm_read" eval="True"/>
diff --git a/setup.py b/setup.py
index 1eea40a..100ffdc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ 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))
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index e3771e0..2a6d2c4 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.0
Name: trytond-product-price-list
-Version: 2.2.0
+Version: 2.4.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index 4662830..10cb3fb 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -11,8 +11,10 @@ setup.py
./__tryton__.py
./price_list.py
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_ES.po
locale/fr_FR.po
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index a07e9d3..bc24137 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 2.2, < 2.3
-trytond_party >= 2.2, < 2.3
-trytond_company >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_product >= 2.4, < 2.5
+trytond_party >= 2.4, < 2.5
+trytond_company >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 4c247576f7c300946da1ec11cb3e3d505f23cff7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:01 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 154bd85..06decad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index aa670bf..4e0b7b8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 2.0.0
+Version: 2.2.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index a2fe630..51fdf89 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -30,10 +30,13 @@
'party.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index ddab6ee..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.price_list.line,0,Invalid formula!,Невалидна формула!,0
-field,"product.price_list,company",0,Company,Фирма,0
-field,"product.price_list,lines",0,Lines,Редове,0
-field,"product.price_list,name",0,Name,Име,0
-field,"product.price_list,rec_name",0,Name,Име,0
-field,"product.price_list.line,formula",0,Formula,Формула,0
-field,"product.price_list.line,price_list",0,Price List,Ценова листа,0
-field,"product.price_list.line,product",0,Product,Продукт,0
-field,"product.price_list.line,quantity",0,Quantity,Количество,0
-field,"product.price_list.line,rec_name",0,Name,Име,0
-field,"product.price_list.line,sequence",0,Sequence,Последователност,0
-field,"product.price_list.line,unit_digits",0,Unit Digits,Десетични единици,0
-help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
-- unit_price: the original unit_price","Израз на python който ще се изпълни с:
-- unit_price: оригиналната единична цена",0
-model,"ir.action,name",act_price_list_form,Price Lists,Ценови листи,0
-model,"ir.action,name",act_price_list_form2,Price Lists,Ценови листи,0
-model,"ir.ui.menu,name",menu_price_list,Price Lists,Ценови листи,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Нова ценова листа,0
-model,"product.price_list,name",0,Price List,Ценова листа,0
-model,"product.price_list.line,name",0,Price List Line,Ред от ценова листа,0
-view,party.party,0,Price List,Ценова листа,0
-view,product.price_list,0,Price List,Ценова листа,0
-view,product.price_list,0,Price List Lines,Редове от ценова листа,0
-view,product.price_list,0,Price Lists,Ценови листи,0
-view,product.price_list.line,0,Price List Line,Ред от ценова листа,0
-view,product.price_list.line,0,Price List Lines,Редове от ценова листа,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 8e002cf..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.price_list.line,0,Invalid formula!,Ungültige Formel!,0
-field,"product.price_list,company",0,Company,Unternehmen,0
-field,"product.price_list,lines",0,Lines,Zeilen,0
-field,"product.price_list,name",0,Name,Name,0
-field,"product.price_list,rec_name",0,Name,Name,0
-field,"product.price_list.line,formula",0,Formula,Formel,0
-field,"product.price_list.line,price_list",0,Price List,Preisliste,0
-field,"product.price_list.line,product",0,Product,Artikel,0
-field,"product.price_list.line,quantity",0,Quantity,Anzahl,0
-field,"product.price_list.line,rec_name",0,Name,Name,0
-field,"product.price_list.line,sequence",0,Sequence,Reihenfolge,0
-field,"product.price_list.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
-help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
-- unit_price: the original unit_price","Ein Pythonausdruck, der ausgewertet wird mit:
-- unit_price: originaler unit_price (Preis pro Einheit)",0
-model,"ir.action,name",act_price_list_form,Price Lists,Preislisten,0
-model,"ir.action,name",act_price_list_form2,Price Lists,Preislisten,0
-model,"ir.ui.menu,name",menu_price_list,Price Lists,Preislisten,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Neue Preisliste,0
-model,"product.price_list,name",0,Price List,Preisliste,0
-model,"product.price_list.line,name",0,Price List Line,Preisliste Zeile,0
-view,party.party,0,Price List,Preisliste,0
-view,product.price_list,0,Price List,Preisliste,0
-view,product.price_list,0,Price List Lines,Preisliste Zeilen,0
-view,product.price_list,0,Price Lists,Preislisten,0
-view,product.price_list.line,0,Price List Line,Preisliste Zeile,0
-view,product.price_list.line,0,Price List Lines,Preisliste Zeilen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 38d99be..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.price_list.line,0,Invalid formula!,,0
-field,"product.price_list,company",0,Company,Compañía,0
-field,"product.price_list.line,formula",0,Formula,,0
-field,"product.price_list.line,price_list",0,Price List,,0
-field,"product.price_list.line,product",0,Product,Producto,0
-field,"product.price_list.line,quantity",0,Quantity,Cantidad,0
-field,"product.price_list.line,rec_name",0,Name,Nombre,0
-field,"product.price_list,lines",0,Lines,Líneas,0
-field,"product.price_list.line,sequence",0,Sequence,Secuencia,0
-field,"product.price_list.line,unit_digits",0,Unit Digits,Dígitos de Unidad,0
-field,"product.price_list,name",0,Name,Nombre,0
-field,"product.price_list,rec_name",0,Name,Nombre,0
-help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
-- unit_price: the original unit_price",,0
-model,"ir.action,name",act_price_list_form,Price Lists,,0
-model,"ir.action,name",act_price_list_form2,Price Lists,,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,,0
-model,"ir.ui.menu,name",menu_price_list,Price Lists,,0
-model,"product.price_list.line,name",0,Price List Line,,0
-model,"product.price_list,name",0,Price List,,0
-view,party.party,0,Price List,,0
-view,product.price_list,0,Price List,,0
-view,product.price_list,0,Price List Lines,,0
-view,product.price_list,0,Price Lists,,0
-view,product.price_list.line,0,Price List Line,,0
-view,product.price_list.line,0,Price List Lines,,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 05e31fb..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.price_list.line,0,Invalid formula!,Formula inválida,0
-field,"product.price_list,company",0,Company,Empresa,0
-field,"product.price_list.line,formula",0,Formula,Fórmula,0
-field,"product.price_list.line,price_list",0,Price List,Lista de precios,0
-field,"product.price_list.line,product",0,Product,Producto,0
-field,"product.price_list.line,quantity",0,Quantity,Cantidad,0
-field,"product.price_list.line,rec_name",0,Name,Nombre,0
-field,"product.price_list,lines",0,Lines,Líneas,0
-field,"product.price_list.line,sequence",0,Sequence,Secuencia,0
-field,"product.price_list.line,unit_digits",0,Unit Digits,Decimales de la unidad,0
-field,"product.price_list,name",0,Name,Nombre,0
-field,"product.price_list,rec_name",0,Name,Nombre,0
-help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
-- unit_price: the original unit_price","Expresión de Python que se evaluará con:
-- unit_price: El precio por unidad original",0
-model,"ir.action,name",act_price_list_form,Price Lists,Listas de precios,0
-model,"ir.action,name",act_price_list_form2,Price Lists,Listas de precios,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nueva lista de precios,0
-model,"ir.ui.menu,name",menu_price_list,Price Lists,Listas de precios,0
-model,"product.price_list.line,name",0,Price List Line,Línea de lista de precios,0
-model,"product.price_list,name",0,Price List,Lista de precios,0
-view,party.party,0,Price List,Lista de precios,0
-view,product.price_list,0,Price List,Lista de precios,0
-view,product.price_list,0,Price List Lines,Líneas de lista de precios,0
-view,product.price_list,0,Price Lists,Listas de precios,0
-view,product.price_list.line,0,Price List Line,Línea de lista de precios,0
-view,product.price_list.line,0,Price List Lines,Líneas de lista de precios,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index d0f6ec7..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,28 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,product.price_list.line,0,Invalid formula!,Formule non-valide !,0
-field,"product.price_list,company",0,Company,Société,0
-field,"product.price_list,lines",0,Lines,Lignes,0
-field,"product.price_list,name",0,Name,Nom,0
-field,"product.price_list,rec_name",0,Name,Nom,0
-field,"product.price_list.line,formula",0,Formula,Formule,0
-field,"product.price_list.line,price_list",0,Price List,Liste de prix,0
-field,"product.price_list.line,product",0,Product,Produit,0
-field,"product.price_list.line,quantity",0,Quantity,Quantité,0
-field,"product.price_list.line,rec_name",0,Name,Nom,0
-field,"product.price_list.line,sequence",0,Sequence,Séquence,0
-field,"product.price_list.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
-help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
-- unit_price: the original unit_price","Une expression Python qui sera évaluée avec:
-- unit_price: le prix unitaire original",0
-model,"ir.action,name",act_price_list_form,Price Lists,Listes de prix,0
-model,"ir.action,name",act_price_list_form2,Price Lists,Listes de prix,0
-model,"ir.ui.menu,name",menu_price_list,Price Lists,Listes de prix,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nouvelle liste de prix,0
-model,"product.price_list,name",0,Price List,Liste de prix,0
-model,"product.price_list.line,name",0,Price List Line,Ligne de liste de prix,0
-view,party.party,0,Price List,Liste de prix,0
-view,product.price_list,0,Price List,Liste de prix,0
-view,product.price_list,0,Price List Lines,Lignes de liste de prix,0
-view,product.price_list,0,Price Lists,Listes de prix,0
-view,product.price_list.line,0,Price List Line,Ligne de liste de prix,0
-view,product.price_list.line,0,Price List Lines,Lignes de liste de prix,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..7a0f178
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,99 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr "Невалидна формула!"
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Редове"
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr "Формула"
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr "Ценова листа"
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Количество"
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Последователност"
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Десетични единици"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+"Израз на python който ще се изпълни с:\n"
+"- unit_price: оригиналната единична цена"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Ценови листи"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Ценови листи"
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr "Ценова листа"
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr "Ред от ценова листа"
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr "Ценова листа"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr "Ред от ценова листа"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr "Редове от ценова листа"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr "Ценова листа"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr "Редове от ценова листа"
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr "Ценови листи"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..e98a42f
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,97 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr ""
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr ""
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr ""
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr ""
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..eef4094
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,99 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr "Ungültige Formel!"
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Zeilen"
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr "Formel"
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr "Preisliste"
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Anzahl"
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Anzahl Stellen"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+"Ein Pythonausdruck, der ausgewertet wird mit:\n"
+"unit_price: originaler unit_price (Preis pro Einheit)"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Preislisten"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Preislisten"
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr "Preisliste"
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr "Preisliste Zeile"
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr "Preisliste"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr "Preisliste Zeile"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr "Preisliste Zeilen"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr "Preisliste"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr "Preisliste Zeilen"
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr "Preislisten"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..b60f207
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,97 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr ""
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Dígitos de Unidad"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..70b8817
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,99 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr "Formula inválida"
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr "Fórmula"
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Decimales de la unidad"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+"Expresión de Python que se evaluará con:\n"
+"- unit_price: El precio por unidad original"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Listas de precios"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Listas de precios"
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr "Línea de lista de precios"
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr "Línea de lista de precios"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr "Líneas de lista de precios"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr "Lista de precios"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr "Líneas de lista de precios"
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr "Listas de precios"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..f854396
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,99 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr "Formule non-valide !"
+
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Lignes"
+
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr "Formule"
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Quantité"
+
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Décimales de l'unité"
+
+msgctxt "help:product.price_list.line,formula:0"
+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"
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr "Listes de prix"
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr "Listes de prix"
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr "Ligne de liste de prix"
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr "Ligne de liste de prix"
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr "Lignes de liste de prix"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr "Liste de prix"
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr "Lignes de liste de prix"
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr "Listes de prix"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..ff03826
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,106 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Regels"
+
+#, fuzzy
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Producten"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Reeks"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Decimalen eenheid"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..9771b5a
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,106 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:product.price_list.line:0"
+msgid "Invalid formula!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+#, fuzzy
+msgctxt "field:product.price_list,lines:0"
+msgid "Lines"
+msgstr "Строки"
+
+#, fuzzy
+msgctxt "field:product.price_list,name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:product.price_list,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:product.price_list.line,formula:0"
+msgid "Formula"
+msgstr ""
+
+msgctxt "field:product.price_list.line,price_list:0"
+msgid "Price List"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:product.price_list.line,product:0"
+msgid "Product"
+msgstr "Товарно материальные ценности (ТМЦ)"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,quantity:0"
+msgid "Quantity"
+msgstr "Кол-во"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,sequence:0"
+msgid "Sequence"
+msgstr "Последовательность"
+
+#, fuzzy
+msgctxt "field:product.price_list.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Группа цифр"
+
+msgctxt "help:product.price_list.line,formula:0"
+msgid ""
+"Python expression that will be evaluated with:\n"
+"- unit_price: the original unit_price"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_price_list_form"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_price_list"
+msgid "Price Lists"
+msgstr ""
+
+msgctxt "model:product.price_list,name:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "model:product.price_list.line,name:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:party.party:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Line"
+msgstr ""
+
+msgctxt "view:product.price_list.line:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price List Lines"
+msgstr ""
+
+msgctxt "view:product.price_list:0"
+msgid "Price Lists"
+msgstr ""
diff --git a/price_list.py b/price_list.py
index 1bacaf3..826f2c0 100644
--- a/price_list.py
+++ b/price_list.py
@@ -1,13 +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.
-from __future__ import with_statement
from decimal import Decimal
import tokenize
from StringIO import StringIO
from trytond.model import ModelView, ModelSQL, fields
from trytond.tools import safe_eval
-from trytond.pyson import If, In, Eval, Get
+from trytond.pyson import If, Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
# code snippet taken from http://docs.python.org/library/tokenize.html
@@ -47,9 +47,9 @@ class PriceList(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
- select=1, domain=[
- ('id', If(In('company', Eval('context', {})), '=', '!='),
- Get(Eval('context', {}), 'company', 0)),
+ select=1, domain=[
+ ('id', If(Eval('context', {}).contains('company'), '=', '!='),
+ Eval('context', {}).get('company', 0)),
])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
@@ -91,10 +91,11 @@ class PriceList(ModelSQL, ModelView):
and match value as value
:return: the computed unit price
'''
- party_obj = self.pool.get('party.party')
- product_obj = self.pool.get('product.product')
- uom_obj = self.pool.get('product.uom')
- price_list_line_obj = self.pool.get('product.price_list.line')
+ pool = Pool()
+ party_obj = pool.get('party.party')
+ product_obj = pool.get('product.product')
+ uom_obj = pool.get('product.uom')
+ price_list_line_obj = pool.get('product.price_list.line')
if not price_list:
return unit_price
@@ -161,7 +162,7 @@ class PriceListLine(ModelSQL, ModelView):
return 'unit_price'
def on_change_with_unit_digits(self, vals):
- product_obj = self.pool.get('product.product')
+ product_obj = Pool().get('product.product')
if vals.get('product'):
product = product_obj.browse(vals['product'])
return product.default_uom.digits
@@ -180,7 +181,7 @@ class PriceListLine(ModelSQL, ModelView):
'''
Check formula
'''
- price_list_obj = self.pool.get('product.price_list')
+ price_list_obj = Pool().get('product.price_list')
context = price_list_obj._get_context_price_list_line(None, None,
Decimal('0.0'), 0, None)
lines = self.browse(ids)
diff --git a/price_list.xml b/price_list.xml
index bb15ac3..bc8df13 100644
--- a/price_list.xml
+++ b/price_list.xml
@@ -17,8 +17,8 @@ this repository contains the full copyright notices and license terms. -->
<field name="lines" colspan="4">
<tree string="Price List Lines"
sequence="sequence">
- <field name="product" select="1"/>
- <field name="quantity" select="1"/>
+ <field name="product"/>
+ <field name="quantity"/>
<field name="formula"/>
</tree>
</field>
@@ -33,7 +33,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Price Lists">
- <field name="name" select="1"/>
+ <field name="name"/>
</tree>
]]>
</field>
@@ -58,25 +58,6 @@ this repository contains the full copyright notices and license terms. -->
sequence="20" id="menu_price_list"
action="act_price_list_form"/>
- <record model="ir.action.act_window" id="act_price_list_form2">
- <field name="name">Price Lists</field>
- <field name="res_model">product.price_list</field>
- <field name="domain">[('company', '=', Eval('company'))]</field>
- </record>
- <record model="ir.action.act_window.view" id="act_price_list_form2_view1">
- <field name="sequence" eval="10"/>
- <field name="view" ref="price_list_view_form"/>
- <field name="act_window" ref="act_price_list_form2"/>
- </record>
- <record model="ir.action.act_window.view" id="act_price_list_form2_view2">
- <field name="sequence" eval="20"/>
- <field name="view" ref="price_list_view_tree"/>
- <field name="act_window" ref="act_price_list_form2"/>
- </record>
- <menuitem name="New Price List" parent="menu_price_list"
- sequence="10" id="menu_price_list_new"
- action="act_price_list_form2" groups="product.group_product_admin"/>
-
<record model="ir.model.access" id="access_price_list">
<field name="model" search="[('model', '=', 'product.price_list')]"/>
<field name="perm_read" eval="True"/>
@@ -133,10 +114,10 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Price List Lines">
- <field name="price_list" select="1"/>
- <field name="sequence" select="2"/>
- <field name="product" select="1"/>
- <field name="quantity" select="1"/>
+ <field name="price_list"/>
+ <field name="sequence"/>
+ <field name="product"/>
+ <field name="quantity"/>
<field name="formula"/>
</tree>
]]>
diff --git a/setup.py b/setup.py
index 96f11e9..1eea40a 100644
--- a/setup.py
+++ b/setup.py
@@ -38,17 +38,20 @@ setup(name='trytond_product_price_list',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
@@ -60,4 +63,6 @@ setup(name='trytond_product_price_list',
[trytond.modules]
product_price_list = trytond.modules.product_price_list
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 0ee76eb..e3771e0 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond-product-price-list
-Version: 2.0.0
+Version: 2.2.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index eb49573..4662830 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -4,17 +4,20 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
party.xml
price_list.xml
setup.py
./__init__.py
./__tryton__.py
./price_list.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_product_price_list.egg-info/PKG-INFO
trytond_product_price_list.egg-info/SOURCES.txt
trytond_product_price_list.egg-info/dependency_links.txt
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index f83b6b4..a07e9d3 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 2.0, < 2.1
-trytond_party >= 2.0, < 2.1
-trytond_company >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_product >= 2.2, < 2.3
+trytond_party >= 2.2, < 2.3
+trytond_company >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit d8a45864c652a93a3a62388ed690d51576a9cd5d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:56 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 7b3896a..154bd85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
Version 1.8.0 - 2010-11-01
diff --git a/PKG-INFO b/PKG-INFO
index 2518a6f..aa670bf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 1.8.1
+Version: 2.0.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -15,10 +15,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 58e4d52..a2fe630 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,15 +2,17 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Product Price List',
+ 'name_bg_BG' : 'Ценова листа на продукт',
'name_de_DE' : 'Artikel Preisliste',
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '1.8.1',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Define price list rules by parties.''',
+ 'description_bg_BG': 'Задаване на правила на ценова листа по партньор.',
'description_de_DE' : '''Preislisten für Artikel
- Ermöglicht die Definition von Preislisten für Parteien.
''',
@@ -28,6 +30,7 @@
'party.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..ddab6ee
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+error,product.price_list.line,0,Invalid formula!,Невалидна формула!,0
+field,"product.price_list,company",0,Company,Фирма,0
+field,"product.price_list,lines",0,Lines,Редове,0
+field,"product.price_list,name",0,Name,Име,0
+field,"product.price_list,rec_name",0,Name,Име,0
+field,"product.price_list.line,formula",0,Formula,Формула,0
+field,"product.price_list.line,price_list",0,Price List,Ценова листа,0
+field,"product.price_list.line,product",0,Product,Продукт,0
+field,"product.price_list.line,quantity",0,Quantity,Количество,0
+field,"product.price_list.line,rec_name",0,Name,Име,0
+field,"product.price_list.line,sequence",0,Sequence,Последователност,0
+field,"product.price_list.line,unit_digits",0,Unit Digits,Десетични единици,0
+help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
+- unit_price: the original unit_price","Израз на python който ще се изпълни с:
+- unit_price: оригиналната единична цена",0
+model,"ir.action,name",act_price_list_form,Price Lists,Ценови листи,0
+model,"ir.action,name",act_price_list_form2,Price Lists,Ценови листи,0
+model,"ir.ui.menu,name",menu_price_list,Price Lists,Ценови листи,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Нова ценова листа,0
+model,"product.price_list,name",0,Price List,Ценова листа,0
+model,"product.price_list.line,name",0,Price List Line,Ред от ценова листа,0
+view,party.party,0,Price List,Ценова листа,0
+view,product.price_list,0,Price List,Ценова листа,0
+view,product.price_list,0,Price List Lines,Редове от ценова листа,0
+view,product.price_list,0,Price Lists,Ценови листи,0
+view,product.price_list.line,0,Price List Line,Ред от ценова листа,0
+view,product.price_list.line,0,Price List Lines,Редове от ценова листа,0
diff --git a/price_list.py b/price_list.py
index 3437432..1bacaf3 100644
--- a/price_list.py
+++ b/price_list.py
@@ -1,14 +1,44 @@
#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 __future__ import with_statement
-import re
from decimal import Decimal
+import tokenize
+from StringIO import StringIO
from trytond.model import ModelView, ModelSQL, fields
from trytond.tools import safe_eval
from trytond.pyson import If, In, Eval, Get
from trytond.transaction import Transaction
-_RE_DECIMAL = re.compile('([\.0-9]+(\.[0-9]+)?)')
+
+# code snippet taken from http://docs.python.org/library/tokenize.html
+def decistmt(s):
+ """Substitute Decimals for floats in a string of statements.
+
+ >>> from decimal import Decimal
+ >>> s = 'print +21.3e-5*-.1234/81.7'
+ >>> decistmt(s)
+ "print +Decimal ('21.3e-5')*-Decimal ('.1234')/Decimal ('81.7')"
+
+ >>> exec(s)
+ -3.21716034272e-007
+ >>> exec(decistmt(s))
+ -3.217160342717258261933904529E-7
+ """
+ result = []
+ # tokenize the string
+ g = tokenize.generate_tokens(StringIO(s).readline)
+ for toknum, tokval, _, _, _ in g:
+ # replace NUMBER tokens
+ if toknum == tokenize.NUMBER and '.' in tokval:
+ result.extend([
+ (tokenize.NAME, 'Decimal'),
+ (tokenize.OP, '('),
+ (tokenize.STRING, repr(tokval)),
+ (tokenize.OP, ')')
+ ])
+ else:
+ result.append((toknum, tokval))
+ return tokenize.untokenize(result)
class PriceList(ModelSQL, ModelView):
@@ -201,7 +231,6 @@ class PriceListLine(ModelSQL, ModelView):
'''
context = Transaction().context.copy()
context['Decimal'] = Decimal
- return safe_eval(_RE_DECIMAL.sub(lambda m: "Decimal('%s')" % m.group(1),
- line.formula), context)
+ return safe_eval(decistmt(line.formula), context)
PriceListLine()
diff --git a/price_list.xml b/price_list.xml
index d13494b..bb15ac3 100644
--- a/price_list.xml
+++ b/price_list.xml
@@ -42,7 +42,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_price_list_form">
<field name="name">Price Lists</field>
<field name="res_model">product.price_list</field>
- <field name="view_type">form</field>
<field name="domain">[('company', '=', Eval('company'))]</field>
</record>
<record model="ir.action.act_window.view" id="act_price_list_form_view1">
@@ -62,7 +61,6 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_price_list_form2">
<field name="name">Price Lists</field>
<field name="res_model">product.price_list</field>
- <field name="view_type">form</field>
<field name="domain">[('company', '=', Eval('company'))]</field>
</record>
<record model="ir.action.act_window.view" id="act_price_list_form2_view1">
diff --git a/setup.py b/setup.py
index 06e2bcb..96f11e9 100644
--- a/setup.py
+++ b/setup.py
@@ -42,12 +42,15 @@ setup(name='trytond_product_price_list',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 2589f14..0ee76eb 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.0
Name: trytond-product-price-list
-Version: 1.8.1
+Version: 2.0.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -15,10 +15,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index b6d39ec..eb49573 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index a2a72e6..f83b6b4 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 1.8, < 1.9
-trytond_party >= 1.8, < 1.9
-trytond_company >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_product >= 2.0, < 2.1
+trytond_party >= 2.0, < 2.1
+trytond_company >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 20e8bf5950ede58c57dcd5a30e7398c84a5e94ca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 15 11:46:17 2011 +0100
Adding upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 3ecb7d4..7b3896a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 6e6811c..1245dd5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 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 339d68a..2518a6f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 1.8.0
+Version: 1.8.1
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index dfc9169..58e4d52 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '1.8.0',
+ 'version': '1.8.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/price_list.py b/price_list.py
index 32c7f1d..3437432 100644
--- a/price_list.py
+++ b/price_list.py
@@ -76,7 +76,7 @@ class PriceList(ModelSQL, ModelView):
party = party_obj.browse(party)
if isinstance(product, (int, long)):
- product = party_obj.browse(product)
+ product = product_obj.browse(product)
if isinstance(uom, (int, long)):
uom = uom_obj.browse(uom)
@@ -153,11 +153,14 @@ class PriceListLine(ModelSQL, ModelView):
price_list_obj = self.pool.get('product.price_list')
context = price_list_obj._get_context_price_list_line(None, None,
Decimal('0.0'), 0, None)
- for line in self.browse(ids):
- try:
- self.get_unit_price(line)
- except Exception:
- return False
+ lines = self.browse(ids)
+ with Transaction().set_context(**context):
+ for line in lines:
+ try:
+ if not isinstance(self.get_unit_price(line), Decimal):
+ return False
+ except Exception:
+ return False
return True
def match(self, line, pattern):
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 80b414a..2589f14 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product-price-list
-Version: 1.8.0
+Version: 1.8.1
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
commit c43fb1a9fec640ff7f21e30a1c7465c5bae15948
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:27 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 71af51b..3ecb7d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-11
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 3640bbe..0dbdc01 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product_price_list
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 83105eb..339d68a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 1.6.0
+Version: 1.8.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 3f4d7ac..dfc9169 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index 537f90e..8e002cf 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,25 +1,25 @@
type,name,res_id,src,value,fuzzy
error,product.price_list.line,0,Invalid formula!,Ungültige Formel!,0
field,"product.price_list,company",0,Company,Unternehmen,0
+field,"product.price_list,lines",0,Lines,Zeilen,0
+field,"product.price_list,name",0,Name,Name,0
+field,"product.price_list,rec_name",0,Name,Name,0
field,"product.price_list.line,formula",0,Formula,Formel,0
field,"product.price_list.line,price_list",0,Price List,Preisliste,0
field,"product.price_list.line,product",0,Product,Artikel,0
field,"product.price_list.line,quantity",0,Quantity,Anzahl,0
field,"product.price_list.line,rec_name",0,Name,Name,0
-field,"product.price_list,lines",0,Lines,Zeilen,0
field,"product.price_list.line,sequence",0,Sequence,Reihenfolge,0
field,"product.price_list.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
-field,"product.price_list,name",0,Name,Name,0
-field,"product.price_list,rec_name",0,Name,Name,0
help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
- unit_price: the original unit_price","Ein Pythonausdruck, der ausgewertet wird mit:
- unit_price: originaler unit_price (Preis pro Einheit)",0
model,"ir.action,name",act_price_list_form,Price Lists,Preislisten,0
model,"ir.action,name",act_price_list_form2,Price Lists,Preislisten,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Neue Preisliste,0
model,"ir.ui.menu,name",menu_price_list,Price Lists,Preislisten,0
-model,"product.price_list.line,name",0,Price List Line,Preisliste Zeile,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Neue Preisliste,0
model,"product.price_list,name",0,Price List,Preisliste,0
+model,"product.price_list.line,name",0,Price List Line,Preisliste Zeile,0
view,party.party,0,Price List,Preisliste,0
view,product.price_list,0,Price List,Preisliste,0
view,product.price_list,0,Price List Lines,Preisliste Zeilen,0
diff --git a/fr_FR.csv b/fr_FR.csv
index b9b3ea9..d0f6ec7 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,25 +1,25 @@
type,name,res_id,src,value,fuzzy
error,product.price_list.line,0,Invalid formula!,Formule non-valide !,0
field,"product.price_list,company",0,Company,Société,0
+field,"product.price_list,lines",0,Lines,Lignes,0
+field,"product.price_list,name",0,Name,Nom,0
+field,"product.price_list,rec_name",0,Name,Nom,0
field,"product.price_list.line,formula",0,Formula,Formule,0
field,"product.price_list.line,price_list",0,Price List,Liste de prix,0
field,"product.price_list.line,product",0,Product,Produit,0
field,"product.price_list.line,quantity",0,Quantity,Quantité,0
field,"product.price_list.line,rec_name",0,Name,Nom,0
-field,"product.price_list,lines",0,Lines,Lignes,0
field,"product.price_list.line,sequence",0,Sequence,Séquence,0
field,"product.price_list.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
-field,"product.price_list,name",0,Name,Nom,0
-field,"product.price_list,rec_name",0,Name,Nom,1
help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
- unit_price: the original unit_price","Une expression Python qui sera évaluée avec:
- unit_price: le prix unitaire original",0
model,"ir.action,name",act_price_list_form,Price Lists,Listes de prix,0
model,"ir.action,name",act_price_list_form2,Price Lists,Listes de prix,0
-model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nouvelle liste de prix,0
model,"ir.ui.menu,name",menu_price_list,Price Lists,Listes de prix,0
-model,"product.price_list.line,name",0,Price List Line,Ligne de liste de prix,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nouvelle liste de prix,0
model,"product.price_list,name",0,Price List,Liste de prix,0
+model,"product.price_list.line,name",0,Price List Line,Ligne de liste de prix,0
view,party.party,0,Price List,Liste de prix,0
view,product.price_list,0,Price List,Liste de prix,0
view,product.price_list,0,Price List Lines,Lignes de liste de prix,0
diff --git a/price_list.py b/price_list.py
index 1da2cb1..32c7f1d 100644
--- a/price_list.py
+++ b/price_list.py
@@ -1,10 +1,12 @@
#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 __future__ import with_statement
+import re
+from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.tools import safe_eval
from trytond.pyson import If, In, Eval, Get
-from decimal import Decimal
-import re
+from trytond.transaction import Transaction
_RE_DECIMAL = re.compile('([\.0-9]+(\.[0-9]+)?)')
@@ -21,40 +23,31 @@ class PriceList(ModelSQL, ModelView):
])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
- def default_company(self, cursor, user, context=None):
- if context is None:
- context = {}
- if context.get('company'):
- return context['company']
- return False
+ def default_company(self):
+ return Transaction().context.get('company') or False
- def _get_context_price_list_line(self, cursor, user, party,
- product, unit_price, quantity, uom, context=None):
+ def _get_context_price_list_line(self, party, product, unit_price,
+ quantity, uom):
'''
Get price list context for unit price
- :param cursor: the database cursor
- :param user: the user id
:param party: the BrowseRecord of the party.party
:param product: the BrowseRecord of the product.product
:param unit_price: a Decimal for the default unit price in the
company's currency and default uom of the product
:param quantity: the quantity of product
:param uom: the BrowseRecord of the product.uom
- :param context: the context
:return: a dictionary
'''
return {
'unit_price': unit_price,
}
- def compute(self, cursor, user, price_list, party, product, unit_price,
- quantity, uom, pattern=None, context=None):
+ def compute(self, price_list, party, product, unit_price, quantity, uom,
+ pattern=None):
'''
Compute price based on price list of party
- :param cursor: the database cursor
- :param user: the user id
:param price_list: the price list id or the BrowseRecord of the
product.price_list
:param party: the party id or the BrowseRecord of the party.party
@@ -66,7 +59,6 @@ class PriceList(ModelSQL, ModelView):
:param uom: the UOM id or the BrowseRecord of the product.uom
:param pattern: a dictionary with price list field as key
and match value as value
- :param context: the context
:return: the computed unit price
'''
party_obj = self.pool.get('party.party')
@@ -78,32 +70,31 @@ class PriceList(ModelSQL, ModelView):
return unit_price
if isinstance(price_list, (int, long)):
- price_list = self.browse(cursor, user, price_list, context=context)
+ price_list = self.browse(price_list)
if isinstance(party, (int, long)):
- party = party_obj.browse(cursor, user, party, context=context)
+ party = party_obj.browse(party)
if isinstance(product, (int, long)):
- product = party_obj.browse(cursor, user, product, context=context)
+ product = party_obj.browse(product)
if isinstance(uom, (int, long)):
- uom = uom_obj.browse(cursor, user, uom, context=context)
+ uom = uom_obj.browse(uom)
if pattern is None:
pattern = {}
pattern = pattern.copy()
pattern['product'] = product and product.id or False
- pattern['quantity'] = uom_obj.compute_qty(cursor, user, uom,
- quantity, product.default_uom, round=False, context=context)
+ pattern['quantity'] = uom_obj.compute_qty(uom, quantity,
+ product.default_uom, round=False)
for line in price_list.lines:
- if price_list_line_obj.match(cursor, user, line, pattern,
- context=context):
- return price_list_line_obj.get_unit_price(cursor, user, line,
- context=self._get_context_price_list_line(
- cursor, user, party, product, unit_price,
- quantity, uom, context=context))
+ if price_list_line_obj.match(line, pattern):
+ with Transaction().set_context(
+ self._get_context_price_list_line(party, product,
+ unit_price, quantity, uom)):
+ return price_list_line_obj.get_unit_price(line)
return unit_price
PriceList()
@@ -136,51 +127,46 @@ class PriceListLine(ModelSQL, ModelView):
'invalid_formula': 'Invalid formula!',
})
- def default_formula(self, cursor, user, context=None):
+ def default_formula(self):
return 'unit_price'
- def on_change_with_unit_digits(self, cursor, user, vals, context=None):
+ def on_change_with_unit_digits(self, vals):
product_obj = self.pool.get('product.product')
if vals.get('product'):
- product = product_obj.browse(cursor, user, vals['product'],
- context=context)
+ product = product_obj.browse(vals['product'])
return product.default_uom.digits
return 2
- def get_unit_digits(self, cursor, user, ids, name, context=None):
+ def get_unit_digits(self, ids, name):
res = {}
- for line in self.browse(cursor, user, ids, context=context):
+ for line in self.browse(ids):
if line.product:
res[line.id] = line.product.default_uom.digits
else:
res[line.id] = 2
return res
- def check_formula(self, cursor, user, ids):
+ def check_formula(self, ids):
'''
Check formula
'''
price_list_obj = self.pool.get('product.price_list')
- context = price_list_obj._get_context_price_list_line(cursor, user,
- None, None, Decimal('0.0'), 0, None)
- for line in self.browse(cursor, user, ids):
+ context = price_list_obj._get_context_price_list_line(None, None,
+ Decimal('0.0'), 0, None)
+ for line in self.browse(ids):
try:
- self.get_unit_price(cursor, user, line,
- context=context)
- except:
+ self.get_unit_price(line)
+ except Exception:
return False
return True
- def match(self, cursor, user, line, pattern, context=None):
+ def match(self, line, pattern):
'''
Match line on pattern
- :param cursor: the database cursor
- :param user: the user id
:param line: a BrowseRecord of price list line
:param pattern: a dictonary with price list line field as key
and match value as value
- :param context: the context
:return: a boolean
'''
res = True
@@ -203,21 +189,16 @@ class PriceListLine(ModelSQL, ModelView):
break
return res
- def get_unit_price(self, cursor, user, line, context=None):
+ def get_unit_price(self, line):
'''
Return unit price for a line
- :param cursor: the database cursor
- :param user: the user id
:param line: a BrowseRecord of price list line
- :param context: the context
:return: a Decimal
'''
- if context is None:
- context = {}
- ctx = context.copy()
- ctx['Decimal'] = Decimal
+ context = Transaction().context.copy()
+ context['Decimal'] = Decimal
return safe_eval(_RE_DECIMAL.sub(lambda m: "Decimal('%s')" % m.group(1),
- line.formula), ctx)
+ line.formula), context)
PriceListLine()
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index feab50f..80b414a 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.0
Name: trytond-product-price-list
-Version: 1.6.0
+Version: 1.8.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index f152c1b..a2a72e6 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 1.6, < 1.7
-trytond_party >= 1.6, < 1.7
-trytond_company >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_product >= 1.8, < 1.9
+trytond_party >= 1.8, < 1.9
+trytond_company >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit eb2525b9ca8ade4207bd7222e803eb60392a1f70
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Wed May 12 12:33:34 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8ce1b25..71af51b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.4.1 - 2009-11-24
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 - 2010-05-11
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a474ed..6e6811c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2009-2010 Cédric Krier.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 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 b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 318ecfe..83105eb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 1.4.1
+Version: 1.6.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index badfdd6..3f4d7ac 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '1.4.1',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index 902b409..537f90e 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -7,7 +7,7 @@ field,"product.price_list.line,product",0,Product,Artikel,0
field,"product.price_list.line,quantity",0,Quantity,Anzahl,0
field,"product.price_list.line,rec_name",0,Name,Name,0
field,"product.price_list,lines",0,Lines,Zeilen,0
-field,"product.price_list.line,sequence",0,Sequence,Sequenz,0
+field,"product.price_list.line,sequence",0,Sequence,Reihenfolge,0
field,"product.price_list.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
field,"product.price_list,name",0,Name,Name,0
field,"product.price_list,rec_name",0,Name,Name,0
diff --git a/price_list.py b/price_list.py
index b2ff203..1da2cb1 100644
--- a/price_list.py
+++ b/price_list.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.tools import safe_eval
+from trytond.pyson import If, In, Eval, Get
from decimal import Decimal
import re
@@ -14,12 +15,13 @@ class PriceList(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
- select=1, domain=["('id', 'company' in context and '=' or '!=', " \
- "context.get('company', 0))"])
+ select=1, domain=[
+ ('id', If(In('company', Eval('context', {})), '=', '!='),
+ Get(Eval('context', {}), 'company', 0)),
+ ])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
def default_company(self, cursor, user, context=None):
- company_obj = self.pool.get('company.company')
if context is None:
context = {}
if context.get('company'):
@@ -115,10 +117,10 @@ class PriceListLine(ModelSQL, ModelView):
required=True, ondelete='CASCADE')
product = fields.Many2One('product.product', 'Product')
sequence = fields.Integer('Sequence')
- quantity = fields.Float('Quantity', digits="(16, unit_digits)",
+ quantity = fields.Float('Quantity', digits=(16, Eval('unit_digits', 2)),
depends=['unit_digits'])
- unit_digits = fields.Function('get_unit_digits', type='integer',
- string='Unit Digits', on_change_with=['product'])
+ unit_digits = fields.Function(fields.Integer('Unit Digits',
+ on_change_with=['product']), 'get_unit_digits')
formula = fields.Char('Formula', required=True,
help='Python expression that will be evaluated with:\n' \
'- unit_price: the original unit_price')
@@ -137,8 +139,7 @@ class PriceListLine(ModelSQL, ModelView):
def default_formula(self, cursor, user, context=None):
return 'unit_price'
- def on_change_with_unit_digits(self, cursor, user, ids, vals,
- context=None):
+ def on_change_with_unit_digits(self, cursor, user, vals, context=None):
product_obj = self.pool.get('product.product')
if vals.get('product'):
product = product_obj.browse(cursor, user, vals['product'],
@@ -146,7 +147,7 @@ class PriceListLine(ModelSQL, ModelView):
return product.default_uom.digits
return 2
- def get_unit_digits(self, cursor, user, ids, name, arg, context=None):
+ def get_unit_digits(self, cursor, user, ids, name, context=None):
res = {}
for line in self.browse(cursor, user, ids, context=context):
if line.product:
diff --git a/price_list.xml b/price_list.xml
index cee28ef..d13494b 100644
--- a/price_list.xml
+++ b/price_list.xml
@@ -43,7 +43,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Price Lists</field>
<field name="res_model">product.price_list</field>
<field name="view_type">form</field>
- <field name="domain">[('company', '=', locals().get('company', False))]</field>
+ <field name="domain">[('company', '=', Eval('company'))]</field>
</record>
<record model="ir.action.act_window.view" id="act_price_list_form_view1">
<field name="sequence" eval="10"/>
@@ -63,7 +63,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Price Lists</field>
<field name="res_model">product.price_list</field>
<field name="view_type">form</field>
- <field name="domain">[('company', '=', locals().get('company', False))]</field>
+ <field name="domain">[('company', '=', Eval('company'))]</field>
</record>
<record model="ir.action.act_window.view" id="act_price_list_form2_view1">
<field name="sequence" eval="10"/>
diff --git a/setup.py b/setup.py
index 6ed556f..06e2bcb 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#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, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (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))
setup(name='trytond_product_price_list',
version=info.get('version', '0.0.1'),
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index d3e3a83..feab50f 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.0
Name: trytond-product-price-list
-Version: 1.4.1
+Version: 1.6.0
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index cf9dadd..f152c1b 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,5 +1,4 @@
-trytond_product
-trytond_party
-trytond_company
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_product >= 1.6, < 1.7
+trytond_party >= 1.6, < 1.7
+trytond_company >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit c308c6e6229b8633f491a5b5eb222efc1f2bad1f
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Nov 25 13:12:48 2009 +0100
Adding upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..8ce1b25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.1 - 2009-11-24
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index 9faea47..318ecfe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_product_price_list
-Version: 1.4.0
+Version: 1.4.1
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 75f34a5..badfdd6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Lista de precios de producto',
'name_es_ES': 'Lista de precios de producto',
'name_fr_FR' : 'Liste de prix produit',
- 'version': '1.4.0',
+ 'version': '1.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/price_list.py b/price_list.py
index f277277..b2ff203 100644
--- a/price_list.py
+++ b/price_list.py
@@ -14,7 +14,8 @@ class PriceList(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
- select=1, domain=["('id', '=', context.get('company', 0))"])
+ select=1, domain=["('id', 'company' in context and '=' or '!=', " \
+ "context.get('company', 0))"])
lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
def default_company(self, cursor, user, context=None):
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index f5bef9a..d3e3a83 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-product-price-list
-Version: 1.4.0
+Version: 1.4.1
Summary: Define price list rules by parties.
Home-page: http://www.tryton.org/
Author: B2CK
commit abcb4ce0b0e8e649a35df0d84d0c8c30062eb9bf
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:52 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3a474ed
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..3640bbe
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing trytond_product_price_list
+=====================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_product_price_list source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name product_price_list.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..9faea47
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond_product_price_list
+Version: 1.4.0
+Summary: Define price list rules by parties.
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..9efe67a
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_product_price_list
+==========================
+
+The product_price_list module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..3e64526
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,4 @@
+#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 price_list import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..75f34a5
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,36 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Product Price List',
+ 'name_de_DE' : 'Artikel Preisliste',
+ 'name_es_CO': 'Lista de precios de producto',
+ 'name_es_ES': 'Lista de precios de producto',
+ 'name_fr_FR' : 'Liste de prix produit',
+ 'version': '1.4.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Define price list rules by parties.''',
+ 'description_de_DE' : '''Preislisten für Artikel
+ - Ermöglicht die Definition von Preislisten für Parteien.
+''',
+ 'description_es_CO': 'Define reglas de lista de precios por tercero.',
+ 'description_es_ES': 'Define reglas de lista de precios por tercero.',
+ 'description_fr_FR' : '''Défini des listes de prix par tiers''',
+ 'depends': [
+ 'ir',
+ 'product',
+ 'party',
+ 'company',
+ ],
+ 'xml': [
+ 'price_list.xml',
+ 'party.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..902b409
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+error,product.price_list.line,0,Invalid formula!,Ungültige Formel!,0
+field,"product.price_list,company",0,Company,Unternehmen,0
+field,"product.price_list.line,formula",0,Formula,Formel,0
+field,"product.price_list.line,price_list",0,Price List,Preisliste,0
+field,"product.price_list.line,product",0,Product,Artikel,0
+field,"product.price_list.line,quantity",0,Quantity,Anzahl,0
+field,"product.price_list.line,rec_name",0,Name,Name,0
+field,"product.price_list,lines",0,Lines,Zeilen,0
+field,"product.price_list.line,sequence",0,Sequence,Sequenz,0
+field,"product.price_list.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
+field,"product.price_list,name",0,Name,Name,0
+field,"product.price_list,rec_name",0,Name,Name,0
+help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
+- unit_price: the original unit_price","Ein Pythonausdruck, der ausgewertet wird mit:
+- unit_price: originaler unit_price (Preis pro Einheit)",0
+model,"ir.action,name",act_price_list_form,Price Lists,Preislisten,0
+model,"ir.action,name",act_price_list_form2,Price Lists,Preislisten,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Neue Preisliste,0
+model,"ir.ui.menu,name",menu_price_list,Price Lists,Preislisten,0
+model,"product.price_list.line,name",0,Price List Line,Preisliste Zeile,0
+model,"product.price_list,name",0,Price List,Preisliste,0
+view,party.party,0,Price List,Preisliste,0
+view,product.price_list,0,Price List,Preisliste,0
+view,product.price_list,0,Price List Lines,Preisliste Zeilen,0
+view,product.price_list,0,Price Lists,Preislisten,0
+view,product.price_list.line,0,Price List Line,Preisliste Zeile,0
+view,product.price_list.line,0,Price List Lines,Preisliste Zeilen,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..38d99be
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,27 @@
+type,name,res_id,src,value,fuzzy
+error,product.price_list.line,0,Invalid formula!,,0
+field,"product.price_list,company",0,Company,Compañía,0
+field,"product.price_list.line,formula",0,Formula,,0
+field,"product.price_list.line,price_list",0,Price List,,0
+field,"product.price_list.line,product",0,Product,Producto,0
+field,"product.price_list.line,quantity",0,Quantity,Cantidad,0
+field,"product.price_list.line,rec_name",0,Name,Nombre,0
+field,"product.price_list,lines",0,Lines,Líneas,0
+field,"product.price_list.line,sequence",0,Sequence,Secuencia,0
+field,"product.price_list.line,unit_digits",0,Unit Digits,Dígitos de Unidad,0
+field,"product.price_list,name",0,Name,Nombre,0
+field,"product.price_list,rec_name",0,Name,Nombre,0
+help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
+- unit_price: the original unit_price",,0
+model,"ir.action,name",act_price_list_form,Price Lists,,0
+model,"ir.action,name",act_price_list_form2,Price Lists,,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,,0
+model,"ir.ui.menu,name",menu_price_list,Price Lists,,0
+model,"product.price_list.line,name",0,Price List Line,,0
+model,"product.price_list,name",0,Price List,,0
+view,party.party,0,Price List,,0
+view,product.price_list,0,Price List,,0
+view,product.price_list,0,Price List Lines,,0
+view,product.price_list,0,Price Lists,,0
+view,product.price_list.line,0,Price List Line,,0
+view,product.price_list.line,0,Price List Lines,,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..05e31fb
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+error,product.price_list.line,0,Invalid formula!,Formula inválida,0
+field,"product.price_list,company",0,Company,Empresa,0
+field,"product.price_list.line,formula",0,Formula,Fórmula,0
+field,"product.price_list.line,price_list",0,Price List,Lista de precios,0
+field,"product.price_list.line,product",0,Product,Producto,0
+field,"product.price_list.line,quantity",0,Quantity,Cantidad,0
+field,"product.price_list.line,rec_name",0,Name,Nombre,0
+field,"product.price_list,lines",0,Lines,Líneas,0
+field,"product.price_list.line,sequence",0,Sequence,Secuencia,0
+field,"product.price_list.line,unit_digits",0,Unit Digits,Decimales de la unidad,0
+field,"product.price_list,name",0,Name,Nombre,0
+field,"product.price_list,rec_name",0,Name,Nombre,0
+help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
+- unit_price: the original unit_price","Expresión de Python que se evaluará con:
+- unit_price: El precio por unidad original",0
+model,"ir.action,name",act_price_list_form,Price Lists,Listas de precios,0
+model,"ir.action,name",act_price_list_form2,Price Lists,Listas de precios,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nueva lista de precios,0
+model,"ir.ui.menu,name",menu_price_list,Price Lists,Listas de precios,0
+model,"product.price_list.line,name",0,Price List Line,Línea de lista de precios,0
+model,"product.price_list,name",0,Price List,Lista de precios,0
+view,party.party,0,Price List,Lista de precios,0
+view,product.price_list,0,Price List,Lista de precios,0
+view,product.price_list,0,Price List Lines,Líneas de lista de precios,0
+view,product.price_list,0,Price Lists,Listas de precios,0
+view,product.price_list.line,0,Price List Line,Línea de lista de precios,0
+view,product.price_list.line,0,Price List Lines,Líneas de lista de precios,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..b9b3ea9
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,28 @@
+type,name,res_id,src,value,fuzzy
+error,product.price_list.line,0,Invalid formula!,Formule non-valide !,0
+field,"product.price_list,company",0,Company,Société,0
+field,"product.price_list.line,formula",0,Formula,Formule,0
+field,"product.price_list.line,price_list",0,Price List,Liste de prix,0
+field,"product.price_list.line,product",0,Product,Produit,0
+field,"product.price_list.line,quantity",0,Quantity,Quantité,0
+field,"product.price_list.line,rec_name",0,Name,Nom,0
+field,"product.price_list,lines",0,Lines,Lignes,0
+field,"product.price_list.line,sequence",0,Sequence,Séquence,0
+field,"product.price_list.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
+field,"product.price_list,name",0,Name,Nom,0
+field,"product.price_list,rec_name",0,Name,Nom,1
+help,"product.price_list.line,formula",0,"Python expression that will be evaluated with:
+- unit_price: the original unit_price","Une expression Python qui sera évaluée avec:
+- unit_price: le prix unitaire original",0
+model,"ir.action,name",act_price_list_form,Price Lists,Listes de prix,0
+model,"ir.action,name",act_price_list_form2,Price Lists,Listes de prix,0
+model,"ir.ui.menu,name",menu_price_list_new,New Price List,Nouvelle liste de prix,0
+model,"ir.ui.menu,name",menu_price_list,Price Lists,Listes de prix,0
+model,"product.price_list.line,name",0,Price List Line,Ligne de liste de prix,0
+model,"product.price_list,name",0,Price List,Liste de prix,0
+view,party.party,0,Price List,Liste de prix,0
+view,product.price_list,0,Price List,Liste de prix,0
+view,product.price_list,0,Price List Lines,Lignes de liste de prix,0
+view,product.price_list,0,Price Lists,Listes de prix,0
+view,product.price_list.line,0,Price List Line,Ligne de liste de prix,0
+view,product.price_list.line,0,Price List Lines,Lignes de liste de prix,0
diff --git a/party.xml b/party.xml
new file mode 100644
index 0000000..1c22b63
--- /dev/null
+++ b/party.xml
@@ -0,0 +1,25 @@
+<?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. -->
+<tryton>
+ <data>
+
+ <record model="ir.ui.view" id="party_view_form">
+ <field name="model">party.party</field>
+ <field name="inherit" ref="party.party_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page[@id="accounting"]"
+ position="after">
+ <page string="Price List" id="price_list">
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ </data>
+</tryton>
diff --git a/price_list.py b/price_list.py
new file mode 100644
index 0000000..f277277
--- /dev/null
+++ b/price_list.py
@@ -0,0 +1,221 @@
+#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 ModelView, ModelSQL, fields
+from trytond.tools import safe_eval
+from decimal import Decimal
+import re
+
+_RE_DECIMAL = re.compile('([\.0-9]+(\.[0-9]+)?)')
+
+
+class PriceList(ModelSQL, ModelView):
+ 'Price List'
+ _name = 'product.price_list'
+ _description = __doc__
+ name = fields.Char('Name', required=True, translate=True)
+ company = fields.Many2One('company.company', 'Company', required=True,
+ select=1, domain=["('id', '=', context.get('company', 0))"])
+ lines = fields.One2Many('product.price_list.line', 'price_list', 'Lines')
+
+ def default_company(self, cursor, user, context=None):
+ company_obj = self.pool.get('company.company')
+ if context is None:
+ context = {}
+ if context.get('company'):
+ return context['company']
+ return False
+
+ def _get_context_price_list_line(self, cursor, user, party,
+ product, unit_price, quantity, uom, context=None):
+ '''
+ Get price list context for unit price
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param party: the BrowseRecord of the party.party
+ :param product: the BrowseRecord of the product.product
+ :param unit_price: a Decimal for the default unit price in the
+ company's currency and default uom of the product
+ :param quantity: the quantity of product
+ :param uom: the BrowseRecord of the product.uom
+ :param context: the context
+ :return: a dictionary
+ '''
+ return {
+ 'unit_price': unit_price,
+ }
+
+ def compute(self, cursor, user, price_list, party, product, unit_price,
+ quantity, uom, pattern=None, context=None):
+ '''
+ Compute price based on price list of party
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param price_list: the price list id or the BrowseRecord of the
+ product.price_list
+ :param party: the party id or the BrowseRecord of the party.party
+ :param product: the product id or the BrowseRecord of the
+ product.product
+ :param unit_price: a Decimal for the default unit price in the
+ company's currency and default uom of the product
+ :param quantity: the quantity of product
+ :param uom: the UOM id or the BrowseRecord of the product.uom
+ :param pattern: a dictionary with price list field as key
+ and match value as value
+ :param context: the context
+ :return: the computed unit price
+ '''
+ party_obj = self.pool.get('party.party')
+ product_obj = self.pool.get('product.product')
+ uom_obj = self.pool.get('product.uom')
+ price_list_line_obj = self.pool.get('product.price_list.line')
+
+ if not price_list:
+ return unit_price
+
+ if isinstance(price_list, (int, long)):
+ price_list = self.browse(cursor, user, price_list, context=context)
+
+ if isinstance(party, (int, long)):
+ party = party_obj.browse(cursor, user, party, context=context)
+
+ if isinstance(product, (int, long)):
+ product = party_obj.browse(cursor, user, product, context=context)
+
+ if isinstance(uom, (int, long)):
+ uom = uom_obj.browse(cursor, user, uom, context=context)
+
+ if pattern is None:
+ pattern = {}
+
+ pattern = pattern.copy()
+ pattern['product'] = product and product.id or False
+ pattern['quantity'] = uom_obj.compute_qty(cursor, user, uom,
+ quantity, product.default_uom, round=False, context=context)
+
+ for line in price_list.lines:
+ if price_list_line_obj.match(cursor, user, line, pattern,
+ context=context):
+ return price_list_line_obj.get_unit_price(cursor, user, line,
+ context=self._get_context_price_list_line(
+ cursor, user, party, product, unit_price,
+ quantity, uom, context=context))
+ return unit_price
+
+PriceList()
+
+
+class PriceListLine(ModelSQL, ModelView):
+ 'Price List Line'
+ _name = 'product.price_list.line'
+ _description = __doc__
+ price_list = fields.Many2One('product.price_list', 'Price List',
+ required=True, ondelete='CASCADE')
+ product = fields.Many2One('product.product', 'Product')
+ sequence = fields.Integer('Sequence')
+ quantity = fields.Float('Quantity', digits="(16, unit_digits)",
+ depends=['unit_digits'])
+ unit_digits = fields.Function('get_unit_digits', type='integer',
+ string='Unit Digits', on_change_with=['product'])
+ formula = fields.Char('Formula', required=True,
+ help='Python expression that will be evaluated with:\n' \
+ '- unit_price: the original unit_price')
+
+ def __init__(self):
+ super(PriceListLine, self).__init__()
+ self._order.insert(0, ('price_list', 'ASC'))
+ self._order.insert(0, ('sequence', 'ASC'))
+ self._constraints += [
+ ('check_formula', 'invalid_formula'),
+ ]
+ self._error_messages.update({
+ 'invalid_formula': 'Invalid formula!',
+ })
+
+ def default_formula(self, cursor, user, context=None):
+ return 'unit_price'
+
+ def on_change_with_unit_digits(self, cursor, user, ids, vals,
+ context=None):
+ product_obj = self.pool.get('product.product')
+ if vals.get('product'):
+ product = product_obj.browse(cursor, user, vals['product'],
+ context=context)
+ return product.default_uom.digits
+ return 2
+
+ def get_unit_digits(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ for line in self.browse(cursor, user, ids, context=context):
+ if line.product:
+ res[line.id] = line.product.default_uom.digits
+ else:
+ res[line.id] = 2
+ return res
+
+ def check_formula(self, cursor, user, ids):
+ '''
+ Check formula
+ '''
+ price_list_obj = self.pool.get('product.price_list')
+ context = price_list_obj._get_context_price_list_line(cursor, user,
+ None, None, Decimal('0.0'), 0, None)
+ for line in self.browse(cursor, user, ids):
+ try:
+ self.get_unit_price(cursor, user, line,
+ context=context)
+ except:
+ return False
+ return True
+
+ def match(self, cursor, user, line, pattern, context=None):
+ '''
+ Match line on pattern
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param line: a BrowseRecord of price list line
+ :param pattern: a dictonary with price list line field as key
+ and match value as value
+ :param context: the context
+ :return: a boolean
+ '''
+ res = True
+ for field in pattern.keys():
+ if field not in self._columns:
+ continue
+ if not line[field]:
+ continue
+ if self._columns[field]._type == 'many2one':
+ if line[field].id != pattern[field]:
+ res = False
+ break
+ elif field == 'quantity':
+ if line[field] > pattern[field]:
+ res = False
+ break
+ else:
+ if line[field] != pattern[field]:
+ res = False
+ break
+ return res
+
+ def get_unit_price(self, cursor, user, line, context=None):
+ '''
+ Return unit price for a line
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param line: a BrowseRecord of price list line
+ :param context: the context
+ :return: a Decimal
+ '''
+ if context is None:
+ context = {}
+ ctx = context.copy()
+ ctx['Decimal'] = Decimal
+ return safe_eval(_RE_DECIMAL.sub(lambda m: "Decimal('%s')" % m.group(1),
+ line.formula), ctx)
+
+PriceListLine()
diff --git a/price_list.xml b/price_list.xml
new file mode 100644
index 0000000..cee28ef
--- /dev/null
+++ b/price_list.xml
@@ -0,0 +1,165 @@
+<?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. -->
+<tryton>
+ <data>
+
+ <record model="ir.ui.view" id="price_list_view_form">
+ <field name="model">product.price_list</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Price List">
+ <label name="name"/>
+ <field name="name"/>
+ <label name="company"/>
+ <field name="company"/>
+ <field name="lines" colspan="4">
+ <tree string="Price List Lines"
+ sequence="sequence">
+ <field name="product" select="1"/>
+ <field name="quantity" select="1"/>
+ <field name="formula"/>
+ </tree>
+ </field>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="price_list_view_tree">
+ <field name="model">product.price_list</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Price Lists">
+ <field name="name" select="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.action.act_window" id="act_price_list_form">
+ <field name="name">Price Lists</field>
+ <field name="res_model">product.price_list</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('company', '=', locals().get('company', False))]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_price_list_form_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="price_list_view_tree"/>
+ <field name="act_window" ref="act_price_list_form"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_price_list_form_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="price_list_view_form"/>
+ <field name="act_window" ref="act_price_list_form"/>
+ </record>
+ <menuitem parent="product.menu_main_product"
+ sequence="20" id="menu_price_list"
+ action="act_price_list_form"/>
+
+ <record model="ir.action.act_window" id="act_price_list_form2">
+ <field name="name">Price Lists</field>
+ <field name="res_model">product.price_list</field>
+ <field name="view_type">form</field>
+ <field name="domain">[('company', '=', locals().get('company', False))]</field>
+ </record>
+ <record model="ir.action.act_window.view" id="act_price_list_form2_view1">
+ <field name="sequence" eval="10"/>
+ <field name="view" ref="price_list_view_form"/>
+ <field name="act_window" ref="act_price_list_form2"/>
+ </record>
+ <record model="ir.action.act_window.view" id="act_price_list_form2_view2">
+ <field name="sequence" eval="20"/>
+ <field name="view" ref="price_list_view_tree"/>
+ <field name="act_window" ref="act_price_list_form2"/>
+ </record>
+ <menuitem name="New Price List" parent="menu_price_list"
+ sequence="10" id="menu_price_list_new"
+ action="act_price_list_form2" groups="product.group_product_admin"/>
+
+ <record model="ir.model.access" id="access_price_list">
+ <field name="model" search="[('model', '=', 'product.price_list')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_price_list_admin">
+ <field name="model" search="[('model', '=', 'product.price_list')]"/>
+ <field name="group" ref="product.group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_product_list">
+ <field name="model" search="[('model', '=', 'product.price_list')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_product_list1">
+ <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'product.price_list')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Current Company</field>
+ <field name="rule_group" ref="rule_group_product_list"/>
+ </record>
+
+ <record model="ir.ui.view" id="price_list_line_view_form">
+ <field name="model">product.price_list.line</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Price List Line">
+ <label name="price_list"/>
+ <field name="price_list"/>
+ <newline/>
+ <label name="product"/>
+ <field name="product"/>
+ <label name="quantity"/>
+ <field name="quantity"/>
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <newline/>
+ <label name="formula"/>
+ <field name="formula" colspan="3"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="price_list_line_view_tree">
+ <field name="model">product.price_list.line</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Price List Lines">
+ <field name="price_list" select="1"/>
+ <field name="sequence" select="2"/>
+ <field name="product" select="1"/>
+ <field name="quantity" select="1"/>
+ <field name="formula"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+
+ <record model="ir.model.access" id="access_price_list_line">
+ <field name="model" search="[('model', '=', 'product.price_list.line')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access" id="access_price_list_line_admin">
+ <field name="model" search="[('model', '=', 'product.price_list.line')]"/>
+ <field name="group" ref="product.group_product_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
+
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..6ed556f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+#!/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.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_product_price_list',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.product_price_list': '.'},
+ packages=[
+ 'trytond.modules.product_price_list',
+ ],
+ package_data={
+ 'trytond.modules.product_price_list': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ product_price_list = trytond.modules.product_price_list
+ """,
+)
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
new file mode 100644
index 0000000..f5bef9a
--- /dev/null
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: trytond-product-price-list
+Version: 1.4.0
+Summary: Define price list rules by parties.
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
new file mode 100644
index 0000000..b6d39ec
--- /dev/null
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -0,0 +1,23 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+party.xml
+price_list.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./price_list.py
+trytond_product_price_list.egg-info/PKG-INFO
+trytond_product_price_list.egg-info/SOURCES.txt
+trytond_product_price_list.egg-info/dependency_links.txt
+trytond_product_price_list.egg-info/entry_points.txt
+trytond_product_price_list.egg-info/not-zip-safe
+trytond_product_price_list.egg-info/requires.txt
+trytond_product_price_list.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_product_price_list.egg-info/dependency_links.txt b/trytond_product_price_list.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product_price_list.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_product_price_list.egg-info/entry_points.txt b/trytond_product_price_list.egg-info/entry_points.txt
new file mode 100644
index 0000000..19926e3
--- /dev/null
+++ b/trytond_product_price_list.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ product_price_list = trytond.modules.product_price_list
+
\ No newline at end of file
diff --git a/trytond_product_price_list.egg-info/not-zip-safe b/trytond_product_price_list.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_product_price_list.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
new file mode 100644
index 0000000..cf9dadd
--- /dev/null
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -0,0 +1,5 @@
+trytond_product
+trytond_party
+trytond_company
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_product_price_list.egg-info/top_level.txt b/trytond_product_price_list.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_product_price_list.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-product-price-list
More information about the tryton-debian-vcs
mailing list