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

rb r2g 

bzr revid: jke@openerp.com-20131118081557-np5sxps572b578bg
This commit is contained in:
jke-openerp 2013-11-18 09:15:57 +01:00
parent c10dda59db
commit 77ba33003a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/base_calendar/crm_meeting.py
View File

@ -188,7 +188,6 @@ class crm_meeting(osv.Model):
'state': fields.selection([('tentative', 'Uncertain'),('cancelled', 'Cancelled'),('confirmed', 'Confirmed'),],'Status', readonly=True, track_visibility='onchange'),
#FIELD FOR RECURRENCY
'exdate': fields.text('Exception Date/Times', help="This property defines the list of date/time exceptions for a recurring calendar component."),
'rrule': fields.function(_get_rulestring, type='char', size=124, fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),

4
addons/hr_holidays/hr_holidays_demo.xml
View File

@ -26,7 +26,7 @@
<field eval="time.strftime('%Y-%m-20')" name="date_from"/>
<field eval="time.strftime('%Y-%m-22')" name="date_to"/>
<field name="type">remove</field>
<field name="state">draft</field>
<field name="state">tentative</field>
<field name="number_of_days_temp">3</field>
<field name="employee_id" ref="hr.employee_fp"/>
</record>
@ -37,7 +37,7 @@
<field eval="time.strftime('%Y-%m-23')" name="date_from"/>
<field eval="time.strftime('%Y-%m-25')" name="date_to"/>
<field name="type">add</field>
<field name="state">draft</field>
<field name="state">tentative</field>
<field name="number_of_days_temp">7</field>
<field name="employee_id" ref="hr.employee_fp"/>
</record>