From a645d7d7953ba9e3f52d3d8ebe541d87b6d23b64 Mon Sep 17 00:00:00 2001
From: Pratima Gupta <pgu@odoo.com>
Date: Tue, 11 Sep 2018 15:44:25 +0530
Subject: [PATCH] [IMP] point of sale: improve filters and labels

Specifications: improve search filters and groupby, reorder filters, update
some field labels.

This commit is related to task #1878516 and PR #26929 .
---
 addons/point_of_sale/models/pos_order.py             | 2 +-
 addons/point_of_sale/report/pos_order_report.py      | 2 +-
 addons/point_of_sale/views/pos_order_report_view.xml | 9 ++++-----
 addons/point_of_sale/views/pos_order_view.xml        | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index d25b6ed9e12..ea3612c6bbf 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -483,7 +483,7 @@ class PosOrder(models.Model):
     company_id = fields.Many2one('res.company', string='Company', required=True, readonly=True, default=lambda self: self.env.user.company_id)
     date_order = fields.Datetime(string='Order Date', readonly=True, index=True, default=fields.Datetime.now)
     user_id = fields.Many2one(
-        comodel_name='res.users', string='Salesman',
+        comodel_name='res.users', string='Salesperson',
         help="Person who uses the cash register. It can be a reliever, a student or an interim employee.",
         default=lambda self: self.env.uid,
         states={'done': [('readonly', True)], 'invoiced': [('readonly', True)]},
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index e14c9352393..f0635c90a8b 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -10,7 +10,7 @@ class PosOrderReport(models.Model):
     _auto = False
     _order = 'date desc'
 
-    date = fields.Datetime(string='Date Order', readonly=True)
+    date = fields.Datetime(string='Order Date', readonly=True)
     order_id = fields.Many2one('pos.order', string='Order', readonly=True)
     partner_id = fields.Many2one('res.partner', string='Customer', readonly=True)
     product_id = fields.Many2one('product.product', string='Product', readonly=True)
diff --git a/addons/point_of_sale/views/pos_order_report_view.xml b/addons/point_of_sale/views/pos_order_report_view.xml
index a6dcede51cf..73c388bbe09 100644
--- a/addons/point_of_sale/views/pos_order_report_view.xml
+++ b/addons/point_of_sale/views/pos_order_report_view.xml
@@ -30,12 +30,10 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <field name="date"/>
+                    <filter string="My Sales" name="my_sales" help="My Sales" domain="[('user_id','=',uid)]"/>
+                    <separator/>
                     <filter string="Invoiced" name="invoiced" domain="[('state','=',('invoiced'))]"/>
                     <filter string="Not Invoiced" name="not_invoiced" domain="[('state','=',('paid'))]"/>
-                    <separator/>
-                    <filter string="Order Date" name="filter_date" date="date" default_period="this_year"/>
-                    <separator/>
-                    <filter string="My Sales" name="my_sales" help="My Sales" domain="[('user_id','=',uid)]"/>
                     <field name="config_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -43,8 +41,9 @@
                     <field name="product_categ_id"/>
                     <group expand="1" string="Group By">
                         <filter string="Salesperson" name="User" context="{'group_by':'user_id'}"/>
-                        <filter string="Product Category" name="product_category" context="{'group_by':'product_categ_id'}"/>
+                        <filter string="Point of Sale" name="pos" context="{'group_by':'config_id'}"/>
                         <filter string="Product" name="product" context="{'group_by':'product_id'}"/>
+                        <filter string="Product Category" name="product_category" context="{'group_by':'product_categ_id'}"/>
                         <separator/>
                         <filter string="Order Date" name="order_month" context="{'group_by':'date:month'}"/>
                     </group>
diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml
index d5c61ec4049..95d046dfed4 100644
--- a/addons/point_of_sale/views/pos_order_view.xml
+++ b/addons/point_of_sale/views/pos_order_view.xml
@@ -303,9 +303,10 @@
                 <field name="user_id"/>
                 <field name="partner_id"/>
                 <field name="session_id"/>
+                <field name="config_id"/>
                 <group expand="0" string="Group By">
                     <filter string="Customer" name="customer" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Salesman" name="salesman" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesperson" name="salesman" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Session" name="session" domain="[]" context="{'group_by':'session_id'}"/>
                     <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Order Date" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>