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

[FW][FIX] stock, purchase{,_requisition}: Fix visual layout for forms

Browse Source 
Description of the issue/feature this PR addresses:
1. Adapts the layout of the `Alternatives` tab of the purchase order form to the new grid system.
2. Fixes display of the confirmation mail for receipts in the purchase order form.
3. Adapts the layout of the backorder confirmation wizard to the new grid system.
A few fixes of the visuals of the Purchase Order form.

Current behavior before PR:
Alternatives RFQ:
![2022-10-04_09-54-07](https://user-images.githubusercontent.com/18055894/194296728-849e9693-c4d5-42d9-83b5-576de54eecf2.png)

Confirmation before arrival:
![image](https://user-images.githubusercontent.com/18055894/194297447-328d640f-387a-43e6-b59d-cb8ab707be82.png)

Backorder confirmation:
![image](https://user-images.githubusercontent.com/18055894/194311631-d7228eba-57d8-48cc-9dae-659d9e4aef99.png)

Desired behavior after PR is merged:
Alternatives RFQ:
![image](https://user-images.githubusercontent.com/18055894/194297724-e93654e5-b8ac-4e00-b1ca-569b35bc6337.png)

Confirmation before arrival:
![image](https://user-images.githubusercontent.com/18055894/194297503-d846d7c6-8bfb-41d7-92fd-14552a9bdc17.png)

Backorder confirmation:
![image](https://user-images.githubusercontent.com/18055894/194311451-d50e39d7-46f4-4f56-bc76-27f8daeeb149.png)

closes odoo/odoo#102495

Forward-port-of: odoo/odoo#102431
Signed-off-by: Tiffany Chang <tic@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
This commit is contained in:
Odoo's Mergebot
2022-10-06 19:59:09 +02:00
committed by GitHub
parent 44f5d4d986 320d81d5d3
commit 28d3c06aff
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/views/purchase_views.xml
+2 -2
View File
@@ -193,12 +193,12 @@
<field name="mail_reminder_confirmed" invisible="1"/>
<span class="text-muted" attrs="{'invisible': [('mail_reminder_confirmed', '=', False)]}">(confirmed by vendor)</span>
</div>
<label for="receipt_reminder_email" invisible='1'/>
<label for="receipt_reminder_email" class="d-none"/>
<div name="reminder" class="o_row" groups='purchase.group_send_reminder' title="Automatically send a confirmation email to the vendor X days before the expected receipt date, asking him to confirm the exact date.">
<field name="receipt_reminder_email"/>
<span>Ask confirmation</span>
<div class="o_row oe_inline" attrs="{'invisible': [('receipt_reminder_email', '=', False)]}">
<field name="reminder_date_before_receipt" class="oe_inline"/>
<field name="reminder_date_before_receipt"/>
day(s) before
<widget name='toaster_button' button_name="send_reminder_preview" title="Preview the reminder email by sending it to yourself." attrs="{'invisible': [('id', '=', False)]}"/>
</div>
addons/purchase_requisition/views/purchase_views.xml
+2 -2
View File
@@ -17,12 +17,12 @@
<page string="Alternatives" name="alternative_pos">
<group>
<group>
<p>Create a call for tender by adding alternative request for quotations to different vendors.
<p colspan="2">Create a call for tender by adding alternative request for quotations to different vendors.
Make your choice by selecting the best combination of lead time, OTD and/or total amount.
By comparing product lines you can also decide to order some products from one vendor and others from another vendor.</p>
</group>
<group>
<p>
<p colspan="2">
<button name="action_create_alternative" type="object" class="btn-link d-block" string="Create Alternative" icon="fa-copy" attrs="{'invisible': [('id', '=', False)]}" />
<button name="action_compare_alternative_lines" type="object" class="btn-link d-block" string="Compare Product Lines" icon="fa-bar-chart" attrs="{'invisible': [('alternative_po_ids', '=', [])]}"/>
</p>
addons/stock/wizard/stock_backorder_confirmation_views.xml
+12 -7
View File
@@ -6,13 +6,18 @@
<field name="arch" type="xml">
<form string="Backorder creation">
<group>
<div><p name="explanation-text">
You have processed less products than the initial demand.
</p></div><div class="text-muted">
Create a backorder if you expect to process the remaining
products later. Do not create a backorder if you will not
process the remaining products.
</div>
<group>
<div colspan="2"><p name="explanation-text">
You have processed less products than the initial demand.
</p></div>
</group>
<group>
<div colspan="2" class="text-muted">
Create a backorder if you expect to process the remaining
products later. Do not create a backorder if you will not
process the remaining products.
</div>
</group>
</group>
<!-- Added to ensure a correct default_get behavior