Browse Source

Merge pull request #152 from beescoop/12.0-fix-attendance-smart-button

[FIX] remove style in separator tag.
pull/153/head
Houssine BAKKALI 5 years ago
committed by GitHub
parent
commit
b27ba0669c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      beesdoo_shift_attendance/__manifest__.py
  2. 35
      beesdoo_shift_attendance/views/attendance_sheet.xml

2
beesdoo_shift_attendance/__manifest__.py

@ -18,7 +18,7 @@
'website': "https://github.com/beescoop/Obeesdoo",
'category': 'Cooperative management',
'version': '12.0.1.0.0',
'version': '12.0.1.0.1',
'depends': [
'beesdoo_base',

35
beesdoo_shift_attendance/views/attendance_sheet.xml

@ -157,13 +157,12 @@
attrs="{'invisible': [('state', '=', 'validated')]}"
/>
</header>
<sheet >
<sheet>
<div class="oe_button_box" name="button_box">
<button name="button_mark_as_read" type="object"
class="oe_stat_button" icon="fa-check"
string="Mark as read"
groups="beesdoo_shift.group_shift_attendance"
/>
groups="beesdoo_shift.group_shift_attendance"/>
<button name="toggle_active"
type="object"
groups="beesdoo_shift.group_shift_attendance"
@ -172,21 +171,21 @@
<field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
</button>
</div>
<separator string="Expected Shifts" style="position:relative;padding:0px;margin:0px;" />
<field name="expected_shift_ids" />
<separator string="Added Shifts" style="position:relative;padding:0px;margin-top:15px;margin-bottom:0px;" />
<field name="added_shift_ids" />
<group>
<field name="max_worker_no" />
</group>
<group string="Feedback"
groups="beesdoo_shift.group_shift_attendance">
<field name="attended_worker_no" />
<field name="notes" />
<field name="feedback" />
<field name="worker_nb_feedback" />
<field name="validated_by" readonly="True"/>
</group>
<separator string="Expected Shifts"/>
<field name="expected_shift_ids" />
<separator string="Added Shifts"/>
<field name="added_shift_ids" />
<group>
<field name="max_worker_no" />
</group>
<group string="Feedback"
groups="beesdoo_shift.group_shift_attendance">
<field name="attended_worker_no" />
<field name="notes" />
<field name="feedback" />
<field name="worker_nb_feedback" />
<field name="validated_by" readonly="True"/>
</group>
</sheet>
<div class="oe_chatter">
<field name="message_ids"

Loading…
Cancel
Save