From bfd157bf7ce0661d5b44eab76000d56545111c68 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Sat, 3 Aug 2013 16:41:22 +0200
Subject: [PATCH] [IMP] picking wave assignation

bzr revid: qdp-launchpad@openerp.com-20130803144122-2twmy13olv5aaag1
---
 addons/stock/stock_view.xml                   |  3 +-
 .../stock_picking_wave/stock_picking_wave.py  |  8 ++--
 .../stock_picking_wave_view.xml               | 43 +++++++++++++++++--
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e61b665d578..2962b59687c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -571,6 +571,7 @@
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="state"/>
+                    <field name="picking_type_id"/>
                 </tree>
             </field>
         </record>
@@ -666,7 +667,7 @@
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Picking Type"  domain="[]" context="{'group_by':'picking_type_id'}"/>
+                        <filter string="Picking Type" name="picking_type_id" domain="[]" context="{'group_by':'picking_type_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index 5411e8beaa6..7456995cffc 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -12,10 +12,11 @@ class stock_picking_wave(osv.osv):
         'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', help='List of picking associated to this wave'),
         'capacity': fields.float('Capacity', help='The capacity of the transport used to get the goods'),
         'capacity_uom': fields.many2one('product.uom', 'Unit of Measure', help='The Unity Of Measure of the transport capacity'),
-        'wave_type': fields.many2one('stock.picking.wave.type', 'Picking Wave Type'),
+        'wave_type_id': fields.many2one('stock.picking.wave.type', 'Picking Wave Type'),
         'state': fields.selection([('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
 
     }
+
     _defaults = {
         'name': '/',
         'state': 'in_progress',
@@ -73,14 +74,13 @@ class stock_picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
         'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
-
-        'wave_type': fields.many2one('stock.picking.wave', 'Picking Wave Type'),
+        'wave_type_ids': fields.related('partner_id', 'wave_type_ids', type="many2many", relation='stock.picking.wave.type', string='Picking Wave Type'),
     }
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'wave_type': fields.many2many('stock.picking.wave.type', 'stock_picking_wave_type_rel', 'wave_type_id', 'partner_id', 'Picking Wave Type'),
+        'wave_type_ids': fields.many2many('stock.picking.wave.type', 'stock_picking_wave_type_rel', 'wave_type_id', 'partner_id', 'Picking Wave Type'),
     }
 
 class stock_picking_wave_type(osv.osv):
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
index 4eb3afaf4ac..f4ec2c0d2c0 100644
--- a/addons/stock_picking_wave/stock_picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -24,7 +24,7 @@
                         <group>
                             <group>
                                 <field name="partner_id"/>
-                                <field name="wave_type"/>
+                                <field name="wave_type_id"/>
                             </group>
                             <group>
                                 <label for="capacity"/>
@@ -63,7 +63,7 @@
                     <field name="partner_id"/>
                     <field name="capacity"/>
                     <field name="capacity_uom"/>
-                    <field name="wave_type"/>
+                    <field name="wave_type_id"/>
                     <field name="time" widget="float_time"/>
                     <field name="state"/>
                 </tree>
@@ -115,9 +115,46 @@
             <xpath expr="//field[@name='picking_type_id']" position="after">
                 <field name="wave_id"/>
             </xpath>
-
+            <xpath expr="//field[@name='move_type']" position="after">
+                <field name="wave_type_ids" widget="many2many_tags"/>
+            </xpath>
         </field>
         </record>
+        <record model="ir.ui.view" id="view_stock_picking_wave_tree_inherit">
+        <field name="name">stock.picking.wave.inherit.tree</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.vpicktree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='picking_type_id']" position="after">
+                <field name="wave_type_ids" invisible="1"/>
+                <field name="wave_id"/>
+            </xpath>
+        </field>
+        </record>
+        <record model="ir.ui.view" id="view_stock_picking_wave_search_inherit">
+        <field name="name">stock.picking.wave.inherit.search</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_internal_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='picking_type_id']" position="after">
+                <filter string="Wave" domain="[]" context="{'group_by':'wave_id'}"/>
+            </xpath>
+            <xpath expr="//field[@name='picking_type_id']" position="after">
+                    <field name="wave_type_ids"/>
+            </xpath>
+        </field>
+        </record>
+
+        <record model="ir.ui.view" id="partner_wave_type">
+            <field name="name">partner.wave.type.view</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='active']" position="after">
+                    <field name="wave_type_ids" widget="many2many_tags"/>
+                </xpath>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="partner_wave_type">
             <field name="name">partner.wave.type.view</field>