Merge lp:~unifield-team/unifield-wm/utp-768-883 into lp:unifield-wm

[jftempo]

=== modified file 'consumption_calculation/consumption_calculation.py'
--- consumption_calculation/consumption_calculation.py	2013-09-05 09:32:29 +0000
+++ consumption_calculation/consumption_calculation.py	2013-11-04 14:27:47 +0000
@@ -1646,7 +1646,7 @@
         
         if not nb_months: nb_months = 1
         
-        uom_id = self.browse(cr, uid, ids[0], context=context).uom_id.id
+        uom_id = self.read(cr, uid, ids[0], ['uom_id'], context=context)['uom_id'][0]
         res = res/nb_months
         res = self.pool.get('product.uom')._compute_qty(cr, uid, uom_id, res, uom_id)
             

=== modified file 'consumption_calculation/history_consumption.py'
--- consumption_calculation/history_consumption.py	2012-04-20 07:58:44 +0000
+++ consumption_calculation/history_consumption.py	2013-11-04 14:27:47 +0000
@@ -27,16 +27,29 @@
 
 import time
 
+HIST_STATUS = [('draft', 'Draft'), ('in_progress', 'In Progress'), ('ready', 'Ready')]
 
-class product_history_consumption(osv.osv_memory):
+class product_history_consumption(osv.osv):
     _name = 'product.history.consumption'
+    _rec_name = 'location_id'
+
+    def _get_status(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Return the same status as status
+        '''
+        res = {}
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = obj.status
+
+        return res
 
     _columns = {
-        'date_from': fields.date(string='From date', required=True),
-        'date_to': fields.date(string='To date', required=True),
+        'date_from': fields.date(string='From date'),
+        'date_to': fields.date(string='To date'),
         'month_ids': fields.one2many('product.history.consumption.month', 'history_id', string='Months'),
         'consumption_type': fields.selection([('rac', 'Real Average Consumption'), ('amc', 'Average Monthly Consumption')],
-                                             string='Consumption type', required=True),
+                                             string='Consumption type'),
         'location_id': fields.many2one('stock.location', string='Location', domain="[('usage', '=', 'internal')]"),
         'sublist_id': fields.many2one('product.list', string='List/Sublist'),
         'nomen_id': fields.many2one('product.nomenclature', string='Products\' nomenclature level'),
@@ -44,10 +57,17 @@
         'nomen_manda_1': fields.many2one('product.nomenclature', 'Group'),
         'nomen_manda_2': fields.many2one('product.nomenclature', 'Family'),
         'nomen_manda_3': fields.many2one('product.nomenclature', 'Root'),
+        'requestor_id': fields.many2one('res.users', string='Requestor'),
+        'requestor_date': fields.datetime(string='Date of the demand'),
+        'fake_status': fields.function(_get_status, method=True, type='selection', selection=HIST_STATUS, readonly=True, string='Status'),
+        'status': fields.selection(HIST_STATUS, string='Status'),
     }
 
     _defaults = {
         'date_to': lambda *a: (DateFrom(time.strftime('%Y-%m-%d')) + RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
+        'requestor_id': lambda obj, cr, uid, c: uid,
+        'requestor_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'status': 'draft',
     }
 
     def open_history_consumption(self, cr, uid, ids, context=None):
@@ -82,21 +102,27 @@
         if date_from and date_to:
             res['value'].update({'month_ids': []})
             current_date = DateFrom(date_from) + RelativeDateTime(day=1)
+            if current_date > (DateFrom(date_to) + RelativeDateTime(months=1, day=1, days=-1)):
+                return {'warning': {'title': _('Error'),
+                                    'message':  _('The \'To Date\' should be greater than \'From Date\'')}}
             # For all months in the period
             while current_date <= (DateFrom(date_to) + RelativeDateTime(months=1, day=1, days=-1)):
                 search_ids = month_obj.search(cr, uid, [('name', '=', current_date.strftime('%m/%Y')), ('history_id', 'in', ids)], context=context)
                 # If the month is in the period and not in the list, create it
                 if not search_ids:
-                    month_id = month_obj.create(cr, uid, {'name': current_date.strftime('%m/%Y'),
-                                                          'date_from': current_date.strftime('%Y-%m-%d'),
-                                                          'date_to': (current_date + RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
-                                                          'history_id': ids[0]})
-                    res['value']['month_ids'].append(month_id)
+#                    month_id = month_obj.create(cr, uid, {'name': current_date.strftime('%m/%Y'),
+#                                                          'date_from': current_date.strftime('%Y-%m-%d'),
+#                                                          'date_to': (current_date + RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
+#                                                          'history_id': ids[0]}, context=context)
+#                    res['value']['month_ids'].append(month_id)
+                    res['value']['month_ids'].append({'name': current_date.strftime('%m/%Y'),
+                                                      'date_from': current_date.strftime('%Y-%m-%d'),
+                                                      'date_to': (current_date + RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d')})
                 else:
                     res['value']['month_ids'].extend(search_ids)
                 current_date = current_date + RelativeDateTime(months=1)
         else:
-            res['value'] = {'month_ids': [False]}
+            res['value'] = {'month_ids': []}
 
         # Delete all months out of the period
         del_months = []
@@ -109,9 +135,9 @@
         return res
 
 
-    def create_lines(self, cr, uid, ids, context=None):
+    def get_data(self, cr, uid, ids, context=None):
         '''
-        Create one line by product for the period
+        Get parameters of the report
         '''
         if not context:
             context = {}
@@ -131,6 +157,9 @@
         nb_months = len(months)
         total_consumption = {}
 
+        if not months:
+            raise osv.except_osv(_('Error'), _('You have to choose at least one month for consumption history'))
+
         if obj.nomen_manda_0:
             for report in self.browse(cr, uid, ids, context=context):
                 product_ids = []
@@ -158,7 +187,6 @@
                 if product.id not in products:
                     batch_mandatory = product.batch_management or product.perishable
                     date_mandatory = not product.batch_management and product.perishable
-                    self.pool.get('product.product').write(cr, uid, ids, {'name': product.id,})
 
         if obj.sublist_id:
             context.update({'search_default_list_ids': obj.sublist_id.id})
@@ -171,13 +199,72 @@
             domain = []
 
         new_context = context.copy()
-        new_context.update({'months': [], 'amc': obj.consumption_type == 'amc' and 'AMC' or 'RAC', 'obj_id': obj.id, 'history_cons': True})
+        new_context.update({'months': [], 'amc': obj.consumption_type == 'amc' and 'AMC' or 'RAC', 'obj_id': obj.id, 'history_cons': True, 'need_thread': True})
 
         # For each month, compute the RAC
         for month in self.pool.get('product.history.consumption.month').browse(cr, uid, months, context=context):
             new_context['months'].append({'date_from': month.date_from, 'date_to': month.date_to})
 
 
+        return product_ids, domain, new_context
+
+    def create_lines(self, cr, uid, ids, context=None):
+        '''
+        Create one line by product for the period
+        '''
+        if not context:
+            context = {}
+
+        product_ids, domain, new_context = self.get_data(cr, uid, ids, context=context)
+
+        if not product_ids:
+            product_ids = self.pool.get('product.product').search(cr, uid, [], context=new_context)
+
+        import threading
+        self.write(cr, uid, ids, {'status': 'in_progress'}, context=context)
+        new_thread = threading.Thread(target=self._create_lines, args=(cr, uid, ids, product_ids, new_context))
+        new_thread.start()
+        new_thread.join(10.0)
+        if new_thread.isAlive():
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'consumption_calculation', 'history_consumption_waiting_view')[1]
+            return {'type': 'ir.actions.act_window',
+                    'res_model': 'product.history.consumption',
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_id': ids[0],
+                    'view_id': [view_id],
+                    'context': new_context,
+                    'target': 'same'}
+
+        return self.open_report(cr, uid, ids, context=new_context)
+
+    def _create_lines(self, cr, uid, ids, product_ids, context=None):
+        '''
+        Create lines in background
+        '''
+        import pooler
+        new_cr = pooler.get_db(cr.dbname).cursor()
+
+        try:
+            self.pool.get('product.product').read(new_cr, uid, product_ids, ['average'], context=context)
+        except Exception, e:
+            cr.rollback()
+        self.write(new_cr, uid, ids, {'status': 'ready'}, context=context)
+
+        new_cr.commit()
+        new_cr.close()
+
+        return
+
+    def open_report(self, cr, uid, ids, context=None):
+        '''
+        Open the report
+        '''
+        if not context:
+            context = {}
+
+        product_ids, domain, new_context = self.get_data(cr, uid, ids, context=context)
+
         return {'type': 'ir.actions.act_window',
                 'res_model': 'product.product',
                 'domain': domain,
@@ -186,6 +273,33 @@
                 'context': new_context,
                 'target': 'dummy'}
 
+    def unlink(self, cr, uid, ids, context=None):
+        '''
+        Remove the data saved in DB
+        '''
+        hist_obj = self.pool.get('product.history.consumption.product')
+        for cons in self.browse(cr, uid, ids, context=context):
+            hist_ids = hist_obj.search(cr, uid, [('consumption_id', '=', cons.id)], context=context)
+            hist_obj.unlink(cr, uid, hist_ids, context=context)
+        return super(product_history_consumption, self).unlink(cr, uid, ids, context=context)
+
+    def in_progress(self, cr, uid, ids, context=None):
+        '''
+        Return dummy
+        '''
+        return self.go_to_list(cr, uid, ids, context=context)
+
+    def go_to_list(self, cr, uid, ids, context=None):
+        '''
+        Returns to the list of reports
+        '''
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'product.history.consumption',
+                'view_mode': 'tree,form',
+                'view_type': 'form',
+                'target': 'dummy',
+                'context': context}
+
 ##############################################################################################################################
 # The code below aims to enable filtering products regarding their nomenclature.
 # NB: the difference with the other same kind of product filters (with nomenclature and sublist) is that here we are dealing with osv_memory
@@ -212,7 +326,7 @@
 
 product_history_consumption()
 
-class product_history_consumption_month(osv.osv_memory):
+class product_history_consumption_month(osv.osv):
     _name = 'product.history.consumption.month'
     _order = 'name, date_from, date_to'
 
@@ -220,7 +334,7 @@
         'name': fields.char(size=64, string='Month'),
         'date_from': fields.date(string='Date from'),
         'date_to': fields.date(string='Date to'),
-        'history_id': fields.many2one('product.history.consumption', string='History'),
+        'history_id': fields.many2one('product.history.consumption', string='History', ondelete='cascade'),
     }
 
 product_history_consumption_month()
@@ -230,6 +344,79 @@
     _name = 'product.product'
     _inherit = 'product.product'
 
+    def export_data(self, cr, uid, ids, fields_to_export, context=None):
+        '''
+        Override the export_data function to add fictive fields
+        '''
+        if not context:
+            context = {}
+
+        history_fields = []
+        new_fields_to_export = []
+        fields_sort = {}
+        sort_iter2 = 0
+        default_code_index = False
+        remove_default_code = False
+
+        # Add fictive fields
+        if context.get('history_cons', False):
+            months = context.get('months', [])
+            
+            if context.get('amc', False) and 'average' in fields_to_export:
+                history_fields.append('average')
+
+            if 'default_code' not in fields_to_export:
+                fields_to_export.append('default_code')
+                remove_default_code = True
+
+            for month in months:
+                field_name = DateFrom(month.get('date_from')).strftime('%m_%Y')
+                if field_name in fields_to_export:
+                    history_fields.append(field_name)
+
+            # Prepare normal fields to export to avoid error on export data with fictive fields
+            to_export_iter = 0
+            for f in fields_to_export:
+                if f not in history_fields:
+                    new_fields_to_export.append(f)
+                    if f == 'default_code':
+                        default_code_index = to_export_iter
+                    to_export_iter += 1
+
+                # We save the order of the fields to read them in the good order
+                fields_sort.update({sort_iter2: f})
+                sort_iter2 += 1
+
+        res = super(product_product, self).export_data(cr, uid, ids, new_fields_to_export, context=dict(context, history_cons=False))
+
+        # Set the fields in the good order
+        if context.get('history_cons', False):
+            new_data = []
+            for r in res['datas']:
+                new_r = []
+                product_id = self.search(cr, uid, [('default_code', '=', r[default_code_index])], context=context)
+                datas = {}
+                if product_id:
+                    datas = self.read(cr, uid, product_id, history_fields + ['default_code', 'id'], context=context)[0]
+
+                iter_r = 0
+                for j in range(sort_iter2):
+                    f = fields_sort[j]
+
+                    if f == 'default_code' and remove_default_code:
+                        continue
+
+                    if f in history_fields:
+                        new_r.append(str(datas.get(f, 0.00)))
+                    else:
+                        new_r.append(r[iter_r])
+                        iter_r += 1
+                new_data.append(new_r)
+
+            res['datas'] = new_data
+        
+        return res
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if not context:
            context = {}
@@ -255,7 +442,7 @@
             tmp_months.sort()
 
             for month in tmp_months:
-                line_view += """<field name="%s" />""" % DateFrom(month).strftime('%m/%Y')
+                line_view += """<field name="%s" />""" % DateFrom(month).strftime('%m_%Y')
 
             line_view += "</tree>"
 
@@ -282,7 +469,7 @@
             months = context.get('months', [])
 
             for month in months:
-                res.update({DateFrom(month.get('date_from')).strftime('%m/%Y'): {'digits': (16,2),
+                res.update({DateFrom(month.get('date_from')).strftime('%m_%Y'): {'digits': (16,2),
                                                                                  'selectable': True,
                                                                                  'type': 'float',
                                                                                  'string': '%s' % DateFrom(month.get('date_from')).strftime('%m/%Y')}})
@@ -299,8 +486,11 @@
         '''
         Set value for each month
         '''
+        cons_prod_obj = self.pool.get('product.history.consumption.product')
+
         if context is None:
             context = {}
+
         if context.get('history_cons', False):
             res = super(product_product, self).read(cr, uid, ids, vals, context=context, load=load)
 
@@ -317,28 +507,120 @@
                 raise osv.except_osv(_('Error'), _('No months found !'))
 
             obj_id = context.get('obj_id')
-
             for r in res:
                 total_consumption = 0.00
                 for month in context.get('months'):
-                    field_name = DateFrom(month.get('date_from')).strftime('%m/%Y')
+                    field_name = DateFrom(month.get('date_from')).strftime('%m_%Y')
                     cons_context = {'from_date': month.get('date_from'), 'to_date': month.get('date_to'), 'location_id': context.get('location_id')}
                     consumption = 0.00
+                    cons_prod_domain = [('name', '=', field_name),
+                                        ('product_id', '=', r['id']),
+                                        ('consumption_id', '=', obj_id)]
                     if context.get('amc') == 'AMC':
-                        consumption = self.pool.get('product.product').compute_amc(cr, uid, r['id'], context=cons_context)
+                        cons_prod_domain.append(('cons_type', '=', 'amc'))
+                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                        if cons_id:
+                            consumption = cons_prod_obj.browse(cr, uid, cons_id[0], context=context).value
+                        else:
+                            consumption = self.pool.get('product.product').compute_amc(cr, uid, r['id'], context=cons_context) or 0.00
+                            cons_prod_obj.create(cr, uid, {'name': field_name,
+                                                           'product_id': r['id'],
+                                                           'consumption_id': obj_id,
+                                                           'cons_type': 'amc',
+                                                           'value': consumption}, context=context)
                     else:
-                        consumption = self.pool.get('product.product').browse(cr, uid, r['id'], context=cons_context).monthly_consumption
+                        cons_prod_domain.append(('cons_type', '=', 'fmc'))
+                        cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                        if cons_id:
+                            consumption = cons_prod_obj.browse(cr, uid, cons_id[0], context=context).value
+                        else:
+                            consumption = self.pool.get('product.product').browse(cr, uid, r['id'], context=cons_context).monthly_consumption or 0.00
+                            cons_prod_obj.create(cr, uid, {'name': field_name,
+                                                           'product_id': r['id'],
+                                                           'consumption_id': obj_id,
+                                                           'cons_type': 'fmc',
+                                                           'value': consumption}, context=context)
                     total_consumption += consumption
                     # Update the value for the month
                     r.update({field_name: consumption})
 
                 # Update the average field
+                cons_prod_domain = [('name', '=', 'average'),
+                                    ('product_id', '=', r['id']),
+                                    ('consumption_id', '=', obj_id),
+                                    ('cons_type', '=', context.get('amc') == 'AMC' and 'amc' or 'fmc')]
                 r.update({'average': round(total_consumption/float(len(context.get('months'))),2)})
+                cons_id = cons_prod_obj.search(cr, uid, cons_prod_domain, context=context)
+                if cons_id:
+                    cons_prod_obj.write(cr, uid, cons_id, {'value': r['average']}, context=context)
+                else:
+                    cons_prod_obj.create(cr, uid, {'name': 'average',
+                                                   'product_id': r['id'],
+                                                   'consumption_id': obj_id,
+                                                   'cons_type': context.get('amc') == 'AMC' and 'amc' or 'fmc',
+                                                   'value': r['average']}, context=context)
         else:
             res = super(product_product, self).read(cr, uid, ids, vals, context=context, load=load)
 
         return res
 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        '''
+        Update the search method to sort by fictive fields if needed
+        '''
+        if not context:
+            context = {}
+
+        hist_obj = self.pool.get('product.history.consumption.product')
+
+        res = super(product_product, self).search(cr, uid, args, offset, limit, order, context, count)
+
+        if context.get('history_cons', False) and context.get('obj_id', False) and order:
+            hist_domain = [('consumption_id', '=', context.get('obj_id'))]
+            if context.get('amc') == 'AMC':
+                hist_domain.append(('cons_type', '=', 'amc'))
+            else:
+                hist_domain.append(('cons_type', '=', 'fmc'))
+
+            for order_part in order.split(','):
+                order_split = order_part.strip().split(' ')
+                order_field = order_split[0]
+                order_direction = order_split[1].strip() if len(order_split) == 2 else ''
+                if order_field != 'id' and order_field not in self._columns and order_field not in self._inherit_fields:
+                    hist_domain.append(('name', '=', order_field))
+                    hist_ids = hist_obj.search(cr, uid, hist_domain, offset=offset, limit=limit, order='value %s' % order_direction, context=context)
+                    res = list(x['product_id'][0] for x in hist_obj.read(cr, uid, hist_ids, ['product_id'], context=context))
+                    break
+
+        return res
+
 product_product()
 
+
+class product_history_consumption_product(osv.osv):
+    _name = 'product.history.consumption.product'
+
+    _columns = {
+        'consumption_id': fields.many2one('product.history.consumption', string='Consumption id', select=1, ondelete='cascade'),
+        'product_id': fields.many2one('product.product', string='Product'),
+        'name': fields.char(size=64, string='Name'),
+        'value': fields.float(digits=(16,2), string='Value', select=1),
+        'cons_type': fields.selection([('amc', 'AMC'), ('fmc', 'FMC')], string='Consumption type'),
+    }
+
+    def read(self, cr, uid, ids, fields, context=None, load='_classic_read'):
+        '''
+        Return the result in the same order as given in ids
+        '''
+        res = super(product_history_consumption_product, self).read(cr, uid, ids, fields, context=context, load=load)
+
+        res_final = [None]*len(ids)
+        for r in res:
+            r_index = ids.index(r['id'])
+            res_final[r_index] = r
+
+        return res_final
+
+product_history_consumption_product()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'consumption_calculation/history_consumption_view.xml'
--- consumption_calculation/history_consumption_view.xml	2012-03-16 15:09:27 +0000
+++ consumption_calculation/history_consumption_view.xml	2013-11-04 14:27:47 +0000
@@ -7,60 +7,147 @@
 	    <field name="model">product.history.consumption</field>
 	    <field name="type">form</field>
 	    <field name="arch" type="xml">
-		<form string="Product historical consumption">
-		    <group colspan="2" col="2">
-			<separator colspan="2" string="Period parameters" />
-		    	<field name="date_from" on_change="date_change(date_from, date_to)" />
-   		    	<field name="date_to" on_change="date_change(date_from, date_to)" />
-		    	<field name="month_ids" nolabel="1" colspan="2">
-			    <tree string="Months" hide_new_button="1" noteditable="True" editable="top">
-			        <field name="name" />
-			    </tree>
-		        </field>
-		    </group>
+            <form string="Product historical consumption" hide_new_button="1" hide_duplicate_button="1">
+                <field name="status" invisible="1" />
+                <group colspan="2" col="2">
+	    		<separator colspan="2" string="Period parameters" />
+                <field name="date_from" on_change="date_change(date_from, date_to)" required="True" attrs="{'readonly': [('status', '!=', 'draft')]}" />
+   		        	<field name="date_to" on_change="date_change(date_from, date_to)" required="True" attrs="{'readonly': [('status', '!=', 'draft')]}" />
+                    <field name="month_ids" nolabel="1" colspan="2" attrs="{'readonly': [('status', '!=', 'draft')]}">
+    			    <tree string="Months" hide_new_button="1" noteditable="True" editable="top">
+	    		        <field name="name" />
+		    	    </tree>
+		            </field>
+    		    </group>
 
-		    <group colspan="2" col="2">
+            <group colspan="2" col="2">
 			<separator colspan="2" string="Consumption parameters" />
-		    	<field name="consumption_type" />
-		    	<field name="location_id" attrs="{'invisible': [('consumption_type', '!=', 'rac')], 'required': [('consumption_type', '=', 'rac')]}" />
+                <field name="consumption_type" required="True" attrs="{'readonly': [('status', '!=', 'draft')]}" />
+                <field name="location_id" attrs="{'invisible': [('consumption_type', '!=', 'rac')], 'required': [('consumption_type', '=', 'rac')], 'readonly': [('status', '!=', 'draft')]}" />
 			<separator colspan="2" string="Product parameters" />
-            <field name="sublist_id" attrs="{'readonly': [('nomen_manda_0', '!=', False)]}" />
-            <group colspan="2" col="4" attrs="{'readonly': [('sublist_id', '!=', False)]}">
+            <field name="sublist_id" attrs="{'readonly': ['|', ('nomen_manda_0', '!=', False), ('status', '!=', 'draft')]}" />
+            <group colspan="2" col="4">
                 <field name="nomen_manda_0"
                     domain="[('level', '=', '0'), ('type', '=', 'mandatory')]"
                     widget="selection"
                     on_change="onChangeSearchNomenclature(0, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)"
+                    attrs="{'readonly': [('status', '!=', 'draft')]}" 
                 />
                 <field name="nomen_manda_1"
                     domain="[('id','=', 0)]"
                     widget="selection"
                     get_selection="get_nomen"
                     on_change="onChangeSearchNomenclature(1, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)"
+                    attrs="{'readonly': [('status', '!=', 'draft')]}" 
                 />
                 <field name="nomen_manda_2"
                     domain="[('id','=', 0)]"
                     widget="selection"
                     get_selection="get_nomen"
                     on_change="onChangeSearchNomenclature(2, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)"
+                    attrs="{'readonly': [('status', '!=', 'draft')]}" 
                 />
                 <field name="nomen_manda_3"
                     domain="[('id','=', 0)]"
                     widget="selection"
                     get_selection="get_nomen"
                     on_change="onChangeSearchNomenclature(3, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)"
+                    attrs="{'readonly': [('status', '!=', 'draft')]}" 
                 />
             </group>
 			<separator colspan="2" string="Actions" />
-			<button name="create_lines" type="object" string="View historical data" icon="gtk-execute" colspan="2" />
+			<button name="create_lines" type="object" string="View historical data" icon="terp-check" colspan="2" attrs="{'readonly': [('status', '=', 'in_progress')], 'invisible': [('status', '=', 'ready')]}" />
+			<button name="open_report" type="object" string="View historical data" icon="terp-check" colspan="2" attrs="{'invisible': [('status', '!=', 'ready')]}" />
 		    </group>
 		</form>
 	    </field>
-	</record>
-
-	<menuitem id="menu_product_history_consumption"
+    </record>
+
+    <record id="history_consumption_waiting_view" model="ir.ui.view">
+        <field name="name">history.consumption.waiting.view</field>
+        <field name="model">product.history.consumption</field>
+        <field name="type">form</field>
+        <field name="priority" eval="99" />
+        <field name="arch" type="xml">
+            <form string="Status of the report" hide_new_button="1" hide_delete_button="1">
+                <label> </label>
+                <group colspan="2" col="2">
+                    <html>
+                        <div style="align: center">
+                            <p style="font-size:14px;align:center">
+                                Your historical consumption demand will be treated quickly.<br />
+                            </p>
+                            <p style="font-size:14px;align:center">
+                                Due to the volume of data, your history cannot be shown immediatly.<br />
+                            </p>
+                            <p style="font-size:14px;align:center">
+                                When the report will be ready, you can access to it by the menu Warehouse / Reporting / Consumption reports / Historical consumption.<br />
+                            </p>
+                        </div>
+                    </html>
+                </group>
+                <label> </label>
+                <!--
+                Remove the button because a click on this button waits the end of the thread to display the list of reports
+                <label> </label>
+                <button name="go_to_list" string="Return to the list of history consumption reports" icon="gtk-undo" type="object" colspan="2"/>
+                <label> </label>-->
+            </form>
+        </field>
+    </record>
+
+    <record id="history_consumption_search_view" model="ir.ui.view">
+        <field name="name">history.consumption.search.view</field>
+        <field name="model">product.history.consumption</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Historical consumptions">
+                <field name="requestor_id" />
+                <filter domain="[('requestor_id', '=', uid)]" icon="terp-personal" help="My requests" />
+                <field name="requestor_date" />
+            </search>
+        </field>
+    </record>
+
+    <record id="history_consumption_tree_view" model="ir.ui.view">
+        <field name="name">history.consumption.tree.view</field>
+        <field name="model">product.history.consumption</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Historical consumptions" noteditable="1" colors="grey:status=='in_progress';green:status=='ready'">
+                <field name="requestor_date" />
+                <field name="requestor_id" />
+                <field name="date_from" />
+                <field name="date_to" />
+                <field name="consumption_type" />
+                <field name="location_id" />
+                <field name="sublist_id" />
+                <field name="nomen_manda_0" />
+                <field name="nomen_manda_1" />
+                <field name="nomen_manda_2" />
+                <field name="nomen_manda_3" />
+                <button name="in_progress" type="object" icon="gtk-refresh" string="In Progress" attrs="{'invisible': [('status', '!=', 'in_progress')]}" />
+                <button name="open_report" type="object" icon="terp-check" string="Open report" attrs="{'invisible': [('status', '!=', 'ready')]}"/>
+                <field name="fake_status" />
+                <field name="status" invisible="1" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_history_consumption" model="ir.actions.act_window">
+        <field name="name">History consumptions</field>
+        <field name="res_model">product.history.consumption</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="target"></field>
+    </record>
+
+    <menuitem id="menu_product_history_consumption"
+          action="action_history_consumption"
 		  name="Historical consumption"
 		  parent="warehouse_consumption_menu" />
 
+    <!--
 	<record id="action_open_history_consumption_view" model="ir.actions.server">
             <field name="name">History consumption</field>
             <field name="model_id" ref="model_product_history_consumption"/>
@@ -76,6 +163,7 @@
             <field eval="'ir.actions.server,%d'%action_open_history_consumption_view" name="value"/>
             <field eval="True" name="object"/>
         </record>
+    -->
 
     </data>	
 </openerp>