diff --git a/content/applications/finance.rst b/content/applications/finance.rst index b9efceb44..494aa6fca 100644 --- a/content/applications/finance.rst +++ b/content/applications/finance.rst @@ -10,3 +10,4 @@ Finance finance/accounting finance/expenses finance/sign + finance/payment_acquirers diff --git a/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst b/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst index cd244c9aa..808fafada 100644 --- a/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst +++ b/content/applications/finance/accounting/receivables/customer_payments/online_payment.rst @@ -17,7 +17,7 @@ Configuration Make sure your :ref:`Payment Acquirers are correctly configured `. .. note:: - By default, ":doc:`Wire Transfer `" is the only + By default, ":doc:`Wire Transfer `" is the only Payment Acquirer activated, but you still have to fill out the payment details. To activate the Invoice Online Payment, go to :menuselection:`Accounting --> Configuration --> @@ -42,4 +42,4 @@ They can choose which Payment Acquirer to use by clicking on *Pay Now*. .. seealso:: - - :doc:`/applications/general/payment_acquirers` + - :doc:`/applications/finance/payment_acquirers` diff --git a/content/applications/general/payment_acquirers.rst b/content/applications/finance/payment_acquirers.rst similarity index 100% rename from content/applications/general/payment_acquirers.rst rename to content/applications/finance/payment_acquirers.rst diff --git a/content/applications/general/payment_acquirers/activation.png b/content/applications/finance/payment_acquirers/activation.png similarity index 100% rename from content/applications/general/payment_acquirers/activation.png rename to content/applications/finance/payment_acquirers/activation.png diff --git a/content/applications/general/payment_acquirers/authorize.rst b/content/applications/finance/payment_acquirers/authorize.rst similarity index 100% rename from content/applications/general/payment_acquirers/authorize.rst rename to content/applications/finance/payment_acquirers/authorize.rst diff --git a/content/applications/general/payment_acquirers/media/authorize-api-keys.png b/content/applications/finance/payment_acquirers/media/authorize-api-keys.png similarity index 100% rename from content/applications/general/payment_acquirers/media/authorize-api-keys.png rename to content/applications/finance/payment_acquirers/media/authorize-api-keys.png diff --git a/content/applications/general/payment_acquirers/media/authorize-capture.png b/content/applications/finance/payment_acquirers/media/authorize-capture.png similarity index 100% rename from content/applications/general/payment_acquirers/media/authorize-capture.png rename to content/applications/finance/payment_acquirers/media/authorize-capture.png diff --git a/content/applications/general/payment_acquirers/media/authorize-configuration.png b/content/applications/finance/payment_acquirers/media/authorize-configuration.png similarity index 100% rename from content/applications/general/payment_acquirers/media/authorize-configuration.png rename to content/applications/finance/payment_acquirers/media/authorize-configuration.png diff --git a/content/applications/general/payment_acquirers/media/authorize-credentials.png b/content/applications/finance/payment_acquirers/media/authorize-credentials.png similarity index 100% rename from content/applications/general/payment_acquirers/media/authorize-credentials.png rename to content/applications/finance/payment_acquirers/media/authorize-credentials.png diff --git a/content/applications/general/payment_acquirers/media/authorize-net.png b/content/applications/finance/payment_acquirers/media/authorize-net.png similarity index 100% rename from content/applications/general/payment_acquirers/media/authorize-net.png rename to content/applications/finance/payment_acquirers/media/authorize-net.png diff --git a/content/applications/general/payment_acquirers/media/payment_check.png b/content/applications/finance/payment_acquirers/media/payment_check.png similarity index 100% rename from content/applications/general/payment_acquirers/media/payment_check.png rename to content/applications/finance/payment_acquirers/media/payment_check.png diff --git a/content/applications/general/payment_acquirers/media/payment_customer_instructions.png b/content/applications/finance/payment_acquirers/media/payment_customer_instructions.png similarity index 100% rename from content/applications/general/payment_acquirers/media/payment_customer_instructions.png rename to content/applications/finance/payment_acquirers/media/payment_customer_instructions.png diff --git a/content/applications/general/payment_acquirers/media/payment_instructions.png b/content/applications/finance/payment_acquirers/media/payment_instructions.png similarity index 100% rename from content/applications/general/payment_acquirers/media/payment_instructions.png rename to content/applications/finance/payment_acquirers/media/payment_instructions.png diff --git a/content/applications/general/payment_acquirers/media/paypal01.png b/content/applications/finance/payment_acquirers/media/paypal01.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal01.png rename to content/applications/finance/payment_acquirers/media/paypal01.png diff --git a/content/applications/general/payment_acquirers/media/paypal02.png b/content/applications/finance/payment_acquirers/media/paypal02.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal02.png rename to content/applications/finance/payment_acquirers/media/paypal02.png diff --git a/content/applications/general/payment_acquirers/media/paypal03.png b/content/applications/finance/payment_acquirers/media/paypal03.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal03.png rename to content/applications/finance/payment_acquirers/media/paypal03.png diff --git a/content/applications/general/payment_acquirers/media/paypal04.png b/content/applications/finance/payment_acquirers/media/paypal04.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal04.png rename to content/applications/finance/payment_acquirers/media/paypal04.png diff --git a/content/applications/general/payment_acquirers/media/paypal05.png b/content/applications/finance/payment_acquirers/media/paypal05.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal05.png rename to content/applications/finance/payment_acquirers/media/paypal05.png diff --git a/content/applications/general/payment_acquirers/media/paypal07.png b/content/applications/finance/payment_acquirers/media/paypal07.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal07.png rename to content/applications/finance/payment_acquirers/media/paypal07.png diff --git a/content/applications/general/payment_acquirers/media/paypal08.png b/content/applications/finance/payment_acquirers/media/paypal08.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal08.png rename to content/applications/finance/payment_acquirers/media/paypal08.png diff --git a/content/applications/general/payment_acquirers/media/paypal09.png b/content/applications/finance/payment_acquirers/media/paypal09.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal09.png rename to content/applications/finance/payment_acquirers/media/paypal09.png diff --git a/content/applications/general/payment_acquirers/media/paypal10.png b/content/applications/finance/payment_acquirers/media/paypal10.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal10.png rename to content/applications/finance/payment_acquirers/media/paypal10.png diff --git a/content/applications/general/payment_acquirers/media/paypal11.png b/content/applications/finance/payment_acquirers/media/paypal11.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal11.png rename to content/applications/finance/payment_acquirers/media/paypal11.png diff --git a/content/applications/general/payment_acquirers/media/paypal12.png b/content/applications/finance/payment_acquirers/media/paypal12.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal12.png rename to content/applications/finance/payment_acquirers/media/paypal12.png diff --git a/content/applications/general/payment_acquirers/media/paypal13.png b/content/applications/finance/payment_acquirers/media/paypal13.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal13.png rename to content/applications/finance/payment_acquirers/media/paypal13.png diff --git a/content/applications/general/payment_acquirers/media/paypal_account_optional.png b/content/applications/finance/payment_acquirers/media/paypal_account_optional.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_account_optional.png rename to content/applications/finance/payment_acquirers/media/paypal_account_optional.png diff --git a/content/applications/general/payment_acquirers/media/paypal_auto_return.png b/content/applications/finance/payment_acquirers/media/paypal_auto_return.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_auto_return.png rename to content/applications/finance/payment_acquirers/media/paypal_auto_return.png diff --git a/content/applications/general/payment_acquirers/media/paypal_credentials.png b/content/applications/finance/payment_acquirers/media/paypal_credentials.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_credentials.png rename to content/applications/finance/payment_acquirers/media/paypal_credentials.png diff --git a/content/applications/general/payment_acquirers/media/paypal_data_transfer.png b/content/applications/finance/payment_acquirers/media/paypal_data_transfer.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_data_transfer.png rename to content/applications/finance/payment_acquirers/media/paypal_data_transfer.png diff --git a/content/applications/general/payment_acquirers/media/paypal_debug.png b/content/applications/finance/payment_acquirers/media/paypal_debug.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_debug.png rename to content/applications/finance/payment_acquirers/media/paypal_debug.png diff --git a/content/applications/general/payment_acquirers/media/paypal_encoding_options.png b/content/applications/finance/payment_acquirers/media/paypal_encoding_options.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_encoding_options.png rename to content/applications/finance/payment_acquirers/media/paypal_encoding_options.png diff --git a/content/applications/general/payment_acquirers/media/paypal_fees.png b/content/applications/finance/payment_acquirers/media/paypal_fees.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_fees.png rename to content/applications/finance/payment_acquirers/media/paypal_fees.png diff --git a/content/applications/general/payment_acquirers/media/paypal_identity_token.png b/content/applications/finance/payment_acquirers/media/paypal_identity_token.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_identity_token.png rename to content/applications/finance/payment_acquirers/media/paypal_identity_token.png diff --git a/content/applications/general/payment_acquirers/media/paypal_ipn.png b/content/applications/finance/payment_acquirers/media/paypal_ipn.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_ipn.png rename to content/applications/finance/payment_acquirers/media/paypal_ipn.png diff --git a/content/applications/general/payment_acquirers/media/paypal_ipn_setup.png b/content/applications/finance/payment_acquirers/media/paypal_ipn_setup.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_ipn_setup.png rename to content/applications/finance/payment_acquirers/media/paypal_ipn_setup.png diff --git a/content/applications/general/payment_acquirers/media/paypal_live.png b/content/applications/finance/payment_acquirers/media/paypal_live.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_live.png rename to content/applications/finance/payment_acquirers/media/paypal_live.png diff --git a/content/applications/general/payment_acquirers/media/paypal_more_options.png b/content/applications/finance/payment_acquirers/media/paypal_more_options.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_more_options.png rename to content/applications/finance/payment_acquirers/media/paypal_more_options.png diff --git a/content/applications/general/payment_acquirers/media/paypal_profile.png b/content/applications/finance/payment_acquirers/media/paypal_profile.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_profile.png rename to content/applications/finance/payment_acquirers/media/paypal_profile.png diff --git a/content/applications/general/payment_acquirers/media/paypal_selling_tools.png b/content/applications/finance/payment_acquirers/media/paypal_selling_tools.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_selling_tools.png rename to content/applications/finance/payment_acquirers/media/paypal_selling_tools.png diff --git a/content/applications/general/payment_acquirers/media/paypal_website_preferences.png b/content/applications/finance/payment_acquirers/media/paypal_website_preferences.png similarity index 100% rename from content/applications/general/payment_acquirers/media/paypal_website_preferences.png rename to content/applications/finance/payment_acquirers/media/paypal_website_preferences.png diff --git a/content/applications/general/payment_acquirers/media/stripe_enable_local_payment_method.png b/content/applications/finance/payment_acquirers/media/stripe_enable_local_payment_method.png old mode 100755 new mode 100644 similarity index 100% rename from content/applications/general/payment_acquirers/media/stripe_enable_local_payment_method.png rename to content/applications/finance/payment_acquirers/media/stripe_enable_local_payment_method.png diff --git a/content/applications/general/payment_acquirers/online-payment.png b/content/applications/finance/payment_acquirers/online-payment.png similarity index 100% rename from content/applications/general/payment_acquirers/online-payment.png rename to content/applications/finance/payment_acquirers/online-payment.png diff --git a/content/applications/general/payment_acquirers/paypal.rst b/content/applications/finance/payment_acquirers/paypal.rst similarity index 100% rename from content/applications/general/payment_acquirers/paypal.rst rename to content/applications/finance/payment_acquirers/paypal.rst diff --git a/content/applications/general/payment_acquirers/stripe.rst b/content/applications/finance/payment_acquirers/stripe.rst similarity index 100% rename from content/applications/general/payment_acquirers/stripe.rst rename to content/applications/finance/payment_acquirers/stripe.rst diff --git a/content/applications/general/payment_acquirers/wire_transfer.rst b/content/applications/finance/payment_acquirers/wire_transfer.rst similarity index 100% rename from content/applications/general/payment_acquirers/wire_transfer.rst rename to content/applications/finance/payment_acquirers/wire_transfer.rst diff --git a/content/applications/general.rst b/content/applications/general.rst index 5fb27a42f..82c309920 100644 --- a/content/applications/general.rst +++ b/content/applications/general.rst @@ -8,7 +8,6 @@ Miscellaneous general/auth general/apps_modules general/export_import_data - general/payment_acquirers general/voip general/in_app_purchase general/developer_mode diff --git a/content/applications/marketing/events/overview/tickets.rst b/content/applications/marketing/events/overview/tickets.rst index 43d827d08..c8021fdea 100644 --- a/content/applications/marketing/events/overview/tickets.rst +++ b/content/applications/marketing/events/overview/tickets.rst @@ -50,4 +50,4 @@ among the payment methods you chose to have available. :alt: View of website transaction for Odoo Events .. seealso:: - - :doc:`/applications/general/payment_acquirers` + - :doc:`/applications/finance/payment_acquirers` diff --git a/content/applications/sales/sales/send_quotations/get_paid_to_validate.rst b/content/applications/sales/sales/send_quotations/get_paid_to_validate.rst index 41759013e..2702f8013 100644 --- a/content/applications/sales/sales/send_quotations/get_paid_to_validate.rst +++ b/content/applications/sales/sales/send_quotations/get_paid_to_validate.rst @@ -22,9 +22,9 @@ feature. 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:`/applications/general/payment_acquirers/paypal`, -:doc:`/applications/general/payment_acquirers/authorize`, and others in the -:doc:`/applications/general/payment_acquirers` documentation. +:doc:`/applications/finance/payment_acquirers/paypal`, +:doc:`/applications/finance/payment_acquirers/authorize`, and others in the +:doc:`/applications/finance/payment_acquirers` documentation. .. note:: If you are familiar with this documentation: :doc:`quote_template`; you @@ -48,8 +48,8 @@ possibilities to make their online payments. For example: .. seealso:: - :doc:`quote_template` - - :doc:`/applications/general/payment_acquirers` - - :doc:`/applications/general/payment_acquirers/paypal` - - :doc:`/applications/general/payment_acquirers/authorize` + - :doc:`/applications/finance/payment_acquirers` + - :doc:`/applications/finance/payment_acquirers/paypal` + - :doc:`/applications/finance/payment_acquirers/authorize` diff --git a/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst b/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst index fdd9e7fca..2dc9c4677 100644 --- a/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst +++ b/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst @@ -56,7 +56,7 @@ orders straight on. Select your **bank account** if you get paid immediately on your bank account. If you don't you can create a specific journal for the payment acquirer (type = Bank). That way, you can track online payments in an intermediary account of your books until you get paid into your bank - account (see :doc:`/applications/general/payment_acquirers`). + account (see :doc:`/applications/finance/payment_acquirers`). Capture the payment after the delivery diff --git a/redirects.txt b/redirects.txt index 7ca769154..bbf69b79d 100644 --- a/redirects.txt +++ b/redirects.txt @@ -185,10 +185,17 @@ helpdesk/reinvoice_from_project.rst applications/services/helpdesk/timesheet_and planning/duplicate_a_planning.rst applications/services/planning/overview/duplicate_a_planning.rst # (#567) planning/send_planned_shifts.rst applications/services/planning/overview/send_planned_shifts.rst # (#567) -ecommerce/shopper_experience/payment.rst applications/general/payment_acquirers/payment_acquirers.rst # ecommerce/shopper_experience/payment --> general/payment_acquirers/payment_acquirers -ecommerce/shopper_experience/authorize.rst applications/general/payment_acquirers/authorize.rst # ecommerce/shopper_experience/* --> general/payment_acquirers/* -ecommerce/shopper_experience/paypal.rst applications/general/payment_acquirers/paypal.rst # ecommerce/shopper_experience/* --> general/payment_acquirers/* -ecommerce/shopper_experience/wire_transfer.rst applications/general/payment_acquirers/wire_transfer.rst # ecommerce/shopper_experience/* --> general/payment_acquirers/* +# PAYMENT ACQUIRERS +ecommerce/shopper_experience/payment.rst applications/finance/payment_acquirers.rst # ecommerce/shopper_experience/payment --> finance/payment_acquirers/payment_acquirers +ecommerce/shopper_experience/authorize.rst applications/finance/payment_acquirers/authorize.rst # ecommerce/shopper_experience/* --> finance/payment_acquirers/* +ecommerce/shopper_experience/paypal.rst applications/finance/payment_acquirers/paypal.rst # ecommerce/shopper_experience/* --> finance/payment_acquirers/* +ecommerce/shopper_experience/wire_transfer.rst applications/finance/payment_acquirers/wire_transfer.rst # ecommerce/shopper_experience/* --> finance/payment_acquirers/* +applications/general/payment_acquirers/payment_acquirers.rst applications/finance/payment_acquirers.rst # general/payment_acquirers/payment_acquirers -> finance/payment_acquirers +applications/general/payment_acquirers.rst applications/finance/payment_acquirers.rst # general/payment_acquirers/* --> finance/payment_acquirers/* +applications/general/payment_acquirers/authorize.rst applications/finance/payment_acquirers/authorize.rst # general/payment_acquirers/* --> finance/payment_acquirers/* +applications/general/payment_acquirers/paypal.rst applications/finance/payment_acquirers/paypal.rst # general/payment_acquirers/* --> finance/payment_acquirers/* +applications/general/payment_acquirers/stripe.rst applications/finance/payment_acquirers/stripe.rst # general/payment_acquirers/* --> finance/payment_acquirers/* +applications/general/payment_acquirers/wire_transfer.rst applications/finance/payment_acquirers/wire_transfer.rst # general/payment_acquirers/* --> finance/payment_acquirers/* discuss/monitoring.rst applications/productivity/discuss/overview/get_started.rst # (#655) discuss/mentions.rst applications/productivity/discuss/overview/get_started.rst # (#655) @@ -205,7 +212,6 @@ general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst applications/general/in_app_purchase/in_app_purchase.rst applications/general/in_app_purchase.rst # in_app_purchase/in_app_purchase -> in_app_purchase applications/general/multi_companies/manage_multi_companies.rst applications/general/companies.rst # multi_companies/manage_multi_companies -> companies applications/general/multi_companies.rst applications/general/users/companies.rst # multi_companies -> companies -applications/general/payment_acquirers/payment_acquirers.rst applications/general/payment_acquirers.rst # payment_acquirers/payment_acquirers -> payment_acquirers applications/general/unsplash/unsplash_access_key.rst applications/websites/website/optimize/unsplash.rst # general/unsplash/unsplash_access_key -> general/unsplash applications/general/unsplash/unsplash_application_id.rst applications/websites/website/optimize/unsplash.rst # general/unsplash/unsplash_application_id -> general/unsplash applications/general/unsplash.rst applications/websites/website/optimize/unsplash.rst # general/unsplash -> websites/website/optimize/unsplash