erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-17 02:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Docs] Updated Documentations

Browse Source
This commit is contained in:
frappe
2018-02-23 07:27:03 +02:00
parent 7c80a62722
commit 70b2035361
1617 changed files with 10381 additions and 4071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md
View File

@@ -13,13 +13,13 @@ Create following Groups and Ledgers in Chart of Accounts if not there.
Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters)
![CoA](/docs/assets/img/articles/Selection_433.png)
![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png)
#### 1.2 Salaries Account
Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
![CoA](/docs/assets/img/articles/Selection_434.png)
![CoA]({{docs_base_url}}/assets/img/articles/Selection_434.png)
#### 1.3 Interest Account
@@ -29,7 +29,7 @@ Create Ledger as 'Interest on Loan' under Indirect Income.
Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.
![Loan Entry](/docs/assets/img/articles/Selection_435.png)
![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png)
### 3. Book Loan Recovery and Interest
@@ -37,13 +37,13 @@ Once loan amount is finalized, make journal voucher to book loan payment entry.
If your employee pays separately for his/her loan installment and loan interest, then create journal voucher.
![Loan Reco](/docs/assets/img/articles/Selection_436.png)
![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_436.png)
#### 3.2 Loan Adjustment in Salary
And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
![Loan Reco](/docs/assets/img/articles/Selection_437.png)
![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_437.png)
In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
@@ -51,6 +51,6 @@ In the Salary Slip of an employee, then create two Deduction Types in Salary Str
After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
![Loan Reco](/docs/assets/img/articles/Selection_439.png)
![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png)
<!-- markdown -->

4
foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
View File

@@ -28,7 +28,7 @@ a scenario to understand how leaves impact employees Salary Slip.
<li>Create Holiday List (if any), and link it with Employee master.</li>
</ol>
<p>When creating Salary Slip for an Employee, following is what you will see:</p>
<img src="/docs/assets/img/articles/SGrab_282.png">
<img src="{{docs_base_url}}/assets/img/articles/SGrab_282.png">
<br>
<br><b>Working Days:</b> Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
<br>
@@ -47,7 +47,7 @@ Leave Type as "Leave Without Pay".
<br>As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
<br>
<br>
<img src="/docs/assets/img/articles/SGrab_283.png" width="760"><br>
<img src="{{docs_base_url}}/assets/img/articles/SGrab_283.png" width="760"><br>
<!-- markdown -->

2
foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
View File

@@ -7,6 +7,6 @@ Working Days are shown in the In the Salary Slip. Based on your preference, it m
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.
<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/hr-working-days.png">
<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hr-working-days.png">
To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module.