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

[jftempo]

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2018-07-18 09:21:25 +0000
+++ bin/addons/mission_stock/mission_stock.py	2018-10-03 10:08:58 +0000
@@ -911,12 +911,15 @@
                                                   ('central_location_ok', '=', False)], context=context)
         cu_loc = location_obj.search(cr, uid, [('usage', '=', 'internal'), ('location_category', '=', 'consumption_unit')], context=context)
         secondary_location_id = data_obj.get_object_reference(cr, uid, 'msf_config_locations', 'stock_location_intermediate_client_view')
+        secondary_location_ids = []
         if secondary_location_id:
             secondary_location_id = secondary_location_id[1]
-        secondary_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', secondary_location_id)], context=context)
+            secondary_location_ids = location_obj.search(cr, uid, [('location_id', 'child_of', secondary_location_id)], context=context)
 
-        cu_loc = location_obj.search(cr, uid, [('location_id', 'child_of', cu_loc)], context=context)
-        central_loc = location_obj.search(cr, uid, [('location_id', 'child_of', central_loc)], context=context)
+        if cu_loc:
+            cu_loc = location_obj.search(cr, uid, [('location_id', 'child_of', cu_loc)], context=context)
+        if central_loc:
+            central_loc = location_obj.search(cr, uid, [('location_id', 'child_of', central_loc)], context=context)
 
         # Check if the instance is a coordination or a project
         coordo_id = False

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-09-21 15:20:25 +0000
+++ bin/addons/msf_profile/data/patches.xml	2018-10-03 10:08:58 +0000
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <record id="us_4541_stock_mission_recompute_cu_qty" model="patch.scripts">
+            <field name="method">us_4541_stock_mission_recompute_cu_qty</field>
+        </record>
 
         <!-- UF1A.0 -->
         <record id="us_4996_bck_beforepatch" model="patch.scripts">

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-09-21 15:20:25 +0000
+++ bin/addons/msf_profile/msf_profile.py	2018-10-03 10:08:58 +0000
@@ -51,12 +51,74 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF11.0
     def us_4996_bck_beforepatch(self, cr, uid, *a, **b):
         if self.pool.get('backup.config'):
             cr.execute("update backup_config set beforepatching='t'")
         return True
 
+=======
+    def us_4541_stock_mission_recompute_cu_qty(self, cr, uid, *a, **b):
+        """
+        recompute cu_qty
+        """
+        report_id = self.pool.get('stock.mission.report').search(cr, uid, [('full_view', '=', False)])
+        if not report_id:
+            return True
+        report_id = report_id[0]
+
+        cu_loc = self.pool.get('stock.location').search(cr, uid, [
+            ('usage', '=', 'internal'), 
+            ('location_category', '=', 'consumption_unit'),
+        ])
+        if cu_loc:
+            cu_loc = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', cu_loc)])
+
+        ID, PRODUCT_ID, PRODUCT_UOM, PRODUCT_QTY, LOCATION_ID, LOCATION_DEST_ID = 0, 1, 2, 3, 4, 5
+        cr.execute('''
+            SELECT id, product_id, product_uom, product_qty, location_id, location_dest_id
+            FROM stock_move
+            WHERE state = 'done'
+            AND id in (SELECT move_id FROM mission_move_rel WHERE mission_id = %s)
+        ''', (report_id,))
+        res = cr.fetchall()
+
+        # reset cu_qty on report lines:
+        smrl_to_reset = self.pool.get('stock.mission.report.line').search(cr, uid, [
+            ('product_id', 'in', [move[PRODUCT_ID] for move in res]),
+            ('mission_report_id', '=', report_id)
+        ])
+        self.pool.get('stock.mission.report.line').write(cr, uid, smrl_to_reset, {'cu_qty': 0.0})
+
+        self._logger.warn("Reset cu_qty on %s stock mission report lines" % len(smrl_to_reset))
+
+        # recalculation of the cu_qty:
+        if cu_loc:
+            for move in res:
+                product = self.pool.get('product.product').browse(cr, uid, move[PRODUCT_ID], fields_to_fetch=['uom_id'])
+                smrl_id = self.pool.get('stock.mission.report.line').search(cr, uid, [
+                    ('product_id', '=', move[PRODUCT_ID]),
+                    ('mission_report_id', '=', report_id)
+                ])
+                if smrl_id:
+                    smrl = self.pool.get('stock.mission.report.line').browse(cr, uid, smrl_id[0])
+                    qty = self.pool.get('product.uom')._compute_qty(cr, uid, move[PRODUCT_UOM], move[PRODUCT_QTY], product.uom_id.id)
+                    vals = {
+                        'cu_qty': smrl.cu_qty or 0.00,
+                    }
+
+                    if move[LOCATION_ID] in cu_loc:
+                        vals['cu_qty'] -= qty
+                    if move[LOCATION_DEST_ID] in cu_loc:
+                        vals['cu_qty'] += qty
+
+                    self.pool.get('stock.mission.report.line').write(cr, uid, smrl.id, vals)
+                
+        return True
+
+
+>>>>>>> MERGE-SOURCE
     # UF10.0
     def us_3427_update_third_parties_in_gl_selector(self, cr, uid, *a, **b):
         """