From 110e5ac904c3c5bc337eebd68ef553eadc32fa63 Mon Sep 17 00:00:00 2001
From: "JMA (OpenERP)" <jma@tinyerp.com>
Date: Tue, 12 Oct 2010 18:16:16 +0530
Subject: [PATCH] [FIX] sale : Corrections

bzr revid: jma@tinyerp.com-20101012124616-ab7ia1hc0n5vzdqa
---
 addons/sale/stock_view.xml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 2739c8dfdfc..dddcad07932 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -13,8 +13,6 @@
             </field>
         </record>
         
-<<<<<<< TREE
-=======
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -27,7 +25,6 @@
             </field>
         </record>
         
->>>>>>> MERGE-SOURCE
         <act_window
             domain="[('sale_id', '=', active_id)]"
             id="act_sale_order_2_stock_picking"
@@ -36,41 +33,20 @@
             src_model="sale.order"
             context="{'contact_display': 'partner'}" />
        
-<<<<<<< TREE
-       <record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
-=======
        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
->>>>>>> MERGE-SOURCE
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
-<<<<<<< TREE
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-=======
             <field name="view_id" ref="stock.view_picking_out_tree"/>
->>>>>>> MERGE-SOURCE
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
-<<<<<<< TREE
-        <record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
-=======
         
         <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
->>>>>>> MERGE-SOURCE
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
-<<<<<<< TREE
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-=======
             <field name="view_id" ref="stock.view_picking_out_form"/>
->>>>>>> MERGE-SOURCE
             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
         </record>
         
-<<<<<<< TREE
-        
-        
-=======
->>>>>>> MERGE-SOURCE
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">