From bdac4ab7ad8438a86465fc2acf37689c2d0b74ef Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 13 May 2012 12:16:41 +0200
Subject: [PATCH] [FIX] pos backend, small bug

bzr revid: fp@openerp.com-20120513101641-7cpbvos3hcgnx91m
---
 addons/point_of_sale/point_of_sale.py       |  4 ++--
 addons/point_of_sale/point_of_sale_view.xml | 25 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 51c32eae217..8b7c741f08c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -498,7 +498,7 @@ class pos_order(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True),
         'shop_id': fields.related('session_id', 'config_id', 'shop_id', relation='sale.shop', type='many2one', string='Shop', store=True, readonly=True),
         'date_order': fields.datetime('Order Date', readonly=True, select=True),
-        'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
+        'user_id': fields.many2one('res.users', 'Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'amount_total': fields.function(_amount_all, string='Total', multi='all'),
         'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
@@ -528,7 +528,7 @@ class pos_order(osv.osv):
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
 
-        'sale_journal': fields.related('session_id', 'config_id', 'journal_id', relation='sale.journal', type='many2one', string='Sale Journal', store=True, readonly=True),
+        'sale_journal': fields.related('session_id', 'config_id', 'journal_id', relation='account.journal', type='many2one', string='Sale Journal', store=True, readonly=True),
     }
 
     def _default_session(self, cr, uid, context=None):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index b7c3d47374c..40a1ed138b1 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -854,6 +854,14 @@
             id="menu_pos_config_pos"
             groups="group_pos_manager"/>
 
+        <act_window 
+            id="act_pos_session_orders" 
+            name="Orders"
+            src_model="pos.session"
+            res_model="pos.order"
+            context="{'search_default_session_id': active_id, 'default_session_id' : active_id }" />
+
+
 
         <record model="ir.ui.view" id="view_pos_session_form">
             <field name="name">pos.session.form.view</field>
@@ -874,9 +882,10 @@
 
                     <group colspan="4" col="4">
                         <field name="config_id"/>
-			<group colspan="2" col="2">
+			<group colspan="2" col="3">
 				<button name="%(action_pos_box_in)d" string="Put Money In" type="action" states="opened"/>
 				<button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened"/>
+				<button name="%(act_pos_session_orders)d" string="Orders" type="action"/>
 			</group>
                         <newline/>
                         <field name="user_id" />
@@ -991,14 +1000,6 @@
             id="menu_pos_session"
             groups="group_pos_manager"/>
 
-        <act_window 
-            id="act_pos_session_orders" 
-            name="Orders"
-            src_model="pos.session"
-            res_model="pos.order"
-            domain="[('session_id', '=', active_id)]" 
-            context="{'search_default_session_id' : [active_id], 'default_session_id' : active_id }" />
-
         <record id="view_pos_order_filter" model="ir.ui.view">
             <field name="name">pos.order.list.select</field>
             <field name="model">pos.order</field>
@@ -1011,15 +1012,15 @@
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="user_id"/>
+                    <field name="date_order"/>
+                    <field name="session_id"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
                         <separator string="" orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator string="" orientation="vertical"/>