Merge lp:~frederic-declercq/openobject-addons/addons-fu into lp:openobject-addons/extra-trunk

[Frédéric (Ferme du Sart)]

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello Frederic: one simple question: what makes you believe those module should be distributed in addons rather than extra-addons? or community-addons? Addons are only for modules that are very centric and highly tested on several installations. Before that, modules should bad distributed in the other channels. Thank you for clarifying. NB: I didn't look at your modules themselves.

[Frédéric (Ferme du Sart) (frederic-declercq)]

Branch says "addons", but the merge proposal says "addons/extra-trunk". I merge this addons in extra-trunk, then I drop this branch (or use it just for sale/stock/purchase/account proposals).

We will have at least 30 modules to give to community. They've been tested in production in La Ferme du Sart since 3 years on Tiny-4.0, but are recoded to be usefull to all community on latest stable version.

We have done a big work. Now we want to send it to community instead of keeping it for us. Some work won't be supported any more (ie: speeking with Mettler-Toledo scales, ZPL printers... because we moved suppliers). If we think that they could be useful, we will put them into community-addons flagged as "beta". OpenERP should work with us to help having quality.

Our v5 main modules should be in production (so well tested) on the first of april. We plan finishing this big work for summer. I propose you to make further tests if you want to try them before us.

A good documentation will also be on line (graphs, screen captures...) because we will need it for our users. I should put our modules roadmap as blueprints. Some will be assumed by ourselves, but we hope community will want to join us.

[Christophe CHAUVET (christophe-chauvet)]

Hi

I've check your proposal, and i see a lot of simple SQL query that can be replace by a browse (or read), You may consider using the osv method instead of SQL Query (if equivalent)

Regards,

review: Needs Fixing

[Sharoon Thomas http://openlabs.co.in (sharoonthomas)]

Hi,

As Christophe pointed out there are lot of SQL queries using cr.execute.

Most of them in osv.osv objects are subject to sql injection. Example:line 148 in the diff

I think you need to change them if this has to be usable.

Refer lp:422563 for further details of how your methods may be exploited

Also refer: http://doc.openerp.com/contribute/developing_modules.html?highlight=sql%20injection#security
(Not sure this is efficient enough though)

review: Needs Fixing

[Frédéric (Ferme du Sart) (frederic-declercq)]

- all cr.commit() removed
- cr.execute(): removed excessive SQL queries

SQL queries remainding in the code looks like not beeing replace (ie: no 'startswith' operator for search method)

NB security:
All user_id in network.material.type should have few acces to database. But this module doesn't have to check if admin can configure its database.

NB - SQL:
To avoid SQL, I used:
     vals['encoding'] = '%s,%s' % (encoding._table_name, encoding.id)
if lp:~frederic-declercq/openobject-server/server-fu-reference_browse is refused, this should be:
     vals['encoding'] = encoding

review: Needs Resubmitting

[Numérigraphe (numerigraphe)]

Requesting review from the community again, because this has been pending for a long time.

Unmerged revisions

4196. By Frédéric (Ferme du Sart) on 2009-12-16

encoding._table to encoding._table_name

4195. By Frédéric (Ferme du Sart) on 2009-12-16

modified:
  product_multibarcode/product.py

- removed all cr.commit()
- replaced cr.execute() with standard methods when possible

4194. By Frédéric (Ferme du Sart) on 2009-12-15

New modules:
- network_interactivity (IP management)
- product_multibarcode (weighted barcode)
- product_structure (categories hierarchical structure)

=== added directory 'network_interactivity'
=== added file 'network_interactivity/__init__.py'
--- network_interactivity/__init__.py	1970-01-01 00:00:00 +0000
+++ network_interactivity/__init__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+import netservice
+import network
+import res
\ No newline at end of file

=== added file 'network_interactivity/__terp__.py'
--- network_interactivity/__terp__.py	1970-01-01 00:00:00 +0000
+++ network_interactivity/__terp__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+{
+    "name" : "Network interactivity",
+    "description" :
+        """
+Adds actions, online/offline, active, availability to network materials
+View only hardware stations. Components are listed inside (both are network.material objects)
+Searching on IP address returns material, not component
+
+New netsvc 'network' connection to log in from IP address returning user linked the material type linked to this IP address
+IP address, and station used in context (res.users context_get() overwrite)
+
+NB: Waiting for merge on lp:~frederic-declercq/openobject-server/server-fu-ip_address to get IP address
+__________________________________________
+=> descriptions & screenshots:
+    http://www.lafermedusart.com/modules/network_interactivity.html
+
+All modules from Fermes Urbaines are put on launchpad when used on production.
+We just offer support to Fermes Urbaines partners.
+Eventhought, all addons are updated as soon as tested.
+""",
+    "version" : "1.0.0",
+    "depends" : [ "base", "network" ],
+    "author" : "Fermes Urbaines",
+    "website" : "http://www.lafermedusart.com/modules/network_interactivity.html",
+    "category" : "Generic Modules/Interfaces",
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [
+         'network_view.xml',
+         ],
+    "active": True,
+    "installable" : True
+}

=== added file 'network_interactivity/netservice.py'
--- network_interactivity/netservice.py	1970-01-01 00:00:00 +0000
+++ network_interactivity/netservice.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import netsvc, sql_db
+
+class network_interface(netsvc.Service):
+
+	def __init__(self,name="network"):
+		netsvc.Service.__init__(self,name)
+		self.joinGroup("web-services")
+		self.exportMethod(self.ip_login)
+		self.exportMethod(self.code39_login)
+
+	def ip_login(self, ip_address, dbname):
+		# IP address is provided by querying. Only DB name required for hardware identified on network.material with user_id set on material type
+		logger = netsvc.Logger()
+		if not (dbname and ip_address): return False
+		ip_ok = True
+		try:
+			for n in map(int,ip_address.split('.')):
+				if n<0 or n>254: ip_ok = False
+		except: ip_ok = False
+		if not ip_ok:
+			logger.notifyChannel("web-service", netsvc.LOG_INFO, 'IP login: %s is not a valid IP address' % ip_address)
+			return False
+		cr= sql_db.db_connect(dbname).cursor()
+		cr.execute("""SELECT u.id, u.password
+			FROM network_material m, network_hardware_type t, res_users u
+			WHERE t.id=m.type AND u.id=t.user_id AND m.ip_addr='%s'""" % ip_address)
+		if not cr.rowcount:
+			logger.notifyChannel("web-service", netsvc.LOG_INFO, 'IP login: Access denied for %s' % ip_address)
+			return False
+		logger.notifyChannel("web-service", netsvc.LOG_INFO, 'IP login: Successful login for %s' % ip_address)
+		uid, password= cr.fetchone()
+		cr.close()
+		return uid, password
+
+network_interface()

=== added file 'network_interactivity/network.py'
--- network_interactivity/network.py	1970-01-01 00:00:00 +0000
+++ network_interactivity/network.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+import time
+
+class network_hardware_type(osv.osv):
+	_name = "network.hardware.type"
+	_inherit = "network.hardware.type"
+
+	_columns = {
+		'user_id': fields.many2one('res.users', 'User', help="This user is the default one used when logging from IP for this kind of hardware. Let empty if not a computer quering OpenERP with a special client interface"),
+	}
+
+network_hardware_type()
+
+class network_network(osv.osv):
+	_name = 'network.network'
+	_inherit = 'network.network'
+
+	_columns = {
+		'active': fields.boolean('Active'),
+	}
+
+	_defaults = {
+		'active': lambda *a: True,
+	}
+
+network_network()
+
+class network_material(osv.osv):
+	_name = "network.material"
+	_inherit = "network.material"
+
+	_columns = {
+		'active': fields.boolean('Active'),
+		'online': fields.boolean('On line'),
+		'available': fields.boolean('Available'),
+		'action_ids': fields.one2many('network.material.action', 'material_id', 'Actions', domain=[('date','>=',time.strftime('%Y-%m-%d 00:00:00'))]),
+		}
+
+	_defaults = {
+		'online': lambda *a: True,
+		'active': lambda *a: True,
+		'available': lambda *a: True,
+		}
+
+	def check_busy(self, cr, uid, ids, context=None):
+		ret = {}
+		if not ids: return ret
+		for i in ids: ret[i] = False
+		cr.execute("SELECT material_id, MIN(id) FROM network_material_action WHERE date_done IS NULL AND material_id IN (%s) GROUP BY 1" % ','.join(map(str,ids)))
+		if cr.rowcount:
+			for r in cr.fetchall(): ret[r[0]] = r[1]
+		avail_ids = [ i for i in ret if not ret[i] ]
+		if avail_ids:
+			self.pool.get('network.material').write(cr, uid, avail_ids, {'available': True})
+		return ret
+
+	def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+		# on IP search, return computers, not components
+		rargs = []
+		for arg in args:
+			if arg[0] == 'ip_addr':
+				component_ids = super(network_material, self).search(cr, uid, [arg], offset=offset, limit=limit, order=order, context=context, count=count)
+				computer_ids = []
+				for material in self.browse(cr, uid, component_ids, context=context):
+					while material.parent_id: material = material.parent_id
+					computer_ids.append( material.id )
+				rargs.append( ('id', 'in', list(set( computer_ids ))) )
+			else: rargs.append( arg )
+		args = rargs
+
+		# view just computers, not components
+		if not 'parent_id' in [arg[0] for arg in args]:
+			args.append( ('parent_id', '=', False) )
+		return super(network_material, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
+
+network_material()
+
+def _action_models_get(obj, cr, uid, context={}):
+	mids = obj.pool.get('ir.model').search(cr, uid, [('model','in', obj._ref_tables)])
+	return [ (r['model'],r['name']) for r in obj.pool.get('ir.model').read(cr, uid, mids, ['model','name'], context=context) ]
+
+class network_material_action(osv.osv):
+	_name = 'network.material.action'
+	_description = 'Actions done on hardware'
+
+	_ref_tables = [ 'pos.order', 'sale.order', 'stock.inventory', 'stock.picking', 'purchase.order', 'account.invoice' ]
+
+	_columns = {
+		'name': fields.char('Action', size=64, required=True),
+		'ref': fields.reference('Reference', selection=_action_models_get, size=128),
+		'material_id': fields.many2one('network.material', 'Material', required=True),
+		'date': fields.datetime('Started at', required=True),
+		'date_done': fields.datetime('Done at'),
+	}
+
+	_order = 'date desc'
+
+	_defaults = {
+		'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+		}
+
+	def unlink(self, cr, uid, ids, context=None):
+		if not ids: return True
+		self.write(cr, uid, ids, {'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
+		mids = [ r['material_id'][0] for r in self.read(cr, uid, ids, ['material_id']) ]
+		self.pool.get('network.material').check_busy(cr, uid, mids, context=context)
+		return True
+
+	def create(self, cr, uid, vals, context=None):
+		if not 'date' in vals: vals['date'] = time.strftime('%Y-%m-%d %H:%M:%S')
+		if not 'name' in vals: vals['name'] = vals['ref']
+		ret = super(network_material_actions, self).create(cr, uid, vals, context=context)
+		self.pool.get('network.material').write(cr, uid, [ vals['material_id'], ], {'available': False})
+		return ret
+
+network_material_action()

=== added file 'network_interactivity/network_view.xml'
--- network_interactivity/network_view.xml	1970-01-01 00:00:00 +0000
+++ network_interactivity/network_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+
+		<record model="ir.ui.view" id="edit_network2">
+			<field name="name">network.material.form</field>
+			<field name="model">network.material</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="network.edit_network"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Elements">
+						<field name="child_id" nolabel="1" colspan="4"/>
+					</page>
+					<page string="Actions">
+						<field name="online" select="1"/>
+						<field name="available" select="1"/>
+						<field name="action_ids" nolabel="1" colspan="4"/>
+					</page>
+				</notebook>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="edit_network3">
+			<field name="name">network.material.form</field>
+			<field name="model">network.material</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="network.edit_network"/>
+			<field name="arch" type="xml">
+				<field name="network_id" position="after">
+					<field name="active" select="1"/>
+				</field>
+			</field>
+		</record>
+
+
+		<record model="ir.ui.view" id="material_view">
+			<field name="name">network.material.tree</field>
+			<field name="model">network.material</field>
+			<field name="priority" eval="1"/>
+			<field name="type">tree</field>
+			<field name="field_parent">child_id</field>
+			<field name="arch" type="xml">
+				<tree string="Network Material">
+					<field name="name"/>
+					<field name="ip_addr"/>
+					<field name="active" />
+					<field name="online"/>
+					<field name="available" />
+				</tree>
+			</field>
+		</record>
+
+
+
+		<record model="ir.ui.view" id="view_hardware_type_form">
+			<field name="name">network.hardware.type.form</field>
+			<field name="model">network.hardware.type</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="network.view_hardware_type_form"/>
+			<field name="arch" type="xml">
+				<field name="networkable" position="after">
+					<field name="user_id" select="1"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+	<data noupdate="1">
+
+		<record forcecreate="True" id="server_type" model="network.hardware.type">
+			<field name="name">Server</field>
+			<field name="networkable">False</field>
+		</record>
+		<record forcecreate="True" id="client_type" model="network.hardware.type">
+			<field name="name">Client computer</field>
+			<field name="networkable">False</field>
+		</record>
+		<record forcecreate="True" id="eth_type" model="network.hardware.type">
+			<field name="name">Ethernet</field>
+			<field name="networkable">True</field>
+		</record>
+		<record forcecreate="True" id="lo_type" model="network.hardware.type">
+			<field name="name">Loopback</field>
+			<field name="networkable">True</field>
+			<field name="user_id">1</field>
+		</record>
+		<record forcecreate="True" id="wifi_type" model="network.hardware.type">
+			<field name="name">WiFi</field>
+			<field name="networkable">True</field>
+		</record>
+
+		<record forcecreate="True" id="localhost" model="network.network">
+			<field name="name">localhost</field>
+			<field name="range">127.0.0</field>
+			<field name="contact_id" ref="base.main_address"/>
+		</record>
+
+		<record forcecreate="True" id="self_server" model="network.material">
+			<field name="name">Main server</field>
+			<field name="user_id">Main server</field>
+			<field name="type" ref="server_type"/>
+		</record>
+		<record forcecreate="True" id="self_server_ip" model="network.material">
+			<field name="name">Main server loopback</field>
+			<field name="ip_addr">127.0.0.1</field>
+			<field name="type" ref="lo_type"/>
+			<field name="network_id" ref="localhost"/>
+			<field name="parent_id" ref="self_server"/>
+		</record>
+
+	</data>
+</openerp>

=== added file 'network_interactivity/res.py'
--- network_interactivity/res.py	1970-01-01 00:00:00 +0000
+++ network_interactivity/res.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+
+class res_users( osv.osv ):
+	_name = 'res.users'
+	_inherit = 'res.users'
+
+	def context_get(self, cr, uid, context=None):
+		ret = super(res_users, self).context_get(cr, uid, context=context)
+		if not (context or {}).get('ip_address', False): return ret
+		ret['ip_address'] = context['ip_address']
+		material_ids = self.pool.get('network.material').search(cr, uid, [('ip_addr','=',context['ip_address'])])
+		if not material_ids: return ret
+		ret['material_id'] = material_ids[0]
+		return ret
+
+res_users()

=== added directory 'product_multibarcode'
=== added file 'product_multibarcode/__init__.py'
--- product_multibarcode/__init__.py	1970-01-01 00:00:00 +0000
+++ product_multibarcode/__init__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+import res
+import product
\ No newline at end of file

=== added file 'product_multibarcode/__terp__.py'
--- product_multibarcode/__terp__.py	1970-01-01 00:00:00 +0000
+++ product_multibarcode/__terp__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+{
+	"name" : "Product ean8 & 13 barcodes with weight",
+	"description" :
+		"""
+- Weight barcode depending on currency (French FRF, Euro...) or weight include in barcode
+- Price calculation
+- Ean automated creation
+- Key calculation
+- Many barcodes depending on packaging (ie: 1 lot of 6 milk packs)
+- ean13 field as a function for compatibility
+- ean13 search on product fields
+- methods to get quantity / price (ie: for use with POS)
+- ean13.ttf encoding
+__________________________________________
+=> descriptions & screenshots:
+	http://www.fermes-urbaines.com/openerp/modules/product_multibarcode.html
+
+All modules from Fermes Urbaines are put on launchpad when used on production.
+We just offer support to Fermes Urbaines partners.
+Eventhought, all addons are updated as soon as tested.
+""",
+	"version" : "1.0.0",
+	"depends" : [ "product_tax_incl" ],
+    "author" : "Fermes Urbaines",
+    "website" : "http://www.fermes-urbaines.com/openerp/modules/product_multibarcode.html",
+    "category" : "Generic Modules/Base",
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [
+		 "res_view.xml",
+		 "product_view.xml"
+        ],
+    "active": True,
+    "installable" : True
+}

=== added file 'product_multibarcode/product.py'
--- product_multibarcode/product.py	1970-01-01 00:00:00 +0000
+++ product_multibarcode/product.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,298 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+import re
+
+# ean.ttf translation tables:
+TTF_EANTABLES=[
+    ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'),
+    ('K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T'),
+    ('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')]
+TTF_EAN6=['000000', '001011', '001101', '001110', '010011', '011001', '011100', '010101', '010110', '011010']
+
+class product_packaging( osv.osv ):
+    _name = "product.packaging"
+    _inherit = "product.packaging"
+
+    # check if unique (weight/price + unit)
+    def _unique_ean(self, cr, uid, ids):
+        for b in self.browse(cr,uid,ids):
+            if b.ean and len(self.search(cr, uid, [('ean','=',b.ean)]))>1: return False
+        return True
+
+    # check EAN syntax
+    def _check_ean(self, cr, uid, ids):
+        for b in self.browse(cr, uid, ids):
+            if b.ean:
+                if re.sub('[0-9]','',b.ean) or (len(b.ean)<7) or (len(b.ean)<12 and not b.encoding):
+                    return False
+        return True
+
+    # ean.ttf translation: use this to write barcode with this font
+    def _ttf(self, cr, uid, ids, name, arg, context=None):
+        ret= {}
+        for b in self.browse(cr, uid, ids):
+            if b.ean:
+                tb=TTF_EAN6[int(b.ean[:1])].replace('A','1').replace('B','2')
+                txt=b.ean[:1]
+                i=1
+                while i<7:
+                    txt+=TTF_EANTABLES[int(tb[i-1:i])][int(b.ean[i:i+1])]
+                    i+=1
+                txt+='*'
+                while i<13:
+                    txt+=TTF_EANTABLES[2][int(b.ean[i:i+1])]
+                    i+=1
+                ret[b.id]=txt+'+'
+            else:
+                ret[b.id]=''
+        return ret
+
+    _columns= {
+        "encoding": fields.reference('Encoding', selection=[('res.currency','Currency'),('product.uom','Unit')], size=128, select=2, help="Weight or price base to encode weight (let empty if product price doesn't depend on weight)"),
+        "ttf": fields.function(_ttf, method=True, type='char', size=20, string='TTF', readonly=True, store=True, help="Encryption to use with ean3.ttf")
+    }
+    _defaults= {
+        "ean": lambda obj,cr,uid,context={}: obj.new_ean( cr, uid, [], encoding=False),
+        }
+    _constraints=  [
+        (_check_ean, 'This barcode is not EAN8 or EAN13', ['ean']),
+        (_unique_ean, 'This barcode is already used', ['ean','product_id','encoding'])
+        ]
+
+    def onchange_encoding(self, cr, uid, ids, encoding):
+        return {'values': {'ean': self.new_ean( cr, uid, ids, encoding=encoding)} }
+
+    # creates an internal barcode (starting with 2) reaching first available, caring if weighted
+    # NB: You have to pay for a GS1 certified barcode if you don't have your own shop or if you plan to sale to other shops
+    def new_ean( self, cr, uid, ids, encoding=False):
+        if encoding:
+            cr.execute("""SELECT e1.ean
+            FROM (SELECT (LPAD(ean,7)::bigint+1)::varchar||'00000' AS ean FROM product_packaging WHERE ean ILIKE '2%%'
+            UNION SELECT '200000000000' AS ean) e1
+            LEFT JOIN product_packaging e2 ON LPAD(e2.ean,7)=LPAD(e1.ean,7)
+            WHERE e2.ean IS NULL
+            ORDER BY 1
+            LIMIT 1""")
+        else:
+            cr.execute("""SELECT e1.ean
+            FROM (SELECT (LPAD(ean,12)::bigint+1)::varchar AS ean FROM product_packaging WHERE ean ILIKE '2%%'
+            UNION SELECT (LPAD(ean,7)::bigint+1)::varchar||'00000' AS ean FROM product_packaging WHERE ean ILIKE '2%%'
+            UNION SELECT '200000000000' AS ean) e1
+            LEFT JOIN product_packaging e2 ON LPAD(e2.ean,12)=e1.ean AND e2.encoding IS NULL
+            LEFT JOIN product_packaging e3 ON LPAD(e3.ean,7)=LPAD(e1.ean,7) AND e3.encoding IS NOT NULL
+            WHERE e2.ean IS NULL AND e3.ean IS NULL
+            ORDER BY 1
+            LIMIT 1""")
+        return self.ean_key(cr, uid, str(cr.fetchone()[0]))
+
+    # builds EAN13 key
+    def ean_key(self, cr, uid, ean):
+        ean= ean[:12]
+        n=0
+        i=0
+        while i<len(ean):
+            n+= int(ean[i:i+1])
+            i+=2
+        i=1
+        while i<len(ean):
+            n+= int(ean[i:i+1])*3
+            i+=2
+        key= 10- (n % 10)
+        if key==10: key=0
+        return ean+str(key)
+
+    # reaches weight encoding (default on res_company) if not set
+    # removes encoding if no decimal unit set (depending on rounding of uos_id / uom_id)
+    # sets key (ignore if allready set)
+    def create(self, cr, uid, vals, context=None):
+        e= vals.get('ean',False)
+        if e:
+            res=self.pool.get("product.product").read(cr, uid, [vals['product_id']], ['name','ean_type'])[0]
+            unit_ean= (str(res['ean_type'])=='unit')
+            if unit_ean: vals['encoding']=False
+            else:
+                e= e[:7]
+                if not vals.get('encoding',False):
+                    # this code has been changed to avoid SQL, but depends on lp:~frederic-declercq/openobject-server/server-fu-reference_browse
+                    encoding = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.ean_encoding
+                    vals['encoding']= '%s,%s' % (encoding._table_name, encoding.id)
+            e+=('0'*(12-len(e)))
+            vals['ean']= self.ean_key(cr, uid, e)
+        return super(product_packaging, self).create(cr, uid, vals, context=context)
+
+    # reaches barcode through unit and weight EANs
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        rargs=[]
+        for arg in args:
+            if arg[0]=='ean':
+                # SQL required because 'startswith' isn't a valid operator
+                cr.execute("SELECT id FROM product_packaging WHERE ean like '%s%%' OR (ean like '%s%%' AND encoding IS NOT NULL)" % (arg[2][:12], arg[2][:7]))
+                if len(args)==1: return [r[0] for r in cr.fetchall()]
+                rargs.append( ('id','in',[r[0] for r in cr.fetchall()]) )
+            else: rargs.append(arg)
+        return super(product_packaging, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
+
+    # function returning product id, name, ean type (price, weight, unit), price, quantity, amount from barcode
+    def ean_data(self, cr, uid, ean, pricelist_id, tax_included=True, partner_id=None, address_id=None, context={}):
+        ret= []
+        ids= self.search(cr, uid, [('ean','=',ean)])
+        if not ids: return ret
+        data_part= int(ean[7:12])
+        for b in self.browse(cr, uid, ids, context=context):
+            if b.encoding:
+                #obj,oid= b.encoding.split(',')
+                #e=self.pool.get(obj).browse(cr,uid,int(str(oid)))
+                r=[]
+                if b.encoding.rate:
+                    # no use to apply lot prices on products with weight: scales can't use OpenERP pricelists
+                    r= {
+                        'id': b.product_id.id,
+                        'name': b.product_id.name,
+                        'type': 'price',
+                        'uom_id': b.product_id.uom_id.id,
+                        'amount': round(0.01*data_part/b.encoding.rate, 2),
+                        'quantity': round( (0.01*data_part/b.encoding.rate) /b.product_id.list_price_tax_incl, 3 ) }
+                    r['price']= self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], b.product_id.id, r['quantity'], partner_id, context=context)[pricelist_id]
+                else:
+                    r= {
+                        'id': b.product_id.id,
+                        'name': b.product_id.name,
+                        'type': 'weight',
+                        'uom_id': b.product_id.uom_id.id,
+                        'quantity': round(1.0*data_part/b.encoding.factor, b.encoding.rounding) }
+                    r['price']= self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], b.product_id.id, r['quantity'], partner_id, context=context)[pricelist_id]
+                    r['amount']= r['price']*r['quantity']
+            else:
+                pptype = self.pool.get('product.pricelist').read(cr, uid, [pricelist_id], ['type'])[0]['type']
+                uom= (pptype=='purchase') and b.product_id.uom_po_id.id or ((b.product_id.uos_id) and b.product_id.uos_id.id or b.product_id.uom_id.id)
+                pkg_qty= b.qty*b.ul_qty*b.rows
+                r= {
+                    'id': b.product_id.id,
+                    'name': b.product_id.name,
+                    'type': 'unit',
+                    'uom_id': b.product_id.uom_id.id,
+                    'quantity': (b.product_id.uom_id.id==uom) \
+                        and pkg_qty or \
+                        self.pool.get('product.uom')._compute_qty(cr, uid, uom, pkg_qty, b.product_id.uom_id.id),
+                    'price': self.pool.get('product.pricelist').price_get(cr, uid, [pricelist_id], b.product_id.id, 1.0, partner_id, context=context)[pricelist_id] }
+                r['amount']= r['price']
+            if tax_included:
+                taxes_id = self.pool.get('product.product').read(cr, uid, [r['id']],['taxes_id'])[0]['taxes_id']
+                taxes= self.pool.get( 'account.tax' ).browse(cr, uid, taxes_id, context=context)
+                taxes= self.pool.get( 'account.tax' ).compute( cr, uid, taxes, r['price'], r['quantity'], address_id, r['id'], partner_id )
+                r['price'] += sum([t['amount'] for t in taxes])
+                if r['type']!='price':
+                    # on amount written into barcode, we have to respect amount
+                    r['amount']= r['price']*r['quantity']
+            ret.append(r)
+        return ret
+
+product_packaging()
+
+class product_product( osv.osv ):
+    _name= "product.product"
+    _inherit= "product.product"
+
+    # check if unit or weight depending on uos / uom rounding
+    def _ean_type( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        if not ids: return ret
+        for prod in self.browse(cr, uid, ids, context=context):
+            uom = prod.uos_id or prod.uom_id
+            ret[prod.id] = (uom.rounding == int(uom.rounding)) and 'unit' or 'price'
+        return ret
+
+    # old ean13 field becomes a function returning the first ean
+    def _ean13( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for b in self.browse(cr, uid, ids):
+            ret[b.id]=(b.packaging) and b.packaging[0].ean or False
+        return ret
+
+    _columns = {
+        "ean13": fields.function(_ean13, method=True, type='char', size=20, string='EAN13', readonly=True, store=False),
+        "ean_type": fields.function(_ean_type, method=True, type='selection', selection=[('unit','Unit'),('price','Price')], string='EAN type', readonly=True),
+    }
+
+    # reaches any barcode from name field
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        rargs=[]
+        for arg in args:
+            if (arg[0]=='name') and not re.sub('[0-9]','',arg[2]):
+                # SQL required because 'startswith' isn't recognized as operator
+                cr.execute("SELECT product_id FROM product_packaging WHERE ean like '%s%%' OR (ean like '%s%%' AND encoding IS NOT NULL) GROUP BY 1" % (arg[2][:12], arg[2][:7]))
+                if len(args)==1: return [r[0] for r in cr.fetchall()]
+                rargs.append( ('id','in',[r[0] for r in cr.fetchall()]) )
+            else: rargs.append(arg)
+        return super(product_product, self).search(cr, uid, rargs, offset=offset, limit=limit, order=order, context=context, count=count)
+
+    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        if name:
+            ids = self.search(cr, user, [('default_code','=',name)]+ args, limit=limit, context=context)
+            if not len(ids):
+                    ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context)
+                    ids += self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, user, args, limit=limit, context=context)
+        result = self.name_get(cr, user, ids, context)
+        return result
+
+    # if no barcode set on create, it creates one (if sale_ok)
+    def create( self , cr, uid, vals, context={} ):
+        if vals.get('sale_ok',False) and not vals.get('packaging',[]):
+            uom_rounding = self.pool.get('product.uom').read(cr, uid, [vals.get('uos_id',False) or vals.get('uom_id',False)], ['rounding'])[0]['rounding']
+            ean_unit = uom_rounding == int(uom_rounding)
+            ean= self.pool.get('product.packaging').new_ean(cr,uid,[], ean_unit)
+            ul = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.ul.id
+            vals['packaging']=[(0,0,{'rows':1, 'sequence': 1, 'ean': ean, 'ul': ul, 'qty': 1, 'ul_qty': 1})]
+        ret= super( product_product, self ).create(cr,uid,vals, context=context )
+        return ret
+
+    # on obsolete, drops all eans for this product
+    # on uos / uom change if ean type changed, checks eans and corrects if required
+    def write( self , cr, uid, ids, vals, context={} ):
+        if vals.get('state','draft')=='obsolete':
+            ret= super( product_product, self ).write( cr, uid, ids, vals, context=context )
+            pp_ids = self.pool.get('product.packaging').search(cr, uid, [('product_id','in',ids)], context=context)
+            self.pool.get('product.packaging').unlink(cr, uid, ppids, context=context)
+            return ret
+        types= {}
+        for b in self.browse(cr, uid, ids):
+            types[b.id]= b.ean_type
+        ean_alert= False
+        for n in vals.get('packaging',[]):
+            if n[0] and n[2].get('ean',False): ean_alert=True
+        if ean_alert:
+            if 'packaging' in vals:
+                super( product_product, self ).write( cr,uid,ids,{'packaging':vals['packaging']}, context=context )
+                del vals['packaging']
+            for r in self.browse(cr, uid, ids,context=context):
+                if not r.packaging:
+                    uom = r.uos_id or r.uom_id
+                    uom_rounding = uom.rounding==int(uom.rounding)
+                    ean= self.pool.get('product.packaging').new_ean(cr,uid,[], uom_rounding)
+                    ul = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.ul.id
+                    cr.execute("""SELECT seq
+                    FROM (SELECT 1 AS seq, %d AS product_id UNION SELECT sequence+1 AS seq, product_id FROM product_packaging WHERE product_id=%d) s
+                    LEFT JOIN product_packaging p ON p.sequence=s.seq AND p.product_id=s.product_id
+                    WHERE p.sequence IS NULL
+                    ORDER BY 1 DESC LIMIT 1""" % (r.id,r.id))
+                    seq= cr.fetchone()[0]
+                    v = {'packaging': [(0,0,{'rows':1, 'sequence': seq, 'ean': ean, 'ul': ul, 'qty': 1, 'ul_qty': 1})] }
+                    super( product_product, self ).write( cr,uid,r.id, v, context=context )
+        ret= super( product_product, self ).write( cr,uid,ids,vals, context=context )
+        return ret
+
+    # on delete, drops all eans for this product
+    # for security, sets ean13 to null too
+    def unlink( self, cr, uid, ids, context={} ):
+        pp_ids = self.pool.get('product.packaging').search(cr, uid, [('product_id', 'in', ids)])
+        self.pool.get('product.packaging').unlink(cr, uid, pp_ids, context=context)
+        return super( product_product, self ).unlink(cr, uid, ids, context=context)
+
+product_product()

=== added file 'product_multibarcode/product_view.xml'
--- product_multibarcode/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_multibarcode/product_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="product_normal_form_view" model="ir.ui.view">
+			<field name="name">product.normal.form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="packaging" position="replace">
+						<label string="" colspan="2"/>
+						<field name="ean_type" colspan="2" readonly="1"/>
+						<field colspan="4" name="packaging" nolabel="1">
+							<form string="Packaging">
+								<field name="ean" select="1"/>
+								<field name="ttf"/>
+								<newline/>
+								<field name="sequence"/>
+								<field name="encoding" on_change="onchange_encoding(encoding)"/>
+								<newline/>
+								<field name="qty" select="1"/>
+								<field name="ul"/>
+								<field name="weight_ul"/>
+								<separator colspan="4" string="Palletization"/>
+								<field name="ul_qty"/>
+								<field name="rows"/>
+								<field name="weight"/>
+								<separator colspan="4" string="Pallet Dimension"/>
+								<field name="height"/>
+								<field name="width"/>
+								<field name="length"/>
+								<separator colspan="4" string="Other Info"/>
+								<field colspan="4" name="name" select="1"/>
+							</form>
+						</field>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'product_multibarcode/res.py'
--- product_multibarcode/res.py	1970-01-01 00:00:00 +0000
+++ product_multibarcode/res.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+
+class res_company( osv.osv ):
+	_name= "res.company"
+	_inherit= "res.company"
+	_columns= {
+		# default object to base method for encoding weighted barcodes
+		# if currency:	0.01 * rate * [ EAN data ]
+		# if unit:		factor * [ EAN data ]
+		"ean_encoding": fields.reference('EAN weight', selection=[('res.currency','Currency'),('product.uom','Unit')], size=128, required=True, help="Default base for EAN13 weight encoding"),
+		'ul' : fields.many2one('product.ul', 'Type of Package', required=True, help="Shipping unit returning the product unit of measure (default, purchase or sale) set on product"),
+		}
+res_company()

=== added file 'product_multibarcode/res_view.xml'
--- product_multibarcode/res_view.xml	1970-01-01 00:00:00 +0000
+++ product_multibarcode/res_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="view_company_form" model="ir.ui.view">
+			<field name="name">res.company.form</field>
+			<field name="model">res.company</field>
+			<field name="inherit_id" ref="base.view_company_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<page string="Configuration" position="inside">
+					<separator colspan="4" string="Barcodes"/>
+					<field name="ean_encoding"/>
+					<field name="ul"/>
+				</page>
+			</field>
+		</record>
+
+	</data>
+</openerp>
+

=== added directory 'product_structure'
=== added file 'product_structure/__init__.py'
--- product_structure/__init__.py	1970-01-01 00:00:00 +0000
+++ product_structure/__init__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+import product
+import purchase
+import res
\ No newline at end of file

=== added file 'product_structure/__terp__.py'
--- product_structure/__terp__.py	1970-01-01 00:00:00 +0000
+++ product_structure/__terp__.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+{
+	"name" : "Product structure",
+	"description" :
+		"""
+Adds typed multi levels human readable structure on product categories
+
+Defaults values for products depending on categories & children:
+- tax
+- payment term
+- email
+- product manager
+
+Adds also:
+- product categories on partners
+- product category on purchase orders with search on category & supplier for products
+- products list on partner from supplierinfo
+- partners on supplierinfo found as suppliers even if not set
+__________________________________________
+=> descriptions & screenshots:
+	http://www.lafermedusart.com/modules/product_structure.html
+
+All modules from Fermes Urbaines are put on launchpad when used on production.
+We just offer support to Fermes Urbaines partners.
+Eventhought, all addons are updated as soon as tested.
+""",
+	"version" : "1.0.0",
+	"depends" : [ "purchase" ],
+    "author" : "Fermes Urbaines",
+    "website" : "http://www.lafermedusart.com/modules/product_structure.html",
+    "category" : "Generic Modules/Base",
+    "init_xml" : [ ],
+    "demo_xml" : [ ],
+    "update_xml" : [
+		 "product_view.xml",
+		 "purchase_view.xml",
+		 "res_view.xml"
+        ],
+    "active": True,
+    "installable" : True
+}

=== added file 'product_structure/alt_osv.py'
--- product_structure/alt_osv.py	1970-01-01 00:00:00 +0000
+++ product_structure/alt_osv.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+from osv import osv
+
+class alt_osv(osv.osv):
+	"""Proposal for an extension on osv.osv:
+
+All fields in _recursive list have recursion value. To avoid recursion (ie to configure), you can set {'recursion': False} in context.
+Recursion can be done if special field 'parent_id' is on recursion model."""
+
+	_recursive = []
+
+	def read(self, cr, uid, ids, field_names=None, context=None, load='_classic_read'):
+		"""Browse() depends on read(). Changing read() changes browse()."""
+
+		columns = self._columns.keys() + self._inherit_fields.keys()
+		if (not 'parent_id' in columns) or (not self._recursive):
+			return super(alt_osv, self).read(cr, uid, ids, fields=field_names, context=context, load=load)
+
+		if not context: context = {}
+		delparent = False
+		if field_names and not 'parent_id' in field_names:
+			field_names.append( 'parent_id' )
+			delparent = True
+		data = super(alt_osv, self).read(cr, uid, ids, fields=field_names, context=context, load=load)
+		if (not data) or not context.get('recursion', True):
+			if delparent:
+				for d in data: del d['parent_id']
+			return data
+
+		if not field_names:
+			field_names = [ f for f in data[0] if f!='id' ]
+		recursive = [ f for f in self._recursive if f in field_names ]
+		explore = {}
+		for d in data:
+			if d['parent_id']:
+				parent_id = (type(d['parent_id']) in (int,long)) and d['parent_id'] or d['parent_id'][0]
+				explore[d['id']] = (parent_id, [ f for f in recursive if not d[f] ])
+				if not explore[d['id']][1]: del explore[d['id']]
+		if explore:
+			exp = {}
+			for data_id in explore:
+				exp[data_id] = self.read(cr, uid, [explore[data_id][0]], explore[data_id][1], context=context, load=load)[0]
+				del exp[data_id]['id']
+				if 'parent_id' in exp[data_id]: del exp[data_id]['parent_id']
+			for d in data:
+				if d['id'] in exp:
+					print exp[ d['id'] ]
+					d.update( exp[ d['id'] ] )
+				if delparent: del d['parent_id']
+		return data

=== added file 'product_structure/product.py'
--- product_structure/product.py	1970-01-01 00:00:00 +0000
+++ product_structure/product.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,366 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+import alt_osv
+from tools.translate import _
+
+
+
+PRODUCT_TYPES = [
+    ('product', _('Stockable Product')),
+    ('consu', _('Consumable')),
+    ('service', _('Service')),
+    ('fee', _('Fee')),
+    ('recurrent', _('Recurrent')),
+    ('recordable', _('Recordable Product')),
+    ('hr', _('HR')) ]
+
+def categ_manager(categ):
+    """Manager for a category (recursive function)
+IN: browse on product.category
+OUT: res.users id"""
+    return (categ.user_id) and categ.user_id.id or (categ.parent_id) and categ_manager(categ.parent_id) or False
+
+def manager_categories(categ):
+    """Categories for a manager
+IN: browse on product.category
+OUT: product.category list of ids"""
+    category_ids= [ categ.id ]
+    if categ.child_id:
+        for c in categ.child_id:
+            category_ids.extend( manager_categories(c) )
+    return category_ids
+
+def type_categories(categ):
+    """Children categories until type change
+IN: browse on product.category
+OUT: product.category list of ids"""
+    category_ids= [ categ.id ]
+    for c in categ.child_id:
+        if not c.type_id:
+            category_ids.extend( type_categories(c) )
+    return category_ids
+
+
+
+class product_category_type(osv.osv):
+    """Hierarchy levels on categories.
+Assign one category type to a category, then all its children will have level type hierarchy depending on this category type, until hierarchy replaced by another hierarchy level type"""
+    _name = "product.category.type"
+    _description = "Product Category Type"
+
+    def _child_id( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for i in ids:
+            ct= self.search( cr, uid, [('parent_id','=',i)] )
+            ret[i]= (ct) and ct[0] or i
+        return ret
+
+    _columns= {
+        "name": fields.char("Name", required=True, size=64),
+        "allow_products": fields.boolean("Product category", help="If not checked, all categories of this level won't be proposed to create products"),
+        "parent_id": fields.many2one('product.category.type','Parent'),
+        'child_id': fields.function(_child_id, method=True, type='many2one', relation='product.category.type', obj='product.category.type', string='Child Type', readonly=True),
+        }
+    _defaults= {
+        "allow_products": lambda *a: False,
+        }
+    _sql_constraints=  [ ('unique_parent_id','unique (parent_id)','This parent is already used') ]
+
+product_category_type()
+
+
+class product_category(alt_osv.alt_osv):
+    _name = "product.category"
+    _inherit = "product.category"
+
+    def _type( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for b in self.browse(cr, uid, ids, context={'recursion':False}):
+            c= b
+            n=0
+            while c.parent_id and not c.type_id:
+                c=c.parent_id
+                n+=1
+            if c.type_id:
+                d=c.type_id
+                while n>0:
+                    d=d.child_id
+                    n=n-1
+                ret[b.id]= d.id
+            else: ret[b.id]= False
+        return ret
+
+    def _allow_products( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for b in self.browse(cr, uid, ids, context={'recursion':False}):
+            ret[b.id]= (b.relate_type_id) and b.relate_type_id.allow_products or False
+        return ret
+
+    def _parent_node( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for b in self.browse(cr, uid, ids, context={'recursion':False}):
+            c = b
+            while c.parent_id and not c.type_id: c=c.parent_id
+            ret[b.id] = c.id
+        return ret
+
+    def _partner_ids( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        product_children = self.get_product_children(cr, uid, ids, context=context)
+        for cid in product_children:
+            if not product_children[cid]:
+                ret[cid] = []
+                continue
+            cr.execute("""SELECT s.name
+            FROM product_supplierinfo s, product_template t, product_product p
+            WHERE t.id=s.product_id AND p.product_tmpl_id=t.id AND p.active AND t.state not in ('obsolete','end') AND t.categ_id IN (%s)
+            GROUP BY 1""" % ','.join(map(str, product_children[cid])))
+            ret[cid]= (cr.rowcount) and [ r[0] for r in cr.fetchall() ] or []
+        return ret
+
+    def get_product_children(self, cr, uid, ids, context = None):
+        """Returns children categories in the same hierarchy that allows product.
+Add {'browse': True} in context, if you want browse objects instead of a list of ids"""
+        product_children = {}
+        res_browse = (context or {}).get('browse', False)
+        ctx = (context or {}).copy()
+        ctx.update({'recursion':False})
+        for b in self.browse(cr, uid, ids, context=ctx):
+            prods = []
+            a = [ b ]
+            while a:
+                r = []
+                for c in a:
+                    if c.type_id and c.id!=b.id: break
+                    if c.allow_products: prods.append((res_browse) and c or c.id)
+                    r.extend( c.child_id )
+                a = r+[]
+            product_children[b.id] = prods
+        return product_children
+
+    _recursive = ['email','type_id','qty_alert_min','qty_alert_max','user_id','auto_picking','term_id','taxes_id','supplier_taxes_id','product_type']
+
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True, help="To reach a category, you can start with part of category type then ':'. You can also put '+' before a part of name to reach in parent categories. NB: searching products from category returns all children from categories found. ie: 've:ui++pa' returns categories (children on products search) with type containing 've', name containing 'ui', and parent name 2 levels over containing 'pa'"),
+        "email": fields.char('Email', size=128, help="Public email to contact someone responsible"),
+        "type_id": fields.many2one('product.category.type', 'Type', domain=[('parent_id','=',False)], help="If not empty, breaks hierarchy (accounting products may not have the same hierarchy as goods)"),
+        'qty_alert_min': fields.integer('Qty alert (min)'),
+        'qty_alert_max': fields.integer('Qty alert (max)'),
+        "user_id": fields.many2one('res.users','Manager'),
+        "auto_picking": fields.boolean("No remainder"),
+        "parent_node_id": fields.function(_parent_node, method=True, type='many2one', relation='product.category', obj='product.category', string='Type node', readonly=True, select=1),
+        "relate_type_id": fields.function(_type, method=True, type='many2one', relation='product.category.type', obj='product.category.type', string='Type (related)', readonly=True, select=1),
+        "allow_products": fields.function(_allow_products, method=True, type='boolean', string="Product category", readonly=True, select=1),
+        "partner_ids": fields.function(_partner_ids, method=True, type='one2many', relation='res.partner', string='Suppliers', select=1, readonly=True, help='Suppliers saling products from this category'),
+        "term_id": fields.many2one('account.payment.term','Payment term'),
+        'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
+            'prod_id', 'tax_id', 'Customer Taxes',
+            domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])], help="Taxes by default on products from this category"),
+        'supplier_taxes_id': fields.many2many('account.tax',
+            'product_supplier_taxes_rel', 'prod_id', 'tax_id',
+            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])], help="Supplier taxes by default on products from this category"),
+        'product_type': fields.selection(PRODUCT_TYPES, 'Product Type',
+            help="Will change default on products for the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
+    }
+
+    def name_get(self, cr, uid, ids, context=None):
+        """Return hierarchy path from the first type node"""
+        ret = []
+        for b in self.browse(cr, uid, ids, context=context):
+            txts= []
+            a=b
+            while a.parent_id and not a.type_id:
+                a= a.parent_id
+                txts.append( a.name )
+            txts.reverse()
+            txt= ('»').decode('utf-8').join(txts)
+            txt= (txt) and b.name+' ('+txt+')' or b.name
+            ret.append( (b.id, txt) )
+        return ret
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        """Allows searching on function fields: user_id, relate_type_id, allow_products
+Allows expressions on searching category in hierarchy as PART-OF-TYPE:PART-OF-NAME+PART-OF-PARENT-NAME+..."""
+        rgs= []
+        for arg in args:
+            tids= []
+
+            if arg[0]=='user_id':
+                ids= self.search(cr, uid, [('user_id',arg[1],arg[2])], offset=offset, limit=limit, order=order, context=context, count=count)
+                if ids:
+                    categ_ids= []
+                    for b in self.browse(cr, uid, ids):
+                        categ_ids.extend( manager_categories(b) )
+                    rgs.append( ('id','in', categ_ids ) )
+                else: return []
+
+            elif arg[0]=='relate_type_id':
+                if type(arg[2]) in (int, long): tids= [arg[2]]
+                elif arg[1]=='in': tids= arg[2][0]
+                elif type(arg[2]) in (tuple, list): tids= [arg[2][0]]
+                else:
+                    tids= self.pool.get('product.category.type').search(cr, uid, [('name',arg[1],arg[2])], context=context)
+
+            elif arg[0]=='allow_products':
+                tids= self.pool.get('product.category.type').search(cr, uid, [ arg ], context=context)
+
+            elif arg[0]=='name':
+                nam= arg[2]
+                v= [a.strip() for a in arg[2].split(':')][:2]
+                if len(v)==2:
+                    typ, nam= v
+                    args.append( ('relate_type_id', arg[1], typ) )
+                criterias= [a.strip() for a in nam.split('+')]
+                criteria= criterias.pop(0)
+                if criteria: rgs.append( ('name', arg[1], criteria) )
+                if criterias:
+                    criteria= criterias.pop(0)
+                    if criteria: rgs.append( ('parent_id', arg[1], criteria) )
+                n=1
+                while criterias:
+                    criteria= criterias.pop(0)
+                    if criteria:
+                        ids= super(product_category, self).search(cr, uid, [ ('parent_id', arg[1], criteria) ], context=context)
+                        cids= []
+                        m=0
+                        while m<n:
+                            if not cids: cids= ids
+                            cids= super(product_category, self).search(cr, uid, [ ('parent_id', 'in', cids) ], context=context)
+                            m = (cids) and m+1 or n
+                        if not cids: return cids
+                        rgs.append( ('id', 'in', cids) )
+                    n+=1
+
+            else: rgs.append(arg)
+
+            if tids:
+                reftypes= {}
+                for t in self.pool.get('product.category.type').browse(cr, uid, tids, context=context):
+                    a= t
+                    n= 0
+                    while a.parent_id:
+                        a = a.parent_id
+                        n+=1
+                    if not a.id in reftypes: reftypes[a.id]= {}
+                    reftypes[a.id][t.id]= (n, t.child_id.id==t.id)
+                cids= super(product_category, self).search(cr, uid, [('type_id','in',reftypes.keys())], context=context)
+                categ_ids= []
+                for b in self.browse(cr, uid, cids, context=context):
+                    for tid in reftypes[b.type_id.id]:
+                        n= 0
+                        c=[b]
+                        while n<reftypes[b.type_id.id][tid][0]:
+                            t= []
+                            for a in c: t.extend(a.child_id)
+                            c= t
+                            n+=1
+                        if reftypes[b.type_id.id][tid][1]:
+                            for t in c: categ_ids.extend( type_categories(t) )
+                        else: categ_ids.extend( [t.id for t in c ] )
+                rgs.append( ('id','in', categ_ids ) )
+
+        return super(product_category, self).search(cr, uid, rgs, offset=offset, limit=limit, order=order, context=context, count=count)
+
+product_category()
+
+
+
+class product_template( osv.osv ):
+    _name = "product.template"
+    _inherit = "product.template"
+
+    def _product_manager( self, cr, uid, ids, name, args, context={} ):
+        ret = {}
+        for b in self.browse(cr, uid, ids):
+            ret[b.id]=b.categ_id.user_id.id
+        return ret
+
+    # On change categ_id, inherits default values from category
+    # Right side argument, is category field name if different from product field name
+    _inherit_defaults = {
+        'categ_id': [
+            ('product_manager', 'user_id'),
+            ('qty_alert_min',),
+            ('qty_alert_max',),
+            ('taxes_id',),
+            ('supplier_taxes_id',),
+            ('type', 'product_type') ],
+        }
+
+    _columns= {
+        "product_manager": fields.function(_product_manager, method=True, type='many2one', relation='res.users', string='Categ manager', select=1, readonly=True),
+        'categ_id': fields.many2one('product.category','Category', domain=[('allow_products','=',True)], required=True, change_default=True, help="To reach a category, you can start with part of category type then ':'. You can also put '+' before a part of name to reach in parent categories. NB: searching products from category returns all children from categories found. ie: 've:ui++pa' returns categories (children on products search) with type containing 've', name containing 'ui', and parent name 2 levels over containing 'pa'"),
+        'qty_alert_min': fields.float('Qty alert (min)', digits=(16, 3)),
+        'qty_alert_max': fields.float('Qty alert (max)', digits=(16, 3)),
+        'type': fields.selection(PRODUCT_TYPES, 'Product Type', required=True,
+            help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
+    }
+
+    def onchange_categ_id(self, cr, uid, ids, ref_id, context=None):
+        ret = {'value': {} }
+#        for f in self._inherit_defaults:
+#            if isinstance(self._columns[f[0]], fields.one2many) or isinstance(self._columns[f[0]], fields.many2many):
+#                ret['value'][f[0]] = []
+        if not ref_id: return ret
+        obj = self._columns['categ_id']._obj
+        res = self.pool.get(obj).browse(cr, uid, ref_id, context=context)
+        for f in self._inherit_defaults['categ_id']:
+            val = eval("res."+((len(f)==1) and f[0] or f[1]))
+            if isinstance(val, osv.orm.browse_null):
+                ret['value'][f[0]] = False
+                continue
+            if isinstance(self._columns[f[0]], fields.one2many) or isinstance(self._columns[f[0]], fields.many2many):
+                ret['value'][f[0]] = [v.id for v in val]
+            elif isinstance(self._columns[f[0]], fields.many2one):
+                ret['value'][f[0]] = val.id
+            else:
+                ret['value'][f[0]] = val
+        return ret
+
+product_template()
+
+
+
+def compare_suppliers(a,b):
+    if not a[2]: return 1
+    if not b[2]: return -1
+    if not a[2]['action']=='none': return 1
+    if not a[2]['action']=='create': return -1
+    return (b[2]['action']=='create') and 1 or -1
+
+class product_product( osv.osv ):
+    _name = "product.product"
+    _inherit = "product.product"
+
+    def onchange_categ_id(self, cr, uid, ids, categ_id):
+        if not ids: return self.pool.get('product.template').onchange_categ_id(cr, uid, [], categ_id)
+        pids = [prod['product_tmpl_id'][0] for prod in self.read(cr, uid, ids, ['product_tmpl_id'])]
+        return self.pool.get('product.template').onchange_categ_id(cr, uid, pids, categ_id)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        rargs=[]
+        for arg in args:
+            cids=[]
+            if arg[0]=='categ_id':
+                if type(arg[2]) in (int, long): cids= [arg[2]]
+                elif arg[1]=='in': cids= arg[2]
+                elif type(arg[2]) in (list, tuple): cids= [arg[2][0]]
+                else:
+                    cids= self.pool.get("product.category").search(cr,uid,[('name',arg[1],arg[2])])
+
+                # LIGNES À RETIRER (conservées par acquis de conscience):
+                #for b in self.pool.get("product.category").browse(cr, uid, cat_ids, context=context):
+                    #cids.extend( manager_categories(b) )
+
+            if arg[0]=='product_manager':
+                cids= self.pool.get("product.category").search(cr,uid,[('user_id',arg[1], arg[2])])
+
+            if cids:
+                rargs.append( ('categ_id','in',cids) )
+            elif arg[0] in ('categ_id', 'product_manager'): return []
+
+            if not (arg[0] in ('categ_id','product_manager') or (arg[0]=='seller_ids' and type(arg[2]) in (int,long))): rargs.append(arg)
+        return super(product_product, self).search(cr, uid,rargs, offset=offset, limit=limit, order=order, context=context, count=count)
+
+product_product()

=== added file 'product_structure/product_view.xml'
--- product_structure/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_structure/product_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,145 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="product_category_type_form_view" model="ir.ui.view">
+			<field name="name">product.category.type.form</field>
+			<field name="model">product.category.type</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Category type">
+					<field name="name"/>
+					<field name="allow_products"/>
+					<field name="parent_id"/>
+					<field name="child_id"/>
+				</form>
+			</field>
+		</record>
+
+		<record id="product_category_type_tree_view" model="ir.ui.view">
+			<field name="name">product.category.type.tree</field>
+			<field name="model">product.category.type</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Category type">
+					<field name="parent_id"/>
+					<field name="name"/>
+					<field name="child_id"/>
+				</tree>
+			</field>
+		</record>
+
+		<record id="product_category_type_action" model="ir.actions.act_window">
+			<field name="name">Category types</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">product.category.type</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="product_category_type_tree_view"/>
+		</record>
+
+		<menuitem action="product_category_type_action" id="menu_product_category_type" parent="product.menu_config_product" groups="product.group_product_manager"/>
+
+		<record id="product_category_list_view2" model="ir.ui.view">
+			<field name="name">product.category.list</field>
+			<field name="model">product.category</field>
+			<field name="type">tree</field>
+			<field name="priority">0</field>
+			<field name="arch" type="xml">
+				<tree string="Product Categories">
+					<field name="name"/>
+					<field name="parent_node_id"/>
+					<field name="allow_products"/>
+					<field name="parent_id"/>
+				</tree>
+			</field>
+		</record>
+
+		<record id="product.product_category_action_form" model="ir.actions.act_window">
+			<field name="name">Products Categories</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">product.category</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="product_category_list_view2"/>
+		</record>
+
+		<record id="product_category_form_view1" model="ir.ui.view">
+			<field name="name">product.category.form</field>
+			<field name="model">product.category</field>
+			<field name="inherit_id" ref="product.product_category_form_view"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="sequence" position="after">
+					<field name="parent_node_id"/>
+					<separator colspan="4" string="Products configuration"/>
+					<group colspan="2" col="3">
+						<field name="type_id"/>
+						<field name="user_id"/>
+						<field name="email"/>
+						<field name="term_id"/>
+					</group>
+					<group colspan="2" col="3">
+						<field name="parent_node_id" colspan="3"/>
+						<field name="qty_alert_min" string="Qty alert (min/max)"/>
+						<field name="qty_alert_max" nolabel="1"/>
+						<field name="allow_products"/>
+						<label string=" " colspan="1"/>
+					</group>
+					<separator colspan="2" string="Supply taxes (default for products)"/>
+					<separator colspan="2" string="Sale taxes (default for products)"/>
+					<field name="supplier_taxes_id" nolabel="1" colspan="2"/>
+					<field name="taxes_id" nolabel="1" colspan="2"/>
+					<field name="partner_ids" colspan="4" nolabel="1"/>
+				</field>
+			</field>
+		</record>
+
+		<record id="product.product_category_action_form" model="ir.actions.act_window">
+			<field name="name">Products Categories</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">product.category</field>
+			<field name="context">{'recursion':False}</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="product.product_category_list_view"/>
+		</record>
+
+		<record id="product_normal_form_view1" model="ir.ui.view">
+			<field name="name">product.normal.form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="categ_id" position="replace">
+					<field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
+				</field>
+			</field>
+		</record>
+
+		<record id="product_normal_form_view2" model="ir.ui.view">
+			<field name="name">product.normal.form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="product.product_normal_form_view"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="product_manager" position="replace">
+					<group colspan="2" col="3">
+						<field name="qty_alert_min" string="Qty alert (min/max)"/>
+						<field name="qty_alert_max" nolabel="1"/>
+					</group>
+				</field>
+			</field>
+		</record>
+
+		<record id="product_normal_form_view3" model="ir.ui.view">
+			<field name="name">product.normal.form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="stock.view_normal_stock_property_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="virtual_available" position="after">
+					<field name="product_manager"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'product_structure/purchase.py'
--- product_structure/purchase.py	1970-01-01 00:00:00 +0000
+++ product_structure/purchase.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+
+
+
+class purchase_order(osv.osv):
+	_name = 'purchase.order'
+	_inherit = 'purchase.order'
+
+	_columns= {
+			'categ_id': fields.many2one('product.category','Category', change_default=True),
+		}
+
+	def onchange_partner_id(self, cr, uid, ids, partner_id):
+		ret = super( purchase_order, self ).onchange_partner_id(cr, uid, ids, partner_id)
+		if not partner_id: return ret
+
+		categs = self.pool.get("res.partner").read(cr, uid, [ partner_id ], ['categ_ids'])
+		if not categs: return ret
+
+		ret['domain'] = ret.get('domain', {})
+		ret['domain']['categ_id']= [('id', 'in', categs[0]['categ_ids'])]
+		if len(categs[0]['categ_ids']) == 1: ret['value']['categ_id'] = categs[0]['categ_ids'][0]
+		return ret
+
+purchase_order()

=== added file 'product_structure/purchase_view.xml'
--- product_structure/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ product_structure/purchase_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="purchase_order_form" model="ir.ui.view">
+			<field name="name">purchase.order.form</field>
+			<field name="model">purchase.order</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="purchase.purchase_order_form"/>
+			<field name="arch" type="xml">
+				<field name="shipped" position="after">
+					<field name="categ_id" on_change="categ_id_change(categ_id,context)"/>
+				</field>
+			</field>
+		</record>
+
+		<record id="purchase_order_line_form" model="ir.ui.view">
+			<field name="name">purchase.order.line.form</field>
+			<field name="model">purchase.order.line</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+			<field name="arch" type="xml">
+				<field name="product_id" position="replace">
+					<field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)" domain="[('seller_ids', 'in', (parent.partner_id,False)),('categ_id', '=', parent.categ_id)]"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'product_structure/res.py'
--- product_structure/res.py	1970-01-01 00:00:00 +0000
+++ product_structure/res.py	2009-12-16 13:50:35 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+
+
+
+class res_partner(osv.osv):
+	_name = "res.partner"
+	_inherit = "res.partner"
+
+	def _categ_ids( self, cr, uid, ids, name, args, context={} ):
+		ret = {}
+		for i in ids: ret[i] = []
+		cids = self.pool.get("product.category").search(cr, uid, [("type_id","=","")], context={'recursion':False})
+		for r in self.pool.get("product.category").read(cr, uid, cids, ["partner_ids"]):
+			for p in r['partner_ids']:
+				if p in ret: ret[p].append( r['id'] )
+		return ret
+
+	_columns = {
+		"categ_ids": fields.function(_categ_ids, method=True, type='one2many', relation='product.category', string='Categorie', select=1, readonly=True),
+		"product_ids": fields.many2many('product.product', 'product_supplierinfo', 'name', 'product_id', 'Products', readonly=True),
+	}
+
+res_partner()
+
+
+
+class res_users( osv.osv ):
+	_name = 'res.users'
+	_inherit = 'res.users'
+
+	_columns = {
+		'context_categ_id': fields.many2one('product.category','Category'),
+		}
+
+	def context_get(self, cr, uid, context=None):
+		user = self.browse(cr, uid, uid, context)
+		result = super(res_users, self).context_get(cr, uid, context=context)
+		for k in self._columns.keys():
+			if k.startswith('context_'):
+				result[k[8:]] = ( isinstance(getattr(user, k), osv.orm.browse_record) and not isinstance(getattr(user, k), osv.orm.browse_null) ) \
+					and getattr(user,k).id \
+					or getattr(user,k)
+		return result
+
+res_users()

=== added file 'product_structure/res_view.xml'
--- product_structure/res_view.xml	1970-01-01 00:00:00 +0000
+++ product_structure/res_view.xml	2009-12-16 13:50:35 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+
+		<record id="view_partner_form" model="ir.ui.view">
+			<field name="name">res.partner.form</field>
+			<field name="model">res.partner</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="base.view_partner_form"/>
+			<field name="arch" type="xml">
+				<notebook position="inside">
+					<page string="Products">
+						<separator string="Products" colspan="3"/>
+						<separator string="Products categories" colspan="1"/>
+						<field name="product_ids" nolabel="1" colspan="3"/>
+						<field name="categ_ids" nolabel="1" colspan="1"/>
+					</page>
+				</notebook>
+			</field>
+		</record>
+
+		<record id="view_users_form_simple_modif" model="ir.ui.view">
+			<field name="name">res.users.form.modif</field>
+			<field name="model">res.users</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+			<field name="arch" type="xml">
+				<field name="signature" position="after">
+					<field name="context_categ_id"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>