Skip to content

Commit

Permalink
Merge pull request #72 from msupply-foundation/v2.2.0-changes
Browse files Browse the repository at this point in the history 
V2.2.0 changes
  • Loading branch information
@lache-melvin
lache-melvin authored Aug 26, 2024
2 parents be46883 + 638c0c4 commit ceaf765
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 37 deletions.
Binary file modified content/docs/distribution/images/req_filter.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 22 additions & 13 deletions content/docs/distribution/requisitions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,44 @@ From this screen you can:

### Requisition list

1. The list of Requisitions is divided into 5 columns:
The list of Requisitions is divided into 6 columns:

| Column | Description |
| :---------- | :---------------------------------- |
| **Name** | Name of the Customer |
| **Number** | Reference Number of the requisition |
| **Created** | Creation Date of the requisition |
| **Status** | Current Status of the requisition |
| **Comment** | Comment for the requisition |
| Column | Description |
| :------------ | :----------------------------------------------- |
| **Name** | Name of the Customer |
| **Number** | Reference Number of the requisition |
| **Created** | Creation Date of the requisition |
| **Status** | Current Status of the requisition |
| **Shipments** | Number of shipments created from the requisition |
| **Comment** | Comment for the requisition |

1. The list can display a fixed number of requisitions per page. On the bottom left corner, you can see how many requisitions are currently displayed on your screen.
<div class="note">If you have program requisitions enabled, you may have additional columns in this table!</div>

The list can display a fixed number of requisitions per page. On the bottom left corner, you can see how many requisitions are currently displayed on your screen.

![Page](/docs/distribution/images/os_list_showing.png)

3. If you have more requisitions than the current limit, you can navigate to the other pages by tapping on the page number or using the right of left arrows (bottom right corner).
If you have more requisitions than the current limit, you can navigate to the other pages by tapping on the page number or using the right of left arrows (bottom right corner).

![Page](/docs/distribution/images/os_list_pagenumbers.png)

4. You can also select a different number of rows to show per page using the option at the bottom right of the page.
You can also select a different number of rows to show per page using the option at the bottom right of the page.

![Rows per page](/docs/introduction/images/rows-per-page-select.png)

### Filter Requisitions

You can filter the list of requisitions by name or status. This can be useful if you're looking for one particular requisition!
You can filter the list of requisitions by name, status or whether shipments have been created. This can be useful if you're looking for one particular requisition!

![Requisition filter](/docs/distribution/images/req_filter.png)

Select the desired filter from the list and either select a status from the list, or start typing in the `Name` field. All the requisitions which match the entered filter value will appear in the list.
Select the desired filter(s) from the list:

- **Name**: Start typing in the field to filter by customer name
- **Status**: Select a status from the dropdown list
- **Shipment created**: Toggle on to only show requisitions where shipments have been created

All the requisitions which match the filters will appear in the list.

### Exporting Requisitions

Expand Down
43 changes: 23 additions & 20 deletions content/docs/replenishment/r-and-r-forms.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,28 @@ Once you are happy with your inputs, click `OK` to generate the form. You will b

The R&R form contains the following columns. Calculated/non-editable columns are greyed out. Columns marked with an asterisk (\*) below are editable.

| Column | Description |
| :----------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| **Code** | Item code |
| **Name** | Item name |
| **Strength** | Strength of the item |
| **Unit** | Unit of measure for the item |
| **VEN** | Item VEN category: Vital (V), Essential (E), Non-essential (N) |
| **Initial balance\*** | Stock on hand for this item at the start of the period. Uses the final balance from the previous R&R form (if it exists), or attempts to calculate the balance based on any transaction data in Open mSupply. |
| **Received\*** | Quantity of this item received during the period. Populated by quantities received through Inbound Shipments. |
| **Consumed\*** | Quantity of this item consumed during the period. Populated by quantities distributed through Outbound Shipments or Prescriptions. |
| **Adjusted consumption** | Consumption, adjusted for any days out of stock. Calculation is <code>Consumed x Days in period / Days in stock</code> |
| **Adjustments\*** | Losses/adjustments made for this item during the period. Can be positive or negative. Populated by data from Stocktakes or Inventory Adjustments. |
| **Stock out duration\*** | Number of days in the period where stock on hand for the item was 0. |
| **Final balance** | Stock on hand for the item at the end of the period. Calculation is <code>Initial balance + Received - Consumed + Adjustments</code> |
| **AMC** | Average monthly consumption over the last 3 periods |
| **Maximum** | <code>AMC x 2</code> |
| **Expiry\*** | Expiry date of the earliest expiring available batch of this item |
| **Requested\*** | Quantity to be requested in the requisition. Calculated as <code>Maximum - Final balance</code> |
| **Comment\*** | You can add any comments to the line as needed |
| **Confirmed\*** | Use this column to keep track of which lines are complete. Acts as the save button for changes to a line. |
| Column | Description |
| :------------------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| **Code** | Item code |
| **Name** | Item name |
| **Strength** | Strength of the item |
| **Unit** | Unit of measure for the item |
| **VEN** | Item VEN category: Vital (V), Essential (E), Non-essential (N) |
| **Initial balance\*** | Stock on hand for this item at the start of the period. Uses the final balance from the previous R&R form (if it exists), or attempts to calculate the balance based on any transaction data in Open mSupply. |
| **Received\*** | Quantity of this item received during the period. Populated by quantities received through Inbound Shipments. |
| **Consumed/distributed\*** | Quantity of this item consumed during the period. Populated by quantities distributed through Outbound Shipments or Prescriptions. |
| **Adjusted consumption/distribution** | Consumption, adjusted for any days out of stock. Calculation is <code>Consumed x Days in period / Days in stock</code> |
| **Adjustments +/-\*** | Losses/adjustments made for this item during the period. Can be positive or negative. Populated by data from Stocktakes or Inventory Adjustments. |
| **Stock out duration\*** | Number of days in the period where stock on hand for the item was 0. |
| **Final balance** | Stock on hand for the item at the end of the period. Calculation is <code>Initial balance + Received - Consumed + Adjustments</code> |
| **AMC/AMD** | Average monthly consumption (distribution) over the last 3 periods |
| **Maximum** | Ideal amount of stock to have on hand, requested quantity could be any amount up to this value. Calculated as <code>AMC x 2</code> |
| **Expiry\*** | Expiry date of the earliest expiring available batch of this item |
| **Requested\*** | Quantity to be requested in the requisition. Calculated as <code>Maximum - Final balance</code> |
| **Low stock** | Warning indicator if your final balance is low in comparison to the ideal stock level. Will show `!` when `Final balance` is less than half of `Maximum`, and `!!` when less than quarter |
| **Comment\*** | You can add any comments to the line as needed |
| **Confirmed\*** | Use this column to keep track of which lines are complete. Acts as the save button for changes to a line. |
| **Approved Quantity** | Once the R&R Form is finalised, this column will show the quantity approved by the authoriser (if authorisation is configured) |

### Editing the R&R Form

Expand Down Expand Up @@ -122,5 +124,6 @@ When you are ready to finalise the R&R form, click the `Finalise` button at the

- The R&R form will no longer be editable
- An Internal Order will be created and sent to the selected supplier. The values entered against each item in the R&R form are used to populate the Internal Order, so check the `Requested` value before confirming!
- Once the Internal Order has been approved by the authoriser, the `Approved Quantity` column will be populated with the approved quantities.

You can also click the `Close` button at any time to return to the list view.
6 changes: 2 additions & 4 deletions content/docs/settings/permissions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ In addition to these specific permissions, you'll need to ensure that the user h
| | | Edit stock | Modify stock lines |
| | | Create Repack Or Split Stock | Can create repack or split stock lines |
| | | Enter Inventory Adjustments | Can maintain inventory adjustments |
| | | Edit Inventory Adjustments | Can maintain inventory adjustments - if either enter or edit permission is given the user can edit |
| | | Finalise Inventory Adjustments | Can maintain inventory adjustments - if either enter, edit or finalise permission is given the user can edit |
| Permissions (2) | Invoices | View customer invoices | Can view Outbound Shipments. Also used to query statistics on the dashboard |
| | | Create customer invoices | Can maintain Outbound Shipments |
| | | Edit customer invoices | Can maintain Outbound Shipments - if either edit or create permission is given the user can edit |
Expand All @@ -49,8 +47,8 @@ In addition to these specific permissions, you'll need to ensure that the user h
| | | Add Patients | Can maintain Patients |
| | | Edit Patient Details | Can maintain Patients - if either add or edit permission is given the user can edit |
| Permissions (3) | Admin | View log | Able to view the logs, these show as a tab on many windows |
| | Requisitions | View requisitions | Can view Requisitions |
| | | Create and edit requisitions | Can maintain Requisitions |
| | Requisitions | View requisitions | Can view Requisitions and R&R Forms |
| | | Create and edit requisitions | Can maintain Requisitions and R&R Forms |
| | Stocktakes | Create Stocktake | Can create Stocktakes |
| | | Delete Stocktake | Can delete Stocktakes |
| | | Add Stocktake lines | Can add Stocktake lines |
Expand Down

0 comments on commit ceaf765

Please sign in to comment.