audrius/stock-rma
1
0
Fork 0
mirror of https://github.com/ForgeFlow/stock-rma.git synced 2025-01-21 12:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #572 from ForgeFlow/17.0-imp-rma

Browse Source 
[17.0][IMP] rma: update configuration view
This commit is contained in:
Lois Rilo
2025-01-10 15:12:54 +01:00
committed by GitHub
parent f57de50427 6eacb6d5ab
commit a0d341ec1f
3 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rma/views/res_config_settings_views.xml
View File

@@ -8,56 +8,33 @@
<field name="inherit_id" ref="base.res_config_settings_view_form" /> <field name="inherit_id" ref="base.res_config_settings_view_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//form" position="inside"> <xpath expr="//form" position="inside">
<div <app
class="app_settings_block"
data-string="RMA"
string="RMA" string="RMA"
data-key="rma" data-string="RMA"
name="rma"
groups="rma.group_rma_manager" groups="rma.group_rma_manager"
> >
<h2>Return Merchandise Authorization</h2> <block
<div class="row mt16 o_settings_container"> title="Return Merchandise Authorization"
<div name="return_merchandise_authorization"
name="rma_delivery_address" >
class="col-12 col-lg-6 o_setting_box" <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" />
<field name="group_rma_delivery_address" /> </setting>
</div> <setting
<div class="o_setting_right_pane"> id="group_rma_lines"
<label for="group_rma_delivery_address" /> help="Group RMA lines in one RMA group"
<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"
> >
<div class="o_setting_left_pane"> <field name="group_rma_lines" />
<field name="group_rma_lines" /> </setting>
</div> <setting id="module_rma_account" help="Enable RMA invoicing">
<div class="o_setting_right_pane"> <field name="module_rma_account" />
<label for="group_rma_lines" /> </setting>
<div class="text-muted"> </block>
Group RMA lines in one RMA group </app>
</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>
</xpath> </xpath>
</field> </field>
</record> </record>

2
rma_reason_code/README.rst
View File

@@ -51,7 +51,7 @@ Authors
Contributors Contributors
------------ ------------
- David Jiménez <david.jimenez@forgeflow.com> - David Jiménez <david.jimenez@forgeflow.com>
Maintainers Maintainers
----------- -----------

7
rma_reason_code/static/description/index.html
View File

@@ -8,10 +8,11 @@
/* /*
:Author: David Goodger (goodger@python.org) :Author: David Goodger (goodger@python.org)
: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. :Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils. 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 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet. customize this style sheet.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ; margin-left: 2em ;
margin-right: 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, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 } pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@ span.option {
span.pre { span.pre {
white-space: pre } white-space: pre }
span.problematic { span.problematic, pre.problematic {
color: red } color: red }
span.section-subtitle { span.section-subtitle {