1
=== modified file 'base_calendar/base_calendar_view.xml'
2
--- base_calendar/base_calendar_view.xml	2012-12-10 15:08:45 +0000
3
+++ base_calendar/base_calendar_view.xml	2013-03-05 07:09:20 +0000
4
@@ -75,27 +75,38 @@
5
75
                        statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
75
                        statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
6
76
                </header>
76
                </header>
7
77
                <sheet>
77
                <sheet>
26
78
                    <group col="6">
78
                    <div class="oe_edit_only">
27
79
                        <field name="name" string="Summary"
79
                        <label for="name" string="Summary"/>
28
80
                            colspan="4" required="1"/>
80
                    </div>
29
81
                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
81
                    <h1>
30
82
                        <newline/>
82
                        <field name="name" required="1"/>
31
83
                        <field name="date" string="Start Date" required="1"
83
                    </h1>
32
84
                            on_change="onchange_dates(date,duration,False,allday)"/>
84
                    <group>
33
85
                        <field name="duration" widget="float_time"
85
	                    <group>
34
86
                            on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
86
	                        <field name="date" string="Start Date" required="1"
35
87
                        <field name="date_deadline" string="End Date" required="1"
87
	                            on_change="onchange_dates(date,duration,False,allday)"/>
36
88
                            on_change="onchange_dates(date,False,date_deadline)"/>
88
	                        <field name="date_deadline" string="End Date" required="1"
37
89
                        <field name="location"/>
89
	                            on_change="onchange_dates(date,False,date_deadline)"/>
38
90
                        <field name="alarm_id" string="Reminder"
90
							<label for="duration"/>	                        
39
91
                            widget="selection"/>
91
	                        <div>
40
92
                        <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
92
	                        	<field name="duration" widget="float_time" class="oe_inline"
41
93
                           <field name="recurrency"/>
93
	                            	on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
42
94
                        </group>
94
	                        	<label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
43
95
                    </group>
95
	                        	<newline/>
44
96
	                        	(<field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
45
97
	                        	<label for="allday" string="All Day?"/>)
46
98
	                        </div>
47
99
	                 	</group>
48
100
						<group>                        
49
101
	                        <field name="location"/>
50
102
	                        <field name="alarm_id" string="Reminder"
51
103
	                            widget="selection"/>
52
104
	                        <field name="recurrency" attrs="{'readonly': [('state','=','done')]}"/> 
53
105
	                    </group>
54
106
                   	</group>
55
96
                    <notebook>
107
                    <notebook>
56
97
                    <page string="Event">
108
                    <page string="Event">
58
98
                        <group col="6" colspan="4">
109
                        <group col="4">
59
99
                             <separator colspan="6" string="Visibility"/>
110
                             <separator colspan="6" string="Visibility"/>
60
100
                             <field name="user_id" string="Responsible User"/>
111
                             <field name="user_id" string="Responsible User"/>
61
101
                             <field name="show_as" string="Show Time as"/>
112
                             <field name="show_as" string="Show Time as"/>
62
@@ -173,8 +184,6 @@
63
173
                                <newline/>
184
                                <newline/>
64
174
                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
185
                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
65
175
                                <newline/>
186
                                <newline/>
66
176
67
177
68
178
                            </group>
187
                            </group>
69
179
                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
188
                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
70
180
                                <separator string="Choose day where repeat the meeting" colspan="8"/>
189
                                <separator string="Choose day where repeat the meeting" colspan="8"/>
Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2013-03-05	Pending
Review via email: mp+151685@code.launchpad.net