diff --git a/views/calendar.xml b/views/calendar.xml index 50ac1ab0901e1a1560f39712ab7ea65d4b7acf00..9a11083a71d6168128ccc9176add41d069e90fa7 100644 --- a/views/calendar.xml +++ b/views/calendar.xml @@ -4,6 +4,10 @@ <odoo> <data> + + <!-- ****************************** + *** Inherited Views + ****************************** --> <!-- Agenda Tree View --> <record id="view_calendar_cooperative_tree_inherited" model="ir.ui.view"> @@ -25,6 +29,7 @@ <field name="type"/> <field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_financial_system_nb', '>', 0)], 'invisible':[('ur_financial_system_nb', '<', 1)]}"/> <field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '<', 1)]}"/> + <field name="is_transfered" /> </field> </field> </record> @@ -50,7 +55,8 @@ type="object" name="create_timesheet" class="oe_highlight" - attrs="{'invisible': ['|', ('project_id', '=', False), ('coop_id', '=', False)]}"/> + attrs="{'invisible': + ['|', '|', '|', ('project_id', '=', False), ('coop_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/> </header> </sheet> <!-- Boutons --> @@ -60,6 +66,13 @@ <!-- Titre --> <div class="oe_title" position="replace"> + <div class="oe_button_box" name="button_box" modifiers="{}"> + <button name="do_accept" string="Accepter" states="needsAction,tentative,declined" type="object" icon="fa-check"> + </button> + <button name="do_decline" string="Refuser" states="needsAction,tentative,accepted" type="object" icon="fa-times-circle"/> + <button name="do_tentative" widget="boolean_button" class="oe_stat_button" states="needsAction,declined,accepted" string="Incertain" type="object" icon="fa-circle"> + </button> + </div> <div class="oe_title" > <div class="oe_edit_only"> <label for="name"/> @@ -74,6 +87,9 @@ <notebook position="before"> <group name="event_info" col="1"> <group> + <field name="state"/> + <field name="is_transfered" widget="toggle_button"/> + <field name="is_attendee" invisible="1"/> <field name="project_id" options="{'no_open': True, 'no_create': True}"/> <field name="coop_id" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/> <field name="ur_id" invisible="1"/> @@ -179,10 +195,11 @@ <field name="partner_ids" position="before"> <field name="ur_id" invisible="1"/> <field name="coop_id" options="{'no_open': True, 'no_create': True}"/> + <field name="type" options="{'no_open': True, 'no_create': True}"/> + <field name="attendees_initial"/> </field> <field name="partner_ids" position="attributes"> <attribute name="domain">[('user_ids', '!=', False), ('ur_id', '=', ur_id)]</attribute> - <field name="type" options="{'no_open': True, 'no_create': True}"/> </field> </field> </record> @@ -211,5 +228,6 @@ </field> </record> + </data> </odoo>