pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged BDE's branch to remove states, statusbar from meeting object

Browse Source 
bzr revid: pso@tinyerp.com-20120822105511-57jfisvqojxj7qp5
This commit is contained in:
pso (OpenERP)
2012-08-22 16:25:11 +05:30
parent 5bfe2da2be 530fa8859d
commit d735cf2cc5
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/crm_meeting_demo.xml
+4 -4
View File
@@ -27,7 +27,7 @@
<field eval="time.strftime('%Y-%m-05 12:00:00')" name="date"/>
<field eval="time.strftime('%Y-%m-05 19:00:00')" name="date_deadline"/>
<field eval="7.0" name="duration"/>
<field name="state">draft</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_3" model="crm.meeting">
@@ -39,7 +39,7 @@
<field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
<field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
<field eval="3.0" name="duration"/>
<field name="state">done</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_4" model="crm.meeting">
@@ -61,7 +61,7 @@
<field eval="time.strftime('%Y-%m-22 11:05:00')" name="date"/>
<field eval="time.strftime('%Y-%m-22 16:05:00')" name="date_deadline"/>
<field eval="5" name="duration"/>
<field name="state">draft</field>
<field name="state">open</field>
</record>
<record id="crm_meeting_6" model="crm.meeting">
@@ -72,7 +72,7 @@
<field eval="time.strftime('%Y-%m-18 2:00:00')" name="date"/>
<field eval="time.strftime('%Y-%m-18 10:30:00')" name="date_deadline"/>
<field eval="8.5" name="duration"/>
<field name="state">done</field>
<field name="state">open</field>
</record>
</data>
</openerp>
addons/base_calendar/crm_meeting_view.xml
+4 -6
View File
@@ -70,7 +70,7 @@
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<header>
<field name="state"/>
<field name="state" invisible="True"/>
</header>
<sheet>
<div class="oe_title">
@@ -115,7 +115,7 @@
<label for="allday" string="All Day?"/>)
</div>
<field name="recurrency"
attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
</group>
<group>
<field name="alarm_id" widget="selection" />
@@ -171,7 +171,6 @@
<button string="Invite People"
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
icon="terp-partner" type="action"
attrs="{'readonly': [('state', '=', 'done')]}"
context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
<field name="attendee_ids" widget="one2many" mode="tree">
<tree string="Invitation details" editable="top">
@@ -245,12 +244,11 @@
<field name="name">CRM - Meetings Tree</field>
<field name="model">crm.meeting</field>
<field name="arch" type="xml">
<tree string="Meetings" fonts="bold:needaction_pending==True"
colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<tree string="Meetings" fonts="bold:needaction_pending==True">
<field name="name" string="Subject" />
<field name="user_id"/>
<field name="date"/>
<field name="state"/>
<field name="state" invisible="True"/>
<field name="duration" />
<field name="needaction_pending" invisible="1"/>
</tree>
addons/hr_holidays/hr_holidays.py
+1 -1
View File
@@ -274,7 +274,7 @@ class hr_holidays(osv.osv):
'date': record.date_from,
'end_date': record.date_to,
'date_deadline': record.date_to,
'state': 'done', # to block that meeting date in the calendar
'state': 'open', # to block that meeting date in the calendar
}
meeting_id = meeting_obj.create(cr, uid, meeting_vals)
self._create_resource_leave(cr, uid, [record], context=context)