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

[FIX] none repeat type 

bzr revid: tfr@openerp.com-20101220103240-vmzmvdhpttxp722x
This commit is contained in:
Thibault Francois 2010-12-20 11:32:40 +01:00
parent fd72b6e57d
commit b106119a0d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/base_calendar/base_calendar.py
View File

@ -1338,13 +1338,10 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
weekstring = ''
monthstring = ''
yearstring = ''
freq=''
if freq == 'None':
freq=datas.get('rrule_type')
if freq == 'none':
return ''
if datas.get('rrule_type')=='daily_working':
freq ='weekly'
else:
freq=datas.get('rrule_type')
interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
if freq == 'weekly':

2
addons/crm/crm_meeting_view.xml
View File

@ -174,7 +174,7 @@
<separator string="End of recurrency" colspan="4"/>
<field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
<label string=" times" colspan="2" />
<label string=" " colspan="2" />
<newline />
<field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
<newline />