+
+
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
index b1ad745ee9..b7599b84f3 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
@@ -15,8 +15,6 @@ On the same lines, you can also define multiple Assessment Group bases on assess
-
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
index 0bb7e6b36d..de13c80f7c 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
@@ -21,8 +21,6 @@ To schedule an assessment/examination for a Student Group, for specific Course,
-
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
index 4ca91a710b..a83a890463 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
@@ -8,8 +8,6 @@ Assessment Result is a log of marks/grades earned by the student for specific As
-
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
index f57fc182c1..39783258c9 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
@@ -11,8 +11,6 @@ As you go on entering marks for a Student, and switch to next student, in the ba
-
diff --git a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
index 3d8f2e9ce3..790b04aa48 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
@@ -9,8 +9,6 @@ In the Grading Scale, you can define various grades and threshold for them. Base
-
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
index cc526b5f6c..4ad2ab8861 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
@@ -17,8 +17,6 @@ Student detials will be autofetched and you can mark the attendance of the given
-
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
index 0ebb65cd48..c9aba9fef1 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
@@ -17,8 +17,6 @@ Select the **Student, Course Schedule and Student Group** for which attendance i
-
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
index 406c20db3e..907dc8eaa6 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
@@ -15,8 +15,6 @@ Once a Leave Application is recorded for a student it will not be recorded in th
-
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
index fa2e09a7d8..e464d45b44 100644
--- a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
@@ -22,8 +22,6 @@ For promoting the students, the new academic year, academic term and program can
-
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
index 54bf98b521..8acff83e75 100644
--- a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
@@ -21,7 +21,6 @@ Student Category: For the Institutions having multiple Fees Structure, this fiel
-
diff --git a/erpnext/docs/user/manual/en/education/admission/student-applicant.md b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
index 2f725424e9..ec8184d644 100644
--- a/erpnext/docs/user/manual/en/education/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
@@ -32,7 +32,6 @@ the system shall create a student against that applicant and redirect you to the
-
diff --git a/erpnext/docs/user/manual/en/education/admission/student_admission.md b/erpnext/docs/user/manual/en/education/admission/student_admission.md
index ff98a923e2..ede45a80f6 100644
--- a/erpnext/docs/user/manual/en/education/admission/student_admission.md
+++ b/erpnext/docs/user/manual/en/education/admission/student_admission.md
@@ -4,7 +4,7 @@ The admission process begins with filling the admission form. The Student Admiss
To create a Student Admission record go to :
-**education** >> **Admissions** >> **Student Admission** >>
+> **education** > **Admissions** > **Student Admission** >
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
index f502b93220..3218f17d34 100644
--- a/erpnext/docs/user/manual/en/education/fees/fee-structure.md
+++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
@@ -24,8 +24,6 @@ If you are going to use this in the Fee Schedule, you must select the Accounts c
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
index f502b93220..3218f17d34 100644
--- a/erpnext/docs/user/manual/en/education/fees/fee-structure.md
+++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
@@ -24,8 +24,6 @@ If you are going to use this in the Fee Schedule, you must select the Accounts c
-
diff --git a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
index eeccae456c..342e4c9c9b 100644
--- a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
+++ b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
@@ -9,8 +9,6 @@ You can see the overall course schedule in the Calendar view.
-
diff --git a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
index 65dd95bd3a..6b306037fd 100644
--- a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
+++ b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
@@ -23,7 +23,6 @@ This tool can be used to create 'Course Schedules'.
#### Video Tutorial on Scheduling Tool
-
diff --git a/erpnext/docs/user/manual/en/education/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md
index 609cac4c70..d55dbae3a3 100644
--- a/erpnext/docs/user/manual/en/education/setup/course.md
+++ b/erpnext/docs/user/manual/en/education/setup/course.md
@@ -14,9 +14,7 @@ The Course form is further linked to **Program, Student Group and Assessment Pla
-
-
+
diff --git a/erpnext/docs/user/manual/en/education/setup/instructor.md b/erpnext/docs/user/manual/en/education/setup/instructor.md
index 9f4dbdca2c..32e5e215c7 100644
--- a/erpnext/docs/user/manual/en/education/setup/instructor.md
+++ b/erpnext/docs/user/manual/en/education/setup/instructor.md
@@ -20,8 +20,6 @@ Further, the log for the Instructor can be entered in the Instructor Log table w
-
diff --git a/erpnext/docs/user/manual/en/education/setup/program.md b/erpnext/docs/user/manual/en/education/setup/program.md
index e9fb091164..5e476d2599 100644
--- a/erpnext/docs/user/manual/en/education/setup/program.md
+++ b/erpnext/docs/user/manual/en/education/setup/program.md
@@ -19,9 +19,7 @@ The Program Doctype is further linked to the **Student applicant**, **Program en
#### Video Tutorial on Program and Courses
-
-
+
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index 7cf9b54c14..39b2657c1e 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -16,4 +16,10 @@ Example of a change in print heading is shown below:
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 5a8b2d272e..2886c0573a 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -97,5 +97,13 @@ Consider Tax or Charge for: In this section you can specify if the tax /
charge is only for valuation (not a part of total) or only for total (does not
add value to the item) or for both.
+
+
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-advance.md b/erpnext/docs/user/manual/en/human-resources/employee-advance.md
index 49f22e8c6e..46620f2e8b 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-advance.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-advance.md
@@ -29,4 +29,8 @@ On submission of payment entry, the paid amount and status will be updated in Em
### Adjust advances on Expense Claim
Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record.
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
index b76a2260c7..e85b5d6fa4 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -52,5 +52,9 @@ To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Empl
+
-
\ No newline at end of file
+{nex}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
index 32e332a804..092d11d672 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -8,4 +8,8 @@ To create new Employee go to:
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 655935b59a..9f53da1372 100644
--- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -11,6 +11,12 @@ To make a new Expense Claim, go to:
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
+
+
+
### Set Account for Employee
Set employee's expense account on the employee form, system books an expense amount of an employee under this account.
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index b9855ab1c5..c735a6bae6 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -23,4 +23,10 @@ settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manu
for more info.
You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html)
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index eff40efbf2..7e7aab12f8 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -169,6 +169,9 @@ created.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
index fcaf43e82a..05f8956f82 100644
--- a/erpnext/docs/user/manual/en/introduction/index.md
+++ b/erpnext/docs/user/manual/en/introduction/index.md
@@ -41,6 +41,12 @@ Among other things, ERPNext will help you to:
And a lot lot lot more.
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 4ceb4fc480..4e2c129389 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -15,6 +15,11 @@ by:
+
+
+
You can also track % Completion of a Project using different methods.
1. Task Completion
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
index cae54f4194..0e529aaa4a 100644
--- a/erpnext/docs/user/manual/en/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -58,4 +58,8 @@ The system shall update the total amount from expense claims in the costing sect
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
index 1524677d48..68b2a2f523 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
@@ -4,6 +4,11 @@ Timesheets can be tracked against Project and Tasks so that you can get reports
+
+
+
####Billable Timesheet
To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here](/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html).
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 2d12ff4a21..d645ab1040 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -43,4 +43,9 @@ You can notify, Suppliers by sending a email after submitting Purchase Order by
###Video Help on Drop Ship
-
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
index 36a99d2173..3fa3dcc0c1 100644
--- a/erpnext/docs/user/manual/en/selling/index.md
+++ b/erpnext/docs/user/manual/en/selling/index.md
@@ -9,3 +9,9 @@ organized and searchable manner.
### Topics
{index}
+
+
+
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
index adeeee453f..a8215a389b 100644
--- a/erpnext/docs/user/manual/en/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -4,11 +4,11 @@ Item Price is the record in which you can log sellig and buying rate of an item.
There are two ways to reach to new Item Price form.
-> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+> Selling/Buying/Stock > Setup > Item Price > New Item Price
Or
-> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+> Item > Add/Edit Prices > Click on "+" >> New Item Price
Following are the steps to create new Item Price.
@@ -16,7 +16,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-+
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -26,20 +26,28 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-+
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-+
+
Step 4: Save Item Price
To check all Item Price together, go to:
-Stock >> Main Report >> Itemwise Price List Rate
+> Stock > Main Report > Itemwise Price List Rate
You will find option to create new Item Price record (+) in this report as well.
+div>
+
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
index d5aca1a006..62b8e87e72 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -42,4 +42,9 @@ If you would like ERPNext to notify you if an email is unreplied for a certain a
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
index b76a2260c7..e85b5d6fa4 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -52,5 +52,9 @@ To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Empl
+
-
\ No newline at end of file
+{nex}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
index 32e332a804..092d11d672 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -8,4 +8,8 @@ To create new Employee go to:
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 655935b59a..9f53da1372 100644
--- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -11,6 +11,12 @@ To make a new Expense Claim, go to:
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
+
+
+
### Set Account for Employee
Set employee's expense account on the employee form, system books an expense amount of an employee under this account.
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index b9855ab1c5..c735a6bae6 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -23,4 +23,10 @@ settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manu
for more info.
You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html)
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index eff40efbf2..7e7aab12f8 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -169,6 +169,9 @@ created.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
index fcaf43e82a..05f8956f82 100644
--- a/erpnext/docs/user/manual/en/introduction/index.md
+++ b/erpnext/docs/user/manual/en/introduction/index.md
@@ -41,6 +41,12 @@ Among other things, ERPNext will help you to:
And a lot lot lot more.
+
+
+
### Topics
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 11a7cac7bf..0557d2cf75 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -5,6 +5,12 @@ The **BOM** is a list of all materials (either bought or made) and operations
that go into a finished product or sub-Item. In ERPNext, the component could
have its own BOM hence forming a tree of Items with multiple levels.
+
+
+
To make accurate Purchase Requests, you must always maintain correct BOMs.
To make a new BOM:
diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
index 75066aa606..bc94579c6a 100644
--- a/erpnext/docs/user/manual/en/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -10,4 +10,9 @@ You can also create a Operation by:
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 4ceb4fc480..4e2c129389 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -15,6 +15,11 @@ by:
+
+
+
+
### Creating Production Orders
* Select the Item to be produced.
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index 9f253d6384..0887a8f1c9 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -3,6 +3,11 @@
Production Planning Tool helps you plan production and purchase of Items for a
period (usually a week or a month).
+
+
+
+
This list of Items can be generated from the open Sales Orders or pending Material Requests that can be Manufactured in the system
and will generate:
diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
index 80654f43e3..7388e16ebc 100644
--- a/erpnext/docs/user/manual/en/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -18,4 +18,10 @@ While scheduling Production Order, system will check for the availability of the
> Note : You can enable overtime for your workstation in [Manufacturing Settings](/docs/user/manual/en/manufacturing/setup/manufacturing-settings.html)
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index 25f28d5878..82f0e6dd6f 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -4,6 +4,11 @@ Project management in ERPNext is Task driven. You can create Project and assign
+
+
You can also track % Completion of a Project using different methods.
1. Task Completion
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
index cae54f4194..0e529aaa4a 100644
--- a/erpnext/docs/user/manual/en/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -58,4 +58,8 @@ The system shall update the total amount from expense claims in the costing sect
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
index 1524677d48..68b2a2f523 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
@@ -4,6 +4,11 @@ Timesheets can be tracked against Project and Tasks so that you can get reports
+
+
+
####Billable Timesheet
To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here](/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html).
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 2d12ff4a21..d645ab1040 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -43,4 +43,9 @@ You can notify, Suppliers by sending a email after submitting Purchase Order by
###Video Help on Drop Ship
-
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
index 36a99d2173..3fa3dcc0c1 100644
--- a/erpnext/docs/user/manual/en/selling/index.md
+++ b/erpnext/docs/user/manual/en/selling/index.md
@@ -9,3 +9,9 @@ organized and searchable manner.
### Topics
{index}
+
+
+
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
index adeeee453f..a8215a389b 100644
--- a/erpnext/docs/user/manual/en/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -4,11 +4,11 @@ Item Price is the record in which you can log sellig and buying rate of an item.
There are two ways to reach to new Item Price form.
-> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+> Selling/Buying/Stock > Setup > Item Price > New Item Price
Or
-> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+> Item > Add/Edit Prices > Click on "+" >> New Item Price
Following are the steps to create new Item Price.
@@ -16,7 +16,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-+
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -26,20 +26,28 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-+
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-+
+
Step 4: Save Item Price
To check all Item Price together, go to:
-Stock >> Main Report >> Itemwise Price List Rate
+> Stock > Main Report > Itemwise Price List Rate
You will find option to create new Item Price record (+) in this report as well.
+div>
+
+
+
+
+
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
index 72b79e1ad9..4a92965ac3 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -4,6 +4,11 @@ Each company has default Letter Head for their company. This Letter Head values
In the Letter Head master, you can track Header and Footer details of the company. These details will appear in the Print Format of the transactions like Sales Order, Sales Invoice, Salary Slip, Purchase Order etc.
+
+
####Step 1: Go to Setup
`Explore > Setup > Printing > Letter Head > New Letter Head`
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
index f9799279af..039b4706d2 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
@@ -8,6 +8,11 @@ You can create a new Print Format either by going to:
or Open the document for which you want to make a print format. Click the Printer icon, or go to Menu > Print and click on the **Edit** button. Note: You must have System Manager permission to do this.
+
+
### Step 1: Make a new Format
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index 7cf9b54c14..39b2657c1e 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -16,4 +16,10 @@ Example of a change in print heading is shown below:
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 5a8b2d272e..2886c0573a 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -97,5 +97,13 @@ Consider Tax or Charge for: In this section you can specify if the tax /
charge is only for valuation (not a part of total) or only for total (does not
add value to the item) or for both.
+
+
+
+
+ 
-{next}
-
### 4. Custom Field in Naming Series
+
Some companies prefers to make use of "short-codes" for suppliers, i.e. WN for company "Web Notes" that later can be used in naming series for quick identification.
#### Example:
@@ -55,3 +54,14 @@ See how to set the naming series
Then under Naming Series, we should allow something like
PO-.YY.MM.-.vendor_id.-.#####
Resulting in "PO-1503-WN-00001"
+
+
+
+
The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
+
After adding these details, save the user.
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
index dcfd77649c..6c07761bbb 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
@@ -8,6 +8,13 @@ roles and permissions.
The most important role is the "System Manager". Any user having this role can add other users and set roles to all users.
+
+
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
similarity index 91%
rename from erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
rename to erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
index 6ed111b99a..0661a2e12a 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
@@ -1,4 +1,4 @@
-#Opening Stock Balance Entry for the Serialized and Batch Item
+#Opening Stock Balance Entry for Serialized and Batch Item
Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](/docs/user/manual/en/stock/serial-no.html).
@@ -57,4 +57,11 @@ As per perpetual inventory valuation system, accounting entry is created for eve
On submission of Stock Entry, stock ledger posting will be posted, and opening balance will be updated for the items on a given Posting Date.
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index 086a272821..652a6874c3 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -44,9 +44,8 @@ See how to set the naming series
-{next}
-
### 4. Custom Field in Naming Series
+
Some companies prefers to make use of "short-codes" for suppliers, i.e. WN for company "Web Notes" that later can be used in naming series for quick identification.
#### Example:
@@ -55,3 +54,14 @@ See how to set the naming series
Then under Naming Series, we should allow something like
PO-.YY.MM.-.vendor_id.-.#####
Resulting in "PO-1503-WN-00001"
+
+
+
+
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 6fb64df37e..65cf77c277 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -20,9 +20,12 @@ To add a new user, click on "New"
Add user details such as First Name, Last Name, Email etc.
+
+
The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
+
After adding these details, save the user.
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
index dcfd77649c..6c07761bbb 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
@@ -8,6 +8,13 @@ roles and permissions.
The most important role is the "System Manager". Any user having this role can add other users and set roles to all users.
+
+
+
+
### Topics
{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index 06c47d7aa4..731fb3d48b 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -59,4 +59,9 @@ When the Leave Approver opens the Leave Application page, he can finally "Approv
+
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index acf1375214..4875de51e7 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -5,7 +5,7 @@ maintain-stock-field-frozen-in-item-master
manage-rejected-finished-goods-items
managing-batch-wise-inventory
managing-fractions-in-uom
-opening-stock-balance-entry-for-the-serialized-and-batch-item
+opening-stock-balance-entry-for-serialized-and-batch-item
repack-entry
serial-no-naming
stock-entry-purpose
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
index 82408bd4e3..f66c8132aa 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -33,3 +33,10 @@ To check batch-wise stock balance report, go to:
Stock > Standard Reports > Batch-wise Balance History
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
similarity index 91%
rename from erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
rename to erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
index 6ed111b99a..0661a2e12a 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md
@@ -1,4 +1,4 @@
-#Opening Stock Balance Entry for the Serialized and Batch Item
+#Opening Stock Balance Entry for Serialized and Batch Item
Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](/docs/user/manual/en/stock/serial-no.html).
@@ -57,4 +57,11 @@ As per perpetual inventory valuation system, accounting entry is created for eve
On submission of Stock Entry, stock ledger posting will be posted, and opening balance will be updated for the items on a given Posting Date.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index 5b57c60ca1..b12a174a38 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -4,6 +4,13 @@ An Item is your companys' product or a service. The term Item is applicable to t
ERPNext is optimised for itemised management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext.
+)
-
-
-
***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
***Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order.
-
-
### Manufacturing And Website
diff --git a/erpnext/docs/user/manual/en/stock/item/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
index 52850c2822..ce1a60ab4c 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -4,11 +4,11 @@ Item Price is the record in which you can log selling and buying rate of an item
There are two ways to reach to new Item Price form.
-> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+> Selling/Buying/Stock > Setup > Item Price > New Item Price
Or
-> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+> Item > Add/Edit Prices > Click on "+" > New Item Price
Following are the steps to create new Item Price.
@@ -16,7 +16,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -26,20 +26,27 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
To check all Item Price together, go to:
-Stock >> Main Report >> Itemwise Price List Rate
+> Stock > Main Report > Itemwise Price List Rate
You will find option to create new Item Price record (+) in this report as well.
+
+
+
+
+
+
## Item Properties
* **Item Name:** Item name is the actual name of your product or service.
@@ -83,16 +90,10 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
-
-
-
-
***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
***Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order.
-
-
### Manufacturing And Website
diff --git a/erpnext/docs/user/manual/en/stock/item/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
index 52850c2822..ce1a60ab4c 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -4,11 +4,11 @@ Item Price is the record in which you can log selling and buying rate of an item
There are two ways to reach to new Item Price form.
-> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+> Selling/Buying/Stock > Setup > Item Price > New Item Price
Or
-> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+> Item > Add/Edit Prices > Click on "+" > New Item Price
Following are the steps to create new Item Price.
@@ -16,7 +16,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -26,20 +26,27 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
To check all Item Price together, go to:
-Stock >> Main Report >> Itemwise Price List Rate
+> Stock > Main Report > Itemwise Price List Rate
You will find option to create new Item Price record (+) in this report as well.
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
index 08f88557d3..b5824279bd 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -56,3 +56,15 @@ To update the value in the variants items from the template item, select the res
To set the fields Goto Stock > Item Variant Settings
+
+
+
+
+
+
+
+
+
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
index 134d551d46..cd695b8db6 100644
--- a/erpnext/docs/user/manual/en/stock/item/purchase-details.md
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -4,4 +4,6 @@ To track a warranty period, it is necessary that the Item is a serialized Item.
A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
-
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
index 548a8a9ad0..cd914125b4 100644
--- a/erpnext/docs/user/manual/en/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -10,4 +10,6 @@ For example, you can set your reorder level of Motherboard at 10. When there are
For example, If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
-
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index 96b9cea7e4..1c2eb9dcb6 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -32,4 +32,10 @@ The User can also raise a [Request For Quotation](/docs/user/manual/en/buying/re
> Info: Material Request is not mandatory. It is ideal if you have centralized
buying so that you can collect this information from various departments.
+
+
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index bb5106f525..5d02083546 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -5,6 +5,11 @@
ERPNext will populate your website with products out of your Item Master. The html code will be
generated automatically.
+
+
#### Step 1: Edit Item
For this example we will add a rocking chair to our catalog to sell on our website.
diff --git a/erpnext/docs/user/manual/en/website/index.md b/erpnext/docs/user/manual/en/website/index.md
index 2ac49558a8..817285f812 100644
--- a/erpnext/docs/user/manual/en/website/index.md
+++ b/erpnext/docs/user/manual/en/website/index.md
@@ -27,6 +27,10 @@ HTML / CSS or hire the services of a professional. The good part is that once
this is setup, you can add and edit content, blogs and products directly from
your ERP.
+
+
### Topics
{index}
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 26284f5237..09129bd9c3 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -8,6 +8,11 @@ the items you intend to buy.
This software displays the price of the product . It also displays shipping
and handling charges, along with taxes, if applicable.
+
+
### Shopping Cart Setup
To set up a shopping cart, go to the website module.
@@ -53,4 +58,10 @@ on "Place Order" to place the order.
+
+
+
{next}
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.js b/erpnext/education/doctype/fee_schedule/fee_schedule.js
index a36b9cbe29..c4fff77d89 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.js
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.js
@@ -38,9 +38,6 @@ frappe.ui.form.on('Fee Schedule', {
if (data.reload && data.reload === 1) {
frm.reload_doc();
}
- if (data.progress && data.progress === "0") {
- frappe.msgprint(__("Fee records will be created in the background. In case of any error the error message will be updated in the Schedule."));
- }
if (data.progress) {
let progress_bar = $(cur_frm.dashboard.progress_area).find(".progress-bar");
if (progress_bar) {
@@ -74,6 +71,15 @@ frappe.ui.form.on('Fee Schedule', {
});
}, "fa fa-play", "btn-success");
}
+ if (frm.doc.fee_creation_status == "Successful") {
+ frm.add_custom_button(__("View Fees Records"), function() {
+ frappe.route_options = {
+ fee_schedule: frm.doc.name
+ };
+ frappe.set_route("List", "Fees");
+ });
+ }
+
},
fee_structure: function(frm) {
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.json b/erpnext/education/doctype/fee_schedule/fee_schedule.json
index a77cc595ff..5aae690668 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.json
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.json
@@ -4,7 +4,7 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
- "beta": 1,
+ "beta": 0,
"creation": "2017-07-18 15:21:21.527136",
"custom": 0,
"docstatus": 0,
@@ -1029,7 +1029,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-04 13:08:27.727709",
+ "modified": "2018-02-26 13:59:36.560780",
"modified_by": "Administrator",
"module": "Education",
"name": "Fee Schedule",
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.py b/erpnext/education/doctype/fee_schedule/fee_schedule.py
index 59acf462d9..b6df8c58d8 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.py
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.py
@@ -56,8 +56,15 @@ class FeeSchedule(Document):
self.db_set("fee_creation_status", "In Process")
frappe.publish_realtime("fee_schedule_progress",
{"progress": "0", "reload": 1}, user=frappe.session.user)
- enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
- fee_schedule=self.name)
+
+ total_records = sum([int(d.total_students) for d in self.student_groups])
+ if total_records > 10:
+ frappe.msgprint(_('''Fee records will be created in the background.
+ In case of any error the error message will be updated in the Schedule.'''))
+ enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
+ fee_schedule=self.name)
+ else:
+ generate_fee(self.name)
def generate_fee(fee_schedule):
doc = frappe.get_doc("Fee Schedule", fee_schedule)
@@ -69,10 +76,7 @@ def generate_fee(fee_schedule):
frappe.throw(_("Please setup Students under Student Groups"))
for d in doc.student_groups:
- students = frappe.db.sql(""" select sg.program, sg.batch, sgs.student, sgs.student_name
- from `tabStudent Group` sg, `tabStudent Group Student` sgs
- where sg.name=%s and sg.name=sgs.parent and sgs.active=1""", d.student_group, as_dict=1)
-
+ students = get_students(d.student_group, doc.academic_year, doc.academic_term, doc.student_category)
for student in students:
try:
fees_doc = get_mapped_doc("Fee Schedule", fee_schedule, {
@@ -86,7 +90,7 @@ def generate_fee(fee_schedule):
fees_doc.student = student.student
fees_doc.student_name = student.student_name
fees_doc.program = student.program
- fees_doc.student_batch = student.batch
+ fees_doc.student_batch = student.student_batch_name
fees_doc.send_payment_request = doc.send_email
fees_doc.save()
fees_doc.submit()
@@ -110,6 +114,30 @@ def generate_fee(fee_schedule):
{"progress": "100", "reload": 1}, user=frappe.session.user)
+def get_students(student_group, academic_year, academic_term=None, student_category=None):
+ conditions = ""
+ if student_category:
+ conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
+ if academic_term:
+ conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
+
+ students = frappe.db.sql("""
+ select pe.student, pe.student_name, pe.program, pe.student_batch_name
+ from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
+ where
+ pe.student = sgs.student and pe.academic_year = %s
+ and sgs.parent = %s and sgs.active = 1
+ {conditions}
+ """.format(conditions=conditions), (academic_year, student_group), as_dict=1)
+ return students
+
+
+@frappe.whitelist()
+def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
+ total_students = get_students(student_group, academic_year, academic_term, student_category)
+ return len(total_students)
+
+
@frappe.whitelist()
def get_fee_structure(source_name,target_doc=None):
fee_request = get_mapped_doc("Fee Structure", source_name,
@@ -117,23 +145,3 @@ def get_fee_structure(source_name,target_doc=None):
"doctype": "Fee Schedule"
}}, ignore_permissions=True)
return fee_request
-
-@frappe.whitelist()
-def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
- conditions = ""
- if student_category:
- conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
- if academic_term:
- conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
-
-
- return frappe.db.sql("""
- select count(pe.name)
- from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
- where
- pe.student = sgs.student
- and pe.academic_year = %s
- and sgs.parent = %s
- and sgs.active = 1
- {conditions}
- """.format(conditions=conditions), (academic_year, student_group))[0][0]
diff --git a/erpnext/education/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json
index d8722e2c90..191e92a0f9 100644
--- a/erpnext/education/doctype/guardian/guardian.json
+++ b/erpnext/education/doctype/guardian/guardian.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "GARD.####",
"beta": 0,
"creation": "2016-07-21 15:32:51.163292",
@@ -507,7 +507,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-06 18:17:38.090252",
+ "modified": "2018-03-07 12:51:06.941609",
"modified_by": "Administrator",
"module": "Education",
"name": "Guardian",
diff --git a/erpnext/healthcare/doctype/consultation/consultation.json b/erpnext/healthcare/doctype/consultation/consultation.json
index 184f484e24..c1bd37a3d2 100644
--- a/erpnext/healthcare/doctype/consultation/consultation.json
+++ b/erpnext/healthcare/doctype/consultation/consultation.json
@@ -767,7 +767,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Drug Prescription",
+ "label": "Medication",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -797,7 +797,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Drug Prescription",
+ "label": "Medication",
"length": 0,
"no_copy": 0,
"options": "Drug Prescription",
@@ -945,7 +945,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-28 11:25:35.256848",
+ "modified": "2018-02-19 11:35:13.826577",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Consultation",
diff --git a/erpnext/healthcare/doctype/consultation/consultation.py b/erpnext/healthcare/doctype/consultation/consultation.py
index 7d41afe65e..451c4914b0 100755
--- a/erpnext/healthcare/doctype/consultation/consultation.py
+++ b/erpnext/healthcare/doctype/consultation/consultation.py
@@ -4,7 +4,6 @@
from __future__ import unicode_literals
import frappe
-from frappe import _
from frappe.model.document import Document
from frappe.utils import getdate
import json
@@ -19,10 +18,6 @@ class Consultation(Document):
def after_insert(self):
insert_consultation_to_medical_record(self)
- def on_submit(self):
- if not self.diagnosis or not self.symptoms:
- frappe.throw(_("Diagnosis and Complaints cannot be left blank"))
-
def on_cancel(self):
if(self.appointment):
frappe.db.set_value("Patient Appointment", self.appointment, "status", "Open")
diff --git a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
index 53f82e034c..7ad673d535 100644
--- a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
+++ b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe
import unittest
-from erpnext.healthcare.doctype.patient_appointment.patient_appointment import create_invoice
+from erpnext.healthcare.doctype.patient_appointment.patient_appointment import invoice_appointment
from frappe.utils.make_random import get_random
from frappe.utils import nowdate, add_days
# test_records = frappe.get_test_records('Fee Validity')
@@ -14,6 +14,7 @@ class TestFeeValidity(unittest.TestCase):
def test_fee_validity(self):
patient = get_random("Patient")
physician = get_random("Physician")
+ department = get_random("Medical Department")
if not patient:
patient = frappe.new_doc("Patient")
@@ -22,33 +23,43 @@ class TestFeeValidity(unittest.TestCase):
patient.save(ignore_permissions=True)
patient = patient.name
+ if not department:
+ medical_department = frappe.new_doc("Medical Department")
+ medical_department.department = "Test Medical Department"
+ medical_department.save(ignore_permissions=True)
+ department = medical_department.name
+
if not physician:
physician = frappe.new_doc("Physician")
physician.first_name = "Amit Jain"
+ physician.department = department
physician.save(ignore_permissions=True)
physician = physician.name
+
+
frappe.db.set_value("Healthcare Settings", None, "max_visit", 2)
frappe.db.set_value("Healthcare Settings", None, "valid_days", 7)
- appointment = create_appointment(patient, physician, nowdate())
+ appointment = create_appointment(patient, physician, nowdate(), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
- create_invoice(frappe.defaults.get_global_default("company"), physician, patient, appointment.name, appointment.appointment_date)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 4))
+ invoice_appointment(appointment)
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 4), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertTrue(invoice)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 5))
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 5), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 10))
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 10), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
-def create_appointment(patient, physician, appointment_date):
+def create_appointment(patient, physician, appointment_date, department):
appointment = frappe.new_doc("Patient Appointment")
appointment.patient = patient
appointment.physician = physician
+ appointment.department = department
appointment.appointment_date = appointment_date
appointment.save(ignore_permissions=True)
return appointment
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index 89121573f6..f34f7cfe1a 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -15,6 +15,20 @@ frappe.ui.form.on('Patient Appointment', {
filters: {"disabled": 0}
};
});
+ frm.set_query("physician", function() {
+ return {
+ filters: {
+ 'department': frm.doc.department
+ }
+ };
+ });
+ frm.set_query("service_unit", function(){
+ return {
+ filters: {
+ "is_group": false,
+ }
+ };
+ });
if(frm.doc.patient){
frm.add_custom_button(__('Medical Record'), function() {
frappe.route_options = {"patient": frm.doc.patient};
@@ -83,11 +97,10 @@ frappe.ui.form.on('Patient Appointment', {
date: appointment_date
},
callback: (r) => {
- // console.log(r);
var data = r.message;
- if(data.available_slots.length > 0) {
+ if(data.slot_details.length > 0){
show_availability(data);
- } else {
+ }else{
show_empty_state();
}
}
@@ -108,48 +121,71 @@ frappe.ui.form.on('Patient Appointment', {
primary_action_label: __("Book"),
primary_action: function() {
// book slot
- frm.set_value('appointment_time', selected_slot);
- frm.set_value('duration', data.time_per_appointment);
+ var btn_selected = $wrapper.find('button.btn-selected-slot');
+ frm.set_value('appointment_time', btn_selected.attr('data-name'));
+ frm.set_value('service_unit', btn_selected.attr('data-service-unit') || '');
+ frm.set_value('duration', btn_selected.attr('data-duration'));
d.hide();
frm.save();
+ frm.enable_save();
}
});
var $wrapper = d.fields_dict.available_slots.$wrapper;
- var selected_slot = null;
// disable dialog action initially
d.get_primary_btn().attr('disabled', true);
- // make buttons for each slot
- var slot_html = data.available_slots.map(slot => {
- return ``;
- }).join("");
+ var slot_details = data.slot_details;
+ var slot_html = "";
+ $.each(slot_details, function(i, slot_detail){
+ slot_html = slot_html + ``;
+ slot_html = slot_html + `
` + slot_detail['avail_slot'].map(slot => { + let disabled = ''; + let start_str = slot.from_time; + let start_time = moment(slot.from_time, 'HH:mm:ss'); + let to_time = moment(slot.to_time, 'HH:mm:ss'); + let interval = (to_time - start_time)/60000 | 0; + // iterate in all booked appointments, update the start time and duration + slot_detail['appointments'].forEach(function(booked) { + let booked_moment = moment(booked.appointment_time, 'HH:mm:ss'); + if(booked_moment.isSame(start_time) || booked_moment.isBetween(start_time, to_time)){ + if(booked.duration == 0){ + disabled = 'disabled="disabled"'; + return false; + } + start_time = booked_moment; + let end_time = booked_moment.add(booked.duration, 'minutes'); + if(end_time.isSameOrAfter(to_time)){ + disabled = 'disabled="disabled"'; + return false; + }else{ + start_str = end_time.format('HH:mm:ss'); + } + } + }); + return ``; + }).join(""); + slot_html = slot_html + `
`; + }); $wrapper .css('margin-bottom', 0) .addClass('text-center') .html(slot_html); - // disable buttons for which appointments are booked - data.appointments.map(slot => { - if(slot.status == "Scheduled" || slot.status == "Open" || slot.status == "Closed"){ - $wrapper - .find(`button[data-name="${slot.appointment_time}"]`) - .attr('disabled', true); - } - }); - // blue button when clicked $wrapper.on('click', 'button', function() { var $btn = $(this); $wrapper.find('button').removeClass('btn-primary'); + $wrapper.find('button').removeClass('btn-selected-slot'); $btn.addClass('btn-primary'); - selected_slot = $btn.attr('data-name'); - + $btn.addClass('btn-selected-slot'); // enable dialog action d.get_primary_btn().attr('disabled', null); }); @@ -209,12 +245,9 @@ var btn_update_status = function(frm, status){ }; var btn_invoice_consultation = function(frm){ - var doc = frm.doc; frappe.call({ - method: - "erpnext.healthcare.doctype.patient_appointment.patient_appointment.create_invoice", - args: {company: doc.company, physician:doc.physician, patient: doc.patient, - appointment_id: doc.name, appointment_date:doc.appointment_date }, + doc: frm.doc, + method:"create_invoice", callback: function(data){ if(!data.exc){ if(data.message){ diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json index 1dcdbb57f1..022a9d6d49 100644 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json @@ -42,6 +42,39 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "department", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Department", + "length": 0, + "no_copy": 0, + "options": "Medical Department", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -73,6 +106,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -103,6 +137,71 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "appointment_time", + "fieldtype": "Time", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Time", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.__islocal", + "description": "In Minutes", + "fieldname": "duration", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Duration", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -134,6 +233,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -151,8 +251,42 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, + "label": "", "length": 0, "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", "permlevel": 0, "precision": "", "print_hide": 0, @@ -162,7 +296,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, + "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -195,6 +330,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -226,6 +362,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -257,6 +394,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -271,7 +409,7 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, + "in_filter": 1, "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, @@ -289,6 +427,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -319,7 +458,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 1, + "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -349,68 +489,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "appointment_time", - "fieldtype": "Time", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Time", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, "set_only_once": 1, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "In Minutes", - "fieldname": "duration", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Duration", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -441,6 +521,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -470,37 +551,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "department", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Department", - "length": 0, - "no_copy": 0, - "options": "Medical Department", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 1, - "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -532,6 +583,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -563,6 +615,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -593,6 +646,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -623,6 +677,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -654,6 +709,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -685,6 +741,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 } ], @@ -698,7 +755,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-28 11:26:20.262978", + "modified": "2018-02-26 12:44:33.756124", "modified_by": "Administrator", "module": "Healthcare", "name": "Patient Appointment", @@ -744,6 +801,26 @@ "share": 1, "submit": 0, "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 } ], "quick_entry": 0, diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 90d4d0ea20..926dc28373 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document import json -from frappe.utils import getdate, cint +from frappe.utils import getdate from frappe import _ import datetime from frappe.core.doctype.sms_settings.sms_settings import send_sms @@ -40,13 +40,8 @@ class PatientAppointment(Document): frappe.msgprint(_("{0} has fee validity till {1}").format(appointment.patient, fee_validity.valid_till)) confirm_sms(self) - def save(self, *args, **kwargs): - # duration is the only changeable field in the document - if not self.is_new(): - self.db_set('duration', cint(self.duration)) - else: - super(PatientAppointment, self).save(*args, **kwargs) - + def create_invoice(self): + return invoice_appointment(self) def appointment_cancel(appointment_id): appointment = frappe.get_doc("Patient Appointment", appointment_id) @@ -79,9 +74,9 @@ def get_availability_data(date, physician): weekday = date.strftime("%A") available_slots = [] - physician_schedule_name = None + slot_details = [] physician_schedule = None - time_per_appointment = None + employee = None physician_obj = frappe.get_doc("Physician", physician) @@ -112,43 +107,57 @@ def get_availability_data(date, physician): frappe.throw(_("Dr {0} on Leave on {1}").format(physician, date)) # get physicians schedule - physician_schedule_name = frappe.db.get_value("Physician", physician, "physician_schedule") - if physician_schedule_name: - physician_schedule = frappe.get_doc("Physician Schedule", physician_schedule_name) - time_per_appointment = frappe.db.get_value("Physician", physician, "time_per_appointment") + if physician_obj.physician_schedules: + for schedule in physician_obj.physician_schedules: + if schedule.schedule: + physician_schedule = frappe.get_doc("Physician Schedule", schedule.schedule) + else: + frappe.throw(_("Dr {0} does not have a Physician Schedule. Add it in Physician master".format(physician))) + + if physician_schedule: + available_slots = [] + for t in physician_schedule.time_slots: + if weekday == t.day: + available_slots.append(t) + + if available_slots: + appointments = [] + + if schedule.service_unit: + slot_name = schedule.schedule+" - "+schedule.service_unit + allow_overlap = frappe.get_value('Patient Service Unit', schedule.service_unit, 'overlap_appointments') + if allow_overlap: + # fetch all appointments to physician by service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"physician": physician, "service_unit": schedule.service_unit, "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + else: + # fetch all appointments to service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"service_unit": schedule.service_unit, "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + else: + slot_name = schedule.schedule + # fetch all appointments to physician without service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"physician": physician, "service_unit": '', "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + + slot_details.append({"slot_name":slot_name, "service_unit":schedule.service_unit, + "avail_slot":available_slots, 'appointments': appointments}) + else: frappe.throw(_("Dr {0} does not have a Physician Schedule. Add it in Physician master".format(physician))) - if physician_schedule: - for t in physician_schedule.time_slots: - if weekday == t.day: - available_slots.append(t) - - # `time_per_appointment` should never be None since validation in `Patient` is supposed to prevent - # that. However, it isn't impossible so we'll prepare for that. - if not time_per_appointment: - frappe.throw(_('"Time Per Appointment" hasn"t been set for Dr {0}. Add it in Physician master.').format(physician)) - - # if physician not available return - if not available_slots: + if not available_slots and not slot_details: # TODO: return available slots in nearby dates frappe.throw(_("Physician not available on {0}").format(weekday)) - # if physician on leave return - - # if holiday return - # if is_holiday(weekday): - - # get appointments on that day for physician - appointments = frappe.get_all( - "Patient Appointment", - filters={"physician": physician, "appointment_date": date}, - fields=["name", "appointment_time", "duration", "status"]) - return { - "available_slots": available_slots, - "appointments": appointments, - "time_per_appointment": time_per_appointment + "slot_details": slot_details } @@ -182,25 +191,25 @@ def confirm_sms(doc): @frappe.whitelist() -def create_invoice(company, physician, patient, appointment_id, appointment_date): - if not appointment_id: +def invoice_appointment(appointment_doc): + if not appointment_doc.name: return False sales_invoice = frappe.new_doc("Sales Invoice") - sales_invoice.customer = frappe.get_value("Patient", patient, "customer") - sales_invoice.appointment = appointment_id + sales_invoice.customer = frappe.get_value("Patient", appointment_doc.patient, "customer") + sales_invoice.appointment = appointment_doc.name sales_invoice.due_date = getdate() sales_invoice.is_pos = '0' - sales_invoice.debit_to = get_receivable_account(company) + sales_invoice.debit_to = get_receivable_account(appointment_doc.company) - fee_validity = get_fee_validity(physician, patient, appointment_date) - create_invoice_items(appointment_id, physician, company, sales_invoice) + fee_validity = get_fee_validity(appointment_doc.physician, appointment_doc.patient, appointment_doc.appointment_date) + create_invoice_items(appointment_doc.physician, appointment_doc.company, sales_invoice) sales_invoice.save(ignore_permissions=True) - frappe.db.sql("""update `tabPatient Appointment` set sales_invoice=%s where name=%s""", (sales_invoice.name, appointment_id)) + frappe.db.sql("""update `tabPatient Appointment` set sales_invoice=%s where name=%s""", (sales_invoice.name, appointment_doc.name)) frappe.db.set_value("Fee Validity", fee_validity.name, "ref_invoice", sales_invoice.name) consultation = frappe.db.exists({ "doctype": "Consultation", - "appointment": appointment_id}) + "appointment": appointment_doc.name}) if consultation: frappe.db.set_value("Consultation", consultation[0][0], "invoice", sales_invoice.name) return sales_invoice.name @@ -247,7 +256,7 @@ def create_fee_validity(physician, patient, date): return fee_validity -def create_invoice_items(appointment_id, physician, company, invoice): +def create_invoice_items(physician, company, invoice): item_line = invoice.append("items") item_line.item_name = "Consulting Charges" item_line.description = "Consulting Charges: " + physician @@ -326,4 +335,4 @@ def get_events(start, end, filters=None): {"start": start, "end": end}, as_dict=True, update={"allDay": 0}) for item in data: item.end = item.start + datetime.timedelta(minutes = item.duration) - return data + return data \ No newline at end of file diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/patient_service_unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js new file mode 100644 index 0000000000..197b4e5dbc --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js @@ -0,0 +1,15 @@ +// Copyright (c) 2017, earthians and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Patient Service Unit', { +}); + +// get query select patient service unit +cur_frm.fields_dict['parent_patient_service_unit'].get_query = function(doc) { + return{ + filters:[ + ['Patient Service Unit', 'is_group', '=', 1], + ['Patient Service Unit', 'name', '!=', doc.patient_service_unit_name] + ] + }; +}; diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json new file mode 100644 index 0000000000..0ca1a53e76 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json @@ -0,0 +1,358 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 1, + "autoname": "field:patient_service_unit_name", + "beta": 1, + "creation": "2016-09-21 13:48:14.731437", + "custom": 0, + "description": "Patinet Service Unit", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Setup", + "editable_grid": 1, + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "patient_service_unit_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "parent_patient_service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Parent Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "is_group", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Is Group", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "overlap_appointments", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow Overlap", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Company", + "length": 0, + "no_copy": 1, + "options": "Company", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "lft", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "lft", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "rgt", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "rgt", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "old_parent", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Old Parent", + "length": 0, + "no_copy": 1, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-03-07 13:25:51.163029", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Patient Service Unit", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 1, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "user_permission_doctypes": "[\"Service Unit\"]", + "write": 0 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Medical Administrator", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Physician", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "search_fields": "patient_service_unit_name", + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "patient_service_unit_name", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py new file mode 100644 index 0000000000..6c177d82d2 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, earthians and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals + +from frappe.utils.nestedset import NestedSet + +class PatientServiceUnit(NestedSet): + nsm_parent_field = 'parent_patient_service_unit' + + def on_update(self): + super(PatientServiceUnit, self).on_update() + self.validate_one_root() diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js new file mode 100644 index 0000000000..0b03f2db8b --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js @@ -0,0 +1,3 @@ +frappe.treeview_settings["Patient Service Unit"] = { + ignore_fields:["parent_patient_service_unit"] +}; diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js new file mode 100644 index 0000000000..320388a1fd --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Patient Service Unit", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Patient Service Unit + () => frappe.tests.make('Patient Service Unit', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py new file mode 100644 index 0000000000..ceb49fd4c6 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, earthians and Contributors +# See license.txt +from __future__ import unicode_literals +import unittest + +class TestPatientServiceUnit(unittest.TestCase): + pass diff --git a/erpnext/healthcare/doctype/physician/physician.js b/erpnext/healthcare/doctype/physician/physician.js index c224b5d36e..6ce01991f3 100755 --- a/erpnext/healthcare/doctype/physician/physician.js +++ b/erpnext/healthcare/doctype/physician/physician.js @@ -19,6 +19,13 @@ frappe.ui.form.on('Physician', { if(!frm.is_new()) { frappe.contacts.render_address_and_contact(frm); } + frm.set_query("service_unit", "physician_schedules", function(){ + return { + filters: { + "is_group": false, + } + }; + }); } }); diff --git a/erpnext/healthcare/doctype/physician/physician.json b/erpnext/healthcare/doctype/physician/physician.json index 1d9794e6de..e29561e91e 100644 --- a/erpnext/healthcare/doctype/physician/physician.json +++ b/erpnext/healthcare/doctype/physician/physician.json @@ -435,45 +435,14 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 1, - "collapsible": 0, - "columns": 0, - "fieldname": "physician_schedule", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Physician Schedule", - "length": 0, - "no_copy": 0, - "options": "Physician Schedule", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_17", - "fieldtype": "Column Break", + "fieldname": "physician_schedules", + "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -481,39 +450,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, + "label": "Physician Schedules", "length": 0, "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "In minutes", - "fieldname": "time_per_appointment", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Time per Appointment", - "length": 0, - "no_copy": 0, + "options": "Physician Service Unit Schedule", "permlevel": 0, "precision": "", "print_hide": 0, @@ -811,7 +751,7 @@ "istable": 0, "max_attachments": 0, "modified": "2018-01-19 15:25:43.166877", - "modified_by": "jams@hcf.com", + "modified_by": "Administrator", "module": "Healthcare", "name": "Physician", "name_case": "", diff --git a/erpnext/healthcare/doctype/physician/physician.py b/erpnext/healthcare/doctype/physician/physician.py index 4d035d39f6..eb03083a49 100644 --- a/erpnext/healthcare/doctype/physician/physician.py +++ b/erpnext/healthcare/doctype/physician/physician.py @@ -20,7 +20,6 @@ class Physician(Document): [cstr(self.get(f)).strip() for f in ["first_name","middle_name","last_name"]])) def validate(self): - self.validate_schedule_and_time() validate_party_accounts(self) if self.user_id: @@ -37,15 +36,6 @@ class Physician(Document): frappe.permissions.remove_user_permission( "Physician", self.name, existing_user_id) - def validate_schedule_and_time(self): - if (self.physician_schedule or self.time_per_appointment) and \ - not (self.physician_schedule and self.time_per_appointment): - frappe.msgprint( - _('Both "Physician Schedule" and Time Per Appointment" must be set for Dr {0}').format( - self.first_name), - title='Error', raise_exception=1, indicator='red' - ) - def on_update(self): if self.user_id: frappe.permissions.add_user_permission("Physician", self.name, self.user_id) diff --git a/erpnext/healthcare/doctype/physician/test_physician.py b/erpnext/healthcare/doctype/physician/test_physician.py index 4bd497a4e9..2fbf5741cf 100644 --- a/erpnext/healthcare/doctype/physician/test_physician.py +++ b/erpnext/healthcare/doctype/physician/test_physician.py @@ -12,23 +12,6 @@ class TestPhysician(unittest.TestCase): def tearDown(self): frappe.delete_doc_if_exists('Physician', '_Testdoctor2', force=1) - def test_schedule_and_time(self): - physician = frappe.new_doc('Physician') - physician.first_name = '_Testdoctor2' - physician.physician_schedule = '_Testdoctor2 Schedule' - - self.assertRaises(frappe.ValidationError, physician.insert) - - physician.physician_schedule = '' - physician.time_per_appointment = 15 - - self.assertRaises(frappe.ValidationError, physician.insert) - - physician.physician_schedule = '_Testdoctor2 Schedule' - physician.time_per_appointment = 15 - - physician.insert() - def test_new_physician_without_schedule(self): physician = frappe.new_doc('Physician') physician.first_name = '_Testdoctor2' diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/__init__.py b/erpnext/healthcare/doctype/physician_service_unit_schedule/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json new file mode 100644 index 0000000000..69fe7b3104 --- /dev/null +++ b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json @@ -0,0 +1,103 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 1, + "creation": "2017-11-16 12:19:17.163786", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "schedule", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Schedule", + "length": 0, + "no_copy": 0, + "options": "Physician Schedule", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-27 10:57:42.301295", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Physician Service Unit Schedule", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py new file mode 100644 index 0000000000..7aaec4de13 --- /dev/null +++ b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +from frappe.model.document import Document + +class PhysicianServiceUnitSchedule(Document): + pass diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js index c24a6bc30b..5e1013d6a2 100755 --- a/erpnext/hr/doctype/employee/employee.js +++ b/erpnext/hr/doctype/employee/employee.js @@ -81,7 +81,7 @@ frappe.ui.form.on('Employee',{ } frappe.call({ method: "erpnext.hr.doctype.employee.employee.create_user", - args: { employee: cur_frm.doc.name }, + args: { employee: frm.doc.name, email: frm.doc.prefered_email }, callback: function(r) { frm.set_value("user_id", r.message) diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index 9541b775a1..25d3ec4bc9 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -263,7 +263,7 @@ def deactivate_sales_person(status = None, employee = None): frappe.db.set_value("Sales Person", sales_person, "enabled", 0) @frappe.whitelist() -def create_user(employee, user = None): +def create_user(employee, user = None, email=None): emp = frappe.get_doc("Employee", employee) employee_name = emp.employee_name.split(" ") @@ -277,6 +277,9 @@ def create_user(employee, user = None): first_name = employee_name[0] + if email: + emp.prefered_email = email + user = frappe.new_doc("User") user.update({ "name": emp.employee_name, diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py index f6b5cc3fb2..31045b73a5 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/expense_claim.py @@ -41,10 +41,12 @@ class ExpenseClaim(AccountsController): }[cstr(self.docstatus or 0)] paid_amount = flt(self.total_amount_reimbursed) + flt(self.total_advance_amount) - if self.total_sanctioned_amount > 0 and self.total_sanctioned_amount == paid_amount\ + + if (self.is_paid or (flt(self.total_sanctioned_amount) > 0 + and flt(self.total_sanctioned_amount) == paid_amount)) \ and self.docstatus == 1: - self.status = "Paid" - elif self.total_sanctioned_amount > 0 and self.docstatus == 1: + self.status = "Paid" + elif flt(self.total_sanctioned_amount) > 0 and self.docstatus == 1: self.status = "Unpaid" def set_payable_account(self): diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json index 2435d06979..8f9c3d0f1d 100644 --- a/erpnext/hr/doctype/leave_application/leave_application.json +++ b/erpnext/hr/doctype/leave_application/leave_application.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "autoname": "LAP/.#####", + "autoname": "naming_series:", "beta": 0, "creation": "2013-02-20 11:18:11", "custom": 0, @@ -42,6 +42,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -72,6 +73,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -101,6 +103,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -130,6 +133,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -159,6 +163,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -188,6 +193,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -217,6 +223,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -248,6 +255,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -278,6 +286,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -307,6 +316,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0, "width": "50%" }, @@ -337,6 +347,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -366,6 +377,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -396,6 +408,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -425,6 +438,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -454,6 +468,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -484,6 +499,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -514,6 +530,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -542,6 +559,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -572,6 +590,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -602,6 +621,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -632,6 +652,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 } ], @@ -646,7 +667,7 @@ "issingle": 0, "istable": 0, "max_attachments": 3, - "modified": "2018-02-12 13:10:05.766762", + "modified": "2018-03-04 18:24:04.863555", "modified_by": "Administrator", "module": "HR", "name": "Leave Application", diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 22fd0e5f98..eb739466d6 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -34,14 +34,13 @@ class LeaveApplication(Document): self.validate_salary_processed_days() self.validate_attendance() + if hasattr(self, "workflow_state") and self.workflow_state == "Rejected": + # notify leave applier about rejection + self.notify_employee() + def on_submit(self): - self.validate_back_dated_application() - def on_cancel(self): - # notify leave applier about cancellation - self.notify_employee("cancelled") - def validate_dates(self): if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)): frappe.throw(_("To date cannot be before from date")) @@ -217,7 +216,8 @@ class LeaveApplication(Document): # for post in messages "message": _get_message(url=True), "message_to": employee.user_id, - "subject": (_("Leave Application") + ": %s - %s") % (self.name) + "subject": (_("Leave Application") + ": %s - %s") % (self.name, + self.workflow_state if hasattr(self, "workflow_state") else "") }) def _get_message(url=False): diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index a023cc3ea9..c6e531438f 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -175,7 +175,7 @@ class PayrollEntry(Document): Get loan details from submitted salary slip based on selected criteria """ cond = self.get_filter_condition() - return frappe.db.sql(""" select eld.employee_loan_account, + return frappe.db.sql(""" select eld.employee_loan_account, eld.employee_loan, eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment from `tabSalary Slip` t1, `tabSalary Slip Loan` eld @@ -283,7 +283,12 @@ class PayrollEntry(Document): "account": data.employee_loan_account, "credit_in_account_currency": data.principal_amount }) - accounts.append({ + + if data.interest_amount and not data.interest_income_account: + frappe.throw(_("Select interest income account in employee loan {0}").format(data.employee_loan)) + + if data.interest_income_account and data.interest_amount: + accounts.append({ "account": data.interest_income_account, "credit_in_account_currency": data.interest_amount, "cost_center": self.cost_center, diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index da2598ff93..7b36b5116d 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -156,9 +156,10 @@ class SalarySlip(TransactionBase): }) def get_date_details(self): - date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date) - self.start_date = date_details.start_date - self.end_date = date_details.end_date + if not self.end_date: + date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date) + self.start_date = date_details.start_date + self.end_date = date_details.end_date def check_sal_struct(self, joining_date, relieving_date): cond = '' diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 47853127b8..c6463fa37d 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -51,7 +51,6 @@ class BOM(WebsiteGenerator): self.validate_currency() self.set_conversion_rate() self.validate_uom_is_interger() - self.update_stock_qty() self.set_bom_material_details() self.validate_materials() self.validate_operations() @@ -251,14 +250,12 @@ class BOM(WebsiteGenerator): set_default(self, "item") item = frappe.get_doc("Item", self.item) if item.default_bom != self.name: - item.default_bom = self.name - item.save(ignore_permissions = True) + frappe.db.set_value('Item', self.item, 'default_bom', self.name) else: frappe.db.set(self, "is_default", 0) item = frappe.get_doc("Item", self.item) if item.default_bom == self.name: - item.default_bom = None - item.save(ignore_permissions = True) + frappe.db.set_value('Item', self.item, 'default_bom', None) def clear_operations(self): if not self.with_operations: @@ -295,6 +292,8 @@ class BOM(WebsiteGenerator): m.uom = m.stock_uom m.qty = m.stock_qty + m.db_update() + def validate_uom_is_interger(self): from erpnext.utilities.transaction_base import validate_uom_is_integer validate_uom_is_integer(self, "uom", "qty", "BOM Item") @@ -337,19 +336,23 @@ class BOM(WebsiteGenerator): def check_recursion(self): """ Check whether recursion occurs in any bom""" + bom_list = self.traverse_tree() + bom_nos = frappe.get_all('BOM Item', fields=["bom_no"], + filters={'parent': ('in', bom_list), 'parenttype': 'BOM'}) - check_list = [['parent', 'bom_no', 'parent'], ['bom_no', 'parent', 'child']] - for d in check_list: - bom_list, count = [self.name], 0 - while (len(bom_list) > count ): - boms = frappe.db.sql(" select %s from `tabBOM Item` where %s = %s and parenttype='BOM'" % - (d[0], d[1], '%s'), cstr(bom_list[count])) - count = count + 1 - for b in boms: - if b[0] == self.name: - frappe.throw(_("BOM recursion: {0} cannot be parent or child of {2}").format(b[0], self.name)) - if b[0]: - bom_list.append(b[0]) + raise_exception = False + if bom_nos and self.name in [d.bom_no for d in bom_nos]: + raise_exception = True + + if not raise_exception: + bom_nos = frappe.get_all('BOM Item', fields=["parent"], + filters={'bom_no': self.name, 'parenttype': 'BOM'}) + + if self.name in [d.parent for d in bom_nos]: + raise_exception = True + + if raise_exception: + frappe.throw(_("BOM recursion: {0} cannot be parent or child of {2}").format(self.name, self.name)) def update_cost_and_exploded_items(self, bom_list=[]): bom_list = self.traverse_tree(bom_list) diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js index 4ec9bef998..185b9ed4bc 100644 --- a/erpnext/manufacturing/doctype/bom/bom_tree.js +++ b/erpnext/manufacturing/doctype/bom/bom_tree.js @@ -60,5 +60,14 @@ frappe.treeview_settings["BOM"] = { condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1' } ], + onrender: function(node) { + if(node.is_root && node.data.value!="BOM") { + frappe.model.with_doc("BOM", node.data.value, function() { + var bom = frappe.model.get_doc("BOM", node.data.value); + node.data.image = bom.image || ""; + node.data.description = bom.description || ""; + }); + } + }, view_template: 'bom_item_preview' } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html index 04a715886b..0110950cb9 100644 --- a/erpnext/non_profit/doctype/chapter/templates/chapter.html +++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html @@ -46,17 +46,18 @@
+ {% set doc = frappe.get_doc('Member',chapter_head) %}
{{ _("Warehouse") }}
{{ _("Quantity") }}
{{ _("UOM") }}
- {{ _("Balance Qty") }}
+ {{ _("Projected Qty") }}
@@ -22,7 +22,7 @@
{{ item.warehouse }}
{{ item.qty }}
{{ item.uom }}
- {{ item.balance_qty }}
+ {{ frappe.utils.flt(item.projected_qty) + frappe.utils.flt(item.qty) }}
{%- endfor %}
diff --git a/erpnext/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
index a872f19510..f2fd60024a 100644
--- a/erpnext/templates/pages/product_search.py
+++ b/erpnext/templates/pages/product_search.py
@@ -35,7 +35,7 @@ def get_product_list(search=None, start=0, limit=12):
search = "%" + cstr(search) + "%"
# order by
- query += """ order by I.weightage desc, in_stock desc, I.item_name limit %s, %s""" % (cint(start), cint(limit))
+ query += """ order by I.weightage desc, in_stock desc, I.modified desc limit %s, %s""" % (cint(start), cint(limit))
data = frappe.db.sql(query, {
"search": search,
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 6594c301ee..f2327ca53c 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -45,7 +45,7 @@ class TransactionBase(StatusUpdater):
events = frappe.db.sql_list("""select name from `tabEvent`
where ref_type=%s and ref_name=%s""", (self.doctype, self.name))
if events:
- frappe.db.sql("delete from `tabEvent` where name in (%s)"
+ frappe.db.sql("delete from `tabEvent` where name in ({0})"
.format(", ".join(['%s']*len(events))), tuple(events))
def _add_calendar_event(self, opts):
@@ -73,6 +73,8 @@ class TransactionBase(StatusUpdater):
validate_uom_is_integer(self, uom_field, qty_fields)
def validate_with_previous_doc(self, ref):
+ self.exclude_fields = ["conversion_factor", "uom"] if self.get('is_return') else []
+
for key, val in ref.items():
is_child = val.get("is_child_table")
ref_doc = {}
@@ -103,7 +105,7 @@ class TransactionBase(StatusUpdater):
frappe.throw(_("Invalid reference {0} {1}").format(reference_doctype, reference_name))
for field, condition in fields:
- if prevdoc_values[field] is not None:
+ if prevdoc_values[field] is not None and field not in self.exclude_fields:
self.validate_value(field, condition, prevdoc_values[field], doc)
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
index 548a8a9ad0..cd914125b4 100644
--- a/erpnext/docs/user/manual/en/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -10,4 +10,6 @@ For example, you can set your reorder level of Motherboard at 10. When there are
For example, If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
-
\ No newline at end of file
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index 96b9cea7e4..1c2eb9dcb6 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -32,4 +32,10 @@ The User can also raise a [Request For Quotation](/docs/user/manual/en/buying/re
> Info: Material Request is not mandatory. It is ideal if you have centralized
buying so that you can collect this information from various departments.
+
+
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
index ea77999fe0..ff5384c766 100644
--- a/erpnext/docs/user/manual/en/stock/opening-stock.md
+++ b/erpnext/docs/user/manual/en/stock/opening-stock.md
@@ -12,4 +12,12 @@ If you are not making opening Stock Entry, you can select "Stock Adjustment" acc
To understand Opening Stock for serialized Items visit [Stock Reconciliation](/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
+
+
+
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
index 015812497c..89bf734962 100644
--- a/erpnext/docs/user/manual/en/stock/serial-no.md
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -15,6 +15,11 @@ If your Item is _serialized_ you will have to enter the Serial Nos in the
related column with each Serial No in a new line.
You can maintain single units of serialized items using Serial Number.
+
+
### Serial Nos and Inventory
Inventory of an Item can only be affected if the Serial No is transacted via a
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
index e931b88a98..f04c6c3725 100644
--- a/erpnext/docs/user/manual/en/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -23,6 +23,11 @@ In the Stock Entry you have to update the Items table with all your
transactions. For each row, you must enter a “Source Warehouse” or a “Target
Warehouse” or both (if you are recording a movement).
+
+
**Additional Costs:**
If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) associated with the process. The additional costs will be considered to calculate valuation rate of the items.
diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
index 3d0331a589..6ba39a96d7 100644
--- a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -7,4 +7,10 @@ Inspection. To enable ERPNext to perform this function, go to :
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index bb5106f525..5d02083546 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -5,6 +5,11 @@
ERPNext will populate your website with products out of your Item Master. The html code will be
generated automatically.
+
+
#### Step 1: Edit Item
For this example we will add a rocking chair to our catalog to sell on our website.
diff --git a/erpnext/docs/user/manual/en/website/index.md b/erpnext/docs/user/manual/en/website/index.md
index 2ac49558a8..817285f812 100644
--- a/erpnext/docs/user/manual/en/website/index.md
+++ b/erpnext/docs/user/manual/en/website/index.md
@@ -27,6 +27,10 @@ HTML / CSS or hire the services of a professional. The good part is that once
this is setup, you can add and edit content, blogs and products directly from
your ERP.
+
+
### Topics
{index}
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 26284f5237..09129bd9c3 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -8,6 +8,11 @@ the items you intend to buy.
This software displays the price of the product . It also displays shipping
and handling charges, along with taxes, if applicable.
+
+
### Shopping Cart Setup
To set up a shopping cart, go to the website module.
@@ -53,4 +58,10 @@ on "Place Order" to place the order.
+
+
+
{next}
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.js b/erpnext/education/doctype/fee_schedule/fee_schedule.js
index a36b9cbe29..c4fff77d89 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.js
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.js
@@ -38,9 +38,6 @@ frappe.ui.form.on('Fee Schedule', {
if (data.reload && data.reload === 1) {
frm.reload_doc();
}
- if (data.progress && data.progress === "0") {
- frappe.msgprint(__("Fee records will be created in the background. In case of any error the error message will be updated in the Schedule."));
- }
if (data.progress) {
let progress_bar = $(cur_frm.dashboard.progress_area).find(".progress-bar");
if (progress_bar) {
@@ -74,6 +71,15 @@ frappe.ui.form.on('Fee Schedule', {
});
}, "fa fa-play", "btn-success");
}
+ if (frm.doc.fee_creation_status == "Successful") {
+ frm.add_custom_button(__("View Fees Records"), function() {
+ frappe.route_options = {
+ fee_schedule: frm.doc.name
+ };
+ frappe.set_route("List", "Fees");
+ });
+ }
+
},
fee_structure: function(frm) {
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.json b/erpnext/education/doctype/fee_schedule/fee_schedule.json
index a77cc595ff..5aae690668 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.json
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.json
@@ -4,7 +4,7 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
- "beta": 1,
+ "beta": 0,
"creation": "2017-07-18 15:21:21.527136",
"custom": 0,
"docstatus": 0,
@@ -1029,7 +1029,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-04 13:08:27.727709",
+ "modified": "2018-02-26 13:59:36.560780",
"modified_by": "Administrator",
"module": "Education",
"name": "Fee Schedule",
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.py b/erpnext/education/doctype/fee_schedule/fee_schedule.py
index 59acf462d9..b6df8c58d8 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.py
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.py
@@ -56,8 +56,15 @@ class FeeSchedule(Document):
self.db_set("fee_creation_status", "In Process")
frappe.publish_realtime("fee_schedule_progress",
{"progress": "0", "reload": 1}, user=frappe.session.user)
- enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
- fee_schedule=self.name)
+
+ total_records = sum([int(d.total_students) for d in self.student_groups])
+ if total_records > 10:
+ frappe.msgprint(_('''Fee records will be created in the background.
+ In case of any error the error message will be updated in the Schedule.'''))
+ enqueue(generate_fee, queue='default', timeout=6000, event='generate_fee',
+ fee_schedule=self.name)
+ else:
+ generate_fee(self.name)
def generate_fee(fee_schedule):
doc = frappe.get_doc("Fee Schedule", fee_schedule)
@@ -69,10 +76,7 @@ def generate_fee(fee_schedule):
frappe.throw(_("Please setup Students under Student Groups"))
for d in doc.student_groups:
- students = frappe.db.sql(""" select sg.program, sg.batch, sgs.student, sgs.student_name
- from `tabStudent Group` sg, `tabStudent Group Student` sgs
- where sg.name=%s and sg.name=sgs.parent and sgs.active=1""", d.student_group, as_dict=1)
-
+ students = get_students(d.student_group, doc.academic_year, doc.academic_term, doc.student_category)
for student in students:
try:
fees_doc = get_mapped_doc("Fee Schedule", fee_schedule, {
@@ -86,7 +90,7 @@ def generate_fee(fee_schedule):
fees_doc.student = student.student
fees_doc.student_name = student.student_name
fees_doc.program = student.program
- fees_doc.student_batch = student.batch
+ fees_doc.student_batch = student.student_batch_name
fees_doc.send_payment_request = doc.send_email
fees_doc.save()
fees_doc.submit()
@@ -110,6 +114,30 @@ def generate_fee(fee_schedule):
{"progress": "100", "reload": 1}, user=frappe.session.user)
+def get_students(student_group, academic_year, academic_term=None, student_category=None):
+ conditions = ""
+ if student_category:
+ conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
+ if academic_term:
+ conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
+
+ students = frappe.db.sql("""
+ select pe.student, pe.student_name, pe.program, pe.student_batch_name
+ from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
+ where
+ pe.student = sgs.student and pe.academic_year = %s
+ and sgs.parent = %s and sgs.active = 1
+ {conditions}
+ """.format(conditions=conditions), (academic_year, student_group), as_dict=1)
+ return students
+
+
+@frappe.whitelist()
+def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
+ total_students = get_students(student_group, academic_year, academic_term, student_category)
+ return len(total_students)
+
+
@frappe.whitelist()
def get_fee_structure(source_name,target_doc=None):
fee_request = get_mapped_doc("Fee Structure", source_name,
@@ -117,23 +145,3 @@ def get_fee_structure(source_name,target_doc=None):
"doctype": "Fee Schedule"
}}, ignore_permissions=True)
return fee_request
-
-@frappe.whitelist()
-def get_total_students(student_group, academic_year, academic_term=None, student_category=None):
- conditions = ""
- if student_category:
- conditions = " and pe.student_category='{}'".format(frappe.db.escape(student_category))
- if academic_term:
- conditions = " and pe.academic_term='{}'".format(frappe.db.escape(academic_term))
-
-
- return frappe.db.sql("""
- select count(pe.name)
- from `tabStudent Group Student` sgs, `tabProgram Enrollment` pe
- where
- pe.student = sgs.student
- and pe.academic_year = %s
- and sgs.parent = %s
- and sgs.active = 1
- {conditions}
- """.format(conditions=conditions), (academic_year, student_group))[0][0]
diff --git a/erpnext/education/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json
index d8722e2c90..191e92a0f9 100644
--- a/erpnext/education/doctype/guardian/guardian.json
+++ b/erpnext/education/doctype/guardian/guardian.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "GARD.####",
"beta": 0,
"creation": "2016-07-21 15:32:51.163292",
@@ -507,7 +507,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-06 18:17:38.090252",
+ "modified": "2018-03-07 12:51:06.941609",
"modified_by": "Administrator",
"module": "Education",
"name": "Guardian",
diff --git a/erpnext/healthcare/doctype/consultation/consultation.json b/erpnext/healthcare/doctype/consultation/consultation.json
index 184f484e24..c1bd37a3d2 100644
--- a/erpnext/healthcare/doctype/consultation/consultation.json
+++ b/erpnext/healthcare/doctype/consultation/consultation.json
@@ -767,7 +767,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Drug Prescription",
+ "label": "Medication",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -797,7 +797,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Drug Prescription",
+ "label": "Medication",
"length": 0,
"no_copy": 0,
"options": "Drug Prescription",
@@ -945,7 +945,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-28 11:25:35.256848",
+ "modified": "2018-02-19 11:35:13.826577",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Consultation",
diff --git a/erpnext/healthcare/doctype/consultation/consultation.py b/erpnext/healthcare/doctype/consultation/consultation.py
index 7d41afe65e..451c4914b0 100755
--- a/erpnext/healthcare/doctype/consultation/consultation.py
+++ b/erpnext/healthcare/doctype/consultation/consultation.py
@@ -4,7 +4,6 @@
from __future__ import unicode_literals
import frappe
-from frappe import _
from frappe.model.document import Document
from frappe.utils import getdate
import json
@@ -19,10 +18,6 @@ class Consultation(Document):
def after_insert(self):
insert_consultation_to_medical_record(self)
- def on_submit(self):
- if not self.diagnosis or not self.symptoms:
- frappe.throw(_("Diagnosis and Complaints cannot be left blank"))
-
def on_cancel(self):
if(self.appointment):
frappe.db.set_value("Patient Appointment", self.appointment, "status", "Open")
diff --git a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
index 53f82e034c..7ad673d535 100644
--- a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
+++ b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe
import unittest
-from erpnext.healthcare.doctype.patient_appointment.patient_appointment import create_invoice
+from erpnext.healthcare.doctype.patient_appointment.patient_appointment import invoice_appointment
from frappe.utils.make_random import get_random
from frappe.utils import nowdate, add_days
# test_records = frappe.get_test_records('Fee Validity')
@@ -14,6 +14,7 @@ class TestFeeValidity(unittest.TestCase):
def test_fee_validity(self):
patient = get_random("Patient")
physician = get_random("Physician")
+ department = get_random("Medical Department")
if not patient:
patient = frappe.new_doc("Patient")
@@ -22,33 +23,43 @@ class TestFeeValidity(unittest.TestCase):
patient.save(ignore_permissions=True)
patient = patient.name
+ if not department:
+ medical_department = frappe.new_doc("Medical Department")
+ medical_department.department = "Test Medical Department"
+ medical_department.save(ignore_permissions=True)
+ department = medical_department.name
+
if not physician:
physician = frappe.new_doc("Physician")
physician.first_name = "Amit Jain"
+ physician.department = department
physician.save(ignore_permissions=True)
physician = physician.name
+
+
frappe.db.set_value("Healthcare Settings", None, "max_visit", 2)
frappe.db.set_value("Healthcare Settings", None, "valid_days", 7)
- appointment = create_appointment(patient, physician, nowdate())
+ appointment = create_appointment(patient, physician, nowdate(), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
- create_invoice(frappe.defaults.get_global_default("company"), physician, patient, appointment.name, appointment.appointment_date)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 4))
+ invoice_appointment(appointment)
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 4), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertTrue(invoice)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 5))
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 5), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
- appointment = create_appointment(patient, physician, add_days(nowdate(), 10))
+ appointment = create_appointment(patient, physician, add_days(nowdate(), 10), department)
invoice = frappe.db.get_value("Patient Appointment", appointment.name, "sales_invoice")
self.assertEqual(invoice, None)
-def create_appointment(patient, physician, appointment_date):
+def create_appointment(patient, physician, appointment_date, department):
appointment = frappe.new_doc("Patient Appointment")
appointment.patient = patient
appointment.physician = physician
+ appointment.department = department
appointment.appointment_date = appointment_date
appointment.save(ignore_permissions=True)
return appointment
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index 89121573f6..f34f7cfe1a 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -15,6 +15,20 @@ frappe.ui.form.on('Patient Appointment', {
filters: {"disabled": 0}
};
});
+ frm.set_query("physician", function() {
+ return {
+ filters: {
+ 'department': frm.doc.department
+ }
+ };
+ });
+ frm.set_query("service_unit", function(){
+ return {
+ filters: {
+ "is_group": false,
+ }
+ };
+ });
if(frm.doc.patient){
frm.add_custom_button(__('Medical Record'), function() {
frappe.route_options = {"patient": frm.doc.patient};
@@ -83,11 +97,10 @@ frappe.ui.form.on('Patient Appointment', {
date: appointment_date
},
callback: (r) => {
- // console.log(r);
var data = r.message;
- if(data.available_slots.length > 0) {
+ if(data.slot_details.length > 0){
show_availability(data);
- } else {
+ }else{
show_empty_state();
}
}
@@ -108,48 +121,71 @@ frappe.ui.form.on('Patient Appointment', {
primary_action_label: __("Book"),
primary_action: function() {
// book slot
- frm.set_value('appointment_time', selected_slot);
- frm.set_value('duration', data.time_per_appointment);
+ var btn_selected = $wrapper.find('button.btn-selected-slot');
+ frm.set_value('appointment_time', btn_selected.attr('data-name'));
+ frm.set_value('service_unit', btn_selected.attr('data-service-unit') || '');
+ frm.set_value('duration', btn_selected.attr('data-duration'));
d.hide();
frm.save();
+ frm.enable_save();
}
});
var $wrapper = d.fields_dict.available_slots.$wrapper;
- var selected_slot = null;
// disable dialog action initially
d.get_primary_btn().attr('disabled', true);
- // make buttons for each slot
- var slot_html = data.available_slots.map(slot => {
- return ``;
- }).join("");
+ var slot_details = data.slot_details;
+ var slot_html = "";
+ $.each(slot_details, function(i, slot_detail){
+ slot_html = slot_html + ``;
+ slot_html = slot_html + `` + slot_detail['avail_slot'].map(slot => { + let disabled = ''; + let start_str = slot.from_time; + let start_time = moment(slot.from_time, 'HH:mm:ss'); + let to_time = moment(slot.to_time, 'HH:mm:ss'); + let interval = (to_time - start_time)/60000 | 0; + // iterate in all booked appointments, update the start time and duration + slot_detail['appointments'].forEach(function(booked) { + let booked_moment = moment(booked.appointment_time, 'HH:mm:ss'); + if(booked_moment.isSame(start_time) || booked_moment.isBetween(start_time, to_time)){ + if(booked.duration == 0){ + disabled = 'disabled="disabled"'; + return false; + } + start_time = booked_moment; + let end_time = booked_moment.add(booked.duration, 'minutes'); + if(end_time.isSameOrAfter(to_time)){ + disabled = 'disabled="disabled"'; + return false; + }else{ + start_str = end_time.format('HH:mm:ss'); + } + } + }); + return ``; + }).join(""); + slot_html = slot_html + `
`; + }); $wrapper .css('margin-bottom', 0) .addClass('text-center') .html(slot_html); - // disable buttons for which appointments are booked - data.appointments.map(slot => { - if(slot.status == "Scheduled" || slot.status == "Open" || slot.status == "Closed"){ - $wrapper - .find(`button[data-name="${slot.appointment_time}"]`) - .attr('disabled', true); - } - }); - // blue button when clicked $wrapper.on('click', 'button', function() { var $btn = $(this); $wrapper.find('button').removeClass('btn-primary'); + $wrapper.find('button').removeClass('btn-selected-slot'); $btn.addClass('btn-primary'); - selected_slot = $btn.attr('data-name'); - + $btn.addClass('btn-selected-slot'); // enable dialog action d.get_primary_btn().attr('disabled', null); }); @@ -209,12 +245,9 @@ var btn_update_status = function(frm, status){ }; var btn_invoice_consultation = function(frm){ - var doc = frm.doc; frappe.call({ - method: - "erpnext.healthcare.doctype.patient_appointment.patient_appointment.create_invoice", - args: {company: doc.company, physician:doc.physician, patient: doc.patient, - appointment_id: doc.name, appointment_date:doc.appointment_date }, + doc: frm.doc, + method:"create_invoice", callback: function(data){ if(!data.exc){ if(data.message){ diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json index 1dcdbb57f1..022a9d6d49 100644 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json @@ -42,6 +42,39 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "department", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Department", + "length": 0, + "no_copy": 0, + "options": "Medical Department", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -73,6 +106,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -103,6 +137,71 @@ "reqd": 1, "search_index": 1, "set_only_once": 1, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "appointment_time", + "fieldtype": "Time", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Time", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "depends_on": "eval:!doc.__islocal", + "description": "In Minutes", + "fieldname": "duration", + "fieldtype": "Int", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Duration", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -134,6 +233,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -151,8 +251,42 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, + "label": "", "length": 0, "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", "permlevel": 0, "precision": "", "print_hide": 0, @@ -162,7 +296,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, + "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -195,6 +330,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -226,6 +362,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -257,6 +394,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -271,7 +409,7 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, + "in_filter": 1, "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 0, @@ -289,6 +427,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -319,7 +458,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 1, + "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -349,68 +489,8 @@ "report_hide": 0, "reqd": 0, "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "appointment_time", - "fieldtype": "Time", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Time", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, "set_only_once": 1, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "In Minutes", - "fieldname": "duration", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Duration", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -441,6 +521,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -470,37 +551,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "department", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Department", - "length": 0, - "no_copy": 0, - "options": "Medical Department", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 1, - "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -532,6 +583,7 @@ "reqd": 0, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -563,6 +615,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -593,6 +646,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -623,6 +677,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -654,6 +709,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -685,6 +741,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 } ], @@ -698,7 +755,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-28 11:26:20.262978", + "modified": "2018-02-26 12:44:33.756124", "modified_by": "Administrator", "module": "Healthcare", "name": "Patient Appointment", @@ -744,6 +801,26 @@ "share": 1, "submit": 0, "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 } ], "quick_entry": 0, diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py index 90d4d0ea20..926dc28373 100755 --- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document import json -from frappe.utils import getdate, cint +from frappe.utils import getdate from frappe import _ import datetime from frappe.core.doctype.sms_settings.sms_settings import send_sms @@ -40,13 +40,8 @@ class PatientAppointment(Document): frappe.msgprint(_("{0} has fee validity till {1}").format(appointment.patient, fee_validity.valid_till)) confirm_sms(self) - def save(self, *args, **kwargs): - # duration is the only changeable field in the document - if not self.is_new(): - self.db_set('duration', cint(self.duration)) - else: - super(PatientAppointment, self).save(*args, **kwargs) - + def create_invoice(self): + return invoice_appointment(self) def appointment_cancel(appointment_id): appointment = frappe.get_doc("Patient Appointment", appointment_id) @@ -79,9 +74,9 @@ def get_availability_data(date, physician): weekday = date.strftime("%A") available_slots = [] - physician_schedule_name = None + slot_details = [] physician_schedule = None - time_per_appointment = None + employee = None physician_obj = frappe.get_doc("Physician", physician) @@ -112,43 +107,57 @@ def get_availability_data(date, physician): frappe.throw(_("Dr {0} on Leave on {1}").format(physician, date)) # get physicians schedule - physician_schedule_name = frappe.db.get_value("Physician", physician, "physician_schedule") - if physician_schedule_name: - physician_schedule = frappe.get_doc("Physician Schedule", physician_schedule_name) - time_per_appointment = frappe.db.get_value("Physician", physician, "time_per_appointment") + if physician_obj.physician_schedules: + for schedule in physician_obj.physician_schedules: + if schedule.schedule: + physician_schedule = frappe.get_doc("Physician Schedule", schedule.schedule) + else: + frappe.throw(_("Dr {0} does not have a Physician Schedule. Add it in Physician master".format(physician))) + + if physician_schedule: + available_slots = [] + for t in physician_schedule.time_slots: + if weekday == t.day: + available_slots.append(t) + + if available_slots: + appointments = [] + + if schedule.service_unit: + slot_name = schedule.schedule+" - "+schedule.service_unit + allow_overlap = frappe.get_value('Patient Service Unit', schedule.service_unit, 'overlap_appointments') + if allow_overlap: + # fetch all appointments to physician by service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"physician": physician, "service_unit": schedule.service_unit, "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + else: + # fetch all appointments to service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"service_unit": schedule.service_unit, "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + else: + slot_name = schedule.schedule + # fetch all appointments to physician without service unit + appointments = frappe.get_all( + "Patient Appointment", + filters={"physician": physician, "service_unit": '', "appointment_date": date, "status": ["not in",["Cancelled"]]}, + fields=["name", "appointment_time", "duration", "status"]) + + slot_details.append({"slot_name":slot_name, "service_unit":schedule.service_unit, + "avail_slot":available_slots, 'appointments': appointments}) + else: frappe.throw(_("Dr {0} does not have a Physician Schedule. Add it in Physician master".format(physician))) - if physician_schedule: - for t in physician_schedule.time_slots: - if weekday == t.day: - available_slots.append(t) - - # `time_per_appointment` should never be None since validation in `Patient` is supposed to prevent - # that. However, it isn't impossible so we'll prepare for that. - if not time_per_appointment: - frappe.throw(_('"Time Per Appointment" hasn"t been set for Dr {0}. Add it in Physician master.').format(physician)) - - # if physician not available return - if not available_slots: + if not available_slots and not slot_details: # TODO: return available slots in nearby dates frappe.throw(_("Physician not available on {0}").format(weekday)) - # if physician on leave return - - # if holiday return - # if is_holiday(weekday): - - # get appointments on that day for physician - appointments = frappe.get_all( - "Patient Appointment", - filters={"physician": physician, "appointment_date": date}, - fields=["name", "appointment_time", "duration", "status"]) - return { - "available_slots": available_slots, - "appointments": appointments, - "time_per_appointment": time_per_appointment + "slot_details": slot_details } @@ -182,25 +191,25 @@ def confirm_sms(doc): @frappe.whitelist() -def create_invoice(company, physician, patient, appointment_id, appointment_date): - if not appointment_id: +def invoice_appointment(appointment_doc): + if not appointment_doc.name: return False sales_invoice = frappe.new_doc("Sales Invoice") - sales_invoice.customer = frappe.get_value("Patient", patient, "customer") - sales_invoice.appointment = appointment_id + sales_invoice.customer = frappe.get_value("Patient", appointment_doc.patient, "customer") + sales_invoice.appointment = appointment_doc.name sales_invoice.due_date = getdate() sales_invoice.is_pos = '0' - sales_invoice.debit_to = get_receivable_account(company) + sales_invoice.debit_to = get_receivable_account(appointment_doc.company) - fee_validity = get_fee_validity(physician, patient, appointment_date) - create_invoice_items(appointment_id, physician, company, sales_invoice) + fee_validity = get_fee_validity(appointment_doc.physician, appointment_doc.patient, appointment_doc.appointment_date) + create_invoice_items(appointment_doc.physician, appointment_doc.company, sales_invoice) sales_invoice.save(ignore_permissions=True) - frappe.db.sql("""update `tabPatient Appointment` set sales_invoice=%s where name=%s""", (sales_invoice.name, appointment_id)) + frappe.db.sql("""update `tabPatient Appointment` set sales_invoice=%s where name=%s""", (sales_invoice.name, appointment_doc.name)) frappe.db.set_value("Fee Validity", fee_validity.name, "ref_invoice", sales_invoice.name) consultation = frappe.db.exists({ "doctype": "Consultation", - "appointment": appointment_id}) + "appointment": appointment_doc.name}) if consultation: frappe.db.set_value("Consultation", consultation[0][0], "invoice", sales_invoice.name) return sales_invoice.name @@ -247,7 +256,7 @@ def create_fee_validity(physician, patient, date): return fee_validity -def create_invoice_items(appointment_id, physician, company, invoice): +def create_invoice_items(physician, company, invoice): item_line = invoice.append("items") item_line.item_name = "Consulting Charges" item_line.description = "Consulting Charges: " + physician @@ -326,4 +335,4 @@ def get_events(start, end, filters=None): {"start": start, "end": end}, as_dict=True, update={"allDay": 0}) for item in data: item.end = item.start + datetime.timedelta(minutes = item.duration) - return data + return data \ No newline at end of file diff --git a/erpnext/healthcare/doctype/patient_service_unit/__init__.py b/erpnext/healthcare/doctype/patient_service_unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js new file mode 100644 index 0000000000..197b4e5dbc --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.js @@ -0,0 +1,15 @@ +// Copyright (c) 2017, earthians and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Patient Service Unit', { +}); + +// get query select patient service unit +cur_frm.fields_dict['parent_patient_service_unit'].get_query = function(doc) { + return{ + filters:[ + ['Patient Service Unit', 'is_group', '=', 1], + ['Patient Service Unit', 'name', '!=', doc.patient_service_unit_name] + ] + }; +}; diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json new file mode 100644 index 0000000000..0ca1a53e76 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.json @@ -0,0 +1,358 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 1, + "autoname": "field:patient_service_unit_name", + "beta": 1, + "creation": "2016-09-21 13:48:14.731437", + "custom": 0, + "description": "Patinet Service Unit", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Setup", + "editable_grid": 1, + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "patient_service_unit_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 1, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "parent_patient_service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Parent Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "is_group", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Is Group", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 1, + "collapsible": 0, + "columns": 0, + "fieldname": "overlap_appointments", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Allow Overlap", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Company", + "length": 0, + "no_copy": 1, + "options": "Company", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "lft", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "lft", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "rgt", + "fieldtype": "Int", + "hidden": 1, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "rgt", + "length": 0, + "no_copy": 1, + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "old_parent", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Old Parent", + "length": 0, + "no_copy": 1, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 1, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2018-03-07 13:25:51.163029", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Patient Service Unit", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "apply_user_permissions": 1, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Nursing User", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "user_permission_doctypes": "[\"Service Unit\"]", + "write": 0 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Medical Administrator", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "apply_user_permissions": 0, + "cancel": 0, + "create": 1, + "delete": 0, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Physician", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "search_fields": "patient_service_unit_name", + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "patient_service_unit_name", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py new file mode 100644 index 0000000000..6c177d82d2 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, earthians and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals + +from frappe.utils.nestedset import NestedSet + +class PatientServiceUnit(NestedSet): + nsm_parent_field = 'parent_patient_service_unit' + + def on_update(self): + super(PatientServiceUnit, self).on_update() + self.validate_one_root() diff --git a/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js new file mode 100644 index 0000000000..0b03f2db8b --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/patient_service_unit_tree.js @@ -0,0 +1,3 @@ +frappe.treeview_settings["Patient Service Unit"] = { + ignore_fields:["parent_patient_service_unit"] +}; diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js new file mode 100644 index 0000000000..320388a1fd --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Patient Service Unit", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Patient Service Unit + () => frappe.tests.make('Patient Service Unit', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py new file mode 100644 index 0000000000..ceb49fd4c6 --- /dev/null +++ b/erpnext/healthcare/doctype/patient_service_unit/test_patient_service_unit.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, earthians and Contributors +# See license.txt +from __future__ import unicode_literals +import unittest + +class TestPatientServiceUnit(unittest.TestCase): + pass diff --git a/erpnext/healthcare/doctype/physician/physician.js b/erpnext/healthcare/doctype/physician/physician.js index c224b5d36e..6ce01991f3 100755 --- a/erpnext/healthcare/doctype/physician/physician.js +++ b/erpnext/healthcare/doctype/physician/physician.js @@ -19,6 +19,13 @@ frappe.ui.form.on('Physician', { if(!frm.is_new()) { frappe.contacts.render_address_and_contact(frm); } + frm.set_query("service_unit", "physician_schedules", function(){ + return { + filters: { + "is_group": false, + } + }; + }); } }); diff --git a/erpnext/healthcare/doctype/physician/physician.json b/erpnext/healthcare/doctype/physician/physician.json index 1d9794e6de..e29561e91e 100644 --- a/erpnext/healthcare/doctype/physician/physician.json +++ b/erpnext/healthcare/doctype/physician/physician.json @@ -435,45 +435,14 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 1, - "collapsible": 0, - "columns": 0, - "fieldname": "physician_schedule", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Physician Schedule", - "length": 0, - "no_copy": 0, - "options": "Physician Schedule", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_17", - "fieldtype": "Column Break", + "fieldname": "physician_schedules", + "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -481,39 +450,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, + "label": "Physician Schedules", "length": 0, "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "In minutes", - "fieldname": "time_per_appointment", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Time per Appointment", - "length": 0, - "no_copy": 0, + "options": "Physician Service Unit Schedule", "permlevel": 0, "precision": "", "print_hide": 0, @@ -811,7 +751,7 @@ "istable": 0, "max_attachments": 0, "modified": "2018-01-19 15:25:43.166877", - "modified_by": "jams@hcf.com", + "modified_by": "Administrator", "module": "Healthcare", "name": "Physician", "name_case": "", diff --git a/erpnext/healthcare/doctype/physician/physician.py b/erpnext/healthcare/doctype/physician/physician.py index 4d035d39f6..eb03083a49 100644 --- a/erpnext/healthcare/doctype/physician/physician.py +++ b/erpnext/healthcare/doctype/physician/physician.py @@ -20,7 +20,6 @@ class Physician(Document): [cstr(self.get(f)).strip() for f in ["first_name","middle_name","last_name"]])) def validate(self): - self.validate_schedule_and_time() validate_party_accounts(self) if self.user_id: @@ -37,15 +36,6 @@ class Physician(Document): frappe.permissions.remove_user_permission( "Physician", self.name, existing_user_id) - def validate_schedule_and_time(self): - if (self.physician_schedule or self.time_per_appointment) and \ - not (self.physician_schedule and self.time_per_appointment): - frappe.msgprint( - _('Both "Physician Schedule" and Time Per Appointment" must be set for Dr {0}').format( - self.first_name), - title='Error', raise_exception=1, indicator='red' - ) - def on_update(self): if self.user_id: frappe.permissions.add_user_permission("Physician", self.name, self.user_id) diff --git a/erpnext/healthcare/doctype/physician/test_physician.py b/erpnext/healthcare/doctype/physician/test_physician.py index 4bd497a4e9..2fbf5741cf 100644 --- a/erpnext/healthcare/doctype/physician/test_physician.py +++ b/erpnext/healthcare/doctype/physician/test_physician.py @@ -12,23 +12,6 @@ class TestPhysician(unittest.TestCase): def tearDown(self): frappe.delete_doc_if_exists('Physician', '_Testdoctor2', force=1) - def test_schedule_and_time(self): - physician = frappe.new_doc('Physician') - physician.first_name = '_Testdoctor2' - physician.physician_schedule = '_Testdoctor2 Schedule' - - self.assertRaises(frappe.ValidationError, physician.insert) - - physician.physician_schedule = '' - physician.time_per_appointment = 15 - - self.assertRaises(frappe.ValidationError, physician.insert) - - physician.physician_schedule = '_Testdoctor2 Schedule' - physician.time_per_appointment = 15 - - physician.insert() - def test_new_physician_without_schedule(self): physician = frappe.new_doc('Physician') physician.first_name = '_Testdoctor2' diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/__init__.py b/erpnext/healthcare/doctype/physician_service_unit_schedule/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json new file mode 100644 index 0000000000..69fe7b3104 --- /dev/null +++ b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.json @@ -0,0 +1,103 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 1, + "creation": "2017-11-16 12:19:17.163786", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "schedule", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Schedule", + "length": 0, + "no_copy": 0, + "options": "Physician Schedule", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "service_unit", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Service Unit", + "length": 0, + "no_copy": 0, + "options": "Patient Service Unit", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-12-27 10:57:42.301295", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Physician Service Unit Schedule", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py new file mode 100644 index 0000000000..7aaec4de13 --- /dev/null +++ b/erpnext/healthcare/doctype/physician_service_unit_schedule/physician_service_unit_schedule.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +from frappe.model.document import Document + +class PhysicianServiceUnitSchedule(Document): + pass diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js index c24a6bc30b..5e1013d6a2 100755 --- a/erpnext/hr/doctype/employee/employee.js +++ b/erpnext/hr/doctype/employee/employee.js @@ -81,7 +81,7 @@ frappe.ui.form.on('Employee',{ } frappe.call({ method: "erpnext.hr.doctype.employee.employee.create_user", - args: { employee: cur_frm.doc.name }, + args: { employee: frm.doc.name, email: frm.doc.prefered_email }, callback: function(r) { frm.set_value("user_id", r.message) diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index 9541b775a1..25d3ec4bc9 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -263,7 +263,7 @@ def deactivate_sales_person(status = None, employee = None): frappe.db.set_value("Sales Person", sales_person, "enabled", 0) @frappe.whitelist() -def create_user(employee, user = None): +def create_user(employee, user = None, email=None): emp = frappe.get_doc("Employee", employee) employee_name = emp.employee_name.split(" ") @@ -277,6 +277,9 @@ def create_user(employee, user = None): first_name = employee_name[0] + if email: + emp.prefered_email = email + user = frappe.new_doc("User") user.update({ "name": emp.employee_name, diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py index f6b5cc3fb2..31045b73a5 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/expense_claim.py @@ -41,10 +41,12 @@ class ExpenseClaim(AccountsController): }[cstr(self.docstatus or 0)] paid_amount = flt(self.total_amount_reimbursed) + flt(self.total_advance_amount) - if self.total_sanctioned_amount > 0 and self.total_sanctioned_amount == paid_amount\ + + if (self.is_paid or (flt(self.total_sanctioned_amount) > 0 + and flt(self.total_sanctioned_amount) == paid_amount)) \ and self.docstatus == 1: - self.status = "Paid" - elif self.total_sanctioned_amount > 0 and self.docstatus == 1: + self.status = "Paid" + elif flt(self.total_sanctioned_amount) > 0 and self.docstatus == 1: self.status = "Unpaid" def set_payable_account(self): diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json index 2435d06979..8f9c3d0f1d 100644 --- a/erpnext/hr/doctype/leave_application/leave_application.json +++ b/erpnext/hr/doctype/leave_application/leave_application.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "autoname": "LAP/.#####", + "autoname": "naming_series:", "beta": 0, "creation": "2013-02-20 11:18:11", "custom": 0, @@ -42,6 +42,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 1, + "translatable": 0, "unique": 0 }, { @@ -72,6 +73,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -101,6 +103,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -130,6 +133,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -159,6 +163,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -188,6 +193,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -217,6 +223,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -248,6 +255,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -278,6 +286,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -307,6 +316,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0, "width": "50%" }, @@ -337,6 +347,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -366,6 +377,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -396,6 +408,7 @@ "reqd": 1, "search_index": 1, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -425,6 +438,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -454,6 +468,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -484,6 +499,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -514,6 +530,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -542,6 +559,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -572,6 +590,7 @@ "reqd": 1, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -602,6 +621,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 }, { @@ -632,6 +652,7 @@ "reqd": 0, "search_index": 0, "set_only_once": 0, + "translatable": 0, "unique": 0 } ], @@ -646,7 +667,7 @@ "issingle": 0, "istable": 0, "max_attachments": 3, - "modified": "2018-02-12 13:10:05.766762", + "modified": "2018-03-04 18:24:04.863555", "modified_by": "Administrator", "module": "HR", "name": "Leave Application", diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 22fd0e5f98..eb739466d6 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -34,14 +34,13 @@ class LeaveApplication(Document): self.validate_salary_processed_days() self.validate_attendance() + if hasattr(self, "workflow_state") and self.workflow_state == "Rejected": + # notify leave applier about rejection + self.notify_employee() + def on_submit(self): - self.validate_back_dated_application() - def on_cancel(self): - # notify leave applier about cancellation - self.notify_employee("cancelled") - def validate_dates(self): if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)): frappe.throw(_("To date cannot be before from date")) @@ -217,7 +216,8 @@ class LeaveApplication(Document): # for post in messages "message": _get_message(url=True), "message_to": employee.user_id, - "subject": (_("Leave Application") + ": %s - %s") % (self.name) + "subject": (_("Leave Application") + ": %s - %s") % (self.name, + self.workflow_state if hasattr(self, "workflow_state") else "") }) def _get_message(url=False): diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index a023cc3ea9..c6e531438f 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -175,7 +175,7 @@ class PayrollEntry(Document): Get loan details from submitted salary slip based on selected criteria """ cond = self.get_filter_condition() - return frappe.db.sql(""" select eld.employee_loan_account, + return frappe.db.sql(""" select eld.employee_loan_account, eld.employee_loan, eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment from `tabSalary Slip` t1, `tabSalary Slip Loan` eld @@ -283,7 +283,12 @@ class PayrollEntry(Document): "account": data.employee_loan_account, "credit_in_account_currency": data.principal_amount }) - accounts.append({ + + if data.interest_amount and not data.interest_income_account: + frappe.throw(_("Select interest income account in employee loan {0}").format(data.employee_loan)) + + if data.interest_income_account and data.interest_amount: + accounts.append({ "account": data.interest_income_account, "credit_in_account_currency": data.interest_amount, "cost_center": self.cost_center, diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index da2598ff93..7b36b5116d 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -156,9 +156,10 @@ class SalarySlip(TransactionBase): }) def get_date_details(self): - date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date) - self.start_date = date_details.start_date - self.end_date = date_details.end_date + if not self.end_date: + date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date) + self.start_date = date_details.start_date + self.end_date = date_details.end_date def check_sal_struct(self, joining_date, relieving_date): cond = '' diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 47853127b8..c6463fa37d 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -51,7 +51,6 @@ class BOM(WebsiteGenerator): self.validate_currency() self.set_conversion_rate() self.validate_uom_is_interger() - self.update_stock_qty() self.set_bom_material_details() self.validate_materials() self.validate_operations() @@ -251,14 +250,12 @@ class BOM(WebsiteGenerator): set_default(self, "item") item = frappe.get_doc("Item", self.item) if item.default_bom != self.name: - item.default_bom = self.name - item.save(ignore_permissions = True) + frappe.db.set_value('Item', self.item, 'default_bom', self.name) else: frappe.db.set(self, "is_default", 0) item = frappe.get_doc("Item", self.item) if item.default_bom == self.name: - item.default_bom = None - item.save(ignore_permissions = True) + frappe.db.set_value('Item', self.item, 'default_bom', None) def clear_operations(self): if not self.with_operations: @@ -295,6 +292,8 @@ class BOM(WebsiteGenerator): m.uom = m.stock_uom m.qty = m.stock_qty + m.db_update() + def validate_uom_is_interger(self): from erpnext.utilities.transaction_base import validate_uom_is_integer validate_uom_is_integer(self, "uom", "qty", "BOM Item") @@ -337,19 +336,23 @@ class BOM(WebsiteGenerator): def check_recursion(self): """ Check whether recursion occurs in any bom""" + bom_list = self.traverse_tree() + bom_nos = frappe.get_all('BOM Item', fields=["bom_no"], + filters={'parent': ('in', bom_list), 'parenttype': 'BOM'}) - check_list = [['parent', 'bom_no', 'parent'], ['bom_no', 'parent', 'child']] - for d in check_list: - bom_list, count = [self.name], 0 - while (len(bom_list) > count ): - boms = frappe.db.sql(" select %s from `tabBOM Item` where %s = %s and parenttype='BOM'" % - (d[0], d[1], '%s'), cstr(bom_list[count])) - count = count + 1 - for b in boms: - if b[0] == self.name: - frappe.throw(_("BOM recursion: {0} cannot be parent or child of {2}").format(b[0], self.name)) - if b[0]: - bom_list.append(b[0]) + raise_exception = False + if bom_nos and self.name in [d.bom_no for d in bom_nos]: + raise_exception = True + + if not raise_exception: + bom_nos = frappe.get_all('BOM Item', fields=["parent"], + filters={'bom_no': self.name, 'parenttype': 'BOM'}) + + if self.name in [d.parent for d in bom_nos]: + raise_exception = True + + if raise_exception: + frappe.throw(_("BOM recursion: {0} cannot be parent or child of {2}").format(self.name, self.name)) def update_cost_and_exploded_items(self, bom_list=[]): bom_list = self.traverse_tree(bom_list) diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js index 4ec9bef998..185b9ed4bc 100644 --- a/erpnext/manufacturing/doctype/bom/bom_tree.js +++ b/erpnext/manufacturing/doctype/bom/bom_tree.js @@ -60,5 +60,14 @@ frappe.treeview_settings["BOM"] = { condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1' } ], + onrender: function(node) { + if(node.is_root && node.data.value!="BOM") { + frappe.model.with_doc("BOM", node.data.value, function() { + var bom = frappe.model.get_doc("BOM", node.data.value); + node.data.image = bom.image || ""; + node.data.description = bom.description || ""; + }); + } + }, view_template: 'bom_item_preview' } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html index 04a715886b..0110950cb9 100644 --- a/erpnext/non_profit/doctype/chapter/templates/chapter.html +++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html @@ -46,17 +46,18 @@
Chapter Head
| Name | -{{ frappe.db.get_value('User', chapter_head, 'full_name') }} | +{{ doc.member_name }} |
| {{ frappe.db.get_value('User', chapter_head, 'email') or '' }} | +{{ frappe.db.get_value('User', doc.email, 'email') or '' }} | |
| Phone | -{{ frappe.db.get_value('User', chapter_head, 'phone') or '' }} | +{{ frappe.db.get_value('User', doc.email, 'phone') or '' }} |