Skip to content

Fork Sync Branch 18.0 - #11

Merged
stopkovae merged 15 commits into
BTLzdravtech:18.0from
ingadhoc:18.0
Jul 24, 2026
Merged

stopkovae merged 15 commits into
BTLzdravtech:18.0from
ingadhoc:18.0

Conversation

@btl-bot

@btl-bot btl-bot commented Feb 5, 2026

Copy link
Copy Markdown

No description provided.

@sireko sireko left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved

adhoc-cicd-bot and others added 14 commits February 18, 2026 14:44
closes #300

Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
closes #305

Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
…g qties

closes #307

Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
closes #299

Signed-off-by: Franco Leyes <lef@adhoc.com.ar>
closes #314

Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
- Add `action_purchase_matching` on `account.move` to set the `purchase_matching_from_button` context flag
- Modify `_compute_product_uom_qty` in `purchase_bill_line_match` to ignore lines with incompatible UoM categories when opened from the purchase matching action
- Preserve previous behavior when context flag is not present

Change note: Al usar la acción de 'purchase matching' desde la factura de proveedor, ahora se marca el contexto para aplicar un filtrado especial en la vista. Las líneas con unidades de medida incompatibles se ignoran durante la búsqueda de coincidencias, mostrando solo las líneas válidas y evitando el error de UoM.

closes #317

Signed-off-by: rov-adhoc <rov@adhoc.com.ar>
closes #323

Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
… POs

closes #330

Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
…ting a PO line

Standard purchase_stock PurchaseOrderLine.unlink() calls
move_dest_ids._action_cancel() for propagate_cancel lines without
filtering out moves already in 'done' state. When an MTO line's
customer delivery was already shipped from on-hand stock, deleting the
purchase line raised 'You cannot cancel a stock move that has been set
to Done', blocking the edition of the RFQ.

button_cancel() already guards against this (it filters state != 'done'
before cancelling). Mirror that protection in unlink(): detach the
already-done downstream moves before the standard unlink so they are no
longer cancelled. The delivered move stays untouched.

Adds a regression test reproducing the case.

closes #333

Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
closes #320

Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
Add a per-type "Lock on Confirmation" boolean on purchase.order.type.
When enabled, purchase orders of that type are automatically locked on
final approval, by overriding button_approve so the lock respects the
double-validation flow (it only applies once the order is actually
approved, not while it is still "to approve").

The behavior is additive to the core "Lock Confirmed Orders" company
setting: when that global setting is on, every confirmed order is locked
regardless of the per-type flag, and the global setting always prevails.
The flag defaults to False, so existing databases keep the current
behavior on update. A note next to the global setting in Purchase
Settings explains the interaction.

In purchase the "locked" state is represented by state == 'done' (there
is no dedicated `locked` field as in sale), so the per-type lock writes
that state, mirroring the core global-lock branch in button_approve.

Includes tests covering the per-type lock, the no-lock default, the
global setting precedence and the double-validation flow.

closes #345

Signed-off-by: Luciano Esperlazza <les@adhoc.inc>
@stopkovae
stopkovae merged commit a61c6e8 into BTLzdravtech:18.0 Jul 24, 2026
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants