summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVir (Open ERP) <vir@tinyerp.com>2010-06-25 15:20:38 +0530
committerVir (Open ERP) <vir@tinyerp.com>2010-06-25 15:20:38 +0530
commit3d20973c46e8eadaf2a55e817fdf8affe5f922e8 (patch)
treea1d99dca8a9dabeb80383827f1ce822bb55cdce5
parentd5196a8fe8f542f67c25f64db2987f3da4b3fc96 (diff)
[ADD] partner : new history tabs are added for crm, email,maketing_campaign,mail_gateway
bzr revid: vir@tinyerp.com-20100625095038-tgjki9gmdfdibgp3
-rw-r--r--addons/crm/res_partner_view.xml122
-rw-r--r--addons/mail_gateway/__init__.py5
-rw-r--r--addons/mail_gateway/__openerp__.py1
-rw-r--r--addons/mail_gateway/res_partner.py36
-rw-r--r--addons/mail_gateway/res_partner_view.xml20
-rw-r--r--addons/marketing_campaign/__init__.py1
-rw-r--r--addons/marketing_campaign/__openerp__.py7
-rw-r--r--addons/marketing_campaign/res_partner.py37
-rw-r--r--addons/marketing_campaign/res_partner_view.xml20
-rw-r--r--addons/project/__init__.py1
-rw-r--r--addons/project/__openerp__.py1
-rw-r--r--addons/project/res_partner.py36
-rw-r--r--addons/project/res_partner_view.xml20
13 files changed, 254 insertions, 53 deletions
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index d5bd5c1a3e9..35318cfcac5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -4,62 +4,88 @@
<!-- Partners inherited form -->
- <record id="view_crm_partner_info_form" model="ir.ui.view">
- <field name="name">res.partner.crm.info.inherit</field>
+ <record id="view_crm_partner_info_form1" model="ir.ui.view">
+ <field name="name">res.partner.crm.info.inherit1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <xpath expr="//notebook[last()]" position="after">
- <notebook colspan="4">
- <page string="CRM">
- <field name="meeting_ids" colspan="4" nolabel="1" />
- <field name="phonecall_ids" colspan="4" nolabel="1" />
- <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
- <tree string="Opportunities" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
- <field name="create_date"/>
- <field name="partner_name"/>
- <field name="name"/>
- <field name="email_from"/>
- <field name="phone"/>
+ <page string="CRM" position="inside">
+ <field name="meeting_ids" colspan="4" nolabel="1" >
+ <tree string="Meetings" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+ <field name="name" string="Subject" />
+ <field name="date" string="Start Date" />
+ <field name="date_deadline" string="End Date"/>
+ <field name="user_id" string="Responsible"/>
+ </tree>
+ </field>
+ </page>
+ </field>
+ </record>
- <field name="categ_id" invisible="1"/>
- <field name="type_id" invisible="1"/>
- <field name="referred" invisible="1"/>
+ <record id="view_crm_partner_info_form2" model="ir.ui.view">
+ <field name="name">res.partner.crm.info.inherit2</field>
+ <field name="model">res.partner</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="CRM" position="inside">
+ <field name="phonecall_ids" colspan="4" nolabel="1" />
+ </page>
+ </field>
+ </record>
- <field name="stage_id"/>
- <button name="stage_previous" string="Previous"
- states="open,pending" type="object" icon="gtk-go-back" />
- <button name="stage_next" string="Next"
- states="open,pending" type="object"
- icon="gtk-go-forward" />
- <field name="section_id"
- invisible="context.get('invisible_section', True)" />
- <field name="user_id" />
- <field name="state" />
- <button name="case_open" string="Open"
- states="draft,pending" type="object"
- icon="gtk-go-forward" />
- <button name="case_close" string="Close"
- states="open,draft,pending" type="object"
- icon="gtk-close" />
- <button string="Convert to Opportunity"
- name="convert_opportunity"
- states="draft,open,pending" icon="gtk-index"
- type="object" />
- <button name="case_escalate" string="Escalate"
- states="open,draft,pending" type="object"
- icon="gtk-go-up" />
- <button name="case_cancel" string="Cancel"
- states="draft,open,pending" type="object"
- icon="gtk-cancel" />
- </tree>
- </field>
- </page>
- </notebook>
- </xpath>
+ <record id="view_crm_partner_info_form3" model="ir.ui.view">
+ <field name="name">res.partner.crm.info.inherit3</field>
+ <field name="model">res.partner</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="CRM" position="inside">
+ <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+ <tree string="Opportunities" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+ <field name="create_date"/>
+ <field name="partner_name"/>
+ <field name="name"/>
+ <field name="email_from"/>
+ <field name="phone"/>
+
+ <field name="categ_id" invisible="1"/>
+ <field name="type_id" invisible="1"/>
+ <field name="referred" invisible="1"/>
+
+ <field name="stage_id"/>
+ <button name="stage_previous" string="Previous"
+ states="open,pending" type="object" icon="gtk-go-back" />
+ <button name="stage_next" string="Next"
+ states="open,pending" type="object"
+ icon="gtk-go-forward" />
+ <field name="section_id"
+ invisible="context.get('invisible_section', True)" />
+ <field name="user_id" />
+ <field name="state" />
+ <button name="case_open" string="Open"
+ states="draft,pending" type="object"
+ icon="gtk-go-forward" />
+ <button name="case_close" string="Close"
+ states="open,draft,pending" type="object"
+ icon="gtk-close" />
+ <button string="Convert to Opportunity"
+ name="convert_opportunity"
+ states="draft,open,pending" icon="gtk-index"
+ type="object" />
+ <button name="case_escalate" string="Escalate"
+ states="open,draft,pending" type="object"
+ icon="gtk-go-up" />
+ <button name="case_cancel" string="Cancel"
+ states="draft,open,pending" type="object"
+ icon="gtk-cancel" />
+ </tree>
+ </field>
+ </page>
</field>
</record>
</data>
</openerp>
+
diff --git a/addons/mail_gateway/__init__.py b/addons/mail_gateway/__init__.py
index 7380514e45a..6526541a068 100644
--- a/addons/mail_gateway/__init__.py
+++ b/addons/mail_gateway/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,11 +15,12 @@
# 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/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import mail_gateway
+import res_partner
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index 1584067ea38..aa08c7f190d 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -32,6 +32,7 @@
'init_xml': [],
'update_xml': [
"mail_gateway_view.xml",
+ "res_partner_view.xml",
'security/ir.model.access.csv'
],
'demo_xml': [],
diff --git a/addons/mail_gateway/res_partner.py b/addons/mail_gateway/res_partner.py
new file mode 100644
index 00000000000..02a55fa45fe
--- /dev/null
+++ b/addons/mail_gateway/res_partner.py
@@ -0,0 +1,36 @@
+# -*- 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 osv import fields,osv
+
+class res_partner(osv.osv):
+ """ Inherits partner and adds CRM information in the partner form """
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'emails': fields.one2many('mailgate.message', 'partner_id',\
+ 'Emails', readonly=True),
+ }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file
diff --git a/addons/mail_gateway/res_partner_view.xml b/addons/mail_gateway/res_partner_view.xml
new file mode 100644
index 00000000000..c81b47e6bf1
--- /dev/null
+++ b/addons/mail_gateway/res_partner_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <!-- Partners inherited form -->
+
+ <record id="view_emails_partner_info_form" model="ir.ui.view">
+ <field name="name">res.partner.emails.info.inherit</field>
+ <field name="model">res.partner</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="History" position="inside">
+ <field name="emails" colspan="4" nolabel="1"/>
+ </page>
+ </field>
+ </record>
+ </data>
+</openerp>
+
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index d37d8604380..23796d1baaf 100644
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -20,6 +20,7 @@
##############################################################################
import marketing_campaign
+import res_partner
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 16e45a36c96..1044030df7e 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -24,7 +24,7 @@
"name" : "",
"version" : "1.1",
"depends" : ["marketing",
- "crm",
+ "crm",
"document",
"email_template"
],
@@ -42,8 +42,9 @@ are dynamic and multi-channels. The process:
'init_xml': [],
'update_xml': [
'marketing_campaign_view.xml',
- 'marketing_campaign_data.xml',
- 'marketing_campaign_workflow.xml',
+ 'marketing_campaign_data.xml',
+ 'marketing_campaign_workflow.xml',
+ 'res_partner_view.xml',
'report/campaign_analysis_view.xml',
"security/marketing_campaign_security.xml",
"security/ir.model.access.csv"
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
new file mode 100644
index 00000000000..2ec92522d6a
--- /dev/null
+++ b/addons/marketing_campaign/res_partner.py
@@ -0,0 +1,37 @@
+# -*- 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 osv import fields,osv
+
+class res_partner(osv.osv):
+ """ Inherits partner and adds CRM information in the partner form """
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'workitem_ids': fields.one2many('marketing.campaign.workitem', 'partner_id',\
+ 'Workitems', readonly=True),
+
+ }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
new file mode 100644
index 00000000000..a035a4ea5f0
--- /dev/null
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -0,0 +1,20 @@
+<?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="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="History" position="inside">
+ <field name="workitem_ids" colspan="4" nolabel="1"/>
+ </page>
+ </field>
+ </record>
+ </data>
+</openerp>
+
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 6347cd9dd29..44154c8ae05 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -25,6 +25,7 @@ import installer
import project_mailgate
import report
import wizard
+import res_partner
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 5d535963422..03b72e09e38 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -46,6 +46,7 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
"project_report.xml",
"process/task_process.xml",
"project_installer.xml",
+ "res_partner_view.xml",
"report/project_report_view.xml",
"wizard/project_close_task_view.xml",
"board_project_view.xml",
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
new file mode 100644
index 00000000000..ac9c646ed82
--- /dev/null
+++ b/addons/project/res_partner.py
@@ -0,0 +1,36 @@
+# -*- 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 osv import fields,osv
+
+class res_partner(osv.osv):
+ """ Inherits partner and adds CRM information in the partner form """
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'task_ids': fields.one2many('project.task', 'partner_id',\
+ 'Tasks', readonly=True),
+ }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
new file mode 100644
index 00000000000..92e74c920b5
--- /dev/null
+++ b/addons/project/res_partner_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <!-- Partners inherited form -->
+
+ <record id="view_task_partner_info_form" model="ir.ui.view">
+ <field name="name">res.partner.task.info.inherit</field>
+ <field name="model">res.partner</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="History" position="inside">
+ <field name="task_ids" colspan="4" nolabel="1"/>
+ </page>
+ </field>
+ </record>
+ </data>
+</openerp>
+