[tryton-debian-vcs] tryton-modules-stock-product-location branch debian updated. debian/2.8.1-1-4-g642d925
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:38:16 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-stock-product-location.git;a=commitdiff;h=debian/2.8.1-1-4-g642d925
commit 642d9259524585048a4284570ab5e50a323abdfa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:39 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index d508f02..5520b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-product-location (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:55:34 +0100
+
tryton-modules-stock-product-location (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit 0f4df9822d18e82e89b6e94e49baa0a0fb288c93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:52 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index a1e9e24..c187d4e 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-stock-product-location.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 ad8d0ce2fd0e9cee9062806a8c33c20122b98ba6
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 5cc7939..a1e9e24 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-stock-product-location.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-stock-product-location.git
commit 9da9eeb9111741c3cd5cc45b659f4d93ea4f2ad8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:28 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1cadb73..a88b689 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.8.1 - 2013-10-01
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
Version 2.8.0 - 2013-04-22
diff --git a/PKG-INFO b/PKG-INFO
index fcd418d..76a3273 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_stock_product_location
==============================
@@ -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/fr_FR.po b/locale/fr_FR.po
index 9194c50..43fd213 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -55,10 +55,6 @@ msgid "Default Locations"
msgstr "Emplacements par défaut"
msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Emplacements par défaut"
-
-msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Emplacement de produit"
@@ -71,13 +67,5 @@ msgid "Product Location"
msgstr "Emplacement de produit"
msgctxt "view:stock.product.location:"
-msgid "Product Location"
-msgstr "Emplacement de produit"
-
-msgctxt "view:stock.product.location:"
-msgid "Product Locations"
-msgstr "Emplacements de produit"
-
-msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr "Emplacements de produit"
diff --git a/locale/fr_FR.po b/locale/sl_SI.po
similarity index 53%
copy from locale/fr_FR.po
copy to locale/sl_SI.po
index 9194c50..495f325 100644
--- a/locale/fr_FR.po
+++ b/locale/sl_SI.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Emplacements par défaut"
+msgstr "Privzete lokacije"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr "Date de création"
+msgstr "Ustvarjeno"
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr "Créé par"
+msgstr "Ustvaril"
msgctxt "field:stock.product.location,id:"
msgid "ID"
@@ -20,64 +20,40 @@ msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Emplacement de stockage"
+msgstr "Shramba"
msgctxt "field:stock.product.location,product:"
msgid "Product"
-msgstr "Produit"
+msgstr "Izdelek"
msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
-msgstr "Nom"
+msgstr "Ime"
msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
-msgstr "Séquence"
+msgstr "Zap.št."
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr "Entrepôt"
+msgstr "Skladišče"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr "Date de mise à jour"
+msgstr "Zapisano"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr "Mis à jour par"
+msgstr "Zapisal"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr "Emplacement produit"
-
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Emplacements par défaut"
-
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Emplacements par défaut"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Emplacement de produit"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Emplacements de produit"
-
-msgctxt "view:stock.product.location:"
-msgid "Product Location"
-msgstr "Emplacement de produit"
+msgstr "Lokacija izdelkov"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Emplacement de produit"
-
-msgctxt "view:stock.product.location:"
-msgid "Product Locations"
-msgstr "Emplacements de produit"
+msgstr "Lokacija izdelkov"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Emplacements de produit"
+msgstr "Lokacije izdelkov"
diff --git a/location.py b/location.py
index 6397762..1634a50 100644
--- a/location.py
+++ b/location.py
@@ -3,7 +3,7 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import If, Eval, Bool
from trytond.transaction import Transaction
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pool import PoolMeta
__all__ = ['ProductLocation', 'ShipmentIn', 'ShipmentOutReturn']
@@ -17,18 +17,17 @@ class ProductLocation(ModelSQL, ModelView):
'''
__name__ = 'stock.product.location'
product = fields.Many2One('product.product', 'Product', required=True,
- select=True)
+ select=True, ondelete='CASCADE')
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
- domain=[('type', '=', 'warehouse')])
+ domain=[('type', '=', 'warehouse')], ondelete='CASCADE')
location = fields.Many2One('stock.location', 'Storage Location',
- required=True, domain=[
+ required=True, ondelete='CASCADE',
+ domain=[
('type', '=', 'storage'),
('parent', 'child_of', If(Bool(Eval('warehouse')),
[Eval('warehouse')], [])),
], depends=['warehouse'])
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
@classmethod
def __setup__(cls):
@@ -37,6 +36,7 @@ class ProductLocation(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -45,6 +45,11 @@ class ProductLocation(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
class ShipmentIn:
__name__ = 'stock.shipment.in'
diff --git a/setup.py b/setup.py
index babda22..03e117f 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_stock_product_location',
'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 e937546..5438ee9 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_stock_product_location import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index c3ef6ee..2fb72e7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=3.0.0
depends:
ir
product
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index f510cff..313abc2 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-product-location
-Version: 2.8.1
+Version: 3.0.0
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_stock_product_location
==============================
@@ -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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 3befa97..92ced4a 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_stock_product_location.egg-info/PKG-INFO
trytond_stock_product_location.egg-info/SOURCES.txt
trytond_stock_product_location.egg-info/dependency_links.txt
diff --git a/trytond_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index eb4aa19..943e3c2 100644
--- a/trytond_stock_product_location.egg-info/requires.txt
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_product >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-stock-product-location
More information about the tryton-debian-vcs
mailing list