Update manuals. Fix codacy issues
This commit is contained in:
parent
118ceda46f
commit
38d4be8325
@ -6,6 +6,7 @@ Payment Entry can be made against following transactions.
|
|||||||
2. Purchase Invoice.
|
2. Purchase Invoice.
|
||||||
3. Sales Order (Advance Payment)
|
3. Sales Order (Advance Payment)
|
||||||
4. Purchase Order (Advance Payment)
|
4. Purchase Order (Advance Payment)
|
||||||
|
5. Expense Claim
|
||||||
|
|
||||||
####Step 1: Make Payment
|
####Step 1: Make Payment
|
||||||
|
|
||||||
@ -21,7 +22,7 @@ In the Payment Entry, select Mode of Payment (eg: Bank, Cash, Wire Transfer). In
|
|||||||
|
|
||||||
####Step 3: Payment Amount
|
####Step 3: Payment Amount
|
||||||
|
|
||||||
Enter actual payment amount received from the Customer or paid to the Supplier.
|
Enter actual payment amount received from the Customer or paid to the Supplier or Employee.
|
||||||
|
|
||||||
<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-3.png">
|
<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-3.png">
|
||||||
|
|
||||||
@ -90,7 +91,7 @@ Following internal transfers can be managed from the Payment Entry.
|
|||||||
- Updating opening balance in an Accounts.
|
- Updating opening balance in an Accounts.
|
||||||
- Fixed Asset Depreciation entry.
|
- Fixed Asset Depreciation entry.
|
||||||
- For adjusting Credit Note against Sales Invoice and Debit Note against Purchase Invoice, incase there is no payment happening at all.
|
- For adjusting Credit Note against Sales Invoice and Debit Note against Purchase Invoice, incase there is no payment happening at all.
|
||||||
|
4. Payment Entries are used if a cheque is printed.
|
||||||
* * *
|
* * *
|
||||||
|
|
||||||
## Managing Outstanding Payments
|
## Managing Outstanding Payments
|
||||||
|
@ -39,11 +39,18 @@ To make payment against the expense claim, user has to click on Make > Bank Entr
|
|||||||
<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/payment.png">
|
<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/payment.png">
|
||||||
|
|
||||||
#### Payment Entry
|
#### Payment Entry
|
||||||
<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/payment_entry.png">
|
<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/payment_entry.png">
|
||||||
|
|
||||||
|
|
||||||
Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee.
|
Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee.
|
||||||
|
|
||||||
|
Alternatively, a Payment Entry can be made for an employee and all outstanding Expense Claims will be pulled in.
|
||||||
|
|
||||||
|
> Accounts > Payment Entry > New Payment Entry
|
||||||
|
|
||||||
|
Set the Payment Type to "Pay", the Party Type to Employee, the Party to the employee being paid and the account being paid
|
||||||
|
from. All outstanding expense claims will be pulled in and payments amounts can be allocated to each expense.
|
||||||
|
<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim_payment_entry.png">
|
||||||
|
|
||||||
### Linking with Task & Project
|
### Linking with Task & Project
|
||||||
|
|
||||||
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
|
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
|
||||||
|
@ -25,7 +25,7 @@ class TestExpenseClaim(unittest.TestCase):
|
|||||||
task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
|
task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
|
||||||
payable_account = get_payable_account("Wind Power LLC")
|
payable_account = get_payable_account("Wind Power LLC")
|
||||||
|
|
||||||
expense_claim = make_expense_claim(payable_account, 300, 200, "Wind Power LLC","Travel Expenses - WP", "_Test Project 1", task_name)
|
make_expense_claim(payable_account, 300, 200, "Wind Power LLC","Travel Expenses - WP", "_Test Project 1", task_name)
|
||||||
|
|
||||||
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
|
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
|
||||||
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
|
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user