From dfd33f6229da49b462b09058361216a165be1561 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 11 Dec 2013 15:14:18 +0100
Subject: [PATCH] [FIX] sale_stock: wrong model name in the action definition.
 Bug introduced with the latest merge with trunk

bzr revid: qdp-launchpad@openerp.com-20131211141418-1fx7g42dislaaiw1
---
 addons/sale_stock/stock_view.xml | 4 ++--
 addons/stock/stock.py            | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index f1a378a6345..9d03ecd3e57 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -5,11 +5,11 @@
         <!--  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.out</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="domain">[('picking_type_id.code','=','outgoing')]</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>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7f843d90415..b158f9fdfcb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3588,7 +3588,6 @@ class stock_picking_type(osv.osv):
         'sequence_id': fields.many2one('ir.sequence', 'Reference Sequence', required=True),
         'default_location_src_id': fields.many2one('stock.location', 'Default Source Location'),
         'default_location_dest_id': fields.many2one('stock.location', 'Default Destination Location'),
-        #TODO: change field name to "code" as it's not a many2one anymore
         'code': fields.selection([('incoming', 'Suppliers'), ('outgoing', 'Customers'), ('internal', 'Internal')], 'Picking type code', required=True),
         'return_picking_type_id': fields.many2one('stock.picking.type', 'Picking Type for Returns'),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', ondelete='cascade'),