change button in ui

akretion · Nov 26, 2024 · 9cf5056 · 9cf5056
1 parent 6971f82
commit 9cf5056
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/shopfloor_inventory/services/inventory.py b/shopfloor_inventory/services/inventory.py
@@ -122,6 +122,7 @@ def _inventory_base_search_domain(self):
             ("user_id", "=", self.env.user.id),
             ("state", "=", "confirm"),
             ("shopfloor_validated", "!=", True),
+            ("company_id", "=", self.env.company.id),
         ]
 
     def _inventory_search(self, name_fragment=None, inventory_ids=None):

diff --git a/shopfloor_inventory_mobile/static/wms/src/scenario/inventory.js b/shopfloor_inventory_mobile/static/wms/src/scenario/inventory.js
@@ -101,7 +101,7 @@ const Inventory = {
                     <div class="button-list button-vertical-list full">
                         <v-row align="center">
                             <v-col class="text-center" cols="12">
-                                <btn-action action="todo" @click="state.on_confirm">{{ $t('inventory.button.confirm') }}</btn-action>
+                                <btn-action action="todo" @click="state.on_confirm">{{ $t('inventory.button.confirm_location') }}</btn-action>
                             </v-col>
                         </v-row>
                     </div>
@@ -128,7 +128,7 @@ const Inventory = {
                <div class="button-list button-vertical-list full">
                    <v-row align="center">
                        <v-col class="text-center" cols="12">
-                           <btn-action action="todo" @click="state.on_confirm">{{ $t('inventory.button.confirm') }}</btn-action>
+                           <btn-action action="todo" @click="state.on_confirm">{{ $t('inventory.button.confirm_done_location') }}</btn-action>
                        </v-col>
                    </v-row>
                </div>

diff --git a/shopfloor_mobile/static/wms/src/i18n/en.json b/shopfloor_mobile/static/wms/src/i18n/en.json
@@ -40,6 +40,8 @@
   "inventory.button.cancel": "Cancel",
   "inventory.button.confirm": "Confirm",
   "inventory.button.confirm_qty": "Confirm quantity",
+  "inventory.button.confirm_location": "Confirm location",
+  "inventory.button.confirm_done_location": "Confirm location done",
   "inventory.button.back": "Back",
   "inventory.button.done": "Done",
   "inventory.message.location_empty": "Location is empty"

diff --git a/shopfloor_mobile/static/wms/src/i18n/fr.json b/shopfloor_mobile/static/wms/src/i18n/fr.json
@@ -36,7 +36,9 @@
   "inventory.button.start": "Démarrer",
   "inventory.button.cancel": "Annuler",
   "inventory.button.confirm": "Confirmer",
-  "inventory.button.confirm_qty": "Confirmer quantité",
+  "inventory.button.confirm_location": "Confirmer emplacement",
+  "inventory.button.confirm_done_location": "Confirmer emplacement terminé",
+  "inventory.button.confirm_qty": "Confirmer quantité article",
   "inventory.button.back": "Retour",
   "inventory.button.done": "Terminer",
   "inventory.message.location_empty": "Emplacement vide"