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!1758
This commit is contained in:
Jared Kipe
2024-11-09 00:43:50 +00:00
parent a1b89200c5 bf62fb92db
commit 424c5f2d12
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maintenance_usage/models/maintenance.py
View File

@@ -1,5 +1,6 @@
from math import floor from math import floor
from odoo import _, api, fields, models from odoo import _, api, fields, models
from odoo.tools import get_timedelta
class MaintenanceEquipmentCategory(models.Model): class MaintenanceEquipmentCategory(models.Model):
@@ -27,8 +28,8 @@ class MaintenanceEquipment(models.Model):
def _compute_period(self): def _compute_period(self):
for equipment in self: for equipment in self:
recurring = equipment.maintenance_ids.filtered('recurring_maintenance') recurring = equipment.maintenance_ids.filtered('repeat_unit')
equipment.period = min(recurring.mapped('period'), default=0) equipment.period = min([get_timedelta(r.repeat_interval, r.repeat_unit).days for r in recurring], default=0)
@api.model @api.model
def create(self, values): def create(self, values):

9
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="//form/sheet/group/group[1]" position="inside"> <xpath expr="//field[@name='equipment_assign_to']/.." 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"/>
@@ -38,8 +38,11 @@
<xpath expr="//group[@name='statistics']" position="inside"> <xpath expr="//group[@name='statistics']" position="inside">
<field name="maintenance_usage"/> <field name="maintenance_usage"/>
</xpath> </xpath>
<xpath expr="//field[@name='mttr']" position="after"> <xpath expr="//field[@name='mttr']/.." position="after">
<field name="period"/> <label for="period"/>
<div class="o_row">
<field name="period" /> days
</div>
</xpath> </xpath>
<xpath expr="//field[@name='maintenance_team_id']" position="attributes"> <xpath expr="//field[@name='maintenance_team_id']" position="attributes">
<attribute name="required">period != 0 or maintenance_usage != 0</attribute> <attribute name="required">period != 0 or maintenance_usage != 0</attribute>