odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] partner kanban, holidays, meeting 

bzr revid: fp@openerp.com-20120714160403-if88yyfrqn07xp3t
This commit is contained in:
Fabien Pinckaers 2012-07-14 18:04:03 +02:00
parent e0cd5371ac
commit 1d94bd4907
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/base_calendar/crm_meeting.py
View File

@ -50,7 +50,8 @@ class crm_meeting(base_state, osv.Model):
'write_date': fields.datetime('Write Date', readonly=True),
'date_open': fields.datetime('Confirmed', readonly=True),
'date_closed': fields.datetime('Closed', readonly=True),
'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id',
string='Attendees', states={'done': [('readonly', True)]}),
'state': fields.selection(
[('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
string='Status', size=16, readonly=True),

2
addons/crm/res_partner.py
View File

@ -38,7 +38,7 @@ class res_partner(osv.osv):
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
'meeting_ids': fields.one2many('crm.meeting', 'partner_ids',\
'meeting_ids': fields.many2many('crm.meeting', 'crm_meeting_partner_rel','partner_id', 'meeting_id',
'Meetings'),
'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
'Phonecalls'),

8
addons/crm/res_partner_view.xml
View File

@ -107,11 +107,11 @@
<field name="meeting_count"/>
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(relate_partner_opportunities)d" type="action">
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
<a name="%(relate_partner_opportunities)d" type="action" t-if="record.opportunity_count.value>0" class="oe_tag">
<t t-esc="record.opportunity_count.value"/> Opportunities
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
<a name="%(crm_meeting_partner)d" type="action" t-if="record.meeting_count.value>0" class="oe_tag">
<t t-esc="record.meeting_count.value"/> Meetings
</a>
</xpath>
</field>

2
addons/hr_holidays/hr_holidays.py
View File

@ -267,7 +267,7 @@ class hr_holidays(osv.osv):
meeting_obj = self.pool.get('crm.meeting')
meeting_vals = {
'name': record.name,
'categ_ids': [(6,0,[record.holiday_status_id.categ_id.id])],
'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
'duration': record.number_of_days_temp * 8,
'description': record.notes,
'user_id': record.user_id.id,

4
addons/sale/res_partner_view.xml
View File

@ -12,8 +12,8 @@
<field name="sale_order_count"/>
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(sale.act_res_partner_2_sale_order)d" type="action">
<t t-if="record.sale_order_count.value"><t t-esc="record.sale_order_count.value" /> Sales</t>
<a name="%(sale.act_res_partner_2_sale_order)d" type="action" t-if="record.sale_order_count.value>0" class="oe_tag">
<t t-esc="record.sale_order_count.value"/> Sales
</a>
</xpath>
</field>