diff --git a/_extensions/odoo/__init__.py b/_extensions/odoo/__init__.py index 13dcf557e..e3473c996 100644 --- a/_extensions/odoo/__init__.py +++ b/_extensions/odoo/__init__.py @@ -28,7 +28,9 @@ def setup(app): app.connect('html-page-context', update_meta) def update_meta(app, pagename, templatename, context, doctree): - meta = context.setdefault('meta', {}) + if not context.get('meta'): # context['meta'] can be None + context['meta'] = {} + meta = context.setdefault('meta', {}) # we want {} by default meta.setdefault('banner', app.config.odoo_cover_default) def navbarify(node, navbar=None): diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 6eba82ada..4c80ed1a3 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -1,11 +1,11 @@ {% extends "basic/layout.html" %} - -{% set script_files = script_files + [ -'_static/jquery.min.js', -'_static/bootstrap.js', -'_static/doc.js', -'_static/jquery.noconflict.js', -] %} +{%- block scripts %} + {{ super() }} + + + + +{%- endblock %} {% set classes = [] %} {% if pagename == master_doc %} diff --git a/_extensions/odoo/pycompat.py b/_extensions/odoo/pycompat.py deleted file mode 100644 index 804a2a0ba..000000000 --- a/_extensions/odoo/pycompat.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -import sys - -PY2 = sys.version_info[0] == 2 - -if PY2: - text_type = unicode -else: - text_type = str - -def to_text(source): - """ Generates a text value (an instance of text_type) from an arbitrary - source. - - * False and None are converted to empty strings - * text is passed through - * bytes are decoded as UTF-8 - * rest is textified via the current version's relevant data model method - """ - if source is None or source is False: - return u'' - - if isinstance(source, bytes): - return source.decode('utf-8') - - return text_type(source) - diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py index 769496f8a..e2c3710ed 100644 --- a/_extensions/odoo/translator.py +++ b/_extensions/odoo/translator.py @@ -2,14 +2,11 @@ import os.path import posixpath import re -import urllib from docutils import nodes -from sphinx import addnodes, util +from sphinx import addnodes, util, builders from sphinx.locale import admonitionlabels -from . import pycompat - try: from urllib import url2pathname except ImportError: @@ -45,6 +42,11 @@ class BootstrapTranslator(nodes.NodeVisitor, object): ] def __init__(self, builder, document): + # order of parameter swapped between Sphinx 1.x and 2.x, check if + # we're running 1.x and swap back + if not isinstance(builder, builders.Builder): + builder, document = document, builder + super(BootstrapTranslator, self).__init__(document) self.builder = builder self.body = [] @@ -58,6 +60,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.context = [] self.section_level = 0 + self.config = builder.config self.highlightlang = self.highlightlang_base = self.builder.config.highlight_language self.highlightopts = getattr(builder.config, 'highlight_options', {}) @@ -67,7 +70,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.param_separator = ',' def encode(self, text): - return pycompat.to_text(text).translate({ + return text.strip().translate({ ord('&'): u'&', ord('<'): u'<', ord('"'): u'"', @@ -76,7 +79,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): }) def starttag(self, node, tagname, **attributes): - tagname = pycompat.to_text(tagname).lower() + tagname = tagname.strip().lower() # extract generic attributes attrs = {name.lower(): value for name, value in attributes.items()} @@ -111,7 +114,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): # only "space characters" SPACE, CHARACTER TABULATION, LINE FEED, # FORM FEED and CARRIAGE RETURN should be collapsed, not al White_Space def attval(self, value, whitespace=re.compile(u'[ \t\n\f\r]')): - return self.encode(whitespace.sub(u' ', pycompat.to_text(value))) + return self.encode(whitespace.sub(u' ', value.strip())) def astext(self): return u''.join(self.body) @@ -647,7 +650,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.body.append(title if title else util.nodes.clean_astext(env.titles[ref])) self.body.append(u'') - entries = [(title, ref)] if not toc else ((e[0], e[1]) for e in toc[0]['entries']) + entries = [(title, ref)] if not toc else ((e[0], e[1]) for e in list(toc)[0]['entries']) for subtitle, subref in entries: baseuri = self.builder.get_target_uri(node['parent']) diff --git a/_static/banners/accounting.jpg b/_static/banners/accounting.jpg deleted file mode 100644 index 888b29114..000000000 Binary files a/_static/banners/accounting.jpg and /dev/null differ diff --git a/_static/banners/accounting.png b/_static/banners/accounting.png new file mode 100644 index 000000000..30d197ed3 Binary files /dev/null and b/_static/banners/accounting.png differ diff --git a/_static/banners/crm.jpg b/_static/banners/crm.jpg deleted file mode 100644 index 7ec6596b5..000000000 Binary files a/_static/banners/crm.jpg and /dev/null differ diff --git a/_static/banners/crm.png b/_static/banners/crm.png new file mode 100644 index 000000000..7a647939c Binary files /dev/null and b/_static/banners/crm.png differ diff --git a/_static/banners/db_online.jpg b/_static/banners/db_online.jpg deleted file mode 100644 index 1140ae637..000000000 Binary files a/_static/banners/db_online.jpg and /dev/null differ diff --git a/_static/banners/db_online.png b/_static/banners/db_online.png new file mode 100644 index 000000000..d5b04dc54 Binary files /dev/null and b/_static/banners/db_online.png differ diff --git a/_static/banners/db_premise.jpg b/_static/banners/db_premise.jpg deleted file mode 100644 index 42a7bf0b1..000000000 Binary files a/_static/banners/db_premise.jpg and /dev/null differ diff --git a/_static/banners/db_premise.png b/_static/banners/db_premise.png new file mode 100644 index 000000000..8cba1338a Binary files /dev/null and b/_static/banners/db_premise.png differ diff --git a/_static/banners/discuss.jpg b/_static/banners/discuss.jpg deleted file mode 100644 index a5c2cdff9..000000000 Binary files a/_static/banners/discuss.jpg and /dev/null differ diff --git a/_static/banners/discuss.png b/_static/banners/discuss.png new file mode 100644 index 000000000..7da2eb305 Binary files /dev/null and b/_static/banners/discuss.png differ diff --git a/_static/banners/download-icon.png b/_static/banners/download-icon.png deleted file mode 100644 index 111c11c58..000000000 Binary files a/_static/banners/download-icon.png and /dev/null differ diff --git a/_static/banners/ecommerce.jpg b/_static/banners/ecommerce.jpg deleted file mode 100644 index 0426d2eec..000000000 Binary files a/_static/banners/ecommerce.jpg and /dev/null differ diff --git a/_static/banners/ecommerce.png b/_static/banners/ecommerce.png new file mode 100644 index 000000000..b8805ce50 Binary files /dev/null and b/_static/banners/ecommerce.png differ diff --git a/_static/banners/expense.jpg b/_static/banners/expense.jpg deleted file mode 100644 index 18a6d88ec..000000000 Binary files a/_static/banners/expense.jpg and /dev/null differ diff --git a/_static/banners/expense.png b/_static/banners/expense.png new file mode 100644 index 000000000..5678f0f29 Binary files /dev/null and b/_static/banners/expense.png differ diff --git a/_static/banners/fsm.jpg b/_static/banners/fsm.jpg deleted file mode 100644 index e0bfce57a..000000000 Binary files a/_static/banners/fsm.jpg and /dev/null differ diff --git a/_static/banners/fsm.png b/_static/banners/fsm.png new file mode 100644 index 000000000..14d5a00cd Binary files /dev/null and b/_static/banners/fsm.png differ diff --git a/_static/banners/general.jpg b/_static/banners/general.jpg deleted file mode 100644 index 1faf2b9ec..000000000 Binary files a/_static/banners/general.jpg and /dev/null differ diff --git a/_static/banners/general.png b/_static/banners/general.png new file mode 100644 index 000000000..7c54a6255 Binary files /dev/null and b/_static/banners/general.png differ diff --git a/_static/banners/getting_started.png b/_static/banners/getting_started.png index cad0240ae..c8e0674a6 100644 Binary files a/_static/banners/getting_started.png and b/_static/banners/getting_started.png differ diff --git a/_static/banners/helpdesk.jpg b/_static/banners/helpdesk.jpg deleted file mode 100644 index 6f28e0837..000000000 Binary files a/_static/banners/helpdesk.jpg and /dev/null differ diff --git a/_static/banners/helpdesk.png b/_static/banners/helpdesk.png new file mode 100644 index 000000000..e1550511b Binary files /dev/null and b/_static/banners/helpdesk.png differ diff --git a/_static/banners/inventory.jpg b/_static/banners/inventory.jpg deleted file mode 100644 index 1a00ed3fd..000000000 Binary files a/_static/banners/inventory.jpg and /dev/null differ diff --git a/_static/banners/inventory.png b/_static/banners/inventory.png new file mode 100644 index 000000000..e7ad03b45 Binary files /dev/null and b/_static/banners/inventory.png differ diff --git a/_static/banners/iot.jpeg b/_static/banners/iot.jpeg deleted file mode 100644 index d1019ddea..000000000 Binary files a/_static/banners/iot.jpeg and /dev/null differ diff --git a/_static/banners/iot.png b/_static/banners/iot.png new file mode 100644 index 000000000..98829f362 Binary files /dev/null and b/_static/banners/iot.png differ diff --git a/_static/banners/legal.png b/_static/banners/legal.png new file mode 100644 index 000000000..4cc119486 Binary files /dev/null and b/_static/banners/legal.png differ diff --git a/_static/banners/livechat.jpg b/_static/banners/livechat.jpg deleted file mode 100644 index cc2e5ae30..000000000 Binary files a/_static/banners/livechat.jpg and /dev/null differ diff --git a/_static/banners/livechat.png b/_static/banners/livechat.png new file mode 100644 index 000000000..22d45ab86 Binary files /dev/null and b/_static/banners/livechat.png differ diff --git a/_static/banners/m_1.jpg b/_static/banners/m_1.jpg deleted file mode 100644 index ce4319631..000000000 Binary files a/_static/banners/m_1.jpg and /dev/null differ diff --git a/_static/banners/m_2.jpg b/_static/banners/m_2.jpg deleted file mode 100644 index dcc723204..000000000 Binary files a/_static/banners/m_2.jpg and /dev/null differ diff --git a/_static/banners/m_accounting.jpg b/_static/banners/m_accounting.jpg deleted file mode 100644 index e100460ba..000000000 Binary files a/_static/banners/m_accounting.jpg and /dev/null differ diff --git a/_static/banners/manufacturing.jpg b/_static/banners/manufacturing.jpg deleted file mode 100644 index f09f97011..000000000 Binary files a/_static/banners/manufacturing.jpg and /dev/null differ diff --git a/_static/banners/manufacturing.png b/_static/banners/manufacturing.png new file mode 100644 index 000000000..61a2ef56f Binary files /dev/null and b/_static/banners/manufacturing.png differ diff --git a/_static/banners/mobile.jpg b/_static/banners/mobile.jpg deleted file mode 100644 index f0667cfaf..000000000 Binary files a/_static/banners/mobile.jpg and /dev/null differ diff --git a/_static/banners/mobile.png b/_static/banners/mobile.png new file mode 100644 index 000000000..6b416bb6c Binary files /dev/null and b/_static/banners/mobile.png differ diff --git a/_static/banners/my_odoo_portal.jpg b/_static/banners/my_odoo_portal.jpg deleted file mode 100644 index dda972b9a..000000000 Binary files a/_static/banners/my_odoo_portal.jpg and /dev/null differ diff --git a/_static/banners/my_odoo_portal.png b/_static/banners/my_odoo_portal.png new file mode 100644 index 000000000..dc5ebf2a3 Binary files /dev/null and b/_static/banners/my_odoo_portal.png differ diff --git a/_static/banners/odoo-sh.jpg b/_static/banners/odoo-sh.jpg deleted file mode 100644 index baaaf533a..000000000 Binary files a/_static/banners/odoo-sh.jpg and /dev/null differ diff --git a/_static/banners/odoo_icon.png b/_static/banners/odoo_icon.png deleted file mode 100644 index 5414774b7..000000000 Binary files a/_static/banners/odoo_icon.png and /dev/null differ diff --git a/_static/banners/odoo_logo.png b/_static/banners/odoo_logo.png deleted file mode 100644 index 91a655b36..000000000 Binary files a/_static/banners/odoo_logo.png and /dev/null differ diff --git a/_static/banners/odoo_sh.png b/_static/banners/odoo_sh.png new file mode 100644 index 000000000..2acb46bd5 Binary files /dev/null and b/_static/banners/odoo_sh.png differ diff --git a/_static/banners/pdf-icon.png b/_static/banners/pdf-icon.png deleted file mode 100644 index 8573bd371..000000000 Binary files a/_static/banners/pdf-icon.png and /dev/null differ diff --git a/_static/banners/planning.jpg b/_static/banners/planning.jpg deleted file mode 100644 index 818425f97..000000000 Binary files a/_static/banners/planning.jpg and /dev/null differ diff --git a/_static/banners/planning.png b/_static/banners/planning.png new file mode 100644 index 000000000..167fa16bd Binary files /dev/null and b/_static/banners/planning.png differ diff --git a/_static/banners/pos.jpg b/_static/banners/pos.jpg deleted file mode 100644 index d6f2a020b..000000000 Binary files a/_static/banners/pos.jpg and /dev/null differ diff --git a/_static/banners/pos.png b/_static/banners/pos.png new file mode 100644 index 000000000..1588d8094 Binary files /dev/null and b/_static/banners/pos.png differ diff --git a/_static/banners/project.jpg b/_static/banners/project.jpg deleted file mode 100644 index 03bd73e90..000000000 Binary files a/_static/banners/project.jpg and /dev/null differ diff --git a/_static/banners/project.png b/_static/banners/project.png new file mode 100644 index 000000000..912bf126f Binary files /dev/null and b/_static/banners/project.png differ diff --git a/_static/banners/purchase.jpg b/_static/banners/purchase.jpg deleted file mode 100644 index 42cb6ecf5..000000000 Binary files a/_static/banners/purchase.jpg and /dev/null differ diff --git a/_static/banners/purchase.png b/_static/banners/purchase.png new file mode 100644 index 000000000..11fd8bf64 Binary files /dev/null and b/_static/banners/purchase.png differ diff --git a/_static/banners/quality.jpg b/_static/banners/quality.jpg deleted file mode 100644 index b21619772..000000000 Binary files a/_static/banners/quality.jpg and /dev/null differ diff --git a/_static/banners/quality.png b/_static/banners/quality.png new file mode 100644 index 000000000..3f601f13e Binary files /dev/null and b/_static/banners/quality.png differ diff --git a/_static/banners/recruitment.jpg b/_static/banners/recruitment.jpg deleted file mode 100644 index feda33b38..000000000 Binary files a/_static/banners/recruitment.jpg and /dev/null differ diff --git a/_static/banners/repair.jpg b/_static/banners/repair.jpg deleted file mode 100644 index 73dfd16cd..000000000 Binary files a/_static/banners/repair.jpg and /dev/null differ diff --git a/_static/banners/repair.png b/_static/banners/repair.png new file mode 100644 index 000000000..14c106e68 Binary files /dev/null and b/_static/banners/repair.png differ diff --git a/_static/banners/sales.jpg b/_static/banners/sales.jpg deleted file mode 100644 index a1df76310..000000000 Binary files a/_static/banners/sales.jpg and /dev/null differ diff --git a/_static/banners/sales.png b/_static/banners/sales.png new file mode 100644 index 000000000..c1197711a Binary files /dev/null and b/_static/banners/sales.png differ diff --git a/_static/banners/seo.jpg b/_static/banners/seo.jpg deleted file mode 100644 index 0fd81be88..000000000 Binary files a/_static/banners/seo.jpg and /dev/null differ diff --git a/_static/banners/seo.png b/_static/banners/seo.png new file mode 100644 index 000000000..4a35fac8c Binary files /dev/null and b/_static/banners/seo.png differ diff --git a/_static/banners/sign.jpg b/_static/banners/sign.jpg deleted file mode 100644 index 1f49bac61..000000000 Binary files a/_static/banners/sign.jpg and /dev/null differ diff --git a/_static/banners/sign_eLearning.jpg b/_static/banners/sign_eLearning.jpg deleted file mode 100644 index a29b7b3a5..000000000 Binary files a/_static/banners/sign_eLearning.jpg and /dev/null differ diff --git a/_static/banners/sms.jpg b/_static/banners/sms.jpg deleted file mode 100644 index 902d29bf5..000000000 Binary files a/_static/banners/sms.jpg and /dev/null differ diff --git a/_static/banners/sms.png b/_static/banners/sms.png new file mode 100644 index 000000000..e37a7f1a7 Binary files /dev/null and b/_static/banners/sms.png differ diff --git a/_static/banners/social_marketing.jpg b/_static/banners/social_marketing.jpg deleted file mode 100644 index 59dde8af8..000000000 Binary files a/_static/banners/social_marketing.jpg and /dev/null differ diff --git a/_static/banners/social_marketing.png b/_static/banners/social_marketing.png new file mode 100644 index 000000000..bec070ebe Binary files /dev/null and b/_static/banners/social_marketing.png differ diff --git a/_static/banners/support.jpg b/_static/banners/support.jpg deleted file mode 100644 index 68e4d41d4..000000000 Binary files a/_static/banners/support.jpg and /dev/null differ diff --git a/_static/banners/support.png b/_static/banners/support.png new file mode 100644 index 000000000..aa731eee5 Binary files /dev/null and b/_static/banners/support.png differ diff --git a/_static/banners/users.jpg b/_static/banners/users.jpg deleted file mode 100644 index 6d6edf2d0..000000000 Binary files a/_static/banners/users.jpg and /dev/null differ diff --git a/_static/banners/users.png b/_static/banners/users.png new file mode 100644 index 000000000..0e6980f05 Binary files /dev/null and b/_static/banners/users.png differ diff --git a/_static/icons/odoo_icon.png b/_static/icons/odoo_icon.png new file mode 100644 index 000000000..d4d303d1d Binary files /dev/null and b/_static/icons/odoo_icon.png differ diff --git a/_static/icons/odoo_logo.png b/_static/icons/odoo_logo.png new file mode 100644 index 000000000..bab8610ba Binary files /dev/null and b/_static/icons/odoo_logo.png differ diff --git a/_static/banners/pdf.svg b/_static/icons/pdf.svg similarity index 98% rename from _static/banners/pdf.svg rename to _static/icons/pdf.svg index 4e617c554..23904abba 100644 --- a/_static/banners/pdf.svg +++ b/_static/icons/pdf.svg @@ -1,73 +1,73 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_static/banners/txt.svg b/_static/icons/txt.svg similarity index 97% rename from _static/banners/txt.svg rename to _static/icons/txt.svg index 8fbf23b04..5706fc65c 100644 --- a/_static/banners/txt.svg +++ b/_static/icons/txt.svg @@ -1,59 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/accounting.rst b/accounting.rst index 511e330a8..cd202e9e8 100644 --- a/accounting.rst +++ b/accounting.rst @@ -1,4 +1,4 @@ -:banner: banners/accounting.jpg +:banner: banners/accounting.png ========== Accounting diff --git a/accounting/bank/feeds.rst b/accounting/bank/feeds.rst index ad12f90b8..8b74fcb1f 100644 --- a/accounting/bank/feeds.rst +++ b/accounting/bank/feeds.rst @@ -5,7 +5,7 @@ Bank Feeds .. toctree:: :titlesonly: - feeds/synchronize + feeds/bank_synchronization feeds/ofx feeds/qif feeds/coda diff --git a/accounting/bank/feeds/bank_synchronization.rst b/accounting/bank/feeds/bank_synchronization.rst new file mode 100644 index 000000000..e7b623b7c --- /dev/null +++ b/accounting/bank/feeds/bank_synchronization.rst @@ -0,0 +1,128 @@ +====================================== +Bank Synchronization: Automatic Import +====================================== + +Odoo can synchronize directly with your bank to get all bank statements imported automatically into +your database. + +To check if your bank is compatible with Odoo, go to `Odoo Accounting Features +`_, and search for your bank in the *Supported Banks* +section. + +.. image:: media/bank_synchronization01.png + :align: center + :alt: checking a bank's compatibility with Odoo + +The countries which are fully supported include the United States, Canada, New Zealand, Austria, and +Belgium. + +More than 30 countries are partially supported, including Colombia, India, France, and Spain. + +To connect to the banks, Odoo uses multiple web-services: + +- **Plaid**: Mainly for the U.S +- **Yodlee**: Worldwide +- **Ponto**: For a growing number of European Banks + +Configuration +============= + +Odoo Online Users +----------------- + +Make sure the **Automatic Import** feature is activated by going to :menuselection:`Accounting +--> Configuration --> Settings` in the *Bank & Cash* section. + +Odoo Enterprise Users +--------------------- + +If you plan to use a bank interface with your Odoo Enterprise subscription, you don’t have to do +anything special. Just make sure that your database is registered with your Odoo Enterprise contract. + +.. note:: + you might want to check that you don't have a firewall/proxy blocking the following address: + + - https://onlinesync.odoo.com/ + +Sync your bank feeds +==================== + +First, make sure that the **Automated Bank Synchronization** is activated in your journal. + +To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, then open your *Bank +Journal*, click on *Edit*, and select **Automated Bank Synchronization** in the *Bank Feed* field. + +.. image:: media/bank_synchronization02.png + :align: center + :alt: Automated Bank Synchronization of a Bank Journal in Odoo + +You can then connect Odoo to your bank. + +To do so, go to :menuselection:`Accounting --> Configuration --> Add a Bank Account`, and follow the +steps. + +Once done, go back to your *Accounting dashboard*. You should now see a **Synchronize Now** button +on your *Bank* card. Click on this button and enter your bank credentials. + +.. image:: media/bank_synchronization03.png + :align: center + :alt: Synchronize Now button in Odoo + +After this, your bank feeds will be regularly synchronized. + +FAQ +=== + +The synchronization is not working in real-time, is that normal? +---------------------------------------------------------------- + +The process is not intended to work in real-time as third party providers synchronize your accounts +at different intervals. To force the synchronization and fetch the statements, go to your +*Accounting dashboard*, and click on the *Synchronize Now* button. + +A transaction can be visible in your bank account, but not be fetched if it has the status +*Pending*. Only transactions with the *Posted* status will be retrieved. If it is not *Posted* yet, +you will have to wait until the status changes. + +Is the Automatic Import feature included in my contract? +-------------------------------------------------------- + +- **Enterprise Version**: Yes, if you have a valid enterprise contract linked to your database. +- **Community Version**: No, this feature is not included in the Community Version. +- **Online Version**: Yes, even if you benefit from the One App Free contract. + +Some banks have a status "Beta," what does this mean? +----------------------------------------------------- + +This means that banking institutions are not yet fully supported by our Third Party Provider. Bugs +or other problems may arise. Odoo does not support technical problems that occur with banks in the +Beta phase, but the user may still choose to connect. Connecting with these banks can aid in the +development process since the Provider will have real data & feedback from the connection. + +Why do my transactions only synchronize when I refresh manually? +---------------------------------------------------------------- + +Some banks have additional security measures and require extra steps, such as an SMS/email +authentication code or another type of MFA. Because of this, the integrator cannot pull transactions +until the security code is provided. + +Not all of my past transactions are in Odoo, why? +------------------------------------------------- + +Transactions can only be fetched up to 3 months in the past. + +Why don’t I see any transactions? +--------------------------------- +When you first connect with your bank, you will be prompted to add each account to its own journal. +If you skip this step, you will not be able to see your transactions in Odoo. + +If your bank account is properly linked to a journal and posted transactions are not visible in your +database, please `submit a support ticket `_. + +How can I update my bank credentials? +------------------------------------- +You can update your credentials in the *Developer Mode*. + +To do so, go to :menuselection:`General Settings`, click on *Activate developer mode*, then go to +:menuselection:`Accounting --> Configuration --> Online Synchronization`, then open the Institution +you want to edit, and click on *Update Credentials*. \ No newline at end of file diff --git a/accounting/bank/feeds/coda.rst b/accounting/bank/feeds/coda.rst index ed6912b5a..913be374e 100644 --- a/accounting/bank/feeds/coda.rst +++ b/accounting/bank/feeds/coda.rst @@ -78,5 +78,5 @@ speed up a lot the reconciliation process. .. seealso:: * :doc:`ofx` * :doc:`qif` - * :doc:`synchronize` + * :doc:`bank_synchronization` * :doc:`manual` diff --git a/accounting/bank/feeds/manual.rst b/accounting/bank/feeds/manual.rst index 0e01b728d..c22ea71d0 100644 --- a/accounting/bank/feeds/manual.rst +++ b/accounting/bank/feeds/manual.rst @@ -96,4 +96,4 @@ To close the bank statement, just click on **Validate**. .. seealso:: * :doc:`../reconciliation/use_cases` - * :doc:`../feeds/synchronize` + * :doc:`../feeds/bank_synchronization` diff --git a/accounting/bank/feeds/media/bank_synchronization01.png b/accounting/bank/feeds/media/bank_synchronization01.png new file mode 100644 index 000000000..3cb3b4e22 Binary files /dev/null and b/accounting/bank/feeds/media/bank_synchronization01.png differ diff --git a/accounting/bank/feeds/media/bank_synchronization02.png b/accounting/bank/feeds/media/bank_synchronization02.png new file mode 100644 index 000000000..2b1141ab4 Binary files /dev/null and b/accounting/bank/feeds/media/bank_synchronization02.png differ diff --git a/accounting/bank/feeds/media/bank_synchronization03.png b/accounting/bank/feeds/media/bank_synchronization03.png new file mode 100644 index 000000000..1ddfa5537 Binary files /dev/null and b/accounting/bank/feeds/media/bank_synchronization03.png differ diff --git a/accounting/bank/feeds/media/synchronize01.png b/accounting/bank/feeds/media/synchronize01.png deleted file mode 100644 index 9c3d8ab8d..000000000 Binary files a/accounting/bank/feeds/media/synchronize01.png and /dev/null differ diff --git a/accounting/bank/feeds/media/synchronize02.png b/accounting/bank/feeds/media/synchronize02.png deleted file mode 100644 index 85aeec488..000000000 Binary files a/accounting/bank/feeds/media/synchronize02.png and /dev/null differ diff --git a/accounting/bank/feeds/media/synchronize03.png b/accounting/bank/feeds/media/synchronize03.png deleted file mode 100644 index e51313de9..000000000 Binary files a/accounting/bank/feeds/media/synchronize03.png and /dev/null differ diff --git a/accounting/bank/feeds/ofx.rst b/accounting/bank/feeds/ofx.rst index 9820c508d..ce14453dc 100644 --- a/accounting/bank/feeds/ofx.rst +++ b/accounting/bank/feeds/ofx.rst @@ -62,5 +62,5 @@ speed up a lot the reconciliation process. .. seealso:: * :doc:`qif` * :doc:`coda` - * :doc:`synchronize` + * :doc:`bank_synchronization` * :doc:`manual` diff --git a/accounting/bank/feeds/qif.rst b/accounting/bank/feeds/qif.rst index daf9b9b8a..bab2024c4 100644 --- a/accounting/bank/feeds/qif.rst +++ b/accounting/bank/feeds/qif.rst @@ -63,5 +63,5 @@ speed up a lot the reconciliation process. .. seealso:: * :doc:`ofx` * :doc:`coda` - * :doc:`synchronize` + * :doc:`bank_synchronization` * :doc:`manual` diff --git a/accounting/bank/feeds/synchronize.rst b/accounting/bank/feeds/synchronize.rst deleted file mode 100644 index 662f50a31..000000000 --- a/accounting/bank/feeds/synchronize.rst +++ /dev/null @@ -1,112 +0,0 @@ -======================================= -How to synchronize Odoo with your bank? -======================================= - -Odoo is able to synchronize directly with your bank in order to get all -bank statements imported automatically in Odoo every 4 hours. Before -moving forward in this tutorial, you should check if your bank is -supported. You can find it out from the `Odoo Accounting Features `__ - -.. image:: media/synchronize01.png - :align: center - -Search for your bank name in the above page. If your bank appears in the -proposition, it means it is supported by Odoo. The countries which are -fully supported (meaning more than 95% of the banks) include: United -States, Canada, New Zealand, Austria. More than 30 countries are -partially supported, including: Colombia, India, France, Spain, etc. - -In order to connect with the banks, Odoo uses two web-services: - -- Plaid: for the main banks in the U.S. - -- Yodlee: for all other banks - -Configuration -============= - -Odoo Online Users ------------------ - -If you we support banks of your country, the bank integration feature -should already been installed. If it's not installed, you can manually -install the module **account_yodlee**. - -Odoo Enterprise Users ---------------------- - -If you plan to use a bank interface with your Odoo Enterprise -subscription, you don't have to do anything special, just make sure that your database is registered with your Odoo Enterprise contract. - -.. note:: - you might want to check that you don't have a firewall/proxy blocking the following addresses - - * https://onlinesync.odoo.com/ - * https://api.plaid.com/ - - -Sync your bank feeds -==================== - -Once the Plaid or Yodlee interface is installed, you can connect Odoo to -your bank. To do that, click on **More** on the bank of your -choice from the accounting dashboard. In the menu, click on Settings to -configure this bank account. - -.. image:: media/synchronize02.png - :align: center - -In the bank form, from the Bank Account tab, set the bank feeds option -to **Bank Synchronization**. - -.. image:: media/synchronize03.png - :align: center - -Once it's done, go back to your accounting dashboard. You should see a -**Online Synchronization** button on your bank card. Click on this button -and fill in your bank credentials. - -Once you filled in your credentials, your bank feeds will be -synchronized every 4 hours. - -FAQ -=== - -The synchronization is not working in real time, is it normal? --------------------------------------------------------------- - -Yodlee tries to get the data from a bank account once a day. However, this doesn't -always happen at the same time. And sometimes the process can fail. In that case, -Yodlee retries one hour or two later. This is why in Odoo there is a cron that is -running every 4 hours to fetch the information from Yodlee. - -You can however force this synchronization by clicking on the button "Synchronize now" -from the accounting dashboard. - -Moreover, a transaction can be visible in your bank account but not being fetched -by Yodlee. Indeed, the transaction in your bank account can have the status "pending" -and not the status "posted". In that case, Yodlee won't import it, you will have to -wait till the status changes. - -What is important to remember is that Yodlee is not a service fetching transactions -in real time. This is a service to facilitate the import of the bank statements to the database. - -Is the Yodlee feature included in my contract? ----------------------------------------------- - -- Enterprise Version: Yes, if you have a valid enterprise contract linked to your database. -- Community Version: No, this feature is not included in the Community Version. -- Online Version: Yes, even if you benefit from the One App Free contract. - -Some banks have a status "Beta", what does it mean? ---------------------------------------------------- - -This means that Yodlee is only currently working on developing the synchronization -with this bank. The synchronization could already work or it may need a bit more time -to have a 100% working synchronization. Unfortunately, there is not much to do about it -except for being patient. - -All my past transactions are not in Odoo, why? ----------------------------------------------- - -Yodlee only allows to fetch transactions up to 3 months in the past. diff --git a/accounting/bank/reconciliation/use_cases.rst b/accounting/bank/reconciliation/use_cases.rst index 699e82635..4d27f03a6 100644 --- a/accounting/bank/reconciliation/use_cases.rst +++ b/accounting/bank/reconciliation/use_cases.rst @@ -106,5 +106,5 @@ right and validate all related payments : .. seealso:: * :doc:`../feeds/ofx` - * :doc:`../feeds/synchronize` + * :doc:`../feeds/bank_synchronization` * :doc:`../feeds/manual` diff --git a/accounting/others/adviser.rst b/accounting/others/adviser.rst index 2f1bf7f30..0ae2990c2 100644 --- a/accounting/others/adviser.rst +++ b/accounting/others/adviser.rst @@ -5,7 +5,6 @@ Adviser .. toctree:: :titlesonly: - adviser/assets adviser/fiscalyear adviser/budget adviser/reverse_entry diff --git a/accounting/others/adviser/assets.rst b/accounting/others/adviser/assets.rst deleted file mode 100644 index 2100e6465..000000000 --- a/accounting/others/adviser/assets.rst +++ /dev/null @@ -1,142 +0,0 @@ -======================== -Manage your fixed assets -======================== - -The "Assets" module allows you to keep track of your fixed assets like -machinery, land and building. The module allows you to generate monthly -depreciation entries automatically, get depreciation board, sell or -dispose assets and perform reports on your company assets. - -As an example, you may buy a car for $36,000 (gross value) and you plan -to amortize it over 36 months (3 years). Every months (periodicity), -Odoo will create a depreciation entry automatically reducing your assets -value by $1,000 and passing $1,000 as an expense. After 3 years, this -assets accounts for $0 (salvage value) in your balance sheet. - -The different types of assets are grouped into "Assets Types" that -describe how to deprecate an asset. Here are two examples of assets -types: - -- Building: 10 years, yearly linear depreciation -- Car: 5 years, monthly linear depreciation - -Configuration -============= - -Install the Asset module ------------------------- - -Start by *installing the Asset module.* - -Once the module is installed, you should see two new menus in the -accounting application: - -- :menuselection:`Adviser --> Assets` -- :menuselection:`Configuration --> Asset Types` - -Before registering your first asset, you must :ref:`define your Asset -Types `. - -.. _accounting/adviser/assets_management/defining: - -Defining Asset Types --------------------- - -Asset type are used to configure all information about an assets: asset -and deprecation accounts, amortization method, etc. That way, advisers -can configure asset types and users can further record assets without -having to provide any complex accounting information. They just need to -provide an asset type on the supplier bill. - -You should create asset types for every group of assets you frequently -buy like "Cars: 5 years", "Computer Hardware: 3 years". For all other -assets, you can create generic asset types. Name them according to the -duration of the asset like "36 Months", "10 Years", ... - -To define asset types, go to :menuselection:`Configuration --> Asset -Types` - -.. image:: media/image01.png - :align: center - -Create assets manually -====================== - -To register an asset manually, go to the menu :menuselection:`Adviser ---> Assets`. - -.. image:: media/image08.png - :align: center - -Once your asset is created, don't forget to Confirm it. You can also -click on the Compute Depreciation button to check the depreciation board -before confirming the asset. - -.. tip:: - - if you create asset manually, you still need to create the supplier - bill for this asset. The asset document will only produce the - depreciation journal entries, not those related to the supplier - bill. - - -Create assets automatically from a supplier bill -================================================ - -Assets can be automatically created from supplier bills. All you need to -do is to set an asset category on your bill line. When the user will -validate the bill, an asset will be automatically created, using the -information of the supplier bill. - -.. image:: media/image09.png - -Depending on the information on the asset category, the asset will be -created in draft or directly validated\ *.* It's easier to confirm -assets directly so that you won't forget to confirm it afterwards. -(check the field *Skip Draft State* on *Asset Category)* Generate assets -in draft only when you want your adviser to control all the assets -before posting them to your accounts. - -.. tip:: if you put the asset on the product, the asset category will - automatically be filled in the supplier bill. - -How to depreciate an asset? -=========================== - -Odoo will create depreciation journal entries automatically at the right -date for every confirmed asset. (not the draft ones). You can control in -the depreciation board: a green bullet point means that the journal -entry has been created for this line. - -But you can also post journal entries before the expected date by -clicking on the green bullet and forcing the creation of related -depreciation entry. - -.. image:: media/image11.png - :align: center - -.. note:: In the Depreciation board, click on the red bullet to post - the journal entry. Click on the :guilabel:`Items` button on - the top to see the journal entries which are already posted. - -How to modify an existing asset? -================================ - -- Click on :guilabel:`Modify Depreciation` -- Change the number of depreciation - -Odoo will automatically recompute a new depreciation board. - -How to record the sale or disposal of an asset? -=============================================== - -If you sell or dispose an asset, you need to deprecate completly this -asset. Click on the button :guilabel:`Sell or Dispose`. This action -will post the full costs of this assets but it will not record the -sales transaction that should be registered through a customer -invoice. - -.. todo:: → This has to be changed in Odoo: selling an asset should: - - #. remove all "Red" lines - #. create a new line that deprecate the whole residual value diff --git a/accounting/others/taxes/taxcloud.rst b/accounting/others/taxes/taxcloud.rst index c88c894a4..b582777cb 100644 --- a/accounting/others/taxes/taxcloud.rst +++ b/accounting/others/taxes/taxcloud.rst @@ -68,5 +68,26 @@ automated tax computation. Add your product(s). You have two options to get Sales Tax on the Order. You can confirm it, or you can save it and from the *Action* Menu choose **Update Taxes with TaxCloud**. + +Coupons & Promotions +==================== + +If you use the Coupon or Promotion Programs, the integration with Taxcloud might seem a bit odd. + +The problem lies with the fact that Taxcloud does not accept lines with negative amounts as part of +the tax computation. This means that the amount of the lines added by the promotion program must be +deduced from the total of the lines it impacts. This means, amongst other complications, that orders +that use coupons or promotions with a Taxcloud fiscal position **must** be invoiced completely - +you cannot create invoices for partial deliveries, etc. + +Another specific oddity is possible in the UI: imagine that you sell a product from the Taxcloud +category *[20110] Computers* and that you have a promotion program in place that provides a 50% +discount on this product. If the tax rate for this particular product is 7%, the tax rate that will +be computed from the Taxcloud integration will display 3.5%. This happens because the discount is +included in the price that is sent to Taxcloud, but in Odoo this discount is in another line +entirely. At the end of the day, your tax computation will be correct (since a 3.5% tax on the full +price is the equivalent of a 7% tax on half the price), but this might be surprising from a user +point of view. + .. seealso:: - * :doc:`application` + - :doc:`application` diff --git a/accounting/payables/supplier_bills.rst b/accounting/payables/supplier_bills.rst index f11eaea4c..ee12248a8 100644 --- a/accounting/payables/supplier_bills.rst +++ b/accounting/payables/supplier_bills.rst @@ -8,3 +8,4 @@ Vendor Bills supplier_bills/manage supplier_bills/bills_or_receipts supplier_bills/deferred_expenses + supplier_bills/assets diff --git a/accounting/payables/supplier_bills/assets.rst b/accounting/payables/supplier_bills/assets.rst new file mode 100644 index 000000000..2c48f6f03 --- /dev/null +++ b/accounting/payables/supplier_bills/assets.rst @@ -0,0 +1,254 @@ +=================================== +Non-current Assets and Fixed Assets +=================================== + +**Non-current Assets**, also known as **long-term assets**, are investments that are expected to be +realized after one year. They are capitalized rather than being expensed and appear on the company's +balance sheet. Depending on their nature, they may undergo **depreciation**. + +**Fixed Assets** are a type of Non-current Assets and include the properties bought for their +productive aspects, such as buildings, vehicles, equipment, land, and software. + +For example, let's say we buy a car for $ 27,000. We plan to amortize it over five years, and we +will sell it for $ 7,000 afterward. Using the linear, or straight-line, depreciation method, +$ 4,000 are expensed each year as **depreciation expenses**. After five years, the **Accumulated +Depreciation** amount reported on the balance sheet equals $ 20,000, leaving us with $ 7,000 of +**Not Depreciable Value**, or Salvage value. + +Odoo Accounting handles depreciation by creating all depreciation entries automatically in *draft +mode*. They are then posted periodically. + +Odoo supports the following **Depreciation Methods**: + +- Linear +- Degressive +- Accelerated Degressive + +.. note:: + The server checks once a day if an entry must be posted. It might then take up to 24 hours before + you see a change from *draft* to *posted*. + +Prerequisites +============= + +Such transactions must be posted on an **Assets Account** rather than on the default +expense account. + +Configure an Assets Account +--------------------------- + +To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting --> +Configuration --> Chart of Accounts`, click on *Create*, and fill out the form. + +.. image:: media/assets01.png + :align: center + :alt: Configuration of an Assets Account in Odoo Accounting + +.. note:: + This account's type must be either *Fixed Assets* or *Non-current Assets*. + +Post an expense to the right account +------------------------------------ + +Select the account on a draft bill +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On a draft bill, select the right account for all the assets you are buying. + +.. image:: media/assets02.png + :align: center + :alt: Selection of an Assets Account on a draft bill in Odoo Accounting + +.. _product-assets-account: + +Choose a different Expense Account for specific products +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Start editing the product, go to the *Accounting* tab, select the right **Expense Account**, and +save. + +.. image:: media/assets03.png + :align: center + :alt: Change of the Assets Account for a product in Odoo + +.. tip:: + It is possible to :ref:`automate the creation of assets entries ` for these + products. + +.. _journal-assets-account: + +Change the account of a posted journal item +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> +Purchases`, select the journal item you want to modify, click on the account, and select the right +one. + +.. image:: media/assets04.png + :align: center + :alt: Modification of a posted journal item's account in Odoo Accounting + +Assets entries +============== + +.. _create-assets-entry: + +Create a new entry +------------------ + +An **Asset entry** automatically generates all journal entries in *draft mode*. They are then posted +one by one at the right time. + +To create a new entry, go to :menuselection:`Accounting --> Accounting --> Assets`, click on +*Create*, and fill out the form. + +Click on **select related purchases** to link an existing journal item to this new entry. Some +fields are then automatically filled out, and the journal item is now listed under the **Related +Purchase** tab. + +.. image:: media/assets05.png + :align: center + :alt: Assets entry in Odoo Accounting + +Once done, you can click on *Compute Depreciation* (next to the *Confirm* button) to generate all +the values of the **Depreciation Board**. This board shows you all the entries that Odoo will post +to depreciate your asset, and at which date. + +.. image:: media/assets06.png + :align: center + :alt: Depreciation Board in Odoo Accounting + +What does "Prorata Temporis" mean? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The **Prorata Temporis** feature is useful to depreciate your assets the most accurately possible. + +With this feature, the first entry on the Depreciation Board is computed based on the time left +between the *Prorata Date* and the *First Depreciation Date* rather than the default amount of time +between depreciations. + +For example, the Depreciation Board above has its first depreciation with an amount of $ 241.10 +rather than $ 4,000.00. Consequently, the last entry is also lower and has an amount of $ 3758.90. + +What are the different Depreciation Methods +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The **Linear Depreciation Method** divides the initial Depreciable Value by the number of +depreciations planned. All depreciation entries have the same amount. + +The **Degressive Depreciation Method** multiplies the Depreciable Value by the **Degressive Factor** +for each entry. Each depreciation entry has a lower amount than the previous entry. + +The **Accelerated Degressive Depreciation Method** uses the Degressive Method, but with a minimum +Depreciation equal to the Linear Method. This method ensures a fast depreciation at the beginning, +followed by a constant one afterward. + +Assets from the Purchases Journal +--------------------------------- + +You can create an asset entry from a specific journal item in your **Purchases Journal**. + +To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting --> +Purchases`, and select the journal item you want to record as an asset. Make sure that it is posted +in the right account (see: :ref:`journal-assets-account`). + +Then, click on *Action*, select **Create Asset**, and fill out the form the same way you would do to +:ref:`create a new entry `. + +.. image:: media/assets07.png + :align: center + :alt: Create Asset Entry from a journal item in Odoo Accounting + +Modification of an Asset +======================== + +You can modify the values of an asset to increase or decrease its value. + +To do so, open the asset you want to modify, and click on *Modify Depreciation*. Then, fill out the +form with the new depreciation values and click on *Modify*. + +A **decrease in value** posts a new Journal Entry for the **Value Decrease** and modifies all the +future *unposted* Journal Entries listed in the Depreciation Board. + +An **increase in value** requires you to fill out additional fields related to the account movements +and creates a new Asset entry with the **Value Increase**. The Gross Increase Asset Entry can be +accessed with a Smart Button. + +.. image:: media/assets08.png + :align: center + :alt: Gross Increase smart button in Odoo Accounting + +Disposal of Fixed Assets +======================== + +To **sell** an asset or **dispose** of it implies that it must be removed from the Balance Sheet. + +To do so, open the asset you want to dispose of, click on *Sell or Dispose*, and fill out the form. + +.. image:: media/assets09.png + :align: center + :alt: Disposal of Assets in Odoo Accounting + +Odoo Accounting then generates all the journal entries necessary to dispose of the asset, including +the gain or loss on sale, which is based on the difference between the asset's book value at the +time of the sale and the amount it is sold for. + +.. note:: + To record the sale of an asset, you must first post the related Customer Invoice so you can link + the sale of the asset with it. + +Assets Models +============= + +You can create **Assets Models** to create your Asset entries faster. It is particularly useful if +you recurrently buy the same kind of assets. + +To create a model, go to :menuselection:`Accounting → Configuration --> Assets Models`, click on +*Create*, and fill out the form the same way you would do to create a new entry. + +.. tip:: + You can also convert a *confirmed Asset entry* into a model by opening it from + :menuselection:`Accounting --> Accounting --> Assets` and then, by clicking on the button *Save + Model*. + +Apply an Asset Model to a new entry +----------------------------------- + +When you create a new Asset entry, fill out the **Fixed Asset Account** with the right asset +account. + +New buttons with all the models linked to that account appear at the top of the form. Clicking on a +model button fills out the form according to that model. + +.. image:: media/assets10.png + :align: center + :alt: Assets model button in Odoo Accounting + +.. _assets-automation: + +Automate the Assets +=================== + +When you create or edit an account of which the type is either *Non-current Assets* or *Fixed +Assets*, you can configure it to create assets for the expenses that are credited on it +automatically. + +You have three choices for the **Automate Assets** field: + +#. **No:** this is the default value. Nothing happens. +#. **Create in draft:** whenever a transaction is posted on the account, a draft *Assets entry* is + created, but not validated. You must first fill out the form in :menuselection:`Accounting --> + Accounting --> Assets`. +#. **Create and validate:** you must also select an Asset Model (see: `Assets Models`_). Whenever a + transaction is posted on the account, an *Assets entry* is created and immediately validated. + +.. image:: media/assets11.png + :align: center + :alt: Automate Assets on an account in Odoo Accounting + +.. tip:: + You can, for example, select this account as the default **Expense Account** of a product to + fully automate its purchase. (see: :ref:`product-assets-account`). + +.. seealso:: + * :doc:`../../others/configuration/account_type` \ No newline at end of file diff --git a/accounting/payables/supplier_bills/media/assets01.png b/accounting/payables/supplier_bills/media/assets01.png new file mode 100644 index 000000000..4d03db3b5 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets01.png differ diff --git a/accounting/payables/supplier_bills/media/assets02.png b/accounting/payables/supplier_bills/media/assets02.png new file mode 100644 index 000000000..db35d459a Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets02.png differ diff --git a/accounting/payables/supplier_bills/media/assets03.png b/accounting/payables/supplier_bills/media/assets03.png new file mode 100644 index 000000000..ac502f19f Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets03.png differ diff --git a/accounting/payables/supplier_bills/media/assets04.png b/accounting/payables/supplier_bills/media/assets04.png new file mode 100644 index 000000000..4884c45c0 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets04.png differ diff --git a/accounting/payables/supplier_bills/media/assets05.png b/accounting/payables/supplier_bills/media/assets05.png new file mode 100644 index 000000000..d69a7b866 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets05.png differ diff --git a/accounting/payables/supplier_bills/media/assets06.png b/accounting/payables/supplier_bills/media/assets06.png new file mode 100644 index 000000000..12261b961 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets06.png differ diff --git a/accounting/payables/supplier_bills/media/assets07.png b/accounting/payables/supplier_bills/media/assets07.png new file mode 100644 index 000000000..17e2d8da9 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets07.png differ diff --git a/accounting/payables/supplier_bills/media/assets08.png b/accounting/payables/supplier_bills/media/assets08.png new file mode 100644 index 000000000..6af72771c Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets08.png differ diff --git a/accounting/payables/supplier_bills/media/assets09.png b/accounting/payables/supplier_bills/media/assets09.png new file mode 100644 index 000000000..64b8ff825 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets09.png differ diff --git a/accounting/payables/supplier_bills/media/assets10.png b/accounting/payables/supplier_bills/media/assets10.png new file mode 100644 index 000000000..63c87c418 Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets10.png differ diff --git a/accounting/payables/supplier_bills/media/assets11.png b/accounting/payables/supplier_bills/media/assets11.png new file mode 100644 index 000000000..3420c953f Binary files /dev/null and b/accounting/payables/supplier_bills/media/assets11.png differ diff --git a/business.rst b/business.rst deleted file mode 100644 index 66bae260f..000000000 --- a/business.rst +++ /dev/null @@ -1,9 +0,0 @@ -================== -Business Mementos -================== - -.. toctree:: - Accounting Memento (US GAAP) - Double-Entry Inventory - Inventory Valuation (Continental Accounting) - Inventory Valuation (Anglo-Saxon Accounting) diff --git a/conf.py b/conf.py index 2b89e1b08..590f457e0 100644 --- a/conf.py +++ b/conf.py @@ -241,7 +241,7 @@ latex_documents = [ # The name of an image file (relative to this directory) to place at the top of # the title page. -latex_logo = '_static/banners/odoo_logo.png' +latex_logo = '_static/icons/odoo_logo.png' # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. @@ -296,11 +296,7 @@ texinfo_documents = [ # If true, do not generate a @detailmenu in the "Top" node's menu. #texinfo_no_detailmenu = False -odoo_cover_external = { - 'https://odoo.com/documentation/user/accounting/overview/main_concepts/memento.html' : 'banners/m_accounting.jpg', - 'https://odoo.com/documentation/user/inventory/overview/concepts/double-entry.html' : 'banners/m_1.jpg', - 'https://odoo.com/documentation/user/inventory/management/reporting/inventory_valuation_config.html' : 'banners/m_2.jpg', -} +odoo_cover_external = {} github_user = 'odoo' github_project = 'documentation-user' diff --git a/crm.rst b/crm.rst index 557017290..ae9783196 100644 --- a/crm.rst +++ b/crm.rst @@ -1,4 +1,4 @@ -:banner: banners/crm.jpg +:banner: banners/crm.png === CRM diff --git a/crm/acquire_leads/generate_from_email.rst b/crm/acquire_leads/generate_from_email.rst index 5a341c372..20c6523d9 100644 --- a/crm/acquire_leads/generate_from_email.rst +++ b/crm/acquire_leads/generate_from_email.rst @@ -10,11 +10,11 @@ pipeline of the default sales channel. Configure email aliases ======================= -Each sales channel can have its own email alias, to generate +Each sales teams 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`. +find the configuration of sales teams under +:menuselection:`Configuration --> Sales Teams`. .. image:: media/generate_from_email01.png :align: center diff --git a/db_management/db_online.rst b/db_management/db_online.rst index 773e7deff..d26f0d682 100644 --- a/db_management/db_online.rst +++ b/db_management/db_online.rst @@ -1,4 +1,4 @@ -:banner: banners/db_online.jpg +:banner: banners/db_online.png .. _db_online: diff --git a/db_management/db_premise.rst b/db_management/db_premise.rst index 0c8a5d4dd..e93e17bd4 100644 --- a/db_management/db_premise.rst +++ b/db_management/db_premise.rst @@ -1,4 +1,4 @@ -:banner: banners/db_premise.jpg +:banner: banners/db_premise.png .. _db_premise: diff --git a/db_management/documentation.rst b/db_management/documentation.rst index 30ce9332a..ab14e9906 100644 --- a/db_management/documentation.rst +++ b/db_management/documentation.rst @@ -1,4 +1,4 @@ -:banner: banners/users.jpg +:banner: banners/users.png .. _db_management/documentation: diff --git a/discuss.rst b/discuss.rst index 0891519ea..1ef6461f4 100644 --- a/discuss.rst +++ b/discuss.rst @@ -1,4 +1,4 @@ -:banner: banners/discuss.jpg +:banner: banners/discuss.png ======= Discuss diff --git a/discuss/email_servers.rst b/discuss/email_servers.rst index fb7a20d7c..31ac73e5c 100644 --- a/discuss/email_servers.rst +++ b/discuss/email_servers.rst @@ -2,22 +2,38 @@ How to use my mail server to send and receive emails in Odoo ============================================================ -This document is mainly dedicated to Odoo on-premise users who don't +If you are a user of Odoo Online or Odoo.sh... +============================================== + +You have nothing to do! **Odoo sets up its own mail servers for your database.** +Outgoing and incoming emails work out-of-the-box! + +Unless you plan to send large batches of mass mailing that could require the +use of an external mail server, simply enjoy your new Odoo database. + + +Scope of this documentation +=========================== + +This document is **mainly dedicated to Odoo on-premise users** who don't benefit from an out-of-the-box solution to send and receive emails in Odoo, unlike `Odoo Online `__ & `Odoo.sh `__. -If no one in your company is used to manage email servers, we strongly recommend that -you opt for those Odoo hosting solutions. Their email system -works instantly and is monitored by professionals. -Nevertheless you can still use your own email servers if you want -to manage your email server's reputation yourself. -You will find here below some useful +.. warning:: + + If no one in your company is used to manage email servers, we strongly recommend that + you opt for those Odoo hosting solutions. Their email system + works instantly and is monitored by professionals. + Nevertheless you can still use your own email servers if you want + to manage your email server's reputation yourself. + +You will find here below some useful information on how to integrate your own email solution with Odoo. -.. note:: Office 365 email servers don't allow easiliy to send external emails - from hosts like Odoo. - Refer to the `Microsoft's documentation `__ +.. note:: Office 365 email servers don't allow easily to send external emails + from hosts like Odoo. + Refer to the `Microsoft's documentation `__ to make it work. How to manage outbound messages diff --git a/ecommerce.rst b/ecommerce.rst index dad217894..30762265e 100644 --- a/ecommerce.rst +++ b/ecommerce.rst @@ -1,4 +1,4 @@ -:banner: banners/ecommerce.jpg +:banner: banners/ecommerce.png ========= eCommerce diff --git a/ecommerce/shopper_experience/authorize.rst b/ecommerce/shopper_experience/authorize.rst index 3e3796586..615bd8cf9 100644 --- a/ecommerce/shopper_experience/authorize.rst +++ b/ecommerce/shopper_experience/authorize.rst @@ -31,30 +31,34 @@ Set up Odoo * Activate Authorize.Net in Odoo from :menuselection:`Website or Sales or Accounting --> Settings --> Payment Acquirers`. * Enter both your **Login ID** - and your **API Transaction Key**. + your **API Transaction Key** and your **API Signature Key**. .. image:: media/authorize02.png :align: center - To get those credentials in Authorize.Net, you can rely on - *API Login ID and Transaction Key* video of - `Authorize.Net Video Tutorials `__. - Such videos give meaningful insights about how to set up your - Authorize.Net account according to your needs. + To get those credentials from Authorize.Net, you can follow the direction + in the Authorize.net Help + `API Credentials and Keys `__ + entry and access the menu :menuselection:`Account --> Settings --> API Credentials & Keys` + in the Authorize.net dashboard. Note that you need *both* a Transaction key and and Signature key. + +* Once both keys are set up, you can then generate a Client Key by clicking the + "Generate Client Key" button. Note that these 3 keys are necessary for the + setup to work correctly. Go live ======= Your configuration is now ready! You can make Authorize.Net visible on your merchant interface -and activate the **Production** mode. +and activate the **Enabled** state. .. image:: media/paypal_live.png :align: center .. note:: Credentials provided by Authorize.net are different for both test and production mode. Don't forget to update them in Odoo when you - turn on the production mode. + switch from testing to production or vice-versa. Assess Authorize.Net as payment solution diff --git a/ecommerce/shopper_experience/media/authorize02.png b/ecommerce/shopper_experience/media/authorize02.png index e89403879..3e8accd2f 100644 Binary files a/ecommerce/shopper_experience/media/authorize02.png and b/ecommerce/shopper_experience/media/authorize02.png differ diff --git a/ecommerce/shopper_experience/media/paypal_live.png b/ecommerce/shopper_experience/media/paypal_live.png index 862725188..b407cf7e2 100644 Binary files a/ecommerce/shopper_experience/media/paypal_live.png and b/ecommerce/shopper_experience/media/paypal_live.png differ diff --git a/ecommerce/shopper_experience/payment.rst b/ecommerce/shopper_experience/payment.rst index 57f4e9f46..5919633c8 100644 --- a/ecommerce/shopper_experience/payment.rst +++ b/ecommerce/shopper_experience/payment.rst @@ -37,8 +37,8 @@ Odoo supports more and more platforms over time: How to go live ============== -Once the payment method ready, make it visible in the payment interface -and activate the **Production** mode. +Once the payment method is ready, make it visible in the payment interface +by switching the state to **Enabled**. .. image:: media/paypal_live.png :align: center diff --git a/expense/expense.rst b/expense/expense.rst index 6fe3536c0..1505744ad 100644 --- a/expense/expense.rst +++ b/expense/expense.rst @@ -1,4 +1,4 @@ -:banner: banners/expense.jpg +:banner: banners/expense.png ======== Expenses diff --git a/fsm.rst b/fsm.rst index a918205e6..2c78a9a64 100644 --- a/fsm.rst +++ b/fsm.rst @@ -1,4 +1,4 @@ -:banner: banners/fsm.jpg +:banner: banners/fsm.png ============== Field Service diff --git a/general.rst b/general.rst index e07e3c005..b5cbe4dfd 100644 --- a/general.rst +++ b/general.rst @@ -1,4 +1,4 @@ -:banner: banners/general.jpg +:banner: banners/general.png ======= General diff --git a/helpdesk.rst b/helpdesk.rst index ace899e58..232627499 100644 --- a/helpdesk.rst +++ b/helpdesk.rst @@ -1,4 +1,4 @@ -:banner: banners/helpdesk.jpg +:banner: banners/helpdesk.png ======== Helpdesk diff --git a/index.rst b/index.rst index f3972c6fc..cbc5ea3b2 100644 --- a/index.rst +++ b/index.rst @@ -10,4 +10,3 @@ Odoo User Documentation Index applications practical - business diff --git a/inventory.rst b/inventory.rst index 8f12b9a19..0665d1293 100644 --- a/inventory.rst +++ b/inventory.rst @@ -1,4 +1,4 @@ -:banner: banners/inventory.jpg +:banner: banners/inventory.png ========= Inventory diff --git a/iot.rst b/iot.rst index c625715fb..150b00aa8 100644 --- a/iot.rst +++ b/iot.rst @@ -1,4 +1,4 @@ -:banner: banners/iot.jpeg +:banner: banners/iot.png ======================== Internet of Things (IoT) diff --git a/legal.rst b/legal.rst index 5d8010658..7d11d1642 100644 --- a/legal.rst +++ b/legal.rst @@ -1,4 +1,4 @@ -:banner: banners/sign.jpg +:banner: banners/legal.png :has-toc: .. ^^: cheat to have a full-width table as if this was a real toc page @@ -26,95 +26,95 @@ Terms and Conditions   -.. |view_enterprise_en| image:: _static/banners/txt.svg +.. |view_enterprise_en| image:: _static/icons/txt.svg :alt: View Odoo Enterprise Agreement :target: legal/terms/enterprise.html -.. |download_enterprise_en| image:: _static/banners/pdf.svg +.. |download_enterprise_en| image:: _static/icons/pdf.svg :alt: Download Odoo Enterprise Agreement :target: odoo_enterprise_agreement.pdf -.. |view_partnership_en| image:: _static/banners/txt.svg +.. |view_partnership_en| image:: _static/icons/txt.svg :alt: View Odoo Partnership Agreement :target: legal/terms/partnership.html -.. |download_partnership_en| image:: _static/banners/pdf.svg +.. |download_partnership_en| image:: _static/icons/pdf.svg :alt: Download Odoo Partnership Agreement :target: odoo_partnership_agreement.pdf -.. |view_terms_of_sale_en| image:: _static/banners/txt.svg +.. |view_terms_of_sale_en| image:: _static/icons/txt.svg :alt: View Terms of Sale :target: legal/terms/terms_of_sale.html -.. |download_terms_of_sale_en| image:: _static/banners/pdf.svg +.. |download_terms_of_sale_en| image:: _static/icons/pdf.svg :alt: Download Odoo Terms of Sale :target: terms_of_sale.pdf -.. |download_enterprise_fr| image:: _static/banners/pdf.svg +.. |download_enterprise_fr| image:: _static/icons/pdf.svg :alt: Download Odoo Enterprise Agreement (FR) :target: odoo_enterprise_agreement_fr.pdf -.. |view_enterprise_fr| image:: _static/banners/txt.svg +.. |view_enterprise_fr| image:: _static/icons/txt.svg :alt: View Odoo Enterprise Agreement (FR) :target: legal/terms/i18n/enterprise_fr.html -.. |download_partnership_fr| image:: _static/banners/pdf.svg +.. |download_partnership_fr| image:: _static/icons/pdf.svg :alt: Download Odoo Partnership Agreement (FR) :target: odoo_partnership_agreement_fr.pdf -.. |view_enterprise_nl| image:: _static/banners/txt.svg +.. |view_enterprise_nl| image:: _static/icons/txt.svg :alt: View Odoo Enterprise Agreement (NL) :target: legal/terms/i18n/enterprise_nl.html -.. |view_partnership_fr| image:: _static/banners/txt.svg +.. |view_partnership_fr| image:: _static/icons/txt.svg :alt: View Odoo Partnership Agreement (FR) :target: legal/terms/i18n/partnership_fr.html -.. |download_terms_of_sale_fr| image:: _static/banners/pdf.svg +.. |download_terms_of_sale_fr| image:: _static/icons/pdf.svg :alt: Download Odoo Terms of Sale (FR) :target: terms_of_sale_fr.pdf -.. |view_terms_of_sale_fr| image:: _static/banners/txt.svg +.. |view_terms_of_sale_fr| image:: _static/icons/txt.svg :alt: View Terms of Sale (FR) :target: legal/terms/i18n/terms_of_sale_fr.html -.. |download_enterprise_nl| image:: _static/banners/pdf.svg +.. |download_enterprise_nl| image:: _static/icons/pdf.svg :alt: Download Odoo Enterprise Agreement (NL) :target: odoo_enterprise_agreement_nl.pdf -.. |download_partnership_nl| image:: _static/banners/pdf.svg +.. |download_partnership_nl| image:: _static/icons/pdf.svg :alt: Download Odoo Partnership Agreement (NL) :target: odoo_partnership_agreement_nl.pdf -.. |download_enterprise_de| image:: _static/banners/pdf.svg +.. |download_enterprise_de| image:: _static/icons/pdf.svg :alt: Download Odoo Enterprise Agreement (DE) :target: odoo_enterprise_agreement_de.pdf -.. |view_enterprise_de| image:: _static/banners/txt.svg +.. |view_enterprise_de| image:: _static/icons/txt.svg :alt: View Odoo Enterprise Agreement (DE) :target: legal/terms/i18n/enterprise_de.html -.. |download_partnership_de| image:: _static/banners/pdf.svg +.. |download_partnership_de| image:: _static/icons/pdf.svg :alt: Download Odoo Partnership Agreement (DE) :target: odoo_partnership_agreement_de.pdf -.. |view_partnership_de| image:: _static/banners/txt.svg +.. |view_partnership_de| image:: _static/icons/txt.svg :alt: View Odoo Partnership Agreement (DE) :target: legal/terms/i18n/partnership_de.html -.. |download_enterprise_es| image:: _static/banners/pdf.svg +.. |download_enterprise_es| image:: _static/icons/pdf.svg :alt: Download Odoo Enterprise Agreement (ES) :target: odoo_enterprise_agreement_es.pdf -.. |view_enterprise_es| image:: _static/banners/txt.svg +.. |view_enterprise_es| image:: _static/icons/txt.svg :alt: View Odoo Partnership Agreement (ES) :target: legal/terms/i18n/enterprise_es.html -.. |download_partnership_es| image:: _static/banners/pdf.svg +.. |download_partnership_es| image:: _static/icons/pdf.svg :alt: Download Odoo Partnership Agreement (ES) :target: odoo_partnership_agreement_es.pdf -.. |view_partnership_es| image:: _static/banners/txt.svg +.. |view_partnership_es| image:: _static/icons/txt.svg :alt: View Odoo Partnership Agreement (ES) :target: legal/terms/i18n/partnership_es.html diff --git a/legal/licenses.rst b/legal/licenses.rst index 2c497b134..97cc10848 100644 --- a/legal/licenses.rst +++ b/legal/licenses.rst @@ -1,4 +1,4 @@ -:banner: banners/getting_started.jpg +:banner: banners/getting_started.png ======== Licenses diff --git a/legal/others.rst b/legal/others.rst index 1ad8a08b4..bf8524973 100644 --- a/legal/others.rst +++ b/legal/others.rst @@ -1,4 +1,4 @@ -:banner: banners/getting_started.jpg +:banner: banners/getting_started.png ====================== Other legal references diff --git a/legal/terms.rst b/legal/terms.rst index 9555d6b57..499ca13ed 100644 --- a/legal/terms.rst +++ b/legal/terms.rst @@ -1,4 +1,4 @@ -:banner: banners/sign.jpg +:banner: banners/legal.png ==================== Terms and Conditions diff --git a/livechat/livechat.rst b/livechat/livechat.rst index c0f893d03..511e4f3f1 100644 --- a/livechat/livechat.rst +++ b/livechat/livechat.rst @@ -1,4 +1,4 @@ -:banner: banners/livechat.jpg +:banner: banners/livechat.png ========= Live Chat diff --git a/manufacturing.rst b/manufacturing.rst index 64443bd0e..2649d5828 100644 --- a/manufacturing.rst +++ b/manufacturing.rst @@ -1,4 +1,4 @@ -:banner: banners/manufacturing.jpg +:banner: banners/manufacturing.png ============= Manufacturing diff --git a/manufacturing/management.rst b/manufacturing/management.rst index fe1571695..508328b95 100644 --- a/manufacturing/management.rst +++ b/manufacturing/management.rst @@ -1,4 +1,4 @@ -:banner: banners/manufacturing.jpg +:banner: banners/manufacturing.png ======================== Manufacturing Management diff --git a/manufacturing/overview.rst b/manufacturing/overview.rst index 3b7377b2f..d3b9da847 100644 --- a/manufacturing/overview.rst +++ b/manufacturing/overview.rst @@ -1,4 +1,4 @@ -:banner: banners/manufacturing.jpg +:banner: banners/manufacturing.png ======== Overview diff --git a/manufacturing/repair.rst b/manufacturing/repair.rst index 9e9e21b90..894cbe8f6 100644 --- a/manufacturing/repair.rst +++ b/manufacturing/repair.rst @@ -1,4 +1,4 @@ -:banner: banners/manufacturing.jpg +:banner: banners/repair.png ================= Repair Management diff --git a/manufacturing/repair/repair.rst b/manufacturing/repair/repair.rst index cd6289425..7c6ada68d 100644 --- a/manufacturing/repair/repair.rst +++ b/manufacturing/repair/repair.rst @@ -1,3 +1,5 @@ +:banner: banners/repair.png + =============== Repair products =============== diff --git a/mobile/firebase.rst b/mobile/firebase.rst index 73bd3596b..670192caa 100644 --- a/mobile/firebase.rst +++ b/mobile/firebase.rst @@ -1,4 +1,4 @@ -:banner: banners/mobile.jpg +:banner: banners/mobile.png ====== Mobile diff --git a/odoo_sh/advanced.rst b/odoo_sh/advanced.rst index a306c3db0..dd1561492 100644 --- a/odoo_sh/advanced.rst +++ b/odoo_sh/advanced.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================= Advanced diff --git a/odoo_sh/advanced/containers.rst b/odoo_sh/advanced/containers.rst index 7aea9bd51..79dce1bc5 100644 --- a/odoo_sh/advanced/containers.rst +++ b/odoo_sh/advanced/containers.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================================== Containers diff --git a/odoo_sh/advanced/frequent_technical_questions.rst b/odoo_sh/advanced/frequent_technical_questions.rst index 9b30cb40b..5cf25588c 100644 --- a/odoo_sh/advanced/frequent_technical_questions.rst +++ b/odoo_sh/advanced/frequent_technical_questions.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png .. _odoosh-advanced-frequent_technical_questions: diff --git a/odoo_sh/advanced/submodules.rst b/odoo_sh/advanced/submodules.rst index a01157293..77cb72f80 100644 --- a/odoo_sh/advanced/submodules.rst +++ b/odoo_sh/advanced/submodules.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png .. _odoosh-advanced-submodules: diff --git a/odoo_sh/advanced/upgrade_your_database.rst b/odoo_sh/advanced/upgrade_your_database.rst index 9c51752c6..94d6a664a 100644 --- a/odoo_sh/advanced/upgrade_your_database.rst +++ b/odoo_sh/advanced/upgrade_your_database.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ===================== Upgrade your database diff --git a/odoo_sh/documentation.rst b/odoo_sh/documentation.rst index 76c6c4abc..c33b61611 100644 --- a/odoo_sh/documentation.rst +++ b/odoo_sh/documentation.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ========================== Odoo.sh diff --git a/odoo_sh/getting_started.rst b/odoo_sh/getting_started.rst index 944b8b863..cf4e7da26 100644 --- a/odoo_sh/getting_started.rst +++ b/odoo_sh/getting_started.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================= Get started diff --git a/odoo_sh/getting_started/branches.rst b/odoo_sh/getting_started/branches.rst index 97138f784..bb72d7321 100644 --- a/odoo_sh/getting_started/branches.rst +++ b/odoo_sh/getting_started/branches.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================================== Branches diff --git a/odoo_sh/getting_started/builds.rst b/odoo_sh/getting_started/builds.rst index 089ffe9e0..e8df52bf2 100644 --- a/odoo_sh/getting_started/builds.rst +++ b/odoo_sh/getting_started/builds.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png .. _odoosh-gettingstarted-builds: diff --git a/odoo_sh/getting_started/create.rst b/odoo_sh/getting_started/create.rst index e5b1ccb28..732187fb8 100644 --- a/odoo_sh/getting_started/create.rst +++ b/odoo_sh/getting_started/create.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png .. _odoosh-gettingstarted-create: diff --git a/odoo_sh/getting_started/first_module.rst b/odoo_sh/getting_started/first_module.rst index 073486a0a..e6fc544ee 100644 --- a/odoo_sh/getting_started/first_module.rst +++ b/odoo_sh/getting_started/first_module.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================================== Your first module diff --git a/odoo_sh/getting_started/online-editor.rst b/odoo_sh/getting_started/online-editor.rst index e36ed1a64..bac203ba5 100644 --- a/odoo_sh/getting_started/online-editor.rst +++ b/odoo_sh/getting_started/online-editor.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png .. _odoosh-gettingstarted-online-editor: diff --git a/odoo_sh/getting_started/settings.rst b/odoo_sh/getting_started/settings.rst index 066146e46..74519492d 100644 --- a/odoo_sh/getting_started/settings.rst +++ b/odoo_sh/getting_started/settings.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================================== Settings diff --git a/odoo_sh/getting_started/status.rst b/odoo_sh/getting_started/status.rst index ee5ed71e6..fdbf17d8d 100644 --- a/odoo_sh/getting_started/status.rst +++ b/odoo_sh/getting_started/status.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================================== Status diff --git a/odoo_sh/overview.rst b/odoo_sh/overview.rst index 33657f9fe..26157b691 100644 --- a/odoo_sh/overview.rst +++ b/odoo_sh/overview.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ================= Overview diff --git a/odoo_sh/overview/introduction.rst b/odoo_sh/overview/introduction.rst index 80f7e0e0d..207db543d 100644 --- a/odoo_sh/overview/introduction.rst +++ b/odoo_sh/overview/introduction.rst @@ -1,4 +1,4 @@ -:banner: banners/odoo-sh.jpg +:banner: banners/odoo_sh.png ============================== Introduction to Odoo.sh diff --git a/planning.rst b/planning.rst index 3372ddf04..f383ba532 100644 --- a/planning.rst +++ b/planning.rst @@ -1,4 +1,4 @@ -:banner: banners/planning.jpg +:banner: banners/planning.png ========= Planning diff --git a/point_of_sale.rst b/point_of_sale.rst index 2ec638127..07707a0ee 100644 --- a/point_of_sale.rst +++ b/point_of_sale.rst @@ -1,4 +1,4 @@ -:banner: banners/pos.jpg +:banner: banners/pos.png ============= Point of Sale diff --git a/portal/my_odoo_portal.rst b/portal/my_odoo_portal.rst index 49797d93d..02a7d8e50 100644 --- a/portal/my_odoo_portal.rst +++ b/portal/my_odoo_portal.rst @@ -1,5 +1,5 @@ -:banner: banners/my_odoo_portal.jpg +:banner: banners/my_odoo_portal.png ============== My Odoo Portal diff --git a/project.rst b/project.rst index 311637d7e..741de7dff 100644 --- a/project.rst +++ b/project.rst @@ -1,4 +1,4 @@ -:banner: banners/project.jpg +:banner: banners/project.png ======= Project diff --git a/purchase.rst b/purchase.rst index ab2f894df..d36acf30a 100644 --- a/purchase.rst +++ b/purchase.rst @@ -1,4 +1,4 @@ -:banner: banners/purchase.jpg +:banner: banners/purchase.png ======== Purchase diff --git a/quality.rst b/quality.rst index 8df17d302..b92772759 100644 --- a/quality.rst +++ b/quality.rst @@ -1,4 +1,4 @@ -:banner: banners/quality.jpg +:banner: banners/quality.png ======= Quality diff --git a/requirements.txt b/requirements.txt index 71121d994..95726293f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -Sphinx<2 \ No newline at end of file +Sphinx>=2.4.0 +Werkzeug==0.14.1 \ No newline at end of file diff --git a/sales.rst b/sales.rst index 4ef902592..ffa10bc28 100644 --- a/sales.rst +++ b/sales.rst @@ -1,4 +1,4 @@ -:banner: banners/sales.jpg +:banner: banners/sales.png ===== Sales diff --git a/sales/amazon_connector/apply.rst b/sales/amazon_connector/apply.rst index d3b661048..24ada3ea5 100644 --- a/sales/amazon_connector/apply.rst +++ b/sales/amazon_connector/apply.rst @@ -45,7 +45,7 @@ Odoo. Answer the Additional Form ========================== -.. tip:: +.. note:: If you did not receive any additional form after your :ref:`initial application for Amazon MWS keys `, you may disregard this section. @@ -54,8 +54,12 @@ This section lists all questions asked by Amazon in additional forms. The answer provide it yourself at the place indicated by square brackets. .. warning:: - If you are *not* hosted on Odoo.com (*online*) or on Odoo.sh, you should adapt the answers - related to hosting according to your own infrastructure and data protection policy. + If you are *not* hosted on Odoo, you should adapt the answers related to hosting according to + your own infrastructure and data protection policy. + + If you *are* hosted on Odoo, take note that Amazon is the final decision maker concerning your + application. While Odoo can help you provide additional details to your application, it is not + guaranteed that Amazon will find them adequate. - **Describe all functionalities in your application where Personally Identifiable Information (e.g. customer name, street address, billing address) is required.** diff --git a/sales/amazon_connector/setup.rst b/sales/amazon_connector/setup.rst index d9d49e0a5..e6473980b 100644 --- a/sales/amazon_connector/setup.rst +++ b/sales/amazon_connector/setup.rst @@ -10,7 +10,8 @@ To register your seller account in Odoo, navigate to :menuselection:`Sales --> C The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the **Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in -Developer Central (where the Developer Registration and Assessment form was located). +Developer Central (where the :ref:`Developer Registration and Assessment form +` was located). Once the account is registered, the marketplaces available to this account are synchronized and listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of diff --git a/sales/send_quotations.rst b/sales/send_quotations.rst index f396d7339..ea18f5d83 100644 --- a/sales/send_quotations.rst +++ b/sales/send_quotations.rst @@ -6,7 +6,7 @@ Send Quotations :titlesonly: send_quotations/quote_template - send_quotations/optional_items + send_quotations/optional_products send_quotations/get_signature_to_validate send_quotations/get_paid_to_validate send_quotations/deadline diff --git a/sales/send_quotations/deadline.rst b/sales/send_quotations/deadline.rst index d854250c6..4f36bd0c0 100644 --- a/sales/send_quotations/deadline.rst +++ b/sales/send_quotations/deadline.rst @@ -1,32 +1,44 @@ -============================================ -Stimulate customers with quotations deadline -============================================ +=================================================== +Use quotations deadline to stimulate your customers +=================================================== -As you send quotations, it is important to set a quotation deadline, -both to entice your customer into action with the fear of missing out on -an offer and to protect yourself. You don't want to have to fulfill an -order at a price that is no longer cost effective for you. +When sending quotations, it is important to set a deadline to encourage your customers to act. +Indeed, this will stimulate them because they will be afraid of missing a good deal and it will also +allow you to protect yourself in case you have to fulfill an order at a price that is no longer +profitable for you. Set a deadline ============== -On every quotation or sales order you can add an *Expiration Date*. +With Odoo Sales, it is possible to instantly add an **Expiration Date** from the quotation or the +sales order. -.. image:: media/quotationsdeadline01.png - :align: center +.. image:: media/quotation_deadlines_1.png + :align: center + :class: img-thumbnail + :alt: How to configure deadlines on Odoo Sales? -Use deadline in templates -========================= +Use deadline in your quotation templates +======================================== -You can also set a default deadline in a *Quotation Template*. Each -time that template is used in a quotation, that deadline is applied. See :doc:`quote_template` for -more information about quotation templates. +It is also possible to add a deadline to every quotation template created. Whenever a specific +quotation template is used in a quote, its associated deadline will be automatically applied. Be +sure to check out our documentation about :doc:`quote_template` to excel in their use. -.. image:: media/quotationsdeadline02.png - :align: center +.. image:: media/quotation_deadlines_2.png + :align: center + :class: img-thumbnail + :alt: How to use deadline in a quotation template on Odoo Sales? -On your customer side, they will see this: +.. tip:: + By clicking on the **Customer Preview** button, you will be able to see when the offer expires. + For your information, the number of days will be the same as those mentioned in the quotation + template. -.. image:: media/quotationsdeadline03.png - :align: center + .. image:: media/quotation_deadlines_3.png + :align: center + :class: img-thumbnail + :alt: How customers will see deadlines on Odoo Sales? +.. seealso:: + - :doc:`quote_template` \ No newline at end of file diff --git a/sales/send_quotations/different_addresses.rst b/sales/send_quotations/different_addresses.rst index a05c96ce2..f4c2b1aac 100644 --- a/sales/send_quotations/different_addresses.rst +++ b/sales/send_quotations/different_addresses.rst @@ -2,47 +2,74 @@ Deliver and invoice to different addresses ========================================== -In Odoo you can configure different addresses for delivery and -invoicing. This is key, not everyone will have the same delivery -location as their invoice location. +With Odoo Sales, you can configure different addresses for delivery and invoicing. For some +customers, it will be very practical to define specific billing and shipping addresses. Indeed, not +everyone will have the same delivery location as the invoicing location. Activate the feature ==================== -Go to :menuselection:`SALES --> Configuration --> Settings` and activate -the *Customer Addresses* feature. +Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Customer Addresses** +feature. -.. image:: media/invoice_and_deliver_to_different_address01.png - :align: center +.. image:: media/addresses_1.png + :align: center + :class: img-thumbnail + :alt: How to enable different customer addresses on Odoo Sales? -Add different addresses to a quotation or sales order -===================================================== +Add addresses from a quotation +============================== -If you select a customer with an invoice and delivery address set, Odoo -will automatically use those. If there's only one, Odoo will use that -one for both but you can, of course, change it instantly and create a -new one right from the quotation or sales order. +When you create a quotation, you must add a customer. This customer can be a company or a person +with specific billing and shipping addresses already defined and registered in the system, or it can +be a new customer. In this case, you have to **Create and edit** the contact form for your new +customer and link it, if necessary, to a company. In this contact form, you will be able to add, +delete and modify invoice and delivery addresses. -.. image:: media/invoice_and_deliver_to_different_address02.png - :align: center +.. image:: media/addresses_2.png + :align: center + :class: img-thumbnail + :alt: How to add addresses from a quotation on Odoo Sales? -Add invoice & delivery addresses to a customer -============================================== +.. note:: + If you select a customer with defined invoice and delivery addresses, Odoo will automatically use + them to fill in the fields. Now, if you want to change it instantly, it is possible to do so + directly from the quotation or the sales order. -If you want to add them to a customer before a quotation or sales order, -they are added to the customer form. Go to any customers form under -:menuselection:`SALES --> Orders --> Customers`. +Add addresses from a contact form +================================= -From there you can add new addresses to the customer. +Previously, we talked about the contact form that you can fill in directly from a quotation or a +sales order to add billing and shipping addresses to customers. But, if you go to +:menuselection:`Sales --> Orders --> Customers`, you can create or modify every customer you want +and add, delete or modify invoice and delivery addresses instantly there, before creating a +quotation. -.. image:: media/invoice_and_deliver_to_different_address03.png - :align: center +.. image:: media/addresses_3.png + :align: center + :class: img-thumbnail + :alt: How to add addresses from a contact form on Odoo Sales? -Various addresses on the quotation / sales orders -================================================= +Deal with different addresses +============================= -These two addresses will then be used on the quotation or sales order -you send by email or print. +Like for the previous example, go to :menuselection:`Sales --> Orders --> Customers` and create a +new customer. There, you can add company information but, more importantly, you can enter billing +and shipping addresses under the **Contacts & Addresses** tab. -.. image:: media/invoice_and_deliver_to_different_address04.png - :align: center +.. image:: media/addresses_4.png + :align: center + :class: img-thumbnail + :alt: How to manage different customer addresses on Odoo Sales? + +Once done, you can return to your Sales dashboard and create a new quotation. Now, if you enter +your new customer, you will see that the other fields will fill in by themself with the information +previously saved for billing and shipping addresses. + +.. image:: media/addresses_5.png + :align: center + :class: img-thumbnail + :alt: Automatic quotation fields filling on Odoo Sales + +With Odoo Sales, it is now very convenient to play with various addresses in terms of invoice and +delivery features. \ No newline at end of file diff --git a/sales/send_quotations/get_paid_to_validate.rst b/sales/send_quotations/get_paid_to_validate.rst index 6fa726802..b05eb8ee0 100644 --- a/sales/send_quotations/get_paid_to_validate.rst +++ b/sales/send_quotations/get_paid_to_validate.rst @@ -2,42 +2,54 @@ Get paid to confirm an order ============================ -You can use online payments to get orders automatically confirmed. -Saving the time of both your customers and yourself. +In general, online payments are considered as a fast and secure alternative to traditional payment +methods. It is generally cheaper, easier and faster than other payment methods. It is particularly +useful and efficient for international transactions. With Odoo Sales, you can use online payments +to get automatic orders confirmation. Online payments are made instantly, so it's very convenient +and saves lots of time in a basic sales process. -Activate online payment -======================= +Enable online payment +===================== -Go to :menuselection:`SALES --> Configuration --> Settings` and activate -the *Online Signature & Payment* feature. - -.. image:: media/getpaidtovalidate01.png - :align: center - -Once in the *Payment Acquirers* menu you can select and configure your -acquirers of choice. - -You can find various documentation about how to be paid with payment -acquirers such as `Paypal -<../../ecommerce/shopper_experience/paypal>`_, -`Authorize.Net (pay by credit card) -<../../ecommerce/shopper_experience/authorize>`_, -and others under the `eCommerce documentation -<../../ecommerce>`_. +Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Online Payment** +feature. +.. image:: media/get_paid_1.png + :align: center + :class: img-thumbnail + :alt: How to enable online payment on Odoo Sales? +There, you will have direct access to the **Payment Acquirers** page. It will allow you to select +and configure your acquirers of choice. Before creating or modifying a payment acquirer, be sure to +check out our documentation about how to be paid with payment acquirers such as +:doc:`../../ecommerce/shopper_experience/paypal`, +:doc:`../../ecommerce/shopper_experience/authorize`, and others in the :doc:`../../ecommerce` +documentation. .. note:: - If you are using `quotation templates - <../quote_template>`_, - you can also pick a default setting for each template. + If you are familiar with this documentation: :doc:`quote_template`; you + can activate or not the **Online Payment** feature for each template you use, under their + confirmation tab. Register a payment ================== -From the quotation email you sent, your customer will be able to pay -online. +After opening quotations from their received email, your customers will have different +possibilities to make their online payments. For example: + +.. image:: media/get_paid_2.png + :align: center + :class: img-thumbnail + :alt: How to register a payment on Odoo Sales? + +.. tip:: + By clicking on the **Customer Preview** button, you will be able to see what your customers + will have to choose when it comes to payment. + +.. seealso:: + - :doc:`quote_template` + - :doc:`../../ecommerce` + - :doc:`../../ecommerce/shopper_experience/paypal` + - :doc:`../../ecommerce/shopper_experience/authorize` -.. image:: media/getpaidtovalidate02.png - :align: center diff --git a/sales/send_quotations/get_signature_to_validate.rst b/sales/send_quotations/get_signature_to_validate.rst index 3e1834c12..a0b547895 100644 --- a/sales/send_quotations/get_signature_to_validate.rst +++ b/sales/send_quotations/get_signature_to_validate.rst @@ -2,31 +2,52 @@ Get a signature to confirm an order =================================== -You can use online signature to get orders automatically confirmed. Both -you and your customer will save time by using this feature compared to a -traditional process. +Online signatures are like electronic "fingerprints". By using them on Odoo, you will get +automatic orders confirmation. You and your customers will save a lot of time by using this +feature compared to a traditional process. Activate online signature ========================= -Go to :menuselection:`SALES --> Configuration --> Settings` and activate -the *Online Signature & Payment* feature. +Go to :menuselection:`Sales --> Configuration --> Settings` and activate the **Online Signature** +feature. -.. image:: media/getsignaturetovalidate01.png - :align: center +.. image:: media/signature_1.png + :align: center + :class: img-thumbnail + :alt: How to enable online signature on Odoo Sales? .. note:: - If you are using :doc:`quotation templates `, you can also pick a default setting - for each template. + If you are familiar with this documentation: :doc:`quote_template`, you can activate or not the + **Online Signature** feature for each quotation template you use, under their confirmation tab. + Example: -Validate an order with a signature -================================== + .. image:: media/signature_2.png + :align: center + :class: img-thumbnail + :alt: How to enable online signature on Odoo Sales? -When you sent a quotation to your client, they can accept it and sign online instantly. +Confirm an order with a signature +================================= -.. image:: media/getsignaturetovalidate02.png - :align: center +When you send quotations to clients, they can instantly accept and sign it online. When they +click on **Sign & Pay**, they have the choice to draw their own signature, automatically fill in the +field with an automated signature or load a file from their computer. Here below, it is an example +of an automated signature: -Once signed the quotation will be confirmed and delivery will start. +.. image:: media/signature_3.png + :align: center + :class: img-thumbnail + :alt: How to confirm an order with a signature on Odoo Sales? + +Once signed, you will have the possibility to choose your payment methods. Then, when the quotation +will be paid and confirmed, a delivery order will be created automatically by Odoo. + +.. tip:: + Be careful that delivery orders are only generated for storable products and if the + **Inventory app** is already installed. + +.. seealso:: + - :doc:`quote_template` diff --git a/sales/send_quotations/media/addresses_1.png b/sales/send_quotations/media/addresses_1.png new file mode 100644 index 000000000..72b86beb5 Binary files /dev/null and b/sales/send_quotations/media/addresses_1.png differ diff --git a/sales/send_quotations/media/addresses_2.png b/sales/send_quotations/media/addresses_2.png new file mode 100644 index 000000000..cf459b0f9 Binary files /dev/null and b/sales/send_quotations/media/addresses_2.png differ diff --git a/sales/send_quotations/media/addresses_3.png b/sales/send_quotations/media/addresses_3.png new file mode 100644 index 000000000..94daff0d2 Binary files /dev/null and b/sales/send_quotations/media/addresses_3.png differ diff --git a/sales/send_quotations/media/addresses_4.png b/sales/send_quotations/media/addresses_4.png new file mode 100644 index 000000000..2022d7abf Binary files /dev/null and b/sales/send_quotations/media/addresses_4.png differ diff --git a/sales/send_quotations/media/addresses_5.png b/sales/send_quotations/media/addresses_5.png new file mode 100644 index 000000000..1d568e000 Binary files /dev/null and b/sales/send_quotations/media/addresses_5.png differ diff --git a/sales/send_quotations/media/get_paid_1.png b/sales/send_quotations/media/get_paid_1.png new file mode 100644 index 000000000..3819269a1 Binary files /dev/null and b/sales/send_quotations/media/get_paid_1.png differ diff --git a/sales/send_quotations/media/get_paid_2.png b/sales/send_quotations/media/get_paid_2.png new file mode 100644 index 000000000..066e6b99c Binary files /dev/null and b/sales/send_quotations/media/get_paid_2.png differ diff --git a/sales/send_quotations/media/getpaidtovalidate01.png b/sales/send_quotations/media/getpaidtovalidate01.png deleted file mode 100644 index 1072d9c73..000000000 Binary files a/sales/send_quotations/media/getpaidtovalidate01.png and /dev/null differ diff --git a/sales/send_quotations/media/getpaidtovalidate02.png b/sales/send_quotations/media/getpaidtovalidate02.png deleted file mode 100644 index 17c431e9e..000000000 Binary files a/sales/send_quotations/media/getpaidtovalidate02.png and /dev/null differ diff --git a/sales/send_quotations/media/getsignaturetovalidate01.png b/sales/send_quotations/media/getsignaturetovalidate01.png deleted file mode 100644 index 7266fadb9..000000000 Binary files a/sales/send_quotations/media/getsignaturetovalidate01.png and /dev/null differ diff --git a/sales/send_quotations/media/getsignaturetovalidate02.png b/sales/send_quotations/media/getsignaturetovalidate02.png deleted file mode 100644 index e3c6b885d..000000000 Binary files a/sales/send_quotations/media/getsignaturetovalidate02.png and /dev/null differ diff --git a/sales/send_quotations/media/invoice_and_deliver_to_different_address01.png b/sales/send_quotations/media/invoice_and_deliver_to_different_address01.png deleted file mode 100644 index 347a4e1d5..000000000 Binary files a/sales/send_quotations/media/invoice_and_deliver_to_different_address01.png and /dev/null differ diff --git a/sales/send_quotations/media/invoice_and_deliver_to_different_address02.png b/sales/send_quotations/media/invoice_and_deliver_to_different_address02.png deleted file mode 100644 index 4ab717863..000000000 Binary files a/sales/send_quotations/media/invoice_and_deliver_to_different_address02.png and /dev/null differ diff --git a/sales/send_quotations/media/invoice_and_deliver_to_different_address03.png b/sales/send_quotations/media/invoice_and_deliver_to_different_address03.png deleted file mode 100644 index 243b7a8ab..000000000 Binary files a/sales/send_quotations/media/invoice_and_deliver_to_different_address03.png and /dev/null differ diff --git a/sales/send_quotations/media/invoice_and_deliver_to_different_address04.png b/sales/send_quotations/media/invoice_and_deliver_to_different_address04.png deleted file mode 100644 index 09fa58534..000000000 Binary files a/sales/send_quotations/media/invoice_and_deliver_to_different_address04.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_items01.png b/sales/send_quotations/media/optional_items01.png deleted file mode 100644 index d0ee5ee06..000000000 Binary files a/sales/send_quotations/media/optional_items01.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_items02.png b/sales/send_quotations/media/optional_items02.png deleted file mode 100644 index 9b40ff9ca..000000000 Binary files a/sales/send_quotations/media/optional_items02.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_items03.png b/sales/send_quotations/media/optional_items03.png deleted file mode 100644 index 690b100e4..000000000 Binary files a/sales/send_quotations/media/optional_items03.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_items04.png b/sales/send_quotations/media/optional_items04.png deleted file mode 100644 index b812d1764..000000000 Binary files a/sales/send_quotations/media/optional_items04.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_items05.png b/sales/send_quotations/media/optional_items05.png deleted file mode 100644 index d31a9ec7c..000000000 Binary files a/sales/send_quotations/media/optional_items05.png and /dev/null differ diff --git a/sales/send_quotations/media/optional_products_1.png b/sales/send_quotations/media/optional_products_1.png new file mode 100644 index 000000000..7b7e8366a Binary files /dev/null and b/sales/send_quotations/media/optional_products_1.png differ diff --git a/sales/send_quotations/media/optional_products_2.png b/sales/send_quotations/media/optional_products_2.png new file mode 100644 index 000000000..55f4044fd Binary files /dev/null and b/sales/send_quotations/media/optional_products_2.png differ diff --git a/sales/send_quotations/media/optional_products_3.png b/sales/send_quotations/media/optional_products_3.png new file mode 100644 index 000000000..f275bf751 Binary files /dev/null and b/sales/send_quotations/media/optional_products_3.png differ diff --git a/sales/send_quotations/media/optional_products_4.png b/sales/send_quotations/media/optional_products_4.png new file mode 100644 index 000000000..335a22f9a Binary files /dev/null and b/sales/send_quotations/media/optional_products_4.png differ diff --git a/sales/send_quotations/media/optional_products_5.png b/sales/send_quotations/media/optional_products_5.png new file mode 100644 index 000000000..393be038d Binary files /dev/null and b/sales/send_quotations/media/optional_products_5.png differ diff --git a/sales/send_quotations/media/quotation_deadlines_1.png b/sales/send_quotations/media/quotation_deadlines_1.png new file mode 100644 index 000000000..d60984ea3 Binary files /dev/null and b/sales/send_quotations/media/quotation_deadlines_1.png differ diff --git a/sales/send_quotations/media/quotation_deadlines_2.png b/sales/send_quotations/media/quotation_deadlines_2.png new file mode 100644 index 000000000..86b1a97f2 Binary files /dev/null and b/sales/send_quotations/media/quotation_deadlines_2.png differ diff --git a/sales/send_quotations/media/quotation_deadlines_3.png b/sales/send_quotations/media/quotation_deadlines_3.png new file mode 100644 index 000000000..f6d9081c6 Binary files /dev/null and b/sales/send_quotations/media/quotation_deadlines_3.png differ diff --git a/sales/send_quotations/media/quotations_templates_1.png b/sales/send_quotations/media/quotations_templates_1.png new file mode 100644 index 000000000..cb3bb5090 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_1.png differ diff --git a/sales/send_quotations/media/quotations_templates_2.png b/sales/send_quotations/media/quotations_templates_2.png new file mode 100644 index 000000000..8fdfd5de9 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_2.png differ diff --git a/sales/send_quotations/media/quotations_templates_3.png b/sales/send_quotations/media/quotations_templates_3.png new file mode 100644 index 000000000..4dbbe86b9 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_3.png differ diff --git a/sales/send_quotations/media/quotations_templates_4.png b/sales/send_quotations/media/quotations_templates_4.png new file mode 100644 index 000000000..bcf3c4fc1 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_4.png differ diff --git a/sales/send_quotations/media/quotations_templates_5.png b/sales/send_quotations/media/quotations_templates_5.png new file mode 100644 index 000000000..36faf4ad3 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_5.png differ diff --git a/sales/send_quotations/media/quotations_templates_6.png b/sales/send_quotations/media/quotations_templates_6.png new file mode 100644 index 000000000..eb7339f57 Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_6.png differ diff --git a/sales/send_quotations/media/quotations_templates_7.png b/sales/send_quotations/media/quotations_templates_7.png new file mode 100644 index 000000000..1d0a3f87c Binary files /dev/null and b/sales/send_quotations/media/quotations_templates_7.png differ diff --git a/sales/send_quotations/media/quotationsdeadline01.png b/sales/send_quotations/media/quotationsdeadline01.png deleted file mode 100644 index 2b79b833b..000000000 Binary files a/sales/send_quotations/media/quotationsdeadline01.png and /dev/null differ diff --git a/sales/send_quotations/media/quotationsdeadline02.png b/sales/send_quotations/media/quotationsdeadline02.png deleted file mode 100644 index 8c1be8c7c..000000000 Binary files a/sales/send_quotations/media/quotationsdeadline02.png and /dev/null differ diff --git a/sales/send_quotations/media/quotationsdeadline03.png b/sales/send_quotations/media/quotationsdeadline03.png deleted file mode 100644 index a6c70c1c5..000000000 Binary files a/sales/send_quotations/media/quotationsdeadline03.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template01.png b/sales/send_quotations/media/quote_template01.png deleted file mode 100644 index 957ae1dae..000000000 Binary files a/sales/send_quotations/media/quote_template01.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template02.png b/sales/send_quotations/media/quote_template02.png deleted file mode 100644 index 5d6677d0d..000000000 Binary files a/sales/send_quotations/media/quote_template02.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template03.png b/sales/send_quotations/media/quote_template03.png deleted file mode 100644 index eae671692..000000000 Binary files a/sales/send_quotations/media/quote_template03.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template04.png b/sales/send_quotations/media/quote_template04.png deleted file mode 100644 index 664b6a5ee..000000000 Binary files a/sales/send_quotations/media/quote_template04.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template05.png b/sales/send_quotations/media/quote_template05.png deleted file mode 100644 index 2b9a5eceb..000000000 Binary files a/sales/send_quotations/media/quote_template05.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template06.png b/sales/send_quotations/media/quote_template06.png deleted file mode 100644 index 49c1c2b9f..000000000 Binary files a/sales/send_quotations/media/quote_template06.png and /dev/null differ diff --git a/sales/send_quotations/media/quote_template07.png b/sales/send_quotations/media/quote_template07.png deleted file mode 100644 index 871b25de7..000000000 Binary files a/sales/send_quotations/media/quote_template07.png and /dev/null differ diff --git a/sales/send_quotations/media/signature_1.png b/sales/send_quotations/media/signature_1.png new file mode 100644 index 000000000..42dffee9e Binary files /dev/null and b/sales/send_quotations/media/signature_1.png differ diff --git a/sales/send_quotations/media/signature_2.png b/sales/send_quotations/media/signature_2.png new file mode 100644 index 000000000..6bb3751a3 Binary files /dev/null and b/sales/send_quotations/media/signature_2.png differ diff --git a/sales/send_quotations/media/signature_3.png b/sales/send_quotations/media/signature_3.png new file mode 100644 index 000000000..bebef7bd5 Binary files /dev/null and b/sales/send_quotations/media/signature_3.png differ diff --git a/sales/send_quotations/media/terms_and_conditions03.png b/sales/send_quotations/media/terms_and_conditions03.png index 39d3854b4..5d6677d0d 100644 Binary files a/sales/send_quotations/media/terms_and_conditions03.png and b/sales/send_quotations/media/terms_and_conditions03.png differ diff --git a/sales/send_quotations/media/terms_and_conditions04.png b/sales/send_quotations/media/terms_and_conditions04.png new file mode 100644 index 000000000..39d3854b4 Binary files /dev/null and b/sales/send_quotations/media/terms_and_conditions04.png differ diff --git a/sales/send_quotations/optional_items.rst b/sales/send_quotations/optional_items.rst deleted file mode 100644 index c56125d40..000000000 --- a/sales/send_quotations/optional_items.rst +++ /dev/null @@ -1,48 +0,0 @@ -=========================================== -Increase your sales with suggested products -=========================================== - -The use of suggested products is an attempt to offer related and useful -products to your client. For instance, a client purchasing a cellphone -could be shown accessories like a protective case, a screen cover, and -headset. - -Add suggested products to your quotation templates -================================================== - -Suggested products can be set on *Quotation Templates*. See :doc:`quote_template`. - -Once on a template, you can see a *Suggested Products* tab where you -can add related products or services. - -.. image:: media/optional_items01.png - :align: center - -You can also add or modify suggested products on the quotation. - -Add suggested products to the quotation -======================================= - -When opening the quotation from the received email, the customer can add -the suggested products to the order. - -.. image:: media/optional_items02.png - :align: center - -.. image:: media/optional_items03.png - :align: center - -The product(s) will be instantly added to their quotation when clicking -on any of the little carts. - -.. image:: media/optional_items04.png - :align: center - -Depending on your confirmation process, they can either digitally sign -or pay to confirm the quotation. - -Each move done by the customer to the quotation will be tracked in the -sales order, letting the salesperson see it. - -.. image:: media/optional_items05.png - :align: center diff --git a/sales/send_quotations/optional_products.rst b/sales/send_quotations/optional_products.rst new file mode 100644 index 000000000..bd7ab19f0 --- /dev/null +++ b/sales/send_quotations/optional_products.rst @@ -0,0 +1,65 @@ +===================== +Add optional products +===================== + +The use of optional products is a marketing strategy for cross-selling products along with a core +product. The aim is to offer useful and related products to your customers. For instance, if a +customer wants to buy a car, he has the choice to order an automatic opening trunk and massaging +seats, or not to order such high-quality products and simply buy his car. + +Add optional products to your quotations +======================================== + +With Odoo Sales, it is possible to add or modify optional products directly on quotations +(under the **Optional Products** tab, as you can see below). + +.. image:: media/optional_products_2.png + :align: center + :class: img-thumbnail + :alt: How to add optional products to your quotations on Odoo Sales + +.. note:: + By clicking on the **Customer Preview** button, you will be able to see what your customers + will have as possibilities after opening a quotation from their received email. + + .. image:: media/optional_products_3.png + :align: center + :class: img-thumbnail + :alt: Preview your quotations on Odoo Sales + +In practice, your customers will be able to add different optional products to their order by +using associated carts, with a user-friendly layout. More than that, if a customer selects all the +optional products suggested, these additional items will automatically fill in the quotation +managed by the salesman. + +.. image:: media/optional_products_4.png + :align: center + :class: img-thumbnail + :alt: How to select optional products on Odoo Sales + +Like this, salespeople will see each movement made by the customer and tracking the order will be +all the better. + +.. image:: media/optional_products_5.png + :align: center + :class: img-thumbnail + :alt: How to follow each movement made by your customers on Odoo Sales + +Add optional products to your quotation templates +================================================= + +Be sure to check out our documentation about :doc:`quote_template` to understand how you can +enable, create, design and manage your own quotation templates before reading this part. + +For quotation templates, you also have an **Optional Products** tab where you can add related +products or services. + +.. image:: media/optional_products_1.png + :align: center + :class: img-thumbnail + :alt: How to add optional products to your quotation templates on Odoo Sales + +With Odoo Sales, it is now very easy to understand your customer's needs. + +.. seealso:: + - :doc:`quote_template` \ No newline at end of file diff --git a/sales/send_quotations/quote_template.rst b/sales/send_quotations/quote_template.rst index acb319a60..2c00982da 100644 --- a/sales/send_quotations/quote_template.rst +++ b/sales/send_quotations/quote_template.rst @@ -2,92 +2,95 @@ Use quotation templates ======================= -If you often sell the same products or services, you can save a lot of -time by creating custom quotation templates. By using a template you can -send a complete quotation in no time. +By creating custom quotation templates, you will save a lot of time. Indeed, with the use of +templates, you will be able to send complete quotations at a fast pace. Configuration ============= -For this feature to work, go to :menuselection:`Sales --> Configuration ---> Settings` and activate *Quotations Templates*. +To enable this feature, go to :menuselection:`Sales --> Configuration --> Settings` and activate +**Quotation Templates**. -.. image:: media/quote_template01.png - :align: center +.. image:: media/quotations_templates_1.png + :align: center + :class: img-thumbnail + :alt: How to enable quotation templates on Odoo Sales? + +For even more convenience, it is also recommended to add the **Quotation Builder** feature which +will help you design your quotation templates very easily. This option will automatically install +the Odoo Website App. + +.. image:: media/quotations_templates_2.png + :align: center + :class: img-thumbnail + :alt: How to enable quotation builder on Odoo Sales? Create your first template ========================== -You will find the templates menu under :menuselection:`Sales --> -Configuration`. +Quotation templates are under :menuselection:`Sales --> Configuration`. -You can then create or edit an existing one. Once named, you will be -able to select the product(s) and their quantity as well as the -expiration time for the quotation. +You can create a new template or edit an existing one. Once named, you will be able to select +products and quantities as well as the expiration time of the quotation. -.. image:: media/quote_template02.png - :align: center - -On each template, you can also specify discounts if the option is -activated in the *Sales* settings. The base price is set in the -product configuration and can be changed by customer pricelists. - -.. seealso:: - - :doc:`../products_prices/prices/pricing` - -Edit your template -================== - -You can edit the customer interface of the template that they see to -accept or pay the quotation. This lets you describe your company, -services and products. When you click on *Edit Template* you will be -brought to the quotation editor. - -.. image:: media/quote_template03.png - :align: center - -.. image:: media/quote_template04.png - :align: center - -This lets you edit the description content thanks to drag & drop of -building blocks. To describe your products add a content block in the -zone dedicated to each product. - -.. image:: media/quote_template05.png +.. image:: media/quotations_templates_3.png :align: center + :class: img-thumbnail + :alt: Create a new quotation template on Odoo Sales .. note:: - The description set for the products will be used in all - quotations templates containing those products. + On each template, you can also specify discounts if the option is activated in the **Sales** + settings. + +Design your template +==================== + +You will have the possibility to design your template and edit the customer interface in order +to manage what clients will see before accepting and paying the quotation. For example, you will +be able to describe your company, your services and your products. To do so, you can click on +**Edit** and you will be brought to the quotation builder. + +.. image:: media/quotations_templates_4.png + :align: center + :class: img-thumbnail + :alt: Design your quotation template on Odoo Sales + +You can easily edit the content of your template by dragging & dropping different building blocks +to organize your quotation. For example, you can add a content block to describe your products. + +.. image:: media/quotations_templates_5.png + :align: center + :class: img-thumbnail + :alt: Drag & drop building blocks to create your quotation template on Odoo Sales Use a quotation template ======================== -When creating a quotation, you can select a template. +When creating a quotation, you can choose a specific template. -.. image:: media/quote_template06.png +.. image:: media/quotations_templates_6.png :align: center - -Each product in that template will be added to your quotation. + :class: img-thumbnail + :alt: Select a specific template on Odoo Sales .. tip:: - You can select a template to be suggested by default in the - *Sales* settings. + You can select any template of your choice and suggest it as the default template in + the **Sales** settings. Confirm the quotation ===================== -Templates also ease the confirmation process for customers with a -digital signature or online payment. You can select that in the template -itself. +Templates facilitate the confirmation process by allowing customers to sign electronically or to +pay online. You can activate these two options directly in the quotation template itself. -.. image:: media/quote_template07.png +.. image:: media/quotations_templates_7.png :align: center + :class: img-thumbnail + :alt: Allow your customers to sign electronically or to pay online on Odoo Sales -Every quotation will now have this setting added to it. - -Of course you can still change it and make it specific for each -quotation. +.. note:: + Every quotation will now have this setting. Of course you can always change it and make it + specific for each quotation. .. seealso:: - :doc:`get_signature_to_validate` diff --git a/sales/send_quotations/terms_and_conditions.rst b/sales/send_quotations/terms_and_conditions.rst index 84540a501..b9d02c4f4 100644 --- a/sales/send_quotations/terms_and_conditions.rst +++ b/sales/send_quotations/terms_and_conditions.rst @@ -26,7 +26,7 @@ appear on every quotation, SO and invoice. .. image:: media/terms_and_conditions02.png :align: center -.. image:: media/quote_template02.png +.. image:: media/terms_and_conditions03.png :align: center Set up more detailed terms & conditions @@ -40,5 +40,5 @@ You can also attach an external document with more detailed and structured conditions to the email you send to the customer. You can even set a default attachment for all quotation emails sent. -.. image:: media/terms_and_conditions03.png +.. image:: media/terms_and_conditions04.png :align: center diff --git a/sms_marketing.rst b/sms_marketing.rst index 1f911a7f0..3cc6fec38 100644 --- a/sms_marketing.rst +++ b/sms_marketing.rst @@ -1,4 +1,4 @@ -:banner: banners/sms.jpg +:banner: banners/sms.png ============= SMS Marketing diff --git a/social_marketing.rst b/social_marketing.rst index 1eceed5f5..728219e39 100644 --- a/social_marketing.rst +++ b/social_marketing.rst @@ -1,4 +1,4 @@ -:banner: banners/social_marketing.jpg +:banner: banners/social_marketing.png ================ Social Marketing diff --git a/support.rst b/support.rst index 6be371b64..6580fba93 100644 --- a/support.rst +++ b/support.rst @@ -1,4 +1,4 @@ -:banner: banners/support.jpg +:banner: banners/support.png ======= Support diff --git a/support/supported_versions.rst b/support/supported_versions.rst index f74ca310a..c4e22f531 100644 --- a/support/supported_versions.rst +++ b/support/supported_versions.rst @@ -1,4 +1,4 @@ -.. :banner: banners/support.jpg +.. :banner: banners/support.png ================== diff --git a/support/user_doc.rst b/support/user_doc.rst index 2cde4ae60..112445751 100644 --- a/support/user_doc.rst +++ b/support/user_doc.rst @@ -1,4 +1,4 @@ -.. :banner: banners/support.jpg +.. :banner: banners/support.png =============================== diff --git a/support/what_can_i_expect.rst b/support/what_can_i_expect.rst index d07bf7a0b..d5b0e7544 100644 --- a/support/what_can_i_expect.rst +++ b/support/what_can_i_expect.rst @@ -1,4 +1,4 @@ -.. :banner: banners/support.jpg +.. :banner: banners/support.png .. _support-expectations: diff --git a/support/where_can_i_get_support.rst b/support/where_can_i_get_support.rst index 7d6c3abed..707af9d51 100644 --- a/support/where_can_i_get_support.rst +++ b/support/where_can_i_get_support.rst @@ -1,4 +1,4 @@ -.. :banner: banners/support.jpg +.. :banner: banners/support.png =================== diff --git a/website.rst b/website.rst index 8c1f9bac3..53b3b0d50 100644 --- a/website.rst +++ b/website.rst @@ -1,4 +1,4 @@ -:banner: banners/seo.jpg +:banner: banners/seo.png ======= Website diff --git a/website/publish/domain_name.rst b/website/publish/domain_name.rst index 8f000d9e0..46022ff55 100644 --- a/website/publish/domain_name.rst +++ b/website/publish/domain_name.rst @@ -94,6 +94,21 @@ In order to get this, simply add your domain name in your customer portal (a sep If you already use CloudFlare or a similar service, you can keep using it or simply change for Odoo. The choice is yours. + +How to make sure that all my URLs use my custom domain? +======================================================= + +To set up the root URL of your website and of all the links sent in emails, you can ask an administrator of your database (any user in the *Settings* group) to perform a login from the login screen. It's as simple as that! + +If you want to do it manually, you can go to :menuselection:`Settings --> Technical --> System Parameters` . +Find the entry called ``web.base.url`` (you can create it if it does not exist) and enter the full URL of your website, like ``https://www.myodoowebsite.com``. + +.. warning:: + The URL must include the protocol (``https://`` or ``http://``) and must not end by a slash (``/``). + +If you want to block the root URL update when an administrator logs in, you can add a System Parameter called ``web.base.url.freeze`` with its value set to ``True``. + + My website is indexed twice by Google =====================================