pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] sale, purchase: corrected invoiced field calculation in sale and purchase

Browse Source 
bzr revid: rha@tinyerp.com-20110517114445-a39ve1w1700zde00
This commit is contained in:
Rifakat Haradwala (Open ERP)
2011-05-17 17:14:45 +05:30
parent da73b76828
commit cc571cfa15
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/purchase.py
+1 -1
View File
@@ -98,7 +98,7 @@ class purchase_order(osv.osv):
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:
addons/sale/sale.py
+2 -2
View File
@@ -131,7 +131,7 @@ class sale_order(osv.osv):
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:
@@ -870,7 +870,7 @@ class sale_order_line(osv.osv):
\n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
_order = 'sequence, id desc'
_defaults = {