Merge branch 'mig/17.0/maintenance_usage' into '17.0'

WIP: mig/17.0/maintenance_usage into 17.0

See merge request hibou-io/hibou-odoo/suite!1761
This commit is contained in:
Jared Kipe
2024-11-11 17:32:55 +00:00
2 changed files with 5 additions and 5 deletions

View File

@@ -35,12 +35,12 @@
<field name="timesheet_ids" context="{'default_project_id': project_id}">
<tree editable="bottom" string="Timesheet Activities" default_order="date">
<field name="date"/>
<field name="user_id" invisible="1"/>
<!-- <field name="user_id" invisible="True"/> -->
<field name="employee_id" required="1"/>
<field name="name"/>
<field name="unit_amount" string="Duration" widget="float_time"/>
<field name="project_id" invisible="1"/>
<field name="company_id" invisible="1"/>
<!-- <field name="project_id" invisible="True"/> -->
<!-- <field name="company_id" invisible="True"/> -->
</tree>
</field>
<group>

View File

@@ -28,7 +28,7 @@
<field string="Usage" name="usage_count" widget="statinfo"/>
</button>
</xpath>
<xpath expr="//field[@name='equipment_assign_to']/.." position="inside">
<xpath expr="//field[@name='location']/.." position="inside">
<label for="usage_qty"/>
<div class="o_row" name="usage">
<field name="usage_qty" nolabel="1"/>
@@ -83,7 +83,7 @@
<field name="employee_id"/>
<field name="department_id"/>
</group>
<group name="usage_info" string="Usage">
<group name="usage_info">
<label for="qty"/>
<div class="o_row" name="usage">
<field name="qty" nolabel="1"/>