adhoc-cicd-odoo-odoo:43d731da from base: 18.0

---

ingadhoc-account-financial-tools:3aea88ba from base: 18.0

---

ingadhoc-aeroo_reports:12b64479 from base: 18.0

---

ingadhoc-enterprise-extensions:42eb0a87 from base: 18.0

---

ingadhoc-miscellaneous:e369e7fd from base: 18.0

---

plugberry-mercadopago:85d35ad5 from base: 18.0

---

plugberry-payment:07235676 found in branch 88 +73 -0 ( 1 ) ( 1 ahead , 0 behind )
Subject: [FIX] resolving conflict with failed cherry-pick
Author: Alexis Lopez ( <loa@adhoc.com.ar> )
Commit date: 2025-02-25 16:23:43

---

plugberry-pagos360:998dd461 from base: 18.0

---

ingadhoc-ingadhoc-demo:96db1fe9 from base: 18.0

---

ingadhoc-ingadhoc-odoo-saas:b75114dd from base: 18.0

---

ingadhoc-ingadhoc-odoo-saas-adhoc2:b57617dc from base: 18.0

---

adhoc-cicd-oca-mail:17d3e0b3 from base: 18.0

---

adhoc-cicd-oca-hr:8af362e3 from base: 18.0

---

ingadhoc-stock:8db6174a from base: 18.0

---

ingadhoc-account-invoicing:e38af5d6 from base: 18.0

---

ingadhoc-account-payment:5379776f from base: 18.0

---

ingadhoc-odoo-argentina-ee:c9fa8ea8 from base: 18.0

---

ingadhoc-argentina-sale:827ba64d from base: 18.0

---

ingadhoc-delivery:5d8c3937 from base: 18.0

---

ingadhoc-hr:ae5136e9 from base: 18.0

---

ingadhoc-multi-company:12a56168 from base: 18.0

---

ingadhoc-multi-store:50151fff from base: 18.0

---

ingadhoc-partner:a56b7205 from base: 18.0

---

ingadhoc-product:e736f58e from base: 18.0

---

adhoc-cicd-oca-pos1:cebdb9b7 from base: 18.0

---

ingadhoc-project:eedde0f1 from base: 18.0

---

ingadhoc-purchase:35f5434a from base: 18.0

---

ingadhoc-sale:d371fc4e from base: 18.0

---

ingadhoc-third-party-apps:c527084a from base: 18.0

---

ingadhoc-uruguay:480dfaae from base: 18.0

---

ingadhoc-website:572796b4 from base: 18.0

---

adhoc-cicd-oca-stock-logistics-request:8880c2ab from base: 18.0

---

adhoc-cicd-oca-account-analytic:c634f53d from base: 18.0

---

adhoc-cicd-oca-stock-logistics-availability:b52d1e53 from base: 18.0

---

adhoc-cicd-oca-account-reconcile:7419bc5b from base: 18.0

---

adhoc-cicd-oca-timesheet:70dc6c64 from base: 18.0

---

adhoc-cicd-odoo-enterprise:e9f76f4c from base: 18.0

---

adhoc-cicd-oca-survey:b5eecc7e from base: 18.0

---

adhoc-cicd-oca-website:c843acf0 from base: 18.0

---

adhoc-cicd-oca-server-backend:a44b3e26 from base: 18.0

---

adhoc-cicd-odoo-design-themes:9bb68b37 from base: 18.0

---

adhoc-cicd-oca-partner-contact:63a7cbb2 from base: 18.0

---

adhoc-cicd-oca-server-auth:dd5dfe77 from base: 18.0

---

adhoc-cicd-oca-knowledge:4d320040 from base: 18.0

---

adhoc-cicd-oca-product-attribute:dec46857 from base: 18.0

---

adhoc-cicd-oca-brand:0c0f4e72 from base: 18.0

---

adhoc-cicd-oca-mis-builder:c0a5cd06 from base: 18.0

---

adhoc-cicd-oca-account-invoicing:4314e27f from base: 18.0

---

adhoc-cicd-oca-stock-logistics-workflow:7c1e15dc from base: 18.0

---

adhoc-cicd-oca-management-system:86b29960 from base: 18.0

---

adhoc-cicd-oca-server-ux:5c437d1a from base: 18.0

---

adhoc-cicd-oca-e-commerce:307def40 from base: 18.0

---

adhoc-cicd-oca-hr-expense:c52c6f75 from base: 18.0

---

adhoc-cicd-oca-manufacture:8614a34d from base: 18.0

---

adhoc-cicd-oca-crm:10432fe3 from base: 18.0

---

adhoc-cicd-oca-stock-logistics-barcode:0f1ad1a8 from base: 18.0

---

adhoc-cicd-oca-project:d37f3d64 from base: 18.0

---

adhoc-cicd-oca-server-tools:c6235922 from base: 18.0

---

adhoc-cicd-oca-social:374ea96c from base: 18.0

---

adhoc-cicd-oca-purchase-workflow:e4028101 from base: 18.0

---

adhoc-cicd-oca-stock-logistics-warehouse:ebd48ef0 from base: 18.0

---

adhoc-cicd-oca-web:6c72295e from base: 18.0

---

adhoc-cicd-oca-product-pack:3576a4c0 from base: 18.0

---

adhoc-cicd-oca-hr-holidays:58fb6833 from base: 18.0

---

adhoc-cicd-oca-reporting-engine:d9917816 from base: 18.0

---

adhoc-cicd-oca-sale-workflow:d79f1f7d from base: 18.0

---

adhoc-cicd-oca-bank-statement-import:7d697ac1 from base: 18.0

---

ingadhoc-odoo-argentina:a198e229 from base: 18.0

---

adhoc-cicd-oca-report-print-send:ea9336ad from base: 18.0

---