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

[imp] added stuff

Browse Source 
bzr revid: nicolas.vanhoren@openerp.com-20111216124419-hviz2o5f0ujyl5bu
This commit is contained in:
niv-openerp
2011-12-16 13:44:19 +01:00
parent 64496f511e
commit fe721330c3
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/pos.js
+2 -1
View File
@@ -87,7 +87,8 @@ openerp.point_of_sale = function(db) {
}, this));
$.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'img'], [['pos_categ_id', '!=', 'false']]),
this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'], [['state', '=', 'open']]),
this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
[['state', '=', 'open'], ['user_id', '=', this.session.uid]]),
this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
this.get_app_data())
.pipe(_.bind(this.build_tree, this));
addons/point_of_sale/static/src/xml/pos.xml
+21 -3
View File
@@ -97,17 +97,35 @@
<header><h2>Payment</h2></header>
<div class="pos-step-container">
<div class="pos-payment-container">
<span id="payment-due-total" class="payment-due pos-rigth-align"></span>
<br />
<table>
<tr>
<td class="paymentline-type">Total:</td>
<td class="paymentline-amount pos-rigth-align">
<t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
<span id="payment-due-total"></span>
<t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
</td>
</tr>
</table>
<table id="paymentlines">
</table>
<table>
<tr>
<td class="paymentline-type">Paid:</td>
<t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <td class="paymentline-amount pos-rigth-align"><span id="payment-paid-total"></span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/></td>
<td class="paymentline-amount pos-rigth-align">
<t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
<span id="payment-paid-total"></span>
<t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
</td>
</tr>
<tr>
<td class="paymentline-type">Change:</td>
<t t-if="currency.position == 'before'" t-esc="currency.symbol"/> <td class="paymentline-amount pos-rigth-align"><span id="payment-remaining"></span> <t t-if="currency.position == 'after'" t-esc="currency.symbol"/></td>
<td class="paymentline-amount pos-rigth-align">
<t t-if="currency.position == 'before'" t-esc="currency.symbol"/>
<span id="payment-remaining"></span>
<t t-if="currency.position == 'after'" t-esc="currency.symbol"/>
</td>
</tr>
</table>
</div>