Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-auction-kjo
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-auction-kjo/+merge/98143
remove the res.partner.address
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-auction-kjo/+merge/98143
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'auction/auction.py'
--- auction/auction.py 2011-12-09 06:03:08 +0000
+++ auction/auction.py 2012-03-19 05:23:34 +0000
@@ -687,9 +687,9 @@
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,
=== modified file 'auction/auction_demo.xml'
--- auction/auction_demo.xml 2011-12-22 13:35:59 +0000
+++ auction/auction_demo.xml 2012-03-19 05:23:34 +0000
@@ -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">[email protected]</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-->
=== modified file 'auction/wizard/auction_lots_sms_send.py'
--- auction/wizard/auction_lots_sms_send.py 2011-01-14 00:11:01 +0000
+++ auction/wizard/auction_lots_sms_send.py 2012-03-19 05:23:34 +0000
@@ -47,18 +47,16 @@
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()
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
