diff --git a/erpnext/docs/assets/img/setup/integration-service/__init__.py b/erpnext/docs/assets/img/setup/integration-service/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-1.png b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png new file mode 100644 index 00000000000..d51434d7f2a Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-2.png b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png new file mode 100644 index 00000000000..f4dfa43a8e7 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-3.png b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png new file mode 100644 index 00000000000..070fdedf90e Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png differ 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 new file mode 100644 index 00000000000..daa792ca1cd Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png differ diff --git a/erpnext/docs/assets/img/setup/dropbox-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-2.png similarity index 100% rename from erpnext/docs/assets/img/setup/dropbox-2.png rename to erpnext/docs/assets/img/setup/integration-service/dropbox-2.png diff --git a/erpnext/docs/assets/img/setup/dropbox-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-3.png similarity index 100% rename from erpnext/docs/assets/img/setup/dropbox-3.png rename to erpnext/docs/assets/img/setup/integration-service/dropbox-3.png diff --git a/erpnext/docs/assets/img/setup/dropbox-open-1.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png similarity index 100% rename from erpnext/docs/assets/img/setup/dropbox-open-1.png rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png diff --git a/erpnext/docs/assets/img/setup/dropbox-open-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png similarity index 100% rename from erpnext/docs/assets/img/setup/dropbox-open-2.png rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png diff --git a/erpnext/docs/assets/img/setup/dropbox-open-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png similarity index 100% rename from erpnext/docs/assets/img/setup/dropbox-open-3.png rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png diff --git a/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png new file mode 100644 index 00000000000..c0ecbc7ea81 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png new file mode 100644 index 00000000000..15fd387c774 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png new file mode 100644 index 00000000000..e6f16650269 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png new file mode 100644 index 00000000000..e09e797dca3 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png new file mode 100644 index 00000000000..bf0ed1941f5 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png new file mode 100644 index 00000000000..f5f5e542c68 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png new file mode 100644 index 00000000000..68cad280d78 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png new file mode 100644 index 00000000000..042b4221c1a Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png new file mode 100644 index 00000000000..21e84602623 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png new file mode 100644 index 00000000000..916679e4775 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png differ diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png new file mode 100644 index 00000000000..932a62ab0df Binary files /dev/null and b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png differ diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html deleted file mode 100644 index ae9978aa418..00000000000 --- a/erpnext/docs/current/models/stock/material_request_item.html +++ /dev/null @@ -1,426 +0,0 @@ - - - - - - -
Table Name: tabMaterial Request Item
| Sr | -Fieldname | -Type | -Label | -Options | -
|---|---|---|---|---|
| 1 | -item_code |
- - Link | -- Item Code - - | -- - - - -Item - - - - | -
| 2 | -col_break1 |
- - Column Break | -- - - | -- |
| 3 | -item_name |
- - Data | -- Item Name - - | -- |
| 4 | -section_break_4 |
- - Section Break | -- Description - - | -- |
| 5 | -description |
- - Text Editor | -- Description - - | -- |
| 6 | -column_break_6 |
- - Column Break | -- - - | -- |
| 7 | -image |
- - Attach Image | -- Image - - | -- |
| 8 | -quantity_and_warehouse |
- - Section Break | -- Quantity and Warehouse - - | -- |
| 9 | -qty |
- - Float | -- Quantity - - | -- |
| 10 | -uom |
- - Link | -- Stock UOM - - | -- - - - -UOM - - - - | -
| 11 | -warehouse |
- - Link | -- For Warehouse - - | -- - - - -Warehouse - - - - | -
| 12 | -col_break2 |
- - Column Break | -- - - | -- |
| 13 | -schedule_date |
- - Date | -- Required Date - - | -- |
| 14 | -more_info |
- - Section Break | -- More Information - - | -- |
| 15 | -item_group |
- - Link | -- Item Group - - | -- - - - -Item Group - - - - | -
| 16 | -brand |
- - Link | -- Brand - - | -- - - - -Brand - - - - | -
| 17 | -lead_time_date |
- - Date | -- Lead Time Date - - | -- |
| 18 | -sales_order |
- - Link | -- Sales Order - - | -- - - - -Sales Order - - - - | -
| 19 | -project |
- - Link | -- Project - - | -- - - - -Project - - - - | -
| 20 | -col_break3 |
- - Column Break | -- - - | -- |
| 21 | -min_order_qty |
- - Float | -- Min Order Qty - - | -- |
| 22 | -projected_qty |
- - Float | -- Projected Qty - - | -- |
| 23 | -actual_qty |
- - Float | -- Actual Qty - - | -- |
| 24 | -ordered_qty |
- - Float | -- Completed Qty - - | -- |
| 25 | -page_break |
- - Check | -- Page Break - - | -- |
####Step 3: Set Frequency
Set Frequency to download backup in your Dropbox account.
-
+
####Step 4: Allow Dropbox Access
-After setting frequency and updating notification email, 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.
+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
Login to your Dropbox account by entering login credentials.
-
+
####Step 6: 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.
-
+
+
+####Step 7: Enable Service
+After generating access token, go back to Dropbox Integration Service record and check `enable`. This will enable backup auto-download.
With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
@@ -44,18 +51,18 @@ With this, a folder called "ERPNext" will be created in your Dropbox account, an
####Step 2:Create a new app
-
+
####Step 3: Fill in details for the app
-
+
-
-
+
####Step 4: Settings in Site Config
-After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
+After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.md b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
new file mode 100644
index 00000000000..e7b5a61d166
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
@@ -0,0 +1,5 @@
+
+Integration Services is platform to configure 3rd Party Services.
+
+###Services
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
new file mode 100644
index 00000000000..fc5e8a46a4f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
@@ -0,0 +1,4 @@
+dropbox-backup
+paypal-integration
+razorpay-integration
+ldap-integration
\ No newline at end of file
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
new file mode 100644
index 00000000000..34678a9ba6b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
@@ -0,0 +1,24 @@
+#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 Razorpay 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, Base Distinguished Name (DN) and Password for Base DN
+
+
+
+####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.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
new file mode 100644
index 00000000000..d1054ba54aa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
@@ -0,0 +1,58 @@
+#Setting up PayPal
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+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
+
+`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
+
+To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
+
+
+
+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.
+
+
+
+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.
+
+
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP, PLN, GBP, RUB, SGD, SEK, CHF, THB, TRY, USD
+
+##Get PayPal credentials
+
+#### Paypal Sanbox API Signature
+ - Login to paypal developer account, PayPal Developer Account
+ - From **Accounts** tab. create a new business account.
+
+
+ - From this account profile you will get your sandbox api credentials
+
+
+
+---
+
+#### PayPal Account API Signature
+ - Login to PayPal Account and go to profile
+
+
+ - From **My Selling Tools** go to **api Access**
+
+
+ - On API Access Page, choose option 2 to generate API credentials
+
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
new file mode 100644
index 00000000000..ad43f632734
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
@@ -0,0 +1,33 @@
+#Setting up Razorpay
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+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
+
+`Explore > Setup > Integration Service`
+
+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.
+
+####Step 2: Setup payment service
+
+To enable Razorpay payment service, you need to configure parameters like API Username, API Password and Signature.
+
+
+
+####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.
+
+
+
+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.
+
+
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+INR