Skip to content

Syncing from upstream OCA/e-commerce (19.0)#936

Merged
bt-admin merged 62 commits into
brain-tec:19.0from
OCA:19.0
Jun 6, 2026
Merged

Syncing from upstream OCA/e-commerce (19.0)#936
bt-admin merged 62 commits into
brain-tec:19.0from
OCA:19.0

Conversation

@bt-admin
Copy link
Copy Markdown

@bt-admin bt-admin commented Jun 6, 2026

bt_gitbot

eLBati and others added 30 commits May 19, 2026 11:42
ADD website_sale_charge_payment_fee_delivery: link module

ADD website_sale_charge_payment_fee_quote: link module
…o acquirer

If there are no acquirers, gets
```
Error to render compiling AST
TypeError: 'NoneType' object has no attribute '__getitem__'
Template: 929
Path: /templates/t/t/div/div[1]/div/div[2]/input
Node: <input type="hidden" t-att-value="selected_acquirer.id if selected_acquirer else acquirers[0].id" name="selected_acquirer_id" data-oe-id="1278" data-oe-xpath="/data/xpath[3]/input" data-oe-model="ir.ui.view" data-oe-field="arch"/>
```
We avoid this way the warning on runbot and it's more tolerant to
inheritance.
Currently translated at 100.0% (21 of 21 strings)

Translation: e-commerce-14.0/e-commerce-14.0-website_sale_charge_payment_fee
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-14-0/e-commerce-14-0-website_sale_charge_payment_fee/es/
  - Bump module version to 19.0.1.0.0
  - Adapt payment form JavaScript to the new PaymentForm interaction
  patching API
  - Use request.cart and updated website_sale payment flow helpers
  - Add support for applying payment fees during express checkout
  - Adapt payment transaction fee update to the 19.0 payment portal flow
  - Update sale order fee computation for tax-included and tax-excluded
  website totals
  - Replace renamed sale order line fields and dependencies for 19.0
  - Hide payment fee lines from the cart line display
  - Update website sale total template xpath
  - Remove obsolete roadmap entry about express checkout support
Without this patch, it's easy that the tour fails randomly due to a timeout when generating the sales order report. These assets can take a long time, increasing when more addons are installed.

In an integrated database, this patch makes the test go from this log:

    2020-11-06 10:34:53,941 34 INFO devel werkzeug: 127.0.0.1 - - [06/Nov/2020 10:34:53] "POST /payment/transfer/feedback HTTP/1.1" 302 - 730 4.368 11.800

To this one:

    2020-11-06 10:32:55,517 34 INFO devel werkzeug: 127.0.0.1 - - [06/Nov/2020 10:32:55] "POST /payment/transfer/feedback HTTP/1.1" 302 - 479 2.906 5.771

That's about 50% the time.

In the same patch, I remove the `self.env` patch that was only needed for Odoo v11 and lower.
With the old tour, timeout problems started to occur, even with 7830084

This partially reverts that, and instead uses a simpler tour to test the creation of the SO.

TT26399
If we don't trigger the onchanges, we won't get some of the default
values that the order type has defined

TT30235
weblate and others added 27 commits June 5, 2026 08:13
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: e-commerce-16.0/e-commerce-16.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-16-0/e-commerce-16-0-website_sale_order_type/
Currently translated at 100.0% (1 of 1 strings)

Translation: e-commerce-16.0/e-commerce-16.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-16-0/e-commerce-16-0-website_sale_order_type/es/
When using the demo product "Customizable Desk" in
the standard behaviour there is an intermediate step
in which the variant of the product to be added to
the cart is chosen. This step may not be there if
there are no variants really because some module has
modified this and to avoid errors in the tests it is
better to create a product in which we are sure that
there are no variants and the step of selecting the
variant before adding to the cart does not exist.
Currently translated at 100.0% (1 of 1 strings)

Translation: e-commerce-18.0/e-commerce-18.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_order_type/es/
Currently translated at 0.0% (0 of 1 strings)

Translation: e-commerce-18.0/e-commerce-18.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_order_type/pt_BR/
Currently translated at 0.0% (0 of 1 strings)

Translation: e-commerce-18.0/e-commerce-18.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_order_type/ca/
Currently translated at 100.0% (1 of 1 strings)

Translation: e-commerce-18.0/e-commerce-18.0-website_sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_order_type/it/
Currently translated at 100.0% (3 of 3 strings)

Translation: e-commerce-19.0/e-commerce-19.0-website_sale_stock_picking_policy
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_stock_picking_policy/it/
Currently translated at 100.0% (8 of 8 strings)

Translation: e-commerce-19.0/e-commerce-19.0-website_sale_product_reference_displayed
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_product_reference_displayed/it/
Signed-off-by ivantodorovich
Signed-off-by ivantodorovich
Signed-off-by ivantodorovich
@bt-admin bt-admin added the 19.0 label Jun 6, 2026
@bt-admin bt-admin merged commit 8bce150 into brain-tec:19.0 Jun 6, 2026
4 checks passed
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 6, 2026

Codecov Report

❌ Patch coverage is 96.06742% with 14 lines in your changes missing coverage. Please review.
✅ Project coverage is 95.16%. Comparing base (c4e5dff) to head (76c80c0).
⚠️ Report is 69 commits behind head on 19.0.

Files with missing lines Patch % Lines
...e_order_type/tests/test_website_sale_order_type.py 78.94% 6 Missing and 2 partials ⚠️
...ebsite_sale_charge_payment_fee/controllers/main.py 96.55% 0 Missing and 2 partials ⚠️
...bsite_sale_charge_payment_fee/models/sale_order.py 94.44% 0 Missing and 2 partials ⚠️
..._charge_payment_fee/tests/test_website_sale_fee.py 99.42% 0 Missing and 1 partial ⚠️
website_sale_order_type/models/website.py 94.73% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             19.0     #936      +/-   ##
==========================================
+ Coverage   94.82%   95.16%   +0.34%     
==========================================
  Files          61       75      +14     
  Lines         946     1302     +356     
  Branches       77      107      +30     
==========================================
+ Hits          897     1239     +342     
- Misses         36       42       +6     
- Partials       13       21       +8     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.