[tryton-debian-vcs] tryton-modules-stock-product-location branch debian updated. debian/3.8.0-2-4-g72d8e03
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:28:43 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-product-location.git;a=commitdiff;h=debian/3.8.0-2-4-g72d8e03
commit 72d8e036b3659656ed654c0aa778847887666377
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:35 2016 +0200
Releasing debian version 4.0.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 0e51919..eccb136 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-product-location (4.0.0-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:32:05 +0200
+
tryton-modules-stock-product-location (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit e7775f7cd58359b5df683e68859edac9b39c9c5c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 83cfe48..fcc6749 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2012 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 2a43b2ae9c57376131bd1be512a42d6ff514e3a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:22 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 889f4ff..32efcfa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 34d4187..808b71b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 8435426..6a55b82 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_stock_product_location
==============================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3e1febf..31ca297 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -50,14 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Variante Lagerort"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Standardlagerorte"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Variante Lagerort"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Variante Lagerort"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index eab10da..eceff22 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -50,10 +50,12 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicación de producto"
+#, fuzzy
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr ""
+msgstr "Ubicación de producto"
+#, fuzzy
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr ""
+msgstr "Ubicación de producto"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 1bc6794..688801b 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -4,56 +4,56 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr ""
+msgstr "Alapértelmezett raktár hely"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás dátuma"
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva"
msgctxt "field:stock.product.location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr ""
+msgstr "Raktár helye"
msgctxt "field:stock.product.location,product:"
msgid "Product"
-msgstr ""
+msgstr "Termék"
msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Sorrend"
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr ""
+msgstr "Raktár"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Utolsó módosítás dátuma"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr ""
+msgstr "Termék raktárhelye"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr ""
+msgstr "Termék raktárhelye"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr ""
+msgstr "Termék raktárhelye"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
diff --git a/location.py b/location.py
index 3c42a4d..0597178 100644
--- a/location.py
+++ b/location.py
@@ -5,12 +5,10 @@ from sql.conditionals import Case
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import If, Eval, Bool
-from trytond.transaction import Transaction
from trytond import backend
from trytond.pool import PoolMeta
__all__ = ['ProductLocation', 'ShipmentIn', 'ShipmentOutReturn']
-__metaclass__ = PoolMeta
class ProductLocation(ModelSQL, ModelView):
@@ -40,8 +38,7 @@ class ProductLocation(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
- table = TableHandler(cursor, cls, module_name)
+ table = TableHandler(cls, module_name)
super(ProductLocation, cls).__register__(module_name)
@@ -55,6 +52,7 @@ class ProductLocation(ModelSQL, ModelView):
class ShipmentIn:
+ __metaclass__ = PoolMeta
__name__ = 'stock.shipment.in'
@classmethod
@@ -70,6 +68,7 @@ class ShipmentIn:
class ShipmentOutReturn:
+ __metaclass__ = PoolMeta
__name__ = 'stock.shipment.out.return'
@classmethod
diff --git a/product.py b/product.py
index dd24b07..3f44630 100644
--- a/product.py
+++ b/product.py
@@ -5,10 +5,10 @@ from trytond.pyson import Eval
from trytond.pool import PoolMeta
__all__ = ['Product']
-__metaclass__ = PoolMeta
class Product:
+ __metaclass__ = PoolMeta
__name__ = 'product.product'
locations = fields.One2Many('stock.product.location', 'product',
'Default Locations', states={
diff --git a/setup.py b/setup.py
index 7c743a4..fa83743 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = ['python-sql >= 0.4']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -75,6 +81,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -88,6 +95,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -101,4 +111,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 0cb7de4..52b81ac 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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 .test_stock_product_location import suite
+try:
+ from trytond.modules.stock_product_location.tests.test_stock_product_location import suite
+except ImportError:
+ from .test_stock_product_location import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index df6941d..965955d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.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 3453b1e..ef1525a 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: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_stock_product_location
==============================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index e3ae7ae..eaefe7d 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -51,11 +51,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.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 4670e4b..3809bd2 100644
--- a/trytond_stock_product_location.egg-info/requires.txt
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql >= 0.4
-trytond_product >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_product >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/product_form.xml b/view/product_form.xml
index e866927..ce0e387 100644
--- a/view/product_form.xml
+++ b/view/product_form.xml
@@ -2,7 +2,9 @@
<!-- 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/field[@name='description']" position="after">
- <field name="locations" colspan="6"/>
+ <xpath expr="/form/notebook" position="inside">
+ <page name="locations">
+ <field name="locations" colspan="6"/>
+ </page>
</xpath>
</data>
--
tryton-modules-stock-product-location
More information about the tryton-debian-vcs
mailing list