audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 34314daef0 7bc889f4bd
commit 3d5fbf7df7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintenance_timesheet/views/maintenance_views.xml
View File

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

4
maintenance_usage/views/maintenance_views.xml
View File

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