Skip to content

Commit

Permalink
Merge pull request #572 from ForgeFlow/17.0-imp-rma
Browse files Browse the repository at this point in the history
[17.0][IMP] rma: update configuration view
  • Loading branch information
LoisRForgeFlow authored Jan 10, 2025
2 parents f57de50 + 6eacb6d commit a0d341e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 49 deletions.
67 changes: 22 additions & 45 deletions rma/views/res_config_settings_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,33 @@
<field name="inherit_id" ref="base.res_config_settings_view_form" />
<field name="arch" type="xml">
<xpath expr="//form" position="inside">
<div
class="app_settings_block"
data-string="RMA"
<app
string="RMA"
data-key="rma"
data-string="RMA"
name="rma"
groups="rma.group_rma_manager"
>
<h2>Return Merchandise Authorization</h2>
<div class="row mt16 o_settings_container">
<div
name="rma_delivery_address"
class="col-12 col-lg-6 o_setting_box"
<block
title="Return Merchandise Authorization"
name="return_merchandise_authorization"
>
<setting
id="rma_delivery_address"
help="Display 3 fields on rma: partner, invoice address, delivery address"
>
<div class="o_setting_left_pane">
<field name="group_rma_delivery_address" />
</div>
<div class="o_setting_right_pane">
<label for="group_rma_delivery_address" />
<div class="text-muted">
Display 3 fields on rma: partner, invoice address, delivery address
</div>
</div>
</div>
<div
name="group_rma_lines"
class="col-12 col-lg-6 o_setting_box"
<field name="group_rma_delivery_address" />
</setting>
<setting
id="group_rma_lines"
help="Group RMA lines in one RMA group"
>
<div class="o_setting_left_pane">
<field name="group_rma_lines" />
</div>
<div class="o_setting_right_pane">
<label for="group_rma_lines" />
<div class="text-muted">
Group RMA lines in one RMA group
</div>
</div>
</div>
<div name="rma_account" class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_rma_account" />
</div>
<div class="o_setting_right_pane">
<label for="module_rma_account" />
<div class="text-muted">
Enable RMA invoicing
</div>
</div>
</div>
</div>
</div>
<field name="group_rma_lines" />
</setting>
<setting id="module_rma_account" help="Enable RMA invoicing">
<field name="module_rma_account" />
</setting>
</block>
</app>
</xpath>
</field>
</record>
Expand Down
2 changes: 1 addition & 1 deletion rma_reason_code/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Authors
Contributors
------------

- David Jiménez <[email protected]>
- David Jiménez <[email protected]>

Maintainers
-----------
Expand Down
7 changes: 4 additions & 3 deletions rma_reason_code/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down

0 comments on commit a0d341e

Please sign in to comment.