[MERGE]: Merged regarding product usability issue.

bzr revid: atp@tinyerp.com-20121127173127-gbwl7i71q86uqtgk

addons/account/product_view.xml

@@ -4,6 +4,7 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
+            <field name="priority">5</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">

addons/event_sale/event_sale.py

@@ -26,7 +26,7 @@ class product(osv.osv):
     _inherit = 'product.product'
     _columns = {
         'event_ok': fields.boolean('Event Subscription', help='Determine if a product needs to create automatically an event registration at the confirmation of a sale order line.'),
-        'event_type_id': fields.many2one('event.type', 'Type of Event', help='Filter the list of event on this category only, in the sale order lines'),
+        'event_type_id': fields.many2one('event.type', 'Type of Event', help='Select event types so when we use this product in Sale order line, it will filter events of this type only.'),
     }
 
     def onchange_event_ok(self, cr, uid, ids, event_ok, context=None):

addons/event_sale/event_sale_view.xml

@@ -10,9 +10,9 @@
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
                 </div>
-                <field name='default_code' position='before'>
+                <div name='ean' position="after">
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
-                </field>
+                </div>
              </field>
         </record>
 

addons/membership/membership_view.xml

@@ -84,9 +84,10 @@
         <record model="ir.ui.view" id="product_normal_form_view">
             <field name="name">Membership Products</field>
             <field name="model">product.product</field>
+            <field name="priority">6</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <page string="Information" position="after">
+                <page string="Accounting" position="after">
                     <page string="Membership">
                         <group col="1">
                             <group>

addons/product/product.py

@@ -323,7 +323,7 @@ class product_template(osv.osv):
             help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
-        'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
+        'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Supplier'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
     }
 

addons/product/product_view.xml

@@ -124,7 +124,7 @@
                                     </group>
                                 </group>
                             </page>
-                            <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
+                            <page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}">
                                 <group name="sale">
                                     <group string="Sale Conditions">
                                         <label for="warranty"/>

addons/purchase_requisition/purchase_requisition_view.xml

@@ -182,7 +182,7 @@
         <field name="model">product.product</field>
         <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
         <field name="arch" type="xml">
-            <field name="procure_method" position="before">
+            <field name="supply_method" position="after">
                 <field name="purchase_requisition"/>
             </field>
         </field>