[WIP]barcode interface, remove extra columns, rework interface, add functionality to split pack_op and set them processed

bzr revid: csn@openerp.com-20140307132523-z0eu9jlvi90baugu

1 files changed, 30 insertions, 100 deletions

diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml
index ad48c70bdb8..65c671641b6 100644
--- a/addons/stock/static/src/xml/picking.xml
+++ b/addons/stock/static/src/xml/picking.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
 
-    <t t-name="TactileListWidget">
+    <!-- <t t-name="TactileListWidget">
         <div class='oe_tactlist js_width' t-att-style="'width:' + widget.get_width() + 'px'">
             <div class='oe_tactlist_header'>
                 <t t-esc='widget.get_title()' />
@@ -44,7 +44,7 @@
                 <span class='oe_hresizer js_hresizer'>●</span>
             </div>
         </div>
-    </t>
+    </t> -->
 
     <t t-name='PickingEditorWidget'>
         <div class='oe_pick_list'>
@@ -54,30 +54,23 @@
             <table class='table table-condensed'>
                 <thead>
                     <tr>
-                        <th>Product</th> 
-                        <th class='text-center'>Total Qty</th> 
-                        <th class='text-center'>Qty done</th> 
-                        <th>Source Location</th>
-                        <th>Destination Location</th>
-                        <th>Lot</th>
-                        <th>Pack</th> 
-                        <th>Container</th>
-                        <th>Scan</th>
+                        <th class="text-center">Product</th> 
+                        <th class='text-center'>Quantity</th> 
+                        <th>From</th>
+                        <th>To</th>
                     </tr>
                 </thead>
 
                 <tbody>
                     <t t-foreach="widget.get_rows()" t-as="row">
                         <tr t-att-class="row.classes + ' js_pack_op_line'" t-att-data-id="row.cols.id">
-                            <td> <t t-esc="row.cols.product" /> </td>
-                            <td class='text-center'> <t t-esc="row.cols.qty" /> <t t-esc="row.cols.uom" /> </td>
-                            <td class='js_qty_rem text-center'> <t t-esc="row.cols.rem" /> </td>
-                            <td class="js_loc"> <t t-esc="row.cols.loc" /> </td>
+                            <td> <span class='btn btn-default js_pack_scan' t-att-op-id='row.cols.product_id'>➔</span> <t t-esc="row.cols.product" /> </td>
+                            <td class='text-center'><t t-esc="row.cols.rem" /> / <t t-esc="row.cols.qty" /> <t t-esc="row.cols.uom" /></td>
+                            <td class="js_loc"> <t t-esc="row.cols.loc" />
+                            <t t-if="row.cols.lot" ><span> : <t t-esc="row.cols.lot" /></span></t>
+                            <t t-if="row.cols.pack" ><span> : <t t-esc="row.cols.pack" /></span></t>
+                             </td>
                             <td class="js_loc"> <t t-esc="row.cols.dest" /> </td>
-                            <td> <t t-esc="row.cols.lot" /> </td>
-                            <td> <t t-esc="row.cols.pack" /> </td>
-                            <td class="js_container"> <t t-esc="row.cols.container" /> </td>
-                            <td><span class='btn btn-default js_pack_scan' t-att-op-id='row.cols.product_id'>➔</span></td>
                         </tr>
                     </t>
                 </tbody>
@@ -86,61 +79,6 @@
         </div>
     </t>
 
-    <t t-name='PackageEditorWidget'>
-        <div class='oe_pick_list'>
-            <h2><strong><div class='oe_pick_list_header'> <t t-esc="widget.get_header()" /> </div></strong></h2>
-            <table class='table table-striped'>
-
-                <thead>
-                    <tr>
-                        <th>Product</th> 
-                        <th class='text-center'>Qty</th> 
-                        <th class='text-center'>UoM</th> 
-                    </tr>
-                </thead>
-
-                <tbody>
-                    <t t-foreach="widget.get_rows()" t-as="row">
-                        <tr t-att-class="row.classes" t-att-op-id="row.att_op_id">
-                            <td> <t t-esc="row.cols.product" /> </td>
-                            <td class='qty text-center'> <t t-esc="row.cols.qty" /> </td>
-                            <td class='text-center'> <t t-esc="row.cols.uom" /> </td>
-                        </tr>
-                    </t>
-                </tbody>
-
-            </table>
-        </div>
-    </t>
-
-    <t t-name='PackageSelectorWidget'>
-        <div class='oe_pick_list'>
-            <h2><strong><div class='oe_pick_list_header'><t t-esc="widget.get_header()" /></div></strong></h2>
-            <table class='table table-striped'>
-
-                <thead>
-                    <tr>
-                        <th>Package</th> <th></th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    <t t-foreach="widget.get_rows()" t-as="row">
-                        <tr t-att-class="'js_pack_row' + row.classes" t-att-pack-id="row.id">
-                            <td class='js_pack_select col-md-8'> <t t-esc="row.cols.pack" /> </td>
-                            <td class='text-right col-md-4'> 
-                                <div class='btn btn-default js_pack_print'>Print</div>
-                                <div class='btn btn-default js_pack_plus'>Copy</div>
-                                <div class='btn btn-default js_pack_minus'>Delete</div>
-
-                            </td>
-                        </tr>
-                    </t>
-                </tbody>
-
-            </table>
-        </div>
-    </t>
     <t t-name="PickingSearchResults">
         <div class="panel-heading">
             <h3 class="panel-title">Search Results</h3>
@@ -167,36 +105,28 @@
         <div class="navbar navbar-inverse navbar-static-top" role="navigation">
             <div class="container">
                 <!-- <div class="navbar-header navbar-form"> -->
-                    <div class="navbar-header navbar-form navbar-left">
+                <div class="navbar-header navbar-form navbar-left">
                     <input type='text' class="oe_searchbox form-control pull-left" placeholder='Search'/>
                 </div>
                 <div class="navbar-header navbar-form navbar-right">
                     <!-- <div class='form-group'> -->
                         <button type="button" class="btn btn-danger js_pick_quit pull-right">Quit</button>
-                    </div>
-                    
                 </div>
+                    
+            </div>
             <!-- </div> -->
         </div>
         <div class="container">
-            <div class="row">
-                <div class="col-md-12">
-                    <h2 class="oe_title_label">Pickings</h2>
-                    <div class='oe_picking_not_found alert alert-warning hidden'>
-                        Scanned picking could not be found
-                    </div>
-
-                    <div class='oe_picking_search_results panel panel-info'>
-                    </div>
+            
+            <h1 class="js_title_label">Select your operation</h1>
+            <div class='js_picking_not_found alert alert-warning hidden'>
+                Scanned picking could not be found
+            </div>
 
-                    <div class='oe_picking_categories'>
-                        <p>
-                            Select the type of picking you want to process.
-                        </p>
-                    </div>
-                </div>
+            <div class='js_picking_search_results panel panel-info hidden'>
             </div>
-            <div class="row oe_picking_categories">
+            
+            <div class="row js_picking_categories">
                 <t t-foreach="widget.picking_types" t-as="type">
                     <div class="col-lg-3 col-md-4">
                         <div t-att-class="'oe_kanban oe_picking oe_kanban_color_' + type.color + ' ' + (widget.pickings_by_type[type.id].length === 0 ? 'oe_empty':'js_pick_last') " 
@@ -238,16 +168,16 @@
                             <button type="button" class='btn btn-info js_pick_print'> Print </button>
                     </div>
                     <h2 class="oe_pick_app_header" t-esc='widget.get_header()' />
-                    <input type='text' class="oe_searchbox align-left" placeholder='Filter by location...'/>
-                    <button type='button' class='btn btn-default js_clear_search'>Clear</button>
+                    <div class="input-group col-md-2">
+                        <input type="text" class="form-control oe_searchbox" placeholder="Filter by location..."/>
+                        <span class="input-group-btn">
+                            <button class="btn btn-danger js_clear_search" type="button">x</button>
+                        </span>
+                    </div>
                     <button type="button" class='btn btn-default js_pick_pack pull-right'> Put in Pack </button>
+                    <button type="button" class="btn btn-default js_pick_drop_down pull-right"> Drop Down </button>
                     <div class='oe_placeholder_picking_editor'/>
-                    
-                    <!-- <div class='oe_placeholder_package_editor'></div> -->
                 </div>
-                <!-- <div class="col-md-4">
-                    <div class='oe_placeholder_package_selector'></div>
-                </div> -->
             </div>
         </div>
     </t>