Merge lp:~unifield-team/unifield-server/us-941 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor.py'
--- bin/addons/msf_outgoing/wizard/ppl_processor.py	2016-11-09 09:07:38 +0000
+++ bin/addons/msf_outgoing/wizard/ppl_processor.py	2017-01-16 10:09:31 +0000
@@ -48,7 +48,18 @@
         ),
     }
 
-    def do_ppl_step1(self, cr, uid, ids, context=None):
+    def do_check_ppl(self, cr, uid, ids, context=None):
+        """
+        Run a check of the integrity of lines
+        """
+        if context is None:
+            context = {}
+
+        res = self.do_ppl_step1(cr, uid, ids, context=context, just_check=True)
+
+        return res
+
+    def do_ppl_step1(self, cr, uid, ids, context=None, just_check=False):
         """
         Make some integrity checks and call the do_ppl_step1 method of the stock.picking object
         """
@@ -73,6 +84,7 @@
         to_smaller_ids = []
         overlap_ids = []
         gap_ids = []
+        ok_ids = []
 
         for wizard in self.browse(cr, uid, ids, context=context):
             # List of sequences
@@ -80,6 +92,7 @@
 
             for line in wizard.move_ids:
                 sequences.append((line.from_pack, line.to_pack, line.id))
+                ok_ids.append(line.id)
 
             # If no data, we return False
             if not sequences:
@@ -124,7 +137,10 @@
         if gap_ids:
             ppl_move_obj.write(cr, uid, gap_ids, {'integrity_status': 'gap'}, context=context)
 
-        if missing_ids or to_smaller_ids or overlap_ids or gap_ids:
+        if not (missing_ids or to_smaller_ids or overlap_ids or gap_ids) and just_check:
+            ppl_move_obj.write(cr, uid, ok_ids, {'integrity_status': 'empty'}, context=context)
+
+        if missing_ids or to_smaller_ids or overlap_ids or gap_ids or just_check:
             view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'ppl_processor_step1_form_view')[1]
             return {
                 'type': 'ir.actions.act_window',
@@ -643,6 +659,15 @@
 
         return super(ppl_move_processor, self).create(cr, uid, vals, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Remove the integrity status value if from_pack or to_pack is changed.
+        """
+        if vals.get('from_pack') or vals.get('to_pack'):
+            vals['integrity_status'] = 'empty'
+
+        return super(ppl_move_processor, self).write(cr, uid, ids, vals, context=context)
+
     def _get_line_data(self, cr, uid, wizard=False, move=False, context=None):
         """
         Just put the stock move product quantity into the ppl.move.processor
@@ -727,6 +752,18 @@
 
         return pick_wiz_id
 
+    # View methods
+    def from_to_pack_change(self, cr, uid, ids, from_pack, to_pack):
+        """
+        Remove the integrity status when from/to pack value is changed
+        """
+        if from_pack or to_pack:
+            return {
+                'value': {'integrity_status': 'empty',},
+            }
+
+        return {}
+
 ppl_move_processor()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/ppl_processor_view.xml	2016-10-28 15:31:38 +0000
+++ bin/addons/msf_outgoing/wizard/ppl_processor_view.xml	2017-01-16 10:09:31 +0000
@@ -15,8 +15,9 @@
                            colspan="4" nolabel="1" />
                     <group colspan="4" col="6" name="actions">
                         <separator string="Actions" colspan="6" />
-                        <label colspan="4"> </label>
+                        <label colspan="3"> </label>
                         <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                        <button name="do_check_ppl" type="object" string="Check integrity" icon="gtk-info" />
                         <button name="do_ppl_step1" type="object" string="Next" icon="gtk-go-forward" />
                     </group>
                 </form>
@@ -79,8 +80,8 @@
                            />
                     <field name="prodlot_id" readonly="1" />
                     <field name="qty_per_pack" />
-                    <field name="from_pack" />
-                    <field name="to_pack" />
+                    <field name="from_pack" on_change="from_to_pack_change(from_pack, to_pack)" />
+                    <field name="to_pack" on_change="from_to_pack_change(from_pack, to_pack)" />
                     <button name="open_split_wizard"
                             type="object"
                             icon="terp-stock_effects-object-colorize"
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-02 08:52:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-01-16 10:09:31 +0000
@@ -75814,6 +75814,7 @@
 msgid "Partner Created on this instance"
 msgstr "Partenaire créé sur cette instance"
 
+<<<<<<< TREE
 #. module: account_reconciliation
 #: code:addons/account_reconciliation/wizard/account_reconcile.py:207
 #, python-format
@@ -75854,3 +75855,9 @@
 #, python-format
 msgid "Wrong total: %.2f, instead of: %.2f"
 msgstr "Total erroné : %.2f, au lieu de : %.2f"
+=======
+#. module: msf_outgoing
+#: view:ppl.processor:0
+msgid "Check integrity"
+msgstr "Vérifier les erreurs"
+>>>>>>> MERGE-SOURCE