New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[13.0] update upstream bc49bef467b #2486
Merged
pedrobaeza
merged 73 commits into
OCA:13.0
from
ForgeFlow:13.0-update-upstream-bc49bef467b
Dec 17, 2020
Merged
[13.0] update upstream bc49bef467b #2486
pedrobaeza
merged 73 commits into
OCA:13.0
from
ForgeFlow:13.0-update-upstream-bc49bef467b
Dec 17, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Behavior prior to this commit: - if the tax eligibility is changed between the time the invoice created and the time it is posted, the invoice ends up with 2 tax lines: one for the "Tax Received" account and one for the "Cash Basis Transition" account - there was already code intended to remove such lines, at https://github.com/odoo/odoo/blob/36b7fbe75dc45cc98a698c4af610ee4a5114919e/addons/account/models/account_move.py#L642, but it was not hit when the `recompute_tax_base_amount` parameter was true (something that was added in 226a115) Behavior after this commit: - only the tax line that is still applicable is kept on the invoice Note: - also added unit test for the use case of 226a115 opw-2371745 closes odoo/odoo#62525 Signed-off-by: Nicolas Galler <ngaller@users.noreply.github.com>
Changing a product type from Consumable to Storable usually gives unexpected results once some stock movements have been performed (negative inventory, wrong valuation...). While it should remain possible to do it (as long as the user knows what he is doing), it is worth pointing the fact that unexpected results are... to be expected. To do so, we raise a non-blocking warning.
…able The creation of a Stock Valuation Layer is useless in case of a Consumable product. At best it is useless, at worst it causes inconsistencies when the user switch from a Consumable to a Storable type. closes odoo/odoo#62622 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
…y and Many2many properties From now on, users will not be able to select journals, accounts or taxes pertaining to a company other than the one the reconciliation model is set up for. Up until now, when in superuser mode, and in a multi company environment, users could reference taxes, journals and accounts from all the companies. This allowed for misconfiguration ending in errors when using the reconciliation widget. Ticket #2375446 closes odoo/odoo#62636 X-original-commit: a3ce6c22d7a54fc89b7b7c8107ea31bec62f8705 Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com> Signed-off-by: Julien CHEVREAU <Julien-CHEVREAU@users.noreply.github.com>
Steps: - In Website, click "Go to website" - Click "Edit" in the corner - Add the block "Three columns" - Double-click on one of the three images - In the modal, click "Video" - Put a link to a video in the "Video code" field - Save Bug: Unlike the other images, the video does not entirely fill the column in width. opw:2381928 closes odoo/odoo#62662 X-original-commit: b9ab8c6 Signed-off-by: backspac <backspac@users.noreply.github.com>
- Install the `board` module - Go to Accounting / Customer / Invoices - Go to the Pivot view - Add the view to the Dashboard - Go to Dashboard - Click on a cell of the pivot view to open the list view The list view is the supplier list view instead of the customer list views. The root cause of the issue is that in the case of the Dashboard, we receive an Array of Array, while in the regular access we receive an Array of Dict. In the former case, the `_findView` returns `false` for all views despite the fact that the correct list is already provided. Since the views are `false`, `load_views` chooses the default views for the model, which are in this case the supplier views. In the Dashboard, the view is created in: https://github.com/odoo/odoo/blob/1bdd0cc247d36c869ffdee7d501cb65d36be47a6/addons/board/static/src/js/board_view.js#L267-L274 When switching view, the action is set in: https://github.com/odoo/odoo/blob/1bdd0cc247d36c869ffdee7d501cb65d36be47a6/addons/web/static/src/js/chrome/action_manager_act_window.js#L895 and the view is created in: https://github.com/odoo/odoo/blob/1bdd0cc247d36c869ffdee7d501cb65d36be47a6/addons/web/static/src/js/chrome/action_manager_act_window.js#L235 The assumption that a list of dicts is received is used is several places: https://github.com/odoo/odoo/blob/7a35515e495d4fb8edbaf252988c8c3c144f4442/addons/web/static/src/js/views/calendar/calendar_view.js#L131 https://github.com/odoo/odoo/blob/7a35515e495d4fb8edbaf252988c8c3c144f4442/addons/web/static/src/js/views/pivot/pivot_view.js#L131 https://github.com/odoo/enterprise/blob/05a78e94073aea88b2314918cadc478a367afef0/web_cohort/static/src/js/cohort_view.js#L93 https://github.com/odoo/enterprise/blob/05a78e94073aea88b2314918cadc478a367afef0/web_grid/static/src/js/grid_view.js#L79-L84 opw-2387417 closes odoo/odoo#62684 X-original-commit: 5fc81820de49b78f70d471d0f9cc99afc874a550 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Due to Spanish fiscal positions tax mapping, this improvement includes in IRPF 7%, IRPF 15%, IRPF 18%, IRPF 19% and IRPF 20% both tax mapping (IVA Exento Repercutido & IVA Soportado exento) as it is in IRPF 1%, IRPF 2%, IRPF 9%, IRPF 21%. There have been included tax mapping for account_tax_template_s_iva0_ns, account_tax_template_p_iva0_ns and account_tax_template_p_iva0_ns_b taxes as well, in all IRPF fiscal positions. closes odoo/odoo#62675 X-original-commit: 152237f Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
If we try to write on a multi recordset warehouses, we get a singleton error closes odoo/odoo#62696 Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
WHY: Some mail servers may provide `Message-Id` header in a section typed `text/rfc822-headers` instead of a `message/rfc822` According to https://tools.ietf.org/html/rfc6522#section-4 that section's body actually contains the headers from the bounced email. STEPS: a way to reproduce it should be using postfix v2.5+ with setting bounce_size_limit=1. See odoo/odoo#42340 (comment) BEFORE: `bounced_message_id` is empty and thus the little email envelope icon doesn't turn red, nor do the email resend features trigger in the UI. You could be sending an invoice and never knowing it was bounced. AFTER: bounces from mail servers that return the `text/rfc822-headers` part will be handled properly. --- @Tecnativa TT21170 opw-2162067 opw-2344252 closes #42340 closes #62551 closes odoo/odoo#62578 Signed-off-by: Ivan Yelizariev // IEL <yelizariev@users.noreply.github.com>
…pdating account to Retención 5% ISR gubernamentales and CLA sing closes odoo/odoo#62330 Signed-off-by: Josse Colpaert <jco@openerp.com>
Taxes calculation improved so must revert the following commit : odoo/odoo@8c50e47 opw-2378978 closes odoo/odoo#62244 Related: odoo/enterprise#15035 Signed-off-by: Laurent Smet <smetl@users.noreply.github.com>
…ournal When opening all the statement lines from a bank journal, the default sequence was used. We change that for a more user-friendly ordering. closes odoo/odoo#62749 X-original-commit: 0dc15b4 Signed-off-by: Laurent Smet <smetl@users.noreply.github.com> Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
Thos two fields shoulb be the same, following odoo/odoo#43985 closes odoo/odoo#62745 Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
Steps: - Install eCommerce and a delivery method (here, UPS) - Go to Website > Configuration > Settings - Select Pricing > Product Prices > Tax-Included - Go to Configuration > eCommerce/Shipping Methods - Click UPS US and publish it - Go to the eCommerce - Add a product to the cart (here, Customizable Desk) - Click My Cart > Process Checkout - UPS has a delivery price - Select UPS Bug: The delivery price of the UPS line has changed Explanation: When we first arrive to the delivery selection, prices are computed by calling the carrier's API and are shown straight away. However, when a list item is clicked, a "Delivery" sale order line is generated and the price on the list is copied from that sale order line. Before 13.0, we explicitly asked customers to click on a delivery method to see its price. Now, it's automatically computed. This fix makes sure the taxes are applied to the delivery prices before clicking on them. opw:2392281 closes odoo/odoo#62723 Signed-off-by: backspac <backspac@users.noreply.github.com>
EAN13 is not a field, barcode is the correct field closes odoo/odoo#62793 X-original-commit: b0e3f711be86e587b0ea1c7671bfab6c7bf10894 Signed-off-by: Laurent Smet <smetl@users.noreply.github.com> Signed-off-by: bfr-o <bfr-o@users.noreply.github.com>
Before this commit there was an option to get an error because there is a space after read. This mistake was introduced by xmo-odoo at 4435170 closes odoo/odoo#62815 X-original-commit: 1147645 Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
This reverts commit ab198ebe22b54ebd5d7815f2665514fdd4ecc1fe. This should be fixed differently with #60432 in 12.0 and #60450 in 13.0 closes odoo/odoo#62812 X-original-commit: 82ca855 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com> Signed-off-by: backspac <backspac@users.noreply.github.com>
Before this commit, in case of Google Translate is enable, some content can be wrapped in extra node. Use currentTarget is more secure to get the right element clicked. **Steps to reproduce:** 1. Add a website and multiple language 2. Create a page in 2 languages 3. Visit the website in Chrome and enable the translation by Google translate 4. Change the language and you should get an error similar to: Error: Uncaught TypeError: Cannot read property 'replace' of undefined closes odoo/odoo#61116 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Cancelling an electronic payment could fail, so we shouldn't set the status to 'retry' in every case. closes odoo/odoo#62853 Signed-off-by: Quentin Lejeune (qle) <qle@odoo.com>
In case a user has installed a module where the code becomes unavailable or during migration a module was removed and needs to be removed after migration it is impossible to uninstall the module from a database still holding the fields or the models. In order to disable prefetch based on information from the database it is needed that the module and models of the unavailable module are initialized with related fields and models. closes odoo/odoo#62880 Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
account: the field was present twice in the view purchase: was not using the right group, same as c9e8ec5 Fixes odoo/odoo#35073 closes odoo/odoo#62876 X-original-commit: 87976518017285c481eeb13c251f83f41682f791 Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
This is a minor issue, but determinism is better than non-determinism. closes odoo/odoo#62882 Signed-off-by: Adrian Torres (adt) <adt@odoo.com>
On Invoicing Select 2+ draft records. Action > Post entries Action > Send & print Send The `message_main_attachment_id` will not be registered on the records unless manually opening them in the view. This will have a negative side effect on the functionalities based on that field such as account_followup send_email with join_invoices opw-2391508 closes odoo/odoo#62875 Signed-off-by: agr-odoo <agr-odoo@users.noreply.github.com>
Before this commit, the inline style added with some options of the editor toolbar when editing a textarea was removed due to the strip_style of the content field. Since we cannot remove this strip_style for security reasons, we can only disable options that add inline style. This commit closes #34288 closes odoo/odoo#62887 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Create a coupon code use it in a quote A cancel the quote A use it in a quote B confirm B go back to quote A set to quotation confirm Result: you used the coupon code twice opw-2410684 closes odoo/odoo#62767 Signed-off-by: agr-odoo <agr-odoo@users.noreply.github.com>
Since #53725, a new entry was added to the pot for account.field_account_move__narration without removint the previous one. The Transifex translation based on this pot created a duplicate entry for this xmlid leading to an error when trying to install a new lang. closes odoo/odoo#62948 Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
In the change 6ba81c9 there was an issue with timezone with Google because we were now sending "20201217T123000+0000" instead of "20201217T123124Z". When google received formatted date ending in Z it would treat it as UTC, but with +0000 ending he treats it as a locale time thus get it wrong if locale timezone is different than UTC. opw-2370895 closes #62943 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
When going on Leaves dashboard, if an employee is archived, his leaves are still displayed. To reproduce the error: 1. Add time-off to an employee E 2. Archive E 3. Go back to Time Off module > Everyone => The E's leaves are still shown They should be hidden. Notes: Manual forward-port. In previous versions, the fix concerned the `hr_holidays` module Replace #62795 Initial PR #62726 OPW-2406702 closes odoo/odoo#62860 Signed-off-by: adwid <adwid@users.noreply.github.com>
closes odoo/odoo#62951 Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
When testing a mass mailing, if the user tries to send a test mail, the dynamic placeholders won't be rendered. To reproduce the error: (Need a mail catcher) 1. Go to Email Marketing 2. Create a new maling - In mail body, add at least one placeholder (e.g. ${object.name}) 3. Save, Test, Send Sample Mail => The mail contains ${object.name}, the placeholders are not rendered. The current fix is actually an adaptation of this commit (odoo/odoo@92aef67). This initial commit fixes the issue for version 14 (see odoo/odoo#55696). This fix also backports odoo/odoo@1c1d842. OPW-2394066 closes odoo/odoo#63101 X-original-commit: 64e3414ad94bc6fcb40be3c694cef19bd1624822 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com> Signed-off-by: adwid <adwid@users.noreply.github.com>
In a multicompany configuration, when starting a POS of another company than the current one, the loading will freeze. To reproduce the error: 1. Create 2 companies C1 and C2 2. Make sure C1 has taxes 3. Create one POS per company: POS_C1 and POS_C2 4. Go on Point of Sale dashboard 5. On top right (the companies list): Check the two companies (so that you can see POS_C1 and POS_C2) If not already done, select C1 6. Start a new session with POS_C2 => The loading will be blocked on "account.tax" step. While loading POS_C2, the system actually tries to load C1 taxes but does not have the corresponding access rights. The issue was supposed to be fixed thanks to odoo/odoo@29db04e, but this line https://github.com/odoo/odoo/blob/2c01da189a4f79cd72372442562bf7187ebda34c/addons/web/static/src/js/chrome/abstract_web_client.js#L132 overrides the `allow_companies_ids` defined in RPC response (https://github.com/odoo/odoo/blob/1d1281bcc5717b7319a489d042a49cf82119a592/addons/point_of_sale/controllers/main.py#L51). A specific key (`pos_session_company_ids`) is now defined to circumvent this behavior. OPW-2388210 closes odoo/odoo#62619 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
- Open a POS session - In the same POS order, add the following order lines: Product | Quantity | Price ---------------------------------------- Product A | 1 | $ 1.00 Product A | -1 | $ 2.00 Product B | 1 | $ 5.00 - The order has a total of $ 4.00 - Pay and validate order - Go to Point of Sale > Reporting > Orders and switch to pivot view The order has a total of 5.00 This is due to the fact that products, for which the sum of quantities is equal to 0, are not retrieved by the SQL request. (i.e. Sum of quantities for Product A = 1 - 1 = 0) This is caused by the HAVING section that is there to prevent a division by 0 when computing average_price, which depends on the sum of quantities of the product. The solution is to remove the HAVING section and to set average_price to NULL when the sum of quantities for a product is equal to 0. opw-2369023 closes odoo/odoo#63107 Signed-off-by: Anh Thao PHAM <kitan191@users.noreply.github.com>
AFIP currency rates goes up to 6 digits. When invoicing exportation of services, AFIP requires to invoice on the exactly same rate. Without this change it was not possible for some currencies with 6 digits as CHF one. The change takes effect without needing of updating module closes odoo/odoo#62845 Signed-off-by: Josse Colpaert <jco@openerp.com>
Thanks to Layline Tech for the update and cleaning out closes odoo/odoo#63148 Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
This reverts commit 64e3414ad94bc6fcb40be3c694cef19bd1624822 because of security issues due to Jinja. See #62888 closes odoo/odoo#63168 X-original-commit: 3ae03023dda5afe59cce96d2cae6cfdca2d0e0a9 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Steps: - Have a demo user with "User: Own Documents Only" rights on Sales. - Connect as admin - Go to Sales > Products > Coupon Program - Click one of the programs - Generate a Coupon - Reconnect as demo user - Create a Sales Order - Apply the generated coupon Bug: Access rights restriction on the coupon. Sorry, you are not allowed to modify documents of type 'Sales Coupon' (sale.coupon). This operation is allowed for the groups: - Sales/Administrator - (Operation: write, User: 6) Explanation: When applying a coupon to the sales order, it tries to update the coupon's state and link it to the order. This needs to update the coupon record. This commit also fixes confirming quotations and cancelling sales orders with coupons for salespeople. opw:2409858 closes odoo/odoo#63087 Signed-off-by: backspac <backspac@users.noreply.github.com>
- Install stock - Create a Storable Product - Add an Attribute with Variant Creation Mode set to Instantly (i.e. Color) - On Product form, click on Variant smart button and open a Product Variant - Click on "Update Quantity" The Create button to edit Quantity on Hand is not present. This comes from the Variant smart button (id: product_variant_action) that adds 'create': False in the context to prevent creation of Variant. But when navigating to Update Quantity page, it is still in the context and hides the Create button. opw-2412380 closes odoo/odoo#63076 Signed-off-by: Anh Thao PHAM <kitan191@users.noreply.github.com>
In the grouped list view, when you select all report of the only opened group (but other group are closed): - in 12.0: you will only select the selected records - in 13.0: you will select all records - in 14.0: you will only select the selected records and there is a way to select them all, eg. "1 selected -> Select all 42" With this changeset, we make a special case in 13.0 so only the selected records are selected. Without the change, added test fails with: "Head selector should be unchecked" after we select only 1 out of the 4 records. opw-2399935 closes #62761 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Create a promotion program with the "Minimum Purchase Of" right field left as blank It won't be taken into account in SO when clicking on 'Promotions' When the field is left as blank `rule_minimum_amount_tax_inclusion` value is `False` and thus break the check. opw-2392546 closes odoo/odoo#63151 Signed-off-by: agr-odoo <agr-odoo@users.noreply.github.com>
What are the steps to reproduce your issue ? 1. Install "contacts" 2. Select list view and select one or more contacts 3. Select "Export" actions What is currently happening ? When filtering fields with text, the system only displays the corresponding fields, but when clicking on sub-field the text written just before is deleted, which prevents us to return to all fields without filter What are you expecting to happen ? Filter fields and select sub-field without deleting the filter text opw-2411928 closes odoo/odoo#63289 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
What are the steps to reproduce your issue ? 1. Install website 2. Connect on the website 3. Choose Customize > HTML/CSS/JS Editor 4. Choose "Web layout" (in "XML (HTML)" ) 5. Modify the HTML code by adding any <script> before the existing <script> (console.log whatever) 6. Save 7. Refresh What is currently happening ? Traceback: TypeError: Cannot read property 'user_context' of undefined How to fix the bug ? Target the odoo script by id in the xpath. opw-2375490 closes odoo/odoo#63309 Signed-off-by: Achraf <abz-odoo@users.noreply.github.com>
This crash is caused by some of our integration code with summernote. When clicking on a button of the toolbar, we attempt to create a range from the current selection so that we can show the image toolbar if the selection contains an image, but there was no check to see whether the current selection was actually inside of the editable part of the page. This causes issues later when we attempt to generate layoutInfo for the image, as it will look for the editable area that contains the image and fail. This commit fixes that by making sure that the current selection is inside of the editable area before adding it to the styleInfo. opw-2376794 closes odoo/odoo#63361 X-original-commit: f85493a Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
When a user is watching a video course in fullscreen mode, the video course options are hidden by the website top bar. To reproduce the error: 1. Go to eLearning 2. Select/Create a course 3. Add Content - Must be a video 4. Go to the public page of the course 5. Click on the video => Above the video, the main top bar is displayed (with website's name, tabs, your name, etc). This bar should be hidden. Moreover, it overlays the options of the video course ("Write a review", "Share", "Exit Fullscreen", "Back to course") OPW-2411534 closes odoo/odoo#63347 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Stock Valuation Layers are used for the MRP Cost Analysis feature. Therefore, they are useful for consumable. opw-2412668 closes odoo/odoo#63386 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Using group of taxes with type_tax_use='none' children messed up the sign of the tax_base_amount and line tags. closes odoo/odoo#63244 Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
Steps to reproduce the bug: - Let's consider a company C with l10n_ch installed - Try to create a vendor bill Bug: A traceback was raised. PS: Function _is_qr_iban has an ensure_one and when creating a vendor bill the function _is_qr_iban by _compute_l10n_ch_isr_needs_fixing was called with no partner_bank opw:2416809 closes odoo/odoo#63424 Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
This fixes an issue that occurs when marking fields to compute in the following situation: - it occurs before the actual modification, - a relational field is marked to compute, - the same field is traversed to inverse some dependency. When the marking occurs after the modification, the traversal of the field should actually recompute the field. However, if the marking occurs before the modification, the inversion of dependencies must be based on the current value of the field. This is the case with method unlink(): we call method modified() to mark the fields that currently depend on the records to be deleted, and the fields must be computed only after the deletion! closes odoo/odoo#63293 Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
Fine tuning of this commit: odoo/odoo@6e374e2 To fix the issue when l10n_ch_qriban is not installed opw:2416809 closes odoo/odoo#63453 Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
This account is intended to be used on a bank journal instead of the bank account. Making it reconcilable is required so that it can be reconciled with a statement made in another bank journal (representing the actual bank account). odoo/odoo@7df9704 changed this account's type to liquidity, but that breaks the above use case, as a liquidity account is not supposed to be reconcilable at all (and so, instead of creating a writeoff, only statement_line_id is set on the check's line, and the statement balances of each journals don't match the general ledger). OPW 2356956 closes odoo/odoo#63472 Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
Due to this commit odoo/odoo@1d00daf It was not possible to set an analytic tag with no company on a reconcialtion model Ps: The field analytic tag on model account.analytic.tag is not required opw:2414202 closes odoo/odoo#63427 Signed-off-by: oco-odoo <oco-odoo@users.noreply.github.com>
task-2362964 closes odoo/odoo#63474 X-original-commit: 42afa3a Related: odoo/enterprise#15352 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
fixed box-shadow effect to fit perfectly on the product shop grid layout and product carousel task-2206930 Closes #47789 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
…49bef467b No conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No conflicts.
--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr