Merge lp:~camptocamp/stock-logistic-flows/add-variant-dispach-report-jge into lp:stock-logistic-flows

[Joël Grand-Guillaume @ camptocamp]

[IMP] Add the variant in the dispatch report

Hi,

This add the variant in the dispatch report.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Joël,

Why don't you just simply don't show column if there is no variant?

Regards.

review: Needs Information

[lp:~camptocamp/stock-logistic-flows/add-variant-dispach-report-jge]

49. By Joël Grand-Guillaume @ camptocamp on 2014-02-24

merge from last head lp:stock-logistic-flows

50. By Joël Grand-Guillaume @ camptocamp on 2014-02-24

merge from lp:~camptocamp/stock-logistic-flows/add-variant-dispach-report-jge

51. By Joël Grand-Guillaume @ camptocamp on 2014-02-26

[FIX] Fix the page break after each page

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Pedro,

You're right, but the thing is, you may have some product that have a variant and some no. So I though it would be more clear to always have the column.. No ?

Regards,

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the clarification. Now, I understand. Let's continue then this way.

There have been other revisions that add some other code. Is that intended?

Regards.

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Something is wrong on the branch

review: Needs Resubmitting

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Added code is proposed here:

https://code.launchpad.net/~camptocamp/stock-logistic-flows/70-improve-dispatch-jge/+merge/210598

Unmerged revisions

51. By Joël Grand-Guillaume @ camptocamp on 2014-02-26

[FIX] Fix the page break after each page

50. By Joël Grand-Guillaume @ camptocamp on 2014-02-24

merge from lp:~camptocamp/stock-logistic-flows/add-variant-dispach-report-jge

49. By Joël Grand-Guillaume @ camptocamp on 2014-02-24

merge from last head lp:stock-logistic-flows

48. By Guewen Baconnier @ Camptocamp on 2014-02-18

merge from lp:~camptocamp/stock-logistic-flows/70-improve-dispatch-jge

47. By Guewen Baconnier @ Camptocamp on 2014-02-18

merge from lp:~camptocamp/stock-logistic-flows/7.0-picking_dispatch-user-optional

46. By Guewen Baconnier @ Camptocamp on 2014-02-18

merge from lp:~camptocamp/stock-logistic-flows/7.0-picking_dispatch-duplicate-move-1281471

45. By Guewen Baconnier @ Camptocamp on 2014-02-18

merge from lp:~camptocamp/stock-logistic-flows/7.0-picking_dispatch-fix-view-labels

44. By Guewen Baconnier @ Camptocamp on 2014-02-18

merge from lp:~camptocamp/stock-logistic-flows/7.0-picking_dispatch-user-optional

=== modified file 'picking_dispatch/picking_dispatch.py'
--- picking_dispatch/picking_dispatch.py	2014-02-18 09:07:52 +0000
+++ picking_dispatch/picking_dispatch.py	2014-02-26 09:27:40 +0000
@@ -169,6 +169,14 @@
                                                help='who this move is dispatched to'),
                 }
 
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default['dispatch_id'] = False
+        return super(StockMove, self).\
+            copy_data(cr, uid, id, default=default, context=context)
+
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """
         in addition to what the original method does, create backorder
@@ -283,6 +291,31 @@
     }
 
 
+class StockPickingIn(Model):
+    _inherit = "stock.picking.in"
+
+    def _get_related_dispatch(self, cr, uid, ids, field_names, arg=None, context=None):
+        return super(StockPickingIn, self)._get_related_dispatch(cr, uid, ids, field_names, arg=arg, context=context)
+
+    _columns = {
+        'related_dispatch_ids': fields.function(_get_related_dispatch, method=True, type='one2many',
+            relation='picking.dispatch', string='Related Dispatch Picking'),
+    }
+
+
+class StockPickingOut(Model):
+    _inherit = "stock.picking.out"
+
+    def _get_related_dispatch(self, cr, uid, ids, field_names, arg=None, context=None):
+        return super(StockPickingOut, self)._get_related_dispatch(cr, uid, ids, field_names, arg=arg, context=context)
+
+    _columns = {
+        'related_dispatch_ids': fields.function(_get_related_dispatch, method=True, type='one2many',
+            relation='picking.dispatch', string='Related Dispatch Picking'),
+    }
+
+
+
 class Product(Model):
     _inherit = "product.product"
 

=== modified file 'picking_dispatch/picking_dispatch_view.xml'
--- picking_dispatch/picking_dispatch_view.xml	2013-04-16 14:29:17 +0000
+++ picking_dispatch/picking_dispatch_view.xml	2014-02-26 09:27:40 +0000
@@ -27,9 +27,11 @@
                 <field name="name"/>
               </h1>
             </div>
-            <field name="picker_id"/>
-            <field name="date"/>
-            <field name="backorder_id"/>
+            <group>
+              <field name="picker_id"/>
+              <field name="date"/>
+              <field name="backorder_id"/>
+            </group>
             <notebook colspan="4">
               <page string="Stock Moves">
                 <field name="move_ids" nolabel="1" colspan='4' widget="many2many"
@@ -119,7 +121,7 @@
     <!-- Stock Out picking : add dispatch infos -->
     <record id="view_picking_form" model="ir.ui.view">
       <field name="name">stock.picking.form.dispatch.out</field>
-      <field name="model">stock.picking</field>
+      <field name="model">stock.picking.out</field>
       <field name="inherit_id" ref="stock.view_picking_out_form"/>
       <field name="type">form</field>
       <field name="arch" type="xml">
@@ -149,7 +151,7 @@
     <!-- Stock In picking : add dispatch infos -->
     <record id="view_picking_form_in" model="ir.ui.view">
       <field name="name">stock.picking.form.dispatch.in</field>
-      <field name="model">stock.picking</field>
+      <field name="model">stock.picking.in</field>
       <field name="inherit_id" ref="stock.view_picking_in_form"/>
       <field name="type">form</field>
       <field name="arch" type="xml">

=== modified file 'picking_dispatch/report/dispatch.html.mako'
--- picking_dispatch/report/dispatch.html.mako	2012-12-10 10:51:23 +0000
+++ picking_dispatch/report/dispatch.html.mako	2014-02-26 09:27:40 +0000
@@ -39,6 +39,7 @@
   <tr align="left">
     <th>${_('Product Code')}</th>
     <th>${_('Product')}</th>
+    <th>${_('Variant')}</th>
     <th>${_('Carrier')}</th>
     <th>${_('QTY')}</th>
     <th>${_('Explanation')}</th>
@@ -47,6 +48,13 @@
       <tr align="left">
         <td>${product.default_code}</td>
         <td>${product.name}</td>
+        <td>
+            %if product.variants:
+              ${product.variants}
+            %else:
+              ${'-'}
+            %endif
+        </td>
         <td>${carrier}</td>
         <td>${qty}</td>
         <td>${_('stock error')}<br/>${_('breakage')}</td>
@@ -57,7 +65,7 @@
   %endfor
 </table>
 %endfor
-        <p style="page-break-after:always">&nbsp</>
+<p style="page-break-after:always">&nbsp;</p>
 %endfor
 </body>
 </html>