Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
roxy-dao committed Jan 23, 2025
2 parents 5956ca5 + cb0868a commit 8432909
Show file tree
Hide file tree
Showing 251 changed files with 409 additions and 446 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/static_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Deploy static content to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
branches: ['main']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -18,7 +18,7 @@ permissions:
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
group: 'pages'
cancel-in-progress: false

jobs:
Expand All @@ -30,19 +30,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Zola Build
uses: shalzz/zola-deploy-action@v0.17.2
uses: shalzz/zola-deploy-action@v0.19.2
env:
BUILD_DIR: .
BUILD_ONLY: true
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
# Upload public directory only
path: "public/."
path: 'public/.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
6 changes: 3 additions & 3 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TOCtitle = "On this page"
search_placeholder = "Search docs..."

[languages.fr]
generate_feed = true # there will be a feed for French content
generate_feeds = true # there will be a feed for French content
build_search_index = true
title = "mSupply 🇫🇷"

Expand All @@ -38,7 +38,7 @@ TOCtitle = "En esta pagina"
search_placeholder = "Buscar documentos..."

[languages.es]
generate_feed = true # there will be a feed for Spanish content
generate_feeds = true # there will be a feed for Spanish content
build_search_index = true
title = "mSupply 🇪🇸"

Expand All @@ -49,7 +49,7 @@ TOCtitle = "Nesta página"
search_placeholder = "Pesquisar documentos..."

[languages.pt]
generate_feed = true # there will be a feed for Portuguese content
generate_feeds = true # there will be a feed for Portuguese content
build_search_index = true
title = "mSupply 🇵🇹"

Expand Down
3 changes: 0 additions & 3 deletions content/coldchain/_index.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
+++
title = "mSupply Cold Chain"
description = "Open Source cold chain monitoring solution."
date = 2022-07-12
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 100
template = "coldchain/section.html"
insert_anchor_links = "right"

+++
2 changes: 0 additions & 2 deletions content/coldchain/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catalogue"
description = "Manage your items"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
2 changes: 0 additions & 2 deletions content/dashboard/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "mSupply Dashboard"
description = "Dashboard for mSupply desktop and cold chain data visualisation."
date = 2022-07-12
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 200
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/dashboard/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catalogue"
description = "Manage your items"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
2 changes: 0 additions & 2 deletions content/docs/TSS/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "TSS"
description = "Open mSupply's Target Software Standards compliance"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 90
paginate_by = 0
Expand Down
3 changes: 1 addition & 2 deletions content/docs/TSS/_index.fr.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
+++
title = "TSS"
description = "Conformité d'Open mSupply avec les Target Software Standards"
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 90
paginate_by = 0
template = "docs/section.fr.html"
insert_anchor_links = "right"
+++
+++
2 changes: 0 additions & 2 deletions content/docs/TSS/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "TSS"
description = "Open mSupply's Target Software Standards compliance"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 90
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Documentos Open mSupply"
description = "The documents of the AdiDoks theme."
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 1
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/_index.fr.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Documentation"
description = "The documents of the AdiDoks theme."
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 1
template = "docs/section.fr.html"
Expand Down
2 changes: 0 additions & 2 deletions content/docs/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Open mSupply Documentation"
description = "The documents of the AdiDoks theme."
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 1
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/_index.pt.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Abra a documentação do mSupply"
description = "The documents of the AdiDoks theme."
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 1
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/catalogue/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catálogo"
description = "Gestiona tus artículos"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.es.html"
sort_by = "weight"
weight = 50
Expand Down
2 changes: 0 additions & 2 deletions content/docs/catalogue/_index.fr.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catalogue"
description = "Gérer vos produits"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.fr.html"
sort_by = "weight"
weight = 6
Expand Down
2 changes: 0 additions & 2 deletions content/docs/catalogue/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catalogue"
description = "Manage your items"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 50
Expand Down
8 changes: 4 additions & 4 deletions content/docs/catalogue/assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ A list of assets can be exported as a csv file using the `Export` button.

#### Delete

On the Open mSupply Central Server, there is the option to select and delete asset catalogue items using the toolbar action:
On the Open mSupply Central Server, there is the option to select and delete asset catalogue items. The `Actions` footer will display at the bottom of the screen when an asset row is selected:

![Assets delete](/docs/catalogue/images/assets_delete.png)
![Assets delete](/docs/catalogue/images/delete-assets.png)

### Managing status log reasons

Expand All @@ -115,8 +115,8 @@ On this page you can:
This will open a create new reason modal
![New reason modal](/docs/catalogue/images/reasons_create_modal.png)

- Select and delete existing reasons with the `Actions` dropdown
![Delete reason button](/docs/catalogue/images/reasons_delete.png)
- Select reasons to delete them. Action buttons will display at the bottom of the screen when an asset log reason is selected
![Delete reason button](/docs/catalogue/images/delete-asset-log-reasons.png)

- Filter existing reasons by status using the filter dropdown
![Filter reasons](/docs/catalogue/images/reasons_filter.png)
2 changes: 0 additions & 2 deletions content/docs/catalogue/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Catalogue"
description = "Manage your items"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
Binary file modified content/docs/catalogue/images/cat_itemslist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/docs/catalogue/images/cat_mllist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/docs/catalogue/images/delete-assets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/docs/catalogue/images/item_ledger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions content/docs/catalogue/items.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,33 @@ There are two tabs in the bottom part of the screen:
This tab lists the Master Lists associated with this item.
![Item detail headers](/docs/catalogue/images/cat_itemmasterlists.png)

### Ledger

The item ledger tab shows a history of transactions in this store for the item.

![](/docs/catalogue/images/item_ledger.png)

The ledger is divided into 16 columns:

| Column | Description |
| :------------------- | :--------------------------------------------------------------- |
| **Type** | The type of the transaction |
| **Date** | The date of the transaction was confirmed |
| **Time** | The time of the transaction was confirmed |
| **Invoice Number** | The invoice (shipment) number of the transaction |
| **Name** | The name of the customer or supplier |
| **Status** | The status of the transaction |
| **Expiry** | The expiry date of the stock line |
| **Batch** | The batch number of the stock line |
| **Pack Size** | The pack size |
| **Number of packs** | The number of packs in the transaction |
| **Unit Qty** | The quantity that was assigned to the transaction in units |
| **Balance** | The balance of the stock line |
| **Pack cost price** | The cost price of the pack |
| **Pack sell price** | The sell price of the pack |
| **Total before tax** | The total cost of the transaction before tax (in local currency) |
| **Reason** | The reason for the adjustment (if required) |

## Item Variants

On the [Open mSupply Central Server](/docs/getting_started/central), a third tab, Item Variants, is available. This tab allows you to configure variations of the item, such as different manufacturers or packaging sizes.
Expand Down
2 changes: 0 additions & 2 deletions content/docs/coldchain/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Cold chain"
description = "Características de Cold chain"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 66
template = "docs/section.es.html"
Expand Down
4 changes: 1 addition & 3 deletions content/docs/coldchain/_index.fr.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
+++
title = "Chaîne du froid"
description = "caractéristiques de la chaîne du froid"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 67
template = "docs/section.fr.html"
draft = false
+++
+++
2 changes: 0 additions & 2 deletions content/docs/coldchain/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Cold chain"
description = "Cold chain features"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 66
template = "docs/section.html"
Expand Down
4 changes: 2 additions & 2 deletions content/docs/coldchain/equipment.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ To add a filter to the page, choose the required filter from the drop down. Mult

#### Delete Equipment

Assets can be selected and deleted using the toolbar action:
Select assets to delete them:

![](/docs/coldchain/images/delete_rows.png)
![Delete coldchain equipment](/docs/coldchain/images/delete-coldchain-equipment.png)

### Importing And Exporting

Expand Down
2 changes: 0 additions & 2 deletions content/docs/coldchain/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Dispensary"
description = "Patient module."
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
Binary file modified content/docs/coldchain/images/breaches_list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/docs/coldchain/images/chart_view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/docs/coldchain/images/chart_view_too_much_data.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/docs/coldchain/images/delete_rows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified content/docs/coldchain/images/equipment_list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions content/docs/developer/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Developer"
description = "Open mSupply Developer Documentation"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 200
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/developer/_index.fr.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Pour les développeurs"
description = "Documentation pour le développement d'Open mSupply"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 200
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/developer/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Developer"
description = "Open mSupply Developer Documentation"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 200
paginate_by = 0
Expand Down
2 changes: 0 additions & 2 deletions content/docs/developer/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Developer"
description = "Open mSupply Developer Documentation"
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
2 changes: 0 additions & 2 deletions content/docs/dispensary/_index.es.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Dispensario"
description = "Patient module"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 65
template = "docs/section.es.html"
Expand Down
2 changes: 0 additions & 2 deletions content/docs/dispensary/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Dispensary"
description = "Patient module"
date = 2025-05-01T08:00:00+00:00
updated = 2021-05-01T08:00:00+00:00
sort_by = "weight"
weight = 65
template = "docs/section.html"
Expand Down
2 changes: 0 additions & 2 deletions content/docs/dispensary/images/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
+++
title = "Dispensary"
description = "Patient module."
date = 2025-05-01T18:00:00+00:00
updated = 2021-05-01T18:00:00+00:00
template = "docs/section.html"
sort_by = "weight"
weight = 6
Expand Down
Binary file removed content/docs/dispensary/images/add_item_button.png
Binary file not shown.
Binary file removed content/docs/dispensary/images/additem_headers.png
Binary file not shown.
Binary file modified content/docs/dispensary/images/click_new_prescription.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified content/docs/dispensary/images/prescription_created.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 8432909

Please sign in to comment.