Merge lp:~unifield-team/unifield-wm/us-655 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/us-655]

2704. By Quentin THEURET @Amaris on 2016-01-21

Merge latest trunk

2705. By Quentin THEURET @Amaris on 2016-01-21

US-655 [FIX] Recompute the name of the consumer location in the Real consumption report when the consumer location is selected or changed
US-655 [FIX] Recompute the name of the consumer location or activity in the Real consumption report when the name of the location is changed

=== modified file 'consumption_calculation/consumption_calculation.py'
--- consumption_calculation/consumption_calculation.py	2015-10-08 14:59:02 +0000
+++ consumption_calculation/consumption_calculation.py	2016-01-21 10:02:15 +0000
@@ -131,11 +131,47 @@
                 res[obj.id] = True
         return res
 
+    def _get_stock_location(self, cr, uid, ids, context=None):
+        """
+        Return the list of real consumption reports to update
+        """
+        return self.pool.get('real.average.consumption').search(cr, uid, [
+            '|',
+            ('cons_location_id', 'in', ids),
+            ('activity_id', 'in', ids),
+        ], context=context)
+
+    def _get_act_name(self, cr, uid, ids, fields, arg, context=None):
+        """
+        Set the activity name when the activity_id is changed
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+        for rac in self.browse(cr, uid, ids, context=context):
+            res[rac.id] = {}
+            res[rac.id]['activity_name'] = rac.activity_id and rac.activity_id.name or ''
+            res[rac.id]['cons_location_name'] = rac.cons_location_id and rac.cons_location_id.name or ''
+
+        return res
+
     _columns = {
         'name': fields.char(size=64, string='Reference'),
         'creation_date': fields.datetime(string='Creation date', required=1),
         'cons_location_id': fields.many2one('stock.location', string='Consumer location', domain=[('usage', '=', 'internal')], required=True),
+        'cons_location_name': fields.function(_get_act_name, method=True, type='char', string='Consumer location Name', readonly=True, size=128, multi='loc_name', store={
+                'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['cons_location_id'], 10),
+                'stock.location': (_get_stock_location, ['name'], 20),
+            },),
         'activity_id': fields.many2one('stock.location', string='Activity', domain=[('usage', '=', 'customer')], required=1),
+        'activity_name': fields.function(_get_act_name, method=True, type='char', string='Activity Name', readonly=True, size=128, multi='loc_name', store={
+                'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['activity_id'], 10),
+                'stock.location': (_get_stock_location, ['name'], 20),
+            },),
         'period_from': fields.date(string='Period from', required=True),
         'period_to': fields.date(string='Period to', required=True),
         'sublist_id': fields.many2one('product.list', string='List/Sublist', ondelete='set null'),

=== modified file 'consumption_calculation/consumption_view.xml'
--- consumption_calculation/consumption_view.xml	2015-05-18 12:40:26 +0000
+++ consumption_calculation/consumption_view.xml	2016-01-21 10:02:15 +0000
@@ -102,8 +102,8 @@
             <field name="arch" type="xml">
                 <tree string="Real consumption reports">
             <field name="name" />
-                    <field name="cons_location_id" />
-                    <field name="activity_id" />
+                    <field name="cons_location_name" string="Consumer location" />
+                    <field name="activity_name" string="Activity" />
                     <field name="period_from" />
                     <field name="period_to" />
                     <field name="nb_lines" />