Merge branch 'main' into staging

mark-prins · mark-prins · commit 3c6f0b75e00c · 2025-12-29T15:32:04.000+13:00
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@
 This repo contains the public documentation for Open mSupply, hosted on [docs.msupply.foundation](https://docs.msupply.foundation/docs/introduction/).
 Documentation is stored in markdown files and built using [zola](https://www.getzola.org/documentation/getting-started/installation/)
 
+There is also a staging url, for staging for docs in 'staging' branch: https://docs-staging.msupply.foundation
+
 ## Getting Started
 
 This process has become slightly convoluted because zola to beginwith, but further because we use an outdated version of zola and installing it locally is no longer straightforward. We must use no more than version 17.2 of Zola, not 19.2 which is the latest as of writing.
diff --git a/content/docs/distribution/outbound_shipments/index.md b/content/docs/distribution/outbound_shipments/index.md
@@ -668,3 +668,45 @@ If you do not have enough room on your screen, or simply aren't interested in so
 Click on the `Show / hide columns` button which is at the top right of the table. This gives a list of the columns available - you can check the columns you want to see. The options chosen are stored for the current browser, so next time you view an Outbound Shipment, you will see the selected columns only. If you have chosen which columns to show, then the button is shown in blue to remind you that there are more columns available.
 
 ![Hide columns](images/os_show_hide_columns.gif)
+
+### View or Edit the Requisition Information Panel
+
+The information Panel allows you to see or edit information about the
+outbound shipment. It is divided into five sections:
+
+- Additional Info
+- Related documents
+- Invoice Details
+- Transport Details
+- Actions
+
+#### Additional Info
+
+In the **Additional Info** section you can:
+
+- See who created the Outbound shipment (name of the user)
+- See when the Outbound shipment was created
+- View and edit the Outbound shipment colour. To edit the colour, tap on the coloured
+  circle and select a colour from the pop-up
+- Write or edit a comment
+
+#### Related Documents
+
+In the **Related Documents** section you can see other related transactions for
+the Outbound shipment.
+
+If you the shipment was created from a Requisition you will see the Requisition number and a link to view the Requisition.
+
+#### Invoice Details
+
+This section lists the service changes, sell price, total price and foreign currency if applicable.
+
+#### Transport Details
+
+The **Transport Details** section is where you can enter the expected delivery date and a reference for the delivery.
+
+#### Actions
+
+- You can tap on the **Copy to Clipboard** button to copy
+  the Requisition details to the clipboard.
+- You can **Delete** the Outbound shipment if it is not in the `Verified` status.
diff --git a/content/docs/getting_started/tutorial/images/main_nav.png b/content/docs/getting_started/tutorial/images/main_nav.png
diff --git a/content/docs/getting_started/tutorial/index.es.md b/content/docs/getting_started/tutorial/index.es.md
@@ -42,7 +42,7 @@ Si el menú está cerrado, simplemente pasar el cursor sobre los elementos del m
 
 ![Main navigation](images/main_nav.png)
 
-En algunas pantallas verás que el encabezado muestra un título, como **Salida** in the example above. en el ejemplo anterior. Al hacer clic en un envío específico, el título cambiará a **Salida/ #[número de envío]**. Puedes hacer clic en la parte **Salida** para volver a la lista o utilizar la navegación principal a la izquierda.
+En algunas pantallas verás que el encabezado muestra un encabezado, como **Pedidos internos** en el ejemplo anterior. Al hacer clic en un pedido específico, ese encabezado cambia a **Pedidos internos / #[el número de pedido]**. Puede hacer clic en la parte **Pedidos internos** para regresar a la lista o utilizar la navegación principal a la izquierda.
 
 ### Atajos de teclado
 
diff --git a/content/docs/getting_started/tutorial/index.fr.md b/content/docs/getting_started/tutorial/index.fr.md
@@ -44,7 +44,7 @@ Si le menu est fermé, il suffit de survoler les éléments du menu pour l'ouvri
 
 ![Main navigation](images/main_nav.png)
 
-Sur certains écrans, vous verrez afficher un libellé en en-tête, tel que **Expédition** dans l'exemple ci-avant. En cliquant sur une expédition spécifique de la liste, vous changez cet en-tête en **Expédition/ #[le numéro d'expédition]**. Vous pouvez cliquer sur **Expédition** pour retourner à la liste - ou utiliser le menu de navigation à gauche.
+Sur certains écrans, vous verrez que l'en-tête affiche un titre, tel que **Commandes internes** dans l'exemple ci-dessus. Cliquer sur une commande spécifique modifie ensuite cet en-tête en **Commandes internes / #[le numéro de commande]**. Vous pouvez cliquer sur la partie **Commandes internes** pour revenir à la liste - ou utiliser la navigation principale à gauche.
 
 ### Raccourcis clavier
 
diff --git a/content/docs/getting_started/tutorial/index.md b/content/docs/getting_started/tutorial/index.md
@@ -44,7 +44,7 @@ If the menu is closed, simply hovering over the menu items will open it, in whic
 
 ![Main navigation](images/main_nav.png)
 
-On some screens you'll see that the header shows a heading, such as **Outbound Shipment** in the example above. Clicking on a specific shipment then changes that heading to **Outbound Shipment / #[the shipment number]**. You are able to click on the **Outbound Shipment** part to return to the list - or use the main navigation on the left.
+On some screens you'll see that the header shows a heading, such as **Internal Orders** in the example above. Clicking on a specific order then changes that heading to **Internal Orders / #[the order number]**. You are able to click on the **Internal Orders** part to return to the list - or use the main navigation on the left.
 
 ### Keyboard shortcuts
 
@@ -76,7 +76,6 @@ Some users have access to more than one store. To change the store which is curr
 
 ![](images/store_switcher.png)
 
-
 You will see the notification and the store name in the footer will be updated. From now, all actions will be in the newly selected store.
 
 You can view your user information by clicking on your username:
diff --git a/content/docs/getting_started/tutorial/index.pt.md b/content/docs/getting_started/tutorial/index.pt.md
@@ -43,7 +43,7 @@ Se o menu estiver fechado, basta passar o rato sobre os itens do menu para o abr
 
 ![Navegação principal](images/main_nav.png)
 
-Em alguns ecrãs, verá que o cabeçalho mostra um título, como **Remessa de saída** no exemplo acima. Clicar numa remessa específica altera o título para **Remessa de saída / #[número da remessa]**. Pode clicar na parte **Envio de saída** para voltar à lista ou utilizar a navegação principal à esquerda.
+Em algumas telas você verá que o cabeçalho mostra um título, como **Ordens Internas** no exemplo acima. Clicar em um pedido específico altera o título para **Pedidos internos / #[o número do pedido]**. Você pode clicar na parte **Ordens Internas** para retornar à lista - ou usar a navegação principal à esquerda.
 
 ### Atalhos de teclado
 
diff --git a/content/docs/introduction/roadmap/images-en/roadmap.png b/content/docs/introduction/roadmap/images-en/roadmap.png
diff --git a/content/docs/introduction/roadmap/images-es/roadmap.png b/content/docs/introduction/roadmap/images-es/roadmap.png
diff --git a/content/docs/introduction/roadmap/images-fr/roadmap.png b/content/docs/introduction/roadmap/images-fr/roadmap.png
diff --git a/content/docs/inventory/locations/index.md b/content/docs/inventory/locations/index.md
@@ -88,6 +88,6 @@ The three buttons across the top allow you to easily filter by volume:
 | EMPTY     | Will only show locations which have no stock in them               |
 | AVAILABLE | Shows locations which have enough capacity to store the stock line |
 
-<div class="note">The calculation of the available space requires the correct volume of the location to be specified and that all of the stock in that location has a volume recorded</div>
+<div class="note">The calculation of the available space requires the correct volume of the location to be specified and that all of the stock in that location has a <a href="/docs/inventory/stock-view/#volume-per-pack">volume recorded</a></div>
 
 Also note that items can have a [restricted location type](https://docs.msupply.org.nz/items:item_basics:tab_storage?s[]=restricted&s[]=location&s[]=type#restricted_to) configured. When selecting a location for these items, only locations with the same type will be shown in the picker.
diff --git a/content/docs/inventory/stock view/index.md b/content/docs/inventory/stock view/index.md
@@ -30,7 +30,7 @@ A detailed list of your inventory appears:
 | **Code**          | Code assigned to this item in mSupply                                                                                                                                                          |
 | **Name**          | This is the name by which mSupply will refer to the item                                                                                                                                       |
 | **Batch**         | Batch number of the stock line                                                                                                                                                                 |
-| **Expiry**        | Expiry date of the batch                                                                                                                                                                       |
+| **Expiry**        | Expiry date of the batch. Note that the date shows in a red font if there is less than four months from now until the expiry date.                                                             |
 | **VVM Status\***  | <p style="margin-bottom: 0">Indicates the vaccine's viability.</p> <small>\*Enabled via the [Manage VVM status for stock](/docs/manage/facilities/#store-preferences) store preference</small> |
 | **Location**      | Where the item is being stored in your facility                                                                                                                                                |
 | **Unit**          | The unit of measure for the item                                                                                                                                                               |
@@ -56,6 +56,20 @@ The list of Stock can be exported to a comma separated file (csv). Simply click
 
 The export function will download all stock lines, not just the current page, if you have more than 20 of them.
 
+### Non standard items
+
+What happens if a supplier sends you stock of an item which is not currently visible in your store?
+
+In this case the following happens:
+
+- The stock line for this item appears in your store and is visible in the Stock list
+- The item now shows in your item list
+- You are able to issue that stock in an outbound shipment or prescription
+
+Note that the item will only show while you have stock on hand for it, so if you issue all of the stock it will no longer appear in your item list.
+
+You also cannot order more of this item - it cannot be added the item to a manual inbound shipment or an internal order.
+
 ## Creating a new stock line
 
 <div class="note">
@@ -102,6 +116,12 @@ If this is the case, the reason input will be enabled as below:
 
 Item variants include packaging information - if your new stock line has a matching pack size, the `Volume per pack` field will be automatically populated.
 
+### Volume per pack
+
+Specify the volume of a single pack in cubic metres. This is used to calculate the available storage space when stock is stored in a location. Note that you will need to also record the volume of the location in order to see the [remaining capacity](/docs/inventory/locations/#assigning-locations-to-stock) of the location.
+
+The `Total volume` field below shows you the calculated value of the volume used by this stock line, which is the volume per pack \* the number of packs (`Pack Qty`),
+
 ### Donor
 
 If the [Allow tracking of stock by donor](/docs/manage/global-preferences/) global preference is enabled then you can allocate a donor to this stock line.
