Merge lp:~jfb-tempo-consulting/unifield-server/US-3235-unit_price into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2018-02-08 09:19:55 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2018-04-17 09:12:21 +0000
@@ -1015,10 +1015,9 @@
                     values = self._get_values_from_line(cr, uid, move, line, db_data_dict, context=context)
                     if not values.get('product_qty', 0.00):
                         continue
-
                     # Check if we must re-compute the price of the product
-                    compute_average = picking_dict['type'] == 'in' and line.product_id.cost_method
-                    if values.get('location_dest_id', False):
+                    compute_average = not sync_in and picking_dict['type'] == 'in' and line.product_id.cost_method
+                    if not sync_in and values.get('location_dest_id', False):
                         compute_average = picking_dict['type'] == 'in' and line.product_id.cost_method == 'average'
 
                     if compute_average:
@@ -1196,7 +1195,7 @@
                 # If there is remaining quantity for the move, put the ID of the move
                 # and the remaining quantity to list of moves to put in backorder
                 if diff_qty > 0.00 and move.state != 'cancel':
-                    backordered_moves.append((move, diff_qty, average_values, data_back, move_sptc_values))
+                    backordered_moves.append((move, diff_qty, average_values, data_back, move_sptc_values, line.product_id.id))
                     if not sync_in:
                         # decrement qty of linked INTernal move:
                         internal_move = self.pool.get('stock.move').search(cr, uid, [('linked_incoming_move', '=', move.id)], context=context)
@@ -1206,7 +1205,7 @@
                     for sptc_values in move_sptc_values:
                         # track change that will be created:
                         track_changes_to_create.append({
-                            'product_id': move.product_id.id,
+                            'product_id': line.product_id.id,
                             'transaction_name': _('Reception %s') % move.picking_id.name,
                             'sptc_values': sptc_values.copy(),
                         })
@@ -1269,9 +1268,9 @@
                     if back_order_post_copy_vals:
                         self.write(cr, uid, backorder_id, back_order_post_copy_vals, context=context)
 
-                for bo_move, bo_qty, av_values, data_back, move_sptc_values in backordered_moves:
+                for bo_move, bo_qty, av_values, data_back, move_sptc_values, p_id in backordered_moves:
                     for sptc_values in move_sptc_values:
-                        sptc_obj.track_change(cr, uid, move.product_id.id,
+                        sptc_obj.track_change(cr, uid, p_id,
                                               _('Reception %s') % backorder_name,
                                               sptc_values, context=context)
                     if bo_move.product_qty != bo_qty:

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-04-03 08:08:50 +0000
+++ bin/addons/msf_profile/data/patches.xml	2018-04-17 09:12:21 +0000
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <record id="us_3319_product_track_price" model="patch.scripts">
+            <field name="method">us_3319_product_track_price</field>
+        </record>
         <!-- UF8.1 -->
         <record id="us-4454" model="patch.scripts">
             <field name="method">cancel_extra_empty_draft_po</field>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-04-09 08:22:12 +0000
+++ bin/addons/msf_profile/msf_profile.py	2018-04-17 09:12:21 +0000
@@ -51,6 +51,15 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_3319_product_track_price(self, cr, uid, *a, **b):
+        cr.execute('select count(*) from standard_price_track_changes')
+        num = cr.fetchone()
+        if num and num[0]:
+            cr.execute("""insert into standard_price_track_changes ( create_uid, create_date, old_standard_price, new_standard_price, user_id, product_id, change_date, transaction_name)
+                    select 1, NOW(), t.standard_price, t.standard_price, 1, p.id, date_trunc('second', now()::timestamp), 'Price corrected' from product_product p, product_template t where p.product_tmpl_id=t.id and t.cost_method='average'
+                    """)
+
+        return True
     # UF8.1
     def cancel_extra_empty_draft_po(self, cr, uid, *a, **b):
         rule_obj = self.pool.get('sync.client.message_rule')