From fe721330c35785e22bb1307d4b61b8a80c8f9180 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 16 Dec 2011 13:44:19 +0100 Subject: [PATCH] [imp] added stuff bzr revid: nicolas.vanhoren@openerp.com-20111216124419-hviz2o5f0ujyl5bu --- addons/point_of_sale/static/src/js/pos.js | 3 ++- addons/point_of_sale/static/src/xml/pos.xml | 24 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 3f0303533c0..3146ba4af44 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -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)); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 781e847fe7e..aa47a38d3cb 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -97,17 +97,35 @@

Payment

- +
+ + + + + +
Total: + + + +
- + - +
Paid: + + + +
Change: + + + +