Skip to content

Commit 7900e91

Browse files
divad1196divad1196
committed
WIP
1 parent 7986bfc commit 7900e91

2 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎stock_vertical_lift/static/src/scss/vertical_lift.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
}
6565

6666
.o_shuttle_data {
67+
display: flex;
68+
flex-flow: row wrap;
6769
padding: $o-shuttle-padding * 0.5;
6870

6971
.o_shuttle_data_content {

‎stock_vertical_lift/views/vertical_lift_operation_base_views.xml‎

Lines changed: 49 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -117,62 +117,55 @@
117117
</xpath>
118118
<xpath expr="//div[hasclass('o_shuttle_data')]" position="inside">
119119
<field name="current_move_line_id" invisible="True" force_save="1" />
120-
<div class="o_shuttle_data_content o_shuttle_move">
121-
<div>
122-
<group>
123-
<label for="picking_id" />
124-
<div>
125-
<div>
126-
<field
127-
name="picking_id"
128-
options="{'no_open': True}"
129-
class="oe_inline mr8"
130-
/>
131-
<span>/</span>
132-
<field
133-
name="picking_origin"
134-
class="oe_inline ml8"
135-
/>
136-
</div>
137-
</div>
138-
<label for="picking_partner_id" />
120+
<!-- on the left of the screen -->
121+
<div class="o_shuttle_data_content">
122+
<group>
123+
<label for="picking_id" />
124+
<div>
139125
<div>
140126
<field
141-
name="picking_partner_id"
127+
name="picking_id"
142128
options="{'no_open': True}"
129+
class="oe_inline mr8"
143130
/>
144-
</div>
145-
<label for="location_dest_id" />
146-
<div>
147-
<field
148-
name="location_dest_id"
149-
class="bg-primary o_shuttle_highlight text-white"
150-
readonly="1"
151-
force_save="1"
152-
options="{'no_open': True}"
153-
/>
154-
</div>
155-
<label for="product_id" />
156-
<div>
131+
<span>/</span>
157132
<field
158-
name="product_id"
159-
options="{'no_open': True}"
160-
class="fw-bold fs-1"
133+
name="picking_origin"
134+
class="oe_inline ml8"
161135
/>
162136
</div>
163-
</group>
164-
</div>
165-
</div>
166-
<div class="o_shuttle_data_content o_shuttle_move">
167-
<!-- on the left of the screen -->
168-
<div>
137+
</div>
138+
<label for="picking_partner_id" />
139+
<div>
140+
<field
141+
name="picking_partner_id"
142+
options="{'no_open': True}"
143+
/>
144+
</div>
145+
<label for="location_dest_id" />
146+
<div>
147+
<field
148+
name="location_dest_id"
149+
class="bg-primary o_shuttle_highlight text-white"
150+
readonly="1"
151+
force_save="1"
152+
options="{'no_open': True}"
153+
/>
154+
</div>
155+
<field
156+
name="product_id"
157+
class="h1"
158+
options="{'no_open': True}"
159+
/>
160+
</group>
161+
<group>
169162
<group>
170163
<div colspan="2">
171164
<field name="product_packagings" />
172165
</div>
173166
<field name="lot_id" />
174167
<label for="quantity" string="Quantity" class="ml32" />
175-
<div colspan="2" class="ml32">
168+
<div class="ml32">
176169
<h1 class="bg-primary o_shuttle_highlight">
177170
<field
178171
name="quantity"
@@ -186,30 +179,21 @@
186179
</h1>
187180
</div>
188181
</group>
189-
</div>
190-
<!-- on the right of the screen -->
191-
<div
192-
class="o_shuttle_data_content o_shuttle_tray"
193-
invisible="not tray_type_id"
194-
>
195-
<group col="1">
196-
<field name="tray_name" />
197-
<field name="tray_type_code" />
198-
<field name="tray_x" />
199-
<field name="tray_y" />
200-
<label for="tray_qty" />
201-
<div colspan="2" class="oe_title">
202-
<h1>
203-
<field name="tray_qty" />
204-
</h1>
205-
</div>
206-
</group>
182+
<!-- on the right of the screen -->
207183
<group>
208-
<div>
209-
<field name="tray_matrix" widget="location_tray_matrix" />
210-
</div>
184+
185+
<group>
186+
<field name="tray_qty" />
187+
</group>
188+
<field name="tray_matrix" widget="location_tray_matrix" />
189+
<group style="width: 80%; display: grid; grid-template-columns: repeat(4, 1fr);">
190+
<field name="tray_x" />
191+
<field name="tray_name" />
192+
<field name="tray_y" />
193+
<field name="tray_type_code" />
194+
</group>
211195
</group>
212-
</div>
196+
</group>
213197
</div>
214198
</xpath>
215199
</field>

0 commit comments

Comments
 (0)