document: fix regressions at storage and node_descriptor

[odoo/odoo.git] / addons / sale / stock_view.xml

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 2739c8d..4075c52 100644 (file)
--- 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,7 @@
             </field>
         </record>
         
->>>>>>> MERGE-SOURCE
+        <!--
         <act_window
             domain="[('sale_id', '=', active_id)]"
             id="act_sale_order_2_stock_picking"
@@ -36,41 +34,21 @@
             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">
@@ -85,5 +63,18 @@
             </field>
         </record>
 
+        <!--  Add menu: Billing - Deliveries to invoice -->
+        <record id="outgoing_picking_list_to_invoice" model="ir.actions.act_window">
+            <field name="name">Deliveries to Invoice</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
+            <field name="search_view_id" ref="stock.view_picking_out_search"/>
+        </record>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="sale.menu_invoiced" sequence="20"/>
+
     </data>
 </openerp>