diff --git a/docs/user/customer_portal/docs.user.customer_portal.login.md b/docs/user/customer_portal/docs.user.customer_portal.login.md
new file mode 100644
index 0000000000..982683a251
--- /dev/null
+++ b/docs/user/customer_portal/docs.user.customer_portal.login.md
@@ -0,0 +1,8 @@
+---
+{
+ "_label": "Login"
+}
+---
+To login into the customer account, use the customer email id and the password sent by ERPNext, generated by the sign-up process.
+
+
\ No newline at end of file
diff --git a/docs/user/customer_portal/docs.user.customer_portal.md b/docs/user/customer_portal/docs.user.customer_portal.md
new file mode 100644
index 0000000000..2f080655b5
--- /dev/null
+++ b/docs/user/customer_portal/docs.user.customer_portal.md
@@ -0,0 +1,14 @@
+---
+{
+ "_label": "Customer Portal",
+ "_toc": [
+ "docs.user.customer_portal.sign_up",
+ "docs.user.customer_portal.login"
+ ]
+}
+---
+
+Customer Portal is designed to give easy accesibility to customers of a company.
+
+
+
diff --git a/docs/user/customer_portal/docs.user.customer_portal.orders.md b/docs/user/customer_portal/docs.user.customer_portal.orders.md
new file mode 100644
index 0000000000..dd1fbff1ba
--- /dev/null
+++ b/docs/user/customer_portal/docs.user.customer_portal.orders.md
@@ -0,0 +1,13 @@
+---
+{
+ "_label": "Customer Orders"
+}
+---
+
+ERPNext Web Portal gives your customers quick access to their Orders. Customers can check the status of their orders by logging on to the web.
+
+Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
+
+
+
+
diff --git a/docs/user/customer_portal/docs.user.customer_portal.sign_up.md b/docs/user/customer_portal/docs.user.customer_portal.sign_up.md
new file mode 100644
index 0000000000..4a217c2659
--- /dev/null
+++ b/docs/user/customer_portal/docs.user.customer_portal.sign_up.md
@@ -0,0 +1,25 @@
+---
+{
+ "_label": "Sign-Up"
+}
+---
+Customers have to log-in to the Company Website,and sign-up as a customer.
+
+#### Step 1: Click on Login Icon
+
+
+
+
+
+#### Step 2: Click on Sign Up Icon
+
+
+
+
+
+#### Step 3: Enter Customer Name and ID
+
+
+
+After the sign up process, a mail will be sent to the customers email id with the password details.
+
diff --git a/docs/user/customize/docs.user.customize.custom_field.md b/docs/user/customize/docs.user.customize.custom_field.md
index a457f074cc..c5aac31a85 100644
--- a/docs/user/customize/docs.user.customize.custom_field.md
+++ b/docs/user/customize/docs.user.customize.custom_field.md
@@ -7,18 +7,20 @@ A very common customization is adding of custom fields. You can add Custom Field
> Setup > Custom Field > New Custom Field
-
+
In the form:
- Select the Document on which you want to add the Custom Field.
-- Select the Type of field and the Options (see section on field types).
+- Select the Type of field and the Options .
- Select where you want the field to appear in the Form (“after field” section).
and save the Custom Field. When you open a new / existing form of the type you selected in step 1, you will see it with the Custom Fields.
+To understand Custom Fields in detail, visit [DocType-Fields](docs.user.knowledge.doctype_fields.html)
+
#### Naming
Many times you want your fields to be carried over from one form to another. For example, you may have added a Custom Field in Quotation that you want to include in Sales Order when a Sales Order is created from the Quotation. This is simple in ERPNext, just make sure the fields have the same “fieldname”
diff --git a/docs/user/customize/docs.user.customize.custom_form.md b/docs/user/customize/docs.user.customize.custom_form.md
index 6b37bd12ee..f4184303ef 100644
--- a/docs/user/customize/docs.user.customize.custom_form.md
+++ b/docs/user/customize/docs.user.customize.custom_form.md
@@ -3,12 +3,13 @@
"_label": "Customize Form"
}
---
-Please read ERPNext Structure before you start customizing.
You can Customize Forms by changing its layout, making certain fields mandatory, hiding others and changing permission levels on fields by going to:
> Setup > Customize ERPNext > Customize Forms
+#### Step 1: Select the required Form Type for Customization.
+

@@ -24,12 +25,14 @@ Select the Form you want to customize and the fields table will be updated with
You can also allow attachments, set max number of attachments and set the default Print Format.
+#### Step 2: Replace Fields with required changes.

+To understand field definitions, visit [Doctype-Fields](docs.user.knowledge.doctype_fields.html)
> Though we want you to do everything you can to customize your ERP based on your business needs, we recommend that you do not make “wild” changes to the forms. This is because, these changes may affect certain operations and may mess up your forms. Make small changes and see its effect before doing some more.
\ No newline at end of file
diff --git a/docs/user/docs.user.md b/docs/user/docs.user.md
index 5c6588272e..cf0e273b97 100644
--- a/docs/user/docs.user.md
+++ b/docs/user/docs.user.md
@@ -17,8 +17,9 @@
"docs.user.website",
"docs.user.tools",
"docs.user.customize",
- "docs.user.knowledge"
- ],
+ "docs.user.knowledge",
+ "docs.user.customer_portal"
+ ],
"_no_toc": 1
}
---
@@ -70,6 +71,7 @@ Contents
1. [Terms and Conditions](docs.user.selling.terms.html)
1. [Price Lists](docs.user.setup.price_list.html)
1. [Discount](docs.user.selling.discount.html)
+ 1. [Shopping Cart](docs.user.selling.shopping_cart.html)
1. [Customers](docs.user.selling.customer.html)
1. [Lead](docs.user.selling.lead.html)
1. [Opportunity](docs.user.selling.opportunity.html)
@@ -88,6 +90,7 @@ Contents
1. [Warehouse](docs.user.stock.warehouse.html)
1. [Item Group](docs.user.stock.item_group.html)
1. [Item](docs.user.stock.item.html)
+ 1. [Product Listing on Website](docs.user.stock.product_listing_on_website.html)
1. [Serialized Inventory](docs.user.stock.serialized.html)
1. [Purchase Receipt](docs.user.stock.purchase_receipt.html)
1. [Delivery Note](docs.user.stock.delivery_note.html)
@@ -159,5 +162,10 @@ Contents
1. [Accounting Knowledge](docs.user.knowledge.accounting.html)
1. [Accounting Entries](docs.user.knowledge.accounting_entries.html)
1. [DocType Definitions](docs.user.knowledge.doctype.html)
+ 1. [DocType Fields](docs.user.knowledge.doctype_fields.html)
1. [Attachment and CSV Files](docs.user.knowledge.attachment_csv.html)
1. [Format using Markdown](docs.user.knowledge.markdown.html)
+1. [Customer Portal](docs.user.customer_portal.html)
+ 1. [Sign Up](docs.user.customer_portal.sign_up.html)
+ 2. [Login](docs.user.customer_portal.login.html)
+ 3. [Customer Orders](docs.user.customer_portal.orders.html)
diff --git a/docs/user/knowledge/docs.user.knowledge.doctype.md b/docs/user/knowledge/docs.user.knowledge.doctype.md
index a2550d4f95..8614fdf03d 100644
--- a/docs/user/knowledge/docs.user.knowledge.doctype.md
+++ b/docs/user/knowledge/docs.user.knowledge.doctype.md
@@ -71,197 +71,3 @@ Many DocTypes are single tables, but some work in groups. For example, Quotation
There are a certain type of DocTypes that are “Single”, i.e. they have no table associated and have only one record of its fields. DocTypes such as Global Defaults, Production Planning Tool are “Single” DocTypes.
-#### Field Columns
-
-In the fields table, there are many columns, here is an explanation of the columns of the field table.
-
-
Column | -Description | -|
Label | -Field Label (that appears in the form). | -|
Type | -Field Type | -|
Name | -Column name in the database, must be code friendly with no white spaces, special characters and capital letters. | -|
options | -Field settings: - For Select: List of options (each on a new line). - For Link: DocType that is “linked”. - For HTML: HTML Content - | |
Perm Level | -Permission level (number) of the field. You can group fields by numbers, called levels, and apply rules on the levels. | -|
Width | -Width of the field (in pixels) - useful for “Table” types. | -|
Reqd | -Checked if field is mandatory (required). | -|
In Filter | -Checked if field appears as a standard filter in old style reports. | -|
Hidden | -Checked if field is hidden. | -|
Print Hide | -Checked if field is hidden in Print Formats. | -|
Report Hide | -Checked if field is hidden in old style reports. | -|
Allow on Submit | -Checked if this field can be edited after the document is “Submitted”. | -|
Depends On | -The fieldname of the field that will decide whether this field will be shown or hidden. It is useful to hide un-necessary fields. | -|
Description | -Description of the field | -|
Default | -Default value when a new record is created. - Note: “user” will set the current user as default and “today” will set today’s date (if the field is a Date field). |
-
Type | -Description | -Options/Setting | -
Data | -Single line text field with 180 characters | -- |
Select | -Select from a pre-determined items in a drop-down. | -The “Options” contains the drop-down items, each on a new row | -
Link | -Link an existing document / record | -Options contains the name of the type of document (DocType) | -
Currency | -Number with 2 decimal places, that will be shown separated by commas for thousands etc. in Print. | -e.g. 1,000,000.00 | -
Float | -Number with 6 decimal places. | -e.g. 3.141593 | -
Int | -Integer (no decimals) | -e.g. 100 | -
Date | -Date | -Format can be selected in Global Defaults | -
Time | -Time | -- |
Text | -||
Text | -Multi-line text box without formatting features | -- |
Text editor | -Multi-line text box with formatting toolbar etc | -- |
Code | -Code Editor | -Options can include the type of language for syntax formatting. - Eg JS / Python / HTML | -
Table (Grid) | -||
Table | -Table of child items linked to the record. | -Options contains the name of the DocType of the child table. For example “Sales Invoice Item” for “Sales Invoice” | -
Layout | -||
Section Break | -Break into a new horizontal section. | -The layout in ERPNext is evaluated from top to bottom. | -
Column Break | -Break into a new vertical column. | -- |
HTML | -Add a static text / help / link etc in HTML | -Options contains the HTML. | -
Action | -||
Button | -Button | -[for developers only] | -
Column | +Description | +|
Label | +Field Label (that appears in the form). | +|
Type | +Field Type | +|
Name | +Column name in the database, must be code friendly with no white spaces, special characters and capital letters. | +|
options | +Field settings: + For Select: List of options (each on a new line). + For Link: DocType that is “linked”. + For HTML: HTML Content + | |
Perm Level | +Permission level (number) of the field. You can group fields by numbers, called levels, and apply rules on the levels. | +|
Width | +Width of the field (in pixels) - useful for “Table” types. | +|
Reqd | +Checked if field is mandatory (required). | +|
In Filter | +Checked if field appears as a standard filter in old style reports. | +|
Hidden | +Checked if field is hidden. | +|
Print Hide | +Checked if field is hidden in Print Formats. | +|
Report Hide | +Checked if field is hidden in old style reports. | +|
Allow on Submit | +Checked if this field can be edited after the document is “Submitted”. | +|
Depends On | +The fieldname of the field that will decide whether this field will be shown or hidden. It is useful to hide un-necessary fields. | +|
Description | +Description of the field | +|
Default | +Default value when a new record is created. + Note: “user” will set the current user as default and “today” will set today’s date (if the field is a Date field). |
+
Type | +Description | +Options/Setting | +
Data | +Single line text field with 180 characters | ++ |
Select | +Select from a pre-determined items in a drop-down. | +The “Options” contains the drop-down items, each on a new row | +
Link | +Link an existing document / record | +Options contains the name of the type of document (DocType) | +
Currency | +Number with 2 decimal places, that will be shown separated by commas for thousands etc. in Print. | +e.g. 1,000,000.00 | +
Float | +Number with 6 decimal places. | +e.g. 3.141593 | +
Int | +Integer (no decimals) | +e.g. 100 | +
Date | +Date | +Format can be selected in Global Defaults | +
Time | +Time | ++ |
Text | +||
Text | +Multi-line text box without formatting features | ++ |
Text editor | +Multi-line text box with formatting toolbar etc | ++ |
Code | +Code Editor | +Options can include the type of language for syntax formatting. + Eg JS / Python / HTML | +
Table (Grid) | +||
Table | +Table of child items linked to the record. | +Options contains the name of the DocType of the child table. For example “Sales Invoice Item” for “Sales Invoice” | +
Layout | +||
Section Break | +Break into a new horizontal section. | +The layout in ERPNext is evaluated from top to bottom. | +
Column Break | +Break into a new vertical column. | ++ |
HTML | +Add a static text / help / link etc in HTML | +Options contains the HTML. | +
Action | +||
Button | +Button | +[for developers only] | +