openerp-dev-web team mailing list archive

["Rifakat Haradwala \(OpenERP\)" <rha@xxxxxxxxxxx>]

Rifakat Haradwala (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-sale-purchase-invoiced-rha into lp:openobject-addons/6.0.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-sale-purchase-invoiced-rha/+merge/61236

sale, purchase: corrected the calculation for invoiced rate of sale and purchase order
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-sale-purchase-invoiced-rha/+merge/61236
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-sale-purchase-invoiced-rha.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-02-21 07:25:45 +0000
+++ purchase/purchase.py	2011-05-17 11:54:29 +0000
@@ -98,7 +98,7 @@
             tot = 0.0
             for invoice in purchase.invoice_ids:
                 if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += invoice.amount_untaxed - invoice.residual
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-01-19 08:38:17 +0000
+++ sale/sale.py	2011-05-17 11:54:29 +0000
@@ -131,7 +131,7 @@
             tot = 0.0
             for invoice in sale.invoice_ids:
                 if invoice.state not in ('draft', 'cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += invoice.amount_untaxed - invoice.residual
             if tot:
                 res[sale.id] = min(100.0, tot * 100.0 / (sale.amount_untaxed or 1.00))
             else: