from 43bca7644bf3ea20a745787099b68c61e4826c77

content/docs/dispensary/prescriptions.md

@@ -139,7 +139,8 @@ Once your Prescription has been created, you can select a clinician from the `Cl
 The Information Panel allows you to see or edit information about the Prescription. It is divided into multiple sections:
 
 - Additional Info
-- Invoice Details
+- Pricing
+- Patient Details
 
 We are planning to add more sections in the future as Open mSupply grows.
 
@@ -153,17 +154,21 @@ You can close by tapping on the `X Close` button, on the top right corner of the
 
 ![Open and close the Information Panel](/docs/dispensary/images/prescription_infopanel_openclose.gif)
 
-#### Additional Info
+#### Information Panel
 
 In the **Additional Info** section, you can:
 
 - See who created the Prescription (name of the user)
 - View and edit the Prescription color. To edit the color, tap on the coloured circle and select a color from the pop-up
 - Write or edit a comment
 
-#### Prescription Details
+In the **Pricing** section, you can:
 
-In this section, you will see by default the total selling price of the items listed in the Prescription.
+- See the total selling price of the items listed in the Prescription.
+
+In the **Patient Details** section, you can:
+
+- Select a Diagnosis related to the prescription
 
 ### Prescription Status Sequence
 
@@ -222,11 +227,13 @@ As demonstrated below, tap on the down arrow of the `Confirm` button and select
 
 ## Adding lines to a Prescription
 
-Tap on the `Add Item` button (top right corner).
+Tap on the `Add Item` button (top right corner) of the prescription window to begin adding items to the prescription.
 
-A new `Add Item` window opens.
+![Add Item button](/docs/dispensary/images/prescription_add_item_button.png)
 
-![Add Item button](/docs/dispensary/images/add_item_button.png)
+Once an item has been added to the prescription, you can also use the `New Item` button in the left hand panel to add an additional item.
+
+![New Item Button](/docs/dispensary/images/prescription_new_item_button.png)
 
 ### Select an Item
 
@@ -238,117 +245,80 @@ In the `Add Item` window, you can look up an item by:
 
 Once your item is highlighted, tap on the name or press `Enter`.
 
-![Alt Text](/docs/dispensary/images/prescription_additem.gif)
-
-Once the item is selected, you can see the following information:
+![Adding an item to a prescription](/docs/dispensary/images/prescription_additem.gif)
 
-#### Headers
+Once the item is selected, you can see information about the item broken down into different sections
 
-- Item code and name (eg. _030063 Acetylsalicylic Acid 100mg tabs_)
-- the available stock quantity for this item (eg. _20,976 units_)
-- the item's unit (eg. _Tab_)
-- **Note**: The medicine's instruction for use.
+#### Item Section
 
-<div class="imagetitle">
-<b>Example:</b> For the item *030063 Acetylsalicylic Acid 100mg tabs*, there are 20,976 tabs available. 
-</div>
+This shows the item name and code.
 
-![add item headers](/docs/dispensary/images/additem_headers.png)
+![alt text](/docs/dispensary/images/prescription_item_section.png)
 
-#### Issue [Quantity] of units in packs of [Pack Size]
+#### Quantity Section
 
-In the `Issue` field, you can enter the quantity that you want to issue to your patient.
+- the available batches for this item
+- the item's unit (eg. _Tablets_)
 
-By default, you are invited to issue a quantity of **units**. However, you have the possibility to issue a quantity of packs instead by changing the value in the second dropdown (`Pack Size`).
+![Quantity Section](/docs/dispensary/images/prescription_qty_section.png)
 
-Default value is `Any` when you are issuing units.
+##### Issuing stock
 
-![Prescription Issue quantity](/docs/dispensary/images/prescription_issuequantityunits.png)
+In the `Issue` field, you can enter the quantity that you want to issue to your patient.
+The system will then attempt to automatically allocate the stock for the prescription.
 
 #### List of available batches:
 
 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 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                                                                                  |
+| Column                | Description                                                                             |
+| :-------------------- | :-------------------------------------------------------------------------------------- |
+| **Expiry**            | Expiry date of the batch (format: MM/YYYY)                                              |
+| **Batch**             | Batch number. It is a designation given to products made in the same manufacturing run. |
+| **Pack Size**         | Quantity of units per pack                                                              |
+| **In Stock (units)**  | Total number of units in your store                                                     |
+| **Available (units)** | Number of units available (not already allocated to other invoices)                     |
+| **Units Issued**      | Total quantity of units to be issued                                                    |
 
 ![List of available batch numbers](/docs/dispensary/images/prescription_additem_listofbatches.png)
 
-The batches which are available for selection are shown first and batches which are not (on hold or no stock available) are shown below and in a grey font.
-
-### Issue a quantity of units
-
-By default, you are invited to issue a quantity of **units**, regardless of the pack size (number of units in a pack).
+### Issue a quantity
 
 <div class="imagetitle">
-In the below example, we are issuing 1000 units of the item. All 1000 units will be taken from the same batch (third row). The first two batches was not selected because they are expired. 
+In the below example, we are issuing 1000 units of the item. All 1000 units will be taken from the same batch (first row). The other two batches was not selected because they are expired or on hold.
 </div>
 
-![additem!](/docs/dispensary/images/prescription_additem_issueunits.png)
+![Auto allocate 1000 units from single batch](/docs/dispensary/images/prescription_additem_1.png)
+![Auto allocate 1000 units from single batch (Collapsed View)](/docs/dispensary/images/prescription_additem_1_collapsed.png)
 
 <div class="imagetitle">
-In this other example, we are issuing 82 units. System selects two batches with different pack sizes. 
+In this other example, we are issuing 11 units. System selects two batches with different pack sizes. 
 </div>
 
-![additem!](/docs/dispensary/images/prescription_additem_issueunitstwobatches.png)
+![Allocated Item 2 Batches selected](/docs/dispensary/images/prescription_additem_issueunitstwobatches.png)
+![Allocated Item 2 Batches selected (Collapsed View)](/docs/dispensary/images/prescription_additem_issueunitstwobatches_collapsed.png)
 
 #### Warnings
 
 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).
-
-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!
+![Warning: can't allocate that many](/docs/dispensary/images/prescription_warning_cant_allocate_more_than_we_have.png)
+This warning tells you that you are trying to issue more units than you have in stock. You will need to reduce the quantity you are trying to issue, or add more stock to the system.
 
-![pack sizes warning!](/docs/distribution/images/os_warning_pack_sizes.png)
+![Warning: Partial Pack](/docs/dispensary/images/prescription_warning_non-whole-packs.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`.
+This warning tells you that because of the available pack sizes, the quantity you are trying to issue would result in an a partial pack being issued. If do not want to split a pack, you'll need to enter a quantity that is a multiple of the pack size(s) available.
 
-![pack sizes warning!](/docs/distribution/images/os_warning_no_quantity.png)
+![Warning: Expired stock](/docs/dispensary/images/prescription_warning_on-hold.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 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
-
-You can decide to issue a quantity of **packs**. To do this, you can change the value in the `Pack Size` dropdown.
-
-<div class="imagetitle">
-Let's imagine that you only want to dispense in a pack size of 100 units. You can change the dropdown value from `Any` to `100`. 
-</div>
-
-![Alt Text](/docs/dispensary/images/prescription_additem_switchtopack.gif)
-
-You are now offered to issue a number of packs of 10 units. Only batch number(s) with a pack size of 10 units can be automatically issued.
-
-<div class="note">
-If you had previously entered a quantity of units and you switch to a quantity of packs, the quantity of units will automatically be converted into the correct quantity of packs.  
-</div>
-
-When a pack size is selected, stock lines which have a different pack size from the one selected are not available for selection. As such, those rows are listed lower down in the table and are shown in a grey font, in the same way as other unavailable rows.
+This warning tells you that some of your stock is on hold and/or expired cannot be auto allocated.
 
 ### Manual Allocation
 
-Regardless if you chose to issue a quantity of units or packs, you can always manually change the quantity at the batch number level directly before pressing on OK.
-
-You simply have to enter or edit the quantity in the `Packs Qty Issued` column.
+Regardless if how the system automatically allocates stock, you can always manually change the quantity at the batch number level directly.
+This method also allows you to select expired batches, but not on hold batches.
 
-The values in the **Total** row will be automatically updated with the new quantity.
-
-<div class="note">
- <b></b> When allocating quantities at the batch number level, the quantity you enter is always a quantity of packs. 
-</div>
+To select or adjust the selected batches, enter or edit the quantity in the `Units Issued` column.
 
 <figure>
 <img src="/docs/dispensary/images/prescription_additem_manualallocation.gif" style="width:100%">
@@ -359,8 +329,8 @@ The values in the **Total** row will be automatically updated with the new quant
 
 When you are happy with the quantity, you can either press on:
 
-- the `OK` button. You are redirected to the Prescription view and your item has been added to the list
-- the `OK & Next` button to add another item right away
+- the `Save` button.
+
 - the `Cancel` button if you do not want to add the item to the Prescription any more
 
 ## Editing a Prescription Line
@@ -374,10 +344,7 @@ To edit a prescription line, tap on it. You will be presented with the `Edit Ite
 </div>
 
 1. Open the Prescription you want to edit.
-2. Tap on the line you want to edit. An identical window to `Add Item` appears. At this stage:
-
-   - Edit the main `Issue` field
-   - or change the number of packs value at the batch number level
+2. Tap on the line you want to edit.
 
 <div class="note">
  <b></b> When editing a prescription line, you cannot change the item. You would need to delete the prescription line and create a new one.