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

[jftempo]

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2016-04-14 17:10:49 +0000
+++ bin/addons/mission_stock/mission_stock.py	2016-05-11 16:11:58 +0000
@@ -49,6 +49,13 @@
 
     _columns = {
         'report_id': fields.many2one('stock.mission.report', "Report"),
+        'done_ok': fields.boolean(string='Processing done'),
+        'start_date': fields.datetime(string='Start date'),
+    }
+
+    _defaults = {
+        'done_ok': lambda *a: False,
+        'start_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 
     def create(self, cr, uid, ids, context=None):
@@ -59,7 +66,7 @@
         return
 
     def _already_processed(self, cr, uid, id, context=None):
-        report_ids = self.search(cr, 1, [('report_id', '=', id)], context=context)
+        report_ids = self.search(cr, 1, [('report_id', '=', id), ('done_ok', '=', True)], context=context)
         if report_ids:
             return True
         return False
@@ -236,6 +243,12 @@
         if context.get('update_full_report'):
             report_ids = full_report_ids
 
+        if not context.get('update_full_report'):
+            all_report_ids = report_ids + full_report_ids
+            for report_id in all_report_ids:
+                # register immediately this report id into the table temp
+                msr_in_progress.create(cr, uid, report_id, context)
+
         product_ids = self.pool.get('product.product').search(cr, uid, [], context=context)
         product_values = {}
         temp_prods = self.pool.get('product.product').read(cr, uid, product_ids, ['product_amc', 'reviewed_consumption'], context=context)
@@ -264,8 +277,6 @@
             #US-1218: If this report is previously processed, then do not redo it again for this transaction!
             if msr_in_progress._already_processed(cr, uid, report['id'], context):
                 continue
-            # register immediately this report id into the table temp
-            msr_in_progress.create(cr, uid, report['id'], context)
 
             logging.getLogger('MSR').info("""___ updating the report lines of the report: %s, at %s (this may take very long time!)""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
             if context.get('update_full_report'):
@@ -277,14 +288,15 @@
                 # Update all lines
                 self.update_lines(cr, uid, [report['id']])
 
-            self.write(cr, uid, [report['id']], {'export_ok': False}, context=context)
+            msr_ids = msr_in_progress.search(cr, uid, [('report_id', '=', report['id'])], context=context)
+            msr_in_progress.write(cr, uid, msr_ids, {'done_ok': True}, context=context)
+
             logging.getLogger('MSR').info("""___ exporting the report lines of the report %s to csv, at %s""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
             self._get_export_csv(cr, uid, report['id'], product_values, context=context)
             # Update the update date on report
             self.write(cr, uid, [report['id']], {'last_update': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
             logging.getLogger('MSR').info("""___ finished processing completely for the report: %s, at %s \n""" % (report['id'], time.strftime('%Y-%m-%d %H:%M:%S')))
 
-
         # After update of all normal reports, update the full view report
         if not context.get('update_full_report'):
             c = context.copy()

=== modified file 'bin/addons/mission_stock/mission_stock_view.xml'
--- bin/addons/mission_stock/mission_stock_view.xml	2014-03-20 15:48:04 +0000
+++ bin/addons/mission_stock/mission_stock_view.xml	2016-05-11 16:11:58 +0000
@@ -12,6 +12,8 @@
                 <separator colspan="4" string="Mission stock" />
                 <field name="report_id" widget="selection" on_change="report_change(report_id)" />
                 <field name="last_update" />
+                <label colspan="2" />
+                <field name="processed_value" string="Updating..." />
                 <separator colspan="4" string="Stock valuation" />
                 <field name="with_valuation" />
                 <separator colspan="4" string="Split Stock" />
@@ -19,8 +21,8 @@
                 <separator colspan="4" string="Actions" />
                 <button name="update" string="Update (in background)" type="object" colspan="4" icon="gtk-remove" />
                 <button special="cancel" string="Close window" icon="gtk-cancel" />
-                <button name="open_xml_file" string="Open XML file" type="object" icon="gtk-print" colspan="1" attrs="{'readonly': [('export_ok', '=', False)]}" />
-                <button name="open_products_view" string="Open report" type="object" icon="gtk-go-forward" colspan="2" />
+                <button name="open_xml_file" string="Open XML file" type="object" icon="gtk-print" colspan="1" attrs="{'readonly': ['|', ('processed_value', '!=', 'Done'), ('export_ok', '=', False)]}" />
+                <button name="open_products_view" string="Open report" type="object" icon="gtk-go-forward" colspan="2" attrs="{'readonly': [('processed_value', '!=', 'Done')]}" />
             </form>
         </field>
     </record>

=== modified file 'bin/addons/mission_stock/wizard/mission_stock_wizard.py'
--- bin/addons/mission_stock/wizard/mission_stock_wizard.py	2014-04-09 09:21:40 +0000
+++ bin/addons/mission_stock/wizard/mission_stock_wizard.py	2016-05-11 16:11:58 +0000
@@ -28,6 +28,32 @@
 class mission_stock_wizard(osv.osv_memory):
     _name = 'mission.stock.wizard'
 
+    def _get_processed_value(self, cr, uid, report_id, context=None, state=False):
+        """
+        Returns the progression of the update
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param report_id: ID of mission.stock.report to compute
+        :param context: Context of the call
+        :return: The percentage of processed lines
+        """
+        msr_in_progress = self.pool.get('msr_in_progress')
+        date_tools = self.pool.get('date.tools')
+
+        if context is None:
+            context = {}
+
+        if msr_in_progress._already_processed(cr, 1, report_id, context=context):
+            return state and 'done' or _('Done')
+
+        msr_ids = msr_in_progress.search(cr, 1, [('report_id', '=', report_id)], context=context)
+        if msr_ids:
+            st_date = date_tools.get_date_formatted(cr, uid, d_type='datetime',
+                datetime=msr_in_progress.browse(cr, uid, msr_ids[0], context=context).start_date)
+            return state and 'progress' or _('In progress since %s') % st_date
+
+        return state and 'done' or _('Done')
+
     _columns = {
         'report_id': fields.many2one(
             'stock.mission.report',
@@ -56,12 +82,18 @@
             string='Filename',
             size=256,
         ),
+        'processed_value': fields.char(
+            string='Processing',
+            size=128,
+            readonly=True,
+        ),
     }
 
     _defaults = {
         'with_valuation': lambda *a: 'false',
         'split_stock': lambda *a: 'false',
         'fname': lambda *a: 'Mission stock report',
+        'processed_value': lambda *a: _('Not started'),
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -79,7 +111,8 @@
             res['report_id'] = local_id[0]
             report = self.pool.get('stock.mission.report').browse(cr, uid, local_id[0], context=context)
             res['last_update'] = report.last_update
-            res['export_ok'] = report.export_ok
+            res['export_ok'] = report.export_ok and self._get_processed_value(cr, uid, local_id[0], context=context, state=True) == 'done'
+            res['processed_value'] = self._get_processed_value(cr, uid, local_id[0], context=context)
 
         return res
 
@@ -90,9 +123,13 @@
         v = {}
         if report_id:
             report = self.pool.get('stock.mission.report').browse(cr, uid, report_id, context=context)
-            v.update({'last_update': report.last_update, 'export_ok': report.export_ok})
+            v.update({
+                'last_update': report.last_update,
+                'export_ok': report.export_ok and self._get_processed_value(cr, uid, report_id, context=context, state=True) == 'done',
+                'processed_value': self._get_processed_value(cr, uid, report_id, context=context)
+            })
         else:
-            v.update({'last_update': False, 'export_ok': False})
+            v.update({'last_update': False, 'export_ok': False, 'processed_value': _('No report selected')})
 
         return {'value': v}