diff --git a/erpnext/docs/assets/img/articles/$SGrab_253.png b/erpnext/docs/assets/img/articles/$SGrab_253.png deleted file mode 100644 index 69649253ede..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_253.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_254.png b/erpnext/docs/assets/img/articles/$SGrab_254.png deleted file mode 100644 index 7b2ea780fec..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_254.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_256.png b/erpnext/docs/assets/img/articles/$SGrab_256.png deleted file mode 100644 index 1fabda35fc5..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_256.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_306.png b/erpnext/docs/assets/img/articles/$SGrab_306.png deleted file mode 100644 index ebbb00764ac..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_306.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_307.png b/erpnext/docs/assets/img/articles/$SGrab_307.png deleted file mode 100644 index f3d1ee1e4ae..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_307.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_431.png b/erpnext/docs/assets/img/articles/$SGrab_431.png deleted file mode 100644 index ae79a3ef63e..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_431.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/$SGrab_432.png b/erpnext/docs/assets/img/articles/$SGrab_432.png deleted file mode 100644 index cc49d855d39..00000000000 Binary files a/erpnext/docs/assets/img/articles/$SGrab_432.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/SGrab_282.png b/erpnext/docs/assets/img/articles/SGrab_282.png deleted file mode 100644 index 3fb138a3c7e..00000000000 Binary files a/erpnext/docs/assets/img/articles/SGrab_282.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/SGrab_283.png b/erpnext/docs/assets/img/articles/SGrab_283.png deleted file mode 100644 index d726339dff8..00000000000 Binary files a/erpnext/docs/assets/img/articles/SGrab_283.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png deleted file mode 100644 index 8467e6dc547..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png deleted file mode 100644 index ac32083b431..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png deleted file mode 100644 index 46c20471144..00000000000 Binary files a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/capacity-1.png b/erpnext/docs/assets/img/articles/capacity-1.png new file mode 100644 index 00000000000..b6879959c70 Binary files /dev/null and b/erpnext/docs/assets/img/articles/capacity-1.png differ diff --git a/erpnext/docs/assets/img/articles/capacity-2.png b/erpnext/docs/assets/img/articles/capacity-2.png new file mode 100644 index 00000000000..9995b6c60c5 Binary files /dev/null and b/erpnext/docs/assets/img/articles/capacity-2.png differ diff --git a/erpnext/docs/assets/img/articles/capacity-3.png b/erpnext/docs/assets/img/articles/capacity-3.png new file mode 100644 index 00000000000..d074eb015d5 Binary files /dev/null and b/erpnext/docs/assets/img/articles/capacity-3.png differ diff --git a/erpnext/docs/assets/img/articles/child-1.png b/erpnext/docs/assets/img/articles/child-1.png new file mode 100644 index 00000000000..fb19e26835f Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-1.png differ diff --git a/erpnext/docs/assets/img/articles/child-2.png b/erpnext/docs/assets/img/articles/child-2.png new file mode 100644 index 00000000000..2141272e399 Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-2.png differ diff --git a/erpnext/docs/assets/img/articles/child-3.png b/erpnext/docs/assets/img/articles/child-3.png new file mode 100644 index 00000000000..a3667aa7270 Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-3.png differ diff --git a/erpnext/docs/assets/img/articles/child-4.gif b/erpnext/docs/assets/img/articles/child-4.gif new file mode 100644 index 00000000000..fab4ba7e93a Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-4.gif differ diff --git a/erpnext/docs/assets/img/articles/child-5.png b/erpnext/docs/assets/img/articles/child-5.png new file mode 100644 index 00000000000..69900212869 Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-5.png differ diff --git a/erpnext/docs/assets/img/articles/child-6.png b/erpnext/docs/assets/img/articles/child-6.png new file mode 100644 index 00000000000..d65498691cc Binary files /dev/null and b/erpnext/docs/assets/img/articles/child-6.png differ diff --git a/erpnext/docs/assets/img/articles/common-receivable.png b/erpnext/docs/assets/img/articles/common-receivable.png new file mode 100644 index 00000000000..33e92c1a763 Binary files /dev/null and b/erpnext/docs/assets/img/articles/common-receivable.png differ diff --git a/erpnext/docs/assets/img/articles/email-setup-error.png b/erpnext/docs/assets/img/articles/email-setup-error.png new file mode 100644 index 00000000000..e8c5d73dc35 Binary files /dev/null and b/erpnext/docs/assets/img/articles/email-setup-error.png differ diff --git a/erpnext/docs/assets/img/articles/hr-working-days.png b/erpnext/docs/assets/img/articles/hr-working-days.png new file mode 100644 index 00000000000..58571646152 Binary files /dev/null and b/erpnext/docs/assets/img/articles/hr-working-days.png differ diff --git a/erpnext/docs/assets/img/articles/purchase-invoice-account-type.png b/erpnext/docs/assets/img/articles/purchase-invoice-account-type.png new file mode 100644 index 00000000000..f268fd7a558 Binary files /dev/null and b/erpnext/docs/assets/img/articles/purchase-invoice-account-type.png differ diff --git a/erpnext/docs/assets/img/articles/report-permission-1.png b/erpnext/docs/assets/img/articles/report-permission-1.png new file mode 100644 index 00000000000..08c4f5a59b6 Binary files /dev/null and b/erpnext/docs/assets/img/articles/report-permission-1.png differ diff --git a/erpnext/docs/assets/img/articles/report-permission-2.png b/erpnext/docs/assets/img/articles/report-permission-2.png new file mode 100644 index 00000000000..5e5ef17cf7b Binary files /dev/null and b/erpnext/docs/assets/img/articles/report-permission-2.png differ diff --git a/erpnext/docs/assets/img/articles/role-deskperm.png b/erpnext/docs/assets/img/articles/role-deskperm.png new file mode 100644 index 00000000000..ef4a4d87f99 Binary files /dev/null and b/erpnext/docs/assets/img/articles/role-deskperm.png differ diff --git a/erpnext/docs/assets/img/articles/sections-1.png b/erpnext/docs/assets/img/articles/sections-1.png new file mode 100644 index 00000000000..1ac12adda2a Binary files /dev/null and b/erpnext/docs/assets/img/articles/sections-1.png differ diff --git a/erpnext/docs/assets/img/articles/sections-2.gif b/erpnext/docs/assets/img/articles/sections-2.gif new file mode 100644 index 00000000000..48edb795b09 Binary files /dev/null and b/erpnext/docs/assets/img/articles/sections-2.gif differ diff --git a/erpnext/docs/assets/img/articles/types-in-tax-masters.png b/erpnext/docs/assets/img/articles/types-in-tax-masters.png new file mode 100644 index 00000000000..221808ea7b7 Binary files /dev/null and b/erpnext/docs/assets/img/articles/types-in-tax-masters.png differ diff --git a/erpnext/docs/assets/img/setup/integrations/razorpay-api.gif b/erpnext/docs/assets/img/setup/integrations/razorpay-api.gif new file mode 100644 index 00000000000..1e79664e5f6 Binary files /dev/null and b/erpnext/docs/assets/img/setup/integrations/razorpay-api.gif differ diff --git a/erpnext/docs/assets/old_images/__init__.py b/erpnext/docs/assets/old_images/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/docs/assets/old_images/erpnext/__init__.py b/erpnext/docs/assets/old_images/erpnext/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md deleted file mode 100644 index a02f7c6461f..00000000000 --- a/erpnext/docs/user/manual/en/accounts/articles/c-form.md +++ /dev/null @@ -1,47 +0,0 @@ -#C-Form - -C-Form functionality is only applicable for Indian customers. - -**What is C-Form?** - -C-Form is issued by the Customer. If Customer Issues C-Form, supplier applies discounted CST (central sales tax) in the invoice. C-Form is only applicable on the inter-state transactions. - -C-Form functionality in ERPNext allows Supplier to update C-Form No. as received from Customer in the submitted Sales Invoice. Also you can create report on Sales Invoice and track invoices for which C-Form has not yet been received from Customer. - -Following are step to manage C-Form related sales in ERPNext. - -####Set C-Form Applicability - -While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value. - -![C-form](/docs/assets/img/articles/Selection_0028c9f9a.png) - -Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer. - -####Create C-Form Record - -After receiving C-Form from your Customer, you should update that C-Form no. in the Sales Invoice by creating C-Form record. - -Go to `Accounts > Setup > C-Form > New` - -Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table. - -![New C-Form](/docs/assets/img/articles/Selection_020f01c1e.png) - -####Save & Submit C-Form - -After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice. - -![C-Form](/docs/assets/img/articles/Selection_02178f9d6.png) - -C-Form serial no will be updated in related invoice under the field 'C-Form No'. - -![C-Form No](/docs/assets/img/articles/Selection_022b7c6d5.png) - -####Tracking Pending Invoice for C-Form - -To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly. - -![C-Form Report](/docs/assets/img/articles/Selection_026.png) - - diff --git a/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md new file mode 100644 index 00000000000..6f922321179 --- /dev/null +++ b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md @@ -0,0 +1,13 @@ +# Common Receivable Account + +As per the party model, a common receivable account called **Debtor** is auto-created. This is a default Receivable Account for all the Customers. + +Role Desk Permission + +If needed, you can also create a new receivable account and update in the Customer master. + +**Question:** Should I create separate Receivable Account Account for each Customer? + +**Answer:** You can, but it's not a recommend approach. If you want to create separate Receivable Account for each Customer for tracking receivable, then it not needed. You still view Account Receivable & General Ledger report for each Customer. + +Just like Debtors, for tracking payables, default account called Creditors is created under Account Payables. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt index 77474bd159d..8b7768a2d18 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/index.txt +++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt @@ -6,10 +6,11 @@ freeze-accounting-entries how-to-freeze-accouting-ledger manage-foreign-exchange-difference managing-transactions-in-multiple-currency -fiscal-year-creation +fiscal-year-creation post-dated-cheque-entry update-stock-option-in-sales-invoice what-is-the-differences-of-total-and-valuation-in-tax-and-charges withdrawing-salary-from-owners-equity-account adjust-withhold-amount-payment-entry -c-form \ No newline at end of file +common-receivable-account.md +types-in-tax-template \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md new file mode 100644 index 00000000000..e7a07722562 --- /dev/null +++ b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md @@ -0,0 +1,9 @@ +# Purchase Invoice - Account Type Error + +**Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account. + +Role Desk Permission + +**Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet). + +The error message indicates that Account selected in the Credit To field doesn't belong to the Liability Group. Please ensure that Payable Account selected in the Purchase Invoice is located under Liability group. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md new file mode 100644 index 00000000000..d8618bee56d --- /dev/null +++ b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md @@ -0,0 +1,17 @@ +# Types in Sales and Purchase Tax Template + +In the Sales Taxes and Purchase Taxes master, you will find a column called Type. Following a brief on a meaning of each Type and how you can use it. + +Role Desk Permission + +**Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping. + +**On Net Total:** If you want to apply any tax or charges on Net Total, select this option. For example, 18% GST applied to all the item in the Sales Order. + +**On Previous Row Amount:** This option helps you want to calculate tax amount calculated based on another tax amount. + +Example: Education Cess is calculated based on the amount of GST tax. + +**On Previous Row Total:** For each Tax row, a cumulative tax is calculated in the Total column. For the first row, total tax is calculated as Net Total + Tax amount at first row. If you want to apply a tax on the Total Amount of another tax row, then use this option. + +If you select Type as Previous Row Amount or Previous Row Total, then you must also specify a Row No. whose Amount or Total should be considered for the calculation. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md new file mode 100644 index 00000000000..bc31cf21d32 --- /dev/null +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md @@ -0,0 +1,33 @@ +# Customizing visibility of data in the child table + +**Question:** Currently, in the child table (like Item table in Quotation), we can view value in the four columns only. How can we have more values previewed in the child table? + +**Answer:** In the version 7, we introduced a feature, editable grid. This allowed the user to add values in the child table without opening dialog box/form for each row. + +This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table. + +Role Desk Permission + +As per the default setting, only four columns are listed in the child table. Following is how you can add more columns in the editable itself. + +For the field to be added as a column in the table, enter a value in the Column field. Also, ensure that "Is List View" property is checked for that field. + +Role Desk Permission + +Based on the value in the Column field, columns will be added in the child table. Ensure that sum total of value added in the Column field doesn't exceed 10. Based on the Column value, width for that column will be set. + +Role Desk Permission + +**Switch to Un-editable Grid** + +To have more values shown in the preview of Quotation Item table, you can disable Editable Grid for the Quotation Item Doctype. Steps below. + +Role Desk Permission + +Once Editable Grid is disabled for the Quotation Item, the following is how values will be rendered in a preview of the Quotation Item table. + +Role Desk Permission + +To have specific field's value shown in the preview, ensure that for that field, in the Customize Form tool, "In List View" property is checked. + +Role Desk Permission \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt index f8a81a4e51f..1740ef0e943 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt +++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt @@ -14,4 +14,5 @@ search-record-by-specific-field set-language set-precision user-restriction -maximum-numbers-of-fields-in-a-form \ No newline at end of file +maximum-numbers-of-fields-in-a-form +child-table \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.txt b/erpnext/docs/user/manual/en/human-resources/articles/index.txt index 3fbdc5bb513..3019af5de9e 100644 --- a/erpnext/docs/user/manual/en/human-resources/articles/index.txt +++ b/erpnext/docs/user/manual/en/human-resources/articles/index.txt @@ -1,2 +1,3 @@ employees-loan-management -leave-calculation-in-salary-slip \ No newline at end of file +leave-calculation-in-salary-slip +working-days-in-salary-slip \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md new file mode 100644 index 00000000000..289a24abb26 --- /dev/null +++ b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md @@ -0,0 +1,11 @@ +# Working Days Calculation in the Salary Slip + +Working Days are shown in the In the Salary Slip. Based on your preference, it may include holidays of the month or it may not. You can define your preference for the Working Days calculation in HR Settings. + +`HR > Setup > HR Settings` + +If you want to include holidays in the count of Total Working days, then ensure that in the HR Settings, field **Include holidays in Total no. of Working Days** is checked and vice versa. + +Role Desk Permission + +To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md new file mode 100644 index 00000000000..4dd10b3eb74 --- /dev/null +++ b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md @@ -0,0 +1,51 @@ +# Capacity Planning based on Production Order + +Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation. + +Role Desk Permission + +Follow are the steps to use Capacity Planning Feature in your ERPNext account. + +1. Operations + + To add operations, go to: + + `Manufacturing > Bill of Materials > Operations` + +2. Workstation + + Add each Workstation in your ERPNext account from: + + `Manufacturing > Bill of Materials > Workstation` + + In the Workstation master, you can define which operations will be performed on it, what are the cost associated with it, and what are the working hours of that Workstation. + +3. Bill of Materials (BOM): + + In a BOM, with the list of raw material needed, for manufacturing, you can also list operation and workstations through which those raw materials will be processed. + +4. Production Order: + + On submission of Production Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation. + +### Error due to Capacity Planning + +**Question:** On Submission of Production Order, we are getting following error message. + +Role Desk Permission + +**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order. + +On submission of Production Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day. + +If you have update working hours in the Workstation, but still getting this issue, that because one of your operation is taking too long, and cannot be completed in a day. Please divide that operation into smaller operations, so that it can be allocated on Workstation and completed on the same day. + +### Avoid Working Hours of Workstation + +If you want to ignore above validation and allow scheduling of production job beyond the working hours of the Workstation, enable +Overtime in the Manufacturing Settings. + +Role Desk Permission + +If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking". + diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt index bb78d39731f..d0e429e9930 100644 --- a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt +++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt @@ -1,3 +1,4 @@ nested-bom-structure production-planning-subassembly -valuation-based-on-field-in-bom \ No newline at end of file +valuation-based-on-field-in-bom +capacity-planning \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md index dad849ea9d0..2943ea6717d 100644 --- a/erpnext/docs/user/manual/en/projects/articles/project-costing.md +++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md @@ -1,4 +1,4 @@ -

Project Costing

+# Project Costing Each project has multiple task associated with it. To track actual costing of a Project, primarily in terms of services, user has to create Time Log based on actual time spent on Project-Task. Following the steps on how you can track actual service cost against Project. @@ -12,17 +12,17 @@ Activity Type is a master of service offered by your personnel. You can add new Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type. -![Activity Cost](/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png) +Activity Cost #### Time Log Based on Actual Time spent on the Project-Task, Employee will create a time log. -![Time Log](/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png) +Time Log On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master. -![Time Log Costing](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png) +[Time Log Costing Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log. @@ -30,10 +30,10 @@ Multiplying these rates with total no. of Hours in the Time Log gives Costing Am Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master. -![Costing in Task](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png) +Costing in Task Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project. -![Costing in Project](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png) +Costing in Project \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md new file mode 100644 index 00000000000..a11aa212ffc --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md @@ -0,0 +1,19 @@ +# Difference Between System User and Website User + +**Question:** I have added my Employee as a User and have assigned them Roles as well. Still, they are not able to view Dashboard on the login. + +**Answer:** + +There are two type of Users in ERPNext. + +* **System User**: They are Employees of your company. Example of Roles assigned to System Users are Account User, Sales Manager, Purchase User, Support Team etc. + +* **Website User**: They are to parties (like Customer and Suppliers) of your Company. + +Example Website User Roles are Customer and Suppliers. + +How to check if Role is for System User or Website User? + +In the Role master, if field "Desk Access" is checked, that Role is for System User. If Desk Access field is unchecked, then that Role is for Website User. + +Role Desk Permission \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt index acf15318f8b..d175d929dae 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt +++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt @@ -11,4 +11,7 @@ naming-series-current-value overwriting-data-from-data-import-tool rename-user using-custom-domain-on-erpnext -setup-two-factor-authentication \ No newline at end of file +setup-two-factor-authentication +difference-between-system-user-and-website-user +outgoing-email-gateway +print-format-sections \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md index 9971610ab08..e4362fb3374 100644 --- a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md +++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md @@ -36,5 +36,4 @@ A separate Chart of Account master will be set for each company in the ERPNext. New Company - \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md new file mode 100644 index 00000000000..9694da12d3d --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md @@ -0,0 +1,9 @@ +#Outgoing Email Gateway + +In the ERPNext, you can customize incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account master is saved. If not, then you might receive an error as indicated below. + +Email Setup Error + +This indicates that using login credentials and other email gateway details provided, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine. + +Note: Your ERPNext account is connected with ERPNext email server by default. If you don't want to use your own email server, you can continue sending emails using an ERPNext email server. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md new file mode 100644 index 00000000000..93542e6261a --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md @@ -0,0 +1,11 @@ +#Print Format Sections + +**Question:** In the Print Format, I am getting link breaks for each section. How can I disable it? + +Email Setup Error + +**Answer:** To disable line breaks for the section breaks, you should uncheck field "Show Line Breaks after Sections" in its Print Format. + +Print Format Builder > Select Print Format > Edit Settings > Uncheck field "Show Line Breaks after Sections" + +Email Setup Error \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md new file mode 100644 index 00000000000..c345d0a7ef6 --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md @@ -0,0 +1,17 @@ +**Question:** User has roles like Account User and Account Manager assigned. Still, when accessing  Account Receivable report, User is getting an error message of no permission the territory master. + +Report Permission Error + +**Answer:** + +As per the permission system in ERPNext, for the User to be able to access a form or a report, s(he) should have at-least read permission on all the link field in that form/report. Since Territory is a link field in Account Receivable report, please add a permission rule to let Account User/Manager have at-least Read permission on the Territory master. Please follow below-given steps to resolve this issue. + +1. Roles assigned to User are Account User and Account Manager. + +2. As indicates in the Error message, the user didn't have permission on the territory master. As per the default permission, none of the above role assigned to that User has any permission on the Territory master. + +3. To resolve this issue, I have assigned Account User permission to Read Territory master. + + Permission Manager + +As per this permission update, User should be able to access Account Receivable report fine. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md index 01f29751c85..d41283ce404 100644 --- a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md +++ b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md @@ -1,26 +1,31 @@ -#Setting up Razorpay +#RazorPay Integration -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 is an e-commerce application service provider service that authorises 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. -To setup Razorpay, -`Explore > Integrations > Razorpay Settings` +To setup RazorPay, -#### Setup Razorpay +`Explore > Integrations > RazorPay Settings` + +Razorpay Settings + +#### Setup RazorPay + +To enable RazorPay payment service, you need to configure parameters like API Key, API Secret -To enable Razorpay payment service, you need to configure parameters like API Key, API Secret Razorpay Settings -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 the Chart of Account with account type as Bank. 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. +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 After enabling service and configuring Payment Gateway Account your system is able to accept online payments. ####Supporting transaction currencies -INR + +RazorPay will only work for the company having `INR (Indian Rupee)` as a Currency. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md new file mode 100644 index 00000000000..3a87e02afea --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md @@ -0,0 +1,7 @@ +# Administrator User + +If your ERPNext account is hosted with us (Frappe Technologies Pvt. Ltd.), then you won't be able to access your ERPNext account as an Administrator. For the hosted account, access via Administrator User us reserved with us. + +1. For the hosted account, upgrades are managed from the backend. We reserve admin login credential with us so that we can upgrade all the hosted customer's ERPNext accounts from the backend. + +2. Since on a single server, we host have many customer's ERPNext accounts, as a security measure, we cannot share the credentials for administrator account with any hosted user. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt index 74243df5209..2477fca4eac 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt @@ -3,3 +3,4 @@ role-based-permissions user-permissions role-permisison-for-page-and-report sharing +admin-user \ No newline at end of file