Merge lp:~openerp-dev/openobject-addons/6.0-opw-17415-nep into lp:openobject-addons/6.0

[Nehal Panchal (OpenERP)]

Hello,

Subtotal of POS lines does not include tax.

This fixes the issue.

Thanks.

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

Hi Nehal,

Your fix works perfectly.

Thanks a ton,
Rifakat

review: Approve

Unmerged revisions

4819. By Nehal Panchal (OpenERP) on 2011-09-09

[FIX] point_of_sale : pos lines subtotal does not include tax

=== 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):