Merge pull request #310 from crescent28/master

Fixed Typo in Multiple Modules.
This commit is contained in:
Shreya Shah
2018-09-24 14:49:13 +05:30
committed by GitHub
15 changed files with 22 additions and 22 deletions

View File

@@ -3,7 +3,7 @@
Now we need to specify what our crop will be. A crop summarizes all that is necessary before creatng our first crop cycle or planting. Now we need to specify what our crop will be. A crop summarizes all that is necessary before creatng our first crop cycle or planting.
> Agriculture > Crop > Agriculture > Crop .
On the desk, click on the Crop icon. A list will show any existing Crops. On the desk, click on the Crop icon. A list will show any existing Crops.

View File

@@ -11,7 +11,7 @@ You can create a new Supplier from:
### Contacts and Addresses ### Contacts and Addresses
Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find the option to create Contact and Address for that Supplier. Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Supplier. Once Supplier is saved, you will find the option to create Contact and Address for that Supplier.
<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-new-address-contact.png"> <img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-new-address-contact.png">

View File

@@ -9,7 +9,7 @@ To mark the **Attedance* based on Student Group select the group based on
2. Course 2. Course
3. Activity ** 3. Activity **
Student detials will be autofetched and you can mark the attendance of the given date. Student details will be autofetched and you can mark the attendance of the given date.
<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/setup/student-attendance-tool.gif"> <img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/setup/student-attendance-tool.gif">

View File

@@ -3,7 +3,7 @@
ERPNext allows you to record the leave application for a student. ERPNext allows you to record the leave application for a student.
To create a Student Leave application record, enter the Student and the date for the leave is applied and save. To create a Student Leave application record, enter the Student and the date for which the leave is applied and save.
<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/schedule/student-leave-application.gif"> <img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/schedule/student-leave-application.gif">

View File

@@ -7,7 +7,7 @@ ERPNext allows you to add additional Salary Components (_Is Additional Component
<img class="screenshot" alt="Additional Salary" src="{{docs_base_url}}/assets/img/human-resources/additional-salary.png"> <img class="screenshot" alt="Additional Salary" src="{{docs_base_url}}/assets/img/human-resources/additional-salary.png">
You can select the Employee to whom you wish to disburse the Additional Salary, the Salary Component and the period for which the employee is entitled to receive the Additional. If the period (From and To dates) consists on multiple payroll periods, the amount will be disbursed on a pro-rata basis. You can select the Employee to whom you wish to disburse the Additional Salary, the Salary Component and the period for which the employee is entitled to receive the Additional Salary. If the period (From and To dates) consists on multiple payroll periods, the amount will be disbursed on a pro-rata basis.
> Note: The Salary Component can also be a deduction component which will add the Additional Salary to the Deductions table in the Salary Slip > Note: The Salary Component can also be a deduction component which will add the Additional Salary to the Deductions table in the Salary Slip

View File

@@ -9,7 +9,7 @@ To create a new Employee Benefit Application,
<img class="screenshot" alt="Employee Benefit Application" src="{{docs_base_url}}/assets/img/human-resources/employee-benefit-application.png"> <img class="screenshot" alt="Employee Benefit Application" src="{{docs_base_url}}/assets/img/human-resources/employee-benefit-application.png">
Here, Employee can view the Max Benefits as per the Salary Structure Assignment and then chose from the Earning Components which are part of the employee's assigned Salary Structure. They can also enter the amount which they wish to receive as part fo their Salary Slip. Here, Employee can view the Max Benefits as per the Salary Structure Assignment and then chose from the Earning Components which are part of the employee's assigned Salary Structure. They can also enter the amount which they wish to receive as part of their Salary Slip.
It is based on the Employee Benefit Application that the Max Benefit Amount will be distributed among the flexible earning components while generating the Salary Slip. If an Employee fails to submit the Employee Benefit Application before processing the payroll, the Max Benefit Amount eligible to the employee will be distributed proportionately to each of the flexible component present in the Employee's salary structure. It is based on the Employee Benefit Application that the Max Benefit Amount will be distributed among the flexible earning components while generating the Salary Slip. If an Employee fails to submit the Employee Benefit Application before processing the payroll, the Max Benefit Amount eligible to the employee will be distributed proportionately to each of the flexible component present in the Employee's salary structure.

View File

@@ -10,7 +10,7 @@ You can create a new Employee Benefit Claim by going to,
<img class="screenshot" alt="Employee Benefit Claim" src="{{docs_base_url}}/assets/img/human-resources/employee-benefit-claim.png"> <img class="screenshot" alt="Employee Benefit Claim" src="{{docs_base_url}}/assets/img/human-resources/employee-benefit-claim.png">
Here, Employee can view the eligible amount as per their Salary Structure Assignment and claim for the amount which they wish to receive as part fo their next Salary. Any remaining amount which the employee did not claim for, in a Payroll Period, will be disbursed as part of the last payroll Salary. Here, Employee can view the eligible amount as per their Salary Structure Assignment and claim for the amount which they wish to receive as part of their next Salary. Any remaining amount which the employee did not claim for, in a Payroll Period, will be disbursed as part of the last payroll Salary.
> Note: Normal Tax calculation does not include Flexible Benefits as in most cases these are exempted from Tax. To tax these components anytime before the last payroll, use _Deduct Tax For Unclaimed Employee Benefits_ in Payroll Entry / Salary Slip while processing the Salary. > Note: Normal Tax calculation does not include Flexible Benefits as in most cases these are exempted from Tax. To tax these components anytime before the last payroll, use _Deduct Tax For Unclaimed Employee Benefits_ in Payroll Entry / Salary Slip while processing the Salary.

View File

@@ -7,7 +7,7 @@ At the beginning of a Payroll Period, employees can declare the amount of exempt
<img class="screenshot" alt="Employee Tax Exemption Declaration" <img class="screenshot" alt="Employee Tax Exemption Declaration"
src="{{docs_base_url}}/assets/img/human-resources/employee-tax-exemption-declaration.png"> src="{{docs_base_url}}/assets/img/human-resources/employee-tax-exemption-declaration.png">
The the _Total Exemption Amount_ will be exempted from annual taxable earnings of the employee while calculating the tax deductions in Payroll. The _Total Exemption Amount_ will be exempted from annual taxable earnings of the employee while calculating the tax deductions in Payroll.
> Note: Employees can only submit one Employee Tax Exemption Declaration for a Payroll Period. > Note: Employees can only submit one Employee Tax Exemption Declaration for a Payroll Period.

View File

@@ -9,7 +9,7 @@ To create a new Employee Tax Exemption Proof Submission, go to
<img class="screenshot" alt="Employee Tax Exemption Proof Submission" <img class="screenshot" alt="Employee Tax Exemption Proof Submission"
src="{{docs_base_url}}/assets/img/human-resources/employee-tax-exemption-proof-submission.png"> src="{{docs_base_url}}/assets/img/human-resources/employee-tax-exemption-proof-submission.png">
The the _Total Exemption Amount_ will be exempted from annual taxable earnings of the employee while calculating the tax deductions in the last payroll. The _Total Exemption Amount_ will be exempted from annual taxable earnings of the employee while calculating the tax deductions in the last payroll.
> Note: Even if employees submit exemption proofs anytime during the payroll period, ERPNext will only consider this in the last payroll of the Payroll Period for adjusting the final taxes based on the proof submitted. If you need to adjust any additional tax collected or consider proof submission of employees anytime before the last payroll, while processing Payroll Entry (or in the Salary Slip of the employee) check the _Deduct Tax For Unsubmitted Tax Exemption Proof_ option. > Note: Even if employees submit exemption proofs anytime during the payroll period, ERPNext will only consider this in the last payroll of the Payroll Period for adjusting the final taxes based on the proof submitted. If you need to adjust any additional tax collected or consider proof submission of employees anytime before the last payroll, while processing Payroll Entry (or in the Salary Slip of the employee) check the _Deduct Tax For Unsubmitted Tax Exemption Proof_ option.

View File

@@ -1,7 +1,7 @@
<!-- add-breadcrumbs --> <!-- add-breadcrumbs -->
# ERPNext for Non-Profit Organizations # ERPNext for Non-Profit Organizations
People who change the world need the tools to do it! The Non Profit Modules of ERPNext is designed for an non-profit organization, so that they can deliver well on their noble cause of a better world. People who change the world need the tools to do it! The Non Profit Modules of ERPNext is designed for a non-profit organization, so that they can deliver well on their noble cause of a better world.
<img class="screenshot" alt="Non Profit" src="{{docs_base_url}}/assets/img/non_profit/non-profit-hero-linus.png"> <img class="screenshot" alt="Non Profit" src="{{docs_base_url}}/assets/img/non_profit/non-profit-hero-linus.png">

View File

@@ -1,7 +1,7 @@
<!-- add-breadcrumbs --> <!-- add-breadcrumbs -->
# Timesheet # Timesheet
Timesheet can be used for track actual hours worked. It can be used for multiple purposes like: Timesheet can be used to track actual hours worked. It can be used for multiple purposes like:
* Billable work to Customers * Billable work to Customers
* Work Order Operations * Work Order Operations

View File

@@ -5,7 +5,7 @@ If salary / wages for your employees are calculated based on number of hours wor
####Employee creates Timesheet ####Employee creates Timesheet
To track actual hours employee has worked for, create Timesheet for each Employee. We suggest you to create Timesheet based on a payment period. For example, if you paying employee on a weekly bases, create one Timesheet for an Employee for one week. However, you can create multiple Timesheets, and create one Salary Slip for the multiple Timesheets. To track actual hours employee has worked for, create Timesheet for each Employee. We suggest you to create Timesheet based on a payment period. For example, if you are paying employee on a weekly basis, create one Timesheet for an Employee for one week. However, you can create multiple Timesheets, and create one Salary Slip for the multiple Timesheets.
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-1.png"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-1.png">
@@ -15,7 +15,7 @@ In the Salary Structure of the Employee, check field "Salary Slip Based on Times
<div class=well> Total Timesheet Hours * Hour Rate </div> <div class=well> Total Timesheet Hours * Hour Rate </div>
Amount directly for other Salary Components (eg: House Rent Allowance, Phone Allowance) can be define directly. When creating Salary Slip, Amount for these Salary Component will be fetched as it is. Amount directly for other Salary Components (eg: House Rent Allowance, Phone Allowance) can be defined directly. When creating Salary Slip, Amount for these Salary Component will be fetched as it is.
<div> <div>
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-2.png"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-2.png">
@@ -31,7 +31,7 @@ In the Salary Slip, Timesheet ID will be updated. You can select more Timesheet
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-4.gif"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-4.gif">
Hour Rate will be fetched from the Salary Structure of an Employee. Based on Total Working Hours and Hour Rate, Amount will be calculated for the Salary Component is to be calculated based on actual hours worked.<br> Hour Rate will be fetched from the Salary Structure of an Employee. Based on Total Working Hours and Hour Rate, Amount will be calculated for the Salary Component based on actual hours worked.<br>
#### Save and Submit Salary Slip #### Save and Submit Salary Slip
@@ -44,7 +44,7 @@ On Submission of Salary Slip, Timesheet's status will be updated to "Payslip".
Creating Salary Slip based on Timesheet will allow you to manage payment for the overtime. Creating Salary Slip based on Timesheet will allow you to manage payment for the overtime.
<ol> <ol>
<li>Employee created Timesheet for the overtime.</li> <li>Employee created Timesheet for the overtime.</li>
<li>In the Salary Structure of an Employee, set Overtime as a Salary Component to be calculated based on hourly bases.</li> <li>In the Salary Structure of an Employee, set Overtime as a Salary Component to be calculated based on hourly basis.</li>
<li>When creating Salary Structure for an Employee, pull Timesheet when overtime details are tracked.</li> <li>When creating Salary Structure for an Employee, pull Timesheet when overtime details are tracked.</li>
</ol> </ol>
</div> </div>

View File

@@ -1,7 +1,7 @@
<!-- add-breadcrumbs --> <!-- add-breadcrumbs -->
#Sales Invoice from Timesheet #Sales Invoice from Timesheet
Customer can be invoiced based on total no. of hours your Employees has worked for that Customer. Timesheet can be used to track actual no. of hours Employee has worked. For example, in the IT services domain, clients are billed based on man-hour bases, where per hour billing cost is pre-determined.s Customer can be invoiced based on total no. of hours your Employees has worked for that Customer. Timesheet can be used to track actual no. of hours Employee has worked. For example, in the IT services domain, clients are billed based on man-hour basis, where per hour billing cost is pre-determined.
###Timesheet ###Timesheet
@@ -13,7 +13,7 @@ To create new Timesheet, go to:
#### Step 2: Select Employee #### Step 2: Select Employee
In the Employee field, only ones having ative Salary Structure will be selectable. Further in the Salary Structure , is created for the E on the actual hours worked, Employee can create Timesheet. To be able to create Sales Invoice against this Timesheet, ensure `Billable` field is checked. In the Employee field, only ones having active Salary Structure will be selectable. Further in the Salary Structure , is created for the E on the actual hours worked, Employee can create Timesheet. To be able to create Sales Invoice against this Timesheet, ensure `Billable` field is checked.
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-structure.png"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-structure.png">
@@ -64,7 +64,7 @@ Select Customer to be billed. Select an Item, and enter rate as the billing amou
####Save ####Save
After enter all required details in the Sales Invoice, Save and Submit it. After you enter all required details in the Sales Invoice, Save and Submit it.
On submitting Sales Invoice, status of the Timesheets linked to the Sales Invoice will be updated as Billed. On submitting Sales Invoice, status of the Timesheets linked to the Sales Invoice will be updated as Billed.

View File

@@ -1,7 +1,7 @@
<!-- add-breadcrumbs --> <!-- add-breadcrumbs -->
#Timesheet based on Work Order #Timesheet based on Work Order
Creating Timesheet for Work Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation. Creating Timesheet for Work Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed by the Workstation for completing specific operation.
When a Work Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet. When a Work Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
@@ -15,7 +15,7 @@ As per the Bill of Materials of manufacturing item, following are the Operations
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-1.png"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-1.png">
On submission on Work Order, Timesheet will be created automatically. On submission of Work Order, Timesheet will be created automatically.
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-2.png"> <img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-2.png">

View File

@@ -4,7 +4,7 @@
### Support Hours ### Support Hours
This report provide the information about the time slot along with the count of issues has been reported during the slot daywise. This report provides the information about the time slot along with the count of issues that has been reported during the slot daywise.
> Support > Reports > Support Hours > Support > Reports > Support Hours