[FIX] delivery: do not overlap smart button

This commit is fixing two issues:
1: make ribbon translatable
2: display ribbon below smart button

closes #68438

closes odoo/odoo#69838

X-original-commit: cbed573e6146a0aab6e0e9114be515a347cd10a4
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
This commit is contained in:
Swapnesh Shah
2021-04-27 06:51:28 +00:00
parent 002cdcab0a
commit 67216355fd
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -157,6 +157,7 @@ msgid ""
msgstr ""
#. module: delivery
#: model_terms:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
#: model_terms:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
msgid "Archived"
msgstr ""
+1 -1
View File
@@ -36,7 +36,6 @@
<field name="arch" type="xml">
<form string="Carrier">
<sheet>
<widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<div class="oe_button_box" name="button_box">
<button name="toggle_prod_environment"
attrs="{'invisible': ['|', '|', ('prod_environment', '=', False), ('delivery_type', '=', 'fixed'), ('delivery_type', '=', 'base_on_rule')]}"
@@ -74,6 +73,7 @@
</div>
</button>
</div>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<div class="oe_title" name="title">
<label for="name" string="Shipping Method"/>
<h1>