[IMP] inventory: delivery orders and incoming shipments restructure

X-original-commit: fd65730

Author: samueljlieber

content/applications/inventory_and_mrp/inventory/management.rst

@@ -10,9 +10,16 @@ Warehouse Management
 
    management/products
    management/warehouses
+<<<<<<< HEAD
    management/inventory_adjustments
    management/delivery
    management/incoming
+||||||| parent of 181bab1be (temp)
+   management/delivery
+   management/incoming
+=======
+   management/shipments_deliveries
+>>>>>>> 181bab1be (temp)
    management/misc
    management/planning
    management/lots_serial_numbers