Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1102873-fka into lp:openobject-addons

  1. trunk-bug-1102873-fka
  2. Merge into trunk
Proposed by Foram Katharotiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1102873-fka
Merge into: lp:openobject-addons
Diff against target: 25 lines (+2/-2)
2 files modified
point_of_sale/static/src/js/screens.js (+1/-1)
point_of_sale/static/src/xml/pos.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1102873-fka
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+146571@code.launchpad.net

Description of the change

Hello,

 Fix the issue of selling any product qty 0.5, the pos-screen shwos 0.5kg at 0.9€ / kg & The PoS Receipt shows a qty of 1. If the qty is below 0.5, the pos receipt shows 0.

Thanks,
FKA

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-bug-1102873-fka updated
8534. By Foram Katharotiya (OpenERP)

[IMP] add unit

Unmerged revisions

8534. By Foram Katharotiya (OpenERP)

[IMP] add unit

8533. By Foram Katharotiya (OpenERP)

[IMP] shows validate button

8532. By Foram Katharotiya (OpenERP)

[IMP] remove rounding value of qty in pos receipt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'point_of_sale/static/src/js/screens.js'
2--- point_of_sale/static/src/js/screens.js 2013-01-14 15:25:33 +0000
3+++ point_of_sale/static/src/js/screens.js 2013-02-05 08:26:22 +0000
4@@ -963,7 +963,7 @@
5 var currentOrder = this.pos.get('selectedOrder');
6 var paidTotal = currentOrder.getPaidTotal();
7 var dueTotal = currentOrder.getTotal();
8- var remaining = dueTotal > paidTotal ? dueTotal - paidTotal : 0;
9+ var remaining = dueTotal > paidTotal ? dueTotal.toFixed(2) - paidTotal.toFixed(2) : 0;
10 var change = paidTotal > dueTotal ? paidTotal - dueTotal : 0;
11
12 this.$('#payment-due-total').html(dueTotal.toFixed(2));
13
14=== modified file 'point_of_sale/static/src/xml/pos.xml'
15--- point_of_sale/static/src/xml/pos.xml 2012-12-06 15:38:56 +0000
16+++ point_of_sale/static/src/xml/pos.xml 2013-02-05 08:26:22 +0000
17@@ -581,7 +581,7 @@
18 </t>
19 </td>
20 <td class="pos-right-align">
21- <t t-esc="order.get_quantity().toFixed(0)"/>
22+ <t t-esc="order.get_quantity().toFixed(2) + ' ' + order.get_unit().name"/>
23 </td>
24 <td class="pos-right-align">
25 <t t-esc="widget.format_currency(order.get_price() * (1 - order.get_discount()/100) * order.get_quantity().toFixed(2))"/>

Subscribers

People subscribed via source and target branches

to all changes: