Merge lp:~dorian-kemps/unifield-web/US-6687 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2019-05-22 17:40:06 +0000
+++ addons/openerp/controllers/templates/form.mako	2020-02-04 10:20:59 +0000
@@ -223,7 +223,7 @@
             error_display(_("The form contains errors."));
             % endif
             % if loading_id:
-            jQuery.fancybox({'href': "/openerp/progressbar?model=${form.screen.model}&id=${form.screen.id}&job_id=${loading_id}", 'modal': false, 'onClickClosed': function() {window.editRecord(${form.screen.id})}});
+            jQuery.fancybox({'href': "/openerp/progressbar?model=${form.screen.model}&id=${form.screen.id}&job_id=${loading_id}", 'modal': true, 'showCloseButton': false});
             % endif
         })
     </script>

=== modified file 'addons/openerp/controllers/templates/progress.mako'
--- addons/openerp/controllers/templates/progress.mako	2019-07-22 08:51:53 +0000
+++ addons/openerp/controllers/templates/progress.mako	2020-02-04 10:20:59 +0000
@@ -61,6 +61,8 @@
                         } else {
                             $('#open_src').show();
                         }
+                        $('#close_box').click(function() {jQuery.fancybox.close(); document.location.reload();});
+                        $('#close_box').show();
                     }
                 }
                 });
@@ -132,6 +134,7 @@
             <td>
             <button id="open_src" style="display:none">View Object</button>
             <button id="open_target" style="display:none">View Target</button>
+            <button id="close_box" style="display:none">${_("Close")}</button>
             </td>
         </tr>
     </table>

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2020-01-28 09:55:50 +0000
+++ addons/openerp/static/javascript/form.js	2020-02-04 10:20:59 +0000
@@ -428,6 +428,8 @@
         s_ids = ListView('order_line').getSelectedRecords();
     } else if (jQuery('[id="move_lines"]').length > 0){
         s_ids = ListView('move_lines').getSelectedRecords();
+    } else if (model == 'shipment' && jQuery('[id="pack_family_memory_ids"]').length > 0){
+        s_ids = ListView('pack_family_memory_ids').getSelectedRecords();
     }
 
     var params = {

=== modified file 'addons/openerp/static/javascript/form_state.js'
--- addons/openerp/static/javascript/form_state.js	2019-04-15 12:09:58 +0000
+++ addons/openerp/static/javascript/form_state.js	2020-02-04 10:20:59 +0000
@@ -354,6 +354,8 @@
             break;
         case 'invisible': form_setVisible(container, widget, !result);
             break;
+        case 'notselectable': form_setNotSelectable(container, widget, result);
+            break;
         default:
     }
 }
@@ -693,6 +695,17 @@
     }
 }
 
+function form_setNotSelectable(container, field, notSelectable) {
+    var editable = getElement('_terp_editable').value;
+    if (editable == 'True' && notSelectable) {
+        // find the checkboxes used to select lines
+        var selectors = field.getElementsByClassName('grid-record-selector');
+        for (var i = 0; i < selectors.length; i++) {
+            selectors[i].style.visibility = 'hidden';
+        }
+    }
+}
+
 jQuery(document).ready(function(){
     form_hookContextMenu();
     form_hookStateChange();