[MERGE] Forward port 11.0 up to 0c97b23

_extensions/odoo/layout.html

@@ -242,7 +242,7 @@
             </div>
           </aside>
           {% endif %}
-          <article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
+          <article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %} {% if pagename in toc%}index-category{% endif %}">
             {% endif %}
             {% block body %} {% endblock %}
           {% if pagename != master_doc %}</article>

_extensions/odoo/translator.py

@@ -472,6 +472,20 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
         self.body.append(self.starttag(node, 'a', **attrs))
     def depart_reference(self, node):
         self.body.append(u'</a>')
+    def visit_download_reference(self, node):
+        # type: (nodes.Node) -> None
+        if node.hasattr('filename'):
+            self.body.append(
+                '<a class="reference download internal" href="%s" download="">' %
+                posixpath.join(self.builder.dlpath, node['filename']))
+            self.body.append(node.astext())
+            self.body.append('</a>')
+            raise nodes.SkipNode
+        else:
+            self.context.append('')
+    def depart_download_reference(self, node):
+        # type: (nodes.Node) -> None
+        self.body.append(self.context.pop())
     def visit_target(self, node): pass
     def depart_target(self, node): pass
     def visit_footnote(self, node):

_static/banners/pdf.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 550.801 550.801" style="enable-background:new 0 0 550.801 550.801;"
+	 xml:space="preserve">
+<g>
+	<g>
+		<path d="M267.342,414.698c-6.613,0-10.884,0.585-13.413,1.165v85.72c2.534,0.586,6.616,0.586,10.304,0.586
+			c26.818,0.189,44.315-14.576,44.315-45.874C308.738,429.079,292.803,414.698,267.342,414.698z"/>
+		<path d="M152.837,414.313c-6.022,0-10.104,0.58-12.248,1.16v38.686c2.531,0.58,5.643,0.78,9.903,0.78
+			c15.757,0,25.471-7.973,25.471-21.384C175.964,421.506,167.601,414.313,152.837,414.313z"/>
+		<path d="M475.095,131.992c-0.032-2.526-0.833-5.021-2.568-6.993L366.324,3.694c-0.021-0.034-0.062-0.045-0.084-0.076
+			c-0.633-0.707-1.36-1.29-2.141-1.804c-0.232-0.15-0.475-0.285-0.718-0.422c-0.675-0.366-1.382-0.67-2.13-0.892
+			c-0.19-0.058-0.38-0.14-0.58-0.192C359.87,0.114,359.037,0,358.203,0H97.2C85.292,0,75.6,9.693,75.6,21.601v507.6
+			c0,11.913,9.692,21.601,21.6,21.601H453.6c11.908,0,21.601-9.688,21.601-21.601V133.202
+			C475.2,132.796,475.137,132.398,475.095,131.992z M193.261,463.873c-10.104,9.523-25.072,13.806-42.569,13.806
+			c-3.882,0-7.391-0.2-10.102-0.58v46.839h-29.35V394.675c9.131-1.55,21.967-2.721,40.047-2.721
+			c18.267,0,31.292,3.501,40.036,10.494c8.363,6.612,13.985,17.497,13.985,30.322C205.308,445.605,201.042,456.49,193.261,463.873z
+			 M318.252,508.392c-13.785,11.464-34.778,16.906-60.428,16.906c-15.359,0-26.238-0.97-33.637-1.94V394.675
+			c10.887-1.74,25.083-2.721,40.046-2.721c24.867,0,41.004,4.472,53.645,13.995c13.61,10.109,22.164,26.241,22.164,49.37
+			C340.031,480.4,330.897,497.697,318.252,508.392z M439.572,417.225h-50.351v29.932h47.039v24.11h-47.039v52.671H359.49V392.935
+			h80.082V417.225z M97.2,366.752V21.601h250.203v110.515c0,5.961,4.831,10.8,10.8,10.8H453.6l0.011,223.836H97.2z"/>
+		<path d="M386.205,232.135c-0.633-0.059-15.852-1.448-39.213-1.448c-7.319,0-14.691,0.143-21.969,0.417
+			c-46.133-34.62-83.919-69.267-104.148-88.684c0.369-2.138,0.623-3.828,0.741-5.126c2.668-28.165-0.298-47.179-8.786-56.515
+			c-5.558-6.101-13.721-8.131-22.233-5.806c-5.286,1.385-15.071,6.513-18.204,16.952c-3.459,11.536,2.101,25.537,16.708,41.773
+			c0.232,0.246,5.189,5.44,14.196,14.241c-5.854,27.913-21.178,88.148-28.613,117.073c-17.463,9.331-32.013,20.571-43.277,33.465
+			l-0.738,0.844l-0.477,1.013c-1.16,2.437-6.705,15.087-2.542,25.249c1.901,4.62,5.463,7.995,10.302,9.767l1.297,0.349
+			c0,0,1.17,0.253,3.227,0.253c9.01,0,31.25-4.735,43.179-48.695l2.89-11.138c41.639-20.239,93.688-26.768,131.415-28.587
+			c19.406,14.391,38.717,27.611,57.428,39.318l0.611,0.354c0.907,0.464,9.112,4.515,18.721,4.524l0,0
+			c13.732,0,23.762-8.427,27.496-23.113l0.189-1.004c1.044-8.393-1.065-15.958-6.096-21.872
+			C407.711,233.281,387.978,232.195,386.205,232.135z M142.812,319.744c-0.084-0.1-0.124-0.194-0.166-0.3
+			c-0.896-2.157,0.179-7.389,1.761-11.222c6.792-7.594,14.945-14.565,24.353-20.841
+			C159.598,317.039,146.274,319.603,142.812,319.744z M200.984,122.695L200.984,122.695c-14.07-15.662-13.859-23.427-13.102-26.041
+			c1.242-4.369,6.848-6.02,6.896-6.035c2.824-0.768,4.538-0.617,6.064,1.058c3.451,3.791,6.415,15.232,5.244,36.218
+			C202.764,124.557,200.984,122.695,200.984,122.695z M193.714,256.068l0.243-0.928l-0.032,0.011
+			c7.045-27.593,17.205-67.996,23.047-93.949l0.211,0.201l0.021-0.124c18.9,17.798,47.88,43.831,82.579,70.907l-0.39,0.016
+			l0.574,0.433C267.279,235.396,228.237,241.84,193.714,256.068z M408.386,265.12c-2.489,9.146-7.277,10.396-11.665,10.396l0,0
+			c-5.094,0-9.998-2.12-11.116-2.632c-12.741-7.986-25.776-16.688-38.929-25.998c0.105,0,0.2,0,0.316,0
+			c22.549,0,37.568,1.369,38.158,1.411c3.766,0.14,15.684,1.9,20.82,7.938C407.984,258.602,408.755,261.431,408.386,265.12z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

_static/banners/txt.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 550.801 550.801" style="enable-background:new 0 0 550.801 550.801;"
+	 xml:space="preserve">
+<g>
+	<g>
+		<path d="M475.095,131.992c-0.032-2.526-0.844-5.021-2.579-6.993L366.324,3.694c-0.031-0.034-0.062-0.045-0.084-0.076
+			c-0.633-0.707-1.371-1.29-2.151-1.804c-0.232-0.15-0.464-0.285-0.707-0.422c-0.675-0.366-1.382-0.67-2.13-0.892
+			c-0.201-0.058-0.38-0.14-0.58-0.192C359.87,0.114,359.037,0,358.193,0H97.2C85.292,0,75.6,9.693,75.6,21.601v507.6
+			c0,11.913,9.692,21.601,21.6,21.601H453.6c11.908,0,21.601-9.688,21.601-21.601V133.202
+			C475.2,132.796,475.137,132.398,475.095,131.992z M210.558,418.605h-35.764v106.128h-29.734V418.605h-35.184v-24.874h100.683
+			V418.605z M298.814,524.733l-11.855-23.714c-4.856-9.134-7.973-15.937-11.662-23.52h-0.388
+			c-2.724,7.583-6.022,14.386-10.104,23.52l-10.887,23.714h-33.827L258,458.452l-36.547-64.727h34.016l11.476,23.91
+			c3.881,7.963,6.803,14.381,9.911,21.769h0.391c3.101-8.358,5.632-14.19,8.933-21.769l11.085-23.91h33.824l-36.936,63.946
+			l38.876,67.062H298.814z M440.923,418.605h-35.765v106.128h-29.742V418.605h-35.189v-24.874h100.686v24.874H440.923z
+			 M97.2,366.752V21.601h250.192v110.515c0,5.961,4.842,10.8,10.801,10.8H453.6v223.836H97.2z"/>
+		<path d="M174.351,148.269h119.812c3.966,0,7.203-3.225,7.203-7.198s-3.237-7.193-7.203-7.193H174.351
+			c-3.977,0-7.193,3.22-7.193,7.193S170.374,148.269,174.351,148.269z"/>
+		<path d="M370.797,191.432H174.161c-3.974,0-7.193,3.217-7.193,7.192c0,3.974,3.219,7.198,7.193,7.198h196.636
+			c3.976,0,7.203-3.225,7.203-7.198C378,194.648,374.772,191.432,370.797,191.432z"/>
+		<path d="M370.797,248.58H174.161c-3.974,0-7.193,3.217-7.193,7.198c0,3.974,3.219,7.198,7.193,7.198h196.636
+			c3.976,0,7.203-3.225,7.203-7.198C378,251.796,374.772,248.58,370.797,248.58z"/>
+		<path d="M370.797,307.099H174.161c-3.974,0-7.193,3.223-7.193,7.198c0,3.977,3.219,7.193,7.193,7.193h196.636
+			c3.976,0,7.203-3.217,7.203-7.193C378,310.321,374.772,307.099,370.797,307.099z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

_static/latex/odoo.sty

@@ -2,7 +2,6 @@
 %\usepackage[default]{lato}
 \usepackage{inconsolata}
 \usepackage{fancyhdr}
-\usepackage[usenames,dvipsnames]{xcolor}
 \usepackage{graphicx}
 
 % fancy titlepage
@@ -82,12 +81,32 @@
 \renewcommand{\headrulewidth}{0.1pt}
 \renewcommand{\footrulewidth}{0.1pt}
 
+\renewcommand{\maketitle}{%
+  \noindent\rule{\textwidth}{1pt}\ifsphinxpdfoutput\newline\null\fi\par
+  \ifsphinxpdfoutput
+    \begingroup
+     %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}%
+     %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
+    \endgroup
+  \fi
+  \begin{flushright}
+    \sphinxlogo
+    \py@HeaderFamily
+    {\Huge \@title }\par
+  \end{flushright}
+  \@thanks
+  \setcounter{footnote}{0}
+  \let\thanks\relax\let\maketitle\relax
+  %\gdef\@thanks{}\gdef\@author{}\gdef\@title{}
+}
+
+
 \newcommand{\makeodootitleold}{%
   \begin{titlepage}
   \titlepagedecoration
   \begin{center}
   \vspace{3cm}
-  \includegraphics{_static/banners/odoo_logo}
+  \sphinxlogo
   \end{center}
 
   \vspace{2cm}

accounting/localizations/mexico.rst

@@ -177,6 +177,19 @@ and then enter your PAC username and PAC password.
    - `Certificate Key`_
    - **Password :** 12345678a
 
+7. Configure the tag in sales taxes
+-----------------------------------
+
+This tag is used to set the tax type code, transferred or withhold, applicable
+to the concept in the CFDI.
+So, if the tax is a sale tax the "Tag" field should be "IVA", "ISR" or "IEPS".
+
+.. image:: media/mexico33.png
+   :align: center
+
+Note that the default taxes already has a tag assigned, but when you create a
+new tax you should choose a tag.
+
 Usage and testing
 ~~~~~~~~~~~~~~~~~
 
@@ -488,7 +501,7 @@ debug mode enabled).
 - Click on button "Create Contextual Action"
 - Go to the company form :menuselection:`Settings --> Users&Companies --> Companies`
 - Open any company you have.
-- Click on "Action" and then on "Dowload XSD file to CFDI".
+- Click on "Action" and then on "Download XSD file to CFDI".
 
 .. image:: media/mexico18.png
    :align: center
@@ -497,6 +510,23 @@ Now you can make an invoice with any error (for example a product without
 code which is pretty common) and an explicit error will be shown instead a
 generic one with no explanation.
 
+.. note::
+   If you see an error like this:
+
+     The cfdi generated is not valid
+
+     attribute decl. 'TipoRelacion', attribute 'type': The QName value
+     '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does
+     not resolve to a(n) simple type definition., line 36
+
+   This can be caused because of a database backup restored in anothe server,
+   or when the XSD files are not correctly downloaded. Follow the same steps
+   as above but:
+
+   - Go to the company in which the error occurs.
+   - Click on "Action" and then on "Download XSD file to CFDI".
+
+
 FAQ
 ~~~
 
@@ -586,9 +616,8 @@ FAQ
 .. image:: media/mexico13.png
    :align: center
 
-
 .. _SAT: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf
-.. _Finkok: https://facturacion.finkok.com/cuentas/registrar/
+.. _Finkok: https://www.finkok.com/contacto.html
 .. _`Solución Factible`: https://solucionfactible.com/sf/v3/timbrado.jsp
 .. _`SAT resolution`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Paginas/Anexo_20_version3.3.aspx
 .. _`given by the SAT`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Documents/GuiaAnexo20DPA.pdf

conf.py

@@ -50,7 +50,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Odoo Business'
+project = u'Odoo'
 copyright = u'2015-TODAY, Odoo S.A.'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -58,8 +58,8 @@ copyright = u'2015-TODAY, Odoo S.A.'
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
-version = '10.0'
+release = '11.0'
+version = '11.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -211,9 +211,6 @@ latex_elements = {
 
 # output manually in latex docs
 'releasename': '',
-'release': '',
-'date': '',
-
 }
 
 latex_additional_files = ['_static/latex/odoo.sty']
@@ -222,11 +219,23 @@ latex_additional_files = ['_static/latex/odoo.sty']
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement_v5.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'),
-  ('legal/terms/i18n/enterprise_tex_fr', 'odoo_enterprise_agreement_v5_fr.tex', 'Odoo Enterprise Subscription Agreement (FR)', '', 'howto'),
-  ('legal/terms/partnership_tex', 'odoo_partnership_agreement_v5.tex', 'Odoo Partnership Agreement', '', 'howto'),
-  ('legal/terms/terms_of_sale', 'terms_of_sale_v1.tex', 'Odoo Terms of Sale', '', 'howto'),
-  ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_v1_fr.tex', u'Conditions Générales de Vente Odoo', '', 'howto'),
+  ('legal/terms/enterprise_tex', 'odoo_enterprise_agreement.tex', 'Odoo Enterprise Subscription Agreement', '', 'howto'),
+  ('legal/terms/partnership_tex', 'odoo_partnership_agreement.tex', 'Odoo Partnership Agreement', '', 'howto'),
+  ('legal/terms/terms_of_sale', 'terms_of_sale.tex', 'Odoo Terms of Sale', '', 'howto'),
+
+  ('legal/terms/i18n/enterprise_tex_fr', 'odoo_enterprise_agreement_fr.tex', 'Odoo Enterprise Subscription Agreement (FR)', '', 'howto'),
+  ('legal/terms/i18n/partnership_tex_fr', 'odoo_partnership_agreement_fr.tex', 'Odoo Partnership Agreement (FR)', '', 'howto'),
+  ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_fr.tex', u'Conditions Générales de Vente Odoo', '', 'howto'),
+
+  #('legal/terms/i18n/enterprise_tex_nl', 'odoo_enterprise_agreement_nl.tex', 'Odoo Enterprise Subscription Agreement (NL)', '', 'howto'),
+  #('legal/terms/i18n/partnership_tex_nl', 'odoo_partnership_agreement_nl.tex', 'Odoo Partnership Agreement (NL)', '', 'howto'),
+
+  ('legal/terms/i18n/enterprise_tex_de', 'odoo_enterprise_agreement_de.tex', 'Odoo Enterprise Subscription Agreement (DE)', '', 'howto'),
+  #('legal/terms/i18n/partnership_tex_de', 'odoo_partnership_agreement_de.tex', 'Odoo Partnership Agreement (DE)', '', 'howto'),
+
+  #('legal/terms/i18n/enterprise_tex_es', 'odoo_enterprise_agreement_es.tex', 'Odoo Enterprise Subscription Agreement (ES)', '', 'howto'),
+  ('legal/terms/i18n/partnership_tex_es', 'odoo_partnership_agreement_es.tex', 'Odoo Partnership Agreement (ES)', '', 'howto'),
+
   #('index', 'UnderstandingAccountingForEntrepreneurs.tex', u'Understanding Accounting For Entrepreneurs Documentation', u'fp, xmo', 'manual'),
 ]
 

crm.rst

@@ -7,8 +7,8 @@ CRM
 .. toctree::
    :titlesonly:
 
-   crm/overview
-   crm/salesteam
-   crm/leads
-   crm/reporting
-   crm/calendar
+   crm/pipeline
+   crm/acquire_leads
+   crm/track_leads
+   crm/performance
+   crm/optimize

crm/acquire_leads.rst

@@ -0,0 +1,11 @@
+=============
+Acquire Leads
+=============
+
+.. toctree::
+   :titlesonly:
+
+   acquire_leads/convert
+   acquire_leads/generate_from_email
+   acquire_leads/generate_from_website
+   acquire_leads/send_quotes

crm/acquire_leads/convert.rst

@@ -0,0 +1,40 @@
+================================
+Convert leads into opportunities
+================================
+
+The system can generate leads instead of opportunities, in order to add
+a qualification step before converting a *Lead* into an
+*Opportunity* and assigning to the right sales people. You can
+activate this mode from the CRM Settings. It applies to all your sales
+channels by default. But you can make it specific for specific channels
+from their configuration form.
+
+Configuration
+=============
+
+For this feature to work, go to :menuselection:`CRM --> Configuration --> Settings`
+and activate the *Leads* feature.
+
+.. image:: media/convert01.png
+    :align: center
+
+You will now have a new submenu *Leads* under *Pipeline* where they
+will aggregate.
+
+.. image:: media/convert02.png
+    :align: center
+
+Convert a lead into an opportunity
+==================================
+
+When you click on a *Lead* you will have the option to convert it to
+an opportunity and decide if it should still be assigned to the same
+channel/person and if you need to create a new customer.
+
+.. image:: media/convert03.png
+    :align: center
+
+If you already have an opportunity with that customer Odoo will
+automatically offer you to merge with that opportunity. In the same
+manner, Odoo will automatically offer you to link to an existing
+customer if that customer already exists.

crm/acquire_leads/generate_from_email.rst

@@ -0,0 +1,20 @@
+========================================
+Generate leads/opportunities from emails
+========================================
+
+Automating the lead/opportunity generation will considerably improve
+your efficiency. By default, any email sent to
+*sales@database\_domain.ext* will create an opportunity in the
+pipeline of the default sales channel.
+
+Configure email aliases
+=======================
+
+Each sales channel can have its own email alias, to generate
+leads/opportunities automatically assigned to it. It is useful if you
+manage several sales teams with specific business processes. You will
+find the configuration of sales channels under
+:menuselection:`Configuration --> Sales Channels`.
+
+.. image:: media/generate_from_email01.png
+    :align: center

crm/acquire_leads/generate_from_website.rst

@@ -0,0 +1,78 @@
+===========================================================
+Generate leads/opportunities from your website contact page
+===========================================================
+
+Automating the lead/opportunity generation will considerably improve
+your efficiency. Any visitor using the contact form on your website will
+create a lead/opportunity in the pipeline.
+
+Use the contact us on your website
+==================================
+
+You should first go to your website app.
+
+|image0|\ |image1|
+
+With the CRM app installed, you benefit from ready-to-use contact form
+on your Odoo website that will generate leads/opportunities
+automatically.
+
+.. image:: media/generate_from_website03.png
+   :align: center
+
+To change to a specific sales channel, go to :menuselection:`Website
+--> Configuration --> Settings` under *Communication* you will find the
+Contact Form info and where to change the *Sales Channel* or
+*Salesperson*.
+
+.. image:: media/generate_from_website04.png
+   :align: center
+
+Create a custom contact form
+============================
+
+You may want to know more from your visitor when they use they want to
+contact you. You will then need to build a custom contact form on your
+website. Those contact forms can generate multiple types of records in
+the system (emails, leads/opportunities, project tasks, helpdesk
+tickets, etc...)
+
+Configuration
+=============
+
+You will need to install the free *Form Builder* module. Only
+available in Odoo Enterprise.
+
+.. image:: media/generate_from_website05.png
+   :align: center
+
+Create a custom contact form
+----------------------------
+
+From any page you want your contact form to be in, in edit mode, drag
+the form builder in the page and you will be able to add all the fields
+you wish.
+
+.. image:: media/generate_from_website06.png
+   :align: center
+
+By default any new contact form will send an email, you can switch to
+lead/opportunity generation in *Change Form Parameters*.
+
+.. note::
+   If the same visitors uses the contact form twice, the second
+   information will be added to the first lead/opportunity in the chatter.
+
+Generate leads instead of opportunities
+=======================================
+
+When using a contact form, it is advised to use a qualification step
+before assigning to the right sales people. To do so, activate *Leads*
+in CRM settings and refer to :doc:`convert`.
+
+.. |image0| image:: ./media/generate_from_website01.png
+   :width: 1.04401in
+   :height: 1.16146in
+.. |image1| image:: ./media/generate_from_website02.png
+   :width: 1.43229in
+   :height: 1.16244in

crm/acquire_leads/send_quotes.rst

@@ -0,0 +1,35 @@
+===============
+Send quotations
+===============
+
+When you qualified one of your lead into an opportunity you will most
+likely need to them send a quotation. You can directly do this in the
+CRM App with Odoo.
+
+.. image:: media/send_quotes01.png
+    :align: center
+
+Create a new quotation
+======================
+
+By clicking on any opportunity or lead, you will see a *New Quotation*
+button, it will bring you into a new menu where you can manage your
+quote.
+
+.. image:: media/send_quotes02.png
+    :align: center
+
+You will find all your quotes to that specific opportunity under the
+*Quotations* menu on that page.
+
+.. image:: media/send_quotes03.png
+    :align: center
+
+Mark them won/lost
+==================
+
+Now you will need to mark your opportunity as won or lost to move the
+process along.
+
+If you mark them as won, they will move to your *Won* column in your
+Kanban view. If you however mark them as *Lost* they will be archived.

crm/calendar.rst

@@ -1,8 +0,0 @@
-========
-Calendar
-========
-
-.. toctree::
-   :titlesonly:
-
-   calendar/google_calendar_credentials

crm/leads.rst

@@ -1,10 +0,0 @@
-=====
-Leads
-=====
-
-.. toctree::
-   :titlesonly:
-
-   leads/generate
-   leads/manage
-   leads/voip

crm/leads/generate.rst

@@ -1,11 +0,0 @@
-==============
-Generate leads
-==============
-
-.. toctree::
-   :titlesonly:
-
-   generate/manual
-   generate/import
-   generate/emails
-   generate/website

crm/leads/generate/emails.rst

@@ -1,69 +0,0 @@
-===========================================
-How to generate leads from incoming emails?
-===========================================
-
-There are several ways for your company to :doc:`generate leads with Odoo CRM <manual>`.
-One of them is using your company's generic email address as a trigger
-to create a new lead in the system. In Odoo, each one of your sales
-teams is linked to its own email address from which prospects can reach
-them. For example, if the personal email address of your Direct team is
-**direct@mycompany.example.com**, every email sent will automatically create a new
-opportunity into the sales team.
-
-Configuration
-=============
-
-The first thing you need to do is to configure your **outgoing email
-servers** and **incoming email gateway** from the :menuselection:`Settings module --> General Settings`.
-
-Then set up your alias domain from the field shown here below and
-click on **Apply**.
-
-.. image:: ./media/emails01.jpg
-   :align: center
-
-Set up team alias
-=================
-
-Go on the Sales module and click on **Dashboard**. You will see that the
-activation of your domain alias has generated a default email alias for
-your existing sales teams.
-
-.. image:: ./media/emails02.jpg
-   :align: center
-
-You can easily personalize your sales teams aliases. Click on the More
-button from the sales team of your choice, then on **Settings** to access
-the sales team form. Into the **Email Alias** field, enter your email
-alias and click on **Save**. Make sure to allow receiving emails from
-everyone.
-
-From there, each email sent to this email address will generate a new
-lead into the related sales team.
-
-.. image:: ./media/emails03.jpg
-   :align: center
-
-Set up catch-all email domain
-=============================
-
-Additionally to your sales team aliases, you can also create a generic
-email alias (e.g. *contact@* or *info@* ) that will also generate a new
-contact in Odoo CRM. Still from the Sales module, go to
-:menuselection:`Configuration --> Settings` and set up your catch-all email domain.
-
-.. tip::
-
-	You can choose whether the contacts generated from your catch-all email
-	become leads or opportunities using the radio buttons that you see on the
-	screenshot here below. Note that, by default, the lead stage is not
-	activated in Odoo CRM.
-
-.. image:: ./media/emails04.jpg
-   :align: center
-
-.. seealso::
-
-	* :doc:`manual`
-	* :doc:`import`
-	* :doc:`website`

crm/leads/generate/import.rst

@@ -1,91 +0,0 @@
-==================================
-How to import contacts to the CRM?
-==================================
-
-In Odoo CRM, you can import a database of potential customers, for
-instance for a cold emailing or cold calling campaign, through a CSV
-file. You may be wondering if the best option is to import your contacts
-as leads or opportunities. It depends on your business specificities and
-workflow:
-
--  Some companies may decide to not use leads, but instead to keep all
-   information directly in an opportunity. For some companies, leads
-   are merely an extra step in the sales process. You could call
-   this extended (start from lead) versus simplified (start from
-   opportunity) customer relationship management.
-
--  Odoo perfectly allows for either one of these approaches to be
-   chosen. If your company handles its sales from a pre
-   qualification step, feel free to activate first the lead stage as
-   described below in order to import your database as leads
-
-Activate the lead stage
-=======================
-
-By default, the lead stage is not activated in Odoo CRM. If you want to
-import your contacts as leads rather than opportunities, go to
-:menuselection:`Configuration --> Settings`, select the option **use leads
-if…** as shown below and click on **Apply**.
-
-.. image:: ./media/import01.jpg
-   :align: center
-
-This activation will create a new submenu :menuselection:`Sales --> Leads`
-from which you will be able to import your contacts from the
-**Import** button (if you want to create a lead manually, :doc:`click here <manual>`)
-
-.. image:: ./media/import02.jpg
-   :align: center
-
-Import your CSV file
-====================
-
-On the new submenu :menuselection:`Sales --> Leads`, click on **Import** and select your
-Excel file to import from the **Choose File** button. Make sure its
-extension is **.csv** and don't forget to set up the correct File format
-options (**Encoding** and **Separator**) to match your local
-settings and display your columns properly.
-
-.. note::
-	If your prospects database is provided in another format than CSV, you can
-	easily convert it to the CSV format using Microsoft Excel, OpenOffice /
-	LibreOffice Calc, Google Docs, etc.
-
-.. image:: ./media/import03.jpg
-   :align: center
-
-Select rows to import
-=====================
-
-Odoo will automatically map the column headers from your CSV file to the
-corresponding fields if you tick *The first row of the file contains the
-label of the column* option. This makes imports easier especially when
-the file has many columns. Of course, you can remap the column headers
-to describe the property you are importing data into (First Name, Last
-Name, Email, etc.).
-
-.. image:: ./media/import04.jpg
-   :align: center
-
-.. tip::
-
-	If you want to import your contacts as opportunities rather than leads, make
-	sure to add the *Type* column to your csv. This column is used to indicate
-	whether your import will be flagged as a Lead (type = Lead) or as an
-	opportunity (type = Opportunity).
-
-Click the **Validate** button if you want to let Odoo verify that
-everything seems okay before importing. Otherwise, you can directly
-click the Import button: the same validations will be done.
-
-.. note::
-
-	For additional technical information on how to import contacts into Odoo CRM,
-	read the **Frequently Asked Questions** section located below the Import tool
-	on the same window.
-
-.. seealso::
-
-	- :doc:`manual`
-	- :doc:`emails`
-	- :doc:`website`

crm/leads/generate/manual.rst

@@ -1,71 +0,0 @@
-======================================
-How to create a contact into Odoo CRM?
-======================================
-
-Odoo CRM allows you to manually add contacts into your pipeline. It can
-be either a lead or an opportunity.
-
-Activate the lead stage
-=======================
-
-By default, the lead stage is not activated in Odoo CRM. To activate it,
-go to :menuselection:`Sales --> Configuration --> Settings`, select the option ""use leads
-if…** as shown below and click on **Apply**.
-
-.. image:: ./media/manual01.jpg
-	:align: center
-
-This activation will create a new submenu **Leads** under
-**Sales** that gives you access to a list of all your leads from
-which you will be able to create a new contact.
-
-.. image:: ./media/manual02.jpg
-	:align: center
-
-Create a new lead
-=================
-
-Go to :menuselection:`Sales --> Leads` and click the **Create** button.
-
-.. image:: ./media/manual03.jpg
-	:align: center
-
-From the contact form, provide all the details in your possession
-(contact name, email, phone, address, etc.) as well as some additional
-information in the **Internal notes** field.
-
-.. note::
-
-	your lead can be directly handed over to specific sales team and salesperson
-	by clicking on **Convert to Opportunity** on the upper left corner of the screen.
-
-Create a new opportunity
-========================
-
-You can also directly add a contact into a specific sales team without
-having to convert the lead first. On the Sales module, go to your
-dashboard and click on the **Pipeline** button of the desired sales
-team. If you don't have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`.
-Then, click on **Create** and fill in the contact details as shown here
-above. By default, the newly created opportunity will appear on the
-first stage of your sales pipeline.
-
-Another way to create an opportunity is by adding it directly on a
-specific stage. For example, if you have have spoken to Mr. Smith at a
-meeting and you want to send him a quotation right away, you can add his
-contact details on the fly directly into the **Proposition** stage. From
-the Kanban view of your sales team, just click on the **+** icon
-at the right of your stage to create the contact. The new opportunity
-will then pop up into the corresponding stage and you can then fill in
-the contact details by clicking on it.
-
-.. image:: ./media/manual04.png
-	:align: center
-
-.. seealso::
-
-	* :doc:`import`
-
-	* :doc:`emails`
-
-	* :doc:`website`

crm/leads/generate/website.rst

@@ -1,196 +0,0 @@
-======================================
-How to generate leads from my website?
-======================================
-
-Your website should be your company's first lead generation tool. With
-your website being the central hub of your online marketing campaigns,
-you will naturally drive qualified traffic to feed your pipeline. When a
-prospect lands on your website, your objective is to capture his
-information in order to be able to stay in touch with him and to push
-him further down the sales funnel.
-
-This is how a typical online lead generation process work :
-
--  Your website visitor clicks on a call-to action (CTA) from one of
-   your marketing materials (e.g. an email newsletter, a social
-   media message or a blog post)
-
--  The CTA leads your visitor to a landing page including a form used to
-   collect his personal information (e.g. his name, his email
-   address, his phone number)
-
--  The visitor submits the form and automatically generates a lead into
-   Odoo CRM
-
-.. tip::
-
-	Your calls-to-action, landing pages and forms are the key pieces of the lead
-	generation process. With Odoo Website, you can easily create and optimize
-	those critical elements without having to code or to use third-party
-	applications. Learn more `here <https://www.odoo.com/page/website-builder>`__.
-
-In Odoo, the Website and CRM modules are fully integrated, meaning that
-you can easily generate leads from various ways through your website.
-However, even if you are hosting your website on another CMS, it is
-still possible to fill Odoo CRM with leads generated from your website.
-
-Activate the lead stage
-=======================
-
-By default, the lead stage is not activated in Odoo CRM. Therefore, new
-leads automatically become opportunities. You can easily activate the
-option of adding the lead step. If you want to import your contacts as
-leads rather than opportunities, from the Sales module go to
-:menuselection:`Configuration --> Settings`, select the option **use leads
-if…** as shown below and click on **Apply**.
-
-.. image:: ./media/website01.jpg
-   :align: center
-
-Note that even without activating this step, the information that
-follows is still applicable - the lead generated will land in the
-opportunities dashboard.
-
-From an Odoo Website
-====================
-
-Let's assume that you want to get as much information as possible about
-your website visitors. But how could you make sure that every person who
-wants to know more about your company's products and services is
-actually leaving his information somewhere? Thanks to Odoo's integration
-between its CRM and Website modules, you can easily automate your lead
-acquisition process thanks to the **contact form** and the **form builder**
-modules
-
-.. note::
-
-	another great way to generate leads from your Odoo Website is by collecting
-	your visitors email addresses thanks to the Newsletter or Newsletter Popup
-	CTAs. These snippets will create new contacts in your Email Marketing's
-	mailing list. Learn more `here <https://www.odoo.com/page/email-marketing>`__.
-
-Configuration
--------------
-
-Start by installing the Website builder module. From the main dashboard,
-click on **Apps**, enter "**Website**" in the search bar and click on **Install**.
-You will be automatically redirected to the web interface.
-
-.. image:: ./media/website02.png
-   :align: center
-
-.. tip::
-
-	A tutorial popup will appear on your screen if this is the first time you
-	use Odoo Website. It will help you get started with the tool and you'll be
-	able to use it in minutes. Therefore, we strongly recommend you to use it.
-
-Create a lead by using the Contact Form module
-----------------------------------------------
-
-You can effortlessly generate leads via a contact form on your **Contact
-us** page. To do so, you first need to install the Contact Form module.
-It will add a contact form in your **Contact us** page and automatically
-generate a lead from forms submissions.
-
-To install it, go back to the backend using the square icon on the
-upper-left corner of your screen. Then, click on **Apps**, enter
-"**Contact Form**" in the search bar (don't forget to remove the **Apps** tag
-otherwise you will not see the module appearing) and click on **Install**.
-
-.. image:: ./media/website03.png
-   :align: center
-
-Once the module is installed, the below contact form will be integrated
-to your "Contact us" page. This form is linked to Odoo CRM, meaning that
-all data entered through the form will be captured by the CRM and will
-create a new lead.
-
-.. image:: ./media/website04.jpg
-   :align: center
-
-Every lead created through the contact form is accessible in the Sales
-module, by clicking on :menuselection:`Sales --> Leads`. The name of the lead corresponds
-to the "Subject" field on the contact form and all the other information
-is stored in the corresponding fields within the CRM. As a salesperson,
-you can add additional information, convert the lead into an opportunity
-or even directly mark it as Won or Lost.
-
-.. image:: ./media/website05.jpg
-   :align: center
-
-Create a lead using the Form builder module
--------------------------------------------
-
-You can create fully-editable custom forms on any landing page on your
-website with the Form Builder snippet. As for the Contact Form module,
-the Form Builder will automatically generate a lead after the visitor
-has completed the form and clicked on the button **Send**.
-
-From the backend, go to Settings and install the
-"**Website Form Builder**" module (don't forget to remove the **Apps** tag
-otherwise you will not see the modules appearing). Then, back on the
-website, go to your desired landing page and click on Edit to access
-the available snippets. The Form Builder snippet lays under the
-**Feature** section.
-
-.. image:: ./media/website06.png
-   :align: center
-
-As soon as you have dropped the snippet where you want the form to
-appear on your page, a **Form Parameters** window will pop up. From the
-**Action** drop-down list, select **Create a lead** to automatically
-create a lead in Odoo CRM. On the **Thank You** field, select the URL of
-the page you want to redirect your visitor after the form being
-submitted (if you don't add any URL, the message "The form has been
-sent successfully" will confirm the submission).
-
-.. image:: ./media/website07.png
-   :align: center
-
-You can then start creating your custom form. To add new fields, click
-on **Select container block** and then on the blue **Customize** button. 3
-options will appear:
-
-.. image:: ./media/website08.png
-   :align: center
-
-- **Change Form Parameters**: allows you to go back to the Form
-  Parameters and change the configuration
-
-- **Add a model field**: allows you to add a field already existing in
-  Odoo CRM from a drop-down list. For example, if you select the
-  Field *Country*, the value entered by the lead will appear under
-  the *Country* field in the CRM - even if you change the name of
-  the field on the form.
-
-- **Add a custom field**: allows you to add extra fields that don't exist
-  by default in Odoo CRM. The values entered will be added under
-  "Notes" within the CRM. You can create any field type : checkbox,
-  radio button, text, decimal number, etc.
-
-Any submitted form will create a lead in the backend.
-
-From another CMS 
-=================
-
-If you use Odoo CRM but not Odoo Website, you can still automate your
-online lead generation process using email gateways by editing the
-"Submit" button of any form and replacing the hyperlink by a mailto
-corresponding to your email alias (learn how to create your sales alias
-:doc:`here <emails>`).
-
-For example if the alias of your company is
-**salesEMEA@mycompany.com**, add
-``mailto:salesEMEA@mycompany.com``
-into the regular hyperlink code (CTRL+K) to generate a lead into the
-related sales team in Odoo CRM.
-
-.. image:: ./media/website09.png
-   :align: center
-
-.. seealso::
-
-	- :doc:`manual`
-	- :doc:`import`
-	- :doc:`emails`

crm/leads/manage.rst

@@ -1,9 +0,0 @@
-============
-Manage leads
-============
-
-.. toctree::
-   :titlesonly:
-
-   manage/automatic_assignation
-   manage/lead_scoring

crm/leads/manage/automatic_assignation.rst

@@ -1,100 +0,0 @@
-================================================================
-Automate lead assignation to specific sales teams or salespeople
-================================================================
-
-Depending on your business workflow and needs, you may need to dispatch
-your incoming leads to different sales team or even to specific
-salespeople. Here are a few example:
-
-- Your company has several offices based on different geographical
-  regions. You will want to assign leads based on the region;
-
-- One of your sales teams is dedicated to treat opportunities from
-  large companies while another one is specialized for SMEs. You
-  will want to assign leads based on the company size;
-
-- One of your sales representatives is the only one to speak foreign
-  languages while the rest of the team speaks English only.
-  Therefore you will want to assign to that person all the leads
-  from non-native English-speaking countries.
-
-As you can imagine, manually assigning new leads to specific individuals
-can be tedious and time consuming - especially if your company generates
-a high volume of leads every day. Fortunately, Odoo CRM allows you to
-automate the process of lead assignation based on specific criteria such
-as location, interests, company size, etc. With specific workflows and
-precise rules, you will be able to distribute all your opportunities
-automatically to the right sales teams and/or salesman.
-
-Configuration
-=============
-
-If you have just started with Odoo CRM and haven't set up your sales
-team nor registered your salespeople, :doc:`read this documentation first <../../overview/started/setup>`.
-
-.. note::
-    You have to install the module **Lead Scoring**. Go to 
-    :menuselection:`Apps` and install it if it's not the case already.
-
-Define rules for a sales team
-=============================
-
-From the sales module, go to your dashboard and click on the **More**
-button of the desired sales team, then on **Settings**. If you don't
-have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`.
-
-.. image:: ./media/automatic01.jpg
-   :align: center
-
-
-On your sales team menu, use in the **Domain** field a specific domain
-rule (for technical details on the domain refer on the
-`Building a Module tutorial <https://www.odoo.com/documentation/11.0/howtos/backend.html#domains>`__
-or `Syntax reference guide <https://www.odoo.com/documentation/11.0/reference/orm.html#reference-orm-domains>`__)
-which will allow only the leads matching the team domain.
-
-For example, if you want your *Direct Sales* team to only receive leads
-coming from United States and Canada, your domain will be as following :
-
-``[[country_id, 'in', ['United States', 'Canada']]]``
-
-.. image:: ./media/automatic02.jpg
-   :align: center
-
-.. note::
-
-	you can also base your automatic assignment on the score attributed to your
-	leads. For example, we can imagine that you want all the leads with a score
-	under 100 to be assigned to a sales team trained for lighter projects and
-	the leads over 100 to a more experienced sales team. Read more on :doc:`how to score leads here <lead_scoring>`.
-
-Define rules for a salesperson
-==============================
-
-You can go one step further in your assignment rules and decide to
-assign leads within a sales team to a specific salesperson. For example,
-if I want Toni Buchanan from the *Direct Sales* team to receive only
-leads coming from Canada, I can create a rule that will automatically
-assign him leads from that country.
-
-Still from the sales team menu (see here above), click on the
-salesperson of your choice under the assignment submenu. Then, enter
-your rule in the *Domain* field.
-
-.. image:: ./media/automatic03.jpg
-   :align: center
-
-.. note::
-
-	In Odoo, a lead is always assigned to a sales team before to be assigned to
-	a salesperson. Therefore, you need to make sure that the assignment rule of
-	your salesperson is a child of the assignment rule of the sales team.
-
-.. seealso::
-
-	* :doc:`../../overview/started/setup`
-
-	.. todo:: * How to assign sales activities into multiple sales teams?
-
-	.. todo:: * How to make sure my salespeople work on the most promising leads?
-

crm/leads/manage/lead_scoring.rst

@@ -1,110 +0,0 @@
-=================================
-How to do efficient Lead Scoring?
-=================================
-
-Odoo's Lead Scoring module allows you to give a score to your leads
-based on specific criteria - the higher the value, the more likely the
-prospect is "ready for sales". Therefore, the best leads are
-automatically assigned to your salespeople so their pipe are not
-polluted with poor-quality opportunities.
-
-.. note::
-    Lead scoring is a critical component of an effective lead 
-    management strategy. By helping your sales representative 
-    determine which leads to engage with in order of priority, 
-    you will increase their overall conversion rate and your 
-    sales team's efficiency.
-
-Configuration
-=============
-
-Install the Lead Scoring module
--------------------------------
-
-Start by installing the **Lead Scoring** module.
-
-Once the module is installed, you should see a new menu 
-:menuselection:`Sales --> Leads Management --> Scoring Rules`
-
-.. image:: media/lead_scoring02.png
-   :align: center
-
-Create scoring rules
---------------------
-
-Leads scoring allows you to assign a positive or negative score to your
-prospects based on any demographic or behavioral criteria that you have
-set (country or origin, pages visited, type of industry, role, etc.). To
-do so you'll first need to create rules that will assign a score to a
-given criteria.
-
-
-.. tip::
-    In order to assign the right score to your various rules, you can use these two methods:
-
-    -  Establish a list of assets that your ideal customer might possess to interest your company. 
-       For example, if you run a local business in California, a prospect coming from 
-       San Francisco should have a higher score than a prospect coming from New York.
-
-    -  Dig into your data to uncover characteristics shared by your closed opportunities 
-       and most important clients.
-
-    Please note that this is not an exact science, so you'll need time 
-    and feedback from your sales teams to adapt and fine tune your rules 
-    until getting the desired result.
-
-In the **Scoring Rules** menu, click on **Create** to write your first rule.
-
-.. image:: media/lead_scoring01.png
-   :align: center
-
-First name your rule, then enter a value and a domain (refer on the
-`official python documentation <https://docs.python.org/2/tutorial/>`__
-for more information). For example, if you want to assign 8 points to all the
-leads coming from **Belgium**, you'll need to give ``8`` as a **value** and
-``[['country\_id',=,'Belgium']]`` as a domain.
-
-.. tip::
-    Here are some criteria you can use to build a scoring rule :
-
-    -  country of origin : ``'country_id'``
-
-    -  stage in the sales cycle : ``'stage_id'``
-
-    -  email address (e.g. if you want to score the professional email addresses) : ``'email_from'``
-
-    -  page visited : ``'score_pageview_ids.url'``
-
-    -  name of a marketing campaign : ``'campaign_id'``
-
-After having activated your rules, Odoo will give a value to all your
-new incoming leads. This value can be found directly on your lead's form
-view.
-
-.. image:: media/lead_scoring04.png
-   :align: center
-
-Assign high scoring leads to your sales teams
-=============================================
-
-The next step is now to automatically convert your best leads into
-opportunities. In order to do so, you need to decide what is the minimum
-score a lead should have to be handed over to a given sales team. Go to
-your **sales dashboard** and click on the **More** button of your desired sales
-team, then on **Settings**. Enter your value under the **Minimum score**
-field.
-
-.. image:: media/lead_scoring03.png
-   :align: center
-
-From the example above, the **Direct Sales** team will only receive
-opportunities with a minimum score of ``50``. The prospects with a lower
-score can either stay in the lead stage or be assigned to another sales
-team which has set up a different minimum score.
-
-.. tip::
-    Organize a meeting between your **Marketing** and **Sales** teams in order 
-    to align your objectives and agree on what minimum score makes a sales-ready lead.
-
-.. seealso::
-    * :doc:`automatic_assignation`

crm/leads/voip.rst

@@ -1,9 +0,0 @@
-=========
-Odoo VOIP
-=========
-
-.. toctree::
-   :titlesonly:
-
-   voip/setup
-   voip/onsip

crm/optimize.rst

@@ -0,0 +1,10 @@
+=============================
+Optimize your Day-to-Day work
+=============================
+
+.. toctree::
+   :titlesonly:
+
+   optimize/google_calendar_credentials
+   optimize/onsip
+   optimize/setup

crm/optimize/google_calendar_credentials.rst

@@ -1,6 +1,6 @@
-==========================================================
-How to synchronize your Odoo Calendar with Google Calendar
-==========================================================
+=====================================
+Synchronize Google Calendar with Odoo
+=====================================
 
 Odoo is perfectly integrated with Google Calendar so that you 
 can see & manage your meetings from both platforms 

crm/optimize/onsip.rst

@@ -1,6 +1,6 @@
-===================
-OnSIP Configuration
-===================
+====================================
+Use VOIP services in Odoo with OnSIP
+====================================
 
 Introduction
 ============
@@ -64,14 +64,15 @@ OnSIP on Your Cell Phone
 
 In order to make and receive phone calls when you are not in front of your computer, you can use a softphone app on your cell phone in parallel of Odoo VoIP. This is useful for on-the-go calls, but also to make sure to hear incoming calls, or simply for convenience. Any SIP softphone will work.
 
-On Android, OnSIP has been successfully tested with `Zoiper <https://play.google.com/store/apps/details?id=com.zoiper.android.app>`_. You will have to configure it as follows:
+On Android and iOS, OnSIP has been successfully tested with `Grandstream Wave <https://play.google.com/store/apps/details?id=com.grandstream.wave>`_. When creating an account, select OnSIP in the list of carriers. You will then have to configure it as follows:
 
 - **Account name**: OnSIP
-- **Host**: the OnSIP 'Domain'
-- **Username**: the OnSIP 'Username'
+- **SIP Server**: the OnSIP 'Domain'
+- **SIP User ID**: the OnSIP 'Username'
+- **SIP Authentication ID**: the OnSIP 'Auth Username'
 - **Password**: the OnSIP 'SIP Password'
-- **Authentication user**: the OnSIP 'Auth Username'
-- **Outbound proxy**: sip.onsip.com
+
+Aside from initiating calls from Grandstream Wave on your phone, you can also initiate calls by clicking phone numbers in your browser on your PC. This will make Grandstream Wave ring and route the call via your phone to the other party. This approach is useful to avoid wasting time dialing phone numbers. In order to do so, you will need the Chrome extension `OnSIP Call Assistant <https://chrome.google.com/webstore/detail/onsip-call-assistant/pceelmncccldedfkcgjkpemakjbapnpg?hl=en>`_.
 
 .. warning::
 

crm/optimize/setup.rst

@@ -1,6 +1,6 @@
-======================
-Installation and Setup
-======================
+============================================
+Configure your VOIP Asterisk server for Odoo
+============================================
 
 Installing Asterisk server
 ==========================

crm/overview.rst

@@ -1,10 +0,0 @@
-========
-Overview
-========
-
-.. toctree::
-   :titlesonly:
-
-   overview/started
-   overview/process
-   overview/main_concepts

crm/overview/main_concepts.rst

@@ -1,9 +0,0 @@
-==============
-Main Concepts
-==============
-
-.. toctree::
-   :titlesonly:
-
-   main_concepts/introduction
-   main_concepts/terminologies

crm/overview/main_concepts/introduction.rst

@@ -1,115 +0,0 @@
-========================
-Introduction to Odoo CRM
-========================
-
-.. youtube:: fgdz8MH2YHY
-    :align: right
-    :width: 700
-    :height: 394
-
-Transcript
-==========
-
-Hi, my name is Nicholas, I'm a business manager in the 
-textile industry. I sell accessories to retailers. Do you 
-know the difference between a good salesperson and an 
-excellent salesperson? The key is to be productive and 
-organized to do the job. That's where Odoo comes in. Thanks 
-to a well structured organization you'll change a good 
-team into an exceptional team. 
-
-With Odoo CRM, the job is much easier for me and my entire 
-team. When I log in into Odoo CRM, I have a direct overview 
-of my ongoing performance. But also the activity of the next 
-7 days and the performance of the last month. I see that I 
-overachieved last month when compared to my invoicing target 
-of $200,000. I have a structured approach of my performance. 
-
-If I want to have a deeper look into the details, I click 
-on next actions and I can see that today I have planned a 
-call with Think Big Systems. Once I have done my daily 
-review, I usually go to my pipeline. The process is the 
-same for everyone in the team. Our job is to find resellers 
-and before closing any deal we have to go through different 
-stages. We usually have a first contact to qualify the 
-opportunity, then move into offer & negotiation stage, and 
-closing by a 'won'..Well, that's if all goes well.
-
-The user interface is really smooth, I can drag and drop 
-any business opportunity from one stage to another in just 
-a few clicks. 
-
-Now I'd like to go further with an interesting contact: 
-a department store. I highlighted their file by changing 
-the color. For each contact, I have a form view where I can 
-access to all necessary information about the contact. I see 
-here my opportunity Macy's has an estimated revenue of $50,000 
-and a success rate of 10%. I need to discuss about this 
-partnership, so I will schedule a meeting straight from the 
-contact form: Macy's partnership meeting. It's super easy 
-to create a new meeting with any contact. I can as well send 
-an email straight from the opportunity form and the answer 
-from the prospect will simply pop up in the system too. Now, 
-let's assume that the meeting took place, therefore I can 
-mark it as done. And the system automatically suggests a 
-next activity. Actually, we configured Odoo with a set of 
-typical activities we follow for every opportunity, and it's 
-great to have a thorough followup. The next activity will 
-be a follow-up email. Browsing from one screen to the other 
-is really simple and adapting to the view too! I can see my 
-opportunitities as a to-do list of next activities for example.
-
-With Odoo CRM I have a sales management tool that is really 
-efficient and me and my team can be well organized. I have 
-a clear overview of my sales pipeline, meetings, revenues, 
-and more.
-
-I go back to my pipeline. Macy's got qualified successfully, 
-which mean I can move their file to the next step and I will 
-dapt the expected revenue as discussed. Once I have performed 
-the qualification process, I will create a new quotation 
-based on the feedback I received from my contact. For my 
-existing customers, I can as well quickly discover the activity 
-around them for any Odoo module I use, and continue to 
-discuss about them. It's that simple.
-
-We have seen how I can manage my daily job as business 
-manager or salesperson. At the end of the journey I would 
-like to have a concrete view of my customer relationships
-and expected revenues. If I go into the reports in Odoo 
-CRM, I have the possibility to know exactly what's the 
-evolution of the leads over the past months, or have a look 
-at the potential revenues and the performance of the 
-different teams in terms of conversions from leads to 
-opportunities for instance. So with Odoo I can have a 
-clear reporting of every activity based on predefined 
-metrics or favorites. I can search for other filters 
-too and adapt the view. If I want to go in the details, 
-I choose the list view and can click on any item
-
-Odoo CRM is not only a powerful tool to achieve our sales 
-goals with structured activities, performance dashboard, 
-next acitivities and more, but also allows me to:
-
--   Use leads to get in the system unqualified but targeted 
-    contacts I may have gathered in a conference or through 
-    a contact form on my website. Those leads can then be 
-    converted into opportunities.
-
--   Manage phone calls from Odoo CRM by using the VoIP app. 
-    Call customers, manage a call queue, log calls, schedule 
-    calls and next actions to perform.
-
--   Integrate with Odoo Sales to create beautiful online or 
-    PDF quotations and turn them into sales orders.
-
--   Use email marketing for marketing campaigns to my customers 
-    and prospects.
-
--   Manage my business seamlessly, even on the go. Indeed, 
-    Odoo offers a mobile app that lets every business 
-    organize key sales activities from leads to quotes.
-
-Odoo CRM is a powerful, yet easy-to-use app. I firstly used 
-the sales planner to clearly state my objectives and set up 
-our CRM. It will help you getting started quickly too.

crm/overview/main_concepts/terminologies.rst

@@ -1,77 +0,0 @@
-======================
-Odoo CRM Terminologies
-======================
-
--  **CRM (Customer relationship management)**: 
-        System for managing a
-        company's interactions with current and future customers. It
-        often involves using technology to organize, automate, and
-        synchronize sales, marketing, customer service, and technical
-        support.
-
--  **Sales cycle** : 
-        Sequence of phases used by a company to convert a
-        prospect into a customer.
-
--  **Pipeline :** 
-        Visual representation of your sales process, from the
-        first contact to the final sale. It refers to the process by
-        which you generate, qualify and close leads through your sales
-        cycle.
-
--  **Sales stage** : 
-        In Odoo CRM, a stage defines where an opportunity
-        is in your sales cycle and its probability to close a sale.
-
--  **Lead :** 
-        Someone who becomes aware of your company or someone who
-        you decide to pursue for a sale, even if they don't know about
-        your company yet.
-
--  **Opportunity :** 
-        A lead that has shown an interest in knowing more
-        about your products/services and therefore has been handed over
-        to a sales representative
-
--  **Customer :** 
-        In Odoo CRM, a customer refers to any contact within
-        your database, whether it is a lead, an opportunity, a client or
-        a company.
-
--  **Key Performance Indicator (KPI)** : 
-        A KPI is a measurable value
-        that demonstrates how effectively a company is achieving key
-        business objectives. Organizations use KPIs to evaluate their
-        success at reaching targets.
-
--  **Lead scoring** : 
-        System assigning a positive or negative score to
-        prospects according to their web activity and personal
-        informations in order to determine whether they are "ready for
-        sales" or not.
-
--  **Kanban view :** 
-        In Odoo, the Kanban view is a workflow
-        visualisation tool halfway between a `list
-        view <https://www.odoo.com/documentation/11.0/reference/views.html#lists>`__
-        and a non-editable `form
-        view <https://www.odoo.com/documentation/11.0/reference/views.html#forms>`__
-        and displaying records as "cards". Records may be grouped in
-        columns for use in workflow visualisation or manipulation (e.g.
-        tasks or work-progress management), or ungrouped (used simply to
-        visualize records).
-
--  **List view :** 
-        View allowing you to see your objects (contacts,
-        companies, tasks, etc.) listed in a table.
-
--  **Lead generation:** 
-        Process by which a company collects relevant
-        datas about potential customers in order to enable a relationship
-        and to push them further down the sales cycle.
-
--  **Campaign:** 
-        Coordinated set of actions sent via various channels to
-        a target audience and whose goal is to generate leads. In Odoo
-        CRM, you can link a lead to the campaign which he comes from in
-        order to measure its efficiency.

crm/overview/process.rst

@@ -1,8 +0,0 @@
-================
-Process Overview
-================
-
-.. toctree::
-   :titlesonly:
-
-   process/generate_leads

crm/overview/process/generate_leads.rst

@@ -1,59 +0,0 @@
-==============================
-Generating leads with Odoo CRM
-==============================
-
-What is lead generation?
-========================
-
-Lead generation is the process by which a company acquires leads and
-collects relevant datas about potential customers in order to enable a
-relationship and to turn them into customers.
-
-For example, a website visitor who fills in your contact form to know
-more about your products and services becomes a lead for your company.
-Typically, a Customer Relationship Management tool such as Odoo CRM is
-used to centralize, track and manage leads.
-
-Why is lead generation important for my business?
-=================================================
-
-Generating a constant flow of high-quality leads is one of the most
-important responsibility of a marketing team. Actually, a well-managed
-lead generation process is like the fuel that will allow your company to
-deliver great performances - leads bring meetings, meetings bring sales,
-sales bring revenue and more work.
-
-How to generate leads with Odoo CRM?
-====================================
-
-Leads can be captured through many sources - marketing campaigns,
-exhibitions and trade shows, external databases, etc. The most common
-challenge is to successfully gather all the data and to track any lead
-activity. Storing leads information in a central place such as Odoo CRM
-will release you of these worries and will help you to better automate
-your lead generation process, share information with your teams and
-analyze your sales processes easily.
-
-Odoo CRM provides you with several methods to generate leads:
-
-* :doc:`../../leads/generate/emails`
-
-  An inquiry email sent to one of your company's generic email addresses
-  can automatically generate a lead or an opportunity.
-
-* :doc:`../../leads/generate/manual`
-
-  You may want to follow up with a prospective customer met briefly at an
-  exhibition who gave you his business card. You can manually create a new
-  lead and enter all the needed information.
-
-* :doc:`../../leads/generate/website`
-
-  A website visitor who fills in a form automatically generates a lead or
-  an opportunity in Odoo CRM.
-
-* :doc:`../../leads/generate/import`
-
-  You can provide your salespeople lists of prospects - for example for a
-  cold emailing or a cold calling campaign - by importing them from any
-  CSV file.

crm/overview/started.rst

@@ -1,8 +0,0 @@
-===============
-Getting started
-===============
-
-.. toctree::
-   :titlesonly:
-
-   started/setup