[IMP]: project_calendar: Generic improvements in fields of task and Improved view

bzr revid: rpa@tinyerp.com-20100101111310-ahrpyhzruo9w8amq
This commit is contained in:
rpa (Open ERP) 2010-01-01 16:43:10 +05:30
parent 2b65916f36
commit 0a4343cf16
2 changed files with 25 additions and 35 deletions

View File

@ -31,17 +31,17 @@ class project_task(osv.osv):
_inherit = "project.task"
_columns = {
'class': fields.selection([('PUBLIC', 'PUBLIC'), ('PRIVATE', 'PRIVATE'), \
('CONFIDENTIAL', 'CONFIDENTIAL')], 'Class'),
'location': fields.text('Location'),
'rrule': fields.text('Recurrent Rule'),
'class': fields.selection([('PUBLIC', 'PUBLIC'), ('PRIVATE', 'PRIVATE'), \
('CONFIDENTIAL', 'CONFIDENTIAL')], 'Privacy'),
'location' : fields.char('Location', size=264, help="Gives Location of Task"),
'rrule' : fields.char('Recurrent Rule', size=352),
'exdate' : fields.text('Exception Date/Times', help="This property defines the list\
of date/time exceptions for arecurring calendar component."),
'exrule' : fields.text('Exception Rule', help="defines a rule or repeating pattern\
'exrule' : fields.char('Exception Rule', size=352, help="defines a rule or repeating pattern\
for anexception to a recurrence set"),
'attendee_ids': fields.many2many('crm.caldav.attendee', 'task_attendee_rel', 'case_id', \
'attendee_id', 'Attendees'),
'alarm_id': fields.many2one('crm.caldav.alarm', 'Alarm'),
'alarm_id': fields.many2one('crm.caldav.alarm', 'Reminder'),
'caldav_url': fields.char('Caldav URL', size=34),
}

View File

@ -21,35 +21,25 @@
<field name="type">form</field>
<field name="arch" type="xml">
<notebook position="inside">
<page string="CalDav Properties">
<field name="class"/>
<field name="caldav_url" widget="url"/>
<field name="alarm_id"/>
<newline/>
<separator string="Location" colspan="4"/>
<field name="location" colspan="4" nolabel="1"/>
<group string="Recurrency Details" col="5" colspan="4">
<button string="Change RRule"
name="%(caldav.action_view_caldav_set_rrule_wizard)d"
icon="gtk-save-as" type="action" colspan="4"
context="{'model' : 'project.task'}"/>
<group col="1" colspan="2">
<separator string="Recurrenet Rule" />
<field name="rrule" nolabel="1" />
<separator string="Exception Rule" />
<field name="exrule" nolabel="1" />
</group>
<group col="1" colspan="2">
<separator string="Exception Dates" />
<field name="exdate" nolabel="1" />
</group>
</group>
</page>
<page string="Attendee">
<separator string="Attendee" colspan="4"/>
<field name="attendee_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
<page string="Calendar Properties">
<field name="class"/>
<field name="caldav_url" widget="url"/>
<field name="location"/>
<field name="alarm_id"/>
<newline/>
<field name="rrule" colspan="2"/>
<button string="Change RRule" name="97"
icon="gtk-save-as" type="action" colspan="2"
context="{'model' : 'project.task'}"/>
<field name="exrule" colspan="4"/>
<separator string="Exception Dates" colspan="4"/>
<field name="exdate" nolabel="1" colspan="4"/>
</page>
<page string="Attendee Details">
<separator string="Attendee" colspan="4"/>
<field name="attendee_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
</field>
</record>