Skip to content

Commit 265be62

Browse files
[IMP] carrier_account_environment: pre-commit auto fixes
1 parent aadc1cb commit 265be62

File tree

10 files changed

+121
-106
lines changed

10 files changed

+121
-106
lines changed

carrier_account_environment/README.rst

+43-39
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ Carrier accounts configuration with server_environment
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20-
:target: https://github.com/OCA/delivery-carrier/tree/16.0/carrier_account_environment
20+
:target: https://github.com/OCA/delivery-carrier/tree/18.0/carrier_account_environment
2121
:alt: OCA/delivery-carrier
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-carrier_account_environment
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-carrier_account_environment
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=16.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
3030

31-
This module allows to configure carrier informations
32-
using the `server_environment` mechanism: you can then have different
33-
servers for the production and the test environment.
31+
This module allows to configure carrier informations using the
32+
server_environment mechanism: you can then have different servers for
33+
the production and the test environment.
3434

3535
**Table of contents**
3636

@@ -40,77 +40,81 @@ servers for the production and the test environment.
4040
Configuration
4141
=============
4242

43-
With this module installed, the delivery carrier are
44-
configured in the `server_environment_files` module (which is a module
45-
you should provide, see the documentation of `server_environment` for
46-
more information).
43+
With this module installed, the delivery carrier are configured in the
44+
server_environment_files module (which is a module you should provide,
45+
see the documentation of server_environment for more information).
4746

4847
In the configuration file of each environment, you may first use the
49-
section `[carrier_account]`.
48+
section [carrier_account].
5049

5150
Then for each server, you can define additional values or override the
52-
default values with a section named `[carrier_account.resource_name]` where "resource_name" is the name of the server.
51+
default values with a section named [carrier_account.resource_name]
52+
where "resource_name" is the name of the server.
5353

54-
Example of config file ::
54+
Example of config file :
5555

56+
::
5657

57-
[carrier_account]
58-
# here is the default format
59-
file_format = 'ZPL'
58+
[carrier_account]
59+
# here is the default format
60+
file_format = 'ZPL'
6061

6162

62-
[carrier_account.mycarrier]
63-
name = mycarrier
64-
account = 587
65-
password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses
63+
[carrier_account.mycarrier]
64+
name = mycarrier
65+
account = 587
66+
password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses
6667

6768

68-
[carrier_account.mycarrier2]
69-
name = mycarrier2
70-
account = 666
71-
password = wazaaaaa
72-
file_format = PDF
69+
[carrier_account.mycarrier2]
70+
name = mycarrier2
71+
account = 666
72+
password = wazaaaaa
73+
file_format = PDF
7374

74-
75-
As an alternative of `server_environment_files`, there is also a module named `server_environment_data_encryption`
76-
which allow to set the environement dependent values directly in the database, by the user itself.
77-
It will be encrypted, to avoid security issues with secrets, see the documentationn of `server_environment_data_encryption` for more information.
78-
The advantage of setting the environment dependent value directly in the database is that it does not require a developper/odoo administrator to change a carrier account.
75+
As an alternative of server_environment_files, there is also a module
76+
named server_environment_data_encryption which allow to set the
77+
environement dependent values directly in the database, by the user
78+
itself. It will be encrypted, to avoid security issues with secrets, see
79+
the documentationn of server_environment_data_encryption for more
80+
information. The advantage of setting the environment dependent value
81+
directly in the database is that it does not require a developper/odoo
82+
administrator to change a carrier account.
7983

8084
Usage
8185
=====
8286

8387
Once configured, Odoo will read the carrier values from the
84-
configuration file related to each environment defined in the main
85-
Odoo file or in carrier.account model.
88+
configuration file related to each environment defined in the main Odoo
89+
file or in carrier.account model.
8690

8791
Bug Tracker
8892
===========
8993

9094
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
9195
In case of trouble, please check there if your issue has already been reported.
9296
If you spotted it first, help us to smash it by providing a detailed and welcomed
93-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20carrier_account_environment%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
97+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20carrier_account_environment%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
9498

9599
Do not contact contributors directly about support or help with technical issues.
96100

97101
Credits
98102
=======
99103

100104
Authors
101-
~~~~~~~
105+
-------
102106

103107
* Akretion
104108
* Camptocamp
105109

106110
Contributors
107-
~~~~~~~~~~~~
111+
------------
108112

109-
* David Béal <david.beal@akretion.com>
110-
* Guewen Baconnier <guewen.baconnier@camptocamp.com>
113+
- David Béal <david.beal@akretion.com>
114+
- Guewen Baconnier <guewen.baconnier@camptocamp.com>
111115

112116
Maintainers
113-
~~~~~~~~~~~
117+
-----------
114118

115119
This module is maintained by the OCA.
116120

@@ -130,6 +134,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
130134

131135
|maintainer-florian-dacosta|
132136

133-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/16.0/carrier_account_environment>`_ project on GitHub.
137+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/carrier_account_environment>`_ project on GitHub.
134138

135139
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["whool"]
3+
build-backend = "whool.buildapi"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
With this module installed, the delivery carrier are configured in the
2+
server_environment_files module (which is a module you should provide,
3+
see the documentation of server_environment for more information).
4+
5+
In the configuration file of each environment, you may first use the
6+
section \[carrier_account\].
7+
8+
Then for each server, you can define additional values or override the
9+
default values with a section named \[carrier_account.resource_name\]
10+
where "resource_name" is the name of the server.
11+
12+
Example of config file :
13+
14+
[carrier_account]
15+
# here is the default format
16+
file_format = 'ZPL'
17+
18+
19+
[carrier_account.mycarrier]
20+
name = mycarrier
21+
account = 587
22+
password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses
23+
24+
25+
[carrier_account.mycarrier2]
26+
name = mycarrier2
27+
account = 666
28+
password = wazaaaaa
29+
file_format = PDF
30+
31+
As an alternative of server_environment_files, there is also a module
32+
named server_environment_data_encryption which allow to set the
33+
environement dependent values directly in the database, by the user
34+
itself. It will be encrypted, to avoid security issues with secrets, see
35+
the documentationn of server_environment_data_encryption for more
36+
information. The advantage of setting the environment dependent value
37+
directly in the database is that it does not require a developper/odoo
38+
administrator to change a carrier account.

carrier_account_environment/readme/CONFIGURE.rst

-36
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- David Béal \<<david.beal@akretion.com>\>
2+
- Guewen Baconnier \<<guewen.baconnier@camptocamp.com>\>

carrier_account_environment/readme/CONTRIBUTORS.rst

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This module allows to configure carrier informations using the
2+
server_environment mechanism: you can then have different servers for
3+
the production and the test environment.

carrier_account_environment/readme/DESCRIPTION.rst

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Once configured, Odoo will read the carrier values from the
2-
configuration file related to each environment defined in the main
3-
Odoo file or in carrier.account model.
2+
configuration file related to each environment defined in the main Odoo
3+
file or in carrier.account model.

carrier_account_environment/static/description/index.html

+30-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
32
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
43
<head>
@@ -9,10 +8,11 @@
98

109
/*
1110
:Author: David Goodger (goodger@python.org)
12-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1312
:Copyright: This stylesheet has been placed in the public domain.
1413
1514
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1616
1717
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1818
customize this style sheet.
@@ -275,7 +275,7 @@
275275
margin-left: 2em ;
276276
margin-right: 2em }
277277

278-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
279279
pre.code, code { background-color: #eeeeee }
280280
pre.code .comment, code .comment { color: #5C6576 }
281281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
301301
span.pre {
302302
white-space: pre }
303303

304-
span.problematic {
304+
span.problematic, pre.problematic {
305305
color: red }
306306

307307
span.section-subtitle {
@@ -369,10 +369,10 @@ <h1 class="title">Carrier accounts configuration with server_environment</h1>
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370370
!! source digest: sha256:15c18b3a9f9749e2a79ca683e39b3f1d2dde711298fd126fe7aab57058705e88
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/16.0/carrier_account_environment"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-carrier_account_environment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373-
<p>This module allows to configure carrier informations
374-
using the <cite>server_environment</cite> mechanism: you can then have different
375-
servers for the production and the test environment.</p>
372+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/18.0/carrier_account_environment"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-carrier_account_environment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373+
<p>This module allows to configure carrier informations using the
374+
server_environment mechanism: you can then have different servers for
375+
the production and the test environment.</p>
376376
<p><strong>Table of contents</strong></p>
377377
<div class="contents local topic" id="contents">
378378
<ul class="simple">
@@ -389,15 +389,15 @@ <h1 class="title">Carrier accounts configuration with server_environment</h1>
389389
</div>
390390
<div class="section" id="configuration">
391391
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
392-
<p>With this module installed, the delivery carrier are
393-
configured in the <cite>server_environment_files</cite> module (which is a module
394-
you should provide, see the documentation of <cite>server_environment</cite> for
395-
more information).</p>
392+
<p>With this module installed, the delivery carrier are configured in the
393+
server_environment_files module (which is a module you should provide,
394+
see the documentation of server_environment for more information).</p>
396395
<p>In the configuration file of each environment, you may first use the
397-
section <cite>[carrier_account]</cite>.</p>
396+
section [carrier_account].</p>
398397
<p>Then for each server, you can define additional values or override the
399-
default values with a section named <cite>[carrier_account.resource_name]</cite> where “resource_name” is the name of the server.</p>
400-
<p>Example of config file</p>
398+
default values with a section named [carrier_account.resource_name]
399+
where “resource_name” is the name of the server.</p>
400+
<p>Example of config file :</p>
401401
<pre class="literal-block">
402402
[carrier_account]
403403
# here is the default format
@@ -416,23 +416,27 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
416416
password = wazaaaaa
417417
file_format = PDF
418418
</pre>
419-
<p>As an alternative of <cite>server_environment_files</cite>, there is also a module named <cite>server_environment_data_encryption</cite>
420-
which allow to set the environement dependent values directly in the database, by the user itself.
421-
It will be encrypted, to avoid security issues with secrets, see the documentationn of <cite>server_environment_data_encryption</cite> for more information.
422-
The advantage of setting the environment dependent value directly in the database is that it does not require a developper/odoo administrator to change a carrier account.</p>
419+
<p>As an alternative of server_environment_files, there is also a module
420+
named server_environment_data_encryption which allow to set the
421+
environement dependent values directly in the database, by the user
422+
itself. It will be encrypted, to avoid security issues with secrets, see
423+
the documentationn of server_environment_data_encryption for more
424+
information. The advantage of setting the environment dependent value
425+
directly in the database is that it does not require a developper/odoo
426+
administrator to change a carrier account.</p>
423427
</div>
424428
<div class="section" id="usage">
425429
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
426430
<p>Once configured, Odoo will read the carrier values from the
427-
configuration file related to each environment defined in the main
428-
Odoo file or in carrier.account model.</p>
431+
configuration file related to each environment defined in the main Odoo
432+
file or in carrier.account model.</p>
429433
</div>
430434
<div class="section" id="bug-tracker">
431435
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
432436
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
433437
In case of trouble, please check there if your issue has already been reported.
434438
If you spotted it first, help us to smash it by providing a detailed and welcomed
435-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20carrier_account_environment%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
439+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20carrier_account_environment%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
436440
<p>Do not contact contributors directly about support or help with technical issues.</p>
437441
</div>
438442
<div class="section" id="credits">
@@ -454,13 +458,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
454458
<div class="section" id="maintainers">
455459
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
456460
<p>This module is maintained by the OCA.</p>
457-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
461+
<a class="reference external image-reference" href="https://odoo-community.org">
462+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
463+
</a>
458464
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
459465
mission is to support the collaborative development of Odoo features and
460466
promote its widespread use.</p>
461467
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
462468
<p><a class="reference external image-reference" href="https://github.com/florian-dacosta"><img alt="florian-dacosta" src="https://github.com/florian-dacosta.png?size=40px" /></a></p>
463-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/16.0/carrier_account_environment">OCA/delivery-carrier</a> project on GitHub.</p>
469+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/carrier_account_environment">OCA/delivery-carrier</a> project on GitHub.</p>
464470
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
465471
</div>
466472
</div>

0 commit comments

Comments
 (0)