Merge lp:~openerp-dev/openobject-addons/6.1-opw-581957-rha into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Hello,

Fixed issue for invoice rate of the purchase order. It cumulates amount of supplier
invoice and supplier refund invoice.

My fix calculates the rate by considering invoice amount - refund amount.
Please provide your remark if any.

Regards,
Rifakat Haradwala

[Serpent Consulting Services (serpent-consulting-services)]

Rifakat,

I recommend to take the code of sale.py as a reference.

The min() should better be used in order to limit it to 100%.

Thanks.

[Rifakat Husen (OpenERP) (rha-openerp)]

Hello,

I think min() will just hide the problem. IMHO we just need to exclude refund amount
from the total.

Thanks

[lp:~openerp-dev/openobject-addons/6.1-opw-581957-rha]

7079. By Rifakat Husen (OpenERP) on 2012-11-27

[FIX] purchase: calculated rate for in invoice by excluding refund

Unmerged revisions

7079. By Rifakat Husen (OpenERP) on 2012-11-27

[FIX] purchase: calculated rate for in invoice by excluding refund

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-10-09 12:16:14 +0000
+++ purchase/purchase.py	2012-11-27 11:23:21 +0000
@@ -90,7 +90,7 @@
         for purchase in self.browse(cursor, user, ids, context=context):
             tot = 0.0
             for invoice in purchase.invoice_ids:
-                if invoice.state not in ('draft','cancel'):
+                if invoice.state not in ('draft','cancel') and invoice.type == 'in_invoice':
                     tot += invoice.amount_untaxed
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed