From 004c742c0f2c61e6adfa0d1bb14bcf88607fceff Mon Sep 17 00:00:00 2001 From: Rushikesh Parekh Date: Mon, 24 Sep 2018 11:16:26 +0530 Subject: [PATCH 01/15] fixed Documentation --- foundation/www/docs/user/manual/en/agriculture/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md index 3c0fcc6f..04e4f437 100755 --- a/foundation/www/docs/user/manual/en/agriculture/index.md +++ b/foundation/www/docs/user/manual/en/agriculture/index.md @@ -1,13 +1,13 @@ # Agriculture -Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities. +Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers customers and logistics to name a few areas. ERPNext already helps organize these activities. Land Unit ### Capture Land Units and Manage Crops -A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions. +A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing etc.), recording environmental and crop data for analysis, and reports to help make effective decisions. Soil Texture From 6365cc0440a05bc098e0163dcb0ba4987ae6ec99 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 13:00:59 +0530 Subject: [PATCH 02/15] Create email-domain.md --- .../en/setting-up/email/email-domain.md | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 foundation/www/docs/user/manual/en/setting-up/email/email-domain.md diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md new file mode 100644 index 00000000..111594cf --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -0,0 +1,34 @@ + +# Email Domains + +You can configure your Email Domain in ERPNext for easy setup of all Email Accounts in ERPNext. You can find domain settings under Setup-->Email Domain. + +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example : If you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. + +Email Domain + +### Default Email Domain + +ERPNext creates a template for an example.com email domain. + +### Example Email Address + +Example Email Address is where you enter your business email address, For example : if your email ID is myname@mybusinessdomain.com enter this here. + +### Email Server + +This is the internet address or URL of the mail service you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. + +### USE IMAP + +If your Mail server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. +If you want to enable incoming mails within ERPNext Leave this checked + +### USE SSL + +If your mail server uses SSL communication leave this checked. + +###Attachment Limit (MB) + +If you want to limit the file attachments size to a particular limit in MB for attachments to be a sent via email from ERPNext, You can set that up here. + From 5511271c5fc8620267d8e0086c1addbc742dffa5 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 13:01:19 +0530 Subject: [PATCH 03/15] Update index.txt --- foundation/www/docs/user/manual/en/setting-up/email/index.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/index.txt b/foundation/www/docs/user/manual/en/setting-up/email/index.txt index 778fc812..4351c8ec 100755 --- a/foundation/www/docs/user/manual/en/setting-up/email/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/email/index.txt @@ -1,6 +1,7 @@ +email-domain email-account email-inbox email-alerts email-digest email-reports -sending-email \ No newline at end of file +sending-email From 0874866496699a80358578ec3dce4a2372abea3c Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 13:09:51 +0530 Subject: [PATCH 04/15] Update email-domain.md --- .../manual/en/setting-up/email/email-domain.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 111594cf..2005029c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -1,34 +1,33 @@ # Email Domains -You can configure your Email Domain in ERPNext for easy setup of all Email Accounts in ERPNext. You can find domain settings under Setup-->Email Domain. +You can configure your Email Domain in ERPNext for easy setup of all Email Accounts in Email Accounts Document. You can find domain settings under Setup-->Email Domain. -> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example : If you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. - -Email Domain +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. ### Default Email Domain ERPNext creates a template for an example.com email domain. +Email Domain + ### Example Email Address -Example Email Address is where you enter your business email address, For example : if your email ID is myname@mybusinessdomain.com enter this here. +Example Email Address is where you enter your business email address, For example : if your email ID is myname@mybusinessdomain.com you should enter this here. ### Email Server -This is the internet address or URL of the mail service you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. +This is the internet address or URL of the mail service you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. ### USE IMAP If your Mail server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. -If you want to enable incoming mails within ERPNext Leave this checked ### USE SSL -If your mail server uses SSL communication leave this checked. +If your mail server uses SSL (Secure Socket Layer) communication leave this checked. You may have purchased SSL certificate from your IT service provider for SSL setup. ###Attachment Limit (MB) -If you want to limit the file attachments size to a particular limit in MB for attachments to be a sent via email from ERPNext, You can set that up here. +If you want to limit the size of file attachments for emails sent from within ERPNext, you can set that up here. You can enter the size of attachments in MB. From d7f3c29cdc8d486c4fd1a851e732d59ff1666081 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 14:36:49 +0530 Subject: [PATCH 05/15] Update email-domain.md --- .../en/setting-up/email/email-domain.md | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 2005029c..f499b2db 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -1,33 +1,45 @@ # Email Domains -You can configure your Email Domain in ERPNext for easy setup of all Email Accounts in Email Accounts Document. You can find domain settings under Setup-->Email Domain. +You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find domain settings under Setup-->Email Domain. > **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. ### Default Email Domain -ERPNext creates a template for an example.com email domain. +ERPNext creates a template email domain using example.com for your reference. You can add your domain by clicking on the new button. Email Domain ### Example Email Address -Example Email Address is where you enter your business email address, For example : if your email ID is myname@mybusinessdomain.com you should enter this here. +Example Email Address is where you enter your business email address, For example, if your email ID is myname@mybusinessdomain.com you should enter this here. ### Email Server -This is the internet address or URL of the mail service you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. +This is the internet address or URL of your mail server or the email service that you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. ### USE IMAP -If your Mail server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. +If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. ### USE SSL -If your mail server uses SSL (Secure Socket Layer) communication leave this checked. You may have purchased SSL certificate from your IT service provider for SSL setup. +If your mail server uses SSL (Secure Socket Layer) communication leave this checked. You may have purchased SSL certificate from your IT service provider for the SSL setup. -###Attachment Limit (MB) +### Attachment Limit (MB) If you want to limit the size of file attachments for emails sent from within ERPNext, you can set that up here. You can enter the size of attachments in MB. +### SMTP Server + +This is the address of service of outgoing mails of your email server. + +### Use TLS + +Set this up if your SMTP service is setup with TLS. + +### Default port + +SMTP service is usually set on port 25. If your email serer is setup on a separate port number you can set that up here. + From f20ff64943c46999048b53adef15e3e1427d1c31 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 14:37:19 +0530 Subject: [PATCH 06/15] Update email-domain.md --- .../www/docs/user/manual/en/setting-up/email/email-domain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index f499b2db..4362d2bd 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -1,7 +1,7 @@ # Email Domains -You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find domain settings under Setup-->Email Domain. +You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find Email Domain settings under Setup-->Email Domain. > **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. From a2991c572d8aed79938f4d6b308356db5072796e Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 14:49:00 +0530 Subject: [PATCH 07/15] Update email-domain.md --- .../manual/en/setting-up/email/email-domain.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 4362d2bd..dafecc8a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -3,11 +3,11 @@ You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find Email Domain settings under Setup-->Email Domain. -> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance might not be able to receive mails even though outgoing mails might work. You may be using commercial mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. ### Default Email Domain -ERPNext creates a template email domain using example.com for your reference. You can add your domain by clicking on the new button. +ERPNext creates a template email domain using example.com for your reference. You should add your new domain as well. Email Domain @@ -21,15 +21,18 @@ This is the internet address or URL of your mail server or the email service tha ### USE IMAP +IMAP and POP are two services used by most mail servers used for incoming mails. If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. ### USE SSL -If your mail server uses SSL (Secure Socket Layer) communication leave this checked. You may have purchased SSL certificate from your IT service provider for the SSL setup. +If your mail server uses SSL (Secure Socket Layer) communication leave this checked. + +> **Do I have SSL?:** You may have purchased SSL certificate from your IT service provider for the SSL and they may have setup SSL for your mail server. If you're using https while accessing mail server over browser then you might have SSL setup. ### Attachment Limit (MB) -If you want to limit the size of file attachments for emails sent from within ERPNext, you can set that up here. You can enter the size of attachments in MB. +If you want to limit the size of file attachments for emails sent from within ERPNext, you can set that up here. You can enter the max size of attachments in MB. ### SMTP Server @@ -41,5 +44,6 @@ Set this up if your SMTP service is setup with TLS. ### Default port -SMTP service is usually set on port 25. If your email serer is setup on a separate port number you can set that up here. +SMTP service is usually set on port 25. If your email server is setup on a separate port number you can set that up here. + From 4fdba08e9cd5196bfc2a6f27a3c939d979a97749 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 14:57:36 +0530 Subject: [PATCH 08/15] Update email-domain.md --- .../docs/user/manual/en/setting-up/email/email-domain.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index dafecc8a..a1ac6a44 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -46,4 +46,10 @@ Set this up if your SMTP service is setup with TLS. SMTP service is usually set on port 25. If your email server is setup on a separate port number you can set that up here. +### Save entered domain +Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a second and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen + +### Entered data but still unable to setup Email Domain + +If you've verified the above settings and are still unable to setup Email Domain, you can contact ERPNext support for help. From f66bcd1fe9234081046dc777d1430900a3ee9d80 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:04:52 +0530 Subject: [PATCH 09/15] Update email-domain.md --- .../manual/en/setting-up/email/email-domain.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index a1ac6a44..eb70eceb 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -3,7 +3,7 @@ You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find Email Domain settings under Setup-->Email Domain. -> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT service provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. And without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT services provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. Without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. ### Default Email Domain @@ -13,16 +13,15 @@ ERPNext creates a template email domain using example.com for your reference. Yo ### Example Email Address -Example Email Address is where you enter your business email address, For example, if your email ID is myname@mybusinessdomain.com you should enter this here. +Example Email Address is where you enter your business email address. For example, if your email ID is myname@mybusinessdomain.com you should enter this. ### Email Server -This is the internet address or URL of your mail server or the email service that you have purchased. For Example it may be mail.mybusiness.com or imap.mybusiness.com. +This is the internet address or URL of your mail server or the email service that you have purchased. For example, it may be mail.mybusiness.com or imap.mybusiness.com. ### USE IMAP -IMAP and POP are two services used by most mail servers used for incoming mails. -If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. +IMAP and POP are two services used by most mail servers for incoming mails. If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. ### USE SSL @@ -36,11 +35,11 @@ If you want to limit the size of file attachments for emails sent from within ER ### SMTP Server -This is the address of service of outgoing mails of your email server. +This is the outgoing email service adress of your email server. ### Use TLS -Set this up if your SMTP service is setup with TLS. +Set this up if your SMTP service is setup with TLS for security. ### Default port @@ -48,8 +47,8 @@ SMTP service is usually set on port 25. If your email server is setup on a separ ### Save entered domain -Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a second and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen +Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a few seconds and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen -### Entered data but still unable to setup Email Domain +### Entered everything but still unable to setup Email Domain If you've verified the above settings and are still unable to setup Email Domain, you can contact ERPNext support for help. From f7e2c3d92d9e2684547f6c3be79a71beb74a27ea Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:06:28 +0530 Subject: [PATCH 10/15] Update email-domain.md --- .../www/docs/user/manual/en/setting-up/email/email-domain.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index eb70eceb..95b54405 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -49,6 +49,6 @@ SMTP service is usually set on port 25. If your email server is setup on a separ Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a few seconds and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen -### Entered everything but still unable to setup Email Domain +## Entered everything but still unable to setup Email Domain? -If you've verified the above settings and are still unable to setup Email Domain, you can contact ERPNext support for help. +If you've entered and verified the above settings and are still unable to setup Email Domain, you can contact ERPNext support for help. From 2c02265f01a0b1e79ddd00d5ac063366877ccc69 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:14:13 +0530 Subject: [PATCH 11/15] Update email-domain.md --- .../www/docs/user/manual/en/setting-up/email/email-domain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 95b54405..5a631f2f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -19,7 +19,7 @@ Example Email Address is where you enter your business email address. For exampl This is the internet address or URL of your mail server or the email service that you have purchased. For example, it may be mail.mybusiness.com or imap.mybusiness.com. -### USE IMAP +### [USE IMAP] (https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol) IMAP and POP are two services used by most mail servers for incoming mails. If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. From 4cc83345725471f5ddd9f52d662f302eeaf28431 Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:19:56 +0530 Subject: [PATCH 12/15] Update email-domain.md --- .../user/manual/en/setting-up/email/email-domain.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 5a631f2f..13b311c2 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -3,7 +3,7 @@ You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find Email Domain settings under Setup-->Email Domain. -> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT services provider. For example, if you access your business mailbox with URL like http://mail.mybusiness.com, then mybusiness.com is your email domain. Without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT services provider. For example, if you access your business mailbox with URL like http://mail.yourcompany.com, then yourcompany.com is your email domain. Without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. ### Default Email Domain @@ -13,13 +13,13 @@ ERPNext creates a template email domain using example.com for your reference. Yo ### Example Email Address -Example Email Address is where you enter your business email address. For example, if your email ID is myname@mybusinessdomain.com you should enter this. +Example Email Address is where you enter your business email address. For example, if your email ID is yourname@yourcompanyname.com you should enter this. ### Email Server -This is the internet address or URL of your mail server or the email service that you have purchased. For example, it may be mail.mybusiness.com or imap.mybusiness.com. +This is the internet address or URL of your mail server or the email service that you have purchased. For example, it may be mail.yourcompany.com or imap.yourcompany.com. -### [USE IMAP] (https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol) +### USE IMAP IMAP and POP are two services used by most mail servers for incoming mails. If your Email server uses IMAP service for the incoming mails keep this checked. Otherwise leave this unchecked. @@ -47,8 +47,8 @@ SMTP service is usually set on port 25. If your email server is setup on a separ ### Save entered domain -Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a few seconds and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen +Once you click on save, these settings are validated by ERPNext and the Email Domain gets saved. Sometimes this could take a few seconds and you might have to wait. This email domain is then available in a dropdown called Domain under Email Accounts screen. -## Entered everything but still unable to setup Email Domain? +### Entered everything but still unable to setup Email Domain? If you've entered and verified the above settings and are still unable to setup Email Domain, you can contact ERPNext support for help. From 4125f83fde4db1daf373d8c5b89cd6bc2ec169aa Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Wed, 24 Oct 2018 15:23:29 +0530 Subject: [PATCH 13/15] Update email-domain.md --- .../www/docs/user/manual/en/setting-up/email/email-domain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md index 13b311c2..4b798fde 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-domain.md @@ -3,7 +3,7 @@ You can configure your Email Domain in ERPNext for easy setup of all Email Accounts. You can find Email Domain settings under Setup-->Email Domain. -> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT services provider. For example, if you access your business mailbox with URL like http://mail.yourcompany.com, then yourcompany.com is your email domain. Without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. +> **What is my Email Domain?:** You might have purchased Email service from your internet service provider or your IT services provider. For example, if you access your business mailbox with URL like http://mail.yourcompany.com, then yourcompany.com is your email domain. Without setting up email domain correctly, your ERPNext instance may not be able to receive mails. You may be using free mail services like gmail or yahoo. In this case google.com or yahoo.com is your email domain. However you might have to allow access to ERPNext for your gmail account. ### Default Email Domain From 2ceef5bba5d761fb4bf05ee55d523829cd43d03b Mon Sep 17 00:00:00 2001 From: rushikesherp <40016931+rushikesherp@users.noreply.github.com> Date: Thu, 25 Oct 2018 12:44:16 +0530 Subject: [PATCH 14/15] Update index.txt --- foundation/www/docs/user/manual/en/setting-up/email/index.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/setting-up/email/index.txt b/foundation/www/docs/user/manual/en/setting-up/email/index.txt index 4351c8ec..7b5b6980 100755 --- a/foundation/www/docs/user/manual/en/setting-up/email/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/email/index.txt @@ -1,4 +1,3 @@ -email-domain email-account email-inbox email-alerts From a4196f3bf708896221b64afcccdc9bcbcc58cea6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 31 Dec 2018 12:51:11 +0530 Subject: [PATCH 15/15] Update index.md --- foundation/www/docs/user/manual/en/agriculture/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md index 04e4f437..bf630e22 100755 --- a/foundation/www/docs/user/manual/en/agriculture/index.md +++ b/foundation/www/docs/user/manual/en/agriculture/index.md @@ -1,7 +1,7 @@ # Agriculture -Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers customers and logistics to name a few areas. ERPNext already helps organize these activities. +Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities. Land Unit @@ -30,4 +30,4 @@ To see feature of ERPNext Agriculture in action, check the following demo video. ### Agriculture User Manual -{index} \ No newline at end of file +{index}