diff --git a/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png deleted file mode 100644 index daa792ca1cd..00000000000 Binary files a/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png and /dev/null differ diff --git a/erpnext/docs/assets/img/setup/integration-service/__init__.py b/erpnext/docs/assets/img/setup/integrations/__init__.py similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/__init__.py rename to erpnext/docs/assets/img/setup/integrations/__init__.py diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-1.png b/erpnext/docs/assets/img/setup/integrations/api-step-1.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/api-step-1.png rename to erpnext/docs/assets/img/setup/integrations/api-step-1.png diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-2.png b/erpnext/docs/assets/img/setup/integrations/api-step-2.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/api-step-2.png rename to erpnext/docs/assets/img/setup/integrations/api-step-2.png diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-3.png b/erpnext/docs/assets/img/setup/integrations/api-step-3.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/api-step-3.png rename to erpnext/docs/assets/img/setup/integrations/api-step-3.png diff --git a/erpnext/docs/assets/img/setup/integration-service/dropbox-2.png b/erpnext/docs/assets/img/setup/integrations/dropbox-2.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/dropbox-2.png rename to erpnext/docs/assets/img/setup/integrations/dropbox-2.png diff --git a/erpnext/docs/assets/img/setup/integration-service/dropbox-3.png b/erpnext/docs/assets/img/setup/integrations/dropbox-3.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/dropbox-3.png rename to erpnext/docs/assets/img/setup/integrations/dropbox-3.png diff --git a/erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png b/erpnext/docs/assets/img/setup/integrations/dropbox-open-1.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png rename to erpnext/docs/assets/img/setup/integrations/dropbox-open-1.png diff --git a/erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png b/erpnext/docs/assets/img/setup/integrations/dropbox-open-2.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png rename to erpnext/docs/assets/img/setup/integrations/dropbox-open-2.png diff --git a/erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png b/erpnext/docs/assets/img/setup/integrations/dropbox-open-3.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png rename to erpnext/docs/assets/img/setup/integrations/dropbox-open-3.png diff --git a/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png b/erpnext/docs/assets/img/setup/integrations/ldap_settings.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/ldap_settings.png rename to erpnext/docs/assets/img/setup/integrations/ldap_settings.png diff --git a/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png b/erpnext/docs/assets/img/setup/integrations/login_via_ldap.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png rename to erpnext/docs/assets/img/setup/integrations/login_via_ldap.png diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png b/erpnext/docs/assets/img/setup/integrations/payment_gateway_account_paypal.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png rename to erpnext/docs/assets/img/setup/integrations/payment_gateway_account_paypal.png diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png b/erpnext/docs/assets/img/setup/integrations/payment_gateway_account_razorpay.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png rename to erpnext/docs/assets/img/setup/integrations/payment_gateway_account_razorpay.png diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png b/erpnext/docs/assets/img/setup/integrations/paypal_coa.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/paypal_coa.png rename to erpnext/docs/assets/img/setup/integrations/paypal_coa.png diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png b/erpnext/docs/assets/img/setup/integrations/paypal_settings.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/paypal_settings.png rename to erpnext/docs/assets/img/setup/integrations/paypal_settings.png diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png b/erpnext/docs/assets/img/setup/integrations/razorpay_coa.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png rename to erpnext/docs/assets/img/setup/integrations/razorpay_coa.png diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png b/erpnext/docs/assets/img/setup/integrations/razorpay_settings.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png rename to erpnext/docs/assets/img/setup/integrations/razorpay_settings.png diff --git a/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png b/erpnext/docs/assets/img/setup/integrations/sanbox-credentials.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png rename to erpnext/docs/assets/img/setup/integrations/sanbox-credentials.png diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png b/erpnext/docs/assets/img/setup/integrations/setup-backup-frequency.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png rename to erpnext/docs/assets/img/setup/integrations/setup-backup-frequency.png diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png b/erpnext/docs/assets/img/setup/integrations/setup-sanbox-1.png similarity index 100% rename from erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png rename to erpnext/docs/assets/img/setup/integrations/setup-sanbox-1.png diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md deleted file mode 100644 index e12ed1ceb4c..00000000000 --- a/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md +++ /dev/null @@ -1,24 +0,0 @@ -#Setting up LDAP - -Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations. - -By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials. - -####Step 1: Create LDAP service - -`Explore > Setup > Integration Service` - -Make a new Integration Service and select `LDAP` as a service from dropdown then save the document. -After saving a document, click on `LDAP Settings` button, to setup service. - -####Step 2: Setup LDAP service - -To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN - -LDAP Settings - -####Step 3: Enable Service -After setting up credentials on LDAP Settings, go back to LDAP Service record and enable it. -While enabling, it will validate LDAP details and on successful validation, it will enables LDAP login option. - -LOGIN via LDAP diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py b/erpnext/docs/user/manual/en/setting-up/integrations/__init__.py similarity index 100% rename from erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py rename to erpnext/docs/user/manual/en/setting-up/integrations/__init__.py diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md similarity index 56% rename from erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md rename to erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md index 7fc283b2abf..9d8554ee47f 100644 --- a/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md @@ -1,45 +1,33 @@ #Setting Up Dropbox Backups -We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well. +We always recommend customers to maintain backup of their data in ERPNext. The database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well. You can automate database backup download of your ERPNext account into your Dropbox account. -####Step 1: Create Dropbox service +To setup Dropbox Backup, +`Explore > Integrations > Dropbox Settings` -`Explore > Setup > Integration Service` - -Make a new Integration Service and select `Dropbox` as a service from dropdown then save the document. - -####Step 2: Activate - -After saving a document, click on `Dropbox Settings` button, to setup service. - -create dropbox service - -####Step 3: Set Frequency +####Step 1: Set Frequency Set Frequency to download backup in your Dropbox account. -set frequency +set frequency -####Step 4: Allow Dropbox Access +####Step 2: Allow Dropbox Access After setting frequency and updating other details, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account. -####Step 5: Login to Dropbox +####Step 3: Login to Dropbox Login to your Dropbox account by entering login credentials. -Login +Login -####Step 6: Allow +####Step 4: Allow -On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account. +On successful login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account. -Allow - -####Step 7: Enable Service -After generating access token, go back to Dropbox Integration Service record and check `enable`. This will enable backup auto-download. +Allow With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it. @@ -51,14 +39,14 @@ With this, a folder called "ERPNext" will be created in your Dropbox account, an ####Step 2:Create a new app -Create new +Create new ####Step 3: Fill in details for the app -Create new +Create new - -Create new +Create new ####Step 4: Settings in Site Config diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.md b/erpnext/docs/user/manual/en/setting-up/integrations/index.md similarity index 100% rename from erpnext/docs/user/manual/en/setting-up/integration-services/index.md rename to erpnext/docs/user/manual/en/setting-up/integrations/index.md diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt b/erpnext/docs/user/manual/en/setting-up/integrations/index.txt similarity index 77% rename from erpnext/docs/user/manual/en/setting-up/integration-services/index.txt rename to erpnext/docs/user/manual/en/setting-up/integrations/index.txt index fc5e8a46a4f..da85ac42314 100644 --- a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt +++ b/erpnext/docs/user/manual/en/setting-up/integrations/index.txt @@ -1,4 +1,4 @@ -dropbox-backup paypal-integration razorpay-integration +dropbox-backup ldap-integration \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md new file mode 100644 index 00000000000..ec6e8487b18 --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md @@ -0,0 +1,19 @@ +#Setting up LDAP + +Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations. + +By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials. + +To setup LDAP, +`Explore > Integrations > LDAP Settings` + +#### Setup LDAP + +To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN + +LDAP Settings + + +After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option. + +LOGIN via LDAP diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md similarity index 68% rename from erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md rename to erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md index d1054ba54aa..314eb64a9d4 100644 --- a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md @@ -4,30 +4,24 @@ A payment gateway is an e-commerce application service provider service that aut A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank. -####Step 1: Create PayPal service +To setup PayPal , +`Explore > Integrations > PayPal Settings` -`Explore > Setup > Integration Service` - -Make a new Integration Service and select `PayPal` as a service from dropdown then save the document. -After saving a document, click on `PayPal Settings` button, to setup service. - -####Step 2: Setup payment service +#### Setup PayPal To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature. -PayPal Settings +PayPal Settings You also can set test payment environment, by settings `Use Sandbox` -####Step 3: Enable Service -After setting up credentials on PayPal Settings, go back to PayPal Service record and enable it. -On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank. +On enabling service, the system will create Payment Gateway record and Account head in chart of accounts having account type as Bank. -PayPal COA +PayPal COA Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments. @@ -39,20 +33,20 @@ AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP, #### Paypal Sanbox API Signature - Login to paypal developer account, PayPal Developer Account - From **Accounts** tab. create a new business account. -Payment Request +Payment Request - From this account profile you will get your sandbox api credentials -Payment Request +Payment Request --- #### PayPal Account API Signature - Login to PayPal Account and go to profile -Payment Request +Payment Request - From **My Selling Tools** go to **api Access** -Payment Request +Payment Request - On API Access Page, choose option 2 to generate API credentials -Payment Request +Payment Request diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md similarity index 62% rename from erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md rename to erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md index ad43f632734..09cd9114c41 100644 --- a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md @@ -4,28 +4,21 @@ A payment gateway is an e-commerce application service provider service that aut A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank. -####Step 1: Create Razorpay service +To setup Razorpay, +`Explore > Integrations > Razorpay Settings` -`Explore > Setup > Integration Service` +#### Setup Razorpay -Make a new Integration Service and select `Razorpay` as a service from dropdown then save the document. -After saving a document, click on `Razorpay Settings` button, to setup service. +To enable Razorpay payment service, you need to configure parameters like API Key, API Secret +Razorpay Settings -####Step 2: Setup payment service - -To enable Razorpay payment service, you need to configure parameters like API Username, API Password and Signature. - -Razorpay Settings - -####Step 3: Enable Service -After setting up credentials on Razorpay Settings, go back to Razorpay Service record and enable it. On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank. -Razorpay COA +Razorpay COA Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments.