Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-838501-bde into lp:openobject-addons

  1. trunk-bug-838501-bde
  2. Merge into trunk
Proposed by Bharat Devnani (Open ERP)
Status: Rejected
Rejected by: Fabien (Open ERP)
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-838501-bde
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
point_of_sale/point_of_sale.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-838501-bde
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
Bharat Devnani (Open ERP) (community) Needs Resubmitting
qdp (OpenERP) Pending
Review via email: mp+74593@code.launchpad.net

Description of the change

Hello Sir,

I have applied the changes suggested by Jonathan Wilson, and now its working as per the functionality.

Thanks & Regards,
Devnani Bharat R.

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

Bharat,

Your patch fixed the problem in pos order line which shows correct result now.
But Total on pos have wrong figure after applying your patch.
Kindly correct the issue.

Thanks,
Mustufa

review: Needs Fixing
lp:~openerp-dev/openobject-addons/trunk-bug-838501-bde updated
4954. By Bharat Devnani (Open ERP)

[FIX] corrected the total value in total field of sale order in point_of_sale

Revision history for this message
Bharat Devnani (Open ERP) (bde-openerp) wrote :

Hello Sir,

Corrected value of total field in sale order of Point of Sale.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve
lp:~openerp-dev/openobject-addons/trunk-bug-838501-bde updated
4955. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

I cleaned the POS it works in price include/exclude now.

Unmerged revisions

4955. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

4954. By Bharat Devnani (Open ERP)

[FIX] corrected the total value in total field of sale order in point_of_sale

4953. By Jonathan Wilson

[FIX] point_of_sale : pos line total does not include tax

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'point_of_sale/point_of_sale.py'
2--- point_of_sale/point_of_sale.py 2011-07-08 09:22:32 +0000
3+++ point_of_sale/point_of_sale.py 2011-09-15 11:27:59 +0000
4@@ -169,7 +169,7 @@
5 res[order.id]['amount_paid'] += payment.amount
6 res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
7 for line in order.lines:
8- val1 += line.price_subtotal_incl
9+ val1 += line.price_subtotal
10 if order.price_type != 'tax_excluded':
11 res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
12 tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
13@@ -1021,7 +1021,7 @@
14 price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
15 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, price, line.qty)
16 cur = line.order_id.pricelist_id.currency_id
17- res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total'])
18+ res[line.id][f] = self.pool.get('res.currency').round(cr, uid, cur, computed_taxes['total_included'])
19 return res
20
21 def price_by_product_multi(self, cr, uid, ids, context=None):

Subscribers

People subscribed via source and target branches

to all changes: