tfr (Openerp) has proposed merging
lp:~openerp-dev/openerp-int/mck_addons_title_fix_tfr into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_addons_title_fix_tfr/+merge/141342
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_addons_title_fix_tfr/+merge/141342
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_addons_title_fix_tfr into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/role.py'
--- mck_contact/role.py 2012-12-21 09:59:46 +0000
+++ mck_contact/role.py 2012-12-27 13:44:30 +0000
@@ -31,12 +31,21 @@
_columns = {
'contact_id' : fields.many2one('res.partner.contact', 'Executive', ondelete='cascade'),
+<<<<<<< TREE
'title' : fields.char('Title (Deprecated)', size=256, required=False),
'mck_title' : fields.char('Title', size=256, required=True),
'title_source' : fields.char('Title Source', size=256),
'title_confirm_user_id' : fields.many2one('res.users', 'Title Confirmed By', readonly=True),
'title_confirm_user' : fields.function(_get_name, type='char', string='Title Confirmed By', readonly=True),
'title_confirm_date' : fields.date('Title Confirmed On', readonly=True),
+=======
+ 'title' : fields.related('title_mck', type='char', string="Title", store=True, required=True),
+ 'title_mck' : fields.char('Title', size=256, required=True),
+ 'title_source' : fields.char('Source', size=256),
+ 'title_confirm_user_id' : fields.many2one('res.users', 'Confirmed By', readonly=True),
+ 'title_confirm_user' : fields.function(_get_name, type='char', string='Confirmed By', readonly=True),
+ 'title_confirm_date' : fields.date('On', readonly=True),
+>>>>>>> MERGE-SOURCE
'email_source' : fields.char('Email Source', size=256),
'email_confirm_user_id' : fields.many2one('res.users', 'Email Confirmed By', readonly=True),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
