[IMP/FIX] res_partner_addres model clean up for crm, lead, phonecall, meeting

bzr revid: jam@tinyerp.com-20120305110346-6vn4he5imzlu53iv

diff --combined addons/crm/crm_lead.py
index b17fa31,c4de42c..94194d8
--- 1/addons/crm/crm_lead.py
--- 2/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@@ -40,7 -40,7 +40,7 @@@ class crm_lead(crm_case, osv.osv)
      _name = "crm.lead"
      _description = "Lead/Opportunity"
      _order = "priority,date_action,id desc"
-     _inherit = ['mail.thread','res.partner.address']
+     _inherit = ['mail.thread','res.partner']
  
      def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
          access_rights_uid = access_rights_uid or uid
@@@ -170,7 -170,7 +170,7 @@@
              domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
          'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
          'contact_name': fields.char('Contact Name', size=64),
--        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the lead into opportunity', select=1),
++        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
          'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
          'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
          'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
@@@ -194,7 -194,6 +194,6 @@@
  
  
          # Only used for type opportunity
-         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
          'probability': fields.float('Probability (%)',group_operator="avg"),
          'planned_revenue': fields.float('Expected Revenue'),
          'ref': fields.reference('Reference', selection=crm._links_get, size=128),
@@@ -205,8 -204,8 +204,8 @@@
          'title_action': fields.char('Next Action', size=64),
          'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
          'color': fields.integer('Color Index'),
-         'partner_address_name': fields.related('partner_address_id', 'name', type='char', string='Partner Contact Name', readonly=True),
-         'partner_address_email': fields.related('partner_address_id', 'email', type='char', string='Partner Contact Email', readonly=True),
+         'partner_address_name': fields.related('partner_id', 'name', type='char', string='Partner Contact Name', readonly=True),
+         'partner_address_email': fields.related('partner_id', 'email', type='char', string='Partner Contact Email', readonly=True),
          'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True),
          'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
          'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
@@@ -230,7 -229,7 +229,7 @@@
          """
          if not add:
              return {'value': {'email_from': False, 'country_id': False}}
-         address = self.pool.get('res.partner.address').browse(cr, uid, add)
+         address = self.pool.get('res.partner').browse(cr, uid, add)
          return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
  
      def on_change_optin(self, cr, uid, ids, optin):
@@@ -501,8 -500,7 +500,7 @@@
              first_opportunity = opportunities_list[0]
              tail_opportunities = opportunities_list[1:]
  
-         fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id',
-             'partner_address_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
+         fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
              'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
              'date_action_next', 'email_from', 'email_cc', 'partner_name']
  
@@@ -546,7 -544,6 +544,6 @@@
                  'stage_id': stage_id or False,
                  'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                  'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
-                 'partner_address_id': contact_id,
          }
  
      def _convert_opportunity_notification(self, cr, uid, lead, context=None):
@@@ -580,15 -577,15 +577,42 @@@
                      }, context=context)
          return True
  
--    def _lead_create_partner(self, cr, uid, lead, context=None):
++    def _lead_create_contact(self, cr, uid, lead, name, is_company, parent_id=False, context=None):
          partner = self.pool.get('res.partner')
--        partner_id = partner.create(cr, uid, {
--                    'name': lead.partner_name or lead.contact_name or lead.name,
--                    'user_id': lead.user_id.id,
--                    'comment': lead.description,
--                    'section_id': lead.section_id.id or False,
--                    'address': []
--        })
++        vals = { 'name': name,
++            'user_id': lead.user_id.id,
++            'comment': lead.description,
++            'section_id': lead.section_id.id or False,
++            'parent_id': parent_id,
++            'phone': lead.phone,
++            'mobile': lead.mobile,
++            'email': lead.email_from and to_email(lead.email_from)[0],
++            'fax': lead.fax,
++            'title': lead.title and lead.title.id or False,
++            'function': lead.function,
++            'street': lead.street,
++            'street2': lead.street2,
++            'zip': lead.zip,
++            'city': lead.city,
++            'country_id': lead.country_id and lead.country_id.id or False,
++            'state_id': lead.state_id and lead.state_id.id or False,
++            'is_company': is_company,
++        }
++
++        partner = partner.create(cr, uid,vals, context)
++        return partner
++
++    def _create_lead_partner(self, cr, uid, lead, context=None):
++        partner_id =  False
++        if lead.partner_name and lead.contact_name:
++            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, 'partner', context=context)
++            self._lead_create_contact(cr, uid, lead, lead.contact_name, 'contact', partner_id, context=context)
++        elif lead.partner_name and not lead.contact_name:
++            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, 'partner', context=context)
++        elif not lead.partner_name and lead.contact_name:
++            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, 'contact', context=context)
++        else:
++            partner_id = self._lead_create_contact(cr, uid, lead, lead.name, 'contact', context=context)
          return partner_id
  
      def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
@@@ -597,29 -594,29 +621,9 @@@
          if partner_id:
              res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
              contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
-             res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
- 
+             res = lead.write({'partner_id' : partner_id, }, context=context)
 -
          return res
  
--    def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
-         address = self.pool.get('res.partner.address')
-         return address.create(cr, uid, {
-                     'partner_id': partner_id,
-                     'name': lead.contact_name,
-                     'phone': lead.phone,
-                     'mobile': lead.mobile,
-                     'email': lead.email_from and to_email(lead.email_from)[0],
-                     'fax': lead.fax,
-                     'title': lead.title and lead.title.id or False,
-                     'function': lead.function,
-                     'street': lead.street,
-                     'street2': lead.street2,
-                     'zip': lead.zip,
-                     'city': lead.city,
-                     'country_id': lead.country_id and lead.country_id.id or False,
-                     'state_id': lead.state_id and lead.state_id.id or False,
-                 })
- 
 -        address = self.pool.get('res.partner')
 -        return address.create(cr, uid, {
 -                    'parent_id': partner_id,
 -                    'name': lead.contact_name,
 -                    'phone': lead.phone,
 -                    'mobile': lead.mobile,
 -                    'email': lead.email_from and to_email(lead.email_from)[0],
 -                    'fax': lead.fax,
 -                    'title': lead.title and lead.title.id or False,
 -                    'function': lead.function,
 -                    'street': lead.street,
 -                    'street2': lead.street2,
 -                    'zip': lead.zip,
 -                    'city': lead.city,
 -                    'country_id': lead.country_id and lead.country_id.id or False,
 -                    'state_id': lead.state_id and lead.state_id.id or False,
 -                })
 -
      def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
          """
          This function convert partner based on action.
@@@ -632,8 -629,8 +636,7 @@@
          for lead in self.browse(cr, uid, ids, context=context):
              if action == 'create':
                  if not partner_id:
--                    partner_id = self._lead_create_partner(cr, uid, lead, context=context)
--                self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
++                    partner_id = self._create_lead_partner(cr, uid, lead, context)
              self._lead_set_partner(cr, uid, lead, partner_id, context=context)
              partner_ids[lead.id] = partner_id
          return partner_ids
@@@ -694,9 -691,8 +697,8 @@@
                      'date' : schedule_time,
                      'section_id' : section_id or False,
                      'partner_id': lead.partner_id and lead.partner_id.id or False,
-                     'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
-                     'partner_phone' : phone or lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
-                     'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
+                     'partner_phone' : phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False),
+                     'partner_mobile' : lead.partner_id and lead.partner_id.mobile or False,
                      'priority': lead.priority,
              }
  

diff --combined addons/crm/crm_lead_view.xml
index 44d83f4,36fd908..6e2540f
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -81,7 -81,7 +81,7 @@@
                  <notebook colspan="4">
                  <page string="Lead">
                      <group colspan="4" col="2">
--                        <field name="partner_name" string="Partner Name" />
++                        <field name="partner_name" string="Company Name" />
                      </group>
                      <group colspan="2" col="4">
                          <separator string="Contact" colspan="4" col="4"/>
@@@ -259,7 -259,6 +259,6 @@@
                  date_start="date_action" color="user_id">
                  <field name="name" />
                  <field name="partner_name" />
-                 <field name="partner_address_id" />
              </calendar>
          </field>
      </record>
@@@ -479,10 -478,7 +478,7 @@@
                                  string="Create"
                                  attrs="{'invisible':[('partner_id','!=',False)]}"/>
                          </group>
-                         <field name="partner_address_id"
-                             string="Contact"
-                             on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                             colspan="1" />
+                         
                          <group col="3" colspan="2">
                              <field name="email_from" string="Email" />
                              <button string="Mail"

diff --combined addons/crm/crm_phonecall.py
index 8d9a47b,b8a7e64..a5a4c08
--- 1/addons/crm/crm_phonecall.py
--- 2/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@@ -44,8 -44,6 +44,6 @@@ class crm_phonecall(crm_base, osv.osv)
                          select=True, help='Sales team to which Case belongs to.'),
          'user_id': fields.many2one('res.users', 'Responsible'),
          'partner_id': fields.many2one('res.partner', 'Partner'),
-         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                  domain="[('partner_id','=',partner_id)]"),
          'company_id': fields.many2one('res.company', 'Company'),
          'description': fields.text('Description'),
          'state': fields.selection([
@@@ -67,8 -65,6 +65,6 @@@
                          domain="['|',('section_id','=',section_id),('section_id','=',False),\
                          ('object_id.model', '=', 'crm.phonecall')]"),
          'partner_phone': fields.char('Phone', size=32),
-         'partner_contact': fields.related('partner_address_id', 'name', \
-                                  type="char", string="Contact", size=128),
          'partner_mobile': fields.char('Mobile', size=32),
          'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
          'date_closed': fields.datetime('Closed', readonly=True), 
@@@ -95,7 -91,7 +91,7 @@@
          res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
          res.setdefault('value', {})
          if add:
-             address = self.pool.get('res.partner.address').browse(cr, uid, add)
+             address = self.pool.get('res.partner').browse(cr, uid, add)
              res['value']['partner_phone'] = address.phone
              res['value']['partner_mobile'] = address.mobile
          return res
@@@ -153,7 -149,6 +149,6 @@@
                      'date' : schedule_time,
                      'section_id' : section_id or False,
                      'partner_id': call.partner_id and call.partner_id.id or False,
-                     'partner_address_id': call.partner_address_id and call.partner_address_id.id or False,
                      'partner_phone' : call.partner_phone,
                      'partner_mobile' : call.partner_mobile,
                      'priority': call.priority,
@@@ -180,9 -175,9 +175,9 @@@
          return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
  
      def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
-         address = self.pool.get('res.partner.address')
+         address = self.pool.get('res.partner')
          return address.create(cr, uid, {
-                     'partner_id': partner_id,
 -                    'parent_id': parent_id,
++                    'parent_id': partner_id,
                      'name': phonecall.name,
                      'phone': phonecall.partner_phone,
          })
@@@ -227,7 -222,6 +222,6 @@@
  
      def convert_opportunity(self, cr, uid, ids, opportunity_summary=False, partner_id=False, planned_revenue=0.0, probability=0.0, context=None):
          partner = self.pool.get('res.partner')
-         address = self.pool.get('res.partner.address')
          opportunity = self.pool.get('crm.lead')
          opportunity_dict = {}
          default_contact = False
@@@ -237,14 -231,12 +231,12 @@@
              if partner_id:
                  address_id = partner.address_get(cr, uid, [partner_id])['default']
                  if address_id:
-                     default_contact = address.browse(cr, uid, address_id, context=context)
+                     default_contact = partner.browse(cr, uid, address_id, context=context)
              opportunity_id = opportunity.create(cr, uid, {
                              'name': opportunity_summary or call.name,
                              'planned_revenue': planned_revenue,
                              'probability': probability,
                              'partner_id': partner_id or False,
-                             'partner_address_id': default_contact and default_contact.id, 
-                             'phone': default_contact and default_contact.phone,
                              'mobile': default_contact and default_contact.mobile,
                              'section_id': call.section_id and call.section_id.id or False,
                              'description': call.description or False,

diff --combined addons/crm/crm_phonecall_view.xml
index 34ef261,115e018..93f18fa
--- 1/addons/crm/crm_phonecall_view.xml
--- 2/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@@ -28,7 -28,7 +28,6 @@@
                  <field name="date"/>
                  <field name="name"/>
                  <field name="partner_id"/>
--                <field name="partner_contact"/>
                  <field name="partner_phone"/>
                  <field name="user_id"/>
                  <field name="categ_id" invisible="1"/>
@@@ -91,8 -91,6 +90,6 @@@
                          attrs="{'invisible':[('partner_id','!=',False)]}" 
                          groups="base.group_partner_manager"/>
                      <newline/>
-                     <field name="partner_address_id"
-                         on_change="onchange_partner_address_id(partner_address_id)" />
                      <newline/>
                      <field name="partner_mobile" />
                  </group>
@@@ -140,9 -138,7 +137,7 @@@
                  <field name="partner_id"
                      on_change="onchange_partner_id(partner_id)"
                      string="Partner" />
-                 <field name="partner_address_id"
-                         on_change="onchange_partner_address_id(partner_address_id)"
-                         invisible="1"/>
+         
                  <field name="partner_phone"
                      invisible="1"/>
                  <field name="user_id" groups="base.group_extended"/>

diff --combined addons/crm/wizard/crm_lead_to_opportunity.py
index 52a79e4,52a79e4..f6fd433
--- 1/addons/crm/wizard/crm_lead_to_opportunity.py
--- 2/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@@ -67,8 -67,8 +67,6 @@@ class crm_lead2opportunity_partner(osv.
              ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
              if ids:
                  opportunities.append(ids[0])
--                
--                
          if not partner_id:
              label = False
              opp_ids = []

diff --combined addons/crm/wizard/crm_phonecall_to_partner.py
index 0fa077b,c29a677..0263bfe
--- 1/addons/crm/wizard/crm_phonecall_to_partner.py
--- 2/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@@ -38,17 -38,16 +38,16 @@@ class crm_phonecall2partner(osv.osv_mem
  
          phonecall_obj = self.pool.get('crm.phonecall')
          partner_obj = self.pool.get('res.partner')
-         contact_obj = self.pool.get('res.partner.address')
          rec_ids = context and context.get('active_ids', [])
          value = {}
--
++        partner_id = False
          for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
              partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
              if not partner_ids and phonecall.email_from:
-                 address_ids = contact_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
+                 address_ids = partner_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
                  if address_ids:
-                     addresses = contact_obj.browse(cr, uid, address_ids)
-                     partner_ids = addresses and [addresses[0].partner_id.id] or False
+                     addresses = partner_ids.browse(cr, uid, address_ids)
+                     partner_ids = addresses and [addresses[0].parent_id.id] or False
  
              partner_id = partner_ids and partner_ids[0] or False
          return partner_id