Merge lp:~unifield-team/unifield-wm/uf-28-warning-rw into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/uf-28-warning-rw]

2456. By Duy VO on 2015-03-26

US-28: Changed the warning message to be clearer.

2457. By Duy VO on 2015-03-26

US-28: Removed the deco call

=== modified file 'delivery_mechanism/delivery_mechanism.py'
--- delivery_mechanism/delivery_mechanism.py	2015-03-23 10:11:31 +0000
+++ delivery_mechanism/delivery_mechanism.py	2015-03-26 15:30:31 +0000
@@ -24,6 +24,7 @@
 from osv import osv, fields
 from osv.orm import browse_record
 from tools.translate import _
+from order_types.stock import check_rw_warning
 
 
 class stock_picking_processing_info(osv.osv_memory):
@@ -1294,6 +1295,7 @@
     def _manual_create_rw_messages(self, cr, uid, context=None):
         return
 
+    @check_rw_warning
     def enter_reason(self, cr, uid, ids, context=None):
         '''
         open reason wizard

=== modified file 'delivery_mechanism/wizard/enter_reason.py'
--- delivery_mechanism/wizard/enter_reason.py	2014-11-04 09:13:14 +0000
+++ delivery_mechanism/wizard/enter_reason.py	2015-03-26 15:30:31 +0000
@@ -25,7 +25,6 @@
 
 import netsvc
 
-
 class enter_reason(osv.osv_memory):
     '''
     wizard called to split a memory stock move from create picking wizard

=== modified file 'msf_outgoing/msf_outgoing_view.xml'
--- msf_outgoing/msf_outgoing_view.xml	2015-03-09 13:15:15 +0000
+++ msf_outgoing/msf_outgoing_view.xml	2015-03-26 15:30:31 +0000
@@ -251,7 +251,7 @@
 									<field name="inactive_product" invisible="1" />
                                     <field name="inactive_error" attrs="{'invisible': [('inactive_product', '=', False)]}" />
                                     <field name="pt_created" invisible="1" />
-                                    <button name="call_cancel_wizard" type="object" string="Cancel" states="draft,assigned,confirmed" icon="gtk-del"  attrs="{'invisible': [('pt_created', '=', True)]}" />
+                                    <button name="call_cancel_wizard" type="object" string="Cancel" states="draft,assigned,confirmed" icon="gtk-del"  attrs="{'invisible': [('pt_created', '=', True)]}"   context="{'from_button': True}"  />
 								</tree>
 								<form string="Stock Moves">
 									<group colspan="2" col="4">
@@ -336,8 +336,8 @@
                                 <field name="line_state" readonly="1" attrs="{'invisible': [('state', '!=', 'draft')]}" nolabel="1" />
                                 <field name="flow_type" />
                                 <group colspan="1" col="1">
-                                    <button name="call_cancel_wizard" type="object" states="draft" string="_Cancel Picking" icon="gtk-cancel"/>
-                                    <button name="button_cancel" states="assigned,confirmed" string="_Cancel Picking" icon="gtk-cancel"/>
+                                    <button name="call_cancel_wizard" type="object" states="draft" string="_Cancel Picking" icon="gtk-cancel"   context="{'from_button': True}" />
+                                    <button name="button_cancel" states="assigned,confirmed" string="_Cancel Picking" icon="gtk-cancel"   context="{'from_button': True}" />
                                 </group>
                                 <field name="has_draft_moves" invisible="1" />
                                 <button name="action_confirm_moves" states="draft" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': [('has_draft_moves', '=', False)]}"/>
@@ -1067,7 +1067,7 @@
 							<group col="12" colspan="4">
 								<field name="state" readonly="1"/>
 								<field name="flow_type" />
-								<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel Picking" icon="gtk-cancel"/>
+								<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel Picking" icon="gtk-cancel"  context="{'from_button': True}" />
 								<button name="action_assign" states="draft,confirmed" string="Check Availability" type="object" icon="gtk-find"/>
 								<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
 								<button name="packing" states="assigned" string="Pack..." type="object" icon="gtk-go-forward"/>

=== modified file 'order_types/stock.py'
--- order_types/stock.py	2015-03-10 15:17:55 +0000
+++ order_types/stock.py	2015-03-26 15:30:31 +0000
@@ -23,72 +23,83 @@
 from order_types import ORDER_PRIORITY, ORDER_CATEGORY
 from tools.translate import _
 
-
+# US-28: Refactored the method decoration to be reused for both RW and CP
+def cp_rw_warning(func, rw_flag, *args, **kwargs):
+    self = args[0]
+    kw_keys = kwargs.keys()
+
+    from_button = False
+    if kwargs.get('context'):
+        from_button = kwargs['context'].get('from_button')
+    elif len(args) > 4 and isinstance(args[4], dict ):
+        from_button = args[4].get('from_button')
+
+    from_cp_check = kwargs.get('context', {}).get('from_cp_check')
+    wargs = kwargs.get('context', {}).get('callback', {}) or kwargs
+    if from_button and not from_cp_check:
+        cr = args[1]
+        uid = args[2]
+        ids = args[3]
+        pick_obj = self.pool.get('stock.picking')
+        rw_type = hasattr(pick_obj, '_get_usb_entity_type') and pick_obj._get_usb_entity_type(cr, uid) or False
+                  
+        text = "remote warehouse"
+        this_instance = "central platform"
+        if rw_flag == pick_obj.REMOTE_WAREHOUSE:    
+            text = "central platform"
+            this_instance = "remote warehouse"
+    
+        if rw_type == rw_flag:
+            name = """This action should only be performed at the %s instance! Are you sure to proceed it at this %s instance?""" %(text, this_instance)
+            model = 'confirm'
+            step = 'default'
+            question = name
+            clazz = self._name
+            args = [ids]
+            kwargs = {}
+            wiz_obj = self.pool.get('wizard')
+            # open the selected wizard
+            callback = {
+                'clazz': clazz,
+                'func': func.__name__,
+                'args': args,
+                'kwargs': kwargs,
+                'from_cp_check': True,
+            }
+            tmp_context = dict(kwargs.get('context', {}),
+                               question=question,
+                               callback=callback,
+                               from_cp_check=True)
+    
+    
+            res = wiz_obj.open_wizard(cr, uid, ids,
+                                      name=name,
+                                      model=model,
+                                      step=step,
+                                      context=tmp_context)
+            return res
+    new_kwargs = {}
+    for kwk in kw_keys:
+        if kwk in wargs:
+            new_kwargs[kwk] = wargs[kwk]
+
+    res = func(*args, **new_kwargs)
+    if from_cp_check and not (isinstance(res, dict) and res.get('res.model') != 'wizard'):
+        return {'type': 'ir.actions.act_window_close'}
+    else:
+        return res
+
+# US-28: Refactored the method decoration to be reused for both RW and CP warning
 def check_cp_rw(func):
     def decorated(*args, **kwargs):
-        self = args[0]
-        kw_keys = kwargs.keys()
-
-        from_button = False
-        if kwargs.get('context'):
-            from_button = kwargs['context'].get('from_button')
-        elif len(args) > 4 and isinstance(args[4], dict ):
-            from_button = args[4].get('from_button')
-
-        from_cp_check = kwargs.get('context', {}).get('from_cp_check')
-        wargs = kwargs.get('context', {}).get('callback', {}) or kwargs
-        if from_button and not from_cp_check:
-            cr = args[1]
-            uid = args[2]
-            ids = args[3]
-            pick_obj = self.pool.get('stock.picking')
-            rw_type = hasattr(pick_obj, '_get_usb_entity_type') and \
-                      pick_obj._get_usb_entity_type(cr, uid) or False
-
-            if rw_type == self.pool.get('stock.picking').CENTRAL_PLATFORM:
-                name = """This action should only be performed at the Remote
-    Warehouse instance! Are you sure to proceed it at this main instance?"""
-                model = 'confirm'
-                step = 'default'
-                question = name
-                clazz = self._name
-                args = [ids]
-                kwargs = {}
-                wiz_obj = self.pool.get('wizard')
-                # open the selected wizard
-                callback = {
-                    'clazz': clazz,
-                    'func': func.__name__,
-                    'args': args,
-                    'kwargs': kwargs,
-                    'from_cp_check': True,
-                }
-                tmp_context = dict(kwargs.get('context', {}),
-                                   question=question,
-                                   callback=callback,
-                                   from_cp_check=True)
-
-
-                res = wiz_obj.open_wizard(cr, uid, ids,
-                                          name=name,
-                                          model=model,
-                                          step=step,
-                                          context=tmp_context)
-                return res
-
-        new_kwargs = {}
-        for kwk in kw_keys:
-            if kwk in wargs:
-                new_kwargs[kwk] = wargs[kwk]
-
-        res = func(*args, **new_kwargs)
-        if from_cp_check and not (isinstance(res, dict) and res.get('res.model') != 'wizard'):
-            return {'type': 'ir.actions.act_window_close'}
-        else:
-            return res
-
-    return decorated
-
+        return cp_rw_warning(func, "central_platform", *args, **kwargs)
+    return decorated
+
+# US-28: Refactored the method decoration to be reused for both RW and CP warning
+def check_rw_warning(func):
+    def decorated(*args, **kwargs):
+        return cp_rw_warning(func, "remote_warehouse", *args, **kwargs)
+    return decorated
 
 class stock_move(osv.osv):
     _name = 'stock.move'

=== modified file 'stock_override/stock.py'
--- stock_override/stock.py	2015-03-24 08:53:36 +0000
+++ stock_override/stock.py	2015-03-26 15:30:31 +0000
@@ -34,6 +34,7 @@
 import decimal_precision as dp
 from msf_partner import PARTNER_TYPE
 from order_types.stock import check_cp_rw
+from order_types.stock import check_rw_warning
 
 
 #----------------------------------------------------------
@@ -588,6 +589,8 @@
     def cancel_assign(self, cr, uid, ids, *args, **kwargs):
         return super(stock_picking, self).cancel_assign(cr, uid, ids)
 
+ 
+    @check_rw_warning
     def call_cancel_wizard(self, cr, uid, ids, context=None):
         '''
         Call the wizard of cancelation (ask user if he wants to resource goods)
@@ -1318,6 +1321,7 @@
         'has_to_be_resourced': False,
     }
 
+    @check_rw_warning
     def call_cancel_wizard(self, cr, uid, ids, context=None):
         '''
         Call the wizard to ask user if he wants to re-source the need

=== modified file 'stock_override/stock_view.xml'
--- stock_override/stock_view.xml	2015-03-19 09:01:18 +0000
+++ stock_override/stock_view.xml	2015-03-26 15:30:31 +0000
@@ -369,7 +369,7 @@
                                     <button name="call_cancel_wizard" icon="gtk-del" string="Cancel &amp; Resource" type="object" 
                                             confirm="Do you really want to delete selected record ?"
                                             attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" 
-                                            context="{'from_int': 1}"/>
+                                            context="{'from_int': 1, 'from_button': True}"/>
                                 </tree>
 
                                 <form string="Stock Moves">
@@ -465,7 +465,7 @@
                                 <field name="state" readonly="1"/>
                                 <field name="has_draft_moves" invisible="1" />
                                 <!-- <button name="return_to_state" string="Return to initial state" states="import" icon="gtk-execute" type="object" />-->
-                                <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object" />
+                                <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object"  context="{'from_button': True}"/>
                                 <button name="draft_force_assign" states="draft,confirmed,assigned" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': ['|', '&amp;', ('state', 'in', ['done', 'cancel', 'import']), ('state', '!=', 'draft'), ('has_draft_moves', '=', False)]}" />
                                 <button name="action_assign" states="confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}"/>
                                 <button name="force_assign" states="confirmed,assigned" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />
@@ -617,7 +617,7 @@
                                     <field name="price_changed" invisible="1" />
                                     <button name="get_price_changed" type="object" string="Price changed" icon="terp-dolar_ok!" attrs="{'invisible': ['|', ('price_changed', '=', False), ('fake_state', '!=', 'done')]}" />
                                     <field name="from_wkf" invisible="1" />
-                                    <button name="call_cancel_wizard" type="object" string="Cancel" attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" icon="gtk-del" />
+                                    <button name="call_cancel_wizard" type="object" string="Cancel" attrs="{'invisible': ['|', ('from_wkf', '=', False), ('fake_state', 'in', ('cancel', 'done'))]}" icon="gtk-del"  context="{'from_button': True}" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="4">
@@ -707,7 +707,7 @@
                                     string="Cancel"
                                     type="object"
                                     icon="gtk-cancel"
-                                    context="{'cancel_type': 'update_out'}"
+                                    context="{'cancel_type': 'update_out', 'from_button': True}"
                                     confirm="Warning, you are going to Cancel!"
                                     />
                                 <field name="from_wkf_sourcing" invisible="1" />
@@ -717,6 +717,7 @@
                                     string="Cancel &amp; Resource"
                                     type="object"
                                     icon="gtk-cancel"
+                                    context="{'from_button': True}" 
                                     confirm="Warning, you are going to Cancel and Resource!"
                                     />
 
@@ -906,7 +907,7 @@
                                     <field name="inactive_product" invisible="1" />
                     				<field name="inactive_error" attrs="{'invisible': [('inactive_product', '=', False)]}" />
                                     <button name="%(stock.action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward" invisible="1"/>
-                                    <button name="call_cancel_wizard" type="object" string="Cancel" states="draft,assigned,confirmed" icon="gtk-del" />
+                                    <button name="call_cancel_wizard" type="object" string="Cancel" states="draft,assigned,confirmed" icon="gtk-del"  context="{'from_button': True}" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="4">
@@ -996,7 +997,7 @@
                                 <button name="set_delivered" icon="gtk-apply" type="object" string="Confirm Delivery" attrs="{'invisible': ['|', '|', '|', ('type', '!=', 'out'), ('subtype', '!=', 'standard'), ('state', '!=', 'done'), ('delivered', '=', True)]}"/>
                                 <field name="cross_docking_ok" invisible="1"/>
                                 <!--<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>-->
-                                <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object" />
+                                <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object"  context="{'from_button': True}" />
                                 <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                 <button name="action_assign" states="confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}" />
                                 <button name="convert_to_pick" states="draft,confirmed,assigned" string="Convert to Picking Ticket" type="object" icon="gtk-convert" context="{'from_button': True}" />