openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #02409
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh into lp:openobject-addons
Hitesh Vaghasiya(OpenERP Trainee) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1121908 in OpenERP Addons: "[trunk/7.0][Usability Issue]: Event form view"
https://bugs.launchpad.net/openobject-addons/+bug/1121908
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh/+merge/151685
Hello,
It has been fixed into this branch lp:~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh
with following revision
Revision ID:hiteshvaghasiya1990@xxxxxxxxx-20130305063452-2ajig07896vy1b8n
Revision No:8561
it will be merged soon in addons!!!
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh/+merge/151685
Your team OpenERP Community is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1121908-hitesh.
=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml 2012-12-10 15:08:45 +0000
+++ base_calendar/base_calendar_view.xml 2013-03-05 07:09:20 +0000
@@ -75,27 +75,38 @@
statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
</header>
<sheet>
- <group col="6">
- <field name="name" string="Summary"
- colspan="4" required="1"/>
- <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
- <newline/>
- <field name="date" string="Start Date" required="1"
- on_change="onchange_dates(date,duration,False,allday)"/>
- <field name="duration" widget="float_time"
- on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
- <field name="date_deadline" string="End Date" required="1"
- on_change="onchange_dates(date,False,date_deadline)"/>
- <field name="location"/>
- <field name="alarm_id" string="Reminder"
- widget="selection"/>
- <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
- <field name="recurrency"/>
- </group>
- </group>
+ <div class="oe_edit_only">
+ <label for="name" string="Summary"/>
+ </div>
+ <h1>
+ <field name="name" required="1"/>
+ </h1>
+ <group>
+ <group>
+ <field name="date" string="Start Date" required="1"
+ on_change="onchange_dates(date,duration,False,allday)"/>
+ <field name="date_deadline" string="End Date" required="1"
+ on_change="onchange_dates(date,False,date_deadline)"/>
+ <label for="duration"/>
+ <div>
+ <field name="duration" widget="float_time" class="oe_inline"
+ on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
+ <label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
+ <newline/>
+ (<field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+ <label for="allday" string="All Day?"/>)
+ </div>
+ </group>
+ <group>
+ <field name="location"/>
+ <field name="alarm_id" string="Reminder"
+ widget="selection"/>
+ <field name="recurrency" attrs="{'readonly': [('state','=','done')]}"/>
+ </group>
+ </group>
<notebook>
<page string="Event">
- <group col="6" colspan="4">
+ <group col="4">
<separator colspan="6" string="Visibility"/>
<field name="user_id" string="Responsible User"/>
<field name="show_as" string="Show Time as"/>
@@ -173,8 +184,6 @@
<newline/>
<field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
<newline/>
-
-
</group>
<group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
<separator string="Choose day where repeat the meeting" colspan="8"/>