|
@@ -25,14 +25,12 @@
|
|
</group>
|
|
</group>
|
|
<group>
|
|
<group>
|
|
<group>
|
|
<group>
|
|
- <field name="user_id" string="Funcionario"/>
|
|
|
|
|
|
+ <field name="user_id" string="Funcionario" required="1"/>
|
|
<field name="date" string="Fecha"/>
|
|
<field name="date" string="Fecha"/>
|
|
<field name="date_reserve" string="Fecha Reservada"/>
|
|
<field name="date_reserve" string="Fecha Reservada"/>
|
|
</group>
|
|
</group>
|
|
<group>
|
|
<group>
|
|
<field name="place" string="Lugar"/>
|
|
<field name="place" string="Lugar"/>
|
|
- <!-- <field name="work_date" string="Fecha"/>
|
|
|
|
- <field name="work_cost" string="Costo"/> -->
|
|
|
|
</group>
|
|
</group>
|
|
</group>
|
|
</group>
|
|
</sheet>
|
|
</sheet>
|
|
@@ -65,39 +63,38 @@
|
|
<field name="arch" type="xml">
|
|
<field name="arch" type="xml">
|
|
<calendar color="user_id" date_start="date_reserve" string="Reserva">
|
|
<calendar color="user_id" date_start="date_reserve" string="Reserva">
|
|
<field name="place"/>
|
|
<field name="place"/>
|
|
- <field name="user_id"/>
|
|
|
|
|
|
+ <field name="name"/>
|
|
</calendar>
|
|
</calendar>
|
|
</field>
|
|
</field>
|
|
</record>
|
|
</record>
|
|
|
|
|
|
<!-- Search -->
|
|
<!-- Search -->
|
|
|
|
|
|
- <!-- <record model="ir.ui.view" id="project_service_activity_search">
|
|
|
|
- <field name="name">project.service.activity.search</field>
|
|
|
|
- <field name="model">project.service.activity</field>
|
|
|
|
|
|
+ <record model="ir.ui.view" id="project_service_reserve_search">
|
|
|
|
+ <field name="name">project.service.reserve.search</field>
|
|
|
|
+ <field name="model">project.service.reserve</field>
|
|
<field name="arch" type="xml">
|
|
<field name="arch" type="xml">
|
|
- <search string="Actividades">
|
|
|
|
- <field name="name" string="Actividad"/>
|
|
|
|
|
|
+ <search string="Reservas">
|
|
<field name="user_id" string="Responsable"/>
|
|
<field name="user_id" string="Responsable"/>
|
|
- <field name="task_id" string="Tarea"/>
|
|
|
|
- <filter string="Mis Actividades" domain="[('user_id','=',uid)]"/>
|
|
|
|
|
|
+ <field name="place" string="Lugar"/>
|
|
|
|
+ <filter string="Mis Reservas" domain="[('user_id','=',uid)]"/>
|
|
<separator/>
|
|
<separator/>
|
|
- <filter string="Terminados" name="End" domain="[('completed','=',1)]"/>
|
|
|
|
- <filter string="Pendientes" name="Pending" domain="[('completed','=',0)]"/>
|
|
|
|
- <filter string="Hoy" domain="[('work_date', '>=', datetime.datetime.now().strftime('%Y-%m-%d 00:00:00')),('work_date', '<=',datetime.datetime.now().strftime('%Y-%m-%d 23:23:59'))]"/>
|
|
|
|
- <filter string="Ayer" domain="[('work_date','<=', (datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d')),('work_date','>=',(datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d'))]"/>
|
|
|
|
- <filter string="Esta semana" domain="[('work_date', '>=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))),('work_date', '<=', ((context_today()+relativedelta(weeks=0, weekday=6)).strftime('%%Y-%%m-%%d')))]"/>
|
|
|
|
- <filter string="Mes actual" domain="[('work_date','<',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('work_date','>=',time.strftime('%%Y-%%m-01'))]"/>
|
|
|
|
- <filter string="Mes pasado" domain="[('work_date','>=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')),('work_date','<',time.strftime('%%Y-%%m-01'))]"/>
|
|
|
|
|
|
+ <filter string="Terminados" name="End" domain="[('state','=','done')]"/>
|
|
|
|
+ <filter string="Pendientes" name="Pending" domain="[('state','=','confirmed')]"/>
|
|
|
|
+ <filter string="Hoy" domain="[('date_reserve', '>=', datetime.datetime.now().strftime('%Y-%m-%d 00:00:00')),('date_reserve', '<=',datetime.datetime.now().strftime('%Y-%m-%d 23:23:59'))]"/>
|
|
|
|
+ <filter string="Ayer" domain="[('date_reserve','<=', (datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d')),('date_reserve','>=',(datetime.date.today()-relativedelta(days=1)).strftime('%%Y-%%m-%%d'))]"/>
|
|
|
|
+ <filter string="Esta semana" domain="[('date_reserve', '>=', ((context_today()+relativedelta(weeks=-1, days=1, weekday=0)).strftime('%%Y-%%m-%%d'))),('date_reserve', '<=', ((context_today()+relativedelta(weeks=0, weekday=6)).strftime('%%Y-%%m-%%d')))]"/>
|
|
|
|
+ <filter string="Mes actual" domain="[('date_reserve','<',(context_today()+relativedelta(months=1)).strftime('%%Y-%%m-01')), ('date_reserve','>=',time.strftime('%%Y-%%m-01'))]"/>
|
|
|
|
+ <filter string="Mes pasado" domain="[('date_reserve','>=',(context_today()-relativedelta(months=1)).strftime('%%Y-%%m-01')),('date_reserve','<',time.strftime('%%Y-%%m-01'))]"/>
|
|
<separator/>
|
|
<separator/>
|
|
<group expand="0" string="Agrupar por ">
|
|
<group expand="0" string="Agrupar por ">
|
|
- <filter string="Tarea" name="task" context="{'group_by':'task_id'}"/>
|
|
|
|
<filter string="Responsables" name="User" context="{'group_by':'user_id'}"/>
|
|
<filter string="Responsables" name="User" context="{'group_by':'user_id'}"/>
|
|
|
|
+ <filter string="Cliente" name="Customer" context="{'group_by':'partner_id'}"/>
|
|
<separator/>
|
|
<separator/>
|
|
</group>
|
|
</group>
|
|
</search>
|
|
</search>
|
|
</field>
|
|
</field>
|
|
- </record> -->
|
|
|
|
|
|
+ </record>
|
|
|
|
|
|
<!-- action -->
|
|
<!-- action -->
|
|
|
|
|
|
@@ -106,6 +103,8 @@
|
|
<field name="res_model">project.service.reserve</field>
|
|
<field name="res_model">project.service.reserve</field>
|
|
<field name="view_type">form</field>
|
|
<field name="view_type">form</field>
|
|
<field name="view_mode">calendar,tree,form</field>
|
|
<field name="view_mode">calendar,tree,form</field>
|
|
|
|
+ <field name="search_view_id" ref="project_service_reserve_search"/>
|
|
|
|
+ <field name="context">{'search_default_Pending': 1}</field>
|
|
</record>
|
|
</record>
|
|
|
|
|
|
<!-- menus -->
|
|
<!-- menus -->
|