Skip to content

Commit

Permalink
[FIX] stock: UI issue at confirmation
Browse files Browse the repository at this point in the history 
Currently after confirmation on picking. The details operations button
is mixed in the trash icon. The view needs a refresh to be correct.

This is cleaned by moving all the buttons together and introducing the
custom column before the last buttons group.

Part-of: odoo#140663
  • Loading branch information
@amoyaux
amoyaux committed Nov 3, 2023
1 parent 548198e commit e518dc9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions addons/mrp/views/mrp_production_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,6 @@
<field name="show_reserved" column_invisible="True"/>
<field name="forecast_expected_date" column_invisible="True"/>
<!-- Button are used in state draft to doesn't have the name of the column "Reserved"-->
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart" column_invisible="parent.state != 'draft'" invisible="forecast_availability &lt; 0"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger" column_invisible="parent.state != 'draft'" invisible="forecast_availability &gt;= 0"/>
<!-- TODO put forecast back -->
<field name="forecast_availability" string="Forecast" widget="forecast_widget"/>
<field name="quantity" string="Quantity"
decoration-success="product_uom_qty - quantity &gt; 0.0001"
Expand All @@ -410,6 +407,9 @@
readonly="has_tracking != 'none'"
force_save="1" widget="mrp_consumed"/>
<field name="product_uom" readonly="state != 'draft' and id" options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart" column_invisible="parent.state != 'draft'" invisible="forecast_availability &lt; 0"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger" column_invisible="parent.state != 'draft'" invisible="forecast_availability &gt;= 0"/>
<!-- TODO put forecast back -->
<field name="picked" string="Consumed" column_invisible="parent.state == 'draft'" optional="hide"/>
<field name="manual_consumption" column_invisible="True" force_save="1"/>
<field name="show_details_visible" column_invisible="True"/>
Expand Down
4 changes: 2 additions & 2 deletions addons/repair/views/repair_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@
<field name="product_packaging_id" groups="product.group_stock_packaging"/>
<field name="product_uom_qty" string="Demand" readonly="state in ('done', 'cancel')"/>
<field name="forecast_expected_date" column_invisible="True"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart" column_invisible="parent.state != 'draft'" invisible="forecast_availability &lt; 0 and repair_line_type == 'add'"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger" column_invisible="parent.state != 'draft'" invisible="forecast_availability &gt;= 0 or repair_line_type != 'add'"/>
<field name="forecast_availability" string="Reserved" column_invisible="parent.state in ('draft', 'done')" widget="forecast_widget"/>
<field name="product_qty" readonly="1" column_invisible="True"/>
<field name="quantity" string="Done" readonly="not product_id"/>
Expand All @@ -173,6 +171,8 @@
optional="hide"
context="{'default_company_id': company_id, 'default_product_id': product_id}"
domain="[('product_id','=',product_id)]"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart" column_invisible="parent.state != 'draft'" invisible="forecast_availability &lt; 0 and repair_line_type == 'add'"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger" column_invisible="parent.state != 'draft'" invisible="forecast_availability &gt;= 0 or repair_line_type != 'add'"/>
<button name="action_show_details" type="object" icon="fa-list" width="0.1" title="Details"
invisible="not show_details_visible" options='{"warn": true}'
context="{'default_location_dest_id': location_dest_id}"
Expand Down
3 changes: 2 additions & 1 deletion addons/stock/static/src/views/picking_form/stock_move_one2many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export class MovesListRenderer extends ListRenderer {
processAllColumn(allColumns, list) {
let cols = super.processAllColumn(...arguments);
if (list.resModel === "stock.move") {
cols.push({
const index = cols.findLastIndex((col) => col.type === "button_group");
cols.splice(index, 0, {
type: 'opendetailsop',
id: `column_detailOp_${cols.length}`,
column_invisible: 'parent.state=="draft"',
Expand Down
8 changes: 4 additions & 4 deletions addons/stock/views/stock_picking_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,6 @@
context="{'default_product_id': product_id}"
readonly="not product_id"/>
<field name="product_uom_qty" string="Demand" readonly="not is_initial_demand_editable"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart"
invisible="quantity == 0 and forecast_availability &lt;= 0 or (parent.picking_type_code == 'outgoing' and state != 'draft')"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger"
invisible="quantity &gt; 0 or forecast_availability &gt; 0 or (parent.picking_type_code == 'outgoing' and state != 'draft')"/>
<field name="forecast_expected_date" column_invisible="True"/>
<field name="forecast_availability" string="Forecast" optional="hide"
column_invisible="parent.state in ('draft', 'done') or parent.picking_type_code != 'outgoing'" widget="forecast_widget"/>
Expand All @@ -338,6 +334,10 @@
icon="fa-plus-square"
role="img" title="Assign Serial Numbers"
invisible="not display_assign_serial or not show_operations"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart"
invisible="quantity == 0 and forecast_availability &lt;= 0 or (parent.picking_type_code == 'outgoing' and state != 'draft')"/>
<button type="object" name="action_product_forecast_report" title="Forecast Report" icon="fa-area-chart text-danger"
invisible="quantity &gt; 0 or forecast_availability &gt; 0 or (parent.picking_type_code == 'outgoing' and state != 'draft')"/>
</tree>
</field>
<field name="id" invisible="1"/>
Expand Down

0 comments on commit e518dc9

Please sign in to comment.