From 0bb65eca8aa2d413228d1e8468c7e32237240b90 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Tue, 6 Mar 2012 18:48:24 +0530
Subject: [PATCH] [IMP]auction: remove res.partner.address

bzr revid: kjo@tinyerp.com-20120306131824-ty3477rzcbyalybt
---
 addons/auction/auction.py                      |  6 +++---
 addons/auction/auction_demo.xml                | 12 ++++++------
 addons/auction/wizard/auction_lots_sms_send.py |  6 ++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index e701e399acf..ced68d530ef 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -687,9 +687,9 @@ class auction_lots(osv.osv):
             if (lot.auction_id.id, lot.ach_uid.id) in invoices:
                 inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)]
             else:
-                add = res_obj.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address']
-                if not len(add):
-                    raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.'))
+                add = res_obj.address_get(cr, uid, [lot.ach_uid.id], ['default'])['default']
+                if not add:
+                    raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Address.'))
                 inv = {
                     'name':lot.auction_id.name or '',
                     'reference': lot.ach_login,
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index ebc336caa72..2e720ed199b 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -109,7 +109,7 @@
         <field name="name">Unknown</field>
     </record>
 
-    <record id="res_partner_unknown_address_1" model="res.partner.address">
+    <record id="res_partner_unknown_address_1" model="res.partner">
         <field name="city">Bruxelles1</field>
         <field name="name">Benoit Mortie1r1</field>
         <field name="zip">1030</field>
@@ -118,10 +118,10 @@
         <field name="phone">(+32)2 211 34 83</field>
         <field name="street">Rue des Palais 44, bte 33</field>
         <field name="type">default</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
-    <record id="res_partner_unknown_address_2" model="res.partner.address">
+    <record id="res_partner_unknown_address_2" model="res.partner">
         <field name="city">Avignon CEDEX 091</field>
         <field name="name">Laurent Jacot1</field>
         <field name="zip">84911</field>
@@ -130,10 +130,10 @@
         <field name="phone">(+33)4.32.74.10.57</field>
         <field name="street">85 rue du traite de Rome</field>
         <field name="type">default</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
-    <record id="res_partner_unknown_address_3" model="res.partner.address">
+    <record id="res_partner_unknown_address_3" model="res.partner">
         <field name="city">Louvain-la-Neuve</field>
         <field name="name">Thomas Passot</field>
         <field name="zip">1348</field>
@@ -141,7 +141,7 @@
         <field name="email">info@mediapole.net</field>
         <field name="phone">(+32).10.45.17.73</field>
         <field name="street">Rue de l'Angelique, 1</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
         <!-- demo data for the auction_artist object-->
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 93faab41275..fe05e538be7 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -47,18 +47,16 @@ class auction_lots_sms_send(osv.osv_memory):
         if context is None: context = {}
         lot_obj = self.pool.get('auction.lots')
         partner_obj = self.pool.get('res.partner')
-        partner_address_obj = self.pool.get('res.partner.address')
         for data in self.read(cr, uid, ids, context=context):
             lots = lot_obj.read(cr, uid, context.get('active_ids', []), ['obj_num','obj_price','ach_uid'])
             res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
-            
             nbr = 0
             for r in res:
                 add = partner_obj.address_get(cr, uid, [r['id']])['default']
-                addr = partner_address_obj.browse(cr, uid, add, context=context)
+                addr = partner_obj.browse(cr, uid, add, context=context)
                 to = addr.mobile
                 if to:
-                    tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                    tools.sms_send(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
                     nbr += 1
             return {'sms_sent': nbr}
 auction_lots_sms_send()