Merge lp:~camptocamp/openerp-product-attributes/7.0-no-attribute_id-on-option-creation-gbr into lp:~product-core-editors/openerp-product-attributes/7.0

[Guewen Baconnier @ Camptocamp]

[IMP] when creating a new option on a 'selection' attribute, the attribute_id should be pre-filled with the current attribute id and should not be editable

When we are editing a product and want to add a new option to an attribute,
actually, the form view for the option asks for the attribute despite the fact
that we come from an attribute.

This change does 2 things:

 * fills the attribute_id of the option with the attribute we come from
 * hide the attribute_id from the form view (but keep it displayed when accessed from the menu 'Attribute Options')

[Quentin THEURET @Amaris (qtheuret)]

review: Approve (code review)

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

LGTM

review: Approve

[lp:~camptocamp/openerp-product-attributes/7.0-no-attribute_id-on-option-creation-gbr]

215. By Guewen Baconnier @ Camptocamp on 2013-11-12

[MRG] from master

=== modified file 'base_custom_attributes/custom_attributes.py'
--- base_custom_attributes/custom_attributes.py	2013-11-11 15:50:07 +0000
+++ base_custom_attributes/custom_attributes.py	2013-11-12 08:03:12 +0000
@@ -132,6 +132,7 @@
                     kwargs['domain'] = "[('id', 'in', %s)]" % ids
             else:
                 kwargs['domain'] = "[('attribute_id', '=', %s)]" % attribute.attribute_id.id
+        kwargs['context'] = "{'default_attribute_id': %s}" % attribute.attribute_id.id
         kwargs['required'] = str(attribute.required or
                                  attribute.required_on_views)
         field = etree.SubElement(parent, 'field', **kwargs)

=== modified file 'base_custom_attributes/custom_attributes_view.xml'
--- base_custom_attributes/custom_attributes_view.xml	2013-10-16 09:50:02 +0000
+++ base_custom_attributes/custom_attributes_view.xml	2013-11-12 08:03:12 +0000
@@ -200,6 +200,19 @@
             parent="menu_attribute_in_admin" sequence="30"/>
 
     <!-- ATTRIBUTE OPTION VIEW -->
+        <record id="attribute_option_form_popup_view" model="ir.ui.view">
+            <field name="name">attribute.option.form.popup</field>
+            <field name="model">attribute.option</field>
+            <field name="priority" eval="6"/>
+            <field name="arch" type="xml">
+                <form string="Attribute Option" col="6">
+                    <field name="name" colspan="2"/>
+                    <field name="value_ref" colspan="2" groups="base.group_advanced_attribute"/>
+                    <field name="sequence" colspan="2"/>
+                </form>
+            </field>
+        </record>
+
         <record id="attribute_option_form_view" model="ir.ui.view">
             <field name="name">attribute.option.form</field>
             <field name="model">attribute.option</field>
@@ -250,6 +263,20 @@
             <field name="help"></field>
         </record>
 
+        <record id="attribute_option_form_action_tree" model="ir.actions.act_window.view">
+            <field name="sequence" eval="1"/>
+            <field name="act_window_id" ref="attribute_option_form_action"/>
+            <field name="view_id" ref="attribute_option_tree_view"/>
+            <field name="view_mode">tree</field>
+        </record>
+
+        <record id="attribute_option_form_action_form" model="ir.actions.act_window.view">
+            <field name="sequence" eval="2"/>
+            <field name="act_window_id" ref="attribute_option_form_action"/>
+            <field name="view_id" ref="attribute_option_form_view"/>
+            <field name="view_mode">form</field>
+        </record>
+
         <menuitem
             action="attribute_option_form_action" id="menu_attribute_option_action"
             parent="menu_attribute_in_admin" sequence="40"/>