Modifs

bzr revid: fp@tinyerp.com-20080901073047-mjtabn8119dbqiaf

diff --cc addons/mrp/mrp.py
index 37d9cc0,37d9cc0..219253c
--- 1/addons/mrp/mrp.py
--- 2/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@@ -668,9 -668,9 +668,9 @@@ class mrp_procurement(osv.osv)
          'date_close': fields.date('Date Closed'),
          'product_id': fields.many2one('product.product', 'Product', required=True),
          'product_qty': fields.float('Quantity', required=True),
--        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
--        'product_uos_qty': fields.float('Quantity'),
--        'product_uos': fields.many2one('product.uom', 'Product UOM'),
++        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
++        'product_uos_qty': fields.float('UoS Quantity'),
++        'product_uos': fields.many2one('product.uom', 'Product UoS'),
          'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
  
          'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),

diff --cc addons/mrp/mrp_view.xml
index e453054,e453054..f4f85c0
--- 1/addons/mrp/mrp_view.xml
--- 2/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@@ -389,11 -389,11 +389,9 @@@
                                                <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
                                                <field name="product_qty"/>
                                                <field name="product_uom"/>
--                                              <group colspan="6" col="6">
--                                                      <label string="" colspan="2"/>
--                                                      <field name="product_uos_qty" groups="product.group_uos"/>
--                                                      <field name="product_uos" groups="product.group_uos"/>
--                                              </group>
++                        <label string="" colspan="2"/>
++                        <field name="product_uos_qty" groups="product.group_uos"/>
++                        <field name="product_uos" groups="product.group_uos"/>
                                        </group>
  
                      <notebook colspan="4">

diff --cc addons/mrp_operations/mrp_operations_view.xml
index 9cd3ae9,9cd3ae9..83e78b5
--- 1/addons/mrp_operations/mrp_operations_view.xml
--- 2/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@@ -56,7 -56,7 +56,7 @@@
                <field name="name">All Operations</field>
                <field name="type">ir.actions.act_window</field>
                <field name="res_model">mrp.production.workcenter.line</field>
--              <field name="view_type">tree</field>
++              <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
        </record>
  
@@@ -66,7 -66,7 +66,7 @@@
                <field name="name">Confirm Operations</field>
                <field name="type">ir.actions.act_window</field>
                <field name="res_model">mrp.production.workcenter.line</field>
--              <field name="view_type">tree</field>
++              <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
                <field name="domain">[('state','=','confirm')]</field>
        </record>
@@@ -77,7 -77,7 +77,7 @@@
                <field name="name">Draft Operations</field>
                <field name="type">ir.actions.act_window</field>
                <field name="res_model">mrp.production.workcenter.line</field>
--              <field name="view_type">tree</field>
++              <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
                <field name="domain">[('state','=','draft')]</field>
        </record>