From dc2731d56580dda3822ca26dea1d974e660edf61 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Tue, 3 Sep 2013 17:52:02 +0200
Subject: [PATCH] [ADD] Move deliveries to invoice form sale_stock to
 stock_account

bzr revid: jco@openerp.com-20130903155202-v36vooidj800q56e
---
 addons/sale_stock/__openerp__.py            |  1 -
 addons/sale_stock/stock_view.xml            | 19 -------------------
 addons/stock_account/stock_account_view.xml | 13 +++++++++++++
 3 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 addons/sale_stock/stock_view.xml

diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index 059c5a59c1d..f6c94841e69 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -53,7 +53,6 @@ You can choose flexible invoicing methods:
         'company_view.xml',
         'sale_stock_view.xml',
         'sale_stock_workflow.xml',
-        'stock_view.xml',
         'res_config_view.xml',
         'report/sale_report_view.xml',
     ],
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
deleted file mode 100644
index b06f56d6659..00000000000
--- a/addons/sale_stock/stock_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!--  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">[('location_id.usage','=','internal'), ('location_dest_id.usage','!=','internal')]</field>
-            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
-            <field name="search_view_id" ref="stock.view_picking_internal_search"/>
-        </record>
-        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/>
-
-    </data>
-</openerp>
diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index 6f3d469b440..6e104e18508 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -52,5 +52,18 @@
                 </field>
             </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">[('location_id.usage','=','internal'), ('location_dest_id.usage','!=','internal')]</field>
+            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
+            <field name="search_view_id" ref="stock.view_picking_internal_search"/>
+        </record>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/>
+
     </data>
 </openerp>