diff options
| author | Swapnesh Shah <swapneshshah111@gmail.com> | 2021-03-28 18:33:58 +0000 |
|---|---|---|
| committer | Swapnesh Shah <swapneshshah111@gmail.com> | 2021-04-26 08:26:14 +0000 |
| commit | cbed573e6146a0aab6e0e9114be515a347cd10a4 (patch) | |
| tree | f946de0d7b3177aaddadf30965ad9a56e13728e3 | |
| parent | 2279d84b4aefc8e488ccc33c30b816e988867589 (diff) | |
[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#69815
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
| -rw-r--r-- | addons/delivery/i18n/delivery.pot | 1 | ||||
| -rw-r--r-- | addons/delivery/views/delivery_view.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index d68bf61db2b..9e5bfc6eb3d 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -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 "" diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index bac707d6121..a0872651c0c 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -49,7 +49,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')]}" @@ -87,6 +86,7 @@ </div> </button> </div> + <widget name="web_ribbon" text="Archived" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <div class="oe_title" name="title"> <label for="name" string="Name" class="oe_edit_only"/> <h1> |