[IMP] Removed the History tab from customer form.
>>> Remove the related one2many:>> 1)Tasks 2)Events 3)Registrations 4)Campaign 5)Claims. >>> Add act_window buttons in the top right corner:>> 1)Tasks 2)Claims. bzr revid: psa@tinyerp.com-20130326113812-xzqpcgwk2yhyike2
This commit is contained in:
parent
5824011dc9
commit
b51362d554
|
@ -227,11 +227,11 @@ class crm_claim(base_stage, osv.osv):
|
||||||
update_vals[key] = res.group(2).lower()
|
update_vals[key] = res.group(2).lower()
|
||||||
|
|
||||||
return super(crm_claim,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
|
return super(crm_claim,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
|
||||||
#
|
|
||||||
#class res_partner(osv.osv):
|
class res_partner(osv.osv):
|
||||||
# _inherit = 'res.partner'
|
_inherit = 'res.partner'
|
||||||
# _columns = {
|
_columns = {
|
||||||
# 'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
|
'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
|
||||||
# }
|
}
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -217,33 +217,40 @@
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- <record id="view_claim_partner_info_form1" model="ir.ui.view">
|
<record id="res_partner_crm_claim_tree" model="ir.ui.view">
|
||||||
<field name="name">res.partner.claim.info.form</field>
|
<field name="name">res.partner.crm.claim.tree</field>
|
||||||
<field name="model">res.partner</field>
|
<field name="model">crm.claim</field>
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
|
||||||
<field name="priority">20</field>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page[@name='page_history']" position="attributes">
|
<tree string="Partners Claim">
|
||||||
<attribute name="invisible">False</attribute>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//page[@name='page_history']" position="inside">
|
|
||||||
<group name="grp_claim" string="Claims">
|
|
||||||
<field name="claims_ids" colspan="4" nolabel="1">
|
|
||||||
<tree string="Partners Claim" editable="bottom">
|
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</group>
|
</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="domain">[['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>
|
||||||
|
<field name="model">res.partner</field>
|
||||||
|
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||||
|
<field name="priority">30</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//div[@name='buttons']" position="inside">
|
||||||
|
<button type="action"
|
||||||
|
name="%(crm_claim.action_res_partner_crm_claim)d"
|
||||||
|
string="Claims" />
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record> -->
|
</record>
|
||||||
<act_window
|
|
||||||
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
|
|
||||||
id="act_claim_partner"
|
|
||||||
name="Claims"
|
|
||||||
view_mode="tree,form"
|
|
||||||
res_model="crm.claim"
|
|
||||||
src_model="res.partner"/>
|
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -22,6 +22,5 @@
|
||||||
import event
|
import event
|
||||||
import wizard
|
import wizard
|
||||||
import report
|
import report
|
||||||
import res_partner
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,6 @@ Key Features
|
||||||
'event_data.xml',
|
'event_data.xml',
|
||||||
'report/report_event_registration_view.xml',
|
'report/report_event_registration_view.xml',
|
||||||
'board_association_view.xml',
|
'board_association_view.xml',
|
||||||
'res_partner_view.xml',
|
|
||||||
'email_template.xml',
|
'email_template.xml',
|
||||||
],
|
],
|
||||||
'demo': ['event_demo.xml'],
|
'demo': ['event_demo.xml'],
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
from openerp.osv import fields, osv
|
|
||||||
|
|
||||||
class res_partner(osv.osv):
|
|
||||||
_inherit = 'res.partner'
|
|
||||||
|
|
||||||
_columns = {
|
|
||||||
'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."),
|
|
||||||
# 'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True),
|
|
||||||
# 'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
res_partner()
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
|
@ -1,44 +0,0 @@
|
||||||
<!-- <?xml version="1.0"?>
|
|
||||||
<openerp>
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<!-- Partners inherited form ->
|
|
||||||
|
|
||||||
<record id="view_event_partner_info_form" model="ir.ui.view">
|
|
||||||
<field name="name">res.partner.event.info.inherit</field>
|
|
||||||
<field name="model">res.partner</field>
|
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<field name="supplier" position="after">
|
|
||||||
<field name="speaker"/>
|
|
||||||
</field>
|
|
||||||
<xpath expr="//page[@name='page_history']" position="attributes">
|
|
||||||
<attribute name="invisible">False</attribute>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//page[@name='page_history']" position="inside">
|
|
||||||
<group name="grp_event" string="Events">
|
|
||||||
<field name="event_ids" colspan="4" nolabel="1">
|
|
||||||
<tree string="Events">
|
|
||||||
<field name="name" string="Event"/>
|
|
||||||
<field name="main_speaker_id"/>
|
|
||||||
</tree>
|
|
||||||
</field>
|
|
||||||
</group>
|
|
||||||
<group name="grp_registration" string="Registrations">
|
|
||||||
<field name="event_registration_ids" colspan="4" nolabel="1">
|
|
||||||
<tree string="Events Registration">
|
|
||||||
<field name="event_begin_date" string="Date"/>
|
|
||||||
<field name="event_id" />
|
|
||||||
<field name="nb_register"/>
|
|
||||||
<field name="state"/>
|
|
||||||
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
|
|
||||||
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
|
|
||||||
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
|
|
||||||
</tree>
|
|
||||||
</field>
|
|
||||||
</group>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</data>
|
|
||||||
</openerp> -->
|
|
|
@ -20,7 +20,6 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import marketing_campaign
|
import marketing_campaign
|
||||||
import res_partner
|
|
||||||
import report
|
import report
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -59,7 +59,6 @@ input segments, workflow.
|
||||||
'marketing_campaign_view.xml',
|
'marketing_campaign_view.xml',
|
||||||
'marketing_campaign_data.xml',
|
'marketing_campaign_data.xml',
|
||||||
'marketing_campaign_workflow.xml',
|
'marketing_campaign_workflow.xml',
|
||||||
'res_partner_view.xml',
|
|
||||||
'report/campaign_analysis_view.xml',
|
'report/campaign_analysis_view.xml',
|
||||||
'security/marketing_campaign_security.xml',
|
'security/marketing_campaign_security.xml',
|
||||||
'security/ir.model.access.csv'
|
'security/ir.model.access.csv'
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
from openerp.osv import fields,osv
|
|
||||||
|
|
||||||
class res_partner(osv.osv):
|
|
||||||
_inherit = 'res.partner'
|
|
||||||
|
|
||||||
_columns = {
|
|
||||||
# 'workitem_ids': fields.one2many('marketing.campaign.workitem',
|
|
||||||
# 'partner_id', 'Workitems',
|
|
||||||
# readonly=True),
|
|
||||||
}
|
|
||||||
|
|
||||||
def copy(self, cr, uid, id, default={}, context=None):
|
|
||||||
default.update({
|
|
||||||
'workitem_ids': [],
|
|
||||||
})
|
|
||||||
return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
|
|
||||||
|
|
||||||
res_partner()
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<openerp>
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<!-- Partners inherited form -->
|
|
||||||
<!-- <record id="view_workitem_partner_info_form" model="ir.ui.view">
|
|
||||||
<field name="name">res.partner.workitem.info.inherit</field>
|
|
||||||
<field name="model">res.partner</field>
|
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//page[@name='page_history']" position="attributes">
|
|
||||||
<attribute name="invisible">False</attribute>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//page[@name='page_history']" position="inside">
|
|
||||||
<group name="grp_campaign" string="Campaigns">
|
|
||||||
<field name="workitem_ids" colspan="4" nolabel="1"/>
|
|
||||||
</group>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record> -->
|
|
||||||
</data>
|
|
||||||
</openerp>
|
|
||||||
|
|
|
@ -2,19 +2,11 @@
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<!-- Partners inherited form -->
|
<record id="res_partner_view_task_tree" model="ir.ui.view">
|
||||||
<!-- <record id="view_task_partner_info_form" model="ir.ui.view">
|
<field name="name">res.partner.project.task.tree</field>
|
||||||
<field name="name">res.partner.task.info.inherit</field>
|
<field name="model">project.task</field>
|
||||||
<field name="model">res.partner</field>
|
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page[@name='page_history']" position="attributes">
|
<tree string="Tasks">
|
||||||
<attribute name="invisible">False</attribute>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//page[@name='page_history']" position="inside">
|
|
||||||
<group name="grp_task" string="Tasks">
|
|
||||||
<field name="task_ids" colspan="4" nolabel="1">
|
|
||||||
<tree string="Tasks" editable="bottom">
|
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="user_id"/>
|
<field name="user_id"/>
|
||||||
<field name="date_deadline"/>
|
<field name="date_deadline"/>
|
||||||
|
@ -23,9 +15,32 @@
|
||||||
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
|
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</group>
|
</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]}</field>
|
||||||
|
<field name="domain">[['partner_id','=', active_id]]</field>
|
||||||
|
<field name="view_id" ref="res_partner_view_task_tree"/>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<!-- Partners inherited form -->
|
||||||
|
<record id="view_task_partner_info_form" model="ir.ui.view">
|
||||||
|
<field name="name">res.partner.task.buttons</field>
|
||||||
|
<field name="model">res.partner</field>
|
||||||
|
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||||
|
<field name="priority" eval="30"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//div[@name='buttons']" position="inside">
|
||||||
|
<button type="action"
|
||||||
|
name="%(project.action_res_partner_tasks_summary)d"
|
||||||
|
string="Tasks" />
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record> -->
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
Loading…
Reference in New Issue