Merge lp:~openerp-dev/openobject-addons/6.0-opw-582438-ksa into lp:openobject-addons/6.0

[Kirti Savalia(OpenERP)]

Hello,

Steps to reproduce the bug:

-> Make a sales order with at least one product that is configured to have an "average price" configured.
-> Confirm the sales order and make the outgoing delivery (invoicing based on delivery).
-> From the outgoing delivery, create the invoice. - Return the outgoing delivery with the corresponding button.
-> From the return-delivery, also create an invoice, using the button "Create invoice" on the return delivery.
-> Compare both invoices. As you will see, the goods on the refund invoice are invoiced at a different value compared to the original invoice.

Thanks
KSA

Unmerged revisions

5386. By Kirti Savalia(OpenERP) <email address hidden> on 2012-12-05

[FIX]:the goods on the refund invoice are invoiced at a different value compared to the original invoice

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-08-17 07:46:56 +0000
+++ stock/stock.py	2012-12-05 10:21:27 +0000
@@ -1078,8 +1078,6 @@
                 if not uos_id and inv_type in ('out_invoice', 'out_refund'):
                     uos_id = move_line.product_uom.id
                 account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
-                if move_line.price_unit != 0 and price_unit != move_line.price_unit:
-                    price_unit = move_line.price_unit
                 invoice_line_id = invoice_line_obj.create(cr, uid, {
                     'name': name,
                     'origin': origin,