[IMP] Sales: Different addresses in contacts/quotations

X-original-commit: eeab0f8
Co-authored-by: Megan Valenzuela <[email protected]>

Author: theRealThagomizer

content/applications/sales/sales/sales_quotations/different_addresses.rst

@@ -28,19 +28,49 @@ to open their contact form.
 .. tip::
    Contact forms can be accessed in the **Contacts** application, as well.
 
+<<<<<<< 96c6ae8ac0cf406d04cfb24bbc54da88e1b8809b
 From the contact form, click the :guilabel:`Add Contact` button, which is located under the
 :guilabel:`Contacts` tab. This brings up the :guilabel:`Create Contact` pop-up form, in which
 additional addresses can be configured.
+||||||| 061341641337cd33652e4586661ab6b7ff85d191
+From the contact form, click :guilabel:`Edit`, and then select :guilabel:`Add`, which is located
+under the :guilabel:`Contacts & Addresses` tab. Doing so reveals a :guilabel:`Create Contact` pop-up
+form, in which additional addresses can be configured.
+=======
+From the contact form, click the :guilabel:`Add` button, which is located under the
+:guilabel:`Contacts & Addresses` tab. This brings up the :guilabel:`Create Contact` pop-up form, in
+which additional addresses can be configured.
+>>>>>>> b2f436a0b94b19a7ce82cd059fbab1ce460b3cec
 
 .. image:: different_addresses/contact-form-add-address.png
    :alt: Add a contact/address to the contact form.
 
 On the :guilabel:`Create Contact` pop-up form, select any of the following options:
 
+<<<<<<< 96c6ae8ac0cf406d04cfb24bbc54da88e1b8809b
 - :guilabel:`Contact`: Adds another contact, such as an employee at a company, to the contact form.
 - :guilabel:`Invoice`: Adds a default invoice address to the contact form.
 - :guilabel:`Delivery`: Adds a default delivery address to the contact form.
 - :guilabel:`Other Address`: Adds an alternate address to the contact form.
+||||||| 061341641337cd33652e4586661ab6b7ff85d191
+Select any of the following options:
+
+- :guilabel:`Contact`: adds another contact to the existing contact form.
+- :guilabel:`Invoice Address`: adds a specific invoice address to the existing contact form.
+- :guilabel:`Delivery Address`: adds a specific delivery address to the existing contact form.
+- :guilabel:`Other Address`: adds an alternate address to the existing contact form.
+- :guilabel:`Private Address`: adds a private address to the existing contact form.
+
+Once an option is selected, proceed to enter the corresponding contact information that should be
+used for the specified address type.
+=======
+- :guilabel:`Contact`: Adds another contact, such as an employee at a company, to the contact form.
+- :guilabel:`Invoice Address`: Adds a default invoice address to the contact form.
+- :guilabel:`Delivery Address`: Adds a default delivery address to the contact form.
+- :guilabel:`Follow-up Address`: Adds a default contact address that is used for follow-up
+  communications about billing and other issues to the contact form.
+- :guilabel:`Other Address`: Adds an alternate address to the contact form.
+>>>>>>> b2f436a0b94b19a7ce82cd059fbab1ce460b3cec
 
 .. image:: different_addresses/create-contact-window.png
    :alt: Create a new contact/address on a contact form.