Nehal Panchal (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-17415-nep into
lp:openobject-addons/6.0.
Requested reviews:
Anup(OpenERP) (ach-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17415-nep/+merge/74761
Hello,
Subtotal of POS lines does not include tax.
This fixes the issue.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-17415-nep/+merge/74761
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-17415-nep.
=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py 2011-06-02 05:14:55 +0000
+++ point_of_sale/point_of_sale.py 2011-09-09 11:34:32 +0000
@@ -181,7 +181,7 @@
line.qty, line.product_id, line.order_id.partner_id)['taxes']:
val += c.get('amount', 0.0)
res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
- res[order.id]['amount_total'] = res[order.id]['amount_tax'] + cur_obj.round(cr, uid, cur, val1)
+ res[order.id]['amount_total'] = cur_obj.round(cr, uid, cur, val1)
return res
def _sale_journal_get(self, cr, uid, context=None):
@@ -1017,7 +1017,7 @@
price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, price, line.qty)
cur = line.order_id.pricelist_id.currency_id
- res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total'])
+ res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total_included'])
return res
def price_by_product_multi(self, cr, uid, ids, context=None):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
