Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-res-partner-address-object-dbr
into lp:~openerp-dev/openobject-server/trunk-fp-notes-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-res-partner-address-object-dbr/+merge/110330
Hello Sir,
No more use of res.partner.address
Remove use of it.
So,kindly review it.
Thanks,
DBR
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-res-partner-address-object-dbr/+merge/110330
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-fp-notes-apa.
=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py 2012-06-04 18:30:55 +0000
+++ openerp/addons/base/__openerp__.py 2012-06-14 13:27:30 +0000
@@ -71,7 +71,7 @@
'security/base_security.xml',
'publisher_warranty/publisher_warranty_view.xml',
'security/ir.model.access.csv',
- 'security/ir.model.access-1.csv', # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version
+# 'security/ir.model.access-1.csv', # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version
'res/res_widget_view.xml',
'res/res_widget_data.xml',
'publisher_warranty/publisher_warranty_data.xml',
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-06-04 18:30:55 +0000
+++ openerp/addons/base/res/res_partner.py 2012-06-14 13:27:30 +0000
@@ -141,7 +141,7 @@
'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
'website': fields.char('Website',size=64, help="Website of Partner or Company"),
'comment': fields.text('Notes'),
- 'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), # should be removed in version 7, but kept until then for backward compatibility
+# 'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), # should be removed in version 7, but kept until then for backward compatibility
'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Tags'),
'credit_limit': fields.float(string='Credit Limit'),
'ean13': fields.char('EAN13', size=13),
@@ -427,54 +427,54 @@
# res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version
-class res_partner_address(osv.osv):
- _table = "res_partner"
- _name = 'res.partner.address'
- _order = 'type, name'
- _columns = {
- 'parent_id': fields.many2one('res.partner', 'Company', ondelete='set null', select=True),
- 'partner_id': fields.related('parent_id', type='many2one', relation='res.partner', string='Partner'), # for backward compatibility
- 'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
- 'function': fields.char('Function', size=128),
- 'title': fields.many2one('res.partner.title','Title'),
- 'name': fields.char('Contact Name', size=64, select=1),
- 'street': fields.char('Street', size=128),
- 'street2': fields.char('Street2', size=128),
- 'zip': fields.char('Zip', change_default=True, size=24),
- 'city': fields.char('City', size=128),
- 'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
- 'country_id': fields.many2one('res.country', 'Country'),
- 'email': fields.char('E-Mail', size=240),
- 'phone': fields.char('Phone', size=64),
- 'fax': fields.char('Fax', size=64),
- 'mobile': fields.char('Mobile', size=64),
- 'birthdate': fields.char('Birthdate', size=64),
- 'is_customer_add': fields.related('partner_id', 'customer', type='boolean', string='Customer'),
- 'is_supplier_add': fields.related('partner_id', 'supplier', type='boolean', string='Supplier'),
- 'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
- 'company_id': fields.many2one('res.company', 'Company',select=1),
- 'color': fields.integer('Color Index'),
- }
-
- _defaults = {
- 'active': True,
- 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
- 'color': 0,
- 'type': 'default',
- }
-
- def write(self, cr, uid, ids, vals, context=None):
- logging.getLogger('res.partner').warning("Deprecated use of res.partner.address")
- if 'partner_id' in vals:
- vals['parent_id'] = vals.get('partner_id')
- del(vals['partner_id'])
- return self.pool.get('res.partner').write(cr, uid, ids, vals, context=context)
-
- def create(self, cr, uid, vals, context=None):
- logging.getLogger('res.partner').warning("Deprecated use of res.partner.address")
- if 'partner_id' in vals:
- vals['parent_id'] = vals.get('partner_id')
- del(vals['partner_id'])
- return self.pool.get('res.partner').create(cr, uid, vals, context=context)
+#class res_partner_address(osv.osv):
+# _table = "res_partner"
+# _name = 'res.partner.address'
+# _order = 'type, name'
+# _columns = {
+# 'parent_id': fields.many2one('res.partner', 'Company', ondelete='set null', select=True),
+# 'partner_id': fields.related('parent_id', type='many2one', relation='res.partner', string='Partner'), # for backward compatibility
+# 'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
+# 'function': fields.char('Function', size=128),
+# 'title': fields.many2one('res.partner.title','Title'),
+# 'name': fields.char('Contact Name', size=64, select=1),
+# 'street': fields.char('Street', size=128),
+# 'street2': fields.char('Street2', size=128),
+# 'zip': fields.char('Zip', change_default=True, size=24),
+# 'city': fields.char('City', size=128),
+# 'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+# 'country_id': fields.many2one('res.country', 'Country'),
+# 'email': fields.char('E-Mail', size=240),
+# 'phone': fields.char('Phone', size=64),
+# 'fax': fields.char('Fax', size=64),
+# 'mobile': fields.char('Mobile', size=64),
+# 'birthdate': fields.char('Birthdate', size=64),
+# 'is_customer_add': fields.related('partner_id', 'customer', type='boolean', string='Customer'),
+# 'is_supplier_add': fields.related('partner_id', 'supplier', type='boolean', string='Supplier'),
+# 'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
+# 'company_id': fields.many2one('res.company', 'Company',select=1),
+# 'color': fields.integer('Color Index'),
+# }
+#
+# _defaults = {
+# 'active': True,
+# 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
+# 'color': 0,
+# 'type': 'default',
+# }
+#
+# def write(self, cr, uid, ids, vals, context=None):
+# logging.getLogger('res.partner').warning("Deprecated use of res.partner.address")
+# if 'partner_id' in vals:
+# vals['parent_id'] = vals.get('partner_id')
+# del(vals['partner_id'])
+# return self.pool.get('res.partner').write(cr, uid, ids, vals, context=context)
+#
+# def create(self, cr, uid, vals, context=None):
+# logging.getLogger('res.partner').warning("Deprecated use of res.partner.address")
+# if 'partner_id' in vals:
+# vals['parent_id'] = vals.get('partner_id')
+# del(vals['partner_id'])
+# return self.pool.get('res.partner').create(cr, uid, vals, context=context)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/addons/base/test/test_osv_expression.yml'
--- openerp/addons/base/test/test_osv_expression.yml 2012-03-19 11:13:57 +0000
+++ openerp/addons/base/test/test_osv_expression.yml 2012-06-14 13:27:30 +0000
@@ -97,7 +97,7 @@
Test one2many operator with False
-
!assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
- - address in (False, None, [])
+ - child_ids in (False, None, [])
-
Test many2many operator with empty search list
-
=== modified file 'openerp/tests/test_orm.py'
--- openerp/tests/test_orm.py 2012-03-06 08:34:20 +0000
+++ openerp/tests/test_orm.py 2012-06-14 13:27:30 +0000
@@ -20,19 +20,18 @@
def setUp(self):
super(TestO2MSerialization, self).setUp()
self.partner = self.registry('res.partner')
- self.address = self.registry('res.partner.address')
def test_no_command(self):
" empty list of commands yields an empty list of records "
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [])
+ self.cr, UID, 'child_ids', [])
self.assertEqual(results, [])
def test_CREATE_commands(self):
" returns the VALUES dict as-is "
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address',
+ self.cr, UID, 'child_ids',
map(CREATE, [{'foo': 'bar'}, {'foo': 'baz'}, {'foo': 'baq'}]))
self.assertEqual(results, [
{'foo': 'bar'},
@@ -43,14 +42,14 @@
def test_LINK_TO_command(self):
" reads the records from the database, records are returned with their ids. "
ids = [
- self.address.create(self.cr, UID, {'name': 'foo'}),
- self.address.create(self.cr, UID, {'name': 'bar'}),
- self.address.create(self.cr, UID, {'name': 'baz'})
+ self.partner.create(self.cr, UID, {'name': 'foo'}),
+ self.partner.create(self.cr, UID, {'name': 'bar'}),
+ self.partner.create(self.cr, UID, {'name': 'baz'})
]
commands = map(LINK_TO, ids)
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', commands, ['name'])
+ self.cr, UID, 'child_ids', commands, ['name'])
self.assertEqual(results, [
{'id': ids[0], 'name': 'foo'},
@@ -61,13 +60,13 @@
def test_bare_ids_command(self):
" same as the equivalent LINK_TO commands "
ids = [
- self.address.create(self.cr, UID, {'name': 'foo'}),
- self.address.create(self.cr, UID, {'name': 'bar'}),
- self.address.create(self.cr, UID, {'name': 'baz'})
+ self.partner.create(self.cr, UID, {'name': 'foo'}),
+ self.partner.create(self.cr, UID, {'name': 'bar'}),
+ self.partner.create(self.cr, UID, {'name': 'baz'})
]
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', ids, ['name'])
+ self.cr, UID, 'child_ids', ids, ['name'])
self.assertEqual(results, [
{'id': ids[0], 'name': 'foo'},
@@ -77,12 +76,12 @@
def test_UPDATE_command(self):
" take the in-db records and merge the provided information in "
- id_foo = self.address.create(self.cr, UID, {'name': 'foo'})
- id_bar = self.address.create(self.cr, UID, {'name': 'bar'})
- id_baz = self.address.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
+ id_foo = self.partner.create(self.cr, UID, {'name': 'foo'})
+ id_bar = self.partner.create(self.cr, UID, {'name': 'bar'})
+ id_baz = self.partner.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [
+ self.cr, UID, 'child_ids', [
LINK_TO(id_foo),
UPDATE(id_bar, {'name': 'qux', 'city': 'tagtag'}),
UPDATE(id_baz, {'name': 'quux'})
@@ -96,12 +95,12 @@
def test_mixed_commands(self):
ids = [
- self.address.create(self.cr, UID, {'name': name})
+ self.partner.create(self.cr, UID, {'name': name})
for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply']
]
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [
+ self.cr, UID, 'child_ids', [
CREATE({'name': 'foo'}),
UPDATE(ids[0], {'name': 'bar'}),
LINK_TO(ids[1]),
@@ -126,14 +125,14 @@
def test_LINK_TO_pairs(self):
"LINK_TO commands can be written as pairs, instead of triplets"
ids = [
- self.address.create(self.cr, UID, {'name': 'foo'}),
- self.address.create(self.cr, UID, {'name': 'bar'}),
- self.address.create(self.cr, UID, {'name': 'baz'})
+ self.partner.create(self.cr, UID, {'name': 'foo'}),
+ self.partner.create(self.cr, UID, {'name': 'bar'}),
+ self.partner.create(self.cr, UID, {'name': 'baz'})
]
commands = map(lambda id: (4, id), ids)
results = self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', commands, ['name'])
+ self.cr, UID, 'child_ids', commands, ['name'])
self.assertEqual(results, [
{'id': ids[0], 'name': 'foo'},
@@ -146,7 +145,7 @@
try:
self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [(5,)], ['name'])
+ self.cr, UID, 'child_ids', [(5,)], ['name'])
except AssertionError:
# 5 should fail with an assert error, but not e.g. a ValueError
pass
@@ -156,19 +155,19 @@
with self.assertRaises(AssertionError):
self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [DELETE(42)], ['name'])
-
- with self.assertRaises(AssertionError):
- self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [FORGET(42)], ['name'])
-
- with self.assertRaises(AssertionError):
- self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [DELETE_ALL()], ['name'])
-
- with self.assertRaises(AssertionError):
- self.partner.resolve_o2m_commands_to_record_dicts(
- self.cr, UID, 'address', [REPLACE_WITH([42])], ['name'])
+ self.cr, UID, 'child_ids', [DELETE(42)], ['name'])
+
+ with self.assertRaises(AssertionError):
+ self.partner.resolve_o2m_commands_to_record_dicts(
+ self.cr, UID, 'child_ids', [FORGET(42)], ['name'])
+
+ with self.assertRaises(AssertionError):
+ self.partner.resolve_o2m_commands_to_record_dicts(
+ self.cr, UID, 'child_ids', [DELETE_ALL()], ['name'])
+
+ with self.assertRaises(AssertionError):
+ self.partner.resolve_o2m_commands_to_record_dicts(
+ self.cr, UID, 'child_ids', [REPLACE_WITH([42])], ['name'])
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
_______________________________________________
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
