pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
bzr revid: rpa@openerp.co.in-20100216095445-qyzbd5i6gif2djkm
This commit is contained in:
rpa (Open ERP)
2010-02-16 15:24:45 +05:30
parent 0434310146
commit 58c4db399c
8 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+3 -3
View File
@@ -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>
addons/crm/crm_lead_view.xml
+5 -6
View File
@@ -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>
addons/crm/crm_opportunity_view.xml
+4 -4
View File
@@ -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>
addons/project/project_view.xml
+4 -4
View File
@@ -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'}"/>
addons/purchase/purchase_view.xml
+3 -3
View File
@@ -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>
addons/report_sale/report_sale_view.xml
+8 -8
View File
@@ -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>
addons/sale/sale_view.xml
+12 -12
View File
@@ -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>
addons/stock/stock_view.xml
+23 -23
View File
@@ -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>