[IMP] change in view
bzr revid: kjo@tinyerp.com-20120709054008-ico77jmm32mcztx2
This commit is contained in:
Kuldeep Joshi (OpenERP)
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
|
||||
('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
|
||||
'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
|
||||
'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
|
||||
'Show as', states={'done': [('readonly', True)]}),
|
||||
'Show Time As', states={'done': [('readonly', True)]}),
|
||||
'base_calendar_url': fields.char('Caldav URL', size=264),
|
||||
'state': fields.selection([('tentative', 'Tentative'),
|
||||
('cancelled', 'Cancelled'),
|
||||
@@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
||||
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
|
||||
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
|
||||
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
|
||||
'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
|
||||
'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
|
||||
'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
|
||||
'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
|
||||
'count': fields.integer('Repeat', help="Repeat x times"),
|
||||
'mo': fields.boolean('Mon'),
|
||||
'tu': fields.boolean('Tue'),
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
<group>
|
||||
<h2>
|
||||
<field name="date" required="1" class="oe_inline"/>
|
||||
at <label string="in" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
|
||||
<label string="at" class="oe_inline" attrs="{'invisible': [('location', '=', False)]}"/> <field name="location" placeholder="Location" class="oe_inline"/>
|
||||
</h2>
|
||||
</group>
|
||||
<group>
|
||||
@@ -104,15 +104,15 @@
|
||||
<field name="partner_id" string="Partner" on_change="onchange_partner_id(partner_id)" />
|
||||
<field name="email_from"/>
|
||||
</group>
|
||||
<group colspan="2">
|
||||
<field name="duration" widget="float_time"
|
||||
on_change="onchange_dates(date,duration,False,allday)"/>
|
||||
<group>
|
||||
<field name="date_deadline"
|
||||
string="End Date" required="1"
|
||||
on_change="onchange_dates(date,False,date_deadline)"/>
|
||||
<field name="duration" widget="float_time"
|
||||
on_change="onchange_dates(date,duration,False,allday)"/>
|
||||
<field name="alarm_id" string="Reminder" widget="selection" />
|
||||
<field name="class" string="Privacy"/>
|
||||
<field name="show_as" string="Show Time as"/>
|
||||
<field name="show_as"/>
|
||||
<field name="categ_id" widget="selection"
|
||||
string="Meeting Type"
|
||||
domain="[('object_id.model', '=', 'crm.meeting')]" />
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
<notebook colspan="4">
|
||||
<page string="Attachment">
|
||||
<group>
|
||||
<group string="Data">
|
||||
<group>
|
||||
<field name="type"/>
|
||||
<newline />
|
||||
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
|
||||
@@ -261,14 +261,13 @@
|
||||
<field name="res_id" invisible="True"/>
|
||||
<field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
|
||||
<field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
|
||||
<separator string="Related to" colspan="2"/>
|
||||
<field name="partner_id"/>
|
||||
</group>
|
||||
<group groups="base.group_no_one" string="Created">
|
||||
<group groups="base.group_no_one">
|
||||
<field name="create_uid" readonly="1"/>
|
||||
<field name="create_date" readonly="1"/>
|
||||
</group>
|
||||
<group groups="base.group_no_one" string="Modified">
|
||||
<group groups="base.group_no_one">
|
||||
<field name="write_uid" readonly="1"/>
|
||||
<field name="write_date" readonly="1"/>
|
||||
</group>
|
||||
|
||||
@@ -12,8 +12,9 @@
|
||||
<header>
|
||||
<button name="import_all" string="_Import"
|
||||
type="object" class="oe_highlight"/>
|
||||
<label string=" "/>
|
||||
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
|
||||
type="object" class="oe_highlight" /> or
|
||||
type="object"/> or
|
||||
<button special="cancel" string="_Cancel" class="oe_link"/>
|
||||
</header>
|
||||
<sheet>
|
||||
|
||||
@@ -313,19 +313,14 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Product Categories" version="7.0">
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<field name="name"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="parent_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="basic">
|
||||
<group name="account_property" string="Account Properties"/>
|
||||
|
||||
Reference in New Issue
Block a user