diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 42abaf96418..4a56c0dda3c 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -916,7 +916,7 @@ -
+
@@ -933,7 +933,7 @@
- + diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py index 4364998b6a4..d6f95cbb7fc 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.py +++ b/addons/point_of_sale/wizard/pos_session_opening.py @@ -6,14 +6,18 @@ import netsvc from openerp.addons.point_of_sale.point_of_sale import pos_session + class pos_session_opening(osv.osv_memory): _name = 'pos.session.opening' _columns = { 'pos_config_id' : fields.many2one('pos.config', 'Point of Sale', required=True), 'pos_session_id' : fields.many2one('pos.session', 'PoS Session'), - 'pos_state' : fields.selection(pos_session.POS_SESSION_STATE, - 'Session State', readonly=True), + 'pos_state' : fields.related('pos_session_id', 'state', + type='selection', + selection=pos_session.POS_SESSION_STATE, + string='Session State', readonly=True), + 'pos_state_str' : fields.char('State', 32, readonly=True), 'show_config' : fields.boolean('Show Config', readonly=True), 'pos_session_name' : fields.related('pos_session_id', 'name', type='char', size=64, readonly=True), @@ -71,22 +75,25 @@ class pos_session_opening(osv.osv_memory): result = { 'pos_session_id': False, 'pos_state': False, + 'pos_state_str' : '', 'pos_session_username' : False, 'pos_session_name' : False, } if not config_id: - return {'value': result} + return {'value' : result} proxy = self.pool.get('pos.session') session_ids = proxy.search(cr, uid, [ - ('state', '<>', 'closed'), + ('state', '!=', 'closed'), ('config_id', '=', config_id), ], context=context) if session_ids: session = proxy.browse(cr, uid, session_ids[0], context=context) - result['pos_state'] = session.state + result['pos_state'] = str(session.state) + result['pos_state_str'] = dict(pos_session.POS_SESSION_STATE).get(session.state, '') result['pos_session_id'] = session.id result['pos_session_name'] = session.name result['pos_session_username'] = session.user_id.name + return {'value' : result} def default_get(self, cr, uid, fieldnames, context=None): diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml index 9279d5fce45..6e44030e582 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.xml +++ b/addons/point_of_sale/wizard/pos_session_opening.xml @@ -12,7 +12,7 @@ - +