[MERGE] forward port of branch 8.0 up to ed1c173

1 files changed, 49 insertions, 24 deletions

diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml
index 8bc25b51d96..e95cfeb8a9a 100644
--- a/addons/stock/static/src/xml/picking.xml
+++ b/addons/stock/static/src/xml/picking.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name='PickingEditorWidget'>
-        
+
         <div class="modal fade" id="js_LocationChooseModal" tabindex="-1" role="dialog" aria-labelledby="LocationChooseModal" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -44,18 +44,42 @@
                     </div>
                 </div>
             </div>
-        </div>        
+        </div>
 
+        <div class="modal fade" id="js_PackConfModal" tabindex="-1" role="dialog" aria-labelledby="PackConfModal" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
+                        <h4 class="modal-title" id="myModalLabel">Configure package</h4>
+                    </div>
+                    <div class="modal-body">
+                        <p>Package type</p>
+                        <select id="js_packconf_select" class="form-control">
+                            <option class="js_packing_option" data-ul-id="false"></option>
+                            <t t-foreach="widget.get_logisticunit()" t-as="ul">
+                                <option class="js_packing_option" t-att-data-ul-id="ul.id" t-att-value="ul.id"><t t-esc="ul.name"/></option>
+                            </t>
+                        </select>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary js_validate_pack">Validate package</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
         <div class="row">
                 <div>
                     <div class="col-sm-4 col-xs-6">
                         <h2 class="oe_pick_app_header" />
                     </div>
                     <div class="col-sm-8 col-xs⁻6 text-right">
-                        
+
                     <button type="button" class='btn btn-default js_pick_done'> Create backorder </button>
                     <button type="button" class='btn btn-default js_pick_print'> Print </button>
-                        
+
                     </div>
                 </div>
         </div>
@@ -67,7 +91,7 @@
                         <select id="js_select" class="form-control">
                             <option value="ToDo" id="js_select_todo">Operations ToDo</option>
                             <option value="Processed" id="js_select_processed">Operations Processed</option>
-                        </select> 
+                        </select>
                     </strong>
                     </h3>
                 </div>
@@ -83,18 +107,18 @@
                 </div>
                 <div class="col-md-6 col-sm-4 col-xs-12 text-right">
                     <h3>
-                        <button type="button" class='btn btn-default js_pick_pack'> Put in Pack </button>
-                        <button type="button" class='btn btn-danger js_drop_down'> Process </button>
+                        <button type="button" class='btn btn-default js_pick_pack js_putinpack'> Put in Pack </button>
+                        <button type="button" class='btn btn-danger js_drop_down fa fa-download'> Put in Cart </button>
                     </h3>
                 </div>
             </div>
         </div>
 
-        <div>  
+        <div>
             <table class='table table-condensed js_op_table_todo'>
                 <thead>
                     <tr>
-                        <th class="text-left">Product</th> 
+                        <th class="text-left">Product</th>
                         <th class='text-center' width="150">Scanned</th>
                         <th class='text-center'>Todo</th>
                         <th>From</th>
@@ -104,17 +128,17 @@
 
                 <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" t-att-data-container-id="row.cols.container_id">
-                            <td t-att-class="'text-left' + row.cols.head_container ? ' js_unfold' : ''"> 
+                        <tr t-att-class="row.classes + 'js_pack_op_line'" t-att-data-id="row.cols.id" t-att-data-container-id="row.cols.container_id" t-att-data-package-id="row.cols.package_id" t-att-data-ulid="row.cols.ul_id">
+                            <td t-att-class="'brctbl-col1 text-left' + row.cols.head_container ? ' js_unfold' : ''">
                                 <t t-if="!row.cols.head_container &amp;&amp; row.cols.container"><span class="fa fa-level-up fa-rotate-90" style="margin-left:10px;margin-right:10px;"></span></t>
-                                <t t-esc="row.cols.product" /> 
+                                <t t-esc="row.cols.product" />
                             </td>
-                            <td class='text-center js_row_qty'>
+                            <td class='brctbl-col2 text-center js_row_qty'>
                                 <t t-if="row.cols.processed == 'false' &amp;&amp; !row.cols.container">
                                     <div class="input-group">
                                         <span class="input-group-addon js_minus input-sm" t-att-data-product-id='row.cols.product_id'><a href="#"><i class="fa fa-minus"></i></a></span>
                                         <form class="js_submit_value">
-                                            <input type="text" class="form-control text-center js_qty" t-att-placeholder="row.cols.rem"></input>
+                                            <input type="text" class="form-control text-center js_qty" t-att-value="row.cols.rem"></input>
                                             <!-- <input type="submit" class="hidden"></input> -->
                                         </form>
                                         <span class="input-group-addon js_plus input-sm" t-att-data-product-id='row.cols.product_id'><a href="#"><i class="fa fa-plus"></i></a></span>
@@ -124,22 +148,22 @@
                                     <t t-esc="row.cols.rem" />
                                 </t>
                             </td>
-                            <td class="text-center">
+                            <td class="brctbl-col3 text-center">
                                 <t t-esc="row.cols.qty"/> <t t-esc="row.cols.uom" />
                             </td>
-                            <td class="js_loc">
+                            <td class="brctbl-col4 js_loc">
                                 <t t-esc="row.cols.loc" />
                                 <t t-if="row.cols.pack" ><span> : <t t-esc="row.cols.pack" /></span></t>
                                 <t t-if="row.cols.lot" ><span> : <t t-esc="row.cols.lot" /></span></t>
                             </td>
-                            <td class="js_loc"> <t t-esc="row.cols.dest" /> 
+                            <td class="brctbl-col5 js_loc"> <t t-esc="row.cols.dest" />
                                 <div class="pull-right btn-group">
                                     <button type="button" class="btn btn-default dropdown-toggle fa fa-cog" data-toggle="dropdown">
                                      <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu" role="menu">
-                                        <t t-if="!row.cols.lot &amp;&amp; row.cols.product_id">
-                                            <li><a class="js_create_lot" href="#">Create Lot</a></li>
+                                        <t t-if="row.cols.product_id">
+                                            <li><a class="js_create_lot" href="#">Create &#47; Change Lot</a></li>
                                         </t>
                                         <t t-if="!row.cols.head_container &amp;&amp; !row.cols.container">
                                             <li><a class="js_change_src" href="#">Change source location</a></li>
@@ -148,6 +172,7 @@
                                         <t t-if="row.cols.head_container">
                                             <li><a class="js_pack_change_dst" href="#">Change destination location</a></li>
                                             <li class="divider"></li>
+                                            <li><a class="js_pack_configure" href="#">Configure package</a></li>
                                             <li><a class="js_delete_pack" href="#">Remove from package</a></li>
                                             <li><a class="js_print_pack" href="#">Print package label</a></li>
                                         </t>
@@ -192,11 +217,11 @@
                 <div class="navbar-header navbar-form navbar-right">
                     <button type="button" class="btn btn-danger js_pick_quit pull-right">Quit</button>
                 </div>
-                    
+
             </div>
         </div>
         <div class="container">
-            
+
             <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
@@ -204,11 +229,11 @@
 
             <div class='js_picking_search_results panel panel-info hidden'>
             </div>
-            
+
             <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') " 
+                        <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') "
                                          t-att-data-id="type.id">
                             <t t-if="type.code == 'incoming'" ><span class="fa fa-sign-in fa-2x"></span></t>
                             <t t-if="type.code == 'outgoing'" ><span class="fa fa-truck fa-2x fa-flip-horizontal"></span></t>
@@ -220,7 +245,7 @@
                         </div>
                     </div>
                 </t>
-            </div>    
+            </div>
         </div>
     </t>