1
=== modified file 'account/account_view.xml'
2
--- account/account_view.xml	2014-05-02 13:07:53 +0000
3
+++ account/account_view.xml	2014-05-06 12:16:18 +0000
4
@@ -100,24 +100,22 @@
5
100
                        <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
100
                        <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
6
101
                        <field name="state" widget="statusbar" nolabel="1"/>
101
                        <field name="state" widget="statusbar" nolabel="1"/>
7
102
                    </header>
102
                    </header>
26
103
                    <sheet>
103
                    <group>
27
104
                        <group>
104
                        <group>
28
105
                            <group>
105
                            <field name="name"/>
29
106
                                <field name="name"/>
106
                            <field name="fiscalyear_id" widget="selection"/>
30
107
                                <field name="fiscalyear_id" widget="selection"/>
107
                            <label for="date_start" string="Duration"/>
31
108
                                <label for="date_start" string="Duration"/>
108
                            <div>
32
109
                                <div>
109
                                <field name="date_start" class="oe_inline" nolabel="1"/> -
33
110
                                    <field name="date_start" class="oe_inline" nolabel="1"/> -
110
                                <field name="date_stop" nolabel="1" class="oe_inline"/>
34
111
                                    <field name="date_stop" nolabel="1" class="oe_inline"/>
111
                            </div>
35
112
                                </div>
112
                        </group>
36
113
                            </group>
113
                        <group>
37
114
                            <group>
114
                            <field name="code"/>
38
115
                                <field name="code"/>
115
                            <field name="special"/>
39
116
                                <field name="special"/>
116
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
40
117
                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
117
                        </group>
41
118
                            </group>
118
                    </group>
24
119
                        </group>
25
120
                    </sheet>
42
121
                </form>
119
                </form>
43
122
            </field>
120
            </field>
44
123
        </record>
121
        </record>
45
124
122
46
=== modified file 'crm/crm_view.xml'
47
--- crm/crm_view.xml	2013-12-10 09:33:07 +0000
48
+++ crm/crm_view.xml	2014-05-06 12:16:18 +0000
49
@@ -258,14 +258,14 @@
50
258
                        <field name="exclusif"/>
258
                        <field name="exclusif"/>
51
259
                    </group>
259
                    </group>
52
260
                    <notebook>
260
                    <notebook>
54
261
                       <page string="Sales Purchase">
261
                       <page string="Sales Purchase" name="sale_purchase">
55
262
                           <group>
262
                           <group>
56
263
                               <field name="sales_purchase_active"/>
263
                               <field name="sales_purchase_active"/>
57
264
                           </group>
264
                           </group>
59
265
                           <separator string="Segmentation Test"/>
265
                           <separator string="Segmentation Test Criteria"/>
60
266
                           <field name="segmentation_line" widget="one2many_list"/>
266
                           <field name="segmentation_line" widget="one2many_list"/>
61
267
                       </page>
267
                       </page>
63
268
                       <page string="Description">
268
                       <page string="Description" name="description">
64
269
                           <field name="description"/>
269
                           <field name="description"/>
65
270
                       </page>
270
                       </page>
66
271
                    </notebook>
271
                    </notebook>
67
272
272
68
=== modified file 'crm_profiling/crm_profiling_view.xml'
69
--- crm_profiling/crm_profiling_view.xml	2012-11-29 22:26:45 +0000
70
+++ crm_profiling/crm_profiling_view.xml	2014-05-06 12:16:18 +0000
71
@@ -137,47 +137,42 @@
72
137
137
73
138
<!-- CRM Segmentation Form view  -->
138
<!-- CRM Segmentation Form view  -->
74
139
139
76
140
    <record model="ir.ui.view" id="crm.crm_segmentation-view">
140
    <record model="ir.ui.view" id="crm_segmentation_profiling_view">
77
141
        <field name="name">crm.segmentation.form</field>
141
        <field name="name">crm.segmentation.form</field>
78
142
        <field name="model">crm.segmentation</field>
142
        <field name="model">crm.segmentation</field>
79
143
        <field name="inherit_id" ref="crm.crm_segmentation-view"/>
80
143
        <field name="arch" type="xml">
144
        <field name="arch" type="xml">
83
144
            <form string="Partner Segmentation">
145
            <page name="sale_purchase" position="before">
82
145
                <notebook>
84
146
                <page string="Segmentation">
146
                <page string="Segmentation">
101
147
                    <separator string="Segmentation Description" colspan="4"/>
147
                    <group col="4">
102
148
                    <field name="name"/>
148
                        <field name="name"/>
103
149
                    <field name="exclusif"/>
149
                        <field name="exclusif"/>
104
150
                    <newline/>
150
                        <field name="categ_id"/>
89
151
                    <field name="categ_id" colspan="2"/>
90
152
                    <newline/>
91
153
                    <field name="description" colspan="4"/>
92
154
                    <field name="state"/>
93
155
                    <group col="3" colspan="2">
94
156
                        <button name="process_start"
95
157
                            states="not running" string="Compute Segmentation" type="object"
96
158
                            icon="gtk-apply" />
97
159
                        <button name="process_stop" states="running"
98
160
                            string="Stop Process" type="object" icon="gtk-stop" />
99
161
                        <button name="process_continue" states="running"
100
162
                            string="Continue Process" type="object" icon="gtk-go-forward" />
105
163
                    </group>
151
                    </group>
112
164
                </page>
152
                    <separator string="Segmentation Description"/>
113
165
                <page string="Sales Purchase">
153
                    <field name="description" nolabel="1"/>
114
166
                    <field name="sales_purchase_active"/>
154
                </page>
115
167
                    <separator string="Segmentation Test" colspan="4"/>
155
            </page>
116
168
                    <field name="segmentation_line" widget="one2many_list" colspan="4"/>
156
            <page name="description" position="replace">
111
169
                </page>
117
170
                <page string="Profiling">
157
                <page string="Profiling">
125
171
                    <field name="profiling_active" colspan="2"/>
158
                    <group>            
126
172
                    <separator string="Profiling Options" colspan="4"/>
159
                        <group>
127
173
                    <field name="parent_id" colspan="2"/><newline/>
160
                            <field name="profiling_active"/>
128
174
                    <separator string="Included Answers :" colspan="2" />
161
                            <separator string="Profiling Options" colspan="4"/>
129
175
                    <separator string="Excluded Answers :" colspan="2"/>
162
                            <field name="parent_id"/>
130
176
                    <field name="answer_yes" nolabel="1" colspan="2"/>
163
                        </group>
131
177
                    <field name="answer_no" nolabel="1" colspan="2"/>
164
                        <newline/>
132
165
                        <group>
133
166
                            <separator string="Included Answers"/>
134
167
                            <field name="answer_yes" nolabel="1" colspan="2"/>
135
168
                        </group>
136
169
                        <group>
137
170
                            <separator string="Excluded Answers"/>
138
171
                            <field name="answer_no" nolabel="1" colspan="2"/>
139
172
                        </group>
140
173
                    </group>
141
178
                </page>
174
                </page>
144
179
                </notebook>
175
            </page>
143
180
            </form>
145
181
        </field>
176
        </field>
146
182
    </record>
177
    </record>
147
183
178
148
184
179
149
=== modified file 'fleet/fleet_view.xml'
150
--- fleet/fleet_view.xml	2014-03-28 13:30:51 +0000
151
+++ fleet/fleet_view.xml	2014-05-06 12:16:18 +0000
152
@@ -6,40 +6,38 @@
153
6
            <field name="model">fleet.vehicle.model</field>
6
            <field name="model">fleet.vehicle.model</field>
154
7
            <field name="arch" type="xml">
7
            <field name="arch" type="xml">
155
8
                <form string="Model" version="7.0">
8
                <form string="Model" version="7.0">
181
9
                    <sheet>
9
                    <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
182
10
                        <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
10
                    <div class="oe_title">
183
11
                        <div class="oe_title">
11
                        <label for="modelname" class="oe_edit_only"/>
184
12
                            <label for="modelname" class="oe_edit_only"/>
12
                        <h1>
185
13
                            <h1>
13
                            <field name="modelname" />
186
14
                                <field name="modelname" />
14
                        </h1>
187
15
                            </h1>
15
                        <label for="brand_id" class="oe_edit_only"/>
188
16
                            <label for="brand_id" class="oe_edit_only"/>
16
                        <h2>
189
17
                            <h2>
17
                            <field name="brand_id" on_change="on_change_brand(brand_id)"/>
190
18
                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
18
                        </h2>
191
19
                            </h2>
19
                    </div>
192
20
                        </div>
20
                    <notebook>
193
21
                        <notebook>
21
                        <page string="Vendors">
194
22
                            <page string="Vendors">
22
                            <field name="vendors" widget="many2many_kanban">
195
23
                                <field name="vendors" widget="many2many_kanban">
23
                                <kanban quick_create="false" create="true">
196
24
                                    <kanban quick_create="false" create="true">
24
                                    <field name="name"/>
197
25
                                        <field name="name"/>
25
                                    <templates>
198
26
                                        <templates>
26
                                        <t t-name="kanban-box">
199
27
                                            <t t-name="kanban-box">
27
                                            <div style="position: relative">
200
28
                                                <div style="position: relative">
28
                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
201
29
                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
29
                                                <div class="oe_module_vignette">
202
30
                                                    <div class="oe_module_vignette">
30
                                                    <div class="oe_module_desc">
203
31
                                                        <div class="oe_module_desc">
31
                                                        <field name="name"/>
179
32
                                                            <field name="name"/>
180
33
                                                        </div>
204
34
                                                    </div>
32
                                                    </div>
205
35
                                                </div>
33
                                                </div>
213
36
                                            </t>
34
                                            </div>
214
37
                                        </templates>
35
                                        </t>
215
38
                                    </kanban>
36
                                    </templates>
216
39
                                </field>
37
                                </kanban>
217
40
                            </page>
38
                            </field>
218
41
                        </notebook>
39
                        </page>
219
42
                    </sheet>
40
                    </notebook>
220
43
                </form>
41
                </form>
221
44
            </field>
42
            </field>
222
45
        </record>
43
        </record>
223
@@ -98,17 +96,15 @@
224
98
            <field name="model">fleet.vehicle.model.brand</field>
96
            <field name="model">fleet.vehicle.model.brand</field>
225
99
            <field name="arch" type="xml">
97
            <field name="arch" type="xml">
226
100
                <form string="Model Brand" version="7.0">
98
                <form string="Model Brand" version="7.0">
238
101
                    <sheet>
99
                    <group>
239
102
                        <group>
100
                        <div>
240
103
                            <div>
101
                            <field name="image_medium" widget="image" class="oe_left oe_avatar"/>
241
104
                                <field name="image_medium" widget="image" class="oe_left oe_avatar"/>
102
                            <label for="name" class="oe_edit_only"/>
242
105
                                <label for="name" class="oe_edit_only"/>
103
                            <h1>
243
106
                                <h1>
104
                                <field name="name" class="oe_inline" />
244
107
                                    <field name="name" class="oe_inline" />
105
                            </h1>
245
108
                                </h1>
106
                        </div>
246
109
                            </div>
107
                    </group>
236
110
                        </group>
237
111
                    </sheet>
247
112
                </form>
108
                </form>
248
113
            </field>
109
            </field>
249
114
        </record>
110
        </record>
250
115
111
251
=== modified file 'hr_holidays/hr_holidays_view.xml'
252
--- hr_holidays/hr_holidays_view.xml	2014-03-26 12:00:56 +0000
253
+++ hr_holidays/hr_holidays_view.xml	2014-05-06 12:16:18 +0000
254
@@ -342,26 +342,24 @@
255
342
            <field name="model">hr.holidays.status</field>
342
            <field name="model">hr.holidays.status</field>
256
343
            <field name="arch" type="xml">
343
            <field name="arch" type="xml">
257
344
                <form string="Leave Type" version="7.0">
344
                <form string="Leave Type" version="7.0">
258
345
                <sheet string="Leave Type">
259
346
                    <group col="4">
345
                    <group col="4">
260
347
                        <field name="name"/>
346
                        <field name="name"/>
261
348
                        <field name="categ_id"/>
347
                        <field name="categ_id"/>
262
349
                    </group>
348
                    </group>
263
350
                    <notebook>
349
                    <notebook>
276
351
                      <page string="Details">
350
                        <page string="Details">
277
352
                          <group>
351
                            <group>
278
353
                              <group name="selection" string="Validation">
352
                                <group name="selection" string="Validation">
279
354
                                  <field name="double_validation"/>
353
                                    <field name="double_validation"/>
280
355
                                  <field name="limit"/>
354
                                    <field name="limit"/>
281
356
                              </group>
355
                                </group>
282
357
                              <group name="second" string="Misc">
356
                                <group name="second" string="Misc">
283
358
                                  <field name="color_name"/>
357
                                    <field name="color_name"/>
284
359
                                  <field name="active"/>
358
                                    <field name="active"/>
285
360
                              </group>
359
                                </group>
286
361
                          </group>
360
                            </group>
287
362
                      </page>
361
                        </page>
288
363
                    </notebook>
362
                    </notebook>
289
364
                </sheet>
290
365
                </form>
363
                </form>
291
366
            </field>
364
            </field>
292
367
        </record>
365
        </record>
293
368
366
294
=== modified file 'hr_payroll/hr_payroll_view.xml'
295
--- hr_payroll/hr_payroll_view.xml	2014-05-02 13:07:53 +0000
296
+++ hr_payroll/hr_payroll_view.xml	2014-05-06 12:16:18 +0000
297
@@ -408,7 +408,7 @@
298
408
            <field name="name">hr.salary.rule.category.form</field>
408
            <field name="name">hr.salary.rule.category.form</field>
299
409
            <field name="model">hr.salary.rule.category</field>
409
            <field name="model">hr.salary.rule.category</field>
300
410
            <field name="arch" type="xml">
410
            <field name="arch" type="xml">
302
411
                <form string="Salary Categories">
411
                <form string="Salary Categories" version="7.0">
303
412
                    <group col="4">
412
                    <group col="4">
304
413
                        <field name="name"/>
413
                        <field name="name"/>
305
414
                        <field name="code"/>
414
                        <field name="code"/>
306
415
415
307
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
308
--- hr_recruitment/hr_recruitment_view.xml	2014-04-15 15:01:46 +0000
309
+++ hr_recruitment/hr_recruitment_view.xml	2014-05-06 12:16:18 +0000
310
@@ -541,7 +541,6 @@
311
541
        <field name="model">hr.recruitment.stage</field>
541
        <field name="model">hr.recruitment.stage</field>
312
542
        <field name="arch" type="xml">
542
        <field name="arch" type="xml">
313
543
            <form string="Stage" version="7.0">
543
            <form string="Stage" version="7.0">
314
544
                <sheet>
315
545
                <group string="Stage Definition">
544
                <group string="Stage Definition">
316
546
                    <group>
545
                    <group>
317
547
                        <field name="name"/>
546
                        <field name="name"/>
318
@@ -555,7 +554,6 @@
319
555
                </group>
554
                </group>
320
556
                <separator string="Requirements"/>
555
                <separator string="Requirements"/>
321
557
                <field name="requirements"/>
556
                <field name="requirements"/>
322
558
                </sheet>
323
559
            </form>
557
            </form>
324
560
        </field>
558
        </field>
325
561
    </record>
559
    </record>
326
@@ -601,12 +599,10 @@
327
601
        <field name="model">hr.recruitment.degree</field>
599
        <field name="model">hr.recruitment.degree</field>
328
602
        <field name="arch" type="xml">
600
        <field name="arch" type="xml">
329
603
            <form string="Degree" version="7.0">
601
            <form string="Degree" version="7.0">
330
604
                <sheet>
331
605
                <group>
602
                <group>
332
606
                    <field name="name"/>
603
                    <field name="name"/>
333
607
                    <field name="sequence" groups="base.group_no_one"/>
604
                    <field name="sequence" groups="base.group_no_one"/>
334
608
                </group>
605
                </group>
335
609
                </sheet>
336
610
            </form>
606
            </form>
337
611
        </field>
607
        </field>
338
612
    </record>
608
    </record>
339
@@ -641,11 +637,9 @@
340
641
        <field name="model">hr.recruitment.source</field>
637
        <field name="model">hr.recruitment.source</field>
341
642
        <field name="arch" type="xml">
638
        <field name="arch" type="xml">
342
643
            <form string="Sources of Applicants" version="7.0">
639
            <form string="Sources of Applicants" version="7.0">
343
644
                <sheet>
344
645
                <group>
640
                <group>
345
646
                    <field name="name"/>
641
                    <field name="name"/>
346
647
                </group>
642
                </group>
347
648
                </sheet>
348
649
            </form>
643
            </form>
349
650
        </field>
644
        </field>
350
651
    </record>
645
    </record>
351
652
646
352
=== modified file 'lunch/lunch_view.xml'
353
--- lunch/lunch_view.xml	2014-04-18 11:59:13 +0000
354
+++ lunch/lunch_view.xml	2014-05-06 12:16:18 +0000
355
@@ -293,11 +293,9 @@
356
293
            <field name="model">lunch.product.category</field>
293
            <field name="model">lunch.product.category</field>
357
294
            <field name="arch" type="xml">
294
            <field name="arch" type="xml">
358
295
                <form string="Products Form" version="7.0">
295
                <form string="Products Form" version="7.0">
359
296
                    <sheet>
360
297
                    <group>
296
                    <group>
361
298
                        <field name='name' string="Product Category: "/>
297
                        <field name='name' string="Product Category: "/>
362
299
                    </group>
298
                    </group>
363
300
                    </sheet>
364
301
                </form>
299
                </form>
365
302
            </field>
300
            </field>
366
303
        </record>
301
        </record>
367
@@ -425,20 +423,18 @@
368
425
                <form string="Products Form" version="7.0">
423
                <form string="Products Form" version="7.0">
369
426
                    <header>
424
                    <header>
370
427
                    </header>
425
                    </header>
385
428
                    <sheet>
426
                    <group>
386
429
                        <group>
427
                        <group>
387
430
                            <group>
428
                            <field name='name'/>
388
431
                                <field name='name'/>
429
                            <field name='category_id'/>
389
432
                                <field name='category_id'/>
430
                        </group>
390
433
                            </group>
431
                        <group>
391
434
                            <group>
432
                            <field name='supplier'/>
392
435
                                <field name='supplier'/>
433
                            <field name='price'/>
393
436
                                <field name='price'/>
434
                        </group>
394
437
                            </group>
435
                    </group>
395
438
                        </group>
436
                    <label for='description'/>
396
439
                        <label for='description'/>
437
                    <field name='description'/>
383
440
                        <field name='description'/>
384
441
                    </sheet>
397
442
                </form>
438
                </form>
398
443
            </field>
439
            </field>
399
444
        </record>
440
        </record>
400
@@ -462,35 +458,32 @@
401
462
            <field name="model">lunch.alert</field>
458
            <field name="model">lunch.alert</field>
402
463
            <field name="arch" type="xml">
459
            <field name="arch" type="xml">
403
464
                <form string="alert tree" version="7.0">
460
                <form string="alert tree" version="7.0">
433
465
                    <sheet>
461
                    <group string="Schedule Date">
434
466
                        <group string="Schedule Date">
462
                        <group>
435
467
                            <group>
463
                            <field name="alter_type" class="oe_inline"/>
436
468
                                <field name="alter_type" class="oe_inline"/>
464
                            <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
437
469
                                <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
465
                        </group>
438
470
                            </group>
466
                    </group>
439
471
                        </group>
467
                    <group attrs="{'invisible': [('alter_type','!=','week')]}">
440
472
                        <group attrs="{'invisible': [('alter_type','!=','week')]}">
468
                        <group>
441
473
                            <group>
469
                            <field name="monday"/>
442
474
                                <field name="monday"/>
470
                            <field name="tuesday"/>
443
475
                                <field name="tuesday"/>
471
                            <field name="wednesday"/>
444
476
                                <field name="wednesday"/>
472
                            <field name="thursday"/>
445
477
                                <field name="thursday"/>
473
                        </group>
446
478
                            </group>
474
                        <group>
447
479
                            <group>
475
                            <field name="friday"/>
448
480
                                <field name="friday"/>
476
                            <field name="saturday"/>
449
481
                                <field name="saturday"/>
477
                            <field name="sunday"/>
450
482
                                <field name="sunday"/>
478
                        </group>
451
483
                            </group>
479
                    </group>
452
484
                        </group>
480
                    <group string="Schedule Hour">
453
485
                        <group string="Schedule Hour">
481
                        <field name='active_from' widget='float_time'/>
454
486
                            <field name='active_from' widget='float_time'/>
482
                        <field name='active_to' widget='float_time'/>
455
487
                            <field name='active_to' widget='float_time'/>
483
                    </group>
456
488
                        </group>
484
                    <group string='Message'>
457
489
                        <group string='Message'>
485
                        <field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/>
458
490
                            <field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/>
486
                    </group>
430
491
                        </group>
431
492
432
493
                </sheet>
459
494
                </form>
487
                </form>
460
495
            </field>
488
            </field>
461
496
        </record>
489
        </record>
462
497
490
463
=== modified file 'membership/membership_view.xml'
464
--- membership/membership_view.xml	2013-10-27 12:31:04 +0000
465
+++ membership/membership_view.xml	2014-05-06 12:16:18 +0000
466
@@ -44,39 +44,37 @@
467
44
            <field name="model">product.product</field>
44
            <field name="model">product.product</field>
468
45
            <field name="arch" type="xml">
45
            <field name="arch" type="xml">
469
46
                <form string="Membership products" version="7.0">
46
                <form string="Membership products" version="7.0">
503
47
                    <sheet>
47
                    <label for="name" class="oe_edit_only"/>
504
48
                        <label for="name" class="oe_edit_only"/>
48
                    <h1>
505
49
                        <h1>
49
                        <field name="name"/>
506
50
                            <field name="name"/>
50
                    </h1>
507
51
                        </h1>
51
                    <group>
508
52
                        <group>
52
                        <group>
509
53
                            <group>
53
                            <field name="default_code"/>
510
54
                                <field name="default_code"/>
54
                            <field name="categ_id"/>
511
55
                                <field name="categ_id"/>
55
                            <field name="membership" invisible="1"/>
512
56
                                <field name="membership" invisible="1"/>
56
                            <field name="company_id"
513
57
                                <field name="company_id"
57
                                groups="base.group_multi_company"
514
58
                                    groups="base.group_multi_company"
58
                                widget="selection"/>
515
59
                                    widget="selection"/>
59
                            <field name="active"/>
516
60
                                <field name="active"/>
60
                        </group>
517
61
                            </group>
61
                        <group>
518
62
                            <group>
62
                            <label for="membership_date_from" string="Membership Duration"/>
519
63
                                <label for="membership_date_from" string="Membership Duration"/>
63
                            <div>
520
64
                                <div>
64
                                <field name="membership_date_from" required="1" class="oe_inline"/> -
521
65
                                    <field name="membership_date_from" required="1" class="oe_inline"/> -
65
                                <field name="membership_date_to" required="1" class="oe_inline"/>
522
66
                                    <field name="membership_date_to" required="1" class="oe_inline"/>
66
                            </div>
523
67
                                </div>
67
                            <field name="list_price" string="Membership Fee"/>
524
68
                                <field name="list_price" string="Membership Fee"/>
68
                            <field
525
69
                                <field
69
                                name="property_account_income"
526
70
                                    name="property_account_income"
70
                                domain="[('type', '!=', 'view')]"/>
527
71
                                    domain="[('type', '!=', 'view')]"/>
71
                            <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
528
72
                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
72
                        </group>
529
73
                            </group>
73
                    </group>
530
74
                        </group>
74
                    <label for="description"/>
531
75
                        <label for="description"/>
75
                    <field colspan="4" name="description" placeholder="Add a description..."/>
532
76
                        <field colspan="4" name="description" placeholder="Add a description..."/>
76
                    <label for="description_sale"/>
533
77
                        <label for="description_sale"/>
77
                    <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
501
78
                        <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
502
79
                    </sheet>
534
80
                 </form>
78
                 </form>
535
81
            </field>
79
            </field>
536
82
        </record>
80
        </record>
537
83
81
538
=== modified file 'mrp/mrp_view.xml'
539
--- mrp/mrp_view.xml	2014-05-02 13:07:53 +0000
540
+++ mrp/mrp_view.xml	2014-05-06 12:16:18 +0000
541
@@ -27,10 +27,11 @@
542
27
            <field name="model">mrp.property.group</field>
27
            <field name="model">mrp.property.group</field>
543
28
            <field name="arch" type="xml">
28
            <field name="arch" type="xml">
544
29
                <form string="Properties categories" version="7.0">
29
                <form string="Properties categories" version="7.0">
549
30
                    <label for="name"/>
30
                    <group>
550
31
                    <field name="name"/>
31
                        <field name="name"/>
551
32
                    <label for="description"/>
32
                    </group>
552
33
                    <field name="description"/>
33
                    <separator string="Description"/>
553
34
                    <field name="description" nolabel="1"/>
554
34
                </form>
35
                </form>
555
35
            </field>
36
            </field>
556
36
        </record>
37
        </record>
557
@@ -84,8 +85,8 @@
558
84
                        <field name="group_id"/>
85
                        <field name="group_id"/>
559
85
                        <field name="composition"/>
86
                        <field name="composition"/>
560
86
                    </group>
87
                    </group>
563
87
                    <label for="description"/>
88
                    <separator string="Description"/>
564
88
                    <field name="description"/>
89
                    <field name="description" nolabel="1"/>
565
89
                </form>
90
                </form>
566
90
            </field>
91
            </field>
567
91
        </record>
92
        </record>
568
@@ -198,8 +199,8 @@
569
198
                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
199
                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
570
199
                                </group>
200
                                </group>
571
200
                            </group>
201
                            </group>
574
201
                            <label for="note"/>
202
                            <separator string="Description"/>
575
202
                            <field name="note"/>
203
                            <field name="note" nolabel="1"/>
576
203
                        </page>
204
                        </page>
577
204
                    </notebook>
205
                    </notebook>
578
205
                </form>
206
                </form>
579
@@ -345,73 +346,75 @@
580
345
            <field name="model">mrp.bom</field>
346
            <field name="model">mrp.bom</field>
581
346
            <field name="arch" type="xml">
347
            <field name="arch" type="xml">
582
347
                <form string="Bill of Material" version="7.0">
348
                <form string="Bill of Material" version="7.0">
650
348
                    <group>
349
                    <sheet>
651
349
                        <group>
350
                        <group>
652
350
                            <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
351
                            <group>
653
351
                            <label for="product_qty" string="Quantity"/>
352
                                <field name="product_id" on_change="onchange_product_id(product_id, name, product_qty, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
654
352
                            <div>
353
                                <label for="product_qty" string="Quantity"/>
655
353
                                <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/>
354
                                <div>
656
354
                                <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
355
                                    <field name="product_qty" class="oe_inline" on_change="onchange_product_id(product_id, name, product_qty, context)"/>
657
355
                            </div>
356
                                    <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
658
356
                            <label for="product_uos_qty" groups="product.group_uos"/>
357
                                </div>
659
357
                            <div groups="product.group_uos" >
358
                                <label for="product_uos_qty" groups="product.group_uos"/>
660
358
                                <field name="product_uos_qty"
359
                                <div groups="product.group_uos" >
661
359
                                    class="oe_inline"/>
360
                                    <field name="product_uos_qty"
662
360
                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
361
                                        class="oe_inline"/>
663
361
                                <field name="product_uos" class="oe_inline"/>
362
                                    <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
664
362
                            </div>
363
                                    <field name="product_uos" class="oe_inline"/>
665
363
                            <label for="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
364
                                </div>
666
364
                            <div groups="mrp.group_mrp_routings">
365
                                <label for="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
667
365
                            	<field name="routing_id" class="oe_inline"/>
366
                                <div groups="mrp.group_mrp_routings">
668
366
                            </div>
367
                                	<field name="routing_id" class="oe_inline"/>
669
367
                        </group>
368
                                </div>
670
368
                        <group>
369
                            </group>
671
369
                            <field name="name" groups="product.group_mrp_properties"/>
370
                            <group>
672
370
                            <field name="code" string="Reference"/>
371
                                <field name="name" groups="product.group_mrp_properties"/>
673
371
                            <field name="type"/>
372
                                <field name="code" string="Reference"/>
674
372
                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
373
                                <field name="type"/>
675
373
                                When processing a sales order for this product, the delivery order
374
                                <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
676
374
                                will contain the raw materials, instead of the finished product.
375
                                    When processing a sales order for this product, the delivery order
677
375
                            </p>
376
                                    will contain the raw materials, instead of the finished product.
678
376
                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
377
                                </p>
679
377
                        </group>
378
                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
680
378
                    </group>
379
                            </group>
681
379
                    <notebook>
380
                        </group>
682
380
                        <page string="Components">
381
                        <notebook>
683
381
                            <field name="bom_lines" widget="one2many_list">
382
                            <page string="Components">
684
382
                                <tree string="Components" editable="bottom">
383
                                <field name="bom_lines" widget="one2many_list">
685
383
                                    <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/>
384
                                    <tree string="Components" editable="bottom">
686
384
                                    <field name="product_qty"/>
385
                                        <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/>
687
385
                                    <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
386
                                        <field name="product_qty"/>
688
386
                                    <field name="name" invisible="1"/>
387
                                        <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
689
387
                                    <field name="date_start"/>
388
                                        <field name="name" invisible="1"/>
690
388
                                    <field name="date_stop"/>
389
                                        <field name="date_start"/>
691
389
                                </tree>
390
                                        <field name="date_stop"/>
692
390
                            </field>
391
                                    </tree>
693
391
                        </page>
392
                                </field>
694
392
                        <page string="Properties" groups="product.group_mrp_properties">
393
                            </page>
695
393
                            <group>
394
                            <page string="Properties" groups="product.group_mrp_properties">
696
394
                                <group>
395
                                <group>
697
395
                                    <field name="position"/>
396
                                    <group>
698
396
                                    <field name="bom_id"/>
397
                                        <field name="position"/>
699
397
                                    <field name="sequence"/>
398
                                        <field name="bom_id"/>
700
398
                                    <field name="active"/>
399
                                        <field name="sequence"/>
701
399
                                </group>
400
                                        <field name="active"/>
702
400
                                <group>
401
                                    </group>
703
401
                                    <field name="date_start"/>
402
                                    <group>
704
402
                                    <field name="date_stop"/>
403
                                        <field name="date_start"/>
705
403
                                    <field name="product_rounding"/>
404
                                        <field name="date_stop"/>
706
404
                                    <field name="product_efficiency"/>
405
                                        <field name="product_rounding"/>
707
405
                                </group>
406
                                        <field name="product_efficiency"/>
708
406
                            </group>
407
                                    </group>
709
407
                            <separator string="Properties"/>
408
                                </group>
710
408
                            <field name="property_ids" widget="many2many_tags"/>
409
                                <separator string="Properties"/>
711
409
                        </page>
410
                                <field name="property_ids" widget="many2many_tags"/>
712
410
                    </notebook>
411
                            </page>
713
411
                    <div class="oe_chatter">
412
                        </notebook>
714
412
                         <field name="message_follower_ids" widget="mail_followers"/>
413
                        <div class="oe_chatter">
715
413
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
414
                             <field name="message_follower_ids" widget="mail_followers"/>
716
414
                    </div>
415
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
717
416
                        </div>
718
417
                    </sheet>
719
415
                </form>
418
                </form>
720
416
            </field>
419
            </field>
721
417
        </record>
420
        </record>
722
418
421
723
=== modified file 'point_of_sale/point_of_sale_view.xml'
724
--- point_of_sale/point_of_sale_view.xml	2014-05-02 13:07:53 +0000
725
+++ point_of_sale/point_of_sale_view.xml	2014-05-06 12:16:18 +0000
726
@@ -715,49 +715,47 @@
727
715
                        </div>
715
                        </div>
728
716
                    </header>
716
                    </header>
729
717
717
773
718
                    <sheet>
718
                    <label for="name" class="oe_edit_only"/>
774
719
                        <label for="name" class="oe_edit_only"/>
719
                    <h1>
775
720
                        <h1>
720
                        <field name="name"/>
776
721
                            <field name="name"/>
721
                    </h1>
777
722
                        </h1>
722
                    <group col="4">
778
723
                        <group col="4">
723
                        <field name="warehouse_id" widget="selection" groups="stock.group_locations" />
779
724
                            <field name="warehouse_id" widget="selection" groups="stock.group_locations" />
724
                        <field name="pricelist_id" groups="product.group_sale_pricelist"/>
780
725
                            <field name="pricelist_id" groups="product.group_sale_pricelist"/>
725
                        <field name="currency_id" invisible="1"/>
781
726
                            <field name="currency_id" invisible="1"/>
726
                        <field name="journal_id" widget="selection"/>
782
727
                            <field name="journal_id" widget="selection"/>
727
                        <field name="group_by" groups="account.group_account_user"/>
783
728
                            <field name="group_by" groups="account.group_account_user"/>
728
                        <field name="sequence_id" readonly="1" groups="base.group_no_one"/>
784
729
                            <field name="sequence_id" readonly="1" groups="base.group_no_one"/>
729
                    </group>
785
730
                        </group>
730
                    <separator string="Available Payment Methods" colspan="4"/>
786
731
                        <separator string="Available Payment Methods" colspan="4"/>
731
                    <field name="journal_ids" colspan="4" nolabel="1">
787
732
                        <field name="journal_ids" colspan="4" nolabel="1">
732
                        <tree string="Journals">
788
733
                            <tree string="Journals">
733
                            <field name="code" />
789
734
                                <field name="code" />
734
                            <field name="name" />
790
735
                                <field name="name" />
735
                            <field name="type" />
791
736
                                <field name="type" />
736
                            <field name="cash_control" />
792
737
                                <field name="cash_control" />
737
                        </tree>
793
738
                            </tree>
738
                    </field>
794
739
                        </field>
739
                    <group string="Features" >
795
740
                        <group string="Features" >
740
                        <group>
796
741
                            <group>
741
                            <field name="iface_vkeyboard" />
797
742
                                <field name="iface_vkeyboard" />
742
                            <field name="iface_invoicing" />
798
743
                                <field name="iface_invoicing" />
743
                        </group>
799
744
                            </group>
744
                        <group>
800
745
                            <group>
745
                            <field name="iface_big_scrollbars" />
801
746
                                <field name="iface_big_scrollbars" />
746
                        </group>
802
747
                            </group>
747
                    </group>
803
748
                        </group>
748
                    <group string="Hardware Proxy" >
804
749
                        <group string="Hardware Proxy" >
749
                        <field name="proxy_ip" />
805
750
                            <field name="proxy_ip" />
750
                        <field name="iface_print_via_proxy" />
806
751
                            <field name="iface_print_via_proxy" />
751
                        <field name="iface_scan_via_proxy" />
807
752
                            <field name="iface_scan_via_proxy" />
752
                        <field name="iface_electronic_scale" />
808
753
                            <field name="iface_electronic_scale" />
753
                        <field name="iface_cashdrawer" />
809
754
                            <field name="iface_cashdrawer" />
754
                    </group>
810
755
                        </group>
755
                    <group string="Receipt" >
811
756
                        <group string="Receipt" >
756
                        <field name="receipt_header" placeholder="A custom receipt header message"/>
812
757
                            <field name="receipt_header" placeholder="A custom receipt header message"/>
757
                        <field name="receipt_footer" placeholder="A custom receipt header footage"/>
813
758
                            <field name="receipt_footer" placeholder="A custom receipt header footage"/>
758
                    </group>
771
759
                        </group>
772
760
                    </sheet>
814
761
759
815
762
                </form>
760
                </form>
816
763
            </field>
761
            </field>
817
764
762
818
=== modified file 'procurement/procurement_view.xml'
819
--- procurement/procurement_view.xml	2014-04-15 13:02:44 +0000
820
+++ procurement/procurement_view.xml	2014-05-06 12:16:18 +0000
821
@@ -215,34 +215,32 @@
822
215
            <field name="model">stock.warehouse.orderpoint</field>
215
            <field name="model">stock.warehouse.orderpoint</field>
823
216
            <field name="arch" type="xml">
216
            <field name="arch" type="xml">
824
217
                <form string="Reordering Rules" version="7.0">
217
                <form string="Reordering Rules" version="7.0">
853
218
                    <sheet>
218
                    <group>
854
219
                        <group>
219
                        <group>
855
220
                            <group>
220
                            <field name="name" />
856
221
                                <field name="name" />
221
                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
857
222
                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
222
                        </group>
858
223
                            </group>
223
                        <group>
859
224
                            <group>
224
                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
860
225
                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
225
                            <field name="product_uom" groups="product.group_uom"/>
861
226
                                <field name="product_uom" groups="product.group_uom"/>
226
                            <field name="location_id" groups="stock.group_locations"/>
862
227
                                <field name="location_id" groups="stock.group_locations"/>
227
                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
863
228
                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
228
                        </group>
864
229
                            </group>
229
                    </group>
865
230
                        </group>
230
                    <group>
866
231
                        <group>
231
                        <group string="Rules">
867
232
                            <group string="Rules">
232
                            <field name="product_min_qty" />
868
233
                                <field name="product_min_qty" />
233
                            <field name="product_max_qty" />
869
234
                                <field name="product_max_qty" />
234
                            <field name="qty_multiple" string="Quantity Multiple"/>
870
235
                                <field name="qty_multiple" string="Quantity Multiple"/>
235
                        </group>
871
236
                            </group>
236
                        <group string="Misc">
872
237
                            <group string="Misc">
237
                            <field name="procurement_id" readonly="1"/>
873
238
                                <field name="procurement_id" readonly="1"/>
238
                            <field name="active" />
874
239
                                <field name="active" />
239
                        </group>
875
240
                            </group>
240
                    </group>
876
241
                        </group>
241
                    <group string="Procurement Orders to Process">
877
242
                        <group string="Procurement Orders to Process">
242
                        <field name="procurement_draft_ids" nolabel="1"/>
878
243
                            <field name="procurement_draft_ids" nolabel="1"/>
243
                    </group>
851
244
                        </group>
852
245
                    </sheet>
879
246
                </form>
244
                </form>
880
247
            </field>
245
            </field>
881
248
        </record>
246
        </record>
882
249
247
883
=== modified file 'product/product_view.xml'
884
--- product/product_view.xml	2014-04-22 10:03:06 +0000
885
+++ product/product_view.xml	2014-05-06 12:16:18 +0000
886
@@ -349,20 +349,18 @@
887
349
            <field name="model">product.category</field>
349
            <field name="model">product.category</field>
888
350
            <field name="arch" type="xml">
350
            <field name="arch" type="xml">
889
351
                <form string="Product Categories" version="7.0">
351
                <form string="Product Categories" version="7.0">
902
352
                    <sheet>
352
                    <div class="oe_title">
903
353
                        <div class="oe_title">
353
                        <label for="name" class="oe_edit_only"/>
904
354
                            <label for="name" class="oe_edit_only"/>
354
                        <h1>
905
355
                            <h1>
355
                            <field name="name"/>
906
356
                                <field name="name"/>
356
                        </h1>
907
357
                            </h1>
357
                    </div>
908
358
                        </div>
358
                    <group>
909
359
                        <group>
359
                        <group name="parent" col="4">
910
360
                            <group name="parent" col="4">
360
                            <field name="parent_id"/>
911
361
                                <field name="parent_id"/>
361
                            <field name="type"/>
900
362
                                <field name="type"/>
901
363
                            </group>
912
364
                        </group>
362
                        </group>
914
365
                    </sheet>
363
                    </group>
915
366
                </form>
364
                </form>
916
367
            </field>
365
            </field>
917
368
        </record>
366
        </record>
918
369
367
919
=== modified file 'resource/resource_view.xml'
920
--- resource/resource_view.xml	2014-04-11 13:18:42 +0000
921
+++ resource/resource_view.xml	2014-05-06 12:16:18 +0000
922
@@ -59,15 +59,13 @@
923
59
            <field name="model">resource.calendar</field>
59
            <field name="model">resource.calendar</field>
924
60
            <field name="arch" type="xml">
60
            <field name="arch" type="xml">
925
61
                <form string="Working Time" version="7.0">
61
                <form string="Working Time" version="7.0">
935
62
                    <sheet>
62
                    <group>
936
63
                        <group>
63
                        <field name="name"/>
937
64
                            <field name="name"/>
64
                        <field name="manager"/>
938
65
                            <field name="manager"/>
65
                        <field name="company_id" groups="base.group_multi_company"/>
939
66
                            <field name="company_id" groups="base.group_multi_company"/>
66
                    </group>
940
67
                        </group>
67
                    <field name="attendance_ids"/>
941
68
                            <field name="attendance_ids"/>
68
                    <field name="leave_ids"/>
933
69
                            <field name="leave_ids"/>
934
70
                    </sheet>
942
71
                </form>
69
                </form>
943
72
            </field>
70
            </field>
944
73
        </record>
71
        </record>
Status:	Needs review
Proposed branch:	lp:~openerp-dev/openobject-addons/trunk-improve-formviews-tpa
Merge into:	lp:openobject-addons
Diff against target:	944 lines (+332/-365) 14 files modified account/account_view.xml (+16/-18) crm/crm_view.xml (+3/-3) crm_profiling/crm_profiling_view.xml (+29/-34) fleet/fleet_view.xml (+39/-43) hr_holidays/hr_holidays_view.xml (+12/-14) hr_payroll/hr_payroll_view.xml (+1/-1) hr_recruitment/hr_recruitment_view.xml (+0/-6) lunch/lunch_view.xml (+38/-45) membership/membership_view.xml (+31/-33) mrp/mrp_view.xml (+78/-75) point_of_sale/point_of_sale_view.xml (+41/-43) procurement/procurement_view.xml (+26/-28) product/product_view.xml (+11/-13) resource/resource_view.xml (+7/-9)
To merge this branch:	bzr merge lp:~openerp-dev/openobject-addons/trunk-improve-formviews-tpa
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2014-04-25	Pending
Review via email: mp+217231@code.launchpad.net