Merge lp:~akretion-team/openerp-product-attributes/mixin-extraction into lp:~product-core-editors/openerp-product-attributes/7.0

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

See commit messages:
no more code but but code is now split in two modules: product_custom_attributes and base_custom_attributes that can be reused in any OpenERP object (partner, project, production order etc...). That last module may be moved to another branch later if it makes more sense.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

When you build a view yourself, you should call
`openerp.osv.orm.setup_modifiers` on the nodes. (example in
`account.wizard.account_report_common.account_common_report.fields_view_get`).

In your case, I don't think it will change anything, because it setup
the modifiers for `attrs`, `states`, `invisible`, `readonly`, `required`
and you don't use them. But I still think it would be proper to call it.

What do you think?

Nitpickings on the style:
* The indentation of l.170,183,184 is a bit weird.
* l.213,215 spaces around '='

review: Needs Information

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Raphael, Guewen, what is the status of this MP ?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I'm fine to merge this proposal without changing the nitpickings.
But `openerp.osv.orm.setup_modifiers` has to be called on the fields.
Raphaël, can you just change this please? The merge proposal can then be merged.

By the way, that's really nice to have extracted this behavior from the product models to a generic module.

review: Needs Fixing

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

Hello will do that as soon as possible (hopefully today), sorry for the
delay.

On Tue, Mar 19, 2013 at 4:49 AM, Guewen Baconnier @ Camptocamp <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> I'm fine to merge this proposal without changing the nitpickings.
> But `openerp.osv.orm.setup_modifiers` has to be called on the fields.
> Raphaël, can you just change this please? The merge proposal can then be
> merged.
>
> By the way, that's really nice to have extracted this behavior from the
> product models to a generic module.
> --
>
> https://code.launchpad.net/~akretion-team/openerp-product-attributes/mixin-extraction/+merge/151333
> Your team OpenERP Community is subscribed to branch
> lp:openerp-product-attributes.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~openerp-community
> More help : https://help.launchpad.net/ListHelp
>

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the change

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I tried to merge lp:~akretion-team/openerp-product-attributes/polymorphic-relations, then this branch, but when I merge this one I have a conflict. Can you check why please?

[lp:~akretion-team/openerp-product-attributes/mixin-extraction]

205. By Raphaël Valyi - http://www.akretion.com on 2013-06-14

[IMP] Generalization of product_custom_attributes for OpenERP v7. See detailed logs for more information

206. By Sébastien BEAU - http://www.akretion.com on 2013-06-14

[MERGE] update with stable branch

207. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[MERGE] merge view improvement from benoit branch

208. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[MERGE] merge Benoit branch for improving view, do some refactor due to the change done in mixing branch

209. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[TYPO] no change juste reorganise the code

210. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[REF] Continue refactor, move attribut set to abstract module

211. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[REF] base_custom_attributes : refcator view and add model on set and group. Now the model of the attrbitue is filtred according to the model selected on the set or the group

212. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[REF] continue refactor, now the abstract model base_custom_attributs have some special option like force model, take a look in product_custom_attribut, just add {'force_model': 'our_model'} in the context and the model will be hide and automatically filled

213. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[REF] rename custom.attribute into attribute.attribute

214. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[IMP] add a special group for advanced option

215. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[IMP] base_custom_attribute: if the field have the type multiselect the option serialized is hide as we have no choice and the option have to be selected

216. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[FIX] fix error due to previous merge

217. By Sébastien BEAU - http://www.akretion.com on 2013-06-15

[REF] Remove useless file

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi all
I merge the improvement done by Benoit
https://code.launchpad.net/~akretion-team/openerp-product-attributes/openerp-product-attributes-fix-view/+merge/168461
https://code.launchpad.net/~akretion-team/openerp-product-attributes/openerp-product-attributes-fix-view/+merge/168461

I extract the attribut.set from the product custom module
I added the model on the group and the attibut set and it's propagated.
The model is also correctly filtred on the attributs

And I also did some other view improvement.

Let's merge it ;)

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

You rock Seb, this is really a pleasure to have this result now. Now we have both the killer ergnomy of product_custom_attributes but enough genericity to use base_custom_attributes as a basis for things like product configurators. I'm really proud of these 2 modules now!

review: Approve

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

(Just to mention: I both tested and looked at the code)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

l.78 the import from `tools.translate` should be from `openerp.tools.translate`

once that fixed, I'll be ok for the merge

[lp:~akretion-team/openerp-product-attributes/mixin-extraction]

218. By Sébastien BEAU - http://www.akretion.com on 2013-06-17

[FIX] fix incorrect importing of translate tools _ Thanks to Guewen

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Thanks Guewen for your remark. It's fix now.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the change

LGTM

review: Approve (code review, no test)

[lp:~akretion-team/openerp-product-attributes/mixin-extraction]

219. By Benoit Guillot - http://www.akretion.com on 2013-06-18

[FIX] remove 'product' in base_custom_atributeviews

220. By Benoit Guillot - http://www.akretion.com on 2013-06-18

[FIX] clean imports, and fix encoding of strings

[Benoit Guillot - http://www.akretion.com (benoit-guillot-z)]

I made fiew fixes.

review: Approve (test)

[debaetsr (rubendebaets)]

Hey,

I've read a lovely book recently, the author is admired by everyone, you should read the book too, that's for sure, here is the link <http://score.strtgk.com/e4trfvt>

Sincerely, ruben

=== renamed directory 'product_custom_attributes' => 'base_custom_attributes'
=== modified file 'base_custom_attributes/__init__.py'
--- product_custom_attributes/__init__.py	2012-08-03 14:33:51 +0000
+++ base_custom_attributes/__init__.py	2013-06-18 16:21:29 +0000
@@ -22,9 +22,7 @@
 
 
 import ir_model
-import product_attribute
-import product
-import wizard
+import custom_attributes
 
 
 

=== modified file 'base_custom_attributes/__openerp__.py'
--- product_custom_attributes/__openerp__.py	2013-02-11 22:58:10 +0000
+++ base_custom_attributes/__openerp__.py	2013-06-18 16:21:29 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ###############################################################################
 #                                                                             #
-#   product_custom_attributes for OpenERP                                      #
+#   base_custom_attributes for OpenERP                                        #
 #   Copyright (C) 2011 Akretion Benoît GUILLOT <[e-mail]>  #
 #                                                                             #
 #   This program is free software: you can redistribute it and/or modify      #
@@ -22,23 +22,20 @@
 
 
 {
-    'name': 'product_custom_attributes',
+    'name': 'base_custom_attributes',
     'version': '0.1',
     'category': 'Generic Modules/Others',
     'license': 'AGPL-3',
-    'description': """This module adds the possibility to easily create custom fields on products.
-Each product can be linked to an attribute set (like camera, fridge...).
-Each attribute has custom fields (for example, you don't need the same field for a frigde and a camera).
+    'description': """This module adds the possibility to easily create custom attributes in any OpenERP business object. See the product_custom_attributes module for instance.
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
-    'depends': ['product'],
+    'depends': ['base'],
     'init_xml': [],
     'update_xml': [
            'security/ir.model.access.csv',
-           'product_attribute_view.xml',
-           'product_view.xml',
-           'wizard/open_product_by_attribute_set.xml',
+           'security/attribute_security.xml',
+           'custom_attributes_view.xml',
     ],
     'demo_xml': [],
     'installable': True,

=== renamed file 'product_custom_attributes/product_attribute.py' => 'base_custom_attributes/custom_attributes.py'
--- product_custom_attributes/product_attribute.py	2013-06-13 16:55:06 +0000
+++ base_custom_attributes/custom_attributes.py	2013-06-18 16:21:29 +0000
@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
 ###############################################################################
 #                                                                             #
-#   product_custom_attributes for OpenERP                                      #
+#   base_attribute.attributes for OpenERP                                        #
 #   Copyright (C) 2011 Akretion Benoît GUILLOT <[e-mail]>  #
+#   Copyright (C) 2013 Akretion Raphaël VALYI <[e-mail]>    #
 #                                                                             #
 #   This program is free software: you can redistribute it and/or modify      #
 #   it under the terms of the GNU Affero General Public License as            #
@@ -19,13 +20,13 @@
 #                                                                             #
 ###############################################################################
 
-from openerp.osv import orm
-from openerp.osv import fields
+from openerp.osv import orm, fields
 from openerp.osv.osv import except_osv
+from openerp.tools.translate import _
 from lxml import etree
-from openerp.tools.translate import _
 from unidecode import unidecode # Debian package python-unidecode
 
+
 class attribute_option(orm.Model):
     _name = "attribute.option"
     _description = "Attribute Option"
@@ -34,7 +35,7 @@
     _columns = {
         'name': fields.char('Name', size=128, translate=True, required=True),
         'value_ref': fields.reference('Reference', selection=[], size=128),
-        'attribute_id': fields.many2one('product.attribute', 'Product Attribute', required=True),
+        'attribute_id': fields.many2one('attribute.attribute', 'Product Attribute', required=True),
         'sequence': fields.integer('Sequence'),
     }
 
@@ -45,12 +46,13 @@
         else:
             return True
 
+
 class attribute_option_wizard(orm.TransientModel):
     _name = "attribute.option.wizard"
     _rec_name = 'attribute_id'
 
     _columns = {
-        'attribute_id': fields.many2one('product.attribute', 'Product Attribute', required=True),
+        'attribute_id': fields.many2one('attribute.attribute', 'Product Attribute', required=True),
     }
 
     _defaults = {
@@ -61,7 +63,7 @@
         return True
 
     def create(self, cr, uid, vals, context=None):
-        attr_obj = self.pool.get("product.attribute")
+        attr_obj = self.pool.get("attribute.attribute")
         attr = attr_obj.browse(cr, uid, vals['attribute_id'])
         op_ids = [op.id for op in attr.option_ids]
         opt_obj = self.pool.get("attribute.option")
@@ -80,7 +82,7 @@
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(attribute_option_wizard, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
         if view_type == 'form' and context and context.get("attribute_id"):
-            attr_obj = self.pool.get("product.attribute")
+            attr_obj = self.pool.get("attribute.attribute")
             model_id = attr_obj.read(cr, uid, [context.get("attribute_id")], ['relation_model_id'])[0]['relation_model_id'][0]
             relation = self.pool.get("ir.model").read(cr, uid, [model_id], ["model"])[0]["model"]
             res['fields'].update({'option_ids': {
@@ -99,11 +101,47 @@
         return res
 
 
-class product_attribute(orm.Model):
-    _name = "product.attribute"
-    _description = "Product Attribute"
+class attribute_attribute(orm.Model):
+    _name = "attribute.attribute"
+    _description = "Attribute"
     _inherits = {'ir.model.fields': 'field_id'}
 
+    def _build_attribute_field(self, cr, uid, page, attribute, context=None):
+        parent = etree.SubElement(page, 'group', colspan="2", col="4")
+        kwargs = {'name': "%s" % attribute.name}
+        if attribute.ttype in ['many2many', 'text']:
+            parent = etree.SubElement(parent, 'group', colspan="2", col="4")
+            sep = etree.SubElement(parent,
+                                   'separator',
+                                    string="%s" % attribute.field_description,
+                                    colspan="4")  
+        
+            kwargs['nolabel'] = "1"
+        if attribute.ttype in ['many2one', 'many2many']:
+            if attribute.relation_model_id:
+                if attribute.domain:
+                    kwargs['domain'] = attribute.domain
+                else:
+                    ids = [op.value_ref.id for op in attribute.option_ids]
+                    kwargs['domain'] = "[('id', 'in', %s)]" % ids
+            else:
+                kwargs['domain'] = "[('attribute_id', '=', %s)]" % attribute.attribute_id.id
+        field = etree.SubElement(parent, 'field', **kwargs)
+        orm.setup_modifiers(field, self.fields_get(cr, uid, attribute.name, context))
+        return parent
+
+    def _build_attributes_notebook(self, cr, uid, attribute_group_ids, context=None):
+        notebook = etree.Element('notebook', name="attributes_notebook", colspan="4")
+        toupdate_fields = []
+        grp_obj = self.pool.get('attribute.group')
+        for group in grp_obj.browse(cr, uid, attribute_group_ids, context=context):
+            page = etree.SubElement(notebook, 'page', string=group.name.capitalize())
+            for attribute in group.attribute_ids:
+                if attribute.name not in toupdate_fields:
+                    toupdate_fields.append(attribute.name)
+                    self._build_attribute_field(cr, uid, page, attribute, context=context)
+        return notebook, toupdate_fields
+
     def relation_model_id_change(self, cr, uid, ids, relation_model_id, option_ids, context=None):
         "removed selected options as they would be inconsistent" 
         return {'value': {'option_ids': [(2, i[1]) for i in option_ids]}}
@@ -147,6 +185,17 @@
             [vals.get('relation_model_id')], ['model'])[0]['model']
         else:
             relation = 'attribute.option'
+
+        if vals['attribute_type'] == 'select':
+            vals['ttype'] = 'many2one'
+            vals['relation'] = relation
+        elif vals['attribute_type'] == 'multiselect':
+            vals['ttype'] = 'many2many'
+            vals['relation'] = relation
+            vals['serialized'] = True
+        else:
+            vals['ttype'] = vals['attribute_type']
+
         if vals.get('serialized'):
             field_obj = self.pool.get('ir.model.fields')
             serialized_ids = field_obj.search(cr, uid,
@@ -156,56 +205,56 @@
                 vals['serialization_field_id'] = serialized_ids[0]
             else:
                 f_vals = {
-                    'name': 'x_custom_json_attrs',
-                    'field_description': 'Serialized JSON Attributes', 
+                    'name': u'x_custom_json_attrs',
+                    'field_description': u'Serialized JSON Attributes', 
                     'ttype': 'serialized',
                     'model_id': vals['model_id'],
                 }
                 vals['serialization_field_id'] = field_obj.create(cr, uid, f_vals, {'manual': True})
-        if vals['attribute_type'] == 'select':
-            vals['ttype'] = 'many2one'
-            vals['relation'] = relation
-        elif vals['attribute_type'] == 'multiselect':
-            vals['ttype'] = 'many2many'
-            vals['relation'] = relation
-            if not vals.get('serialized'):
-                raise except_osv(_('Create Error'), _("The field serialized should be ticked for a multiselect field !"))
-        else:
-            vals['ttype'] = vals['attribute_type']
         vals['state'] = 'manual'
-        return super(product_attribute, self).create(cr, uid, vals, context)
+        return super(attribute_attribute, self).create(cr, uid, vals, context)
 
     def onchange_field_description(self, cr, uid, ids, field_description, context=None):
-        name = 'x_'
+        name = u'x_'
         if field_description:
-            name = unidecode('x_%s' % field_description.replace(' ', '_').lower())
+            name = unidecode(u'x_%s' % field_description.replace(' ', '_').lower())
         return  {'value' : {'name' : name}}
 
     def onchange_name(self, cr, uid, ids, name, context=None):
+        res = {}
         if not name.startswith('x_'):
-            name = 'x_%s' % name
-        return  {'value' : {'name' : unidecode(name)}}
-
-
-class attribute_location(orm.Model):
-    _name = "attribute.location"
-    _description = "Attribute Location"
-    _order="sequence"
-    _inherits = {'product.attribute': 'attribute_id'}
-
-
-    def _get_attribute_loc_from_group(self, cr, uid, ids, context=None):
-        return self.pool.get('attribute.location').search(cr, uid, [('attribute_group_id', 'in', ids)], context=context)
-
-    _columns = {
-        'attribute_id': fields.many2one('product.attribute', 'Product Attribute', required=True, ondelete="cascade"),
-        'attribute_set_id': fields.related('attribute_group_id', 'attribute_set_id', type='many2one', relation='attribute.set', string='Attribute Set', readonly=True,
-store={
-            'attribute.group': (_get_attribute_loc_from_group, ['attribute_set_id'], 10),
-        }),
-        'attribute_group_id': fields.many2one('attribute.group', 'Attribute Group', required=True),
-        'sequence': fields.integer('Sequence'),
-        }
+            name = u'x_%s' % name
+        else:
+            name = u'%s' % name
+        res = {'value' : {'name' : unidecode(name)}}
+
+        #FILTER ON MODEL
+        model_domain = []
+        model_name = context.get('force_model')
+        if not model_name:
+            model_id = context.get('default_model_id')
+            if model_id:
+                model = self.pool['ir.model'].browse(cr, uid, model_id, context=context)
+                model_name = model.model
+        if model_name:
+            model_obj = self.pool[model_name]
+            allowed_model = [x for x in model_obj._inherits] + [model_name]
+            res['domain'] = {'model_id': [['model', 'in', allowed_model]]}
+
+        return res
+
+    def _get_default_model(self, cr, uid, context=None):
+        if context and context.get('force_model'):
+            model_id = self.pool['ir.model'].search(cr, uid, [
+                    ['model', '=', context['force_model']]
+                    ], context=context)
+            if model_id:
+                return model_id[0]
+        return None
+
+    _defaults = {
+        'model_id': _get_default_model
+    }
 
 
 class attribute_group(orm.Model):
@@ -215,9 +264,10 @@
 
     _columns = {
         'name': fields.char('Name', size=128, required=True),
+        'sequence': fields.integer('Sequence'),
         'attribute_set_id': fields.many2one('attribute.set', 'Attribute Set'),
         'attribute_ids': fields.one2many('attribute.location', 'attribute_group_id', 'Attributes'),
-        'sequence': fields.integer('Sequence'),
+        'model_id': fields.many2one('ir.model', 'Model', required=True),
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -226,6 +276,19 @@
                 attribute[2]['attribute_set_id'] = vals['attribute_set_id']
         return super(attribute_group, self).create(cr, uid, vals, context)
 
+    def _get_default_model(self, cr, uid, context=None):
+        if context and context.get('force_model'):
+            model_id = self.pool['ir.model'].search(cr, uid, [
+                    ['model', '=', context['force_model']]
+                    ], context=context)
+            if model_id:
+                return model_id[0]
+        return None
+
+    _defaults = {
+        'model_id': _get_default_model
+    }
+
 
 class attribute_set(orm.Model):
     _name = "attribute.set"
@@ -233,5 +296,38 @@
     _columns = {
         'name': fields.char('Name', size=128, required=True),
         'attribute_group_ids': fields.one2many('attribute.group', 'attribute_set_id', 'Attribute Groups'),
-        }
-
+        'model_id': fields.many2one('ir.model', 'Model', required=True),
+        }
+
+    def _get_default_model(self, cr, uid, context=None):
+        if context and context.get('force_model'):
+            model_id = self.pool['ir.model'].search(cr, uid, [
+                    ['model', '=', context['force_model']]
+                    ], context=context)
+            if model_id:
+                return model_id[0]
+        return None
+
+    _defaults = {
+        'model_id': _get_default_model
+    }
+
+class attribute_location(orm.Model):
+    _name = "attribute.location"
+    _description = "Attribute Location"
+    _order="sequence"
+    _inherits = {'attribute.attribute': 'attribute_id'}
+
+
+    def _get_attribute_loc_from_group(self, cr, uid, ids, context=None):
+        return self.pool.get('attribute.location').search(cr, uid, [('attribute_group_id', 'in', ids)], context=context)
+
+    _columns = {
+        'attribute_id': fields.many2one('attribute.attribute', 'Product Attribute', required=True, ondelete="cascade"),
+        'attribute_set_id': fields.related('attribute_group_id', 'attribute_set_id', type='many2one', relation='attribute.set', string='Attribute Set', readonly=True,
+store={
+            'attribute.group': (_get_attribute_loc_from_group, ['attribute_set_id'], 10),
+        }),
+        'attribute_group_id': fields.many2one('attribute.group', 'Attribute Group', required=True),
+        'sequence': fields.integer('Sequence'),
+        }

=== renamed file 'product_custom_attributes/product_attribute_view.xml' => 'base_custom_attributes/custom_attributes_view.xml'
--- product_custom_attributes/product_attribute_view.xml	2013-02-28 20:39:39 +0000
+++ base_custom_attributes/custom_attributes_view.xml	2013-06-18 16:21:29 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  product_custom_attributes for OpenERP
+  base_custom_attributes for OpenERP
   Copyright (C) 2011-2013 Akretion (http://www.akretion.com/)
   @author: Benoît GUILLOT <[e-mail]>
   The licence is in the file __openerp__.py
@@ -10,37 +10,65 @@
     <data>
 
         <menuitem
-            id="menu_attribute_in_config_product" name="Attributes"
-            parent="product.prod_config_main" sequence="20"/>
+            id="menu_attribute_in_admin" name="Attributes"
+            parent="base.next_id_9" sequence="1"/>
+
+    <!-- ATTRIBUTE SET VIEW -->
 
         <record id="attribute_set_form_view" model="ir.ui.view">
             <field name="name">attribute.set.form</field>
             <field name="model">attribute.set</field>
             <field name="arch" type="xml">
                 <form string="Attribute Set">
-                    <field name="name" colspan="4"/>
-                    <field name="attribute_group_ids" colspan="4" >
-                        <form string="Attribute Groups">
-                            <field name="name" />
-                            <field name="sequence" />
-                            <field name="attribute_ids" colspan="4">
-                                <form string="Attribute Location">
-                                    <field name="attribute_id" />
-                                    <field name="sequence" />
-                                </form>
-                                <tree string="Attribute Location">
-                                    <field name="attribute_id" />
-                                </tree>
-                            </field>
-                        </form>
-                        <tree string="Attribute Groups">
-                            <field name="name" />
-                        </tree>
+                    <field name="name"/>
+                    <field name="model_id" invisible="context.get('force_model')"/>
+                    <field name="attribute_group_ids" colspan="4"
+                           context="{'default_model_id': model_id, 'from_attribute_set':True}">
                     </field>
                 </form>
             </field>
         </record>
 
+        <record id="attribute_set_tree_view" model="ir.ui.view">
+            <field name="name">attribute.set.tree</field>
+            <field name="model">attribute.set</field>
+            <field name="arch" type="xml">
+                <tree string="Attribute Set" >
+                    <field name="name" />
+                    <field name="model_id" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_attribute_set_search" model="ir.ui.view">
+            <field name="name">attribute.set.list</field>
+            <field name="model">attribute.set</field>
+            <field name="arch" type="xml">
+                <search string="Search Attribute Sets">
+                    <field name="name"/>
+                    <field name="model_id" />
+               </search>
+            </field>
+        </record>
+
+        <record id="attribute_set_form_action" model="ir.actions.act_window">
+            <field name="name">Attribute Sets</field>
+            <field name="res_model">attribute.set</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_attribute_set_search"/>
+            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="help"></field>
+        </record>
+
+         <menuitem
+             action="attribute_set_form_action" id="menu_attribute_set_action"
+             parent="menu_attribute_in_admin" sequence="10"/>
+ 
+
+
+    <!-- ATTRIBUTE GROUP VIEW -->
+
         <record id="attribute_group_form_view" model="ir.ui.view">
             <field name="name">attribute.group.form</field>
             <field name="model">attribute.group</field>
@@ -48,253 +76,168 @@
                 <form string="Attribute Group">
                     <field name="name" />
                     <field name="sequence" />
-                    <field name="attribute_set_id" />
+                    <field name="model_id" invisible="context.get('from_attribute_set') or context.get('force_model')"/>
+                    <field name="attribute_set_id" invisible="context.get('from_attribute_set')"/>
                     <field name="attribute_ids" colspan="4" nolabel="1">
                         <form string="Attribute Location">
-                            <field name="attribute_id" />
+                            <field name="attribute_id" context="{'default_model_id': parent.model_id}"/>
                             <field name="sequence" />
                         </form>
-                        <tree string="Attribute Location">
-                            <field name="attribute_id" />
+                        <tree string="Attribute Location" editable="top">
+                            <field name="attribute_id" context="{'default_model_id': parent.model_id}"/>
+                            <field name="sequence" />
                         </tree>
                     </field>
                 </form>
             </field>
         </record>
 
-        <record id="attribute_location_form_view" model="ir.ui.view">
-            <field name="name">attribute.location.form</field>
-            <field name="model">attribute.location</field>
+        <record id="attribute_group_tree_view" model="ir.ui.view">
+            <field name="name">attribute.group.tree</field>
+            <field name="model">attribute.group</field>
             <field name="arch" type="xml">
-                <form string="Attribute Location">
-                    <field name="attribute_id" />
+                <tree string="Attribute Group">
+                    <field name="name" />
                     <field name="sequence" />
-                    <field name="attribute_group_id" />
-                    <field name="attribute_set_id" />
-                </form>
-            </field>
-        </record>
-
-        <record id="product_attribute_form_view" model="ir.ui.view">
-            <field name="name">product.attribute.form</field>
-            <field name="model">product.attribute</field>
-            <field name="arch" type="xml">
-                <form string="Product Attribute">
+                    <field name="attribute_set_id" invisible="context.get('from_attribute_set')"/>
+                    <field name="model_id" invisible="context.get('from_attribute_set')"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_attribute_group_search" model="ir.ui.view">
+            <field name="name">attribute.group.list</field>
+            <field name="model">attribute.group</field>
+            <field name="arch" type="xml">
+                <search string="Search Attribute Groups">
+                    <field name="name"/>
+                    <field name="attribute_set_id"/>
+                    <field name="model_id" />
+               </search>
+            </field>
+        </record>
+
+
+        <record id="attribute_group_form_action" model="ir.actions.act_window">
+            <field name="name">Attribute Groups</field>
+            <field name="res_model">attribute.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="help"></field>
+        </record>
+
+         <menuitem
+             action="attribute_group_form_action" id="menu_attribute_group_action"
+             parent="menu_attribute_in_admin" sequence="20"/>
+
+    <!-- ATTRIBUTE VIEW -->
+
+        <record id="attribute_attribute_form_view" model="ir.ui.view">
+            <field name="name">attribute.attribute.form</field>
+            <field name="model">attribute.attribute</field>
+            <field name="arch" type="xml">
+                <form string="Attribute">
                     <field name="field_description" on_change="onchange_field_description(field_description, context)"/>
                     <field name="name" attrs="{'readonly':[('create_date', '!=', False)]}" on_change="onchange_name(name, context)"/>
                     <field name="attribute_type" />
                     <field name="model_id" />
-                    <field name="serialized" />
+                    <field name="serialized" attrs="{'invisible':[('attribute_type', '=', 'multiselect')]}"/>
                     <field name="size" attrs="{'invisible':[('attribute_type', '!=', 'char')]}"/>
                     <field name="translate" attrs="{'invisible':[('attribute_type', 'not in', ('char', 'text'))]}"/>
                     <newline />
                     <group colspan="4" attrs="{'invisible':[('attribute_type', 'not in', ['select', 'multiselect'])]}">
-                    <field name="relation_model_id" on_change="relation_model_id_change(relation_model_id, option_ids, context)"/>
-                    <field name="domain" attrs="{'invisible':[('relation_model_id', '=', False)]}"/>
-                    <group colspan="4" attrs="{'invisible':[('domain', '!=', False)]}">
-                    <button name="button_add_options" attrs="{'invisible':[('relation_model_id', '=', False)]}" type="object" string="Change Options"/>
-                    <field name="option_ids" colspan="4" nolabel="1">
-                        <tree string="Attribute Options" editable="top">
-                            <field name="sequence" invisible="1"/>
-                            <field name="name" on_change="name_change(name, parent.relation_model_id, context)"/>
-                        </tree>
-                    </field>
-                    </group>
+                        <group groups="base.group_advanced_attribute">
+                            <field name="relation_model_id" on_change="relation_model_id_change(relation_model_id, option_ids, context)"/>
+                            <field name="domain" attrs="{'invisible':[('relation_model_id', '=', False)]}"/>
+                            <button name="button_add_options" attrs="{'invisible':[('relation_model_id', '=', False), ('domain', '!=', False)]}" type="object" string="Load Options"/>
+                        </group>
+                        <field name="option_ids" colspan="4" nolabel="1">
+                            <tree string="Attribute Options" editable="top">
+                                <field name="sequence" invisible="1"/>
+                                <field name="name" on_change="name_change(name, parent.relation_model_id, context)"/>
+                            </tree>
+                        </field>
                     </group>
                     <field name="create_date" invisible="1"/>
                 </form>
             </field>
         </record>
-
-        <record id="attribute_option_wizard_form_view" model="ir.ui.view">
-            <field name="name">attribute.option.wizard</field>
-            <field name="model">attribute.option.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Options Wizard" col="6">
-                    <field name="attribute_id" invisible="1" colspan="2"/>
-                    <separator string="options_placeholder"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="validate" string="Validate" type="object" icon="gtk-convert"/>
-                </form>
-            </field>
-        </record>
-
+        
+        <record id="attribute_attribute_tree_view" model="ir.ui.view">
+            <field name="name">attribute.attribute.tree</field>
+            <field name="model">attribute.attribute</field>
+            <field name="arch" type="xml">
+                <tree string="Attribute">
+                    <field name="name" />
+                    <field name="attribute_type" />
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_attribute_attribute_search" model="ir.ui.view">
+            <field name="name">attribute.attribute.list</field>
+            <field name="model">attribute.attribute</field>
+            <field name="arch" type="xml">
+                <search string="Search Attributes">
+                    <field name="name"/>
+               </search>
+            </field>
+        </record>
+
+        <record id="attribute_attribute_form_action" model="ir.actions.act_window">
+            <field name="name">Attributes</field>
+            <field name="res_model">attribute.attribute</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_attribute_attribute_search"/>
+            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="help"></field>
+        </record>
+        <menuitem
+            action="attribute_attribute_form_action" id="menu_attribute_attribute_action"
+            parent="menu_attribute_in_admin" sequence="30"/>
+
+    <!-- ATTRIBUTE OPTION VIEW -->
         <record id="attribute_option_form_view" model="ir.ui.view">
             <field name="name">attribute.option.form</field>
             <field name="model">attribute.option</field>
             <field name="arch" type="xml">
                 <form string="Attribute Option" col="6">
-                    <field name="value_ref" colspan="2"/>
+                    <field name="name" colspan="2"/>
+                    <field name="value_ref" colspan="2" groups="base.group_advanced_attribute"/>
                     <field name="sequence" colspan="2"/>
                     <field name="attribute_id" colspan="2"/>
                 </form>
             </field>
         </record>
-
-        <record id="attribute_set_tree_view" model="ir.ui.view">
-            <field name="name">attribute.set.tree</field>
-            <field name="model">attribute.set</field>
-            <field name="arch" type="xml">
-                <tree string="Attribute Set" >
-                    <field name="name" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="attribute_group_tree_view" model="ir.ui.view">
-            <field name="name">attribute.group.tree</field>
-            <field name="model">attribute.group</field>
-            <field name="arch" type="xml">
-                <tree string="Attribute Group">
-                    <field name="name" />
-                    <field name="sequence" />
-                    <field name="attribute_set_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="attribute_location_tree_view" model="ir.ui.view">
-            <field name="name">attribute.location.tree</field>
-            <field name="model">attribute.location</field>
-            <field name="arch" type="xml">
-                <tree string="Attribute Location">
-                    <field name="attribute_id" />
-                    <field name="sequence" />
-                    <field name="attribute_set_id" />
-                    <field name="attribute_group_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="product_attribute_tree_view" model="ir.ui.view">
-            <field name="name">product.attribute.tree</field>
-            <field name="model">product.attribute</field>
-            <field name="arch" type="xml">
-                <tree string="Product Attribute">
-                    <field name="name" />
-                    <field name="attribute_type" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="prio_attribute_option_tree_view" model="ir.ui.view">
-            <field name="name">attribute.option.tree.prio</field>
-            <field name="model">attribute.option</field>
-            <field eval="1" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Attribute Option">
-                    <field name="value_ref" />
-                </tree>
-            </field>
-        </record>
-
+        
         <record id="attribute_option_tree_view" model="ir.ui.view">
             <field name="name">attribute.option.tree</field>
             <field name="model">attribute.option</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Attribute Option">
+                    <field name="name" />
                     <field name="sequence" />
-                    <field name="value_ref" />
+                    <field name="value_ref" groups="base.group_advanced_attribute"/>
                     <field name="attribute_id" />
                 </tree>
             </field>
         </record>
 
-        <record id="view_attribute_set_search" model="ir.ui.view">
-            <field name="name">attribute.set.list</field>
-            <field name="model">attribute.set</field>
-            <field name="arch" type="xml">
-                <search string="Search Attribute Sets">
-                    <field name="name"/>
-               </search>
-            </field>
-        </record>
-
-        <record id="view_attribute_group_search" model="ir.ui.view">
-            <field name="name">attribute.group.list</field>
-            <field name="model">attribute.group</field>
-            <field name="arch" type="xml">
-                <search string="Search Attribute Groups">
-                    <field name="name"/>
-                    <field name="attribute_set_id"/>
-               </search>
-            </field>
-        </record>
-
-        <record id="view_attribute_location_search" model="ir.ui.view">
-            <field name="name">attribute.location.list</field>
-            <field name="model">attribute.location</field>
-            <field name="arch" type="xml">
-                <search string="Search Attribute Locations">
-                    <field name="name"/>
-                    <field name="attribute_set_id"/>
-                    <field name="attribute_group_id"/>
-               </search>
-            </field>
-        </record>
-
-        <record id="view_product_attribute_search" model="ir.ui.view">
-            <field name="name">product.attribute.list</field>
-            <field name="model">product.attribute</field>
-            <field name="arch" type="xml">
-                <search string="Search Product Attributes">
-                    <field name="name"/>
-               </search>
-            </field>
-        </record>
-
         <record id="view_attribute_option_search" model="ir.ui.view">
             <field name="name">attribute.option.list</field>
             <field name="model">attribute.option</field>
             <field name="arch" type="xml">
                 <search string="Search Attribute Options">
-                    <field name="value_ref" />
+                    <field name="name" />
+                    <field name="value_ref" groups="base.group_advanced_attribute"/>
                     <field name="attribute_id"/>
                </search>
             </field>
         </record>
 
-        <record id="attribute_set_form_action" model="ir.actions.act_window">
-            <field name="name">Attribute Sets</field>
-            <field name="res_model">attribute.set</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_attribute_set_search"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="help"></field>
-        </record>
-
-        <record id="attribute_group_form_action" model="ir.actions.act_window">
-            <field name="name">Attribute Groups</field>
-            <field name="res_model">attribute.group</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_attribute_group_search"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="help"></field>
-        </record>
-
-        <record id="attribute_location_form_action" model="ir.actions.act_window">
-            <field name="name">Attribute Locations</field>
-            <field name="res_model">attribute.location</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_attribute_location_search"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="help"></field>
-        </record>
-
-        <record id="product_attribute_form_action" model="ir.actions.act_window">
-            <field name="name">Product Attributes</field>
-            <field name="res_model">product.attribute</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_product_attribute_search"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="help"></field>
-        </record>
-
         <record id="attribute_option_form_action" model="ir.actions.act_window">
             <field name="name">Attribute Options</field>
             <field name="res_model">attribute.option</field>
@@ -306,21 +249,23 @@
             <field name="help"></field>
         </record>
 
-         <menuitem
-             action="attribute_set_form_action" id="menu_attribute_set_action"
-             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="1"/>
-         <menuitem
-             action="attribute_group_form_action" id="menu_attribute_group_action"
-             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="2"/>
-         <menuitem
-             action="attribute_location_form_action" id="menu_attribute_location_action"
-             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="3"/>
-         <menuitem
-             action="product_attribute_form_action" id="menu_product_attribute_action"
-             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="4"/>
-         <menuitem
-             action="attribute_option_form_action" id="menu_attribute_option_action"
-             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="5"/>
+        <menuitem
+            action="attribute_option_form_action" id="menu_attribute_option_action"
+            parent="menu_attribute_in_admin" sequence="40"/>
+
+    <!-- ATTRIBUTE OPTION WIZARD -->
+        <record id="attribute_option_wizard_form_view" model="ir.ui.view">
+            <field name="name">attribute.option.wizard</field>
+            <field name="model">attribute.option.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Options Wizard" col="6">
+                    <field name="attribute_id" invisible="1" colspan="2"/>
+                    <separator string="options_placeholder"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="validate" string="Validate" type="object" icon="gtk-convert"/>
+                </form>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== added file 'base_custom_attributes/security/attribute_security.xml'
--- base_custom_attributes/security/attribute_security.xml	1970-01-01 00:00:00 +0000
+++ base_custom_attributes/security/attribute_security.xml	2013-06-18 16:21:29 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_advanced_attribute" model="res.groups">
+        <field name="name">Advanced Attribute Option</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+</data>
+</openerp>

=== modified file 'base_custom_attributes/security/ir.model.access.csv'
--- product_custom_attributes/security/ir.model.access.csv	2013-02-11 22:58:10 +0000
+++ base_custom_attributes/security/ir.model.access.csv	2013-06-18 16:21:29 +0000
@@ -1,16 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_custom_attributes_attribute_set_salemanager","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","base.group_sale_manager",1,1,1,1
-"access_product_custom_attributes_attribute_group_salemanager","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","base.group_sale_manager",1,1,1,1
-"access_product_custom_attributes_attribute_location_salemanager","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","base.group_sale_manager",1,1,1,1
-"access_product_custom_attributes_product_attribute_salemanager","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","base.group_sale_manager",1,1,1,1
-"access_product_custom_attributes_attribute_option_salemanager","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","base.group_sale_manager",1,1,1,1
-"access_product_custom_attributes_attribute_set_manager","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","product.group_product_variant",1,1,1,1
-"access_product_custom_attributes_attribute_group_manager","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","product.group_product_variant",1,1,1,1
-"access_product_custom_attributes_attribute_location_manager","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","product.group_product_variant",1,1,1,1
-"access_product_custom_attributes_product_attribute_manager","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","product.group_product_variant",1,1,1,1
-"access_product_custom_attributes_attribute_option_manager","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","product.group_product_variant",1,1,1,1
-"access_product_custom_attributes_attribute_set_user","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","base.group_user",1,0,0,0
-"access_product_custom_attributes_attribute_group_user","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","base.group_user",1,0,0,0
-"access_product_custom_attributes_attribute_location_user","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","base.group_user",1,0,0,0
-"access_product_custom_attributes_product_attribute_user","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","base.group_user",1,0,0,0
-"access_product_custom_attributes_attribute_option_user","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","base.group_user",1,0,0,0
+"access_base_custom_attributes_attribute_group_salemanager","base_custom_attributes_attribute_group","base_custom_attributes.model_attribute_group","base.group_sale_manager",1,1,1,1
+"access_base_custom_attributes_attribute_attribute_salemanager","base_custom_attributes_product_attribute","base_custom_attributes.model_attribute_attribute","base.group_sale_manager",1,1,1,1
+"access_base_custom_attributes_attribute_option_salemanager","base_custom_attributes_attribute_option","base_custom_attributes.model_attribute_option","base.group_sale_manager",1,1,1,1
+"access_base_custom_attributes_attribute_group_manager","base_custom_attributes_attribute_group","base_custom_attributes.model_attribute_group","base.group_no_one",1,1,1,1
+"access_base_custom_attributes_attribute_attribute_manager","base_custom_attributes_attribute_attribute","base_custom_attributes.model_attribute_attribute","base.group_no_one",1,1,1,1
+"access_base_custom_attributes_attribute_option_manager","base_custom_attributes_attribute_option","base_custom_attributes.model_attribute_option","base.group_no_one",1,1,1,1
+"access_base_custom_attributes_attribute_group_user","base_custom_attributes_attribute_group","base_custom_attributes.model_attribute_group","base.group_user",1,0,0,0
+"access_base_custom_attributes_attribute_attribute_user","base_custom_attributes_attribute_attribute","base_custom_attributes.model_attribute_attribute","base.group_user",1,0,0,0
+"access_base_custom_attributes_attribute_option_user","base_custom_attributes_attribute_option","base_custom_attributes.model_attribute_option","base.group_user",1,0,0,0

=== added directory 'product_categ_attributes'
=== added file 'product_categ_attributes/__init__.py'
--- product_categ_attributes/__init__.py	1970-01-01 00:00:00 +0000
+++ product_categ_attributes/__init__.py	2013-06-18 16:21:29 +0000
@@ -0,0 +1,1 @@
+import product

=== added file 'product_categ_attributes/__openerp__.py'
--- product_categ_attributes/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_categ_attributes/__openerp__.py	2013-06-18 16:21:29 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   product_custom_attributes for OpenERP                                     #
+#   Copyright (C) 2013 Akretion Raphaël Valyi <[e-mail]>    #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero 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 Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+
+
+{
+    'name': 'product_categ_attributes',
+    'version': '0.1',
+    'category': 'Generic Modules/Others',
+    'license': 'AGPL-3',
+    'description': """Makes it possible to inherit product attributes from its categories
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com/',
+    'depends': ['product_custom_attributes', 'product_m2mcategories'],
+    'init_xml': [],
+    'update_xml': [
+        "product_view.xml"
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+

=== added file 'product_categ_attributes/product.py'
--- product_categ_attributes/product.py	1970-01-01 00:00:00 +0000
+++ product_categ_attributes/product.py	2013-06-18 16:21:29 +0000
@@ -0,0 +1,25 @@
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.osv.osv import except_osv
+from openerp.tools.translate import _
+
+
+class product_category(Model):
+    _inherit = "product.category"
+    _columns = {
+        'attribute_group_ids': fields.many2many('attribute.group', 'categ_attr_grp_rel', 'categ_id', 'grp_id', 'Attribute Groups'),
+        }
+
+
+class product_product(Model):
+    _inherit = "product.product"
+
+    def _attr_grp_ids(self, cr, uid, ids, field_names, arg=None, context=None):
+        res = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            grp_ids = [grp.id for grp in product.categ_id.attribute_group_ids]
+            for categ in product.categ_ids:
+                grp_ids += [grp.id for grp in categ.attribute_group_ids]
+            res[product.id] = list(set(grp_ids))
+        return res
+

=== added file 'product_categ_attributes/product_view.xml'
--- product_categ_attributes/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_categ_attributes/product_view.xml	2013-06-18 16:21:29 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="product_categ_form_view">
+            <field name="name">product_categ_form_view</field>
+            <field name="model">product.category</field>
+            <field name="inherit_id" ref="product.product_category_form_view" />
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="attribute_group_ids"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="product_product_form_view_set_button">
+            <field name="name">attributes.product.normal.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product_custom_attributes.product_product_form_view_set_button" />
+            <field name="arch" type="xml">
+                <field name="attribute_set_id" position="replace">
+                </field>
+                <button name="open_attributes" position="replace">
+                    <button name="open_attributes" string="Open Attributes" type="object" icon="gtk-ok"/>
+                </button>
+            </field>
+        </record>
+
+        <record id="attribute_group_form_view" model="ir.ui.view">
+            <field name="name">attribute.group.form</field>
+            <field name="model">attribute.group</field>
+            <field name="inherit_id" ref="product_custom_attributes.attribute_group_form_view" />
+            <field name="arch" type="xml">
+                    <field name="attribute_set_id" position="replace">
+                    </field>
+            </field>
+        </record>
+
+        <record id="product_attributes_form_view" model="ir.ui.view">
+            <field name="name">product_attributes_form_view</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product_custom_attributes.product_attributes_form_view" />
+            <field name="arch" type="xml">
+                    <field name="attribute_set_id" position="replace">
+                    </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+

=== added directory 'product_custom_attributes'
=== added file 'product_custom_attributes/__init__.py'
--- product_custom_attributes/__init__.py	1970-01-01 00:00:00 +0000
+++ product_custom_attributes/__init__.py	2013-06-18 16:21:29 +0000
@@ -0,0 +1,2 @@
+import product
+import wizard

=== added file 'product_custom_attributes/__openerp__.py'
--- product_custom_attributes/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_custom_attributes/__openerp__.py	2013-06-18 16:21:29 +0000
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   product_custom_attributes for OpenERP                                      #
+#   Copyright (C) 2011 Akretion Benoît GUILLOT <[e-mail]>  #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero 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 Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+
+
+{
+    'name': 'product_custom_attributes',
+    'version': '0.1',
+    'category': 'Generic Modules/Others',
+    'license': 'AGPL-3',
+    'description': """This module adds the possibility to easily create custom fields on products.
+Each product can be linked to an attribute set (like camera, fridge...).
+Each attribute has custom fields (for example, you don't need the same field for a frigde and a camera).
+In particular it's used by the Magento Magentoerpconnect module to match the EAV flexibility of Magento.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com/',
+    'depends': ['product', 'base_custom_attributes'],
+    'init_xml': [],
+    'update_xml': [
+           'product_view.xml',
+           'custom_attributes_view.xml',
+           'wizard/open_product_by_attribute_set.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+

=== added file 'product_custom_attributes/custom_attributes_view.xml'
--- product_custom_attributes/custom_attributes_view.xml	1970-01-01 00:00:00 +0000
+++ product_custom_attributes/custom_attributes_view.xml	2013-06-18 16:21:29 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  base_custom_attributes for OpenERP
+  Copyright (C) 2011-2013 Akretion (http://www.akretion.com/)
+  @author: Benoît GUILLOT <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+
+<openerp>
+    <data>
+
+        <menuitem
+            id="menu_attribute_in_config_product" name="Attributes"
+            parent="product.prod_config_main" sequence="20"/>
+
+        <record id="attribute_set_form_action" model="ir.actions.act_window">
+            <field name="name">Product Attribute Sets</field>
+            <field name="res_model">attribute.set</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="base_custom_attributes.view_attribute_set_search"/>
+            <field name="context">{"force_model": 'product.product'}</field>
+            <field name="help"></field>
+        </record>
+
+        <record id="attribute_attribute_form_action" model="ir.actions.act_window">
+            <field name="name">Product Attribute</field>
+            <field name="res_model">attribute.attribute</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="base_custom_attributes.view_attribute_attribute_search"/>
+            <field name="context">{"force_model": 'product.product'}</field>
+            <field name="help"></field>
+        </record>
+
+         <menuitem
+             action="attribute_set_form_action" id="menu_attribute_set_action"
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="1"/>
+        <menuitem
+             action="attribute_attribute_form_action" id="menu_attribute_attribute_action"
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="4"/>
+
+    </data>
+</openerp>

=== renamed file 'product_custom_attributes/product.py' => 'product_custom_attributes/product.py'
--- product_custom_attributes/product.py	2013-04-22 06:20:25 +0000
+++ product_custom_attributes/product.py	2013-06-18 16:21:29 +0000
@@ -28,7 +28,6 @@
 
 
 class product_product(Model):
-
     _inherit = "product.product"
 
     def _attr_grp_ids(self, cr, uid, ids, field_names, arg=None, context=None):
@@ -83,40 +82,6 @@
     def save_and_close_product_attributes(self, cr, uid, ids, context=None):
         return {'type': 'ir.actions.act_window_close'}
 
-    def _build_attribute_field(self, cr, uid, page, attribute, context=None):
-        parent = page
-        kwargs = {'name': "%s" % attribute.name}
-        if attribute.ttype == 'many2many':
-            parent = etree.SubElement(page, 'group', colspan="2", col="4")
-            #FIXME the following isn't displayed in v7:
-            sep = etree.SubElement(parent, 'separator',
-                                    string="%s" % attribute.field_description, colspan="4")
-            kwargs['nolabel'] = "1"
-        if attribute.ttype in ['many2one', 'many2many']:
-            if attribute.relation_model_id:
-                if attribute.domain:
-                    kwargs['domain'] = attribute.domain
-                else:
-                    ids = [op.value_ref.id for op in attribute.option_ids]
-                    kwargs['domain'] = "[('id', 'in', %s)]" % ids
-            else:
-                kwargs['domain'] = "[('attribute_id', '=', %s)]" % attribute.attribute_id.id
-        field = etree.SubElement(parent, 'field', **kwargs)
-        setup_modifiers(field, self.fields_get(cr, uid, attribute.name, context))
-        return parent
-
-    def _build_attributes_notebook(self, cr, uid, attribute_group_ids, context=None):
-        notebook = etree.Element('notebook', name="attributes_notebook", colspan="4")
-        toupdate_fields = []
-        grp_obj = self.pool.get('attribute.group')
-        for group in grp_obj.browse(cr, uid, attribute_group_ids, context=context):
-            page = etree.SubElement(notebook, 'page', string=group.name.capitalize())
-            for attribute in group.attribute_ids:
-                if attribute.name not in toupdate_fields:
-                    toupdate_fields.append(attribute.name)
-                    self._build_attribute_field(cr, uid, page, attribute, context=context)
-        return notebook, toupdate_fields
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:
             context = {}
@@ -128,7 +93,7 @@
             if button:
                 button = button[0]
                 button.getparent().remove(button)
-            attributes_notebook, toupdate_fields = self._build_attributes_notebook(cr, uid, context['attribute_group_ids'], context=context)
+            attributes_notebook, toupdate_fields = self.pool.get('attribute.attribute')._build_attributes_notebook(cr, uid, context['attribute_group_ids'], context=context)
             result['fields'].update(self.fields_get(cr, uid, toupdate_fields, context))
             if context.get('open_attributes'):
                 placeholder = eview.xpath("//separator[@string='attributes_placeholder']")[0]

=== renamed file 'product_custom_attributes/product_view.xml' => 'product_custom_attributes/product_view.xml'
=== renamed directory 'product_custom_attributes/wizard' => 'product_custom_attributes/wizard'