odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] marketing_campaign : Improvements in search views 

bzr revid: vir@tinyerp.com-20100810095211-yxakl871pqjasp8l
This commit is contained in:
Vir (Open ERP) 2010-08-10 15:22:11 +05:30
parent b4de88c478
commit 4dd3512996
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/marketing_campaign/marketing_campaign.py
View File

@ -85,7 +85,7 @@ class marketing_campaign(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True),
'object_id': fields.many2one('ir.model', 'Model', required=True,
'object_id': fields.many2one('ir.model', 'Resource', required=True,
help="Choose the model on which you want \
this campaign to be run"),
'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
@ -459,10 +459,10 @@ class marketing_campaign_transition(osv.osv):
'name': fields.function(_get_name, method=True, string='Name',
type='char', size=128),
'activity_from_id': fields.many2one('marketing.campaign.activity',
'Source Activity', select=1,
'Previous Activity', select=1,
required=True),
'activity_to_id': fields.many2one('marketing.campaign.activity',
'Destination Activity',
'Next Activity',
required=True),
'interval_nbr': fields.integer('Interval Value', required=True),
'interval_type': fields.selection(_interval_units, 'Interval Unit',

22
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -84,10 +84,13 @@
<filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="object_id" select="1"/>
<field name="object_id" select="1" string="Resource"/>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="Object" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
<filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
<separator orientation="vertical"/>
<filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
<separator orientation="vertical"/>
<filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
</group>
</search>
@ -171,21 +174,23 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Segments">
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
<filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Create Date" domain="[('sync_mode','=','create_date')]"/>
<filter icon="terp-go-month" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
<filter icon="terp-go-month" string="Create After Sync" domain="[('sync_mode','=','create_date')]"/>
<filter icon="terp-go-month" string="Modified after Sync" domain="[('sync_mode','=','write_date')]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="object_id" select="1"/>
<field name="campaign_id" select="1"/>
<field name="object_id" select="1"/>
<field name="date_run" select="1"/>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
<filter string="Date Run" name="Date Run" icon="terp-go-month" context="{'group_by':'date_run'}" />
<separator orientation="vertical"/>
<filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
<separator orientation="vertical"/>
<filter string="Run Date" name="Date Run" icon="terp-go-month" context="{'group_by':'date_run'}" />
</group>
</search>
</field>
@ -371,8 +376,9 @@
<filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
<filter string="Activity" name="Activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
<separator orientation="vertical"/>
<filter string="Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
<filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
<separator orientation="vertical"/>
<filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
</group>
</search>
</field>