Merge lp:~yann-papouin/ocb-addons/6.1-bug-1077931-fix-purchase-invoiced-rate into lp:ocb-addons/6.1

[Yann Papouin]

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

The original proposal has been changed: https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-581957-rha/+merge/135880

Can you check that?

Thanks

review: Needs Information

[Yann Papouin (yann-papouin)]

No changes for me, It's just my merge proposal that add a limit to 100% to the rate value

[Stefan Rijnhart (Opener) (stefan-opener)]

Tnx!

review: Approve (code review)

[Omar (Pexego) (omar7r)]

LGTM

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Guewen, could you please check your MP review?

I see OK to add extra clamp on bar percentage, and it doesn't see that OpenERP S.A. it's going to merge OPW branch.

Regards.

review: Approve (code review)

[Ana Juaristi Olalde (ajuaristio)]

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

I proceed with the merge, because Guewen's question is answered.

Regards.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-11-20 01:17:39 +0000
+++ purchase/purchase.py	2014-02-06 12:31:06 +0000
@@ -90,10 +90,10 @@
         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
+                res[purchase.id] = min(100.0, tot * 100.0 / purchase.amount_untaxed)
             else:
                 res[purchase.id] = 0.0
         return res