[tryton-debian-vcs] tryton-modules-stock-product-location branch upstream created. bab8841c9ee795e3799217fcc0d1182bb9f9a381
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:11:30 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-stock-product-location.git;a=commitdiff;h=bab8841c9ee795e3799217fcc0d1182bb9f9a381
commit bab8841c9ee795e3799217fcc0d1182bb9f9a381
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:28:27 2013 +0100
Adding 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
commit 87b1682618487c003b5c5d20682a625c5fc9ae55
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Oct 13 20:02:00 2013 +0200
Adding upstream version 2.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 17ff3b7..1cadb73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-10-01
+* 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 957d792..fcd418d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 49a5a96..5072162 100644
--- a/product.py
+++ b/product.py
@@ -13,4 +13,5 @@ class Product:
locations = fields.One2Many('stock.product.location', 'product',
'Default Locations', states={
'invisible': ~Eval('type').in_(['goods', 'assets']),
- })
+ },
+ depends=['type'])
diff --git a/tryton.cfg b/tryton.cfg
index 4ab7723..c3ef6ee 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.1
depends:
ir
product
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 45f961b..f510cff 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-product-location
-Version: 2.8.0
+Version: 2.8.1
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
commit 60cff4beae167afb21b5ff0c84c547b1471f3879
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:38:07 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 64c426e..17ff3b7 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 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-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 2b82bd1..957d792 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 2.6.0
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_stock_product_location
==============================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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/__init__.py b/__init__.py
index d774584..640aa72 100644
--- a/__init__.py
+++ b/__init__.py
@@ -11,4 +11,5 @@ def register():
Product,
ProductLocation,
ShipmentIn,
+ ShipmentOutReturn,
module='stock_product_location', type_='model')
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 08c66cf..9a3fca3 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -20,7 +20,7 @@ msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Ubicació del magatzem"
+msgstr "Ubicació interna"
msgctxt "field:stock.product.location,product:"
msgid "Product"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 8c80feb..99ede3e 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Ubicaciones predeterminadas"
+msgstr "Ubicaciones por defecto"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
@@ -20,7 +20,7 @@ msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Ubicación del almacén"
+msgstr "Ubicación del depósito"
msgctxt "field:stock.product.location,product:"
msgid "Product"
@@ -36,7 +36,7 @@ msgstr "Secuencia"
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Almacén"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
@@ -52,7 +52,7 @@ msgstr "Ubicación de producto"
msgctxt "view:product.product:"
msgid "Default Locations"
-msgstr "Ubicaciones predeterminadas"
+msgstr "Ubicaciones por defecto"
msgctxt "view:product.product:"
msgid "Product Location"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 36578da..ebc3ac7 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 "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Locaciones por Defecto"
+msgstr "Bodegas por Defecto"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
@@ -20,11 +20,11 @@ msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Locación de Almacenamiento"
+msgstr "Bodega de Almacenamiento"
msgctxt "field:stock.product.location,product:"
msgid "Product"
-msgstr "Productos"
+msgstr "Producto"
msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
@@ -46,27 +46,26 @@ msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr "Locación de Producto"
+msgstr "Bodega de Producto"
msgctxt "view:product.product:"
msgid "Default Locations"
-msgstr "Locaciones por Defecto"
+msgstr "Bodegas por Defecto"
msgctxt "view:product.product:"
msgid "Product Location"
-msgstr "Locación del Producto"
+msgstr "Bodega de Producto"
msgctxt "view:product.product:"
msgid "Product Locations"
-msgstr "Locaciones del Producto"
+msgstr "Bodegas de Producto"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Locación del Producto"
+msgstr "Bodega de Producto"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Locaciones del Producto"
+msgstr "Bodegas de Producto"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index ea98e9e..7f9232f 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -6,21 +6,25 @@ msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr ""
+#, fuzzy
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:stock.product.location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr ""
+msgstr "Хранение Местоположение"
#, fuzzy
msgctxt "field:stock.product.location,product:"
@@ -42,13 +46,15 @@ msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Товарный склад"
+#, fuzzy
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
diff --git a/location.py b/location.py
index b6ed460..6397762 100644
--- a/location.py
+++ b/location.py
@@ -6,7 +6,7 @@ from trytond.transaction import Transaction
from trytond.backend import TableHandler
from trytond.pool import PoolMeta
-__all__ = ['ProductLocation', 'ShipmentIn']
+__all__ = ['ProductLocation', 'ShipmentIn', 'ShipmentOutReturn']
__metaclass__ = PoolMeta
@@ -51,10 +51,24 @@ class ShipmentIn:
@classmethod
def _get_inventory_moves(cls, incoming_move):
- res = super(ShipmentIn, cls)._get_inventory_moves(incoming_move)
+ move = super(ShipmentIn, cls)._get_inventory_moves(incoming_move)
for product_location in incoming_move.product.locations:
if product_location.warehouse.id != \
- incoming_move.shipment_in.warehouse.id:
+ incoming_move.shipment.warehouse.id:
continue
- res['to_location'] = product_location.location.id
- return res
+ move.to_location = product_location.location
+ return move
+
+
+class ShipmentOutReturn:
+ __name__ = 'stock.shipment.out.return'
+
+ @classmethod
+ def _get_inventory_moves(cls, incoming_move):
+ move = super(ShipmentOutReturn, cls)._get_inventory_moves(
+ incoming_move)
+ for product_location in incoming_move.product.locations:
+ if (product_location.warehouse
+ == incoming_move.shipment.warehouse):
+ move.to_location = product_location.location
+ return move
diff --git a/location.xml b/location.xml
index 6789545..a259918 100644
--- a/location.xml
+++ b/location.xml
@@ -6,33 +6,12 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="product_location_view_form">
<field name="model">stock.product.location</field>
<field name="type">form</field>
- <field name="arch" type="xml">
- <![CDATA[
- <form string="Product Location" cursor="product">
- <label name="sequence"/>
- <field name="sequence"/>
- <label name="product"/>
- <field name="product"/>
- <label name="warehouse"/>
- <field name="warehouse"/>
- <label name="location"/>
- <field name="location"/>
- </form>
- ]]>
- </field>
+ <field name="name">product_location_form</field>
</record>
<record model="ir.ui.view" id="product_location_view_tree">
<field name="model">stock.product.location</field>
<field name="type">tree</field>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Product Locations">
- <field name="product"/>
- <field name="warehouse"/>
- <field name="location"/>
- </tree>
- ]]>
- </field>
+ <field name="name">product_location_tree</field>
</record>
</data>
</tryton>
diff --git a/product.xml b/product.xml
index 61307c8..db4a307 100644
--- a/product.xml
+++ b/product.xml
@@ -6,19 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="product_view_form">
<field name="model">product.product</field>
<field name="inherit" ref="product.product_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath expr="/form/notebook/page[@id="general"]"
- position="after">
- <page string="Default Locations" id="default_locations"
- states="{'invisible': ~Eval('type').in_(['goods', 'assets'])}">
- <field name="locations" colspan="4"/>
- </page>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">product_form</field>
</record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index db87a9d..babda22 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_stock_product_location',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_stock_product_location',
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.stock_product_location': '.'},
packages=[
'trytond.modules.stock_product_location',
'trytond.modules.stock_product_location.tests',
],
package_data={
- 'trytond.modules.stock_product_location': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po', 'label.odt'],
+ 'trytond.modules.stock_product_location': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'label.odt']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_stock_product_location',
'Intended Audience :: Manufacturing',
'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 90dbb7f..4ab7723 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.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 10a60d2..45f961b 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.0
+Metadata-Version: 1.1
Name: trytond-stock-product-location
-Version: 2.6.0
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_stock_product_location
==============================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 59971ba..3befa97 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -30,4 +30,7 @@ trytond_stock_product_location.egg-info/dependency_links.txt
trytond_stock_product_location.egg-info/entry_points.txt
trytond_stock_product_location.egg-info/not-zip-safe
trytond_stock_product_location.egg-info/requires.txt
-trytond_stock_product_location.egg-info/top_level.txt
\ No newline at end of file
+trytond_stock_product_location.egg-info/top_level.txt
+view/product_form.xml
+view/product_location_form.xml
+view/product_location_tree.xml
\ No newline at end of file
diff --git a/trytond_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index 2480e97..eb4aa19 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.6, < 2.7
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_product >= 2.8, < 2.9
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/product_form.xml b/view/product_form.xml
new file mode 100644
index 0000000..e866927
--- /dev/null
+++ b/view/product_form.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. -->
+<data>
+ <xpath expr="/form/field[@name='description']" position="after">
+ <field name="locations" colspan="6"/>
+ </xpath>
+</data>
diff --git a/view/product_location_form.xml b/view/product_location_form.xml
new file mode 100644
index 0000000..c8d3b10
--- /dev/null
+++ b/view/product_location_form.xml
@@ -0,0 +1,13 @@
+<?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="Product Location" cursor="product">
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="product"/>
+ <field name="product"/>
+ <label name="warehouse"/>
+ <field name="warehouse"/>
+ <label name="location"/>
+ <field name="location"/>
+</form>
diff --git a/view/product_location_tree.xml b/view/product_location_tree.xml
new file mode 100644
index 0000000..1a7a480
--- /dev/null
+++ b/view/product_location_tree.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="Product Locations">
+ <field name="product"/>
+ <field name="warehouse"/>
+ <field name="location"/>
+</tree>
commit 996fded8f7f9a61f2794fae6e65b2d4eb544705e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:54:02 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 27c0284..64c426e 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 bb438eb..2b82bd1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 2.4.0
-Summary: Define default storage location by warehouse on product.
-Theses locations will be used by the supplier shipment for generating
-inventory moves.
-
+Version: 2.6.0
+Summary: Tryton module to add default location on product
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_stock_product_location
+ ==============================
+
+ The stock_product_location 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 6c471d7..a9469f4 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_stock_product_location
==============================
The stock_product_location module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 8ae28ea..d774584 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,14 @@
#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 .product import *
from .location import *
+
+
+def register():
+ Pool.register(
+ Product,
+ ProductLocation,
+ ShipmentIn,
+ module='stock_product_location', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 50a29f2..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,71 +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": "Stock Product Location",
- "name_bg_BG": "Местонахождение на наличност на продукт",
- 'name_ca_ES': 'Ubicació d''estoc de producte',
- "name_de_DE": "Lagerverwaltung Artikel Lagerort",
- "name_es_AR": "Ubicación de existencias de producto",
- "name_es_CO": "Ubicación de existencias de producto",
- "name_es_ES": "Ubicación de stock de producto",
- "name_fr_FR": "Emplacement de produit",
- "version": "2.4.0",
- "author": "B2CK",
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- "description": '''Define default storage location by warehouse on product.
-Theses locations will be used by the supplier shipment for generating
-inventory moves.
-''',
- "description_bg_BG": '''Задаване на местонахождение по подрабиране на
- на продукт по склад. Тези местонахождения ще бъдат използвани при пратки
- от доставчик за генериране на движения за инвентаризация.
-''',
- 'description_ca_ES': '''Defineix la ubicació interna predeterminada per
-magatzem i producte. Aquestes ubicacions s'utilitzaran en l'enviament de proveïdor
-per generar moviments d'inventari.
-''',
- "description_de_DE": '''Standardlagerorte für Artikel
- - Ermöglicht die Definition von Standardlagerorten für Artikel in einem Warenlager
- - Diese Lagerorte werden von Lieferposten von Lieferanten für die
- Lagerbewegungen benutzt
-''',
- "description_es_AR": '''Define la ubicación del almacén predeterminado por
-depósito y producto.
-Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos
-de inventario.
-''',
- "description_es_CO": '''Define la ubicación de almacenamiento predeterminada
-por depósito y producto.
-Esta ubicación la utilizará el envío del proveedor para generar movimientos
-de inventaio.
-''',
- "description_es_ES": '''Define la ubicación interna predeterminada por almacén y producto.
-Estas ubicaciones se utilizarán en el envío de proveedor para generar movimientos de inventario.
-''',
- "description_fr_FR": '''Defini un emplacement de rangement par défaut par produit.
-Ces emplacements seront utilisés par les colisages fournisseurs pour
-générer les mouvements internes.
-''',
- "depends": [
- "ir",
- "product",
- "stock",
- ],
- "xml": [
- "location.xml",
- "product.xml",
- ],
- 'translation': [
- 'locale/cs_CZ.po',
- 'locale/bg_BG.po',
- 'locale/ca_ES.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 ce6a49c..08c66cf 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -8,16 +8,15 @@ msgstr "Ubicacions predeterminades"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:stock.product.location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
@@ -37,15 +36,15 @@ msgstr "Seqüència"
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr "Dipòsit"
+msgstr "Magatzem"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 150606d..36578da 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,24 +4,23 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Sitios Predeterminados"
+msgstr "Locaciones por Defecto"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:stock.product.location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Lugar de Almacenamiento"
+msgstr "Locación de Almacenamiento"
msgctxt "field:stock.product.location,product:"
msgid "Product"
@@ -41,32 +40,33 @@ msgstr "Depósito"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
+#, fuzzy
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr "Sitio del Producto"
+msgstr "Locación de Producto"
msgctxt "view:product.product:"
msgid "Default Locations"
-msgstr "Sitios Predeterminados"
+msgstr "Locaciones por Defecto"
msgctxt "view:product.product:"
msgid "Product Location"
-msgstr "Sitio del Producto"
+msgstr "Locación del Producto"
msgctxt "view:product.product:"
msgid "Product Locations"
-msgstr "Sitios del Producto"
+msgstr "Locaciones del Producto"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Sitio del Producto"
+msgstr "Locación del Producto"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Sitios del Producto"
+msgstr "Locaciones del Producto"
diff --git a/location.py b/location.py
index 984fd1a..b6ed460 100644
--- a/location.py
+++ b/location.py
@@ -2,16 +2,20 @@
#this repository contains the full copyright notices and license terms.
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.pool import PoolMeta
+
+__all__ = ['ProductLocation', 'ShipmentIn']
+__metaclass__ = PoolMeta
class ProductLocation(ModelSQL, ModelView):
'''
- Product Location defines the default storage location
- by warehouse for a product
+ Product Location
+ It defines the default storage location by warehouse for a product.
'''
- _name = 'stock.product.location'
- _description = 'Product Location'
-
+ __name__ = 'stock.product.location'
product = fields.Many2One('product.product', 'Product', required=True,
select=True)
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
@@ -22,25 +26,35 @@ class ProductLocation(ModelSQL, ModelView):
('parent', 'child_of', If(Bool(Eval('warehouse')),
[Eval('warehouse')], [])),
], depends=['warehouse'])
- sequence = fields.Integer('Sequence', required=True)
+ sequence = fields.Integer('Sequence',
+ order_field='(%(table)s.sequence IS NULL) %(order)s, '
+ '%(table)s.sequence %(order)s')
+
+ @classmethod
+ def __setup__(cls):
+ super(ProductLocation, cls).__setup__()
+ cls._order.insert(0, ('sequence', 'ASC'))
- def __init__(self):
- super(ProductLocation, self).__init__()
- self._order.insert(0, ('sequence', 'ASC'))
+ @classmethod
+ def __register__(cls, module_name):
+ cursor = Transaction().cursor
+ table = TableHandler(cursor, cls, module_name)
-ProductLocation()
+ super(ProductLocation, cls).__register__(module_name)
+ # Migration from 2.4: drop required on sequence
+ table.not_null_action('sequence', action='remove')
-class ShipmentIn(ModelSQL, ModelView):
- _name = 'stock.shipment.in'
- def _get_inventory_moves(self, incoming_move):
- res = super(ShipmentIn, self)._get_inventory_moves(incoming_move)
+class ShipmentIn:
+ __name__ = 'stock.shipment.in'
+
+ @classmethod
+ def _get_inventory_moves(cls, incoming_move):
+ res = super(ShipmentIn, cls)._get_inventory_moves(incoming_move)
for product_location in incoming_move.product.locations:
if product_location.warehouse.id != \
incoming_move.shipment_in.warehouse.id:
continue
res['to_location'] = product_location.location.id
return res
-
-ShipmentIn()
diff --git a/product.py b/product.py
index 89e8afc..49a5a96 100644
--- a/product.py
+++ b/product.py
@@ -1,12 +1,16 @@
#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.model import fields
+from trytond.pyson import Eval
+from trytond.pool import PoolMeta
+__all__ = ['Product']
+__metaclass__ = PoolMeta
-class Product(ModelSQL, ModelView):
- _name = 'product.product'
+class Product:
+ __name__ = 'product.product'
locations = fields.One2Many('stock.product.location', 'product',
- 'Default Locations')
-
-Product()
+ 'Default Locations', states={
+ 'invisible': ~Eval('type').in_(['goods', 'assets']),
+ })
diff --git a/product.xml b/product.xml
index c5a5400..61307c8 100644
--- a/product.xml
+++ b/product.xml
@@ -11,9 +11,10 @@ this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form/notebook/page[@id="general"]"
position="after">
- <page string="Default Locations" id="default_locations">
- <field name="locations" colspan="4"/>
- </page>
+ <page string="Default Locations" id="default_locations"
+ states="{'invisible': ~Eval('type').in_(['goods', 'assets'])}">
+ <field name="locations" colspan="4"/>
+ </page>
</xpath>
</data>
]]>
diff --git a/setup.py b/setup.py
index 4864a28..db87a9d 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,22 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_stock_product_location',
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 to add default location on product',
+ 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.stock_product_location': '.'},
packages=[
'trytond.modules.stock_product_location',
'trytond.modules.stock_product_location.tests',
- ],
+ ],
package_data={
'trytond.modules.stock_product_location': info.get('xml', []) \
- + info.get('translation', []) \
- + ['label.odt'],
- },
+ + ['tryton.cfg', 'locale/*.po', 'label.odt'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +67,7 @@ setup(name='trytond_stock_product_location',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +77,4 @@ setup(name='trytond_stock_product_location',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..90dbb7f
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,9 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ product
+ stock
+xml:
+ location.xml
+ product.xml
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index e03ffff..10a60d2 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,16 +1,48 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 2.4.0
-Summary: Define default storage location by warehouse on product.
-Theses locations will be used by the supplier shipment for generating
-inventory moves.
-
+Version: 2.6.0
+Summary: Tryton module to add default location on product
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_stock_product_location
+ ==============================
+
+ The stock_product_location 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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index ba3394b..59971ba 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -7,8 +7,8 @@ README
location.xml
product.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./location.py
./product.py
./tests/__init__.py
diff --git a/trytond_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index 57d794b..2480e97 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.4, < 2.5
-trytond_stock >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_product >= 2.6, < 2.7
+trytond_stock >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 28d387692969dab5006dbc5873ea9fb90f019cfe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:07 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 46e887a..27c0284 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-25
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..2057c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-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 361369c..5430d32 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_product_location
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_stock (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 96fe5aa..bb438eb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 2.2.0
+Version: 2.4.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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 4f52f97..8ae28ea 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#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 product import *
-from location import *
+from .product import *
+from .location import *
diff --git a/__tryton__.py b/__tryton__.py
index 32ea51e..50a29f2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -1,14 +1,16 @@
#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" : "Stock Product Location",
- "name_bg_BG" : "Местонахождение на наличност на продукт",
- "name_de_DE" : "Lagerverwaltung Artikel Lagerort",
- "name_es_CO" : "Ubicación de existencias de producto",
- "name_es_ES" : "Ubicación de existencias de producto",
- "name_fr_FR" : "Emplacement de produit",
- "version" : "2.2.0",
- "author" : "B2CK",
+ "name": "Stock Product Location",
+ "name_bg_BG": "Местонахождение на наличност на продукт",
+ 'name_ca_ES': 'Ubicació d''estoc de producte',
+ "name_de_DE": "Lagerverwaltung Artikel Lagerort",
+ "name_es_AR": "Ubicación de existencias de producto",
+ "name_es_CO": "Ubicación de existencias de producto",
+ "name_es_ES": "Ubicación de stock de producto",
+ "name_fr_FR": "Emplacement de produit",
+ "version": "2.4.0",
+ "author": "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
"description": '''Define default storage location by warehouse on product.
@@ -19,36 +21,47 @@ inventory moves.
на продукт по склад. Тези местонахождения ще бъдат използвани при пратки
от доставчик за генериране на движения за инвентаризация.
''',
+ 'description_ca_ES': '''Defineix la ubicació interna predeterminada per
+magatzem i producte. Aquestes ubicacions s'utilitzaran en l'enviament de proveïdor
+per generar moviments d'inventari.
+''',
"description_de_DE": '''Standardlagerorte für Artikel
- Ermöglicht die Definition von Standardlagerorten für Artikel in einem Warenlager
- Diese Lagerorte werden von Lieferposten von Lieferanten für die
Lagerbewegungen benutzt
''',
+ "description_es_AR": '''Define la ubicación del almacén predeterminado por
+depósito y producto.
+Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos
+de inventario.
+''',
"description_es_CO": '''Define la ubicación de almacenamiento predeterminada
por depósito y producto.
Esta ubicación la utilizará el envío del proveedor para generar movimientos
de inventaio.
''',
- "description_es_ES": '''Define la ubicación del almacén predeterminado por depósito y producto.
-Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos de inventario.
+ "description_es_ES": '''Define la ubicación interna predeterminada por almacén y producto.
+Estas ubicaciones se utilizarán en el envío de proveedor para generar movimientos de inventario.
''',
"description_fr_FR": '''Defini un emplacement de rangement par défaut par produit.
Ces emplacements seront utilisés par les colisages fournisseurs pour
générer les mouvements internes.
''',
- "depends" : [
+ "depends": [
"ir",
"product",
"stock",
],
- "xml" : [
+ "xml": [
"location.xml",
"product.xml",
],
'translation': [
'locale/cs_CZ.po',
'locale/bg_BG.po',
+ 'locale/ca_ES.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 5b2a39d..6f4a263 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,50 +2,70 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr "Местонахождения по подразбиране"
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr "Местонахождение на съхранение"
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Продукт"
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Последователност"
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Склад"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Местонахождение на продукт"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr "Местонахождения по подразбиране"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Местонахождение на продукт"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr "Местонахождения на продукт"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Местонахождение на продукт"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr "Местонахождения на продукт"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..ce6a49c
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,72 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:"
+msgid "Default Locations"
+msgstr "Ubicacions predeterminades"
+
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:"
+msgid "Storage Location"
+msgstr "Ubicació del magatzem"
+
+msgctxt "field:stock.product.location,product:"
+msgid "Product"
+msgstr "Producte"
+
+msgctxt "field:stock.product.location,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.product.location,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:stock.product.location,warehouse:"
+msgid "Warehouse"
+msgstr "Dipòsit"
+
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:"
+msgid "Product Location"
+msgstr "Ubicació de producte"
+
+msgctxt "view:product.product:"
+msgid "Default Locations"
+msgstr "Ubicacions predeterminades"
+
+msgctxt "view:product.product:"
+msgid "Product Location"
+msgstr "Ubicació de producte"
+
+msgctxt "view:product.product:"
+msgid "Product Locations"
+msgstr "Ubicacions de producte"
+
+msgctxt "view:stock.product.location:"
+msgid "Product Location"
+msgstr "Ubicació de producte"
+
+msgctxt "view:stock.product.location:"
+msgid "Product Locations"
+msgstr "Ubicacions de producte"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index f05b8f5..a9ced2e 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,50 +2,70 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr ""
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr ""
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr ""
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr ""
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr ""
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4baf855..0513510 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,50 +2,70 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr "Standardlagerorte"
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr "Lagerort"
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Artikel"
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Reihenfolge"
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Warenlager"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Artikel Lagerort"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr "Standardlagerorte"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Artikel Lagerort"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr "Artikel Lagerorte"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Artikel Lagerort"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr "Artikel Lagerorte"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..8c80feb
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,71 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:"
+msgid "Default Locations"
+msgstr "Ubicaciones predeterminadas"
+
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.product.location,location:"
+msgid "Storage Location"
+msgstr "Ubicación del almacén"
+
+msgctxt "field:stock.product.location,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:stock.product.location,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:stock.product.location,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:stock.product.location,warehouse:"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "model:stock.product.location,name:"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:product.product:"
+msgid "Default Locations"
+msgstr "Ubicaciones predeterminadas"
+
+msgctxt "view:product.product:"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:product.product:"
+msgid "Product Locations"
+msgstr "Ubicaciones de producto"
+
+msgctxt "view:stock.product.location:"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:stock.product.location:"
+msgid "Product Locations"
+msgstr "Ubicaciones de producto"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index bc6508c..150606d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,50 +2,71 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr "Sitios Predeterminados"
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr "Lugar de Almacenamiento"
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Productos"
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Depósito"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Sitio del Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr "Sitios Predeterminados"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Sitio del Producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr "Sitios del Producto"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Sitio del Producto"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr "Sitios del Producto"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index a1200fc..a9a7847 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,50 +2,70 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Ubicaciones predeterminadas"
+msgstr "Ubicaciones por defecto"
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Ubicación del almacén"
+msgstr "Ubicación interna"
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Almacén"
+
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
-msgstr "Ubicaciones predeterminadas"
+msgstr "Ubicaciones por defecto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr "Ubicaciones de producto"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr "Ubicaciones de producto"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 17687e3..9194c50 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,50 +2,82 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr "Emplacements par défaut"
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr "Emplacement de stockage"
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Produit"
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Séquence"
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Entrepôt"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Emplacement produit"
-msgctxt "view:product.product:0"
+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:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr "Emplacement de produit"
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr "Emplacements de produit"
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
+msgid "Product Location"
+msgstr "Emplacement de produit"
+
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Emplacement de produit"
-msgctxt "view:stock.product.location:0"
+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/nl_NL.po b/locale/nl_NL.po
index 3554ac4..31233c0 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,54 +2,74 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr ""
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr ""
#, fuzzy
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Producten"
#, fuzzy
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
#, fuzzy
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Reeks"
#, fuzzy
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Magazijn"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4088073..ea98e9e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,54 +2,74 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:product.product,locations:0"
+msgctxt "field:product.product,locations:"
msgid "Default Locations"
msgstr ""
-msgctxt "field:stock.product.location,location:0"
+msgctxt "field:stock.product.location,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:stock.product.location,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
msgstr ""
#, fuzzy
-msgctxt "field:stock.product.location,product:0"
+msgctxt "field:stock.product.location,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
#, fuzzy
-msgctxt "field:stock.product.location,rec_name:0"
+msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
msgstr "Наименование"
#, fuzzy
-msgctxt "field:stock.product.location,sequence:0"
+msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
msgstr "Последовательность"
#, fuzzy
-msgctxt "field:stock.product.location,warehouse:0"
+msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
msgstr "Товарный склад"
-msgctxt "model:stock.product.location,name:0"
+msgctxt "field:stock.product.location,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:stock.product.location,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Default Locations"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:0"
+msgctxt "view:product.product:"
msgid "Product Locations"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
-msgctxt "view:stock.product.location:0"
+msgctxt "view:stock.product.location:"
msgid "Product Locations"
msgstr ""
diff --git a/location.py b/location.py
index 711b053..984fd1a 100644
--- a/location.py
+++ b/location.py
@@ -13,7 +13,7 @@ class ProductLocation(ModelSQL, ModelView):
_description = 'Product Location'
product = fields.Many2One('product.product', 'Product', required=True,
- select=1)
+ select=True)
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
domain=[('type', '=', 'warehouse')])
location = fields.Many2One('stock.location', 'Storage Location',
@@ -22,7 +22,7 @@ class ProductLocation(ModelSQL, ModelView):
('parent', 'child_of', If(Bool(Eval('warehouse')),
[Eval('warehouse')], [])),
], depends=['warehouse'])
- sequence = fields.Integer('Sequence')
+ sequence = fields.Integer('Sequence', required=True)
def __init__(self):
super(ProductLocation, self).__init__()
diff --git a/product.xml b/product.xml
index 9c346c5..c5a5400 100644
--- a/product.xml
+++ b/product.xml
@@ -12,25 +12,7 @@ this repository contains the full copyright notices and license terms. -->
<xpath expr="/form/notebook/page[@id="general"]"
position="after">
<page string="Default Locations" id="default_locations">
- <field name="locations" colspan="4">
- <tree string="Product Locations"
- sequence="sequence">
- <field name="warehouse"/>
- <field name="location"/>
- <field name="sequence"
- tree_invisible="1"/>
- </tree>
- <form string="Product Location"
- cursor="warehouse">
- <label name="sequence"/>
- <field name="sequence"/>
- <newline/>
- <label name="warehouse"/>
- <field name="warehouse"/>
- <label name="location"/>
- <field name="location"/>
- </form>
- </field>
+ <field name="locations" colspan="4"/>
</page>
</xpath>
</data>
diff --git a/setup.py b/setup.py
index c88d25e..4864a28 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/tests/__init__.py b/tests/__init__.py
index ece4b66..e937546 100644
--- a/tests/__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 test_stock_product_location import suite
+from .test_stock_product_location import suite
diff --git a/tests/test_stock_product_location.py b/tests/test_stock_product_location.py
index d4f7284..9099016 100644
--- a/tests/test_stock_product_location.py
+++ b/tests/test_stock_product_location.py
@@ -2,7 +2,8 @@
#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, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class StockProductLocationTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index d6c6296..e03ffff 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 2.2.0
+Version: 2.4.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 83e5d40..ba3394b 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -15,8 +15,10 @@ setup.py
./tests/test_stock_product_location.py
doc/index.rst
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_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index b5a2afa..57d794b 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.2, < 2.3
-trytond_stock >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_product >= 2.4, < 2.5
+trytond_stock >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit c2aef7d343dc0e2081b73527767d73fcb6928016
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:28 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index bd2a9a7..46e887a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-25
+* 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 3e27e90..96fe5aa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 2.0.0
+Version: 2.2.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,22 +9,25 @@ 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 :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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 3014a65..32ea51e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
"name_es_CO" : "Ubicación de existencias de producto",
"name_es_ES" : "Ubicación de existencias de producto",
"name_fr_FR" : "Emplacement de produit",
- "version" : "2.0.0",
+ "version" : "2.2.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -16,7 +16,7 @@ Theses locations will be used by the supplier shipment for generating
inventory moves.
''',
"description_bg_BG": '''Задаване на местонахождение по подрабиране на
- на продукт по склад. Тези местонахождения ще бъдат използвани при пратки
+ на продукт по склад. Тези местонахождения ще бъдат използвани при пратки
от доставчик за генериране на движения за инвентаризация.
''',
"description_de_DE": '''Standardlagerorte für Artikel
@@ -46,10 +46,13 @@ générer les mouvements internes.
"product.xml",
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/cs_CZ.po',
+ 'locale/bg_BG.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 180ada3..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"product.product,locations",0,Default Locations,Местонахождения по подразбиране,0
-field,"stock.product.location,location",0,Storage Location,Местонахождение на съхранение,0
-field,"stock.product.location,product",0,Product,Продукт,0
-field,"stock.product.location,rec_name",0,Name,Име,0
-field,"stock.product.location,sequence",0,Sequence,Последователност,0
-field,"stock.product.location,warehouse",0,Warehouse,Склад,0
-model,"stock.product.location,name",0,Product Location,Местонахождение на продукт,0
-view,product.product,0,Default Locations,Местонахождения по подразбиране,0
-view,product.product,0,Product Location,Местонахождение на продукт,0
-view,product.product,0,Product Locations,Местонахождения на продукт,0
-view,stock.product.location,0,Product Location,Местонахождение на продукт,0
-view,stock.product.location,0,Product Locations,Местонахождения на продукт,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index d2838d2..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"product.product,locations",0,Default Locations,Standardlagerorte,0
-field,"stock.product.location,location",0,Storage Location,Lagerort,0
-field,"stock.product.location,product",0,Product,Artikel,0
-field,"stock.product.location,rec_name",0,Name,Name,0
-field,"stock.product.location,sequence",0,Sequence,Reihenfolge,0
-field,"stock.product.location,warehouse",0,Warehouse,Warenlager,0
-model,"stock.product.location,name",0,Product Location,Artikel Lagerort,0
-view,product.product,0,Default Locations,Standardlagerorte,0
-view,product.product,0,Product Location,Artikel Lagerort,0
-view,product.product,0,Product Locations,Artikel Lagerorte,0
-view,stock.product.location,0,Product Location,Artikel Lagerort,0
-view,stock.product.location,0,Product Locations,Artikel Lagerorte,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 5d51de2..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"product.product,locations",0,Default Locations,Sitios Predeterminados,0
-field,"stock.product.location,location",0,Storage Location,Lugar de Almacenamiento,0
-field,"stock.product.location,product",0,Product,Productos,0
-field,"stock.product.location,rec_name",0,Name,Nombre,0
-field,"stock.product.location,sequence",0,Sequence,Secuencia,0
-field,"stock.product.location,warehouse",0,Warehouse,Depósito,0
-model,"stock.product.location,name",0,Product Location,Sitio del Producto,0
-view,product.product,0,Default Locations,Sitios Predeterminados,0
-view,product.product,0,Product Location,Sitio del Producto,0
-view,product.product,0,Product Locations,Sitios del Producto,0
-view,stock.product.location,0,Product Location,Sitio del Producto,0
-view,stock.product.location,0,Product Locations,Sitios del Producto,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 0d52877..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"product.product,locations",0,Default Locations,Ubicaciones predeterminadas,0
-field,"stock.product.location,location",0,Storage Location,Ubicación del almacén,0
-field,"stock.product.location,product",0,Product,Producto,0
-field,"stock.product.location,rec_name",0,Name,Nombre,0
-field,"stock.product.location,sequence",0,Sequence,Secuencia,0
-field,"stock.product.location,warehouse",0,Warehouse,Depósito,0
-model,"stock.product.location,name",0,Product Location,Ubicación de producto,0
-view,product.product,0,Default Locations,Ubicaciones predeterminadas,0
-view,product.product,0,Product Location,Ubicación de producto,0
-view,product.product,0,Product Locations,Ubicaciones de producto,0
-view,stock.product.location,0,Product Location,Ubicación de producto,0
-view,stock.product.location,0,Product Locations,Ubicaciones de producto,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 96c68f3..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"product.product,locations",0,Default Locations,Emplacements par défaut,0
-field,"stock.product.location,location",0,Storage Location,Emplacement de stockage,0
-field,"stock.product.location,product",0,Product,Produit,0
-field,"stock.product.location,rec_name",0,Name,Nom,0
-field,"stock.product.location,sequence",0,Sequence,Séquence,0
-field,"stock.product.location,warehouse",0,Warehouse,Entrepôt,0
-model,"stock.product.location,name",0,Product Location,Emplacement produit,0
-view,product.product,0,Default Locations,Emplacements par défaut,0
-view,product.product,0,Product Location,Emplacement de produit,0
-view,product.product,0,Product Locations,Emplacements de produit,0
-view,stock.product.location,0,Product Location,Emplacement de produit,0
-view,stock.product.location,0,Product Locations,Emplacements de produit,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..5b2a39d
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr "Местонахождения по подразбиране"
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr "Местонахождение на съхранение"
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Последователност"
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Склад"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr "Местонахождение на продукт"
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr "Местонахождения по подразбиране"
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr "Местонахождение на продукт"
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr "Местонахождения на продукт"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr "Местонахождение на продукт"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr "Местонахождения на продукт"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..f05b8f5
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr ""
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr ""
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..4baf855
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr "Standardlagerorte"
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr "Lagerort"
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Warenlager"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr "Artikel Lagerort"
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr "Standardlagerorte"
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr "Artikel Lagerort"
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr "Artikel Lagerorte"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr "Artikel Lagerort"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr "Artikel Lagerorte"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..bc6508c
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr "Sitios Predeterminados"
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr "Lugar de Almacenamiento"
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Productos"
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr "Sitio del Producto"
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr "Sitios Predeterminados"
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr "Sitio del Producto"
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr "Sitios del Producto"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr "Sitio del Producto"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr "Sitios del Producto"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..a1200fc
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr "Ubicaciones predeterminadas"
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr "Ubicación del almacén"
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr "Ubicaciones predeterminadas"
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr "Ubicaciones de producto"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr "Ubicación de producto"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr "Ubicaciones de producto"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..17687e3
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,51 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr "Emplacements par défaut"
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr "Emplacement de stockage"
+
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr "Emplacement produit"
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr "Emplacements par défaut"
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr "Emplacement de produit"
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr "Emplacements de produit"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr "Emplacement de produit"
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr "Emplacements de produit"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..3554ac4
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Producten"
+
+#, fuzzy
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Reeks"
+
+#, fuzzy
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Magazijn"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..4088073
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:product.product,locations:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "field:stock.product.location,location:0"
+msgid "Storage Location"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:stock.product.location,product:0"
+msgid "Product"
+msgstr "Товарно материальные ценности (ТМЦ)"
+
+#, fuzzy
+msgctxt "field:stock.product.location,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:stock.product.location,sequence:0"
+msgid "Sequence"
+msgstr "Последовательность"
+
+#, fuzzy
+msgctxt "field:stock.product.location,warehouse:0"
+msgid "Warehouse"
+msgstr "Товарный склад"
+
+msgctxt "model:stock.product.location,name:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Default Locations"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:product.product:0"
+msgid "Product Locations"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Location"
+msgstr ""
+
+msgctxt "view:stock.product.location:0"
+msgid "Product Locations"
+msgstr ""
diff --git a/location.py b/location.py
index 82d61ad..711b053 100644
--- a/location.py
+++ b/location.py
@@ -17,11 +17,11 @@ class ProductLocation(ModelSQL, ModelView):
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
domain=[('type', '=', 'warehouse')])
location = fields.Many2One('stock.location', 'Storage Location',
- required=True, domain=[
- ('type', '=', 'storage'),
- ('parent', 'child_of', If(Bool(Eval('warehouse')),
+ required=True, domain=[
+ ('type', '=', 'storage'),
+ ('parent', 'child_of', If(Bool(Eval('warehouse')),
[Eval('warehouse')], [])),
- ])
+ ], depends=['warehouse'])
sequence = fields.Integer('Sequence')
def __init__(self):
diff --git a/location.xml b/location.xml
index 189637c..6789545 100644
--- a/location.xml
+++ b/location.xml
@@ -27,9 +27,9 @@ this repository contains the full copyright notices and license terms. -->
<field name="arch" type="xml">
<![CDATA[
<tree string="Product Locations">
- <field name="product" select="1"/>
- <field name="warehouse" select="2"/>
- <field name="location" select="2"/>
+ <field name="product"/>
+ <field name="warehouse"/>
+ <field name="location"/>
</tree>
]]>
</field>
diff --git a/setup.py b/setup.py
index fa47aa8..c88d25e 100644
--- a/setup.py
+++ b/setup.py
@@ -40,17 +40,20 @@ setup(name='trytond_stock_product_location',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'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',
diff --git a/tests/test_stock_product_location.py b/tests/test_stock_product_location.py
index c49e3d1..d4f7284 100644
--- a/tests/test_stock_product_location.py
+++ b/tests/test_stock_product_location.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class StockProductLocationTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class StockProductLocationTestCase(unittest.TestCase):
'''
test_view('stock_product_location')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 5119549..d6c6296 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 2.0.0
+Version: 2.2.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,22 +9,25 @@ 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 :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index bbbd4aa..83e5d40 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
location.xml
product.xml
setup.py
@@ -19,6 +14,14 @@ setup.py
./tests/__init__.py
./tests/test_stock_product_location.py
doc/index.rst
+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_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 e78ed20..b5a2afa 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.0, < 2.1
-trytond_stock >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_product >= 2.2, < 2.3
+trytond_stock >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 8d83245e7b23941b419533138dd3a5ef862d5f30
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:13:14 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 6765d27..bd2a9a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* 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 cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-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 d706eff..3e27e90 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 1.8.0
+Version: 2.0.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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
@@ -18,10 +18,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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 e3a45cf..3014a65 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,12 @@
#this repository contains the full copyright notices and license terms.
{
"name" : "Stock Product Location",
+ "name_bg_BG" : "Местонахождение на наличност на продукт",
"name_de_DE" : "Lagerverwaltung Artikel Lagerort",
"name_es_CO" : "Ubicación de existencias de producto",
"name_es_ES" : "Ubicación de existencias de producto",
"name_fr_FR" : "Emplacement de produit",
- "version" : "1.8.0",
+ "version" : "2.0.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,6 +15,10 @@
Theses locations will be used by the supplier shipment for generating
inventory moves.
''',
+ "description_bg_BG": '''Задаване на местонахождение по подрабиране на
+ на продукт по склад. Тези местонахождения ще бъдат използвани при пратки
+ от доставчик за генериране на движения за инвентаризация.
+''',
"description_de_DE": '''Standardlagerorte für Artikel
- Ermöglicht die Definition von Standardlagerorten für Artikel in einem Warenlager
- Diese Lagerorte werden von Lieferposten von Lieferanten für die
@@ -41,6 +46,7 @@ générer les mouvements internes.
"product.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..180ada3
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+field,"product.product,locations",0,Default Locations,Местонахождения по подразбиране,0
+field,"stock.product.location,location",0,Storage Location,Местонахождение на съхранение,0
+field,"stock.product.location,product",0,Product,Продукт,0
+field,"stock.product.location,rec_name",0,Name,Име,0
+field,"stock.product.location,sequence",0,Sequence,Последователност,0
+field,"stock.product.location,warehouse",0,Warehouse,Склад,0
+model,"stock.product.location,name",0,Product Location,Местонахождение на продукт,0
+view,product.product,0,Default Locations,Местонахождения по подразбиране,0
+view,product.product,0,Product Location,Местонахождение на продукт,0
+view,product.product,0,Product Locations,Местонахождения на продукт,0
+view,stock.product.location,0,Product Location,Местонахождение на продукт,0
+view,stock.product.location,0,Product Locations,Местонахождения на продукт,0
diff --git a/setup.py b/setup.py
index 4c9055b..fa47aa8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,15 @@ setup(name='trytond_stock_product_location',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'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_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 6605b9a..5119549 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 1.8.0
+Version: 2.0.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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
@@ -18,10 +18,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 8381ff0..bbbd4aa 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.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_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index 7c49621..e78ed20 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 >= 1.8, < 1.9
-trytond_stock >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_product >= 2.0, < 2.1
+trytond_stock >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 7f7b0068051ec9a2563bf8efecced0901b879ee1
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:36 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1bf0d45..6765d27 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-12
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 3265927..361369c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_product_location
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_stock (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 648727f..d706eff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 1.6.0
+Version: 1.8.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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 3fe8a9a..e3a45cf 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
"name_es_CO" : "Ubicación de existencias de producto",
"name_es_ES" : "Ubicación de existencias de producto",
"name_fr_FR" : "Emplacement de produit",
- "version" : "1.6.0",
+ "version" : "1.8.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/location.py b/location.py
index d94e863..82d61ad 100644
--- a/location.py
+++ b/location.py
@@ -34,9 +34,8 @@ ProductLocation()
class ShipmentIn(ModelSQL, ModelView):
_name = 'stock.shipment.in'
- def _get_inventory_moves(self, cursor, user, incoming_move, context=None):
- res = super(ShipmentIn, self)._get_inventory_moves(cursor, user,
- incoming_move, context=context)
+ def _get_inventory_moves(self, incoming_move):
+ res = super(ShipmentIn, self)._get_inventory_moves(incoming_move)
for product_location in incoming_move.product.locations:
if product_location.warehouse.id != \
incoming_move.shipment_in.warehouse.id:
diff --git a/tests/test_stock_product_location.py b/tests/test_stock_product_location.py
index 23b8667..c49e3d1 100644
--- a/tests/test_stock_product_location.py
+++ b/tests/test_stock_product_location.py
@@ -25,7 +25,7 @@ class StockProductLocationTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('stock_product_location'))
+ test_view('stock_product_location')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 02ea982..6605b9a 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 1.6.0
+Version: 1.8.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index 1990304..7c49621 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 >= 1.6, < 1.7
-trytond_stock >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_product >= 1.8, < 1.9
+trytond_stock >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit e50c800110088fdf9ca0819cc08c82f19b9b37b4
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:30:10 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index ac6b386..1bf0d45 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-12
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 853f1f7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-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 8b45b8a..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,4 +8,3 @@ include *.xml
include *.odt
include *.csv
include doc/*
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index b97cd21..648727f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 1.4.0
+Version: 1.6.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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 380ebe0..3fe8a9a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
"name_es_CO" : "Ubicación de existencias de producto",
"name_es_ES" : "Ubicación de existencias de producto",
"name_fr_FR" : "Emplacement de produit",
- "version" : "1.4.0",
+ "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 8d07e3c..d2838d2 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -3,7 +3,7 @@ field,"product.product,locations",0,Default Locations,Standardlagerorte,0
field,"stock.product.location,location",0,Storage Location,Lagerort,0
field,"stock.product.location,product",0,Product,Artikel,0
field,"stock.product.location,rec_name",0,Name,Name,0
-field,"stock.product.location,sequence",0,Sequence,Sequenz,0
+field,"stock.product.location,sequence",0,Sequence,Reihenfolge,0
field,"stock.product.location,warehouse",0,Warehouse,Warenlager,0
model,"stock.product.location,name",0,Product Location,Artikel Lagerort,0
view,product.product,0,Default Locations,Standardlagerorte,0
diff --git a/location.py b/location.py
index 57fabc7..d94e863 100644
--- a/location.py
+++ b/location.py
@@ -1,6 +1,7 @@
#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.pyson import If, Eval, Bool
class ProductLocation(ModelSQL, ModelView):
@@ -16,8 +17,11 @@ class ProductLocation(ModelSQL, ModelView):
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
domain=[('type', '=', 'warehouse')])
location = fields.Many2One('stock.location', 'Storage Location',
- required=True, domain=[('type', '=', 'storage'),
- "('parent', 'child_of', warehouse and [warehouse] or [])"])
+ required=True, domain=[
+ ('type', '=', 'storage'),
+ ('parent', 'child_of', If(Bool(Eval('warehouse')),
+ [Eval('warehouse')], [])),
+ ])
sequence = fields.Integer('Sequence')
def __init__(self):
diff --git a/setup.py b/setup.py
index 8a1037e..4c9055b 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, 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_stock_product_location',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_stock_product_location',
package_dir={'trytond.modules.stock_product_location': '.'},
packages=[
'trytond.modules.stock_product_location',
+ 'trytond.modules.stock_product_location.tests',
],
package_data={
'trytond.modules.stock_product_location': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_stock_product_location',
[trytond.modules]
stock_product_location = trytond.modules.stock_product_location
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index e7563a9..ece4b66 100644
--- a/tests/__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 test_stock_product_location import *
+from test_stock_product_location import suite
diff --git a/tests/test_stock_product_location.py b/tests/test_stock_product_location.py
index c9c0d1f..23b8667 100644
--- a/tests/test_stock_product_location.py
+++ b/tests/test_stock_product_location.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class StockProductLocationTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class StockProductLocationTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('stock_product_location'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(StockProductLocationTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ StockProductLocationTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteStockProductLocation = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteStockProductLocation])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index 90640c4..02ea982 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 1.4.0
+Version: 1.6.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ 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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 4c209d6..8381ff0 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -15,9 +15,9 @@ setup.py
./__tryton__.py
./location.py
./product.py
+./tests/__init__.py
+./tests/test_stock_product_location.py
doc/index.rst
-tests/__init__.py
-tests/test_stock_product_location.py
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 5df9de7..1990304 100644
--- a/trytond_stock_product_location.egg-info/requires.txt
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_product
-trytond_stock
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_product >= 1.6, < 1.7
+trytond_stock >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 1b577eb197bd6c4c2fbba2ef59a2b3e1aac153a8
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:42:07 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 64b3cbd..ac6b386 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-07-31
* Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..8b45b8a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,3 +8,4 @@ include *.xml
include *.odt
include *.csv
include doc/*
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 4a67db5..b97cd21 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_stock_product_location
-Version: 1.2.0
+Version: 1.4.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 15b5749..380ebe0 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,11 @@
#this repository contains the full copyright notices and license terms.
{
"name" : "Stock Product Location",
- "name_fr_FR" : "Emplacement de produit",
"name_de_DE" : "Lagerverwaltung Artikel Lagerort",
- "name_es_ES" : "Ubicación de existencias de producto",
"name_es_CO" : "Ubicación de existencias de producto",
- "version" : "1.2.0",
+ "name_es_ES" : "Ubicación de existencias de producto",
+ "name_fr_FR" : "Emplacement de produit",
+ "version" : "1.4.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,23 +14,23 @@
Theses locations will be used by the supplier shipment for generating
inventory moves.
''',
- "description_fr_FR": '''Defini un emplacement Magasin par défaut par produit.
-Ces emplacements seront utilisés par les colisages fournisseurs pour
-générer les mouvements internes.
-''',
"description_de_DE": '''Standardlagerorte für Artikel
- Ermöglicht die Definition von Standardlagerorten für Artikel in einem Warenlager
- Diese Lagerorte werden von Lieferposten von Lieferanten für die
Lagerbewegungen benutzt
''',
- "description_es_ES": '''Define la ubicación del almacén predeterminado por depósito y producto.
-Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos de inventario.
-''',
"description_es_CO": '''Define la ubicación de almacenamiento predeterminada
por depósito y producto.
Esta ubicación la utilizará el envío del proveedor para generar movimientos
de inventaio.
''',
+ "description_es_ES": '''Define la ubicación del almacén predeterminado por depósito y producto.
+Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos de inventario.
+''',
+ "description_fr_FR": '''Defini un emplacement de rangement par défaut par produit.
+Ces emplacements seront utilisés par les colisages fournisseurs pour
+générer les mouvements internes.
+''',
"depends" : [
"ir",
"product",
@@ -41,9 +41,9 @@ de inventaio.
"product.xml",
],
'translation': [
- 'fr_FR.csv',
'de_DE.csv',
- 'es_ES.csv',
'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
],
}
diff --git a/location.py b/location.py
index 58a68e2..57fabc7 100644
--- a/location.py
+++ b/location.py
@@ -16,8 +16,8 @@ class ProductLocation(ModelSQL, ModelView):
warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
domain=[('type', '=', 'warehouse')])
location = fields.Many2One('stock.location', 'Storage Location',
- required=True, domain="[('type', '=', 'storage'), " \
- "('parent', 'child_of', warehouse and [warehouse] or [])]")
+ required=True, domain=[('type', '=', 'storage'),
+ "('parent', 'child_of', warehouse and [warehouse] or [])"])
sequence = fields.Integer('Sequence')
def __init__(self):
@@ -27,17 +27,17 @@ class ProductLocation(ModelSQL, ModelView):
ProductLocation()
-class PackingIn(ModelSQL, ModelView):
- _name = 'stock.packing.in'
+class ShipmentIn(ModelSQL, ModelView):
+ _name = 'stock.shipment.in'
def _get_inventory_moves(self, cursor, user, incoming_move, context=None):
- res = super(PackingIn, self)._get_inventory_moves(cursor, user,
+ res = super(ShipmentIn, self)._get_inventory_moves(cursor, user,
incoming_move, context=context)
for product_location in incoming_move.product.locations:
if product_location.warehouse.id != \
- incoming_move.packing_in.warehouse.id:
+ incoming_move.shipment_in.warehouse.id:
continue
res['to_location'] = product_location.location.id
return res
-PackingIn()
+ShipmentIn()
diff --git a/setup.py b/setup.py
index b89f06e..8a1037e 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ 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' % (major_version, int(minor_version) + 1))
setup(name='trytond_stock_product_location',
version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e7563a9
--- /dev/null
+++ b/tests/__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 test_stock_product_location import *
diff --git a/tests/test_stock_product_location.py b/tests/test_stock_product_location.py
new file mode 100644
index 0000000..c9c0d1f
--- /dev/null
+++ b/tests/test_stock_product_location.py
@@ -0,0 +1,38 @@
+#!/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, 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 RPCProxy, CONTEXT, SOCK, test_view
+
+
+class StockProductLocationTestCase(unittest.TestCase):
+ '''
+ Test StockProductLocation module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('stock_product_location')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('stock_product_location'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(StockProductLocationTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteStockProductLocation = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteStockProductLocation])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index f792168..90640c4 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-stock-product-location
-Version: 1.2.0
+Version: 1.4.0
Summary: Define default storage location by warehouse on product.
Theses locations will be used by the supplier shipment for generating
inventory moves.
@@ -9,7 +9,7 @@ Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index 99479a3..4c209d6 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -16,6 +16,8 @@ setup.py
./location.py
./product.py
doc/index.rst
+tests/__init__.py
+tests/test_stock_product_location.py
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 f1efd63..5df9de7 100644
--- a/trytond_stock_product_location.egg-info/requires.txt
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_product
trytond_stock
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit 3d26919ae1b1fac6e1fce22ad9fa0226295f3ee3
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Aug 2 00:51:03 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..64b3cbd
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.2.0 - 2009-07-31
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..853f1f7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-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..3265927
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_stock_product_location
+=========================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+ * trytond_stock (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_stock_product_location 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 stock_product_location.
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..dcb2afa
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..4a67db5
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,27 @@
+Metadata-Version: 1.0
+Name: trytond_stock_product_location
+Version: 1.2.0
+Summary: Define default storage location by warehouse on product.
+Theses locations will be used by the supplier shipment for generating
+inventory moves.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.2/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+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..6c471d7
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_stock_product_location
+==============================
+
+The stock_product_location 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..4f52f97
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#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 product import *
+from location import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..15b5749
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,49 @@
+#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" : "Stock Product Location",
+ "name_fr_FR" : "Emplacement de produit",
+ "name_de_DE" : "Lagerverwaltung Artikel Lagerort",
+ "name_es_ES" : "Ubicación de existencias de producto",
+ "name_es_CO" : "Ubicación de existencias de producto",
+ "version" : "1.2.0",
+ "author" : "B2CK",
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ "description": '''Define default storage location by warehouse on product.
+Theses locations will be used by the supplier shipment for generating
+inventory moves.
+''',
+ "description_fr_FR": '''Defini un emplacement Magasin par défaut par produit.
+Ces emplacements seront utilisés par les colisages fournisseurs pour
+générer les mouvements internes.
+''',
+ "description_de_DE": '''Standardlagerorte für Artikel
+ - Ermöglicht die Definition von Standardlagerorten für Artikel in einem Warenlager
+ - Diese Lagerorte werden von Lieferposten von Lieferanten für die
+ Lagerbewegungen benutzt
+''',
+ "description_es_ES": '''Define la ubicación del almacén predeterminado por depósito y producto.
+Estas ubicaciones se utilizarán en el envio de proveedor para generar movimientos de inventario.
+''',
+ "description_es_CO": '''Define la ubicación de almacenamiento predeterminada
+por depósito y producto.
+Esta ubicación la utilizará el envío del proveedor para generar movimientos
+de inventaio.
+''',
+ "depends" : [
+ "ir",
+ "product",
+ "stock",
+ ],
+ "xml" : [
+ "location.xml",
+ "product.xml",
+ ],
+ 'translation': [
+ 'fr_FR.csv',
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'es_CO.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..8d07e3c
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+field,"product.product,locations",0,Default Locations,Standardlagerorte,0
+field,"stock.product.location,location",0,Storage Location,Lagerort,0
+field,"stock.product.location,product",0,Product,Artikel,0
+field,"stock.product.location,rec_name",0,Name,Name,0
+field,"stock.product.location,sequence",0,Sequence,Sequenz,0
+field,"stock.product.location,warehouse",0,Warehouse,Warenlager,0
+model,"stock.product.location,name",0,Product Location,Artikel Lagerort,0
+view,product.product,0,Default Locations,Standardlagerorte,0
+view,product.product,0,Product Location,Artikel Lagerort,0
+view,product.product,0,Product Locations,Artikel Lagerorte,0
+view,stock.product.location,0,Product Location,Artikel Lagerort,0
+view,stock.product.location,0,Product Locations,Artikel Lagerorte,0
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 0000000..01e8917
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,8 @@
+Stock Product Location Module
+#############################
+
+The Stock Product Location Module adds on the product form a list of
+preferred location by warehouse. This list is used when a supplier
+shipment is received: the auto-generated Inventory Moves will use as
+default destination the preferred locations associated to the current
+warehouse.
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..5d51de2
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+field,"product.product,locations",0,Default Locations,Sitios Predeterminados,0
+field,"stock.product.location,location",0,Storage Location,Lugar de Almacenamiento,0
+field,"stock.product.location,product",0,Product,Productos,0
+field,"stock.product.location,rec_name",0,Name,Nombre,0
+field,"stock.product.location,sequence",0,Sequence,Secuencia,0
+field,"stock.product.location,warehouse",0,Warehouse,Depósito,0
+model,"stock.product.location,name",0,Product Location,Sitio del Producto,0
+view,product.product,0,Default Locations,Sitios Predeterminados,0
+view,product.product,0,Product Location,Sitio del Producto,0
+view,product.product,0,Product Locations,Sitios del Producto,0
+view,stock.product.location,0,Product Location,Sitio del Producto,0
+view,stock.product.location,0,Product Locations,Sitios del Producto,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..0d52877
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+field,"product.product,locations",0,Default Locations,Ubicaciones predeterminadas,0
+field,"stock.product.location,location",0,Storage Location,Ubicación del almacén,0
+field,"stock.product.location,product",0,Product,Producto,0
+field,"stock.product.location,rec_name",0,Name,Nombre,0
+field,"stock.product.location,sequence",0,Sequence,Secuencia,0
+field,"stock.product.location,warehouse",0,Warehouse,Depósito,0
+model,"stock.product.location,name",0,Product Location,Ubicación de producto,0
+view,product.product,0,Default Locations,Ubicaciones predeterminadas,0
+view,product.product,0,Product Location,Ubicación de producto,0
+view,product.product,0,Product Locations,Ubicaciones de producto,0
+view,stock.product.location,0,Product Location,Ubicación de producto,0
+view,stock.product.location,0,Product Locations,Ubicaciones de producto,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..96c68f3
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,13 @@
+type,name,res_id,src,value,fuzzy
+field,"product.product,locations",0,Default Locations,Emplacements par défaut,0
+field,"stock.product.location,location",0,Storage Location,Emplacement de stockage,0
+field,"stock.product.location,product",0,Product,Produit,0
+field,"stock.product.location,rec_name",0,Name,Nom,0
+field,"stock.product.location,sequence",0,Sequence,Séquence,0
+field,"stock.product.location,warehouse",0,Warehouse,Entrepôt,0
+model,"stock.product.location,name",0,Product Location,Emplacement produit,0
+view,product.product,0,Default Locations,Emplacements par défaut,0
+view,product.product,0,Product Location,Emplacement de produit,0
+view,product.product,0,Product Locations,Emplacements de produit,0
+view,stock.product.location,0,Product Location,Emplacement de produit,0
+view,stock.product.location,0,Product Locations,Emplacements de produit,0
diff --git a/location.py b/location.py
new file mode 100644
index 0000000..58a68e2
--- /dev/null
+++ b/location.py
@@ -0,0 +1,43 @@
+#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
+
+
+class ProductLocation(ModelSQL, ModelView):
+ '''
+ Product Location defines the default storage location
+ by warehouse for a product
+ '''
+ _name = 'stock.product.location'
+ _description = 'Product Location'
+
+ product = fields.Many2One('product.product', 'Product', required=True,
+ select=1)
+ warehouse = fields.Many2One('stock.location', 'Warehouse', required=True,
+ domain=[('type', '=', 'warehouse')])
+ location = fields.Many2One('stock.location', 'Storage Location',
+ required=True, domain="[('type', '=', 'storage'), " \
+ "('parent', 'child_of', warehouse and [warehouse] or [])]")
+ sequence = fields.Integer('Sequence')
+
+ def __init__(self):
+ super(ProductLocation, self).__init__()
+ self._order.insert(0, ('sequence', 'ASC'))
+
+ProductLocation()
+
+
+class PackingIn(ModelSQL, ModelView):
+ _name = 'stock.packing.in'
+
+ def _get_inventory_moves(self, cursor, user, incoming_move, context=None):
+ res = super(PackingIn, self)._get_inventory_moves(cursor, user,
+ incoming_move, context=context)
+ for product_location in incoming_move.product.locations:
+ if product_location.warehouse.id != \
+ incoming_move.packing_in.warehouse.id:
+ continue
+ res['to_location'] = product_location.location.id
+ return res
+
+PackingIn()
diff --git a/location.xml b/location.xml
new file mode 100644
index 0000000..189637c
--- /dev/null
+++ b/location.xml
@@ -0,0 +1,38 @@
+<?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="product_location_view_form">
+ <field name="model">stock.product.location</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <form string="Product Location" cursor="product">
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <label name="product"/>
+ <field name="product"/>
+ <label name="warehouse"/>
+ <field name="warehouse"/>
+ <label name="location"/>
+ <field name="location"/>
+ </form>
+ ]]>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="product_location_view_tree">
+ <field name="model">stock.product.location</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Product Locations">
+ <field name="product" select="1"/>
+ <field name="warehouse" select="2"/>
+ <field name="location" select="2"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/product.py b/product.py
new file mode 100644
index 0000000..89e8afc
--- /dev/null
+++ b/product.py
@@ -0,0 +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 trytond.model import ModelView, ModelSQL, fields
+
+
+class Product(ModelSQL, ModelView):
+ _name = 'product.product'
+
+ locations = fields.One2Many('stock.product.location', 'product',
+ 'Default Locations')
+
+Product()
diff --git a/product.xml b/product.xml
new file mode 100644
index 0000000..9c346c5
--- /dev/null
+++ b/product.xml
@@ -0,0 +1,41 @@
+<?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="product_view_form">
+ <field name="model">product.product</field>
+ <field name="inherit" ref="product.product_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath expr="/form/notebook/page[@id="general"]"
+ position="after">
+ <page string="Default Locations" id="default_locations">
+ <field name="locations" colspan="4">
+ <tree string="Product Locations"
+ sequence="sequence">
+ <field name="warehouse"/>
+ <field name="location"/>
+ <field name="sequence"
+ tree_invisible="1"/>
+ </tree>
+ <form string="Product Location"
+ cursor="warehouse">
+ <label name="sequence"/>
+ <field name="sequence"/>
+ <newline/>
+ <label name="warehouse"/>
+ <field name="warehouse"/>
+ <label name="location"/>
+ <field name="location"/>
+ </form>
+ </field>
+ </page>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </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..b89f06e
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,63 @@
+#!/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', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(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_stock_product_location',
+ 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.stock_product_location': '.'},
+ packages=[
+ 'trytond.modules.stock_product_location',
+ ],
+ package_data={
+ 'trytond.modules.stock_product_location': info.get('xml', []) \
+ + info.get('translation', []) \
+ + ['label.odt'],
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ '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]
+ stock_product_location = trytond.modules.stock_product_location
+ """,
+)
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
new file mode 100644
index 0000000..f792168
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -0,0 +1,27 @@
+Metadata-Version: 1.0
+Name: trytond-stock-product-location
+Version: 1.2.0
+Summary: Define default storage location by warehouse on product.
+Theses locations will be used by the supplier shipment for generating
+inventory moves.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.2/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+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_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
new file mode 100644
index 0000000..99479a3
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -0,0 +1,25 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+location.xml
+product.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./location.py
+./product.py
+doc/index.rst
+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
+trytond_stock_product_location.egg-info/entry_points.txt
+trytond_stock_product_location.egg-info/not-zip-safe
+trytond_stock_product_location.egg-info/requires.txt
+trytond_stock_product_location.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_stock_product_location.egg-info/dependency_links.txt b/trytond_stock_product_location.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_stock_product_location.egg-info/entry_points.txt b/trytond_stock_product_location.egg-info/entry_points.txt
new file mode 100644
index 0000000..6d287c7
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ stock_product_location = trytond.modules.stock_product_location
+
\ No newline at end of file
diff --git a/trytond_stock_product_location.egg-info/not-zip-safe b/trytond_stock_product_location.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
new file mode 100644
index 0000000..f1efd63
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_product
+trytond_stock
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
diff --git a/trytond_stock_product_location.egg-info/top_level.txt b/trytond_stock_product_location.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_stock_product_location.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-stock-product-location
More information about the tryton-debian-vcs
mailing list