From 8cd3caab579726817801a4fd9d095e960d210303 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 25 May 2010 17:53:58 +0530
Subject: [PATCH] [IMP]: crm: Improvement for putting crm information in
 partner, made separate file for partner info

bzr revid: rpa@tinyerp.com-20100525122358-z1e5qeb2c7glcdwd
---
 addons/crm/__init__.py              |  1 +
 addons/crm/__openerp__.py           |  4 +-
 addons/crm/crm_meeting.py           | 12 ------
 addons/crm/crm_meeting_view.xml     | 16 --------
 addons/crm/crm_opportunity.py       | 12 ------
 addons/crm/crm_opportunity_view.xml | 54 -------------------------
 addons/crm/crm_phonecall.py         | 10 -----
 addons/crm/crm_phonecall_view.xml   | 14 -------
 addons/crm/res_partner.py           | 39 ++++++++++++++++++
 addons/crm/res_partner_view.xml     | 63 +++++++++++++++++++++++++++++
 10 files changed, 106 insertions(+), 119 deletions(-)
 create mode 100644 addons/crm/res_partner.py
 create mode 100644 addons/crm/res_partner_view.xml

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index de0fac56e29..362444ccc2c 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -33,6 +33,7 @@ import crm_installer
 import report
 import wizard
 
+import res_partner
 
 
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 3bc1f703454..0c98fd51c9c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -96,7 +96,9 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml'
+        'crm_installer_view.xml', 
+        
+        'res_partner_view.xml'
     ],
     'demo_xml': [
         'crm_demo.xml',
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 20ae1176ca6..e45ee85b31d 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -175,16 +175,4 @@ class res_users(osv.osv):
 res_users()
 
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds meetings information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-                                                     'Meetings'), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ac61809cfad..28cf42e3a73 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -324,21 +324,5 @@
                 </field>
         </record>
 
-        <!--  Partners inherited form -->
-
-		<record id="view_meeting_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.meeting.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">
-                <notebook position="inside">
-               		<page string="CRM Info">
-						<field name="meeting_ids" colspan="4" nolabel="1" />
-					</page>
-                </notebook>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3bc9fdd6d81..98e4c6f3ded 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -163,16 +163,4 @@ class crm_opportunity(osv.osv):
 
 crm_opportunity()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Opportunities information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ce0ce788f6..1b0b384f22a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -328,59 +328,5 @@
         </field>
     </record>
     
-    <!--  Partners inherited form -->
-
-		<record id="view_opp_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.opportunity.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">
-               		<field name="phonecall_ids" position="after">
-               			<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>
-               		</field>
-            </field>
-        </record>
-
-
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 7131a3730d2..205b30d39dc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -178,15 +178,5 @@ class crm_phonecall(osv.osv, crm_case):
 
 crm_phonecall()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Phonecalls information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
-                }
-
-res_partner()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a72a8df9de8..65b77ed5abe 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -289,19 +289,5 @@
         </field>
     </record>
     
-        <!--  Partners inherited form -->
-        
-    <record id="view_phonecall_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.phonecall.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">
-               		<field name="meeting_ids" position="after">
-               			<field name="phonecall_ids" colspan="4" nolabel="1" />
-               		</field>
-            </field>
-        </record>
-    
     </data>
 </openerp>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
new file mode 100644
index 00000000000..93d865d7f74
--- /dev/null
+++ b/addons/crm/res_partner.py
@@ -0,0 +1,39 @@
+# -*- 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 = {
+                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
+                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
+                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+                                                     'Meetings'), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
new file mode 100644
index 00000000000..540c8d13186
--- /dev/null
+++ b/addons/crm/res_partner_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+         <!--  Partners inherited form -->
+
+		<record id="view_crm_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.crm.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">
+                <notebook position="inside">
+               		<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"/>
+				
+				                <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>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>