[tryton-debian-vcs] tryton-modules-product-price-list branch debian updated. debian/2.8.0-3-4-ged31207
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:36:16 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-price-list.git;a=commitdiff;h=debian/2.8.0-3-4-ged31207
commit ed312078912341951fcb4afd01379136e7b29ced
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:20 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 5193c68..128ba66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product-price-list (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:42 +0100
+
tryton-modules-product-price-list (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 038a4c2efe4a31349b8e0c108adce409fa3c7d15
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index f7a8deb..9cc1649 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-price-list.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 9d3c0310a2567f2d8fcc7a77554f3abee7d11db7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index f02cd93..f7a8deb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product-price-list.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-product-price-list.git
commit 7669362aeed1280e6a0b52cf742f4e1c21db16f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:35 2013 +0100
Merging 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>
--
tryton-modules-product-price-list
More information about the tryton-debian-vcs
mailing list