[IMP] base_contact: Add the migration script for the addresses

[FIX] base_contact: Add a name_get for the location and the address

bzr revid: stw@openerp.com-20111214091118-qw564mpfwgnez1po

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 29d125c..891e143 100644 (file)
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -71,6 +71,13 @@ class res_partner_contact(osv.osv):
         else:
             ids = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, ids, context=context)
+
+    def name_get(self, cr, uid, ids, context=None):
+        return [
+            (obj.id, " ".join(filter(None, [obj.first_name, obj.name])),)
+            for obj in self.browse(cr, uid, ids, context=context)
+        ]
+
     
 res_partner_contact()
 
@@ -87,7 +94,7 @@ class res_partner_location(osv.osv):
     _name = 'res.partner.location'
     _inherit = 'res.partner.address'
     _columns = {
-        'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
+        'job_ids': fields.one2many('res.partner.address', 'location2_id', 'Contacts'),
     }
 
     def _auto_init(self, cr, context=None):
@@ -114,25 +121,58 @@ class res_partner_address(osv.osv):
     _name = 'res.partner.address'
     _inherits = { 'res.partner.location' : 'location_id' }
 
+    def _get_use_existing_address(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict.fromkeys(ids, 0)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = 0
+        return result
+
+    def _set_use_existing_address(self, cr, uid, ids, field, value, arg, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        return True
+
     _columns = {
         'location_id' : fields.many2one('res.partner.location', 'Location'),
-        'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
+        'location2_id' : fields.many2one('res.partner.location', 'Location'),
+        'contact_id' : fields.many2one('res.partner.contact', 'Contact', required=True),
 
-        'contact_firstname' : fields.related('contact_id', 'first_name', type='char', size=64, string='FirstName'),
-        'name' : fields.related('contact_id', 'name', type='char', size='64', string="LastName"),
+        'partner_id' : fields.many2one('res.partner', 'Partner'),
+        'contact_firstname' : fields.related('contact_id', 'first_name', type='char', size=64, string='Firstname'),
+        'contact_name' : fields.related('contact_id', 'name', type='char', size='64', string="Lastname"),
         'function': fields.char('Partner Function', size=64, help="Function of this contact with this partner"),
         'date_start': fields.date('Date Start',help="Start date of job(Joining Date)"),
         'date_stop': fields.date('Date Stop', help="Last date of job"),
         'state': fields.selection([('past', 'Past'),('current', 'Current')], \
                                   'State', required=True, help="Status of Address"),
+        'use_existing_address' : fields.function(_get_use_existing_address, type="boolean",
+                                                 fnct_inv=_set_use_existing_address, 
+                                                 string='Use Existing Address'),
     }
 
+    def name_get(self, cr, uid, ids, context=None):
+        result = []
+
+        append_call = result.append
+        for obj in self.browse(cr, uid, ids, context=context):
+            append_call((obj.id, "%s, %s" % (obj.contact_id.name_get()[0][1], obj.location_id.name_get()[0][1],)))
+        return result
+
+
     _description ='Contact Partner Function'
 
     _defaults = {
         'state': 'current',
     }
 
+    def create(self, cr, uid, values, context=None):
+        record_id = super(res_partner_address, self).create(cr, uid, values, context=context)
+        record = self.browse(cr, uid, record_id, context=context)
+        if not record.partner_id:
+            record.write({'partner_id' : record.location2_id.partner_id.id}, context=context)
+        return record_id
+
     def _auto_init(self, cr, context=None):
         def column_exists(column):
             cr.execute("select count(attname) from pg_attribute where attrelid = \
@@ -145,7 +185,39 @@ class res_partner_address(osv.osv):
         super(res_partner_address, self)._auto_init(cr, context)
 
         if not exists:
-            cr.execute("UPDATE res_partner_address SET location_id = id")
+            cr.execute("UPDATE res_partner_address SET location_id = id, location2_id = id")
+
+            contact_proxy = self.pool.get('res.partner.contact')
+            uid = 1
+
+            cr.execute("SELECT id, name, mobile, country_id, partner_id, phone, email, street, street2, city, company_id, state_id, zip, location_id \
+                       FROM res_partner_address \
+                       WHERE contact_id IS NULL AND name IS NOT NULL AND location_id IS NOT NULL")
+            for item in cr.fetchall():
+
+                values = {
+                    'name' : item[1],
+                    'mobile' : item[2],
+                    'country_id' : item[3],
+                    'phone' : item[5],
+                    'email' : item[6],
+                    'company_id' : item[10],
+                }
+
+                contact_id = contact_proxy.create(cr, uid, values, context=context)
+                values = {
+                    'street' : item[7],
+                    'street2' : item[8],
+                    'city' : item[9],
+                    'country_id' : item[3],
+                    'company_id' : item[10],
+                    'state_id' : item[11],
+                    'zip' : item[12],
+                }
+                location_id = self.pool.get('res.partner.location').create(cr, uid, values, context=context)
+
+                cr.execute("UPDATE res_partner_address SET location_id = %s, contact_id = %s, partner_id = %s WHERE id = %s",
+                           (location_id, contact_id, item[4], item[0],))
 
 res_partner_address()
 

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 2947a4a..554a058 100644 (file)
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -52,8 +52,7 @@
                             <form string="Functions and Addresses">
                                <group colspan="4" col="4">
                                    <field name="function"/>
-                                   <field name="name" on_change="onchange_name(name,address_id)"/> 
-                                   <field name="address_id"/>                                   
+                                   <field name="name" />
                                    <field name="date_start" />
                                    <field name="date_stop" />
                                    <field name="state" />
@@ -69,7 +68,6 @@
                             <tree string="Functions and Addresses">
                                 <field name="function"/>
                                 <field name="name" on_change="onchange_partner(name)"/> 
-                                                               <field name="address_id" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="email"/>
@@ -244,19 +242,6 @@
 
     <!-- Views for Addresses -->
 
-    <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
-        <field name="name">Partner addresses inherited</field>
-        <field name="model">res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_tree"/>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <field name="name" position="replace">
-                <field name="name" />
-                <field name='job_ids' string='# of Contacts'/>
-            </field>
-        </field>
-    </record>
-
     <record model="ir.ui.view" id="view_partner_address_form_inherited0">
         <field name='name'>res.partner.address.form.inherited0</field>
         <field name='model'>res.partner.address</field>
@@ -271,6 +256,7 @@
                 <separator string="Contact" colspan="6" />
                 <group colspan="6" col="2">
                     <field name="title" />
+                    <field name="contact_id" />
                     <field name="contact_firstname" />
                     <field name="contact_name" />
                 </group>
@@ -278,7 +264,6 @@
             <field name="partner_id" position="replace">
                 <field name='partner_id' select='1'/>
                 <field name='type' select='2' invisible="1"/>
-                <field name='job_id' invisible="1"/>
                 <field name="function" />
             </field>
         </field>