Merge pull request #1189 from openmsupply/1052-os-add-item-modal

Outbound Shipment add item modal Ux improvements

Author: mark-prins

client/packages/common/src/intl/locales/en/catalogue.json

@@ -22,8 +22,6 @@
   "label.weight": "Weight",
   "messages.click-to-return-to-item-list": "Unable to find an item with that ID. Click OK to return to the list of items.",
   "messages.click-to-return-to-master-lists": "Unable to find a master list with that ID. Click OK to return to the list of master lists",
-  "tab.general": "General",
-  "tab.master-lists": "Master Lists",
   "title.amc": "AMC",
   "title.categories": "Categories",
   "title.details": "Details",

client/packages/common/src/intl/locales/en/common.json

@@ -81,7 +81,7 @@
   "label.amc": "AMC",
   "label.amount": "Amount",
   "label.app-version": "Version:",
-  "label.available": "Available",
+  "label.available-packs": "Available (packs)",
   "label.barcode": "Barcode",
   "label.batch": "Batch",
   "label.chargeCode": "Charge Code",
@@ -119,7 +119,7 @@
   "label.finalised": "Finalised",
   "label.forecast-quantity": "Suggested Quantity",
   "label.hold": "Hold",
-  "label.in-store": "In store",
+  "label.in-store": "In Store (packs)",
   "label.invoice-number": "Number",
   "label.issue": "Issue",
   "label.item_one": "Item",
@@ -148,6 +148,7 @@
   "label.our-soh": "Our SOH",
   "label.pack": "Pack",
   "label.pack-quantity": "Pack Qty",
+  "label.pack-quantity-issued": "Pack Qty Issued",
   "label.pack-size": "Pack Size",
   "label.phone": "Phone",
   "label.picked": "Picked",
@@ -159,9 +160,8 @@
   "label.select": "Select",
   "label.select-all": "Select all",
   "label.selected": "Selected",
-  "label.sell": "Sell",
+  "label.sell": "Pack Sell Price",
   "label.server": "Server",
-  "label.server-mode": "Server",
   "label.settings-central-site-id": "Central server Site ID",
   "label.settings-interval": "Interval (seconds)",
   "label.settings-password": "Sync password",
@@ -186,7 +186,8 @@
   "label.type": "Type",
   "label.unit": "Unit",
   "label.unit-price": "Unit Price",
-  "label.unit-quantity": "{{unit}} Qty",
+  "label.unit-quantity": "Unit Qty",
+  "label.unit-quantity-issued": "{{unit}} Qty Issued",
   "label.units": "Units",
   "label.user": "User",
   "label.verified": "Verified",

client/packages/common/src/intl/locales/en/distribution.json

@@ -1,6 +1,7 @@
 {
   "button.add-from-master-list": "Add from master list",
   "button.add-item": "Add item",
+  "button.allocate": "Allocate",
   "button.allocate-lines": "Allocate placeholder lines",
   "button.create-shipment": "Create Shipment",
   "button.delete-lines": "Delete selected lines",
@@ -35,8 +36,8 @@
   "heading.stock-details": "Stock details",
   "heading.sub-total": "Sub total",
   "heading.total": "Total",
-  "heading.totals": "Totals",
   "heading.grand-total": "Grand total",
+  "label.total-quantity": "Total quantity",
   "label.incoming-stock": "Stock arriving",
   "label.stock-on-order": "Stock on order",
   "label.all-requested-quantity": "Other requested",
@@ -47,11 +48,9 @@
   "label.amc": "AMC",
   "label.any": "Any",
   "label.available-quantity": "Available quantity: {{number}} units",
-  "label.available": "Available",
   "label.customer-name": "Customer Name",
   "label.customer-ref": "Customer Ref",
   "label.group-by-item": "Group by Item",
-  "label.in-store": "In store",
   "label.edited-by": "Edited by",
   "label.issue": "Issue",
   "label.no-unallocated-rows-selected": "All of the selected rows are already allocated",
@@ -64,7 +63,6 @@
   "label.requested-quantity": "Requested quantity",
   "label.select-rows-to-allocate-them": "Select rows to allocate them",
   "label.cant-delete-disabled-requisition": "Can only delete lines when requisition is in Draft",
-  "label.cant-delete-disabled-shipment": "You cannot delete a line when status is Shipped, Delivered or Verified",
   "label.supply-quantity": "Quantity to supply",
   "label.unit_one": "{{unit}}",
   "label.unit_other": "{{unit}}s",
@@ -91,7 +89,6 @@
   "messages.customer-requisition-created-on": "Customer requisition created on {{date}}",
   "messages.off-hold-confirmation": "This will re-enable status changes",
   "messages.on-hold-confirmation": "This will prevent any further status changes until the hold is removed",
-  "messages.cant-delete-invoices": "Can only delete invoices with a status of 'New' or 'Allocated'",
   "messages.no-stock-available": "There is no stock available",
   "messages.cant-delete-requisitions": "Can only delete requisitions with a status of 'Draft'",
   "messages.click-to-return-to-requisitions": "Unable to find a requisition with that ID. Click OK to return to the requisition list",

client/packages/common/src/intl/locales/en/inventory.json

@@ -32,7 +32,6 @@
   "message.no-supplier": "Inventory Adjustment",
   "messages.locked-description": "This will prevent further changes to the stocktake until it is unlocked.",
   "messages.unlocked-description": "This will re-enable changes to the stocktake.",
-  "messages.cant-delete-stocktakes": "Can only delete stocktakes with a status of 'New'",
   "messages.select-rows-to-delete": "Select rows to delete",
   "messages.click-to-return": "Unable to find a stocktake with that ID. Click OK to return to the stocktake list",
   "messages.confirm-delete-stocktakes_one": "This will permanently remove 1 stocktake",

client/packages/common/src/intl/locales/en/replenishment.json

@@ -24,7 +24,6 @@
   "heading.stock-charges": "Stock charges",
   "heading.sub-total": "Sub total",
   "heading.total": "Total",
-  "heading.totals": "Totals",
   "heading.tax": "Tax",
   "heading.grand-total": "Grand total",
   "heading.edit-tax-rate": "Edit tax rate percentage",
@@ -70,7 +69,6 @@
   "messages.internal-order-created-on": "Internal order created on {{date}}",
   "messages.off-hold-confirmation": "This will re-enable status changes",
   "messages.on-hold-confirmation": "This will prevent any further status changes until the hold is removed",
-  "messages.cant-delete-invoices": "Can only delete shipments with a status of 'New'",
   "messages.cant-delete-requisitions": "Can only delete requisitions with a status of 'Draft'",
   "messages.changing-max-mos": "This will change the maximum months of stock target.",
   "messages.changing-min-mos": "This will change the minimum months of stock threshold.",
@@ -98,6 +96,5 @@
   "messages.error-saving-shipment": "Error saving shipment 🥺",
   "messages.saved": "Saved",
   "messages.select-rows-to-delete-them": "Select rows to delete them",
-  "messages.shipment-saved": "Shipment saved 🥳",
-  "messages.delete-shipment-warning": "This will permanently delete shipment(s)"
+  "messages.shipment-saved": "Shipment saved 🥳"
 }

client/packages/common/src/intl/locales/es/common.json

@@ -1 +1,3 @@
-{ "button.language": "Idioma" }
+{
+  "button.language": "Idioma"
+}

client/packages/common/src/intl/locales/es_CO/app.json

@@ -1,18 +1,18 @@
 {
-    "auth.unauthenticated-message": "Actualmente no ha iniciado sesión. Haga clic en OK para volver a la pantalla de inicio de sesión.",
-    "auth.server-error": "¡El servidor ha devuelto un error al obtener los detalles del usuario!\nNo se puede continuar, por favor póngase en contacto con soporte.",
-    "auth.no-store-assigned": "No estás asignado a ninguna almacén. Inicie sesión como un usuario diferente o comuníquese con su administrador.",
-    "app": "mSupply",
-    "auth.alert-title": "Error de autenticación",
-    "auth.permission-denied": "Permiso denegado",
-    "auth.timeout-message": "Ha sido desconectado de su sesión debido a la inactividad. Haga clic en OK para volver a la pantalla de inicio de sesión.",
-    "button.close-the-menu": "Cerrar el menú",
-    "button.open-the-menu": "Abrir el menú",
-    "catalogue": "Catálogo",
-    "customer-requisition": "Requisiciones",
-    "customers": "Clientes",
-    "dashboard": "Tablero",
-    "distribution": "Distribución",
-    "docs": "Documentos",
-    "auth.timeout-title": ""
+  "auth.unauthenticated-message": "Actualmente no ha iniciado sesión. Haga clic en OK para volver a la pantalla de inicio de sesión.",
+  "auth.server-error": "¡El servidor ha devuelto un error al obtener los detalles del usuario!\nNo se puede continuar, por favor póngase en contacto con soporte.",
+  "auth.no-store-assigned": "No estás asignado a ninguna almacén. Inicie sesión como un usuario diferente o comuníquese con su administrador.",
+  "app": "mSupply",
+  "auth.alert-title": "Error de autenticación",
+  "auth.permission-denied": "Permiso denegado",
+  "auth.timeout-message": "Ha sido desconectado de su sesión debido a la inactividad. Haga clic en OK para volver a la pantalla de inicio de sesión.",
+  "button.close-the-menu": "Cerrar el menú",
+  "button.open-the-menu": "Abrir el menú",
+  "catalogue": "Catálogo",
+  "customer-requisition": "Requisiciones",
+  "customers": "Clientes",
+  "dashboard": "Tablero",
+  "distribution": "Distribución",
+  "docs": "Documentos",
+  "auth.timeout-title": ""
 }

client/packages/common/src/intl/locales/fr/catalogue.json

@@ -8,7 +8,6 @@
   "label.doses": "Doses",
   "label.is-vaccine": "Vaccin",
   "label.margin": "Marge",
-  "label.master-list-name": "Nom",
   "label.months": "Mois",
   "label.name": "Nom",
   "label.outer-pack-size": "Taille de l'emballage extérieur",
@@ -21,8 +20,6 @@
   "label.weight": "Poids (kg)",
   "messages.click-to-return-to-item-list": "Impossible de trouver un article avec ce code. Cliquez sur OK pour revenir à la liste des articles.",
   "messages.click-to-return-to-master-lists": "Impossible de trouver la liste maîtresse recherchée. Cliquez sur OK pour revenir à la liste des listes maîtres",
-  "tab.general": "Général",
-  "tab.master-lists": "Listes maîtresses",
   "title.amc": "CMM",
   "title.categories": "Catégories",
   "title.details": "Détails",

client/packages/common/src/intl/locales/fr/common.json

@@ -69,7 +69,7 @@
   "label.amount": "Montant",
   "label.api-version": "Version API:",
   "label.app-version": "Version:",
-  "label.available": "Disponible",
+  "label.available-packs": "Disponible (packs)",
   "label.batch": "Lot",
   "label.chargeCode": "Code facturation",
   "label.clear-filter": "Effacer le filtre",
@@ -103,7 +103,7 @@
   "label.finalised": "Finalisé(e)",
   "label.forecast-quantity": "Quantité suggérée",
   "label.hold": "Suspendu",
-  "label.in-store": "En magasin",
+  "label.in-store": "En magasin (packs)",
   "label.invoice-number": "Numéro",
   "label.issue": "Distribuer",
   "label.item": "Article",
@@ -127,6 +127,7 @@
   "label.our-soh": "Notre SDU",
   "label.pack": "Pack",
   "label.pack-quantity": "Qté de packs",
+  "label.pack-quantity-issued": "Qté de packs émise",
   "label.pack-size": "Format Pack",
   "label.phone": "Téléphone",
   "label.picked": "Prélevé(e)",
@@ -152,6 +153,7 @@
   "label.unit": "Unité",
   "label.unit-price": "Prix unitaire",
   "label.unit-quantity": "Quantité unitaire",
+  "label.unit-quantity-issued": "{{unit}} quantité émise",
   "label.units": "Unités",
   "label.verified": "Vérifiée",
   "label.website": "Site internet",

client/packages/common/src/intl/locales/fr/distribution.json

@@ -38,18 +38,15 @@
   "heading.stock-details": "Détails stock",
   "heading.sub-total": "Sous-total",
   "heading.total": "Total",
-  "heading.totals": "Totaux",
   "heading.grand-total": "Grand total",
   "label.add-batch": "Ajouter lot",
   "label.allocated": "Alloué(e)",
   "label.amc": "CMM",
   "label.any": "Tout",
   "label.available-quantity": "Quantité disponible : {{number}} unités",
-  "label.available": "Disponible",
   "label.customer-name": "Nom du client",
   "label.customer-ref": "Référence client",
   "label.group-by-item": "Grouper par article",
-  "label.in-store": "En magasin",
   "label.edited-by": "Édité(e) par",
   "label.issue": "Distribuer",
   "label.no-unallocated-rows-selected": "Tous les lignes sélectionnées sont déjà allouées",
@@ -63,7 +60,6 @@
   "messages.create-outbound-from-requisition": "Êtes-vous sûr(e) de vouloir créer une livraison sortante pour cette réquisition client ?",
   "label.add-charges": "Ajouter frais",
   "label.cant-delete-disabled-requisition": "Vous ne pouvez supprimer des lignes lorsque le statut de la réquisition est 'Brouillon'",
-  "label.cant-delete-disabled-shipment": "Vous ne pouvez pas supprimer une ligne lorsque le statut est 'Expédié(e), Livré(e) ou Vérifié(e)",
   "label.supply-quantity": "Quantité à fournir",
   "label.unit_one": "{{unit}}",
   "label.unit_other": "{{unit}}s",
@@ -86,7 +82,6 @@
   "messages.outbound-shipment-created-on": "Livraison sortante créée le {{date}}",
   "messages.customer-requisition-created-on": "Réquisition client créée le {{date}}",
   "messages.off-hold-confirmation": "Cela permettra de réactiver les changements de statut",
-  "messages.cant-delete-invoices": "Vous ne pouvez supprimer les livraisons avec le statut 'Nouvel(le)' ou 'Alloué(e)'",
   "messages.no-stock-available": "Pas de stock disponible",
   "messages.cant-delete-requisitions": "Vous pouvez uniquement supprimer les réquisitions avec un statut 'Brouillon'",
   "messages.click-to-return-to-shipments": "La livraison recherchée est introuvable. Cliquez sur OK pour retourner à la liste des livraisons sortantes",

client/packages/common/src/intl/locales/fr/inventory.json

@@ -25,7 +25,6 @@
   "label.batch": "Lot",
   "messages.locked-description": "Cela empêchera les changements de cet inventaire jusqu'au déverrouillage.",
   "messages.unlocked-description": "Cela permettra de réactiver les changement pour cet inventaire.",
-  "messages.cant-delete-stocktakes": "Seuls les inventaires avec un statut 'Nouvel(le)' peuvent être supprimés",
   "messages.select-rows-to-delete": "Sélectionner les lignes à supprimer",
   "messages.click-to-return": "Impossible de trouver un inventaire avec ce numéro. Cliquez sur OK pour retourner à la liste des inventaires",
   "messages.confirm-delete-stocktakes_one": "Cela supprimera définitivement 1 inventaire",
@@ -38,7 +37,6 @@
   "messages.deleted-locations_one": "{{count}} emplacement supprimé",
   "messages.deleted-locations_other": "{{count}} emplacements supprimés",
   "messages.deleted-stocktakes_other": "{{count}} inventaires supprimés",
-  "messages.click-to-view-item": "Cliquez pour voir les détails de l'article pour '{{itemName}}'",
   "messages.error-deleting-locations_one": "{{count}} emplacement n'a pas pu être supprimé",
   "messages.error-deleting-locations_other": "{{count}} emplacements n'ont pas pu être supprimés",
   "placeholder.enter-an-item-code-or-name": "Entrer le code ou le nom de l'article",