From 14b8ae3a8ace265146673fdd972d874f9df87c2b Mon Sep 17 00:00:00 2001 From: Lau-Odoo <46811180+Lau-Odoo@users.noreply.github.com> Date: Thu, 16 Jan 2020 14:37:26 +0100 Subject: [PATCH 1/4] [IMP] pos: new titles for each section (#528) --- point_of_sale/advanced_pricing_features.rst | 6 +++--- point_of_sale/belgian_fdm.rst | 6 +++--- point_of_sale/restaurant.rst | 6 +++--- point_of_sale/shop.rst | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/point_of_sale/advanced_pricing_features.rst b/point_of_sale/advanced_pricing_features.rst index 9411d9544..397059135 100644 --- a/point_of_sale/advanced_pricing_features.rst +++ b/point_of_sale/advanced_pricing_features.rst @@ -1,6 +1,6 @@ -========================= -Advanced Pricing Features -========================= +================ +Pricing Features +================ .. toctree:: :titlesonly: diff --git a/point_of_sale/belgian_fdm.rst b/point_of_sale/belgian_fdm.rst index c4d093e91..060955d12 100644 --- a/point_of_sale/belgian_fdm.rst +++ b/point_of_sale/belgian_fdm.rst @@ -1,6 +1,6 @@ -========================== -Belgian Fiscal Data Module -========================== +=================== +Fiscal Data Modules +=================== .. toctree:: :titlesonly: diff --git a/point_of_sale/restaurant.rst b/point_of_sale/restaurant.rst index 218bd97b5..b2c99e4fc 100644 --- a/point_of_sale/restaurant.rst +++ b/point_of_sale/restaurant.rst @@ -1,6 +1,6 @@ -============================ -Advanced Restaurant Features -============================ +=================== +Restaurant Features +=================== .. toctree:: :titlesonly: diff --git a/point_of_sale/shop.rst b/point_of_sale/shop.rst index 376808c24..2a08cb277 100644 --- a/point_of_sale/shop.rst +++ b/point_of_sale/shop.rst @@ -1,6 +1,6 @@ -====================== -Advanced Shop Features -====================== +============= +Shop Features +============= .. toctree:: :titlesonly: From b08d95f49567a3f901e5bf51a3a1c9d60a874351 Mon Sep 17 00:00:00 2001 From: Jonathan <46810843+RamblingFiddler@users.noreply.github.com> Date: Mon, 20 Jan 2020 14:18:42 +0100 Subject: [PATCH 2/4] [FIX] accounting: correct a small mistake in Deferred Expenses and Deferred Revenues (#530) --- accounting/payables/supplier_bills/deferred_expenses.rst | 2 +- accounting/receivables/customer_invoices/deferred_revenues.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accounting/payables/supplier_bills/deferred_expenses.rst b/accounting/payables/supplier_bills/deferred_expenses.rst index bb07bc092..624d559fa 100644 --- a/accounting/payables/supplier_bills/deferred_expenses.rst +++ b/accounting/payables/supplier_bills/deferred_expenses.rst @@ -186,7 +186,7 @@ You have three choices for the **Automate Deferred Expense** field: .. tip:: You can, for example, select this account as the default **Expense Account** of a product to - fully automate its sale completely. (see: `Choose a different Expense Account for specific + fully automate its purchase. (see: `Choose a different Expense Account for specific products`_). .. seealso:: diff --git a/accounting/receivables/customer_invoices/deferred_revenues.rst b/accounting/receivables/customer_invoices/deferred_revenues.rst index 66ca40bc3..4ab3d7689 100644 --- a/accounting/receivables/customer_invoices/deferred_revenues.rst +++ b/accounting/receivables/customer_invoices/deferred_revenues.rst @@ -186,7 +186,7 @@ You have three choices for the **Automate Deferred Revenue** field: .. tip:: You can, for example, select this account as the default **Income Account** of a product to fully - automate its sale completely. (see: `Choose a different Income Account for specific products`_). + automate its sale. (see: `Choose a different Income Account for specific products`_). .. seealso:: * :doc:`../../others/configuration/account_type` From f37934ab0233beeaf1aae7e6c68dd76072f73a16 Mon Sep 17 00:00:00 2001 From: KBR <57449423+kbr-odoo@users.noreply.github.com> Date: Fri, 24 Jan 2020 14:06:29 +0100 Subject: [PATCH 3/4] [IMP] discuss: add note about config of outbound servers (#534) --- discuss/email_servers.rst | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/discuss/email_servers.rst b/discuss/email_servers.rst index 063dc1a46..fb7a20d7c 100644 --- a/discuss/email_servers.rst +++ b/discuss/email_servers.rst @@ -2,7 +2,7 @@ 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 +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 `__. @@ -22,9 +22,8 @@ information on how to integrate your own email solution with Odoo. How to manage outbound messages =============================== - -As a system admin, go to :menuselection:`Settings --> General Settings` -and check *External Email Servers*. +As a system admin, go to :menuselection:`Settings --> General Settings` +and check *External Email Servers*. Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*. @@ -35,6 +34,14 @@ Here is a typical configuration for a G Suite server. Then set your email domain name in the General Settings. +.. note:: + If you get a ``[AUTHENTICATIONFAILED] Invalid credentials (Failure)`` warning when you *Test + Connection* on a Gmail address, activate the *Less secure app access* option. A direct link can + be `accessed here `_. + + In addition to that, enable the IMAP setting on your Gmail account. + + Can I use an Office 365 server ------------------------------ You can use an Office 365 server if you run Odoo on-premise. From fd3c2bcd7b6b4cde9cf35aab1f39cca81a54f457 Mon Sep 17 00:00:00 2001 From: Lau-Odoo <46811180+Lau-Odoo@users.noreply.github.com> Date: Mon, 27 Jan 2020 10:58:20 +0100 Subject: [PATCH 4/4] [REV] pos: revert doc about ingenico and six as they only exist since 13.0 (#529) --- point_of_sale/payment.rst | 2 - point_of_sale/payment/ingenico.rst | 89 ------------------------ point_of_sale/payment/six.rst | 107 ----------------------------- 3 files changed, 198 deletions(-) delete mode 100644 point_of_sale/payment/ingenico.rst delete mode 100644 point_of_sale/payment/six.rst diff --git a/point_of_sale/payment.rst b/point_of_sale/payment.rst index 14c8d4d09..420509043 100644 --- a/point_of_sale/payment.rst +++ b/point_of_sale/payment.rst @@ -5,6 +5,4 @@ Payment Terminals .. toctree:: :titlesonly: - payment/ingenico payment/vantiv - payment/six diff --git a/point_of_sale/payment/ingenico.rst b/point_of_sale/payment/ingenico.rst deleted file mode 100644 index a7d6e318a..000000000 --- a/point_of_sale/payment/ingenico.rst +++ /dev/null @@ -1,89 +0,0 @@ -================================================ -Connect an Ingenico Payment Terminal to your PoS -================================================ - -Connecting a payment terminal allows you to offer a fluid payment flow -to your customers and ease the work of your cashiers. - -Please note that Ingenico is currently only available for customers in the -Benelux. - -Configuration -============= - -Connect a Payment Terminal --------------------------- - -Connecting an Ingenico Payment Terminal to Odoo is a feature that -requires an IoT Box. For more information on how to connect an IoT Box -to your database, please refer to `this -documentation `__. - -Once the IoT Box is up and running, you’ll need to link your payment -terminal to your PoS. Open the Point of Sale app and go to *Configuration -> Point of Sale*. Select a PoS, tick the IoT Box Device option and select -your payment terminal. - -.. image:: media/payment_terminal_01.png - :align: center - -Configure the Lane/5000 for Ingenico BENELUX --------------------------------------------- - -Click on the F button of the terminal, then go in the *PoS Menu* > -settings menu and enter the settings password. - -Now, click on connexion change and TCP/IP. Type the IP of your *IoT -Box* (you can find it on the form view of your IoT Box). Then, enter -9000 as port. The terminal will restart. Once it is done, go on your -*IoT Box* form in Odoo and verify that the terminal has been found. - -.. image:: media/payment_terminal_02.png - :align: center - -Configure the payment method ----------------------------- - -First, go in the general settings of the POS app, and activate the -Ingenico setting. - -.. image:: media/payment_terminal_03.png - :align: center - -Go back in *Point of Sale > Configuration > Point of Sale*, go in the -payments section and access your payment methods. Create a new payment -method for Ingenico, select the payment terminal option Ingenico, and -select your payment terminal device. - -.. image:: media/payment_terminal_04.png - :align: center - -Pay with a payment terminal -=========================== - -In your *PoS interface*, when processing a payment, select a *Payment -Method* using a payment terminal. Check that the amount in the tendered -column is the one that has to be sent to the payment terminal and click -on *Send*. When the payment is successful, the status will change to -*Payment Successful*. - -.. image:: media/payment_terminal_05.png - :align: center - -If you want to cancel the payment request, click on cancel. You can -still retry to send the payment request. - -If there is any issue with the payment terminal, you can still force the -payment using the *Force Done*. This will allow you to validate the -order in Odoo even if the connexion between the terminal and Odoo has -issues. - -.. note:: - This option will only be available if you received an error message - telling you the connexion failed. - -Once your payment is processed, on the payment record, you’ll find the -type of card that has been used and the transaction ID. - -.. image:: media/payment_terminal_06.png - :align: center diff --git a/point_of_sale/payment/six.rst b/point_of_sale/payment/six.rst deleted file mode 100644 index 493da0f2b..000000000 --- a/point_of_sale/payment/six.rst +++ /dev/null @@ -1,107 +0,0 @@ -================================= -Connect SIX/Worldline to your PoS -================================= - -Connecting a SIX/Worldline payment terminal allows you to offer a fluid -payment flow to your customers and ease the work of your cashiers. - -.. note:: - Please note SIX/Worldine is currently only available for UE customers. - -Configuration -============= - -Connect a Payment Terminal --------------------------- - -Connecting a SIX/Worldline Payment Terminal to Odoo is a feature that -requires an IoT Box. For more information on how to connect an IoT Box -to your database, please refer to `this documentation -`__. - -Once the *IoT Box* is up and running, you’ll need to link it to your -PoS. Open the Point of Sale app and go to *Configuration > Point of -Sale*. Select a PoS, tick the IoT Box Device option and select your -payment terminal. - -.. image:: media/six_01.png - :align: center - -Then go to your *IoT Box homepage* (accessible from the IoT Box form -view in Odoo) and enter the ID of your Six payment terminal. - -.. image:: media/six_02.png - :align: center - -You should now see that the terminal is connected to your IoT Box (it -takes +/- 1 min). - -.. image:: media/six_03.png - :align: center - -.. tip:: - The terminal should only be connected to the network with the Ethernet. - Do not connect it to the IoT Box with a USB Cable. - -Configure the Payment Method ----------------------------- - -First, go in the general settings of the POS app, and activate the SIX -setting. - -.. image:: media/six_04.png - :align: center - -Back in *Point of Sale > Configuration > Point of Sale*, go in the -payments section and access your payment methods. Create a new payment -method for SIX, select the payment terminal option SIX, and select your -payment terminal device. - -.. image:: media/six_05.png - :align: center - -Pay with a Payment Terminal -=========================== - -In your PoS interface, at the moment of the payment, select a payment -method using a payment terminal. Verify that the amount in the tendered -column is the one that has to be sent to the payment terminal and click -on *Send*. If you want to cancel the payment request, click on cancel. - -.. image:: media/six_06.png - :align: center - -When the payment is done, the status will change to *Payment -Successful*. You can always reverse the last transaction by clicking on -*Reverse*. - -.. image:: media/six_07.png - :align: center - -If there is any issue with the payment terminal, you can still force the -payment using the *Force Done*. This will allow you to validate the -order in Odoo even if the connexion between the terminal and Odoo -encounters issues. - -Close your Session -================== - -At the end of the day, before closing your session, you need to send the -balance of the payments to SIX. To do that, click on this button. - -.. image:: media/six_08.png - :align: center - -Once the balance has been sent, the SIX shift is closed, meaning you -cannot do additional operations with the SIX payment terminal (except if -you reopen a shift by clicking on the user name and selecting a -cashier). - -.. image:: media/six_09.png - :align: center - -Once your payment is processed, on the payment record, you’ll find the -type of card that has been used and the transaction ID. - -.. image:: media/six_10.png - :align: center \ No newline at end of file