[MERGE] Forward-port of branch 14.0 to master

This commit is contained in:
Victor Feyens
2021-05-31 15:27:38 +02:00
38 changed files with 58 additions and 82 deletions

View File

@@ -286,7 +286,7 @@ on the value of other fields thanks to the ``attrs`` attribute. Note that ``invi
to other elements of the view such as ``button`` or ``group``.
The ``attrs`` is a dictionary with the property as a key and a domain as a value. The domain gives
the conditon in which the property applies. For example:
the condition in which the property applies. For example:
.. code-block:: xml

View File

@@ -72,7 +72,7 @@ Create your working branch:
$ git checkout -b master-my_first_branch-xyz
Your branch name must follow the following name strucutre : <targetVersion>-<feature>-<trigram>
Your branch name must follow the following name structure : <targetVersion>-<feature>-<trigram>
Example: The branch master-sale-fixes-abc on odoo-dev/odoo is a branch containing fixes for the
sales app in the odoo/odoo repository, to be deployed in master and done by ABC.

View File

@@ -172,12 +172,12 @@ while one with B and C will be able to read or update, but not search or read.
.. note::
* The group of an access right can be ommitted, this means the ACL applies
* The group of an access right can be omitted, this means the ACL applies
to *every user*, this is a useful but risky fallback as depending on the
applications installed it can grant even non-users access to the model.
* If no access right applies to a user, they are not granted access
(default-deny).
* If a menu item points to a model to which a user doesn't have acces and
* If a menu item points to a model to which a user doesn't have access and
has no submenus which the user can see, the menu will not be displayed.
.. exercise:: Update the access rights file to:
@@ -412,7 +412,7 @@ another.
Odoo can be used to manage multiple companies inside the same system, however
the actual handling is up to individual modules: Odoo itself provides the tools
to manage the issue like company-dependent fields and *multi-company rules*,
which is what we're going to concern outselves with.
which is what we're going to concern ourselves with.
We want different agencies to be "siloed" from one another, with properties
belonging to a given agency and users (whether agents or managers) only able to

View File

@@ -76,7 +76,7 @@ Integration Bots
`github.com/odoo`. We highly recommend having your own CI if it is not the case.
When a test is written, it is important to make sure it always passes when modifications are
applied to the source code. To automatize this task, we use a development practice called
applied to the source code. To automate this task, we use a development practice called
Continuous Integration (CI). This is why we have some bots running all the tests at different
moments.
Whether you are working at Odoo or not, if you are trying to merge something inside `odoo/odoo`,

View File

@@ -394,7 +394,7 @@ So here are the steps to create a robust and consistent style for your theme:
\(1) Set the values for Odoo-provided SCSS variables
Odoo declares many CSS rules, most being entirely customizable by overridding
Odoo declares many CSS rules, most being entirely customizable by overriding
the related SCSS variables. First, create a new file called primary_variables.scss
and add it the same way as the style.scss file. The only difference it that
you won't add it in the ``assets_frontend`` template but in the ``_assets_primary_variables``

View File

@@ -330,7 +330,7 @@ should have a real naming as it is used as display name.
</record>
<record id="model_name_action_child_list" model="ir.actions.act_window">
<field name="name">Model Access Childs</field>
<field name="name">Model Access Children</field>
</record>
<!-- menus and sub-menus -->

View File

@@ -357,7 +357,7 @@ manifest counterparts.
directives `replace`, `before` and `after`.
``active`` (default= `True`)
Wether the record is active
Whether the record is active
``sequence`` (default= `16`)
Loading order of the asset records (ascending). A sequence lower than 16 means

View File

@@ -60,7 +60,7 @@ Check if the method is available and then execute it.
Methods
-------
.. note:: Each of the methods returns a JQuery Deffered object which returns
.. note:: Each of the methods returns a JQuery Deferred object which returns
a data JSON dictionary
Show Toast in device

View File

@@ -32,7 +32,7 @@ thus applying security mechanisms to users.
Other groups to set on the user alongside this one. This is a
convenience pseudo-inheritance relationship: it's possible to
explicitely remove implied groups from a user without removing the
explicitly remove implied groups from a user without removing the
implier.
.. attribute:: comment

View File

@@ -456,7 +456,7 @@ calendar view are:
* ``write_model`` and ``write_field`` and ``filter_field``
you can add a filter and save the result in the defined model, the
filter is added in the sidebar. The ``filter_field`` is optionnal and allows
filter is added in the sidebar. The ``filter_field`` is optional and allows
you to specify the field that will hold the status of the filter.
* ``filter`` and ``color``
@@ -1240,7 +1240,7 @@ view architecture is:
the measure field of the adjusted cell
``change``
the difference between the old value of the cell and the adjusted one,
may be possitive or negative
may be positive or negative
* optional ``hide_line_total`` and ``hide_column_total`` attributes