From b132cb3b5ca46a8da1270db4f8262ff10eed44b1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 15:52:57 +0530
Subject: [PATCH 01/17] [IMP] stock.purchase:Imrpove the search view

bzr revid: sbh@tinyerp.com-20100914102257-l1p11xxw4a1q2m06
---
 addons/purchase/purchase_view.xml | 4 ++--
 addons/stock/stock_view.xml       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 81834ebbdbf..f4739064c2f 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -351,9 +351,9 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         <filter string="Product" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         </group>
                </search>
             </field>
@@ -377,7 +377,7 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Purchase Lines not Invoiced</field>
+            <field name="name">Purchase Lines Not Invoiced</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f9fd2ed2bd2..885f74267d9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1369,10 +1369,10 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
@@ -1767,9 +1767,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>

From e05a5c8b7608ba301e37cf1a90f68189d5343119 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 15:55:45 +0530
Subject: [PATCH 02/17] [IMP] purchase:Imrpove the view of purchase order line

bzr revid: sbh@tinyerp.com-20100914102545-t4rskjt34zjf2juc
---
 addons/purchase/purchase_view.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f4739064c2f..eb74b6730b2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -322,19 +322,20 @@
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History" groups="base.group_extended">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>
+               
                         <page string="Invoicing" groups="base.group_extended">
                             <separator colspan="4" string="Manual Invoices"/>
                             <field name="invoiced"/>
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
+         				<page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                               <separator colspan="4" string="Stock Moves"/>
+                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                        </page>                        
                     </notebook>
                 </form>
             </field>

From 71a8ce03371810bbdcad92f0c6461a74c15adaaa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 14:55:43 +0530
Subject: [PATCH 03/17] [IMP] purchase: Improve the serch view

bzr revid: sbh@tinyerp.com-20100916092543-0fifa4lzkw7cmjrm
---
 addons/purchase/purchase_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index eb74b6730b2..c1abe475110 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -171,6 +171,7 @@
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1" help="Purchase order which are in draft state"/>
                     <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1" help="Purchase order to be approved"/>
                     <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1" help="Approved purchase order"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
@@ -183,11 +184,13 @@
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
                     <filter string="Source Document" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                     <separator orientation="vertical"/>
+                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    
                 </group>
               </search>
             </field>

From 21c7ee711d122715f7faff2bf9d5d051d31ad2e1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:02:38 +0530
Subject: [PATCH 04/17] [IMP] purchase: Improve the serch view and put the
 waring in Purchase Order Merge wizard

bzr revid: sbh@tinyerp.com-20100916093238-ji70a4c1dsq19ugi
---
 addons/purchase/purchase_view.xml             |  4 ++--
 .../purchase/wizard/purchase_order_group.py   | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c1abe475110..eeec28637bd 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -174,7 +174,7 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To be Invoiced" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -184,7 +184,7 @@
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Source Document" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 8d2e17609e8..08b2ee5c4ed 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -24,11 +24,28 @@ from osv import fields, osv
 import netsvc
 import pooler
 from osv.orm import browse_record, browse_null
+from tools.translate import _
 
 class purchase_order_group(osv.osv_memory):
     _name = "purchase.order.group"
     _description = "Purchase Order Merge"
-
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        if not context:
+            context={}
+        res = super(purchase_order_group, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select multiple order inventories to merge in the list view.'))
     def merge_orders(self, cr, uid, ids, context):
         """
              To merge similar type of purchase orders.

From 0cc3c5ce1f83ee94e8c8d751424d7fc370a60af3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:08:25 +0530
Subject: [PATCH 05/17] [IMP] purchase: Improve the form view of order_line

bzr revid: sbh@tinyerp.com-20100916093825-1jju5nlti7gld94k
---
 addons/purchase/purchase_view.xml              | 14 +++++++-------
 addons/purchase/wizard/purchase_order_group.py |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index eeec28637bd..5144ed45ffc 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -264,19 +264,19 @@
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History" groups="base.group_extended">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>
                         <page string="Invoicing" groups="base.group_extended">
                             <separator colspan="4" string="Manual Invoices"/>
                             <field name="invoiced"/>
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
+           				<page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                               <separator colspan="4" string="Stock Moves"/>
+                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                        </page>                        
                     </notebook>
                 </form>
             </field>
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 08b2ee5c4ed..dbcd89dbc44 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -46,6 +46,7 @@ class purchase_order_group(osv.osv_memory):
         if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
             raise osv.except_osv(_('Warning'),
             _('Please select multiple order inventories to merge in the list view.'))
+        return res
     def merge_orders(self, cr, uid, ids, context):
         """
              To merge similar type of purchase orders.

From 5a549c08754dfab7e688ee37f435b824c5754ab8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:16:23 +0530
Subject: [PATCH 06/17] [IMP] purchase: Improve the serch view of purchase
 oreder_line

bzr revid: sbh@tinyerp.com-20100916094623-5uvmg5yqd0n0fuxr
---
 addons/purchase/purchase_view.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5144ed45ffc..ee25bd4363e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -296,7 +296,8 @@
                     <field name="product_uom"/>
                     <field name="price_unit"/>
                     <field name="price_subtotal"/>
-                    <field name="invoiced"/>
+                    <field name="state" invisible="1"/>
+                    <field name="invoiced" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -325,7 +326,6 @@
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
                         </page>
-               
                         <page string="Invoicing" groups="base.group_extended">
                             <separator colspan="4" string="Manual Invoices"/>
                             <field name="invoiced"/>
@@ -349,7 +349,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                		 <group>
+                		<group>
                         <field name="order_id"/>
                         <field name="product_id"/>
                         </group>
@@ -357,6 +357,7 @@
                         <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
+                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                         </group>
                </search>

From b7e6ccc3a24fe85d04888d4b6531e88afb8d00de Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:37:57 +0530
Subject: [PATCH 07/17] [IMP]purchase_requisition : Improve the form view and
 serch view

bzr revid: sbh@tinyerp.com-20100916100757-10lk53pi8fu1cmfz
---
 addons/purchase/purchase_view.xml               |  2 +-
 .../purchase_requisition_view.xml               | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ee25bd4363e..cbe75dd56d3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -184,8 +184,8 @@
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                     <separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index eed99cefd6c..a9f88b0fa6a 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -21,7 +21,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='To Invoice']" position="after">
+            <xpath expr="/search/group/filter[@string='To be Invoiced']" position="after">
              <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]" separator="1"/>
             </xpath>
         </field>
@@ -125,19 +125,20 @@
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-check" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <field name="name"/>
                     <field name="user_id" />
-                    <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <field name="exclusive" />
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                      <separator orientation="vertical"/>
-                    <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
-                    <separator orientation="vertical"/>
+                  	<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+					<separator orientation="vertical"/>
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date Start" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                    <filter string="Date End" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
                 </group>
               </search>
             </field>
@@ -150,7 +151,7 @@
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{"search_default_user_id":uid}</field>
+        <field name="context">{"search_default_user_id":uid,'search_default_draft': 1}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
     </record>
 

From bf9f914c18c919eaffea89b85e0f9bd3ef826eb8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:46:04 +0530
Subject: [PATCH 08/17] [IMP] purchase_requisition :set the color in tree view

bzr revid: sbh@tinyerp.com-20100916101604-7dw7pz463xabatfe
---
 addons/purchase_requisition/purchase_requisition_view.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index a9f88b0fa6a..7fc7a00706b 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,10 +102,9 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree string="Purchase Requisition">
+            <tree colors="grey:state in ('done');red:(state not in ('cancel','done')) and date_end > current_date" string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
-                <field name="purchase_ids"/>
                 <field name="date_start"/>
                 <field name="date_end"/>
                 <field name="origin"/>
@@ -137,8 +136,8 @@
                     <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date Start" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="Date End" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
+                    <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                    <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
                 </group>
               </search>
             </field>

From bea1616546eaab29b3a5d7ab63dca4f8aa11a315 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 16:23:24 +0530
Subject: [PATCH 09/17] [IMP] purchase_requisition :Improve the view of
 Quotation wizard

bzr revid: sbh@tinyerp.com-20100916105324-0hjql1rdnouo22ac
---
 .../wizard/purchase_requisition_partner_view.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 6214c4fad51..d994ba71405 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,10 +7,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Purchase Requisition">
+              	 <group colspan="2" col="2">
               		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
               		  <separator string="" colspan="4" />
-		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
 		              </group>

From b6440e2c2a8e8cae0d945af46db93e2fd77d56f8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 16:30:17 +0530
Subject: [PATCH 10/17] [IMP] purchase_requisition :Improve the tooltips

bzr revid: sbh@tinyerp.com-20100916110017-xw2ggjvye1x68mqn
---
 addons/purchase_requisition/purchase_requisition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 13a760c9b87..09feddc1516 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -35,7 +35,7 @@ class purchase_requisition(osv.osv):
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Tender (exclusive):On the confirmation of a purchase order, it cancels the remaining purchase order.Multiple Requisitions:It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
+        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),

From 0c5efd6eada8aab76f933c16768ef68fc53e8555 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 17:42:19 +0530
Subject: [PATCH 11/17] [IMP] purchase: Improve the Purchase analysis report

bzr revid: sbh@tinyerp.com-20100916121219-4w1ug3idx8r5ss17
---
 addons/purchase/report/purchase_report.py     |  7 +++-
 .../purchase/report/purchase_report_view.xml  | 37 ++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 40a61efbc19..e5ca57ffef5 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -31,7 +31,7 @@ class purchase_report(osv.osv):
     _description = "Purchases Orders"
     _auto = False
     _columns = {
-        'date': fields.date('Order Date', readonly=True),
+        'date': fields.date('Order Date', readonly=True, help="Date on which this document has been created"),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'state': fields.selection([('draft', 'Request for Quotation'),
@@ -52,11 +52,12 @@ class purchase_report(osv.osv):
         'date_approve':fields.date('Date Approved', readonly=True),
         'expected_date':fields.date('Expected Date', readonly=True),
         'validator' : fields.many2one('res.users', 'Validated By', readonly=True),
+        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'delay':fields.float('Days to Validate', digits=(16,2), readonly=True),
         'delay_pass':fields.float('Days to Deliver', digits=(16,2), readonly=True),
-        'quantity': fields.float('# of Products', readonly=True),
+        'quantity': fields.float('# of Qty', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'negociation': fields.float('Purchase-Standard Price', readonly=True, group_operator="avg"),
@@ -89,6 +90,7 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     l.product_id,
+                    l.product_uom as product_uom,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
@@ -114,6 +116,7 @@ class purchase_report(osv.osv):
                     l.price_unit,
                     s.date_approve,
                     l.date_planned,
+                    l.product_uom,
                     date_trunc('day',s.minimum_planned_date),
                     s.partner_address_id,
                     s.pricelist_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index bd69e4dfce0..79178048ff6 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -25,6 +25,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
+                    <field name="product_uom" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
@@ -34,7 +35,7 @@
                     <field name="state" invisible="1"/>
                     <field name="location_id" invisible="1"/>
                     <field name="nbr" sum="# of Lines"/>
-                    <field name="quantity" sum="# of Products"/>
+                    <field name="quantity" sum="# of Qty"/>
                     <field name="price_average" sum="Average Price"/>
                     <field name="price_total" sum="Total Price"/>
                     <field name="price_standard" sum="Products Value"/>
@@ -52,18 +53,18 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-                <filter icon="terp-go-year" string="This Year"
-                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Tasks performed in this year"/>
-                <filter icon="terp-go-month" string="This Month"
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in this month"/>
-                <filter icon="terp-go-week"
-                        string="7 Days"
-                        separator="1"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks during last 7 days"/>
+                <filter icon="terp-go-year" string="  Year  "
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                help="Order in current year"/>
+                <filter icon="terp-go-month" string="   Month   "
+                name="month"
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                help="Order in  current month"/>
+                <filter icon="terp-go-month"
+                 string="    Month-1    "
+                 separator="1"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
                         string="Quotations"
@@ -80,12 +81,12 @@
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+ 					<separator orientation="vertical"/>
+                    <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Product UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -106,7 +107,7 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date"/>
+                    <field name="date" />
                     <field name="date_approve"/>
                     <field name="expected_date"/>
                 </group>

From 0e5c322264f67b83541615f33be6e34719a16d8e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 17:57:09 +0530
Subject: [PATCH 12/17] [IMP] stock: Add the month,year and month-1 group by in
 search view

bzr revid: sbh@tinyerp.com-20100916122709-axhvl7w3d8fkj66g
---
 .../stock/report/report_stock_move_view.xml   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2c8c1ad80e9..da15e91915f 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -54,16 +54,18 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
+                <filter icon="terp-go-year" string="  Year  "
+                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-01-01'))]"
+                help="Current year"/>
+                <filter icon="terp-go-month" string="   Month   "
+                name="month"
+                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                help="Current month"/>
                 <filter icon="terp-go-month"
-                    name="month"
-                    string="This Month"
-                    domain="[('month','=',time.strftime('%%m'))]"
-                    help="Stock Moves of this month"/>
-                <filter icon="terp-go-today"
-                    string="Today"
-                    separator="1"
-                    domain="[('date_planned','=', time.strftime('%%Y-%%m-%%d'))]"
-                    help="Stock Moves of today"/>
+                 string="    Month-1    "
+                 separator="1"
+                 domain="[('date_planned','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_planned','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Last month"/>                    
                 <separator orientation="vertical"/>
 
                 <filter string="Done"
@@ -91,9 +93,10 @@
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/>
                     <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

From e1b2c48621e0f893bc9a86d0ee03d6b722d69c2c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 17:58:50 +0530
Subject: [PATCH 13/17] [IMP] stock: change the icon

bzr revid: sbh@tinyerp.com-20100916122850-bmr89xldihgigxut
---
 addons/stock/report/report_stock_move_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index da15e91915f..6e92ff87e33 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -70,7 +70,7 @@
 
                 <filter string="Done"
                     name="done"
-                    icon="terp-dialog-close"
+                    icon="terp-check"
                     domain="[('state','=','done')]"
                     help = "Completed Stock-Moves"/>
                 <filter string="Todo"

From 117ba2fc53a81103a5504e286d1fe6ec614fc190 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 15:09:44 +0530
Subject: [PATCH 14/17] [IMP] purchase_requisition: change the context in
 search view

bzr revid: sbh@tinyerp.com-20100917093944-d7jqgoyztghpmdlk
---
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 7fc7a00706b..b0f87a342ad 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -150,7 +150,7 @@
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{"search_default_user_id":uid,'search_default_draft': 1}</field>
+        <field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
     </record>
 

From b43dc2d5551ebc2d3c2b3f5b0b3046bcea48bd07 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 18:06:57 +0530
Subject: [PATCH 15/17] [IMP] purchase: Improve the tooltips and view

bzr revid: sbh@tinyerp.com-20100917123657-yjfi18gvyn1308lk
---
 addons/purchase/wizard/purchase_order_group.py            | 2 +-
 addons/purchase_requisition/purchase_requisition.py       | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index dbcd89dbc44..f20205098bf 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -45,7 +45,7 @@ class purchase_order_group(osv.osv_memory):
         res = super(purchase_order_group, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
             raise osv.except_osv(_('Warning'),
-            _('Please select multiple order inventories to merge in the list view.'))
+            _('Please select multiple order Order to merge in the list view.'))
         return res
     def merge_orders(self, cr, uid, ids, context):
         """
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 09feddc1516..1e0c4f06838 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -35,7 +35,7 @@ class purchase_requisition(osv.osv):
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
+        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive):  On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple):  It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b0f87a342ad..3daeab14881 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,7 +102,7 @@
         <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree colors="grey:state in ('done');red:(state not in ('cancel','done')) and date_end > current_date" string="Purchase Requisition">
+            <tree colors="grey:state in ('done');red:date_end&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;" string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="date_start"/>

From 2bd607d49cbe42343cf13b6987fcfc4ee5f25f88 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 18:19:50 +0530
Subject: [PATCH 16/17] [IMP] stock: rename the date field in Moves Statistics
 report

bzr revid: sbh@tinyerp.com-20100917124950-r3oqg7jhrqpr12aq
---
 addons/purchase/wizard/purchase_order_group.py | 2 +-
 addons/stock/report/report_stock_move.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index f20205098bf..10bf55570cc 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -45,7 +45,7 @@ class purchase_order_group(osv.osv_memory):
         res = super(purchase_order_group, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
             raise osv.except_osv(_('Warning'),
-            _('Please select multiple order Order to merge in the list view.'))
+            _('Please select multiple order to merge in the list view.'))
         return res
     def merge_orders(self, cr, uid, ids, context):
         """
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 460e7a6d0ab..a96144060ca 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -28,7 +28,7 @@ class report_stock_move(osv.osv):
     _description = "Moves Statistics"
     _auto = False
     _columns = {
-        'date_planned': fields.date('Date', readonly=True),
+        'date_planned': fields.date('Date Planned', readonly=True ),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),

From 9bae4e5be0f44cbf474c1378f739cea584de3114 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 16:15:08 +0530
Subject: [PATCH 17/17] [ADD] stock,purchase: Add the tooltips

bzr revid: sbh@tinyerp.com-20100922104508-g1cm0xldfllkk563
---
 addons/purchase/report/purchase_report_view.xml | 6 +++---
 addons/stock/report/report_stock_move_view.xml  | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 79178048ff6..f6ba909a857 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -93,9 +93,9 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Order of Day"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Order of Month"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}" help="Order of Year"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 6e92ff87e33..9d259f86f18 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -90,7 +90,9 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
@@ -101,9 +103,9 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}" help="Month Planned"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">