Skip to content

Commit 3bbf86c

Browse files
committed
Merge branch 'staging'
2 parents 8a26588 + f06284e commit 3bbf86c

File tree

9 files changed

+67
-9
lines changed

9 files changed

+67
-9
lines changed

content/docs/introduction/requirements/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ Recording stock transactions is a core Open mSupply activity. Most stock transac
5151

5252
### Mobile / tablet requirements
5353

54-
You are able to use a browser on a tablet to connect to an Open mSupply server, and the only requirement here is a suitably fast tablet with a browser such as chrome or firefox.
55-
56-
For a stand-alone, offline, solution a mobile application is also available for android devices.
54+
For a stand-alone, offline, solution a mobile application is also available for android devices. This is the recommended approach. While you are able to use a browser on a tablet to connect to an Open mSupply server, this is not supported. Using a browser will not allow you to make use of the server discovery feature or use the camera for barcode scanning, among other limitations.
5755

5856
Recommended Specifications:
59-
In short, Open mSupply mobile runs on Android tablets (not on phones as there is too much data to use well on small phone screens).
57+
In short, Open mSupply mobile runs on Android tablets (not on phones for general usage as there is too much data to use well on small phone screens).
58+
Note that there are some specific features which can run on phones, such as the GAPS feature.
59+
6060
The application requires at least Android 10
6161

6262
| | Minimum | Recommended |
31.3 KB
Loading
148 KB
Loading
116 KB
Loading
11.8 KB
Loading

content/docs/replenishment/inbound shipments/index.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,3 +640,48 @@ When editing a line on the shipment, the `Other` tab will have a `Donor` selecti
640640
![Donor per line](images/edit_line_donor.png)
641641

642642
Simply select the donor for that stock line.
643+
644+
## Linking an internal order
645+
646+
If the [store preference](/docs/settings/configuration/#store-preferences) `Can manually link requisition to supplier invoice` is enabled in the current store, then it is possible to link a manually created inbound shipment to an internal order.
647+
648+
This allows you to create a link between the internal order and inbound shipment and also lets you easily add all items which are on the order to this inbound shipment.
649+
650+
### How to link an internal order
651+
652+
Ensure that the store preference mentioned above is enabled.
653+
654+
Click the `New Shipment` button to create a new manual inbound shipment and select a supplier as usual. With the preference enabled you will then see a new screen showing all internal orders which this store has created for the selected supplier.
655+
656+
<div class="note">Only orders in the <i>Sent</i> status are shown in the list</div>
657+
658+
![Select internal order](images/linked_internal_orders.png)
659+
660+
From this window you can
661+
662+
- Click **Cancel** to stop creating the inbound shipment
663+
- Click **Next** to continue creating without linking an internal order
664+
- Click on one of the internal order lines in the table - this will link the order to the newly created inbound shipment
665+
666+
### Working with a linked inbound shipment
667+
668+
A link to the internal order is shown in the _Related documents_ section of the _More info_ panel:
669+
670+
![Related documents link](images/linked_related_docs.png)
671+
672+
and a corresponding link is shown on the internal order, allowing you to quickly move between the two.
673+
674+
Once the shipment and order are linked you are able to add lines from the internal order to the shipment.
675+
Click the arrow beside the **Add Item** button to expand it and view the other options:
676+
677+
![Add from internal order](images/linked_add_from_order.png)
678+
679+
Click the option **Add from Internal Order**.
680+
681+
A windows is shown which lists all of the item lines in the internal order. You can then click the checkboxes to select which lines to add to the shipment.
682+
683+
<div class="tip">You can click the top checkbox to select or deselect all lines</div>
684+
685+
![Add lines from internal order](images/linked_add_lines.png)
686+
687+
Click the **Select** button to add the lines to the shipment.

content/docs/settings/configuration/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Once configured, the `Initialise` button will become disabled:
4343

4444
An `Edit` button will also appear in the footer, where you can edit the store properties for the store you are currently logged into:
4545

46-
![Store properties edit](images/store_properties_edit_footer.png)
46+
![Store properties edit](/docs/manage/facilities/images/footer_store_edit.png)
4747

4848
Clicking that `Edit` button will open a new window, where you can [view and edit your store properties](/docs/manage/facilities/#editing-your-store-properties).
4949

@@ -88,7 +88,7 @@ Here's the list of preferences which are currently in use:
8888

8989
| Preference | Used by |
9090
| ------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
91-
| Can manually link requisition to supplier invoice | [Internal Orders](/docs/replenishment/internal-orders/) |
91+
| Can manually link requisition to supplier invoice | [Inbound shipments](/docs/replenishment/inbound-shipments/) |
9292
| Edit prescribed quantity on prescription | [Prescriptions](/docs/dispensary/prescriptions/) |
9393
| Expiring items period | Used for some [Reports](/docs/getting_started/reports/) |
9494
| Include requisitions from this store in suppliers' remote authorisation process | Used in [Internal Orders](/docs/replenishment/internal-orders/) if using the remote authorisation module |

content/docs/settings/devices/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ The label printing functionality is in an experimental state currently. There is
3939

4040
#### Printing via Network
4141

42+
<div class="note">Printing via network requires either that your Open mSupply instance is running in <strong>server mode</strong> or that the network printer, the Open mSupply server and client are all on a local network.</div>
43+
4244
Enter the IP address and other details of the printer. Click `Save` to save the details. Once saved, you can click the `Test` button to attempt to connect to the printer and fetch its configuration.
4345

4446
<div class="note">The label width and height values are not currently used - you can ignore those fields for now.</div>
@@ -56,6 +58,9 @@ Return to the settings page and turn on the Print via USB switch to enable USB p
5658
## Barcode Scanners
5759

5860
This section allows you to configure a USB barcode scanner for use with Open mSupply desktop.
61+
62+
If you are using the android application you are able to scan barcodes using the device's camera and this configuration section is not relevant.
63+
5964
We support serial-mode and keyboard-mode scanners. The preference is serial scanners which we have found to be more reliable. The Zebra DS-22 is the recommended model.
6065

6166
On opening the barcode scanners section you may see the message `Not connected`:

content/docs/settings/permissions/index.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ The following table lists the area and name of the permissions in the central se
2424

2525
In addition to these specific permissions, you'll need to ensure that the user has access to the store(s) which they'll be working in.
2626

27+
<!-- TODO: ADD PURCHASE ORDER AND GOODS RECEIVED PERMISSIONS WHEN THEY ARE READY -->
28+
2729
| Tab | Area | Permission | Description |
2830
| -------------------- | --------------------------- | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
2931
| Permissions | Admin | Access server administration | Allows access to the `Synchronisation`, `Support`, `Devices` and also, if on the central server, `Configuration` pages in the `Settings` section |
@@ -35,9 +37,10 @@ In addition to these specific permissions, you'll need to ensure that the user h
3537
| | | Create Repack Or Split Stock | Can create repack or split stock lines |
3638
| | | Enter Inventory Adjustments | Can maintain inventory adjustments |
3739
| | Clinicians | Add clinicians | Can add clinicians |
38-
| Permissions (2) | Invoices | View customer invoices | Can view Outbound Shipments. Also used to query statistics on the dashboard |
39-
| | | Create customer invoices | Can maintain Outbound Shipments |
40-
| | | Edit customer invoices | Can maintain Outbound Shipments - if either edit or create permission is given the user can edit |
40+
| Permissions (2) | Invoices | View customer invoices | Can view Outbound Shipments and prescriptions. Also used to query statistics on the dashboard |
41+
| | | Create customer invoices | Can maintain Outbound Shipments and prescriptions |
42+
| | | Edit customer invoices | Can maintain Outbound Shipments and prescriptions - if either edit or create permission is given the user can edit |
43+
| | | Cancel finalised invoices | Can cancel `Verified` prescriptions |
4144
| | | Return stock from supplier invoices | Can return stock from Inbound Shipments |
4245
| | | View supplier invoices | Can view Inbound Shipments. Also used to query statistics on the dashboard |
4346
| | | Create supplier invoices | Can maintain Inbound Shipments |
@@ -48,17 +51,22 @@ In addition to these specific permissions, you'll need to ensure that the user h
4851
| | Patients | View patients | Can view Patients |
4952
| | | Add Patients | Can maintain Patients |
5053
| | | Edit Patient Details | Can maintain Patients - if either add or edit permission is given the user can edit |
54+
| | Names | Edit customer, supplier & manufacturer names | Can edit customer and supplier properties |
5155
| Permissions (3) | Admin | View log | Able to view the logs, these show as a tab on many windows |
5256
| | Requisitions | View requisitions | Can view Requisitions and R&R Forms |
5357
| | | Create and edit requisitions | Can maintain Requisitions and R&R Forms |
58+
| | | Create customer invoices from requisitions | Can create outbound shipments from requisition |
5459
| | Stocktakes | Create Stocktake | Can create Stocktakes |
5560
| | | Delete Stocktake | Can delete Stocktakes |
5661
| | | Add Stocktake lines | Can add Stocktake lines |
5762
| | | Edit Stocktake lines | Can edit Stocktake lines |
5863
| | Vaccines | View sensor details | Can view sensor details |
5964
| | | Edit sensor location | Can edit sensor location |
65+
| | | View and edit vaccine vial monitor status | Can view and edit vaccine vial monitor status on stock lines |
6066
| | Assets | View assets | Can view Assets |
67+
| | | Add assets visa datamatrix | Can add Assets via datamatrix scanning |
6168
| | | Add, edit assets | Can maintain Assets |
69+
| | | Change Asset status | Can change the status of Assets (e.g. Functioning, not in use) |
6270
| | | Setup Assets | Can import Asset catalogue items |
6371
| omSupply Permissions | Internal Order | Confirm Internal Order sent | Can confirm Internal Orders as sent |
6472
| | API Access | Cold chain API access | Can access the Cold Chain API |

0 commit comments

Comments
 (0)