diff --git a/content/docs/dispensary/prescriptions.md b/content/docs/dispensary/prescriptions.md index 4b1791f9..2fcc5fd2 100644 --- a/content/docs/dispensary/prescriptions.md +++ b/content/docs/dispensary/prescriptions.md @@ -269,17 +269,17 @@ Default value is `Any` when you are issuing units. This is a list of batch numbers that you have in store for this item: -| Column | Description | -| :--------------------- | :----------------------------------------------------------------------------------------------- | -| **Batch** | Batch number. It is a designation given to products made in the same manufacturing run. | -| **Expiry** | Expiry date of the batch (format: MM/YYYY) | -| **Location** | This is the name of the location where the item is stored if your inventory is managed with storage locations | -| **On Hold** | Indicates whether a batch is on hold or not. You cannot issue a batch that is on hold. | -| **In Store (packs)** | Total number of packs in your store | -| **Available (packs)** | Number of packs available (not already allocated to other shipments) | -| **Pack Size** | Quantity of units per pack | -| **[Unit] Qty Issued** | Total quantity of units to be issued | -| **Pack Qty Issued** | Number of packs to be issued | +| Column | Description | +| :-------------------- | :------------------------------------------------------------------------------------------------------------ | +| **Batch** | Batch number. It is a designation given to products made in the same manufacturing run. | +| **Expiry** | Expiry date of the batch (format: MM/YYYY) | +| **Location** | This is the name of the location where the item is stored if your inventory is managed with storage locations | +| **On Hold** | Indicates whether a batch is on hold or not. You cannot issue a batch that is on hold. | +| **In Store (packs)** | Total number of packs in your store | +| **Available (packs)** | Number of packs available (not already allocated to other invoices) | +| **Pack Size** | Quantity of units per pack | +| **[Unit] Qty Issued** | Total quantity of units to be issued | +| **Pack Qty Issued** | Number of packs to be issued | ![List of available batch numbers](/docs/dispensary/images/prescription_additem_listofbatches.png) @@ -307,19 +307,18 @@ You may see one or more warning messages on this screen: ![placeholder warning!](/docs/distribution/images/os_warning_placeholder.png) -The warning is shown to let you know that not enough stock is available to fulfil your request. A placeholder quantity is added automatically so that you can keep track of the amount requested, while adding more stock (for example by using an internal order or inbound shipment). +The warning is shown to let you know that not enough stock is available to fulfil your request. A placeholder quantity is added automatically so that you can keep track of the amount requested, while adding more stock (for example by using an Internal Order or Inbound Shipment). This image also shows the warning which lets you know that some stock lines are expired; this may be why the system did not auto-allocate particular stock lines. -However you can still manually choose those lines and issue the expired stock! +However you can still manually choose those lines and issue the expired stock! ![pack sizes warning!](/docs/distribution/images/os_warning_pack_sizes.png) This warning tells you that because of the available pack sizes, the system has rounded up the quantity requested. In this example, there is no pack size that is less than `12`. There are packs of `20` available though, so when 12 tablets are requested, the system has rounded up the request to `2` packs of `20`. - ![pack sizes warning!](/docs/distribution/images/os_warning_no_quantity.png) -If you add an item, forget to enter a quantity to issue, and click `OK` you will see this warning message. It is informing you that there is no issue quantity; from here you can click `OK` again to confirm that you intended to enter `0`, in which case the window will close and a placeholder row will be added to the shipment. You can edit the row later and add a quantity. If you forget to add a quantity however, and confirm the shipment as allocated, this row will be removed! +If you add an item, forget to enter a quantity to issue, and click `OK` you will see this warning message. It is informing you that there is no issue quantity; from here you can click `OK` again to confirm that you intended to enter `0`, in which case the window will close and a placeholder row will be added to the invoice. You can edit the row later and add a quantity. If you forget to add a quantity however, and confirm the invoice as allocated, this row will be removed! ### Issue a quantity of packs @@ -414,7 +413,7 @@ Once an item has been added to your prescription, the status will automatically - Prescription status is now `PICKED` - You are now invited to confirm the prescription via the `Confirm Verified` button -At this stage, you are still able to edit shipment lines, to add items or to delete existing lines. +At this stage, you are still able to edit invoice lines, to add items or to delete existing lines. ### Verify the Prescription diff --git a/content/docs/distribution/customer_returns.md b/content/docs/distribution/customer_returns.md index c30d4519..ed07a32c 100644 --- a/content/docs/distribution/customer_returns.md +++ b/content/docs/distribution/customer_returns.md @@ -117,7 +117,7 @@ Often, you will be processing the return of goods that you sent via an Outbound 1. In the `Customers` window, you will be presented with a list of available customers. You can select your customer from the list or you can filter by typing the customer name.
-In the below example, we are wanting to receive returned stock from Tamaki Central Medical Store. +In the below example, we are wanting to receive returned stock from Slytherin Clinic.
![Create Customer Return](/docs/distribution/images/ir_create.gif) @@ -205,7 +205,7 @@ There are 5 status for the Customer Return: | **Delivered** | When you confirm that the return has been delivered | | **Verified** | When you have verified the Customer Return | -You probably noticed that two of the status values only apply to automatically created shipments. These are created by the system when another store in the system creates a Supplier Return to return stock to your store. If this is the case you'll see a message near the top of the page: +You probably noticed that two of the status values only apply to automatically created returns. These are created by the system when another store in the system creates a Supplier Return to return stock to your store. If this is the case you'll see a message near the top of the page: ![Automatic IS message](/docs/distribution/images/ir_message_automatic.png) @@ -213,11 +213,11 @@ Note that this message appears differently if the status is `Delivered` or `Veri ![Automatic IS message: delivered](/docs/distribution/images/ir_message_automatic_delivered.png) -If, however, you've created an Inbound Shipment manually, then the following message shows: +If, however, you've created an Customer Return manually, then the following message shows: ![Manual IS message](/docs/distribution/images/ir_message_manual.png) -and you'll see that the status bar has only the status values which apply to this type of shipment. +and you'll see that the status bar has only the status values which apply to this Customer Return.
Inbound Shipment Status Sequence (New & manual) @@ -393,7 +393,7 @@ Once you have done this: - Return status is now `DELIVERED`
-In case your Customer Return is automatic, you cannot confirm its delivery unless the customer has confirmed its shipment. In other words, your shipment status has to be SHIPPED before you can confirm that you have received the returned goods. +In case your Customer Return is automatic, you cannot confirm its delivery unless the customer has confirmed its shipment. In other words, your return status has to be SHIPPED before you can confirm that you have received the returned goods.
![Alt Text](/docs/distribution/images/ir_confirmdelivered.gif) diff --git a/content/docs/distribution/images/cust_gotocust2.png b/content/docs/distribution/images/cust_gotocust2.png index 9ea4284e..78f43195 100644 Binary files a/content/docs/distribution/images/cust_gotocust2.png and b/content/docs/distribution/images/cust_gotocust2.png differ diff --git a/content/docs/distribution/images/gotoir.png b/content/docs/distribution/images/gotoir.png index d1d4ece1..2ebd433c 100644 Binary files a/content/docs/distribution/images/gotoir.png and b/content/docs/distribution/images/gotoir.png differ diff --git a/content/docs/distribution/images/gotoos2.png b/content/docs/distribution/images/gotoos2.png index d8093440..9ffa1b16 100644 Binary files a/content/docs/distribution/images/gotoos2.png and b/content/docs/distribution/images/gotoos2.png differ diff --git a/content/docs/distribution/images/ir_additem.gif b/content/docs/distribution/images/ir_additem.gif index 6cc5ba82..4e8915c1 100644 Binary files a/content/docs/distribution/images/ir_additem.gif and b/content/docs/distribution/images/ir_additem.gif differ diff --git a/content/docs/distribution/images/ir_additembutton.png b/content/docs/distribution/images/ir_additembutton.png index a450a27c..57ea2174 100644 Binary files a/content/docs/distribution/images/ir_additembutton.png and b/content/docs/distribution/images/ir_additembutton.png differ diff --git a/content/docs/distribution/images/ir_confirmdelivered.gif b/content/docs/distribution/images/ir_confirmdelivered.gif index c2e75367..bcb78cab 100644 Binary files a/content/docs/distribution/images/ir_confirmdelivered.gif and b/content/docs/distribution/images/ir_confirmdelivered.gif differ diff --git a/content/docs/distribution/images/ir_create.gif b/content/docs/distribution/images/ir_create.gif index ca7d262c..306bf1db 100644 Binary files a/content/docs/distribution/images/ir_create.gif and b/content/docs/distribution/images/ir_create.gif differ diff --git a/content/docs/distribution/images/ir_delete.gif b/content/docs/distribution/images/ir_delete.gif index 19ec3bee..9515453a 100644 Binary files a/content/docs/distribution/images/ir_delete.gif and b/content/docs/distribution/images/ir_delete.gif differ diff --git a/content/docs/distribution/images/ir_deleteselectedlines.gif b/content/docs/distribution/images/ir_deleteselectedlines.gif index 99980f00..ae2e479a 100644 Binary files a/content/docs/distribution/images/ir_deleteselectedlines.gif and b/content/docs/distribution/images/ir_deleteselectedlines.gif differ diff --git a/content/docs/distribution/images/ir_filter.gif b/content/docs/distribution/images/ir_filter.gif index 989d2282..63deb17c 100644 Binary files a/content/docs/distribution/images/ir_filter.gif and b/content/docs/distribution/images/ir_filter.gif differ diff --git a/content/docs/distribution/images/ir_filter_columns.gif b/content/docs/distribution/images/ir_filter_columns.gif index 4d682196..46db4489 100644 Binary files a/content/docs/distribution/images/ir_filter_columns.gif and b/content/docs/distribution/images/ir_filter_columns.gif differ diff --git a/content/docs/distribution/images/ir_group_by_item.gif b/content/docs/distribution/images/ir_group_by_item.gif index 3aa4d1c5..91cb6b97 100644 Binary files a/content/docs/distribution/images/ir_group_by_item.gif and b/content/docs/distribution/images/ir_group_by_item.gif differ diff --git a/content/docs/distribution/images/ir_message_automatic.png b/content/docs/distribution/images/ir_message_automatic.png index cc308dae..e67270e2 100644 Binary files a/content/docs/distribution/images/ir_message_automatic.png and b/content/docs/distribution/images/ir_message_automatic.png differ diff --git a/content/docs/distribution/images/ir_message_automatic_delivered.png b/content/docs/distribution/images/ir_message_automatic_delivered.png index 7abee3f9..662ec6fa 100644 Binary files a/content/docs/distribution/images/ir_message_automatic_delivered.png and b/content/docs/distribution/images/ir_message_automatic_delivered.png differ diff --git a/content/docs/distribution/images/ir_message_manual.png b/content/docs/distribution/images/ir_message_manual.png index fa9b3edf..59bf2757 100644 Binary files a/content/docs/distribution/images/ir_message_manual.png and b/content/docs/distribution/images/ir_message_manual.png differ diff --git a/content/docs/distribution/images/ir_newreturn.png b/content/docs/distribution/images/ir_newreturn.png index b75c0d6a..ad7664b4 100644 Binary files a/content/docs/distribution/images/ir_newreturn.png and b/content/docs/distribution/images/ir_newreturn.png differ diff --git a/content/docs/distribution/images/ir_sidepanel.gif b/content/docs/distribution/images/ir_sidepanel.gif index 0b583c92..3264f8bb 100644 Binary files a/content/docs/distribution/images/ir_sidepanel.gif and b/content/docs/distribution/images/ir_sidepanel.gif differ diff --git a/content/docs/distribution/images/req_gotoreq2.png b/content/docs/distribution/images/req_gotoreq2.png index 495ca32f..fd73508f 100644 Binary files a/content/docs/distribution/images/req_gotoreq2.png and b/content/docs/distribution/images/req_gotoreq2.png differ diff --git a/content/docs/replenishment/images/clicknewreturn.png b/content/docs/replenishment/images/clicknewreturn.png index f64a352c..cc52ffad 100644 Binary files a/content/docs/replenishment/images/clicknewreturn.png and b/content/docs/replenishment/images/clicknewreturn.png differ diff --git a/content/docs/replenishment/images/goto_rnr.png b/content/docs/replenishment/images/goto_rnr.png index d64a76c6..41a8738a 100644 Binary files a/content/docs/replenishment/images/goto_rnr.png and b/content/docs/replenishment/images/goto_rnr.png differ diff --git a/content/docs/replenishment/images/gotoor.png b/content/docs/replenishment/images/gotoor.png index 53d01266..c8b88961 100644 Binary files a/content/docs/replenishment/images/gotoor.png and b/content/docs/replenishment/images/gotoor.png differ diff --git a/content/docs/replenishment/images/intord_access.png b/content/docs/replenishment/images/intord_access.png index 2acfc228..800536a3 100644 Binary files a/content/docs/replenishment/images/intord_access.png and b/content/docs/replenishment/images/intord_access.png differ diff --git a/content/docs/replenishment/images/is_gotois.png b/content/docs/replenishment/images/is_gotois.png index dda89f3f..b03f03a8 100644 Binary files a/content/docs/replenishment/images/is_gotois.png and b/content/docs/replenishment/images/is_gotois.png differ diff --git a/content/docs/replenishment/images/or_actions_deletelines.gif b/content/docs/replenishment/images/or_actions_deletelines.gif new file mode 100644 index 00000000..cf0432c2 Binary files /dev/null and b/content/docs/replenishment/images/or_actions_deletelines.gif differ diff --git a/content/docs/replenishment/images/or_additem.gif b/content/docs/replenishment/images/or_additem.gif index de59e826..9b427fb9 100644 Binary files a/content/docs/replenishment/images/or_additem.gif and b/content/docs/replenishment/images/or_additem.gif differ diff --git a/content/docs/replenishment/images/or_additembutton.png b/content/docs/replenishment/images/or_additembutton.png index 37d44e58..d20cb904 100644 Binary files a/content/docs/replenishment/images/or_additembutton.png and b/content/docs/replenishment/images/or_additembutton.png differ diff --git a/content/docs/replenishment/images/or_confirmpicked.gif b/content/docs/replenishment/images/or_confirmpicked.gif index bd0bf6f4..c3c0beb2 100644 Binary files a/content/docs/replenishment/images/or_confirmpicked.gif and b/content/docs/replenishment/images/or_confirmpicked.gif differ diff --git a/content/docs/replenishment/images/or_created.png b/content/docs/replenishment/images/or_created.png index e3bc167e..c1800899 100644 Binary files a/content/docs/replenishment/images/or_created.png and b/content/docs/replenishment/images/or_created.png differ diff --git a/content/docs/replenishment/images/or_delete.gif b/content/docs/replenishment/images/or_delete.gif index faa96c96..b62f0973 100644 Binary files a/content/docs/replenishment/images/or_delete.gif and b/content/docs/replenishment/images/or_delete.gif differ diff --git a/content/docs/replenishment/images/or_filter.png b/content/docs/replenishment/images/or_filter.png index f5e137d1..1d7a9b1e 100644 Binary files a/content/docs/replenishment/images/or_filter.png and b/content/docs/replenishment/images/or_filter.png differ diff --git a/content/docs/replenishment/images/or_filter_columns.gif b/content/docs/replenishment/images/or_filter_columns.gif index a48b1dbf..8435212e 100644 Binary files a/content/docs/replenishment/images/or_filter_columns.gif and b/content/docs/replenishment/images/or_filter_columns.gif differ diff --git a/content/docs/replenishment/images/or_group_by_item.gif b/content/docs/replenishment/images/or_group_by_item.gif index a7f69244..7e78eab4 100644 Binary files a/content/docs/replenishment/images/or_group_by_item.gif and b/content/docs/replenishment/images/or_group_by_item.gif differ diff --git a/content/docs/replenishment/images/or_sidepanel.gif b/content/docs/replenishment/images/or_sidepanel.gif index 3d8394ba..75dd0579 100644 Binary files a/content/docs/replenishment/images/or_sidepanel.gif and b/content/docs/replenishment/images/or_sidepanel.gif differ diff --git a/content/docs/replenishment/images/sup_gotosup.png b/content/docs/replenishment/images/sup_gotosup.png index dc247a19..376ecd68 100644 Binary files a/content/docs/replenishment/images/sup_gotosup.png and b/content/docs/replenishment/images/sup_gotosup.png differ