[IMP] Inventory: Expanding on delivery method form fields

content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/new_delivery_method.rst

@@ -33,9 +33,18 @@ a form to provide details about the shipping provider, including:
 
 - :guilabel:`Delivery Method` (*Required field*): the name of the delivery method (e.g. `flat-rate
   shipping`, `same day delivery`, etc.).
+<<<<<<< b97dc8c165f2999d3509c82fefd6f608e22c6451
 - :guilabel:`Website`: configure :doc:`delivery methods for an ecommerce
   </applications/websites/ecommerce/shipping>`. Select the applicable website from the drop-down
   menu, or leave it blank to apply the method to all web pages.
+||||||| 3feb5021889018fb28ae39166cf7577a1c0d074e
+- :guilabel:`Website`: configure shipping methods for an **eCommerce** page. Select the applicable
+  website from the drop-down menu, or leave it blank to apply the method to all web pages.
+=======
+- :guilabel:`Website`: configure shipping methods for an **eCommerce** page. Select the applicable
+  website from the drop-down menu, or leave it blank to apply the method to all web pages. This
+  field only appears when the **eCommerce** app is enabled.
+>>>>>>> 6ce56afb2e74a26875879ada897d6ede4a4bcce8
 - :guilabel:`Provider` (*Required field*): choose the delivery service, like FedEx, if using a
   :ref:`third-party carrier <inventory/shipping/third_party>`. Ensure the integration with the
   shipping carrier is properly installed and select the provider from the drop-down menu. For more
@@ -46,10 +55,12 @@ a form to provide details about the shipping provider, including:
   <payment_providers/inperson_payments/cash_on_delivery>` payment method when selecting this
   delivery option on the ecommerce website.
 - :guilabel:`Company`: If the shipping method should apply to a specific company, select it from the
-  drop-down menu. Leave the field blank to apply the method to all companies.
+  drop-down menu. Leave the field blank to apply the method to all companies. This field only
+  appears in multi-company databases.
 - :guilabel:`Routes`: select the applicable routes to define different delivery methods, such as
-  standard or express shipping, based on varying lead times. For more information, jump to the
-  :ref:`Set routes on shipping method <inventory/shipping_receiving/shipping-route>` section.
+  standard or express shipping, based on varying lead times. This field only appears when you have
+  enabled multi-step routes in your inventory configuration settings. For more information, refer to
+  the :ref:`Set routes on shipping method <inventory/shipping_receiving/shipping-route>` section.
 - :guilabel:`Delivery Product` (*Required field*): the product listed on the :ref:`sales order line
   <inventory/shipping/sales-order>` as the delivery charge.
 - :guilabel:`Free if order amount is above`: checking this box enables free shipping if the customer
@@ -58,6 +69,17 @@ a form to provide details about the shipping provider, including:
   delivery. When a custom carrier is added in a delivery order, the tracking button is enabled, and
   the link directs to the tracking portal with that URL.
 
+.. example::
+   To set up `$200` flate-rate shipping, fill in the following fields:
+
+   - :guilabel:`Delivery Method`: `Furniture Delivery (Manual)`
+   - :guilabel:`Provider`: :guilabel:`Fixed Price`
+   - :guilabel:`Fixed Price`: `200`
+   - :guilabel:`Delivery Product`: :guilabel:`Furniture Delivery (manual)`
+
+   .. image:: new_delivery_method/sample-delivery-method.png
+      :alt: Set up a delivery method with a fixed price of 200.
+
 .. _inventory/shipping_receiving/availability:
 
 Use the :guilabel:`Availability` tab to define conditions for the delivery method based on the