[IMP]: Removed duplicated by.. from Group by

bzr revid: rpa@openerp.co.in-20100216095445-qyzbd5i6gif2djkm

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7962ce2..60eed3e 100644 (file)
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -337,9 +337,9 @@
                         <field name="origin" select='1'/>
                                        </group>                
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="10">
-                        <filter string="By Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
-                                               <filter string="By State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
-                                               <filter string="By Date Invoice" icon="terp-account" domain="[]" context="{'group_by':'date_invoice'}"/>
+                        <filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
+                                               <filter string="State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
+                                               <filter string="Date Invoice" icon="terp-account" domain="[]" context="{'group_by':'date_invoice'}"/>
                           </group>   
                </search>
             </field>

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5869751..47047c5 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -183,12 +183,11 @@
                 </group>
                 <newline/>
                <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
-                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
-
-                </group>
+                        <filter string="Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
+                        <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
+                        
            </search>
         </field>
     </record>

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ab370e4..2b9831a 100644 (file)
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -222,10 +222,10 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="4">
-                        <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
-                        <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
-                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
                         
                 </group>
            </search>

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f7e5139..945eec1 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -412,10 +412,10 @@
                         </field>
                     </group>
                     <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Users" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="By Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="By State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Users" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b7b09e7..2e1f048 100644 (file)
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -161,9 +161,9 @@
                     </field>
                 </group>
                                <group expand="1" string="Group By..." colspan="4" col="10">
-                                       <filter string="By Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>     
-                    <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>                            
-                                       <filter string="By Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
+                                       <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>        
+                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>                               
+                                       <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
                                </group>
               </search>
             </field>

diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 4a687a8..21ec33c 100644 (file)
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -66,10 +66,10 @@
                            <field name="state" select="1"/>
                            </group>     
                                <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
-                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
+                        <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
                        </group>
                 </search>
             </field>
@@ -153,10 +153,10 @@
                            <field name="state" select="1"/>
                                                </group>                            
                                <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="By Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
-                        <filter string="By Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="By Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
+                        <filter string="Year" icon="terp-sale" domain="[]"  context="{'group_by':'name'}"/>
+                        <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'category_id'}"/>
                                                </group>                            
                                        
                 </search>

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 711cfac..756ade6 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -242,12 +242,12 @@
                             <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
                         </field>
                         <field name="date_order" select="1"/>
-                    </group>
-                    <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="By Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                    </group>
+                                       </group>
+                                       <group expand="1" string="Group By..." colspan="4" col="8">
+                                               <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                                       </group>                        
                </search>
             </field>
         </record>
@@ -411,12 +411,12 @@
                             <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                             <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
-                    <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    </group>
-
+                                       <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
+                                               <filter string="Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                                       </group>                        
+                        
                     </group>
                 </search>
             </field>

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c27d0d7..140ecb1 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -666,9 +666,9 @@
                         <field name="address_id" select="1"/>
                    </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                                        </group>
               </search>
             </field>
@@ -792,9 +792,9 @@
                         <field name="origin" select="1"/>
                    </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="10">
-                        <filter string="By Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
-                        <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
                                        </group>
               </search>
             </field>
@@ -950,9 +950,9 @@
                         <field name="company_id" select="1" widget="selection"/>
                    </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                                        </group>
                 </search>
             </field>
@@ -1110,9 +1110,9 @@
                         <field name="company_id" select="1" widget="selection"/>
                    </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                                        </group>
                 </search>
             </field>
@@ -1163,9 +1163,9 @@
                         <field name="company_id" select="1" widget="selection"/>
                    </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                                        </group>
                 </search>
             </field>
@@ -1280,11 +1280,11 @@
                            <field name="product_id" select="1"/>
                     </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                        <filter string="By Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                                               <filter string="By Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                                               <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Destion Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                                               <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
+                                               <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Destion Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
                                        </group>
                </search>
             </field>
@@ -1406,9 +1406,9 @@
                            <field name="product_id"/>
                     </group>
                     <group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-                                               <filter string="By Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                                               <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                                               <filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                                               <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                                               <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                                               <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
                                        </group>
                </search>
             </field>