[IMP] CRM: updating flow and screenshots of generating leads

content/applications/sales/crm/acquire_leads.rst

@@ -8,7 +8,6 @@ Acquire leads
    :titlesonly:
 
    acquire_leads/convert
-   acquire_leads/generate_from_email
-   acquire_leads/generate_from_website
+   acquire_leads/generate_leads
    acquire_leads/send_quotes
    acquire_leads/lead_mining

content/applications/sales/crm/acquire_leads/generate_leads.rst

@@ -0,0 +1,104 @@
+============================
+Generate leads/opportunities
+============================
+
+Two key ways to generate new leads or opportunities for your business are through email aliases and
+website contact forms. Odoo automatically creates leads in your CRM whenever someone sends a
+message to a Sales Team email alias or fills out a contact form on your website.
+
+Configure email aliases
+=======================
+
+Each Sales Team can use its own unique email alias to generate leads/opportunities. Any email sent
+to a Sales Team's email alias will automatically create a lead (if leads are activated in your CRM
+settings) or an opportunity in the pipeline for that particular team. Configure custom email
+aliases on the configuration page for each Sales Team by navigating to :menuselection:`CRM -->
+Configuration --> Sales Teams`.
+
+.. image:: generate_leads/sales-team-config.png
+   :align: center
+   :alt: Configuring Sales Teams
+
+Use Contact Forms on your website
+=================================
+
+By default, your website's *Contact Us* page displays Odoo's ready-to-use Contact Form. Whenever
+someone submits this form, a lead or an opportunity is generated in your database.
+
+.. image:: generate_leads/default-contact-us-page.png
+   :align: center
+   :alt: Default Contact Us page
+
+The Contact Form can be activated or deactivated at any time by going to :menuselection:`Website
+--> Go to Website --> Customize --> Contact Form`.
+
+.. image:: generate_leads/contact-form-toggle.png
+   :align: center
+   :alt: Contact Form toggle
+
+When the Form is deactivated, the *Contact Us* page simply displays a button to email your company
+directly. Any email sent this way will generate a lead/opportunity.
+
+.. image:: generate_leads/default-contact-us-page-no-form.png
+   :align: center
+   :alt: Contact Us Page using email
+
+Choose which Sales Team or salesperson is automatically assigned to the leads/opportunities created
+from the Contact Form by going to :menuselection:`Website --> Configuration --> Settings -->
+Communication`.
+
+.. image:: generate_leads/contact-form-settings.png
+   :align: center
+   :alt: Contact Form settings
+
+Customize Contact Forms
+=======================
+
+Contact Forms can be customized for the specific information your team needs, using the free *Form
+Builder* module.
+
+The *Form Builder* module is installed automatically when a Form element is added to a web page via
+the Website Builder. It can also be installed manually from the :guilabel:`Apps` page.
+
+.. image:: generate_leads/form-building-block.png
+   :align: center
+   :alt: Form Builder building blocks
+
+.. tip::
+   Forms can be created from scratch to serve a wide variety of purposes. However, Odoo's default
+   *Contact Us* page is designed to fit most users' needs. Start with the default form and modify
+   from there.
+
+Edit Contact Form fields
+------------------------
+
+In Edit mode on your website, click on any field to start editing it. The following information can
+be edited for each field on the Contact Form:
+
+- :guilabel:`Type`: Choose a custom field option or an existing field. Examples include phone, file
+  upload, language, etc.
+- :guilabel:`Input Type`: Determine the type of entry customers should input. Available options are
+  text,email, telephone, and URL.
+- :guilabel:`Input Placeholder`: Type in an example to guide users how to input information where
+  formatting is important, such as a phone number or email address.
+- :guilabel:`Label Name`: Type in the display name to show users what information is needed from
+  them.
+- :guilabel:`Label Position`: Choose the way the label is aligned with the rest of the form. The
+  label can be hidden, above the field, to the far left of the field, or right adjusted and closer
+  to the field.
+- :guilabel:`Required`: Toggle this option for information that you absolutely need entered.
+- :guilabel:`Hidden`: Toggle this option to hide the field without deleting it.
+- :guilabel:`Shown on Mobile`: Toggle this option to show the field to users on mobile devices.
+
+.. image:: generate_leads/editable-field-options.png
+   :align: center
+   :alt: Editable field options
+
+By default, when a Form is submitted, it sends you an email with the customer's inputted
+information. To have it automatically generate a lead/opportunity instead, edit the Form and select
+:guilabel:`Create an Opportunity` as the Action.
+
+.. tip::
+   If leads are activated in your CRM settings, selecting :guilabel:`Create an Opportunity`
+   generates a lead instead. To learn more about activating leads in the CRM settings, head over to
+   :doc:`convert`.

redirects.txt

@@ -278,6 +278,9 @@ services/support/supported_versions.rst administration/maintain/supported_versio
 
 # Redirections introduced in 14.0 :
 
+applications/sales/crm/acquire_leads/generate_from_email.rst applications/sales/crm/acquire_leads/generate_leads.rst       # (#986)
+applications/sales/crm/acquire_leads/generate_from_website.rst applications/sales/crm/acquire_leads/generate_leads.rst       # (#986)
+
 legal/others/cla.rst legal/cla.rst
 legal/licenses/licenses.rst legal/licenses.rst