Merge lp:~fabien-morin/unifield-server/fm-us-2579 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2017-02-13 11:31:10 +0000
+++ bin/addons/mission_stock/mission_stock.py	2017-04-06 09:41:30 +0000
@@ -103,7 +103,7 @@
 GET_EXPORT_REQUEST = '''SELECT
         l.product_id AS product_id,
         l.default_code as default_code,
-        pt.name as pt_name,
+        COALESCE(trans.value, pt.name) as pt_name,
         pu.name as pu_name,
         trim(to_char(l.internal_qty, '999999999999.999')) as l_internal_qty,
         trim(to_char(l.wh_qty, '999999999999.999')) as l_wh_qty,
@@ -123,6 +123,8 @@
          LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
          LEFT JOIN product_uom pu ON pt.uom_id = pu.id
          LEFT JOIN res_currency rc ON pp.currency_id = rc.id
+         LEFT JOIN ir_translation trans ON trans.res_id = pt.id AND
+             trans.name='product.template,name' AND lang = %s
     WHERE l.mission_report_id = %s
     ORDER BY l.default_code'''
 
@@ -439,7 +441,7 @@
                 return
 
             logging.getLogger('MSR').info("""____________________ Start the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
-            self.update(cr, uid, ids=[], context=None)
+            self.update(cr, uid, ids=[], context=context)
             msr_in_progress._delete_all(cr, uid, context)
             cr.commit()
             logging.getLogger('MSR').info("""____________________ Finished the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
@@ -772,7 +774,8 @@
 
         for report_id in ids:
             logger.info('___ Start export SQL request...')
-            cr.execute(GET_EXPORT_REQUEST, (report_id, ))
+            lang = context.get('lang')
+            cr.execute(GET_EXPORT_REQUEST, (lang, report_id))
             request_result = cr.dictfetchall()
 
             logger.info('___ Start CSV and XLS generation...')
 
=== modified file 'bin/addons/mission_stock/wizard/mission_stock_wizard.py'
--- bin/addons/mission_stock/wizard/mission_stock_wizard.py	2016-12-06 13:04:22 +0000
+++ bin/addons/mission_stock/wizard/mission_stock_wizard.py	2017-04-06 09:41:30 +0000
@@ -248,6 +248,6 @@
     def update(self, cr, uid, ids, context=None):
         msr_obj = self.pool.get('stock.mission.report')
         ids = msr_obj.search(cr, uid, [], context=context)
-        return msr_obj.background_update(cr, uid, ids)
+        return msr_obj.background_update(cr, uid, ids, context=context)
 
 mission_stock_wizard()