Merge lp:~dorian-kemps/unifield-server/US-5761 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/specific_rules/report/report_stock_inventory.py'
--- bin/addons/specific_rules/report/report_stock_inventory.py	2019-02-25 09:43:25 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory.py	2019-02-26 09:54:52 +0000
@@ -403,12 +403,12 @@
 
         cost_price_at_date = {}
         if report.stock_level_date and product_ids_to_fetch:
-            self.cr.execute("""select distinct on (product_id) product_id, new_standard_price
+            self.cr.execute("""select distinct on (product_id) product_id, old_standard_price
                 from standard_price_track_changes
                 where
                     product_id in %s and
-                    create_date <= %s
-                order by product_id, create_date desc""", (tuple(product_ids_to_fetch), values['stock_level_date']))
+                    create_date >= %s
+                order by product_id, create_date asc""", (tuple(product_ids_to_fetch), values['stock_level_date']))
 
             for x in self.cr.fetchall():
                 cost_price_at_date[x[0]] = x[1]
 
=== modified file 'bin/addons/stock/report/stock_expired_damaged_report.py'
--- bin/addons/stock/report/stock_expired_damaged_report.py	2019-02-11 09:51:38 +0000
+++ bin/addons/stock/report/stock_expired_damaged_report.py	2019-02-26 09:54:52 +0000
@@ -247,14 +247,16 @@
         res = []
 
         for move in move_obj.browse(self.cr, self.uid, self.datas['moves_ids'], context=self.localcontext):
-            price_at_date = False
-            self.cr.execute("""SELECT distinct on (product_id) product_id, new_standard_price
+            prod_price = False
+            self.cr.execute("""SELECT distinct on (product_id) product_id, old_standard_price
             FROM standard_price_track_changes
-            WHERE product_id = %s AND change_date <= %s
-            ORDER BY product_id, change_date desc
+            WHERE product_id = %s AND change_date >= %s
+            ORDER BY product_id, change_date asc
             """, (move.product_id.id, move.date))
             for x in self.cr.fetchall():
-                price_at_date = x[1]
+                prod_price = x[1]
+            if not prod_price:
+                prod_price = move.product_id.standard_price or move.price_unit
             res.append({
                 'ref': move.picking_id.name,
                 'reason_type': move.reason_type_id and move.reason_type_id.complete_name or '',
@@ -265,11 +267,10 @@
                 'qty': move.product_qty,
                 'batch': move.prodlot_id and move.prodlot_id.name or '',
                 'exp_date': move.expired_date,
-                'unit_price': price_at_date or move.price_unit,
+                'unit_price': prod_price,
                 'currency': move.price_currency_id and move.price_currency_id.name or
                 move.product_id.currency_id and move.product_id.currency_id.name or '',
-                'total_price': price_at_date and move.product_qty * price_at_date or
-                move.product_qty * move.price_unit,
+                'total_price': move.product_qty * prod_price,
                 'src_loc': move.location_id and move.location_id.name or '',
                 'dest_loc': move.location_dest_id and move.location_dest_id.name or '',
                 'crea_date': move.picking_id.date,
 
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2018-11-12 11:26:37 +0000
+++ bin/addons/stock_override/stock_view.xml	2019-02-26 09:54:52 +0000
@@ -481,7 +481,7 @@
                                 <field name="from_manage_expired" invisible="1" />
                                 <!-- <button name="return_to_state" string="Return to initial state" states="import" icon="gtk-execute" type="object" />-->
                                 <button name="call_cancel_wizard" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" type="object"  context="{'from_button': True}"/>
-                                <button name="draft_force_assign" states="draft,confirmed,assigned" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': ['|', '&amp;', ('state', 'in', ['done', 'cancel', 'import']), ('state', '!=', 'draft'), ('has_draft_moves', '=', False)]}" />
+                                <button name="draft_force_assign" states="draft,confirmed,assigned" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': ['|', ('state', 'in', ['done', 'cancel', 'import']), '&amp;', ('state', '!=', 'draft'), ('has_draft_moves', '=', False)]}" />
                                 <button name="expired_assign" states="confirmed,assigned" string="Check Expired Products' Availability" type="object" icon="gtk-find" context="{'from_button': True}" attrs="{'invisible': ['|', ('state', 'not in', ['confirmed', 'assigned']), ('from_manage_expired', '=', False)]}" />
                                 <button name="check_availability_manually" states="confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}" attrs="{'invisible': [('from_manage_expired', '=', True)]}"/>
                                 <button name="force_assign" states="confirmed,assigned" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />