openerp-community-reviewer team mailing list archive

[Mohammad Alhashash <alhashash@xxxxxxxxxxxxx>]

Mohammad Alhashash has proposed merging lp:~alhashash/ocb-addons/7.0-ocb-bugs-1177076-1177063 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1177063 in OpenERP Community Backports (Addons): "[7.0][stock] Incorrect o2m stock.move views selected in stock.picking forms"
  https://bugs.launchpad.net/ocb-addons/+bug/1177063
  Bug #1177076 in OpenERP Community Backports (Addons): "[7.0][stock] production lot/serial is not shown in stock.move form view if pack tracking is not enabled"
  https://bugs.launchpad.net/ocb-addons/+bug/1177076

For more details, see:
https://code.launchpad.net/~alhashash/ocb-addons/7.0-ocb-bugs-1177076-1177063/+merge/188533

Fixing bugs lp:1177076 and lp:1177063
-- 
https://code.launchpad.net/~alhashash/ocb-addons/7.0-ocb-bugs-1177076-1177063/+merge/188533
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~alhashash/ocb-addons/7.0-ocb-bugs-1177076-1177063 into lp:ocb-addons.

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-09-20 13:54:03 +0000
+++ stock/stock_view.xml	2013-10-01 09:25:41 +0000
@@ -780,7 +780,7 @@
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'picking_type': 'internal'}" options='{"reload_on_button": true}'/>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree', 'picking_type': 'internal'}" options='{"reload_on_button": true}'/>
                             <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>
                         <page string="Additional Info">
@@ -914,7 +914,7 @@
                     <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Customer" domain="[('customer','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
-                    <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}" options='{"reload_on_button": true}'/>
+                    <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>
                 </xpath>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_chatter">
@@ -1041,7 +1041,7 @@
                     <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
-                    <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}" options='{"reload_on_button": true}'/>
+                    <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree'}" options='{"reload_on_button": true}'/>
                 </xpath>
                 <xpath expr="/form/sheet" position="after">
                     <div class="oe_chatter">
@@ -1259,7 +1259,7 @@
                             <field name="date" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                         </group>
                         <group string="Traceability"
-                            groups="stock.group_tracking_lot">
+                            groups="stock.group_tracking_lot,stock.group_production_lot">
                             <label for="tracking_id" groups="stock.group_tracking_lot"/>
                             <div groups="stock.group_tracking_lot">
                                 <field name="tracking_id" class="oe_inline"/>