Merge remote-tracking branch 'origin/release/2026-04-03' into feature/IO-3624-Shop-Config-UX-Refresh

# Conflicts: # client/src/components/shop-employees/shop-employees-form.component.jsx
2026-03-24 13:55:37 -04:00
parent dd306e1a7b 9b1488ac3b
commit 2690e09626
6 changed files with 13 additions and 1 deletions
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -339,6 +339,7 @@
          "require_actual_delivery_date": "",
          "templates": ""
        },
+        "disableBillCostCalculation": "",
        "dms": {
          "apcontrol": "",
          "appostingaccount": "",