Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-tools-ssu 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-tools-ssu/+merge/96313
Hello madam,
I have removed res.partner.address from the following modules:
1) audittrail
2) survey
3) subscription
4) base_module_record
5) event
Thank you.
SSU
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-tools-ssu/+merge/96313
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py 2011-11-21 16:27:12 +0000
+++ audittrail/audittrail.py 2012-03-07 09:34:44 +0000
@@ -375,8 +375,7 @@
}
The reason why the structure returned is build as above is because when modifying an existing
- record (res.partner, for example), we may have to log a change done in a x2many field (on
- res.partner.address, for example)
+ record (res.partner, for example), we may have to log a change done in a x2many field
"""
key = (model.id, resource_id)
lines = {
=== modified file 'base_module_record/wizard/base_module_record_data.py'
--- base_module_record/wizard/base_module_record_data.py 2012-02-09 09:11:17 +0000
+++ base_module_record/wizard/base_module_record_data.py 2012-03-07 09:34:44 +0000
@@ -39,7 +39,7 @@
def _get_default_objects(self, cr, uid, context=None):
names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
- 'res.partner', 'res.partner.address', 'res.partner.category', 'workflow',
+ 'res.partner', 'res.partner.category', 'workflow',
'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
=== modified file 'base_module_record/wizard/base_module_record_objects.py'
--- base_module_record/wizard/base_module_record_objects.py 2012-02-09 09:12:03 +0000
+++ base_module_record/wizard/base_module_record_objects.py 2012-03-07 09:34:44 +0000
@@ -39,7 +39,7 @@
def _get_default_objects(self, cr, uid, context=None):
names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
- 'res.partner', 'res.partner.address', 'res.partner.category', 'workflow',
+ 'res.partner', 'res.partner.category', 'workflow',
'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
=== modified file 'event/event.py'
--- event/event.py 2011-12-22 17:02:05 +0000
+++ event/event.py 2012-03-07 09:34:44 +0000
@@ -234,7 +234,7 @@
'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify a specific amount for each registration.", digits_compute=dp.get_precision('Sale Price')),
'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
- 'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+ 'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
'country_id': fields.related('address_id', 'country_id',
type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
@@ -303,7 +303,7 @@
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
"partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
- "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
+ "contact_id": fields.many2one('res.partner', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
"unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
"badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
@@ -382,7 +382,7 @@
inv_lines_pool = self.pool.get('account.invoice.line')
inv_pool = self.pool.get('account.invoice')
product_pool = self.pool.get('product.product')
- contact_pool = self.pool.get('res.partner.address')
+ contact_pool = self.pool.get('res.partner')
if context is None:
context = {}
# If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
@@ -596,7 +596,7 @@
data ={}
if not contact:
return data
- addr_obj = self.pool.get('res.partner.address')
+ addr_obj = self.pool.get('res.partner')
data['email_from'] = addr_obj.browse(cr, uid, contact).email
return {'value': data}
@@ -706,7 +706,7 @@
"registration_id": fields.many2one('event.registration', 'Registration', required=True),
"title": fields.char('Title', size=128),
"name": fields.char('Name', size=128, required=True),
- "address_id": fields.many2one('res.partner.address', 'Address'),
+ "address_id": fields.many2one('res.partner', 'Address'),
}
event_registration_badge()
=== modified file 'event/wizard/partner_event_registration.py'
--- event/wizard/partner_event_registration.py 2011-12-19 16:54:40 +0000
+++ event/wizard/partner_event_registration.py 2012-03-07 09:34:44 +0000
@@ -48,7 +48,6 @@
"""
value = {}
res_obj = self.pool.get('res.partner')
- addr_obj = self.pool.get('res.partner.address')
reg_obj = self.pool.get('event.registration')
mod_obj = self.pool.get('ir.model.data')
@@ -57,7 +56,7 @@
email = False
contact_id = addr.get('default', False)
if contact_id:
- email = addr_obj.browse(cr, uid, contact_id, context=context).email
+ email = res_obj.browse(cr, uid, contact_id, context=context).email
result = mod_obj.get_object_reference(cr, uid, 'event', 'view_registration_search')
res = result and result[1] or False
=== modified file 'subscription/security/ir.model.access.csv'
--- subscription/security/ir.model.access.csv 2011-12-19 16:54:40 +0000
+++ subscription/security/ir.model.access.csv 2012-03-07 09:34:44 +0000
@@ -4,5 +4,4 @@
access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
=== modified file 'survey/security/ir.model.access.csv'
--- survey/security/ir.model.access.csv 2012-02-07 05:15:20 +0000
+++ survey/security/ir.model.access.csv 2012-03-07 09:34:44 +0000
@@ -11,7 +11,6 @@
access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1
access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1
access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1
-access_survey_res_partner_address_user,survey.res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,0
access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1
access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1
_______________________________________________
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
