Merge lp:~unifield-team/unifield-wm/uf-2511 into lp:unifield-wm

[jftempo]

=== modified file 'threshold_value/threshold_value.py'
--- threshold_value/threshold_value.py	2014-01-15 09:14:35 +0000
+++ threshold_value/threshold_value.py	2014-10-10 12:33:23 +0000
@@ -22,10 +22,11 @@
 
 from osv import osv
 from osv import fields
+from tools.translate import _
 
 from mx.DateTime import DateFrom
 from mx.DateTime import now
-from mx.DateTime import RelativeDate 
+from mx.DateTime import RelativeDate
 
 class threshold_value(osv.osv):
     _name = 'threshold.value'
@@ -260,6 +261,23 @@
         ret = super(threshold_value, self).write(cr, uid, ids, vals, context=context)
         return ret
 
+    def on_change_compute_method(self, cr, uid, ids, compute_method,
+        context=None):
+        res = {}
+        if compute_method and compute_method == 'computed':
+            # UF-2511: switch from 'fixed' to 'compute' compute method
+            # warn user to refresh values
+            # (are not any more computed in 'fixed' mode)
+            msg = "You switch from 'fixed values' to 'computed values'. " \
+                "Please click on 'Refresh values' button to compute values."
+            res = {
+                'warning': {
+                    'title': _('Warning'),
+                    'message': _(msg),
+                    },
+            }
+        return res
+
 threshold_value()
 
 class threshold_value_line(osv.osv):
@@ -349,6 +367,18 @@
         res = {}
 
         for line in self.browse(cr, uid, ids, context=context):
+            if context and context.get('compute_method', False) == 'fixed':
+                # UF-2511: do not compute in 'fixed' compute method mode
+                res[line.id] = {
+                    'consumption': 0.,
+                    'real_stock': 0.,
+                    'available_stock': 0.,
+                    'expiry_before': False,
+                    'supplier_id': False,
+                    'required_date': False,
+                }
+                continue
+
             # Stock values
             location_id = line.threshold_value_id.location_id.id
             stock_product = product_obj.browse(cr, uid, line.product_id.id, context=dict(context, location=location_id))

=== modified file 'threshold_value/threshold_value_view.xml'
--- threshold_value/threshold_value_view.xml	2014-03-14 09:48:25 +0000
+++ threshold_value/threshold_value_view.xml	2014-10-10 12:33:23 +0000
@@ -12,7 +12,7 @@
                     <separator colspan="4" string="General Information" />
                     <field name="name" />
                     <field name="warehouse_id" widget="selection" on_change="onchange_warehouse_id(warehouse_id)" />
-                    <field name="compute_method" />
+                    <field name="compute_method" on_change="on_change_compute_method(compute_method)"/>
                     <field name="location_id" />
                     <field name="active" attrs="{'invisible': [('compute_method', '=', False)]}" />
                     <newline />
@@ -49,7 +49,7 @@
 
                     <group colspan="4" col="4" attrs="{'invisible': [('compute_method', '=', False)]}">
                         <button colspan="4" icon="gtk-execute" string="Refresh values" type="object" name="dummy" />
-                        <field name="line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('compute_method', '!=', 'computed')]}" context="{'rule_id': active_id}">
+                        <field name="line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('compute_method', '!=', 'computed')]}" context="{'rule_id': active_id, 'compute_method': compute_method}">
                             <tree string="Products" editable="top">
                                 <field name="product_id" domain="[('list_ids', '=', parent.sublist_id), ('type', 'not in', ['service', 'service_recep', 'consu'])]"
                                     on_change="onchange_product_id(product_id, parent.compute_method, parent.consumption_method, parent.consumption_period_from, parent.consumption_period_to, parent.frequency, parent.safety_month, parent.lead_time,parent.supplier_lt, fixed_threshold_value, fixed_product_qty, False, 'product_id', context)"/>
@@ -66,7 +66,7 @@
                             </tree>
                         </field>
 
-                        <field name="fixed_line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('compute_method', '!=', 'fixed')]}">
+                        <field name="fixed_line_ids" nolabel="1" colspan="4" attrs="{'invisible': [('compute_method', '!=', 'fixed')]}" context="{'compute_method': compute_method}">
                             <tree string="Products" editable="top">
                                 <field name="product_id" domain="[('list_ids', '=', parent.sublist_id), ('type', 'not in', ['service', 'service_recep', 'consu'])]"
                                        on_change="onchange_product_id(product_id, parent.compute_method, parent.consumption_method, parent.consumption_period_from, parent.consumption_period_to, parent.frequency, parent.safety_month, parent.lead_time,parent.supplier_lt, fixed_threshold_value, fixed_product_qty, context)"/>