Problem:
When the `payment_state` field on `account.move` is automatically computed, the logic will prioritize whether the move has been posted over whether it has been blocked. The effect is that if an invoice has been marked as blocked, it might be automatically unblocked during reconciliation.

Solution:
The `_compute_payment_state` method will now prioritize a move's `payment_state` being blocked over whether it has been posted. This prevents a blocked move from being unblocked unexpectedly.

Steps to Replicate (Runbot 18)
- Create a product
	- Track inventory
	- Cost > 0
	- Control policy = On ordered quantities
	- Product category is valuated in real-time (Inventory Valuation - Automated) (requires 'Stock Accounting Automatic' group)

1. Create a PO for the product
2. Create a bill, validate it
3. Block the bill using the contextual action
4. Receive the product

If you navigate back to the Vendor Bill, you will see that it has been unblocked.

opw-4981799

---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: odoo/odoo#223351
Forward-Port-Of: odoo/odoo#222906

If you made an order and tried to pay with a payment terminal (like Adyen) then canceled the payment on the terminal. Then leave the order and create a new order, add different products, and try to pay again, pay on the terminal, the payment will not be transmitted to the PoS and the order would still be waiting for payment.

Steps to reproduce:
------------------
* Create a pos payment method using adyen
* Open a PoS session
* Create an order with a product
* Pay with the adyen payment method
* Cancel the payment on the terminal
* Leave the order
* Create a new order with different products
* Try to pay with the adyen payment method
* Validate the payment on the terminal
> Observation: The payment will not be transmitted to the PoS and the
  order will still be waiting for payment.

Why the fix:
----------------
The issue occurs because the canceled payment line is still considered as a pending payment line. And when the payment will be receiven on the pos it would take the canceled payment line as the pending one.

opw-4805704

Forward-Port-Of: odoo/odoo#222325
Forward-Port-Of: odoo/odoo#219054

Problem:
On large screens, the `s_showcase` template shows blocks stacked vertically instead of side-by-side as in the editor.

Cause:
After commit 10008b32334152ada1a847b091189d1d9d5aa3d3, `s_showcase` was refactored to fix selection/formatting issues. Mixing relative widths (`col-sm`) with fixed widths (`col-1`) breaks in `convert_inline`, exceeding the 12-column grid.

Solution:
- Use `Math.floor` when calculating the `colSize` to prevent overflow

Before:
<img width="1862" height="948" alt="image" src="https://github.com/user-attachments/assets/35d82103-1f84-4754-862d-50ef3481bcb3" />
After:
<img width="1847" height="955" alt="image" src="https://github.com/user-attachments/assets/20e1b454-dfc4-4ad0-9e6a-3b38c230d0fd" />

Steps to reproduce:
1. Open a new email marketing.
2. Drop the `s_showcase` snippet.
3. Send a test email.
4. Observe the received template is misaligned compared to the editor.

opw-4946126

---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: odoo/odoo#222801

Currently, an error occurs when a user sign the document and tries to validate and send the completed document.

**Steps to reproduce:**

- Install the `sign` module.
- Go to: `Sign Settings > Cryptographic Signature` > Create a 'Signing certificate' and upload any random PDF (Observe: A warning appears `'This certificate could not be loaded. Either the content or the password is erroneous.'`).
- In the Sign app, upload any document, drag and drop a `Signature` field, and sign the document.
- Click `Validate & Send Completed Document`.

**Note:**
- [1] Make sure your system has cryptography version `41.0.7 or above`.
- Refer to [2] for steps to reproduce.

**Error:**
`TypeError: expected bytes-like object, not bool`

**Root Cause:**
At [3], when the certificate is not correctly created, `certificate.pem_certificate` is `False`, which leads to an error.

This commit allows validating and sending a signed document, when the certificate is invalid.

[1]:
https://github.com/odoo/odoo/blob/d730518fa6a1fba3b3edba6f3b65bcc88ed992fe/odoo/tools/pdf/signature.py#L16

[2]:
https://drive.google.com/file/d/19fd82TdGzVPRUVW3PDMGEhyaQLTwL41h/view?usp=sharing

[3]:
https://github.com/odoo/odoo/blob/a6fa3784b20f75490e405e3728d5a335f2104fa0/odoo/tools/pdf/signature.py#L85

sentry-6796501254

Forward-Port-Of: odoo/odoo#222417

Currently, when users import a CSV or XLSX file into the Fleet app containing the `model_year` field as an integer, an error is raised.

**Steps to Reproduce:**
1) Install **Fleet** app(with Demo Data).
2) Open Fleet App and Import [this file](https://docs.google.com/spreadsheets/d/1KJgVTM7KeAVcHR-TQg86gO4in53G7NyR/edit?usp=sharing&ouid=101212513075316114369&rtpof=true&sd=true). 
3) Click on Test or Import.

**Error:**
`UndefinedFunction: operator does not exist: text = integer`

**Root Cause:**
Since PR https://github.com/odoo/odoo/pull/197440, the `model_year` field was changed from a `char` to a `selection`. The selection values are generated by the `_get_year_selection` method at [1], which returns a list of integers.
However, when these integer value is compared at [2], a type mismatch occurs because the expected type is `text`, not `integer`.

**Solution:**
This fix ensures that `_get_year_selection` returns a list of **strings** instead of `integers`, so that the values match the expected type at [2]

[1]- https://github.com/odoo/odoo/blob/4806b08dcfc965cdbd463269be078f8da9f48863/addons/fleet/models/fleet_vehicle.py#L34-L36

[2]- https://github.com/odoo/odoo/blob/4806b08dcfc965cdbd463269be078f8da9f48863/odoo/addons/base/models/ir_fields.py#L451

sentry-**6663249660**

Forward-Port-Of: odoo/odoo#221861

If you made a sale with multiple lines having the same product, the qty_delivered was not correctly computed on the different lines.

Steps to reproduce:
-------------------
* Activate the ship later option in the PoS settings
* Open PoS
* Add any product with a quantity of 5
* Apply a discount of 20% to the line
* Click on the same product so that they are added as a second line
* Change the quantity of the second line to 3
* Validate the order and use the ship later option
* Validate the picking
* Go to the sale report and check the qty_delivered for the product
> Observation: The qty_delivered is doubled, 16 instead of 8.

Why the fix:
------------
The qty_delivered was computed by summing the quantities of all moves for the product, but it did not take into account that the same product could be present in multiple lines of the same order. We now make sure to dispatch the delivered quantity correctly across the different lines of the order, ensuring that the qty_delivered is accurate.

opw-4826487

Forward-Port-Of: odoo/odoo#221373

Reproduction Steps:
---------------------------------------------------
To reproduce the issue first we need to create cowed view, follow the steps below:

- Ensure that the website and website_sale_mass_mailing modules are installed. 
- Navigate to Website > Shop.
- Select any product and add it to the cart.
- click on Proceed to checkout then checkout.
- On the checkout page, you will see the address form.
- Click on "Add a new address".
- Now "Edit" the website page (e.g., make the City label bold).

This will create a cowed view for the address page.
Now, follow the final steps to reproduce the actual issue:

- Enable the "Newsletter" option from Website Settings.
- Log out of the database.
- Go to the website shop, add a product to the cart, and proceed to checkout.
- On the address page, the subscription checkbox is not visible for a "Guest"  user.

Root Cause:
--------------------------------------------
The subscription checkbox does not appear because the cowed view of the newsletter is not activated.

Solution:
---------------------------------------
As of SaaS 17.3, a new module `website_sale_mass_mailing` was introduced, which adds the "Newsletter" option in Website Settings. When this option is enabled, the newsletter view is automatically activated. However, the corresponding cowed views are not automatically activated, causing the subscription checkbox to be missing during guest checkout.
To fix this, we ensure that the corresponding cowed view is also activated when the "Newsletter" option is enabled.

Related Link:
https://github.com/odoo/odoo/pull/154604/files

OPW-4860002
UPG-2978748



---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: odoo/odoo#223255
Forward-Port-Of: odoo/odoo#214989

**Steps to reproduce:**
- Install Accounting, l10n_nl and l10n_nl_reports_sbr_ob_nummer
- Switch to a Dutch company (e.g. NL Company)
- In company form, set VAT and Omzetbelastingnummer

- Create an invoice with tax for previous month
- Confirm the invoice

- Go to "Accounting / Reporting / Statement Reports / Tax Return"
- Select previous month
- Create "Closing Entry" and post it

- On "Miscellaneous Operations" journal in Accounting dashboard, click on "Pay tax: [date]" link
- A wizard will appear fot the VAT payment

**Issue:**
The value of the "Communication" field is incorrect.

**Cause:**
The "Communication" field is always computed from the VAT of the company.
However, when the "Omzetbelastingnummer" field is set, it should be used instead of the VAT.

**Solution:**
Use the "Omzetbelastingnummer" field to compute the "Communication" of the VAT payment when it is set.
This is done through an overridden method because "Omzetbelastingnummer" is defined in an independent module.

opw-4836615

Forward-Port-Of: odoo/enterprise#92691
Forward-Port-Of: odoo/enterprise#92407

Currently an error occurs when trying to run whatsapp marketing automation test more than once.

**Steps to replicate:**
* Install `marketing_automation_whatsapp`
* Setup whatsapp integration
* Marketing Automation > New > Start From Scratch > Add a new activity
* Select Activity Type as Whatsapp Message and a Whatsapp Template
* Launch a Test > Pick a contact > Launch > Run (Do this step twice)

**Error:**
`ValueError: Expected singleton: marketing.trace(6, 4, 3, 2, 1)`

**Cause:**
This error occurs because the variable `trace` contains multiple records, but the `process_event` method is being called on the entire recordset.

Since `process_event` uses `self.ensure_one()`, it expects exactly one record, and therefore raises an error at [1] when multiple records are passed.

**Solution:**
* Handle trace records one by one using a loop.

[1]: https://github.com/odoo/enterprise/blob/624b18bdb5dff0df4756c4e1d37a696631e57a05/marketing_automation_whatsapp/models/marketing_trace.py#L20

**Sentry-6772553612**

Forward-Port-Of: odoo/enterprise#91207

Problem:
The non-recurring products added through upsell Sales Orders are not included in the Sales Analysis Report. This results in missing sales data for those products, leading to inaccurate reporting.

Purpose:
To ensure that non-recurring products added through upsell Sales Orders are correctly included in the Sales Analysis Report (report_all_channels_sales_action). This fix updates the report's domain filter to include upsell orders when the product is not recurring, resolving the issue of missing sales data for such products.

Steps to reproduce the bug:

1. Create a Sales Order (SO):
  Add two products to the order:
    - One recurring product (e.g., a subscription-based product with a recurring billing policy).
    - One non-recurring (standard) product. 
2. Confirm the SO
3. Generate an Invoice for the confirmed SO.
4. Validate the Invoice and deliver the non-recurring product (process the delivery order fully). 
5. Create an Upsell Sales Order:
    - From the original SO, create a new upsell SO.
    - Add the same non-recurring product again. 
6. Navigate to the Non-Recurring Product Page:
    - Open the Product form for the non-recurring item.
    - Click on the "Sold" smart button (shows delivered/sold quantities in the past 365 days).
    - This opens the Sales Analysis Report (report_all_channels_sales_action) filtered by this product.

Issue:
The upsell Sales Order is not included in the Sales Analysis Report for the non-recurring product. As a result, the delivered quantity or revenue from upsell SOs is missing from the report for non-recurring products.

opw-4940977

Forward-Port-Of: odoo/enterprise#92559

When user tries to group by in commission, a traceback will appear.

Steps to reproduce the error:
- Install ``sale_commission`` module
- Go to Sales > Commissions > My Commissions > Group by with any field

Traceback:
```
TypeError: strptime() argument 1 must be str, not datetime.date
```

After this [commit,](https://github.com/odoo/odoo/commit/26c37c9c070107f8bd753cb8a6d8343384fdd7bf)
When grouping, the ``web_read_group`` method is invoked, which internally calls
``optimize() → _optimize() → _optimize_type_date() → _value_to_date()``.
The ``_value_to_date()`` method returns a ``datetime.date`` object from below lines for default filters and group by.
https://github.com/odoo/odoo/blob/b42d8ebee73fbf8a8eac0222ae9bcaee3fa33c98/odoo/orm/domains.py#L1417-L1420

https://github.com/odoo/enterprise/blob/3b2556d174cc2b5e3bfe9e72f1f02fea87310653/sale_commission/report/commission_report.py#L31-L38
So, In the domain, a ``datetime.date`` is passed,
but ``strptime()`` expects a ``string`` at the above line, leading to a traceback.

Sentry-6785019405

**Steps to reproduce:**
- Install accountant

- Go to "Accounting / Configuration / Invoicing / Payment Terms"
- Create a payment term having at least 2 installments (e.g. 20%-80%)

- Create a bill:
  * Vendor: [any]
  * Payment terms: [the created payment term]
  * Amount: 1000
- Confirm the bill

- Pay the first installment from the bill (i.e. 200)
- Go to "Accounting / Vendors / Payments"
- Select the payment and create a batch
- Validate the batch payment

- From Accounting dashboard, go to Bank journal
- Create a statement:
  * Partner: [None]
  * Amount: -200
- Reconcile the statement with the batch payment

- From the bill, pay the second installment (i.e. 800)
- Go to "Accounting / Vendors / Payments"
- Select the payment and create a batch
- Validate the batch payment

- From Accounting dashboard, go to Bank journal
- Create a statement:
  * Partner: [None]
  * Amount: -800
- Reconcile the statement with the batch payment

**Issue:**
The following UserError is raised:
"You are trying to reconcile some entries that are already reconciled."

**Cause:**
When reconciling a batch payment, all the payment term lines from the invoices/bills linked to the payment are used.
However, in this case, when the first batch payment has been reconciled, the first payment term line of the bill (linked to the first installment) has been reconciled.
It should not be reused when reconciling the second batch payment.

**Solution:**
Exclude reconciled payment term lines when reconciling a batch payment.

opw-4830185

Forward-Port-Of: odoo/enterprise#92524
Forward-Port-Of: odoo/enterprise#91367