Skip to content

Commit e98568f

Browse files
committed
[BOT] post-merge updates
1 parent 464bb1a commit e98568f

File tree

7 files changed

+74
-74
lines changed

7 files changed

+74
-74
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ addon | version | maintainers | summary
2323
--- | --- | --- | ---
2424
[web_environment_ribbon](web_environment_ribbon/) | 18.0.1.0.1 | | Web Environment Ribbon
2525
[web_notify](web_notify/) | 18.0.1.0.1 | | Send notification messages to user
26-
[web_pivot_computed_measure](web_pivot_computed_measure/) | 18.0.1.0.0 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Web Pivot Computed Measure
27-
[web_tree_dynamic_colored_field](web_tree_dynamic_colored_field/) | 18.0.1.0.0 | | Allows you to dynamically color fields on tree views
26+
[web_pivot_computed_measure](web_pivot_computed_measure/) | 18.0.1.0.1 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Web Pivot Computed Measure
27+
[web_tree_dynamic_colored_field](web_tree_dynamic_colored_field/) | 18.0.1.0.1 | | Allows you to dynamically color fields on tree views
2828

2929
[//]: # (end addons)
3030

web_pivot_computed_measure/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Web Pivot Computed Measure
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:5b39f6b5f029b78cd1c9905a891b308ef82f93df14f8ccb659c4e0577b1bb2e0
10+
!! source digest: sha256:ef1d9798000e33915ec220f529705bc7f263e563bacca0755f7dfbc2cfdf3639
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

web_pivot_computed_measure/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Web Pivot Computed Measure",
55
"category": "web",
6-
"version": "18.0.1.0.0",
6+
"version": "18.0.1.0.1",
77
"author": "Tecnativa, Odoo Community Association (OCA)",
88
"license": "AGPL-3",
99
"website": "https://github.com/OCA/web",

web_pivot_computed_measure/static/description/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Web Pivot Computed Measure</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:5b39f6b5f029b78cd1c9905a891b308ef82f93df14f8ccb659c4e0577b1bb2e0
370+
!! source digest: sha256:ef1d9798000e33915ec220f529705bc7f263e563bacca0755f7dfbc2cfdf3639
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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/web/tree/18.0/web_pivot_computed_measure"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_pivot_computed_measure"><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/web&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>Adds support for computed measures on the pivot view.</p>

web_tree_dynamic_colored_field/README.rst

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Colorize field in tree views
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:f6356258dae95cac6cf463ac8565680182dc73987f8d9f528ffab3567773e0bc
10+
!! source digest: sha256:9421f600f808456315bd58fa3ad58e5d8790f99fb1f0809e81ce7bb0ef0774b1
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -34,10 +34,10 @@ view according to data in the record.
3434
Features
3535
--------
3636

37-
- Add attribute ``bg_color`` on field's ``options`` to color background
38-
of a cell in tree view
39-
- Add attribute ``fg_color`` on field's ``options`` to change text
40-
color of a cell in tree view
37+
- Add attribute ``bg_color`` on field's ``options`` to color background
38+
of a cell in tree view
39+
- Add attribute ``fg_color`` on field's ``options`` to change text color
40+
of a cell in tree view
4141

4242
**Table of contents**
4343

@@ -47,44 +47,44 @@ Features
4747
Usage
4848
=====
4949

50-
- In the tree view declaration, put
51-
``options='{"bg_color": "red: customer==True"}`` attribute in the
52-
``field`` tag:
50+
- In the tree view declaration, put
51+
``options='{"bg_color": "red: customer==True"}`` attribute in the
52+
``field`` tag:
5353

54-
::
54+
::
5555

56-
...
57-
<field name="arch" type="xml">
58-
<tree string="View name">
59-
...
60-
<field name="name" options='{"bg_color": "red: customer == True"}'/>
61-
...
62-
</tree>
63-
</field>
64-
...
56+
...
57+
<field name="arch" type="xml">
58+
<tree string="View name">
59+
...
60+
<field name="name" options='{"bg_color": "red: customer == True"}'/>
61+
...
62+
</tree>
63+
</field>
64+
...
6565

66-
With this example, column which renders 'name' field will have its **background** colored in red on customer records.
66+
With this example, column which renders 'name' field will have its **background** colored in red on customer records.
6767

68-
- In the tree view declaration, put
69-
``options='{"fg_color": "white:customer == True"}'`` attribute in the
70-
``field`` tag:
68+
- In the tree view declaration, put
69+
``options='{"fg_color": "white:customer == True"}'`` attribute in the
70+
``field`` tag:
7171

72-
::
72+
::
7373

74-
...
75-
<field name="arch" type="xml">
76-
<tree string="View name">
77-
...
78-
<field name="name" options='{"fg_color": "white:customer == True"}'/>
79-
...
80-
</tree>
81-
</field>
82-
...
74+
...
75+
<field name="arch" type="xml">
76+
<tree string="View name">
77+
...
78+
<field name="name" options='{"fg_color": "white:customer == True"}'/>
79+
...
80+
</tree>
81+
</field>
82+
...
8383

84-
With this example, column which renders 'name' field will have its **text** colored in white on customer records.
84+
With this example, column which renders 'name' field will have its **text** colored in white on customer records.
8585

86-
- If you want to use more than one color, you can split the attributes
87-
using ';':
86+
- If you want to use more than one color, you can split the attributes
87+
using ';':
8888

8989
::
9090

@@ -104,21 +104,21 @@ Example:
104104
</field>
105105
...
106106
107-
- Can use strings too... In the tree view declaration, put
108-
``options="{'fg_color': 'green:customer_state == \'success\''}"``
109-
attribute in the ``field`` tag:
107+
- Can use strings too... In the tree view declaration, put
108+
``options="{'fg_color': 'green:customer_state == \'success\''}"``
109+
attribute in the ``field`` tag:
110110

111-
::
111+
::
112112

113-
...
114-
<field name="arch" type="xml">
115-
<tree string="View name">
116-
...
117-
<field name="name" options="{'fg_color': 'green:customer_state == \'success\''}"/>
118-
...
119-
</tree>
120-
</field>
121-
...
113+
...
114+
<field name="arch" type="xml">
115+
<tree string="View name">
116+
...
117+
<field name="name" options="{'fg_color': 'green:customer_state == \'success\''}"/>
118+
...
119+
</tree>
120+
</field>
121+
...
122122

123123
**Note that you can use single or normal quotes. If the declaration of
124124
the options doesn't follow the JSON format, the options string will be
@@ -127,14 +127,14 @@ evaluated using py.eval()**
127127
Known issues / Roadmap
128128
======================
129129

130-
- Before version 13.0, this module had a feature allowing to change the
131-
color of a line depending on a field, using a ``colors`` attribute
132-
with the name of the field on the ``<tree>`` element. Since 13.0, the
133-
``colors`` attribute is no longer in the RelaxNG schema of the tree
134-
view, so we can't use it anymore. This feature has then been dropped,
135-
but could be reimplement in another way.
136-
- Since version 17.0 coloring is written into ``style`` attribute of
137-
(td) element
130+
- Before version 13.0, this module had a feature allowing to change the
131+
color of a line depending on a field, using a ``colors`` attribute
132+
with the name of the field on the ``<tree>`` element. Since 13.0, the
133+
``colors`` attribute is no longer in the RelaxNG schema of the tree
134+
view, so we can't use it anymore. This feature has then been dropped,
135+
but could be reimplement in another way.
136+
- Since version 17.0 coloring is written into ``style`` attribute of
137+
(td) element
138138

139139
Bug Tracker
140140
===========
@@ -158,21 +158,21 @@ Authors
158158
Contributors
159159
------------
160160

161-
- Damien Crier <[email protected]>
162-
- Holger Brunn <[email protected]>
163-
- Artem Kostyuk <[email protected]>
164-
- Guewen Baconnier <[email protected]>
165-
- Phuc Tran Thanh <[email protected]>
166-
- Sylvain LE GAL <https://twitter.com/legalsylvain>
167-
- Jurgis Pralgauskis <[email protected]>
161+
- Damien Crier <[email protected]>
162+
- Holger Brunn <[email protected]>
163+
- Artem Kostyuk <[email protected]>
164+
- Guewen Baconnier <[email protected]>
165+
- Phuc Tran Thanh <[email protected]>
166+
- Sylvain LE GAL <https://twitter.com/legalsylvain>
167+
- Jurgis Pralgauskis <[email protected]>
168168

169169
Other credits
170170
-------------
171171

172172
The development of this module has been financially supported by:
173173

174-
- Camptocamp
175-
- Versada
174+
- Camptocamp
175+
- Versada
176176

177177
Maintainers
178178
-----------

web_tree_dynamic_colored_field/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Colorize field in tree views",
55
"summary": "Allows you to dynamically color fields on tree views",
66
"category": "Hidden/Dependency",
7-
"version": "18.0.1.0.0",
7+
"version": "18.0.1.0.1",
88
"depends": ["web"],
99
"author": "Camptocamp, Therp BV, Odoo Community Association (OCA)",
1010
"license": "AGPL-3",

web_tree_dynamic_colored_field/static/description/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Colorize field in tree views</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:f6356258dae95cac6cf463ac8565680182dc73987f8d9f528ffab3567773e0bc
370+
!! source digest: sha256:9421f600f808456315bd58fa3ad58e5d8790f99fb1f0809e81ce7bb0ef0774b1
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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/web/tree/18.0/web_tree_dynamic_colored_field"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_tree_dynamic_colored_field"><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/web&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>This module aims to add support for dynamically coloring fields in tree
@@ -377,8 +377,8 @@ <h1>Features</h1>
377377
<ul class="simple">
378378
<li>Add attribute <tt class="docutils literal">bg_color</tt> on field’s <tt class="docutils literal">options</tt> to color background
379379
of a cell in tree view</li>
380-
<li>Add attribute <tt class="docutils literal">fg_color</tt> on field’s <tt class="docutils literal">options</tt> to change text
381-
color of a cell in tree view</li>
380+
<li>Add attribute <tt class="docutils literal">fg_color</tt> on field’s <tt class="docutils literal">options</tt> to change text color
381+
of a cell in tree view</li>
382382
</ul>
383383
<p><strong>Table of contents</strong></p>
384384
<div class="contents local topic" id="contents">

0 commit comments

Comments
 (0)