[IMP] crm: updated crm_meeting and crm_phonecall, to have Inbox filter for needaction.
bzr revid: tde@openerp.com-20120621104640-qsptqc62eyxzskl4
This commit is contained in:
parent
53b12f3fae
commit
3b74f505e1
|
@ -549,7 +549,6 @@
|
||||||
<field name="type">tree</field>
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline < current_date)">
|
<tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline < current_date)">
|
||||||
<field name="needaction_pending" invisible="1"/>
|
|
||||||
<field name="date_deadline" invisible="1"/>
|
<field name="date_deadline" invisible="1"/>
|
||||||
<field name="create_date" groups="base.group_no_one"/>
|
<field name="create_date" groups="base.group_no_one"/>
|
||||||
<field name="name" string="Opportunity"/>
|
<field name="name" string="Opportunity"/>
|
||||||
|
@ -568,6 +567,7 @@
|
||||||
<field name="priority" invisible="1"/>
|
<field name="priority" invisible="1"/>
|
||||||
<field name="categ_id" invisible="1"/>
|
<field name="categ_id" invisible="1"/>
|
||||||
<field name="state" groups="base.group_no_one"/>
|
<field name="state" groups="base.group_no_one"/>
|
||||||
|
<field name="needaction_pending" invisible="1"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -234,7 +234,6 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Meetings" fonts="bold:needaction_pending==True"
|
<tree string="Meetings" fonts="bold:needaction_pending==True"
|
||||||
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
|
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
|
||||||
<field name="needaction_pending" invisible="1"/>
|
|
||||||
<field name="name" string="Subject" />
|
<field name="name" string="Subject" />
|
||||||
<field name="user_id"/>
|
<field name="user_id"/>
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
|
@ -243,6 +242,7 @@
|
||||||
<field name="partner_id" string="Partner" />
|
<field name="partner_id" string="Partner" />
|
||||||
<field name="location" />
|
<field name="location" />
|
||||||
<field name="categ_id"/>
|
<field name="categ_id"/>
|
||||||
|
<field name="needaction_pending" invisible="1"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -282,20 +282,24 @@
|
||||||
<field name="model">crm.meeting</field>
|
<field name="model">crm.meeting</field>
|
||||||
<field name="type">search</field>
|
<field name="type">search</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<search string="Search Meetings">
|
<search string="Search Meetings">
|
||||||
<group>
|
<filter icon="terp-mail-message-new"
|
||||||
<field name="name" string="Meeting / Partner"
|
string="Inbox" help="Unread messages"
|
||||||
filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
|
name="needaction_pending"
|
||||||
<field name="user_id">
|
domain="[('needaction_pending','=',True)]"/>
|
||||||
<filter icon="terp-personal"
|
<group>
|
||||||
domain="[('user_id','=',uid)]"
|
<field name="name" string="Meeting / Partner"
|
||||||
help="My Meetings" />
|
filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
|
||||||
</field>
|
<field name="user_id">
|
||||||
<field name="partner_id"/>
|
<filter icon="terp-personal"
|
||||||
</group>
|
domain="[('user_id','=',uid)]"
|
||||||
</search>
|
help="My Meetings" />
|
||||||
</field>
|
</field>
|
||||||
</record>
|
<field name="partner_id"/>
|
||||||
|
</group>
|
||||||
|
</search>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<!-- Calendar Attendee Form View -->
|
<!-- Calendar Attendee Form View -->
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,7 @@
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Phonecalls Calendar View -->
|
<!-- Phonecalls Calendar View -->
|
||||||
|
|
||||||
<record model="ir.ui.view" id="crm_case_phone_calendar_view">
|
<record model="ir.ui.view" id="crm_case_phone_calendar_view">
|
||||||
<field name="name">CRM - Phone Calls Calendar</field>
|
<field name="name">CRM - Phone Calls Calendar</field>
|
||||||
|
@ -169,55 +169,59 @@
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Phonecalls Search View -->
|
<!-- Phonecalls Search View -->
|
||||||
|
|
||||||
<record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
|
<record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
|
||||||
<field name="name">CRM - Phone Calls Search</field>
|
<field name="name">CRM - Phone Calls Search</field>
|
||||||
<field name="model">crm.phonecall</field>
|
<field name="model">crm.phonecall</field>
|
||||||
<field name="type">search</field>
|
<field name="type">search</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<search string="Search Phonecalls">
|
<search string="Search Phonecalls">
|
||||||
<filter icon="terp-go-today" string="Today"
|
<filter icon="terp-mail-message-new"
|
||||||
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),
|
string="Inbox" help="Unread messages"
|
||||||
('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
name="needaction_pending"
|
||||||
name="today"
|
domain="[('needaction_pending','=',True)]"/>
|
||||||
help="Todays's Phonecalls"
|
<separator orientation="vertical"/>
|
||||||
/>
|
<filter icon="terp-go-today" string="Today"
|
||||||
<filter icon="terp-go-week"
|
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),
|
||||||
string="7 Days"
|
('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
||||||
help="Phonecalls during last 7 days"
|
name="today"
|
||||||
domain="[('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
help="Todays's Phonecalls"
|
||||||
/>
|
/>
|
||||||
|
<filter icon="terp-go-week"
|
||||||
<separator orientation="vertical"/>
|
string="7 Days"
|
||||||
<field name="name"/>
|
help="Phonecalls during last 7 days"
|
||||||
<field name="partner_id"/>
|
domain="[('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
||||||
<field name="user_id">
|
/>
|
||||||
<filter icon="terp-personal-"
|
<separator orientation="vertical"/>
|
||||||
domain="[('user_id','=',False)]"
|
<field name="name"/>
|
||||||
help="Unassigned Phonecalls" />
|
<field name="partner_id"/>
|
||||||
</field>
|
<field name="user_id">
|
||||||
<field name="section_id"
|
<filter icon="terp-personal-"
|
||||||
widget="selection" string="Sales Team">
|
domain="[('user_id','=',False)]"
|
||||||
<filter icon="terp-personal+"
|
help="Unassigned Phonecalls" />
|
||||||
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
</field>
|
||||||
help="My Sales Team(s)" />
|
<field name="section_id"
|
||||||
</field>
|
widget="selection" string="Sales Team">
|
||||||
<newline/>
|
<filter icon="terp-personal+"
|
||||||
<group expand="0" string="Group By...">
|
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
||||||
<filter string="Partner" icon="terp-partner" domain="[]"
|
help="My Sales Team(s)" />
|
||||||
context="{'group_by':'partner_id'}" />
|
</field>
|
||||||
<filter string="Responsible" icon="terp-personal"
|
<newline/>
|
||||||
domain="[]" context="{'group_by':'user_id'}" />
|
<group expand="0" string="Group By...">
|
||||||
<separator orientation="vertical" />
|
<filter string="Partner" icon="terp-partner" domain="[]"
|
||||||
<filter string="Creation" icon="terp-go-month" help="Creation Date"
|
context="{'group_by':'partner_id'}" />
|
||||||
domain="[]" context="{'group_by':'create_date'}" />
|
<filter string="Responsible" icon="terp-personal"
|
||||||
<filter string="Date" icon="terp-go-month" domain="[]"
|
domain="[]" context="{'group_by':'user_id'}" />
|
||||||
context="{'group_by':'date'}" help="Date of Call" />
|
<separator orientation="vertical" />
|
||||||
</group>
|
<filter string="Creation" icon="terp-go-month" help="Creation Date"
|
||||||
</search>
|
domain="[]" context="{'group_by':'create_date'}" />
|
||||||
|
<filter string="Date" icon="terp-go-month" domain="[]"
|
||||||
|
context="{'group_by':'date'}" help="Date of Call" />
|
||||||
|
</group>
|
||||||
|
</search>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Scheduled a phonecall search view-->
|
<!-- Scheduled a phonecall search view-->
|
||||||
<record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
|
<record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
|
||||||
<field name="name">CRM - Scheduled Calls Search</field>
|
<field name="name">CRM - Scheduled Calls Search</field>
|
||||||
|
@ -225,47 +229,51 @@
|
||||||
<field name="type">search</field>
|
<field name="type">search</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<search string="Scheduled Phonecalls">
|
<search string="Scheduled Phonecalls">
|
||||||
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
|
<filter icon="terp-mail-message-new"
|
||||||
<separator orientation="vertical"/>
|
string="Inbox" help="Unread messages"
|
||||||
<filter icon="terp-go-today" string="Today"
|
name="needaction_pending"
|
||||||
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),
|
domain="[('needaction_pending','=',True)]"/>
|
||||||
('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
<separator orientation="vertical"/>
|
||||||
name="today"
|
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
|
||||||
help="Todays's Phonecalls"
|
<separator orientation="vertical"/>
|
||||||
/>
|
<filter icon="terp-go-today" string="Today"
|
||||||
<filter icon="terp-go-week"
|
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),
|
||||||
string="7 Days"
|
('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
||||||
help="Phonecalls during last 7 days"
|
name="today"
|
||||||
domain="[('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
help="Todays's Phonecalls"
|
||||||
/>
|
/>
|
||||||
|
<filter icon="terp-go-week"
|
||||||
<separator orientation="vertical"/>
|
string="7 Days"
|
||||||
<field name="name"/>
|
help="Phonecalls during last 7 days"
|
||||||
<field name="partner_id"/>
|
domain="[('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
||||||
<field name="user_id">
|
/>
|
||||||
<filter icon="terp-personal-"
|
<separator orientation="vertical"/>
|
||||||
domain="[('user_id','=',False)]"
|
<field name="name"/>
|
||||||
help="Unassigned Phonecalls" />
|
<field name="partner_id"/>
|
||||||
</field>
|
<field name="user_id">
|
||||||
<field name="section_id"
|
<filter icon="terp-personal-"
|
||||||
widget="selection" string="Sales Team">
|
domain="[('user_id','=',False)]"
|
||||||
<filter icon="terp-personal+"
|
help="Unassigned Phonecalls" />
|
||||||
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
</field>
|
||||||
help="My Sales Team(s)" />
|
<field name="section_id"
|
||||||
</field>
|
widget="selection" string="Sales Team">
|
||||||
<newline/>
|
<filter icon="terp-personal+"
|
||||||
<group expand="0" string="Group By...">
|
domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
|
||||||
<filter string="Partner" icon="terp-partner" domain="[]"
|
help="My Sales Team(s)" />
|
||||||
context="{'group_by':'partner_id'}" />
|
</field>
|
||||||
<filter string="Responsible" icon="terp-personal"
|
<newline/>
|
||||||
domain="[]" context="{'group_by':'user_id'}" />
|
<group expand="0" string="Group By...">
|
||||||
<separator orientation="vertical" />
|
<filter string="Partner" icon="terp-partner" domain="[]"
|
||||||
<filter string="Creation" icon="terp-go-month" help="Creation Date"
|
context="{'group_by':'partner_id'}" />
|
||||||
domain="[]" context="{'group_by':'create_date'}" />
|
<filter string="Responsible" icon="terp-personal"
|
||||||
<filter string="Date" icon="terp-go-month" domain="[]"
|
domain="[]" context="{'group_by':'user_id'}" />
|
||||||
context="{'group_by':'date'}" help="Date of Call" />
|
<separator orientation="vertical" />
|
||||||
</group>
|
<filter string="Creation" icon="terp-go-month" help="Creation Date"
|
||||||
</search>
|
domain="[]" context="{'group_by':'create_date'}" />
|
||||||
|
<filter string="Date" icon="terp-go-month" domain="[]"
|
||||||
|
context="{'group_by':'date'}" help="Date of Call" />
|
||||||
|
</group>
|
||||||
|
</search>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue