pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] mrp: workorders redesign

Browse Source 
This patch is part of a complete rework of the workorder tablet view and general
work order processing experience. It's mainly done in the Enterprise
repo. In community: the changes are the follows:

 - The workorder kanban view remodeled
 - Prepare workorder productivity timer to work with employee

Task: 2427466
Part-of: odoo/odoo#91565
This commit is contained in:
William Henrotin
2022-09-13 10:30:00 +02:00
parent 1f8e265e43
commit 2c65e916fc
4 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/models/mrp_workorder.py
+1 -15
View File
@@ -711,7 +711,7 @@ class MrpWorkorder(models.Model):
'name': _('Scrap'),
'view_mode': 'form',
'res_model': 'stock.scrap',
'view_id': self.env.ref('stock.stock_scrap_form_view2').id,
'views': [(self.env.ref('stock.stock_scrap_form_view2').id, 'form')],
'type': 'ir.actions.act_window',
'context': {'default_company_id': self.production_id.company_id.id,
'default_workorder_id': self.id,
@@ -786,20 +786,6 @@ class MrpWorkorder(models.Model):
res[wo1].append(wo2)
return res
@api.model
def _prepare_component_quantity(self, move, qty_producing):
""" helper that computes quantity to consume (or to create in case of byproduct)
depending on the quantity producing and the move's unit factor"""
if move.product_id.tracking == 'serial':
uom = move.product_id.uom_id
else:
uom = move.product_uom
return move.product_uom._compute_quantity(
qty_producing * move.unit_factor,
uom,
round=False
)
def _prepare_timeline_vals(self, duration, date_start, date_end=False):
# Need a loss in case of the real time exceeding the expected
if not self.duration_expected or duration <= self.duration_expected:
addons/mrp/static/src/scss/mrp_workorder_kanban.scss
+24 -2
View File
@@ -1,5 +1,27 @@
.o_kanban_dashboard.o_kanban_renderer {
&.o_mrp_workorder_kanban,&.o_workcenter_kanban {
&.o_mrp_workorder_kanban {
.o_kanban_group:not(.o_column_folded) {
width: 400px + $o-kanban-group-padding;
}
.o_kanban_record {
flex-basis: 40%;
@include media-breakpoint-down(lg) {
flex-basis: 100%
}
}
.o_kanban_record_top {
justify-content: space-between;
.o_kanban_workorder_title {
flex-basis: 40%;
}
.o_kanban_workorder_date {
}
.o_kanban_workorder_status {
flex-basis: 20%;
}
}
}
&.o_workcenter_kanban {
.o_kanban_group:not(.o_column_folded) {
width: 400px + $o-kanban-group-padding;
}
@@ -7,4 +29,4 @@
width: 400px;
}
}
}
}
addons/mrp/views/mrp_routing_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<field name="time_mode" optional="show"/>
<field name="time_computed_on" optional="hide"/>
<field name="time_cycle" widget="float_time" string="Duration (minutes)" width="1.5"/>
<field name="company_id" optional="show" groups="base.group_multi_company"/>
<field name="company_id" optional="hide" groups="base.group_multi_company"/>
<field name="possible_bom_product_template_attribute_value_ids" invisible="1"/>
<field name="bom_product_template_attribute_value_ids" optional="hide" widget="many2many_tags" options="{'no_create': True}" groups="product.group_product_variant"/>
<field name="blocked_by_operation_ids" widget="many2many_tags" optional="hide" groups="mrp.group_mrp_workorder_dependencies"/>
addons/mrp/views/mrp_workorder_views.xml
+24 -16
View File
@@ -190,13 +190,12 @@
</field>
</page>
<page string="Time Tracking" name="time_tracking" groups="mrp.group_mrp_manager">
<group>
<field name="time_ids" nolabel="1" context="{'default_workcenter_id': workcenter_id, 'default_workorder_id': id}">
<tree editable="bottom">
<field name="user_id"/>
<field name="duration" widget="float_time" sum="Total duration"/>
<field name="date_start"/>
<field name="date_end"/>
<field name="duration" widget="float_time" sum="Total duration"/>
<field name="user_id"/>
<field name="workcenter_id" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="loss_id" string="Productivity" optional="hide"/>
@@ -218,7 +217,6 @@
</group>
</form>
</field>
</group>
</page>
<page string="Work Instruction" name="workorder_page_work_instruction" attrs="{'invisible': [('worksheet', '=', False), ('worksheet_google_slide', '=', False), ('operation_note', '=', False)]}">
<field name="worksheet_type" invisible="1"/>
@@ -405,15 +403,21 @@
<field name="workcenter_id"/>
<field name="product_id"/>
<field name="qty_remaining"/>
<field name="qty_production"/>
<field name="date_planned_start"/>
<field name="production_date"/>
<field name="product_uom_id" force_save="1"/>
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_global_click">
<div class="o_kanban_card_header o_kanban_record_top">
<div class="o_kanban_record_headings o_kanban_card_header_title">
<strong class="o_primary">
<span t-out="record.production_id.value"/> - <span t-out="record.name.value"/>
</strong>
<div class="o_kanban_workorder_title">
<h4 class="o_primary">
<span><t t-out="record.production_id.value"/></span> - <span><t t-out="record.name.value"/></span>
</h4>
</div>
<div class="o_kanban_workorder_date">
<h5><span class="d-flex" t-esc="record.date_planned_start.value or record.production_date.value"/></h5>
</div>
<div class="o_kanban_manage_button_section">
<h2 class="ml8">
@@ -425,15 +429,19 @@
</div>
<div class="o_kanban_record_bottom">
<h5 class="oe_kanban_bottom_left">
<span t-out="record.product_id.value"/>, <span t-out="record.qty_remaining.value"/> <span t-out="record.product_uom_id.value"/>
<span><t t-out="record.product_id.value"/>, </span> <span><t t-out="record.qty_production.value"/> <t t-out="record.product_uom_id.value"/></span>
</h5>
<div class="oe_kanban_bottom_right" t-if="record.state.raw_value == 'progress'">
<span t-if="record.working_state.raw_value != 'blocked' and record.working_user_ids.raw_value.length > 0"><i class="fa fa-play" role="img" aria-label="Run" title="Run"/></span>
<span t-if="record.working_state.raw_value != 'blocked' and record.working_user_ids.raw_value.length == 0 and record.last_working_user_id.raw_value"><i class="fa fa-pause" role="img" aria-label="Pause" title="Pause"/></span>
<span t-if="record.working_state.raw_value == 'blocked' and (record.working_user_ids.raw_value.length == 0 or record.last_working_user_id.raw_value)"><i class="fa fa-stop" role="img" aria-label="Stop" title="Stop"/></span>
<t t-if="record.last_working_user_id.raw_value">
<img t-att-src="kanban_image('res.users', 'avatar_128', record.last_working_user_id.raw_value)" class="oe_kanban_avatar" alt="Avatar"/>
</t>
<div class="o_kanban_workorder_status">
<div class="o_kanban_record_bottom">
<div class="oe_kanban_bottom_right" t-if="record.state.raw_value == 'progress'">
<span t-if="record.working_state.raw_value != 'blocked' and record.working_user_ids.raw_value.length > 0"><i class="fa fa-play" role="img" aria-label="Run" title="Run"/></span>
<span t-if="record.working_state.raw_value != 'blocked' and record.working_user_ids.raw_value.length == 0 and record.last_working_user_id.raw_value"><i class="fa fa-pause" role="img" aria-label="Pause" title="Pause"/></span>
<span t-if="record.working_state.raw_value == 'blocked' and (record.working_user_ids.raw_value.length == 0 or record.last_working_user_id.raw_value)"><i class="fa fa-stop" role="img" aria-label="Stop" title="Stop"/></span>
<t name="user_avatar" t-if="record.last_working_user_id.raw_value">
<img t-att-src="kanban_image('res.users', 'avatar_128', record.last_working_user_id.raw_value)" class="oe_kanban_avatar" alt="Avatar"/>
</t>
</div>
</div>
</div>
</div>
</div>