diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-17 11:55:16 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-17 11:55:16 +0530 |
| commit | fd9290d4e2fc607daabb5976a8ea8e1b98138ac5 (patch) | |
| tree | 5edc3a138a1de572ab93e7170e5b918f4d23559c | |
| parent | 7468d02118f4ed56bf3920f761d134f74d03fa16 (diff) | |
[IMP] project_caladav,crm,base_calendar: improve the view of meeting
bzr revid: sbh@tinyerp.com-20101217062516-t38ovx8zys4pxrb3
| -rw-r--r-- | addons/base_calendar/base_calendar.py | 1 | ||||
| -rw-r--r-- | addons/base_calendar/base_calendar_view.xml | 5 | ||||
| -rw-r--r-- | addons/crm/crm_meeting_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_caldav/project_caldav_view.xml | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index d93fcf1e7cd..94f2499e207 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1307,7 +1307,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ new_rule = '%s=%s' % (name, value) new_rrule_str.append(new_rule) new_rrule_str = ';'.join(new_rrule_str) - rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule']) for r_date in rdates: if start_date and r_date < start_date: diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 2c9c2b95542..9254cf3aa3b 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -353,8 +353,9 @@ </group> <separator string="Recurrency Rule" colspan="8"/> <group col="6" colspan="4"> - <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/> - <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/> + <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/> + <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/> + <field name="end_date" attrs="{'readonly': [('interval','!=',False)]}"/> </group> <group col="14" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}"> diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 36aa2432b83..614a3e364c7 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -173,7 +173,7 @@ <label string="" colspan="2"/> </group> <separator string="Recurrency Rule" colspan="8"/> - <group col="3" colspan="3"> + <group col="6" colspan="4"> <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/> <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/> <field name="end_date" attrs="{'readonly': [('interval','!=',False)]}"/> diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml index 09f68c67025..0c072458acc 100644 --- a/addons/project_caldav/project_caldav_view.xml +++ b/addons/project_caldav/project_caldav_view.xml @@ -85,11 +85,11 @@ </group> <newline/> <group col="4" colspan="6" name="rrule"> - <separator string="Custom Recurrency Rule" colspan="8"/> + <separator string="Recurrency Rule" colspan="8"/> <group col="6" colspan="4"> - <!-- <field name="freq" /> --> - <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/> - <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/> + <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/> + <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/> + <field name="end_date" attrs="{'invisible': [('readonly','!=',False)]}"/> </group> <group col="14" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}"> |