Michael (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_add_search_crit 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_add_search_crit/+merge/142140
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_add_search_crit/+merge/142140
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_add_search_crit into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_common/event.py'
--- mck_common/event.py 2012-12-26 15:05:17 +0000
+++ mck_common/event.py 2013-01-07 15:39:31 +0000
@@ -399,6 +399,18 @@
'state' : fields.selection([('draft','Draft'),('confirm','Confirm'),('Done','done')],'State'),
'name' : fields.related('executive_id', 'name', type='char', string='Invitee Name'),
'executive_id':fields.many2one('res.partner.contact','Executive',required=True),
+
+ 'sepcific_info_value_ids' : fields.related('executive_id','specific_value_ids',type='one2many',relation='mck.executive.practice.field.value',string='Label'),
+ 'executive_gender' : fields.related('executive_id',type='selection',selection=[('male', 'Male'), ('female', 'Female')],string='Gender'),
+ 'executive_alumni' : fields.related('executive_id',type='boolean',string='alumni'),
+ 'executive_role_type' : fields.related('executive_id','job_ids', 'type_id', type='many2one', relation="mck.role.type", string='Role Type'),
+ 'executive_role_email' : fields.related('executive_id','job_ids', 'email', type='char', string='Primary Role Email'),
+ 'executive_line1' : fields.related('executive_id','job_ids', 'function_ids', 'service_line_1_id', type="many2one", relation="mck.role.service_line", string="Service Line 1"),
+ 'executive_company_priority' : fields.related('executive_id','partner_id', "priority", type='char', string='Company Priority'),
+ 'executive_role_country' : fields.related('executive_id','job_ids', 'country_id', type='many2one', relation="res.country", string='Country'),
+ 'executive_validated_affiliation' : fields.related('executive_id','exec_practice_link_ids', 'validated', type='boolean', string="Validated Affiliation"),
+ 'executive_role_level' : fields.related('executive_id','job_ids', 'level_id', type='many2one', relation="mck.role.level", string='Role Level'),
+
'main_partner':fields.function(_get_cc_partner_and_main_partner, type="many2one", relation='mck.contact', string='McK Main Partner',readonly=True, multi=True,store=True),
'is_speaker':fields.boolean('Speaker'),
'comment':fields.text('Comment'),
=== modified file 'mck_contact/view/executive.xml'
--- mck_contact/view/executive.xml 2012-12-27 09:41:00 +0000
+++ mck_contact/view/executive.xml 2013-01-07 15:39:31 +0000
@@ -231,7 +231,7 @@
<field name="role_email" string="Email" />
<field name="function" />
<field name="line1"
- filter_domain="['|', ('line1', 'ilike', self), '|', ('line2', 'ilike', self),('line3', 'ilike', self)]" />
+ filter_domain="['|', ('line1', 'ilike', self), '|', ('line2', 'ilike', self),('line3', 'ilike', self)]" string="Service Line"/>
<field name="specific_value_ids" string="Specific Label" context="{'label':self}" />
<field name="specific_value_ids" string="Specific Info" context="{'value':self}" />
<newline />
=== modified file 'mck_event/view/invitee.xml'
--- mck_event/view/invitee.xml 2012-12-06 09:48:12 +0000
+++ mck_event/view/invitee.xml 2013-01-07 15:39:31 +0000
@@ -33,7 +33,24 @@
<field name="country_event" />
<field name="planner_event" />
<field name="main_partner" />
- <field name="cc_mck_contact" />
+ <field name="cc_mck_contact" />
+ </group>
+ <newline />
+ <group expand="0" string="Executive information">
+ <field name="executive_gender"/>
+ <field name="executive_alumni"/>
+ <field name="executive_role_type"/>
+ <field name="executive_role_email"/>
+ <field name="executive_line1" filter_domain="['|', ('line1', 'ilike', self), '|', ('line2', 'ilike', self),('line3', 'ilike', self)]" string="Service Line"/>
+ <field name="sepcific_info_value_ids" context="{'value':self}" string="Specific label"/>
+ <field name="sepcific_info_value_ids" context="{'value':self}" string="Specific info"/>
+ <newline/>
+ <field name="role_title"/>
+ <field name="executive_role_level"/>
+ <field name="role_company_id"/>
+ <field name="executive_company_priority"/>
+ <field name="executive_role_country"/>
+ <field name="executive_validated_affiliation"/>
</group>
<newline />
<group expand="0" string="Group By...">
=== modified file 'mck_publication/view/invitee.xml'
--- mck_publication/view/invitee.xml 2012-12-26 15:04:12 +0000
+++ mck_publication/view/invitee.xml 2013-01-07 15:39:31 +0000
@@ -29,6 +29,24 @@
<field name="cc_mck_contact" />
</group>
<newline />
+ <newline />
+ <group expand="0" string="Executive information">
+ <field name="executive_gender"/>
+ <field name="executive_alumni"/>
+ <field name="executive_role_type"/>
+ <field name="executive_role_email"/>
+ <field name="executive_line1" filter_domain="['|', ('line1', 'ilike', self), '|', ('line2', 'ilike', self),('line3', 'ilike', self)]" string="Service Line"/>
+ <field name="sepcific_info_value_ids" context="{'value':self}" string="Specific label"/>
+ <field name="sepcific_info_value_ids" context="{'value':self}" string="Specific info"/>
+ <newline/>
+ <field name="role_title"/>
+ <field name="executive_role_level"/>
+ <field name="role_company_id"/>
+ <field name="executive_company_priority"/>
+ <field name="executive_role_country"/>
+ <field name="executive_validated_affiliation"/>
+ </group>
+ <newline/>
<group expand="0" string="Group By...">
<filter string='Publication' context="{'group_by' : 'event_id'}" />
<filter string="Executive" context="{'group_by' : 'executive_id'}" />
_______________________________________________
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
