[IMP] Improved code of Meetings buttons in Customers form view which is showing 'id' of Customer.
Removed unwanted code of views and action and used older actions. bzr revid: psa@tinyerp.com-20130412082500-xf96csxd5unz66cr
This commit is contained in:
Paramjit Singh Sahota
parent
cdf4d94e7f
commit
eb1ede2367
|
|
@ -44,6 +44,29 @@ class crm_meeting(base_state, osv.Model):
|
|||
_description = "Meeting"
|
||||
_order = "id desc"
|
||||
_inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
|
||||
def _get_attendee(self, cursor, user, ids, name, arg, context=None):
|
||||
res = {}
|
||||
return res
|
||||
|
||||
def _attendees_search(self, cursor, user, obj, name, args, context=None):
|
||||
if not len(args):
|
||||
return []
|
||||
clause = ''
|
||||
res = False
|
||||
for arg in args:
|
||||
if arg[1] == '=':
|
||||
if arg[2]:
|
||||
clause = 'rel.partner_id = ' + str(arg[2])
|
||||
if clause:
|
||||
cursor.execute('SELECT rel.meeting_id ' \
|
||||
'FROM crm_meeting_partner_rel AS rel ' \
|
||||
'WHERE ' + clause )
|
||||
res = cursor.fetchall()
|
||||
|
||||
if not res:
|
||||
return [('id', '=', 0)]
|
||||
return [('id', 'in', [x[0] for x in res])]
|
||||
|
||||
_columns = {
|
||||
# base_state required fields
|
||||
'create_date': fields.datetime('Creation Date', readonly=True),
|
||||
|
|
@ -52,6 +75,8 @@ class crm_meeting(base_state, osv.Model):
|
|||
'date_closed': fields.datetime('Closed', readonly=True),
|
||||
'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id',
|
||||
string='Attendees', states={'done': [('readonly', True)]}),
|
||||
'partner_id': fields.function(_get_attendee, string='Attendees',
|
||||
fnct_search=_attendees_search, type='many2one', relation='res.partner'),
|
||||
'state': fields.selection(
|
||||
[('draft', 'Unconfirmed'), ('open', 'Confirmed')],
|
||||
string='Status', size=16, readonly=True, track_visibility='onchange'),
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Meetings">
|
||||
<field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
|
||||
<field name="partner_ids"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="categ_ids"/>
|
||||
<field name="user_id"/>
|
||||
<separator/>
|
||||
|
|
@ -291,6 +291,20 @@
|
|||
<menuitem name="Calendar"
|
||||
id="mail_menu_calendar" parent="mail.mail_my_stuff"
|
||||
sequence="10" action="action_crm_meeting"/>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="res_partner_view_buttons">
|
||||
<field name="name">res.partner.view.buttons.meeting</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form" />
|
||||
<field name="priority" eval="10"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action"
|
||||
string="Meetings"
|
||||
name="%(base_calendar.action_crm_meeting)d"
|
||||
context="{'search_default_partner_id': active_id, 'default_partner_ids': [active_id]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -99,10 +99,6 @@
|
|||
<field name="priority" eval="10"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action"
|
||||
string="Meetings"
|
||||
name="%(base_calendar.action_crm_meeting)d"
|
||||
context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
|
||||
<button type="action" string="Calls"
|
||||
name="%(crm.crm_case_categ_phone_incoming0)d"
|
||||
context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
|
||||
|
|
|
|||
|
|
@ -217,25 +217,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_partner_crm_claim_tree" model="ir.ui.view">
|
||||
<field name="name">res.partner.crm.claim.tree</field>
|
||||
<field name="model">crm.claim</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Partners Claim">
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_res_partner_crm_claim" model="ir.actions.act_window">
|
||||
<field name="name">Claims</field>
|
||||
<field name="res_model">crm.claim</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="context">{'search_default_partner_id': [active_id]}</field>
|
||||
<field name="view_id" ref="res_partner_crm_claim_tree"/>
|
||||
</record>
|
||||
|
||||
<!-- Partners inherited form -->
|
||||
<record id="view_claim_res_partner_info_form" model="ir.ui.view">
|
||||
<field name="name">res.partner.claim.info.form</field>
|
||||
|
|
@ -245,8 +226,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action"
|
||||
name="%(crm_claim.action_res_partner_crm_claim)d"
|
||||
name="%(crm_case_categ_claim0)d"
|
||||
string="Claims"
|
||||
context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
|
||||
groups="base.group_sale_salesman" />
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
<separator/>
|
||||
<filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]"
|
||||
help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="project_id"/>
|
||||
<field name="user_id"/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
|
|
|||
|
|
@ -2,41 +2,6 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="res_partner_view_task_tree" model="ir.ui.view">
|
||||
<field name="name">res.partner.project.task.tree</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Tasks">
|
||||
<field name="name"/>
|
||||
<field name="user_id"/>
|
||||
<field name="date_deadline"/>
|
||||
<field name="state" invisible="1"/>
|
||||
<button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
|
||||
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_res_partner_tasks_summary" model="ir.actions.act_window">
|
||||
<field name="name">Tasks</field>
|
||||
<field name="res_model">project.task</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
|
||||
<field name="view_id" ref="res_partner_view_task_tree"/>
|
||||
</record>
|
||||
|
||||
<record id="view_res_partner_task_search_form_group" model="ir.ui.view">
|
||||
<field name="name">res.partner.task.search.form.group</field>
|
||||
<field name="model">project.task</field>
|
||||
<field name="inherit_id" ref="project.view_task_search_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="project_id" position="before">
|
||||
<field name="partner_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Partners inherited form -->
|
||||
<record id="view_task_partner_info_form" model="ir.ui.view">
|
||||
<field name="name">res.partner.task.buttons</field>
|
||||
|
|
@ -46,8 +11,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action"
|
||||
name="%(project.action_res_partner_tasks_summary)d"
|
||||
name="%(action_view_task)d"
|
||||
string="Tasks"
|
||||
context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
|
||||
groups="project.group_project_user" />
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@
|
|||
<filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
|
||||
<separator/>
|
||||
<filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/>
|
||||
<field name="partner_id" string="Partner"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id"/>
|
||||
<field name="project_id"/>
|
||||
<field name="categ_ids"/>
|
||||
|
|
@ -281,22 +281,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_project_feature_filter" model="ir.ui.view">
|
||||
<field name="name">Project Issue - Feature Tracker Search</field>
|
||||
<field name="model">project.issue</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Feature Tracker Search">
|
||||
<field name="name" string="Feature description"/>
|
||||
<field name="date"/>
|
||||
<field name="state" groups="base.group_no_one"/>
|
||||
<filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
|
||||
<filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
|
||||
<field name="user_id"/>
|
||||
<field name="project_id" string="Project"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
|
||||
<field name="res_model">project.issue</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
@ -391,7 +375,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@name='buttons']" position="inside">
|
||||
<button type="action" string="Issues" attrs="{'invisible': [('customer', '=', False)]}"
|
||||
name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}" groups="project.group_project_user"/>
|
||||
name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" groups="project.group_project_user"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue