From f5116f473794de6d652968dc4ff1aa7cf1319097 Mon Sep 17 00:00:00 2001 From: Mitali Deshpande Date: Thu, 20 Sep 2018 17:39:08 +0530 Subject: [PATCH 1/4] Fix typo on non profit index page --- foundation/www/docs/user/manual/en/non_profit/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/www/docs/user/manual/en/non_profit/index.md b/foundation/www/docs/user/manual/en/non_profit/index.md index 8ed2546a..2f4b9543 100755 --- a/foundation/www/docs/user/manual/en/non_profit/index.md +++ b/foundation/www/docs/user/manual/en/non_profit/index.md @@ -1,7 +1,7 @@ # 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. Non Profit From eb9faef76eaf33a07ce07c10c3f02e3c33a3b4cb Mon Sep 17 00:00:00 2001 From: crescent28 <41110073+crescent28@users.noreply.github.com> Date: Mon, 24 Sep 2018 12:05:19 +0530 Subject: [PATCH 2/4] Update agri --- .../docs/user/manual/en/agriculture/crops_and_land/crop.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md index 7769b23e..9cc952b5 100755 --- a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md @@ -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. -> Agriculture > Crop +> Agriculture > Crop . On the desk, click on the Crop icon. A list will show any existing Crops. @@ -48,4 +48,4 @@ You form should now look something like this Task -Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items \ No newline at end of file +Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items From e4ec42a5cbefd94e8dc9a4ee83f4bf4bb1eac791 Mon Sep 17 00:00:00 2001 From: Mitali Deshpande Date: Mon, 24 Sep 2018 12:54:53 +0530 Subject: [PATCH 3/4] Fixed Minor Typos in Multiple Modules --- foundation/www/docs/user/manual/en/buying/supplier.md | 2 +- .../en/education/Attendance/student-attendance-tool.md | 2 +- .../en/education/Attendance/student-leave-application.md | 2 +- .../en/human-resources/payroll/additional-salary.md | 2 +- .../payroll/employee-benefit-application.md | 2 +- .../en/human-resources/payroll/employee-benefit-claim.md | 2 +- .../payroll/employee-tax-exemption-declaration.md | 2 +- .../payroll/employee-tax-exemption-proof-submission.md | 2 +- .../www/docs/user/manual/en/projects/timesheet/index.md | 2 +- .../en/projects/timesheet/salary-slip-from-timesheet.md | 8 ++++---- .../en/projects/timesheet/sales-invoice-from-timesheet.md | 6 +++--- .../en/projects/timesheet/timesheet-against-work-order.md | 4 ++-- .../www/docs/user/manual/en/support/support_reports.md | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/foundation/www/docs/user/manual/en/buying/supplier.md b/foundation/www/docs/user/manual/en/buying/supplier.md index 74e478e3..5a4c64d8 100755 --- a/foundation/www/docs/user/manual/en/buying/supplier.md +++ b/foundation/www/docs/user/manual/en/buying/supplier.md @@ -11,7 +11,7 @@ You can create a new Supplier from: ### 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. Supplier Master diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md index 4392fda8..41aa1555 100755 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -9,7 +9,7 @@ To mark the **Attedance* based on Student Group select the group based on 2. Course 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. Student Attendance diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md index e9128f5c..07221f8e 100755 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -3,7 +3,7 @@ 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. Student Attendance diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/additional-salary.md b/foundation/www/docs/user/manual/en/human-resources/payroll/additional-salary.md index b589296f..ddfd1b90 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/additional-salary.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/additional-salary.md @@ -7,7 +7,7 @@ ERPNext allows you to add additional Salary Components (_Is Additional Component Additional Salary -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 diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-application.md b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-application.md index 276dbd84..cc923d18 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-application.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-application.md @@ -9,7 +9,7 @@ To create a new Employee Benefit Application, Employee Benefit Application -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. diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md index 936d1fe6..3451fc8c 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md @@ -10,7 +10,7 @@ You can create a new Employee Benefit Claim by going to, Employee Benefit Claim -Here, Employee can view the 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. diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-declaration.md b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-declaration.md index a78cdab3..2d6982a3 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-declaration.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-declaration.md @@ -7,7 +7,7 @@ At the beginning of a Payroll Period, employees can declare the amount of exempt Employee Tax Exemption Declaration -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. diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-proof-submission.md b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-proof-submission.md index 99a61e71..cdfe3f0b 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-proof-submission.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-tax-exemption-proof-submission.md @@ -9,7 +9,7 @@ To create a new Employee Tax Exemption Proof Submission, go to Employee Tax Exemption Proof Submission -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. diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/index.md b/foundation/www/docs/user/manual/en/projects/timesheet/index.md index 40378bd3..443d7682 100755 --- a/foundation/www/docs/user/manual/en/projects/timesheet/index.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/index.md @@ -1,7 +1,7 @@ # 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 * Work Order Operations diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md index 24ff480d..53b0d8ba 100755 --- a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md @@ -5,7 +5,7 @@ If salary / wages for your employees are calculated based on number of hours wor ####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. Sales Invoice @@ -15,7 +15,7 @@ In the Salary Structure of the Employee, check field "Salary Slip Based on Times
Total Timesheet Hours * Hour Rate
-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.
Sales Invoice @@ -31,7 +31,7 @@ In the Salary Slip, Timesheet ID will be updated. You can select more Timesheet Sales Invoice -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.
+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.
#### 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.
  1. Employee created Timesheet for the overtime.
    2. -
  2. In the Salary Structure of an Employee, set Overtime as a Salary Component to be calculated based on hourly bases.
    3. +
  3. In the Salary Structure of an Employee, set Overtime as a Salary Component to be calculated based on hourly basis.
  4. When creating Salary Structure for an Employee, pull Timesheet when overtime details are tracked.
\ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md index 24dc1687..763f549e 100755 --- a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md @@ -1,7 +1,7 @@ #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 @@ -13,7 +13,7 @@ To create new Timesheet, go to: #### 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. Sales Invoice @@ -64,7 +64,7 @@ Select Customer to be billed. Select an Item, and enter rate as the billing amou ####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. diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md index 691db2e4..f357f77a 100755 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md @@ -1,7 +1,7 @@ #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. @@ -15,7 +15,7 @@ As per the Bill of Materials of manufacturing item, following are the Operations Sales Invoice -On submission on Work Order, Timesheet will be created automatically. +On submission of Work Order, Timesheet will be created automatically. Sales Invoice diff --git a/foundation/www/docs/user/manual/en/support/support_reports.md b/foundation/www/docs/user/manual/en/support/support_reports.md index 741455e9..f7a8027b 100755 --- a/foundation/www/docs/user/manual/en/support/support_reports.md +++ b/foundation/www/docs/user/manual/en/support/support_reports.md @@ -4,7 +4,7 @@ ### 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 From 7eafe527fb2e8226439ba69adee62b3e11ff7422 Mon Sep 17 00:00:00 2001 From: Mitali Deshpande Date: Mon, 24 Sep 2018 13:21:08 +0530 Subject: [PATCH 4/4] Fixed Conflict --- .../en/human-resources/payroll/employee-benefit-claim.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md index b49bbb29..3451fc8c 100644 --- a/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md +++ b/foundation/www/docs/user/manual/en/human-resources/payroll/employee-benefit-claim.md @@ -10,11 +10,7 @@ You can create a new Employee Benefit Claim by going to, Employee Benefit Claim -<<<<<<< HEAD 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. -======= -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. ->>>>>>> c1d9932d4b9cd3d2416b8339202ff8dbd59310bf > 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.