Company docs updates (#4710)

* Refactor order documentation into simpler consolidated pages

* Reorganize images

* Add documentation on "Contact"

* Add imgae

docs/docs/barcodes/barcodes.md

@@ -20,7 +20,7 @@ Barcodes can be linked with the following data model types:
 - [Part](../part/part.md#part)
 - [Stock Item](../stock/stock.md#stock-item)
 - [Stock Location](../stock/stock.md#stock-location)
-- [Supplier Part](../buy/supplier.md#supplier-parts)
+- [Supplier Part](../order/company.md#supplier-parts)
 
 ## Web Integration
 

docs/docs/buy/manufacturer.md

@@ -1,69 +0,0 @@
----
-title: Manufacturers
----
-
-## Manufacturers
-
-A manufacturer is an external **producer** of parts and raw materials.
-
-To access the manufacturer page, click on the <span class="badge inventree nav main"><span class='fas fa-shopping-cart'></span> Buy</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-industry'></span> Manufacturers</span> option in the dropdown list.
-
-{% with id="manufacturer_list", url="buy/manufacturer_list.png", description="Manufacturer List" %}
-{% include "img.html" %}
-{% endwith %}
-
-!!! info
-	**Viewing**, **adding**, **editing** and **deleting** manufacturers require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
-
-### Add Manufacturer
-
-Once the manufacturer page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Manufacturer</span> button: the "Create new Manufacturer" form opens. Fill-in the manufacturer informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
-
-!!! info "Manufacturer vs Supplier"
-	In the case the manufacturer sells directly to customers, you may want to enable the checkbox `is supplier` before submitting the form (you can also enable it later on). Purchase orders rely exclusively on [supplier parts](./supplier.md#supplier-parts), therefore the manufacturer will need to be set as a supplier too.
-
-### Edit Manufacturer
-
-To edit a manufacturer, click on its name in the list of manufacturers.
-
-After the manufacturer details are loaded, click on the <span class='fas fa-edit'></span> icon under the manufacturer name. Edit the manufacturer information then click on <span class="badge inventree confirm">Submit</span>
-
-### Delete Manufacturer
-
-!!! warning
-	All manufacturer parts for this manufacturer will also be deleted!
-
-To delete a manufacturer, click on its name in the list of manufacturers.
-
-After the manufacturer details are loaded, click on the <span class='fas fa-trash-alt'></span> icon under the manufacturer name. Review the list of manufacturer parts to be deleted in consequence of deleting this manufacturer. Confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
-
-## Manufacturer Parts
-
-Manufacturer parts are linked to a manufacturer and defined as manufacturable items.
-
-!!! warning
-	**Viewing**, **adding**, **editing** and **deleting** manufacturer parts require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
-
-### Add Manufacturer Part
-
-To create a manufacturer part, you have the following options:
-
-* either navigate to a Part detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab
-* or navigate to a Manufacturer detail page then click on the <span class="badge inventree nav side"><span class='fas fa-industry'></span> Manufactured Parts</span> tab.
-
-Whichever you pick, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Manufacturer Part</span> button to load the "Create New Manufacturer Part" form. Fill out the form with the manufacturer part information then click on <span class="badge inventree confirm">Submit</span>
-
-### Edit Manufacturer Part
-
-To edit a manufacturer part, first access the manufacturer part detail page with one of the following options:
-
-* either navigate to a Part detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab then, in the <span class="badge inventree nav main">Part Manufacturers</span> table, click on the _MPN_ link
-* or navigate to a Manufacturer detail page, click on the <span class="badge inventree nav side"><span class='fas fa-industry'></span> Manufactured Parts</span> tab then click on the _MPN_ link.
-
-After the manufacturer part details are loaded, click on the <span class='fas fa-edit'></span> icon next to the manufacturer part image. Edit the manufacturer part information then click on <span class="badge inventree confirm">Submit</span>
-
-### Delete Manufacturer Part
-
-To delete a manufacturer part, first access the manufacturer part detail page like in the [Edit Manufacturer Part](#edit-manufacturer-part) section.
-
-After the manufacturer part details are loaded, click on the <span class='fas fa-trash-alt'></span> icon next to the manufacturer part image. Review the the information for the manufacturer part to be deleted, confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>

docs/docs/buy/supplier.md

@@ -1,89 +0,0 @@
----
-title: Suppliers
----
-
-## Suppliers
-
-A supplier is an external **vendor** of parts and raw materials.
-
-To access the supplier page, click on the <span class="badge inventree nav main"><span class='fas fa-shopping-cart'></span> Buy</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-building'></span> Suppliers</span> option in the dropdown list.
-
-{% with id="supplier_list", url="buy/supplier_list.png", description="Supplier List" %}
-{% include "img.html" %}
-{% endwith %}
-
-!!! info
-	**Viewing**, **adding**, **editing** and **deleting** suppliers require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
-
-### Add Supplier
-
-Once the supplier page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Supplier</span> button: the "Create new Supplier" form opens. Fill-in the supplier informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
-
-!!! info "Supplier vs Manufacturer"
-	In the case the supplier is a manufacturer who sells directly to customers, you may want to enable the checkbox `is manufacturer` before submitting the form (you can also enable it later on).
-
-### Edit Supplier
-
-To edit a supplier, click on its name in the list of suppliers.
-
-After the supplier details are loaded, click on the <span class='fas fa-edit'></span> icon under the supplier name. Edit the supplier information then click on <span class="badge inventree confirm">Submit</span>
-
-### Delete Supplier
-
-!!! warning
-	All supplier parts for this supplier will also be deleted!
-
-To delete a supplier, click on its name in the list of suppliers.
-
-After the supplier details are loaded, click on the <span class='fas fa-trash-alt'></span> icon under the supplier name. Review the list of supplier parts to be deleted in consequence of deleting this supplier. Confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
-
-## Supplier Parts
-
-Supplier parts are linked to a supplier and defined as purchasable items.
-
-!!! warning
-	**Viewing**, **adding**, **editing** and **deleting** supplier parts require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
-
-### Add Supplier Part
-
-To create a supplier part, you have the following options:
-
-1. navigate to a Part detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab
-0. navigate to a Supplier detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab
-0. navigate to a Manufacturer detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab.
-
-Whichever you pick, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Supplier Part</span> button to load the "Create new Supplier Part" form. Fill out the form with the supplier part information then click on <span class="badge inventree confirm">Submit</span>
-
-### Edit Supplier Part
-
-To edit a supplier part, first access the supplier part detail page with one of the following options:
-
-1. navigate to a Part detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab then, in the <span class="badge inventree nav main">Part Suppliers</span> table, click on the corresponding _Supplier Part_ link
-0. navigate to a Supplier detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab then click on the corresponding _Supplier Part_ link
-0. navigate to a Manufacturer detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab then click on the corresponding _Supplier Part_ link.
-
-After the supplier part details are loaded, click on the <span class='fas fa-edit'></span> icon next to the supplier part image. Edit the supplier part information then click on <span class="badge inventree confirm">Submit</span>
-
-### Delete Supplier Part
-
-To delete a supplier part, first access the supplier part detail page like in the [Edit Supplier Part](#edit-supplier-part) section.
-
-After the supplier part details are loaded, click on the <span class='fas fa-trash-alt'></span> icon next to the supplier part image. Review the the information for the supplier part to be deleted, confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
-
-### Supplier Part Availability
-
-InvenTree supports tracking 'availability' information for supplier parts. While this information can be updated manually, it is more useful when used in conjunction with the InvenTree plugin system.
-
-A custom can periodically request availability information (via a supplier API), and update this availability information for each supplier part.
-
-If provided, availability information is displayed on the Supplier Part detail page.
-
-{% with id="supplier_part_availability", url="buy/supplier_part_availability.png", maxheight="240px", description="Supplier part availability" %}
-{% include "img.html" %}
-{% endwith %}
-
-Availability information can be manually updated via the user interface:
-
-{% with id="update_availability", url="buy/update_availability.png", maxheight="240px", description="Update availability" %}
-{% include "img.html" %}
-{% endwith %}

docs/docs/features.md

@@ -22,7 +22,7 @@ Parts are the fundamental element of any inventory. InvenTree groups parts into
 
 InvenTree allows you to easily create, modify or delete suppliers and supplier items linked to any part in your inventory.
 
-[Read more...](./buy/supplier.md)
+[Read more...](./order/company.md#suppliers)
 
 ## Instant Stock Knowledge
 

docs/docs/order/company.md

@@ -0,0 +1,180 @@
+---
+title: External Companies
+---
+
+## Companies
+
+External companies are represented by the *Company* database model. Each company may be classified into the following categories:
+
+- [Customer](#customers)
+- [Supplier](#suppliers)
+- [Manufacturer](#manufacturers)
+
+!!! tip Multi Purpose
+    A company may be allocated to multiple categories
+
+### Edit Company
+
+To edit a company, click on the <span class='fas fa-edit'>Edit Company</span> icon in the actions menu. Edit the company information, and then click on <span class='badge inventree confirm'>Submit</span>.
+
+!!! warning "Permission Required"
+    The edit button will not be available to users who do not have the required permissions to edit the company
+
+### Delete Company
+
+To delete a company, click on the <span class='fas fa-trash-alt'></span> icon under the actions menu. Confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
+
+!!! warning "Permission Required"
+    The edit button will not be available to users who do not have the required permissions to delete the company
+
+!!! danger "Take Care"
+    Deleting a company instance will also remove any orders or supplied parts associated with that company!
+
+### Contacts
+
+Each company can have multiple assigned *Contacts*. A contact identifies an individual who is associated with the company, including information such as name, email address, phone number, etc.
+
+The list of contacts associated with a particular company is available in the <span class='badge inventree nav main'><span class='fas fa-users'></span> Contacts</span> navigation tab:
+
+{% with id="contact_list", url="order/contact_list.png", description="Contact List" %}
+{% include "img.html" %}
+{% endwith %}
+
+
+A *contact* can be assigned to orders, (such as [purchase orders](./purchase_order.md) or [sales orders](./sales_order.md)).
+
+## Customers
+
+A *customer* is an external client to whom parts or services are sold.
+
+To access the customer page, click on the <span class="badge inventree nav main"><span class='fas fa-truck'></span> Sell</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-user-tie'></span> Customers</span> option in the dropdown list.
+
+!!! warning
+	**Viewing**, **adding**, **editing** and **deleting** customers require the corresponding [Sales Orders user permissions](../settings/permissions.md)
+
+### Add Customer
+
+Once the customer page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Customer</span> button: the "Create new Customer" form opens. Fill-in the manufacturer informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
+
+## Manufacturers
+
+A manufacturer is an external **producer** of parts and raw materials.
+
+!!! info
+	**Viewing**, **adding**, **editing** and **deleting** manufacturers require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
+
+To access the list of manufacturers , click on the <span class="badge inventree nav main"><span class='fas fa-shopping-cart'></span> Buy</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-industry'></span> Manufacturers</span> option in the dropdown list.
+
+{% with id="manufacturer_list", url="order/manufacturer_list.png", description="Manufacturer List" %}
+{% include "img.html" %}
+{% endwith %}
+
+### Add Manufacturer
+
+Once the manufacturer page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Manufacturer</span> button: the "Create new Manufacturer" form opens. Fill-in the manufacturer informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
+
+!!! info "Manufacturer vs Supplier"
+	In the case the manufacturer sells directly to customers, you may want to enable the checkbox `is supplier` before submitting the form (you can also enable it later on). Purchase orders rely exclusively on [supplier parts](#supplier-parts), therefore the manufacturer will need to be set as a supplier too.
+
+
+### Manufacturer Parts
+
+Manufacturer parts are linked to a manufacturer and defined as manufacturable items.
+
+!!! warning
+	**Viewing**, **adding**, **editing** and **deleting** manufacturer parts require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
+
+#### Add Manufacturer Part
+
+To create a manufacturer part, you have the following options:
+
+* either navigate to a Part detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab
+* or navigate to a Manufacturer detail page then click on the <span class="badge inventree nav side"><span class='fas fa-industry'></span> Manufactured Parts</span> tab.
+
+Whichever you pick, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Manufacturer Part</span> button to load the "Create New Manufacturer Part" form. Fill out the form with the manufacturer part information then click on <span class="badge inventree confirm">Submit</span>
+
+#### Edit Manufacturer Part
+
+To edit a manufacturer part, first access the manufacturer part detail page with one of the following options:
+
+* either navigate to a Part detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab then, in the <span class="badge inventree nav main">Part Manufacturers</span> table, click on the _MPN_ link
+* or navigate to a Manufacturer detail page, click on the <span class="badge inventree nav side"><span class='fas fa-industry'></span> Manufactured Parts</span> tab then click on the _MPN_ link.
+
+After the manufacturer part details are loaded, click on the <span class='fas fa-edit'></span> icon next to the manufacturer part image. Edit the manufacturer part information then click on <span class="badge inventree confirm">Submit</span>
+
+#### Delete Manufacturer Part
+
+To delete a manufacturer part, first access the manufacturer part detail page like in the [Edit Manufacturer Part](#edit-manufacturer-part) section.
+
+After the manufacturer part details are loaded, click on the <span class='fas fa-trash-alt'></span> icon next to the manufacturer part image. Review the the information for the manufacturer part to be deleted, confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
+
+## Suppliers
+
+A supplier is an external **vendor** of parts and raw materials.
+
+To access the supplier page, click on the <span class="badge inventree nav main"><span class='fas fa-shopping-cart'></span> Buy</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-building'></span> Suppliers</span> option in the dropdown list.
+
+{% with id="supplier_list", url="order/supplier_list.png", description="Supplier List" %}
+{% include "img.html" %}
+{% endwith %}
+
+!!! info
+	**Viewing**, **adding**, **editing** and **deleting** suppliers require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
+
+### Add Supplier
+
+Once the supplier page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Supplier</span> button: the "Create new Supplier" form opens. Fill-in the supplier informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
+
+!!! info "Supplier vs Manufacturer"
+	In the case the supplier is a manufacturer who sells directly to customers, you may want to enable the checkbox `is manufacturer` before submitting the form (you can also enable it later on).
+
+### Supplier Parts
+
+Supplier parts are linked to a supplier and defined as purchasable items.
+
+!!! warning
+	**Viewing**, **adding**, **editing** and **deleting** supplier parts require the corresponding [Purchase Orders user permissions](../settings/permissions.md)
+
+#### Add Supplier Part
+
+To create a supplier part, you have the following options:
+
+1. navigate to a Part detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab
+0. navigate to a Supplier detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab
+0. navigate to a Manufacturer detail page then click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab.
+
+Whichever you pick, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Supplier Part</span> button to load the "Create new Supplier Part" form. Fill out the form with the supplier part information then click on <span class="badge inventree confirm">Submit</span>
+
+#### Edit Supplier Part
+
+To edit a supplier part, first access the supplier part detail page with one of the following options:
+
+1. navigate to a Part detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Suppliers</span> tab then, in the <span class="badge inventree nav main">Part Suppliers</span> table, click on the corresponding _Supplier Part_ link
+0. navigate to a Supplier detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab then click on the corresponding _Supplier Part_ link
+0. navigate to a Manufacturer detail page, click on the <span class="badge inventree nav side"><span class='fas fa-building'></span> Supplied Parts</span> tab then click on the corresponding _Supplier Part_ link.
+
+After the supplier part details are loaded, click on the <span class='fas fa-edit'></span> icon next to the supplier part image. Edit the supplier part information then click on <span class="badge inventree confirm">Submit</span>
+
+#### Delete Supplier Part
+
+To delete a supplier part, first access the supplier part detail page like in the [Edit Supplier Part](#edit-supplier-part) section.
+
+After the supplier part details are loaded, click on the <span class='fas fa-trash-alt'></span> icon next to the supplier part image. Review the the information for the supplier part to be deleted, confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>
+
+#### Supplier Part Availability
+
+InvenTree supports tracking 'availability' information for supplier parts. While this information can be updated manually, it is more useful when used in conjunction with the InvenTree plugin system.
+
+A custom can periodically request availability information (via a supplier API), and update this availability information for each supplier part.
+
+If provided, availability information is displayed on the Supplier Part detail page.
+
+{% with id="supplier_part_availability", url="order/supplier_part_availability.png", maxheight="240px", description="Supplier part availability" %}
+{% include "img.html" %}
+{% endwith %}
+
+Availability information can be manually updated via the user interface:
+
+{% with id="update_availability", url="order/update_availability.png", maxheight="240px", description="Update availability" %}
+{% include "img.html" %}
+{% endwith %}

docs/docs/order/purchase_order.md

@@ -8,7 +8,7 @@ Purchase orders allow to track which parts are bought from suppliers and manufac
 
 To access the purchase order page, click on the <span class="badge inventree nav main"><span class='fas fa-shopping-cart'></span> Buy</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-list'></span> Purchase Orders</span> option in the dropdown list.
 
-{% with id="purchase_order_list", url="buy/po_list.png", description="Purchase Order List" %}
+{% with id="purchase_order_list", url="order/po_list.png", description="Purchase Order List" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -25,7 +25,7 @@ Each Purchase Order has a specific status code which indicates the current state
 
 ### Purchase Order Currency
 
-The currency code can be specified for an individual purchase order. If not specified, the default currency specified against the [supplier](./supplier.md) will be used.
+The currency code can be specified for an individual purchase order. If not specified, the default currency specified against the [supplier](./company.md#suppliers) will be used.
 
 ## Create Purchase Order
 
@@ -100,19 +100,19 @@ Duplicating a Purchase Order allows the user to quickly create a new *copy* of a
 
 To duplicate an existing order, select the *Duplicate Order* action from the menu in the top-right of the screen (as shown below):
 
-{% with id="purchase_order_duplicate", url="buy/po_duplicate.png", description="Duplicate Purchase Order" %}
+{% with id="purchase_order_duplicate", url="order/po_duplicate.png", description="Duplicate Purchase Order" %}
 {% include "img.html" %}
 {% endwith %}
 
 This opens the following dialog, where you can adjust the parameters of the new order before proceeding to actually create the new order. You can see in the screenshot below that some extra options are provided in this form, to control duplication of individual line items.
 
-{% with id="purchase_order_duplicate_2", url="buy/po_duplicate_2.png", description="Duplicate Purchase Order" %}
+{% with id="purchase_order_duplicate_2", url="order/po_duplicate_2.png", description="Duplicate Purchase Order" %}
 {% include "img.html" %}
 {% endwith %}
 
 A new purchase order is then created based on the currently selected order:
 
-{% with id="purchase_order_duplicate_3", url="buy/po_duplicate_3.png", description="Duplicate Purchase Order" %}
+{% with id="purchase_order_duplicate_3", url="order/po_duplicate_3.png", description="Duplicate Purchase Order" %}
 {% include "img.html" %}
 {% endwith %}
 

docs/docs/order/return_order.md

@@ -13,13 +13,13 @@ Return Orders allow stock items (which have been sold or allocted to a customer)
 
 By default, Return Order functionality is not enabled - it must be enabled by a *staff* user from the settings page:
 
-{% with id="enable-return-order", url="sell/return_order_enable.png", description="Enable Return Orders" %}
+{% with id="enable-return-order", url="order/return_order_enable.png", description="Enable Return Orders" %}
 {% include "img.html" %}
 {% endwith %}
 
 Once this setting is enabled, you can access the "Return Orders" page from the main navigation bar:
 
-{% with id="return-order-navbar", url="sell/return_order_navbar.png", description="Access Return Orders" %}
+{% with id="return-order-navbar", url="order/return_order_navbar.png", description="Access Return Orders" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -31,7 +31,7 @@ Once this setting is enabled, you can access the "Return Orders" page from the m
 
 A list of Return Orders is displayed on the *Return Order* index page:
 
-{% with id="return-order-index", url="sell/return_order_index.png", description="Return Order Index" %}
+{% with id="return-order-index", url="order/return_order_index.png", description="Return Order Index" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -57,7 +57,7 @@ A Return Order is linked to a specific customer, which can be selected from the
 !!! warning "Customers Only"
 	Only companies with the "Customer" attribute enabled will be shown and can be selected
 
-{% with id="return-order-create", url="sell/return_order_create.png", description="Return Order Create" %}
+{% with id="return-order-create", url="order/return_order_create.png", description="Return Order Create" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -75,7 +75,7 @@ The order can be assigned to a responsible *owner*, which is either a user or gr
 
 Indvidual Return Orders can be viewed via the Return Order detail page:
 
-{% with id="return-order-detail", url="sell/return_order_detail.png", description="Return Order Detail" %}
+{% with id="return-order-detail", url="order/return_order_detail.png", description="Return Order Detail" %}
 {% include "img.html" %}
 {% endwith %}
 

docs/docs/order/sales_order.md

@@ -8,7 +8,7 @@ Sales orders allow tracking of which stock items are sold to customers, therefor
 
 To access the sales order page, click on the <span class="badge inventree nav main"><span class='fas fa-truck'></span> Sell</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-list'></span> Sales Orders</span> option in the dropdown list.
 
-{% with id="sales_order_list", url="sell/so_list.png", description="Sales Order List" %}
+{% with id="sales_order_list", url="order/so_list.png", description="Sales Order List" %}
 {% include "img.html" %}
 {% endwith %}
 
@@ -25,8 +25,7 @@ Each Sales Order has a specific status code, which represents the state of the o
 
 ### Sales Order Currency
 
-The currency code can be specified for an individual sales order. If not specified, the default currency specified against the [customer](./customer.md) will be used.
-
+The currency code can be specified for an individual sales order. If not specified, the default currency specified against the [customer](./company.md#customers) will be used.
 
 ## Create a Sales Order
 
@@ -56,7 +55,7 @@ Fill out the rest of the form then click on <span class="badge inventree confirm
 
 #### Shipments
 
-After all line items were added to the sales order, user needs to create one or more [shipments](./shipment.md) in order to allocate stock for those parts.
+After all line items were added to the sales order, user needs to create one or more [shipments](#sales-order-shipments) in order to allocate stock for those parts.
 
 In order to create a new shipment:
 
@@ -99,3 +98,72 @@ This view can be accessed externally as an ICS calendar using a URL like the fol
 `http://inventree.example.org/api/order/calendar/sales-order/calendar.ics`
 
 By default, completed orders are not exported. These can be included by appending `?include_completed=True` to the URL.
+
+## Sales Order Shipments
+
+
+Shipments are used to track sales items when they are shipped to customers. Multiple shipments can be created against a [Sales Order](./sales_order.md), allowing line items to be sent to customers in multiple deliveries.
+
+On the main Sales Order detail page, the order shipments are split into two categories, *Pending Shipments* and *Completed Shipments*:
+
+### Pending Shipments
+
+The *Pending Shipments* panel displays the shipments which have not yet been sent to the customer.
+
+- Each shipment displays the items which have been allocated to it
+- Pending sales order items can be allocated to these shipments
+- New shipments can be created if the order is still open
+
+{% with id="pending-shipments", url="order/pending_shipments.png", description="Pending shipments" %}
+{% include "img.html" %}
+{% endwith %}
+
+#### Creating a new Shipment
+
+To create a new shipment for a sales order, press the *New Shipment* button above the pending shipments table.
+
+#### Completing a Shipment
+
+To complete a shipment, press the *Complete Shipment* button associated with the particular shipment:
+
+{% with id="complete-shipment", url="order/complete_shipment.png", description="Complete shipment" %}
+{% include "img.html" %}
+{% endwith %}
+
+Alternatively, pending shipments can be completed by selecting the *Complete Shipments* action from the sales order actions menu:
+
+{% with id="complete-shipment-action", url="order/complete_shipment_action.png", description="Complete shipment" %}
+{% include "img.html" %}
+{% endwith %}
+
+### Completed Shipments
+
+{% with id="completed-shipments", url="order/completed_shipments.png", description="Completed shipments" %}
+{% include "img.html" %}
+{% endwith %}
+
+### Shipment Data
+
+Each shipment provides the following data fields:
+
+#### Reference
+
+A unique number for the shipment, used to identify each shipment within a sales order. By default, this value starts at `1` for the first shipment (for each order) and automatically increments for each new shipment.
+
+#### Tracking Number
+
+An optional field used to store tracking number information for the shipment.
+
+#### Invoice Number
+
+An optional field used to store an invoice reference for the shipment.
+
+#### Link
+
+An optional URL field which can be used to provide a link to an external URL.
+
+All these fields can be edited by the user:
+
+{% with id="edit-shipment", url="order/edit_shipment.png", description="Edit shipment" %}
+{% include "img.html" %}
+{% endwith %}

docs/docs/part/part.md

@@ -55,7 +55,7 @@ Trackable parts can be assigned batch numbers or serial numbers which uniquely i
 
 ### Purchaseable
 
-If a part is designated as *Purchaseable* it can be purchased from external suppliers. Setting this flag allows parts to be added to [purchase orders](../buy/po.md).
+If a part is designated as *Purchaseable* it can be purchased from external suppliers. Setting this flag allows parts to be added to [purchase orders](../order/purchase_order.md).
 
 ### Salable
 

docs/docs/part/pricing.md

@@ -25,11 +25,11 @@ Pricing information can be determined from multiple sources:
 | Pricing Source | Description | Linked to |
 | --- | --- | ---|
 | Internal Price | How much a part costs to make | [Part](../part/part.md) |
-| Supplier Price | The price to theoretically purchase a part from a given supplier (with price-breaks) | [Supplier](../buy/supplier.md) |
-| Purchase Cost | Historical cost information for parts purchased | [Purchase Order](../buy/po.md) |
+| Supplier Price | The price to theoretically purchase a part from a given supplier (with price-breaks) | [Supplier](../order/company.md#suppliers) |
+| Purchase Cost | Historical cost information for parts purchased | [Purchase Order](../order/purchase_order.md) |
 | BOM Price | Total price for an assembly (total price of all component items) | [Part](../part/part.md) |
 | Sale Price | How much a salable item is sold for (with price-breaks) | [Part](../part/part.md) |
-| Sale Cost | How much an item was sold for | [Sales Order](../sell/so.md) |
+| Sale Cost | How much an item was sold for | [Sales Order](../order/sales_order.md) |
 
 ### Currency Support
 
@@ -97,7 +97,7 @@ If the **Internal Price Override** setting is enabled, then internal pricing dat
 
 ### Purchase History
 
-If the Part is designated as *purchaseable*, then historical purchase cost information is displayed (and used to calculate overall pricing). Purchase history data is collected from *completed* [purchase orders](../buy/po.md).
+If the Part is designated as *purchaseable*, then historical purchase cost information is displayed (and used to calculate overall pricing). Purchase history data is collected from *completed* [purchase orders](../order/purchase_order.md).
 
 {% with id="pricing_purchase_history", url="part/pricing_purchase_history.png", description="Purchase History" %}
 {% include 'img.html' %}
@@ -144,7 +144,7 @@ If the Part is designated as *Salable* then sale price breaks are made available
 
 ### Sale History
 
-If the Part is designated as *Salable* then historical sale cost information is available. Sale history data is collected from *completed* [sales orders](../sell/so.md).
+If the Part is designated as *Salable* then historical sale cost information is available. Sale history data is collected from *completed* [sales orders](../order/sales_order.md).
 
 {% with id="pricing_sale_history", url="part/pricing_sale_history.png", description="Sale History" %}
 {% include 'img.html' %}

docs/docs/part/trackable.md

@@ -8,7 +8,7 @@ Denoting a part as *Trackble* changes the way that [stock items](../../stock/sto
 
 For many parts in an InvenTree database, simply tracking current stock levels (and locations) is sufficient. However, some parts require more extensive tracking than simple stock level knowledge.
 
-Any stock item associated with a trackable part *must* have either a batch number or a serial number. This includes stock created manually or via an internal process (such as a [Purchase Order](../buy/po.md) or a [Build Order](../build/build.md)).
+Any stock item associated with a trackable part *must* have either a batch number or a serial number. This includes stock created manually or via an internal process (such as a [Purchase Order](../order/purchase_order.md) or a [Build Order](../build/build.md)).
 
 
 ## Assign Serial Numbers

docs/docs/releases/0.1.8.md

@@ -29,7 +29,7 @@ title: Release 0.1.8
 
 ### Assign by Serial Number
 
-[#1426](https://github.com/inventree/InvenTree/pull/1426) introduces a new feature which allows stock items to be allocated to a sales order using serial number references. This provides a much more streamlined user experience. Refer to the [sales order documentation](../sell/so.md) for further information.
+[#1426](https://github.com/inventree/InvenTree/pull/1426) introduces a new feature which allows stock items to be allocated to a sales order using serial number references. This provides a much more streamlined user experience. Refer to the [sales order documentation](../order/sales_order.md) for further information.
 
 ## Major Bug Fixes
 

docs/docs/releases/0.2.1.md

@@ -26,7 +26,7 @@ sourcing information for a part. Soon, InvenTree will allow the use of
 manufacturer data directly in purchase orders.
 
 Details on how to create and manage manufacturer parts were added
-[here](../buy/manufacturer.md#add-manufacturer-part).
+[here](../order/company.md#add-manufacturer-part)
 
 ### URL-style QR Code for StockItem
 

docs/docs/releases/0.8.0.md

@@ -14,7 +14,7 @@ title: Release 0.8.0
 
 ### Shipment Features
 
-[#3058](https://github.com/inventree/InvenTree/pull/3058) implements new data fields for the [Sales Order Shipment](../sell/shipment.md).
+[#3058](https://github.com/inventree/InvenTree/pull/3058) implements new data fields for the [Sales Order Shipment](../order/sales_order.md#sales-order-shipments).
 
 ### Calendar Displays
 

docs/docs/report/context_variables.md

@@ -217,14 +217,11 @@ Each part object has access to a lot of context variables about the part. The fo
 
 ### Orders
 
-!!! incomplete "TODO"
-    This section requires further work
-
-The [Purchase Order](../buy/po.md) context variables are described in the [Purchase Order](purchase_order.md) section.
+The [Purchase Order](../order/purchase_order.md) context variables are described in the [Purchase Order](./purchase_order.md) section.
 
 #### SalesOrder
 
-A [Sales Order](../sell/so.md) object has the following context variables available.
+A [Sales Order](../order/sales_order.md) object has the following context variables available.
 
 | Variable | Description |
 |----------|-------------|
@@ -235,7 +232,7 @@ A [Sales Order](../sell/so.md) object has the following context variables availa
 
 #### Return Order
 
-A [Return Order](../sell/return.md) object has the following context variables avaiable.
+A [Return Order](../order/return_order.md) object has the following context variables avaiable.
 
 | Variable | Description |
 | --- | --- |
@@ -244,7 +241,6 @@ A [Return Order](../sell/return.md) object has the following context variables a
 | lines | The lines in the Sales Order |
 | reference | The reference number |
 
-
 ### User
 
 | Variable | Description |

docs/docs/report/purchase_order.md

@@ -4,11 +4,11 @@ title: Purchase Order Report
 
 ## Purchase Order Reports
 
-Custom purchase order reports may be generated against any given [Purchase Order](../buy/po.md). For example, purchase order reports could be used to generate a pdf of the order to send to a supplier.
+Custom purchase order reports may be generated against any given [Purchase Order](../order/purchase_order.md). For example, purchase order reports could be used to generate a pdf of the order to send to a supplier.
 
 ### Purchase Order Filters
 
-The report template can be filtered against available [Purchase Order](../buy/po.md) instances.
+The report template can be filtered against available [Purchase Order](../order/purchase_order.md) instances.
 
 ### Context Variables
 
@@ -19,7 +19,7 @@ In addition to the default report context variables, the following variables are
 | order | The specific Purchase Order object |
 | reference | The order reference field (can also be accessed as `{% raw %}{{ order.reference }}{% endraw %}`) |
 | description | The order description field |
-| supplier | The [supplier](../buy/supplier.md) associated with this purchase order |
+| supplier | The [supplier](../order/company.md#suppliers) associated with this purchase order |
 | lines | A list of available line items for this order |
 | extra_lines | A list of available *extra* line items for this order |
 | order.created_by | The user who created the order |

docs/docs/report/return_order.md

@@ -4,7 +4,7 @@ title: Return Order Reports
 
 ## Return Order Reports
 
-Custom reports may be generated against any given [Return Order](../sell/return.md). For example, return order reports can be used to generate an RMA request to send to a customer.
+Custom reports may be generated against any given [Return Order](../order/return_order.md). For example, return order reports can be used to generate an RMA request to send to a customer.
 
 ### Context Variables
 

docs/docs/report/sales_order.md

@@ -4,11 +4,11 @@ title: Sales Order Reports
 
 ## Sales Order Reports
 
-Custom sales order reports may be generated against any given [Sales Order](../sell/so.md). For example, a sales order report could be used to generate an invoice to send to a customer.
+Custom sales order reports may be generated against any given [Sales Order](../order/sales_order.md). For example, a sales order report could be used to generate an invoice to send to a customer.
 
 ### Sales Order Filters
 
-The report template can be filtered against available [Sales Order](../sell/so.md) instances.
+The report template can be filtered against available [Sales Order](../order/sales_order.md) instances.
 
 ### Context Variables
 
@@ -19,7 +19,7 @@ In addition to the default report context variables, the following variables are
 | order | The specific Sales Order object |
 | reference | The order reference field (can also be accessed as `{% raw %}{{ order.description }}{% endraw %}`) |
 | description | The order description field |
-| customer | The [customer](../sell/customer.md) associated with the particular sales order |
+| customer | The [customer](../order/company.md#customers) associated with the particular sales order |
 | lines | A list of available line items for this order |
 | extra_lines | A list of available *extra* line items for this order |
 | order.currency | The currency code associated with this order, e.g. 'CAD' |

docs/docs/sell/customer.md

@@ -1,28 +0,0 @@
----
-title: Customers
----
-
-## Customers
-
-A customer is an external client to whom parts are sold.
-
-To access the customer page, click on the <span class="badge inventree nav main"><span class='fas fa-truck'></span> Sell</span> navigation tab and click on <span class="badge inventree nav main"><span class='fas fa-user-tie'></span> Customers</span> option in the dropdown list.
-
-!!! warning
-	**Viewing**, **adding**, **editing** and **deleting** customers require the corresponding [Sales Orders user permissions](../settings/permissions.md)
-
-### Add Customer
-
-Once the customer page is loaded, click on the <span class="badge inventree add"><span class='fas fa-plus-circle'></span> New Customer</span> button: the "Create new Customer" form opens. Fill-in the manufacturer informations (`Company name` and `Company description` are required) then click on <span class="badge inventree confirm">Submit</span>
-
-### Edit Customer
-
-To edit a customer, click on its name in the list of customers.
-
-After the customer details are loaded, click on the <span class='fas fa-edit'></span> icon under the customer name. Edit the customer information then click on <span class="badge inventree confirm">Submit</span>
-
-### Delete Customer
-
-To delete a customer, click on its name in the list of customers.
-
-After the customer details are loaded, click on the <span class='fas fa-trash-alt'></span> icon under the customer name. Confirm the deletion using the checkbox then click on <span class="badge inventree confirm">Submit</span>

docs/docs/sell/shipment.md

@@ -1,71 +0,0 @@
----
-title: Shipments
----
-
-## Shipments
-
-Shipments are used to track sales items when they are shipped to customers. Multiple shipments can be created against a [Sales Order](./so.md), allowing line items to be sent to customers in multiple deliveries.
-
-On the main Sales Order detail page, the order shipments are split into two categories, *Pending Shipments* and *Completed Shipments*:
-
-### Pending Shipments
-
-The *Pending Shipments* panel displays the shipments which have not yet been sent to the customer.
-
-- Each shipment displays the items which have been allocated to it
-- Pending sales order items can be allocated to these shipments
-- New shipments can be created if the order is still open
-
-{% with id="pending-shipments", url="sell/pending_shipments.png", description="Pending shipments" %}
-{% include "img.html" %}
-{% endwith %}
-
-#### Creating a new Shipment
-
-To create a new shipment for a sales order, press the *New Shipment* button above the pending shipments table.
-
-#### Completing a Shipment
-
-To complete a shipment, press the *Complete Shipment* button associated with the particular shipment:
-
-{% with id="complete-shipment", url="sell/complete_shipment.png", description="Complete shipment" %}
-{% include "img.html" %}
-{% endwith %}
-
-Alternatively, pending shipments can be completed by selecting the *Complete Shipments* action from the sales order actions menu:
-
-{% with id="complete-shipment-action", url="sell/complete_shipment_action.png", description="Complete shipment" %}
-{% include "img.html" %}
-{% endwith %}
-
-### Completed Shipments
-
-{% with id="completed-shipments", url="sell/completed_shipments.png", description="Completed shipments" %}
-{% include "img.html" %}
-{% endwith %}
-
-### Shipment Data
-
-Each shipment provides the following data fields:
-
-#### Reference
-
-A unique number for the shipment, used to identify each shipment within a sales order. By default, this value starts at `1` for the first shipment (for each order) and automatically increments for each new shipment.
-
-#### Tracking Number
-
-An optional field used to store tracking number information for the shipment.
-
-#### Invoice Number
-
-An optional field used to store an invoice reference for the shipment.
-
-#### Link
-
-An optional URL field which can be used to provide a link to an external URL.
-
-All these fields can be edited by the user:
-
-{% with id="edit-shipment", url="sell/edit_shipment.png", description="Edit shipment" %}
-{% include "img.html" %}
-{% endwith %}

docs/docs/settings/reference.md

@@ -4,7 +4,7 @@ title: Reference Patterns
 
 ## Reference Patterns
 
-InvenTree contains a number of data models which require a *unique* reference field (such as [Purchase Orders](../buy/po.md)). In addition to being *unique* these reference values must conform to a specific *pattern* (which can be defined by the user). Defined reference patterns also make it simple for the user to control how references are generated.
+InvenTree contains a number of data models which require a *unique* reference field (such as [Purchase Orders](../order/purchase_order.md)). In addition to being *unique* these reference values must conform to a specific *pattern* (which can be defined by the user). Defined reference patterns also make it simple for the user to control how references are generated.
 
 ### Default Patterns
 

docs/mkdocs.yml

@@ -101,15 +101,11 @@ nav:
     - Bill of Materials: build/bom.md
     - Importing BOM Data: build/bom_import.md
     - Exporting BOM Data: build/bom_export.md
-  - Buy:
-    - Suppliers: buy/supplier.md
-    - Manufacturers: buy/manufacturer.md
-    - Purchase Orders: buy/po.md
-  - Sell:
-    - Customers: sell/customer.md
-    - Sales Orders: sell/so.md
-    - Shipments: sell/shipment.md
-    - Return Orders: sell/return.md
+  - Orders:
+    - Companies: order/company.md
+    - Purchase Orders: order/purchase_order.md
+    - Sales Orders: order/sales_order.md
+    - Return Orders: order/return_order.md
   - Report:
     - Templates: report/report.md
     - Report Types: