+
+If User has Role define in the Account Setting assigned, then he/she will be able to set an Account as Frozen.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
index 8b7768a2d1..af8572c233 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -13,4 +13,5 @@ what-is-the-differences-of-total-and-valuation-in-tax-and-charges
withdrawing-salary-from-owners-equity-account
adjust-withhold-amount-payment-entry
common-receivable-account.md
-types-in-tax-template
\ No newline at end of file
+types-in-tax-template
+freeze-account
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
new file mode 100644
index 0000000000..04b20ac4b9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
@@ -0,0 +1,19 @@
+# Fetching Data from one Document to Another
+
+**Question:** We track Customer's PO No and PO Date field in the Sales Order. To have these values fetched into Sales Invoice as well, we have inserted Custom Field in the Sales Invoice. However, when we create Sales Invoice from the Sales Order, Customer's PO details are not being fetched.
+
+**Answer:** When data is fetched from one transaction to the another transaction, then the mapping of data is done based on the field names. If two transactions have fields with the exact same name, then it's values are mapped.
+
+For example, if you want Customer's PO No. and PO Date to be fetched from Sales Order to Sales Invoice, then you should ensure that Custom Fields added in the Sales Invoice has an exact same field name as in the Sales Order.
+
+Sales Order (standard fields)
+
+
+
+Sales Invoice (custom fields)
+
+
+
+Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
index 1740ef0e94..56e7040b47 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -15,4 +15,5 @@ set-language
set-precision
user-restriction
maximum-numbers-of-fields-in-a-form
-child-table
\ No newline at end of file
+child-table
+fetching-data-from-a-document
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md
index 39b9790246..2aa06791f0 100644
--- a/erpnext/docs/user/manual/en/human-resources/training.md
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -9,22 +9,23 @@ Schedule seminars, workshops, conferences etc using Training Event. You can also
### Inviting Employees for Event
You can invite your employees to attend the event. You can do so by selecting the employees to be invited in the employee table.
+
By default the status of the employee will be 'Open'.
-The system shall notify the employee with status 'Open' by sending a email to the office email address of the employee as mentioned in the employee master if you have selected 'Send Email' checkbox.
-The status is changed to 'Invited' when an invitation email is sent to the employee by the system.
-When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'.
+When you submit the Training Event, a notifcation will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modifiy this Email Alert to customize the message.
+
### Training Result
-After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer.
+After compleation of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.
+When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too.
-### Trainig Feedback
+### Training Feedback
-Collect feedback regarding the event from your Employees using Training Feedback.
+Employees can then share their feedback via Training Feedback.
diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt
index fff4da7d8e..712ab8eabd 100644
--- a/erpnext/docs/user/manual/en/index.txt
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -9,6 +9,7 @@ manufacturing
projects
support
human-resources
+subscription
customer-portal
website
using-erpnext
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
index 9be2bad0e2..4dbdcbb6dc 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
@@ -48,6 +48,8 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa
+
+
####Sales Invoice
Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
new file mode 100644
index 0000000000..4287ca8617
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
@@ -0,0 +1 @@
+#
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/__init__.py b/erpnext/docs/user/manual/en/schools/Attendance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.md b/erpnext/docs/user/manual/en/schools/Attendance/index.md
new file mode 100644
index 0000000000..3153a59022
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/index.md
@@ -0,0 +1,6 @@
+#Attendance
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/index.txt b/erpnext/docs/user/manual/en/schools/Attendance/index.txt
new file mode 100644
index 0000000000..8cd02627a2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/index.txt
@@ -0,0 +1,3 @@
+student-attendance
+student-leave-application
+student-attendance-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
new file mode 100644
index 0000000000..5c4ce3072a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
@@ -0,0 +1,15 @@
+# Student Attendance Tool
+
+The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
+
+To mark the **Attedance* based on Student Group select the group based on
+
+**1. Batch
+ 2. Course
+ 3. Activity **
+
+Student detials will be autofetched and you can mark the attendance of the given date.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
new file mode 100644
index 0000000000..1b917d0ae2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md
@@ -0,0 +1,15 @@
+# Student Attendance
+
+Attendance doctype allows you to track and manage attendance of a student in all the days at any time. The Attendance module is designed to help teachers easily mark student attendance during class.
+
+Attendance Records can be created against Student on daily basis.
+
+To create Attendance record :
+
+Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save.
+
+
+
+**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
new file mode 100644
index 0000000000..5620bdadd7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md
@@ -0,0 +1,13 @@
+#Student Leave Application
+
+ERPNext allows you to record the leave application for a student.
+
+To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
+
+
+
+Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself.
+
+Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.md b/erpnext/docs/user/manual/en/schools/admission/index.md
index 87cdfe5c89..b602271bbb 100644
--- a/erpnext/docs/user/manual/en/schools/admission/index.md
+++ b/erpnext/docs/user/manual/en/schools/admission/index.md
@@ -1,6 +1,6 @@
# Admission
-This section contains student admission related documents.
+The Admission section allow you to create all records starting from Student application till the program enrollment. Below is the list of documents for Student addmission.
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/admission/index.txt b/erpnext/docs/user/manual/en/schools/admission/index.txt
index ec9e768116..680d779089 100644
--- a/erpnext/docs/user/manual/en/schools/admission/index.txt
+++ b/erpnext/docs/user/manual/en/schools/admission/index.txt
@@ -1,2 +1,4 @@
+student-admission
student-applicant
-program-enrollment
\ No newline at end of file
+program-enrollment
+program-enrollment-Tool
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
new file mode 100644
index 0000000000..2a2fa1e58e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md
@@ -0,0 +1,16 @@
+# Program Enrollment Tool
+
+The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program.
+
+
+You can create the the Program Enrollment for :
+
+1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
+
+
+
+2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
index 2dcc6cb2ce..cc1308cf6c 100644
--- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
@@ -1,7 +1,12 @@
# Program Enrollment
-This form allows you to enroll a student to a program. A student can be enrolled to multiple programs.
+Program Enrollment describes an educational model where students must complete a defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year.
-
+Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
+
+
+
+- A student can be enrolled in multiple Course for a program in a given academeic year.
+- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
{next}
diff --git a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
index e67c1dc79e..22d370939d 100644
--- a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
@@ -18,7 +18,9 @@ You can Approve or Reject a student applicant. By accepting a student applicant
and will not allow you to change the application status unless the student record is deleted.
### Student Enrollment
+Once the form is submitted you can either approve or reject the application form.
+
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
diff --git a/erpnext/docs/user/manual/en/schools/admission/student_admission.md b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
new file mode 100644
index 0000000000..eeaa977912
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
@@ -0,0 +1,13 @@
+# Student Admission
+
+The admission process begins with filling the admission form. The Student Admission record enables to intitate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website.
+
+To create a Student Admission record go to :
+
+**Schools** >> **Admissions** >> **Student Admission** >>
+
+
+
+
+
+Once a admission record is created it can be published on the website and the student can apply from the web portal itself.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md
index 8c766d6db4..d317d39bfa 100644
--- a/erpnext/docs/user/manual/en/schools/index.md
+++ b/erpnext/docs/user/manual/en/schools/index.md
@@ -1,7 +1,7 @@
# Schools
-The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes.
+The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee.
diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/schools/index.txt
index b485fdcfea..159089c6f3 100644
--- a/erpnext/docs/user/manual/en/schools/index.txt
+++ b/erpnext/docs/user/manual/en/schools/index.txt
@@ -1,6 +1,7 @@
student
admission
+Attendance
schedule
fees
setup
-assessment
\ No newline at end of file
+Assessment
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md b/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
deleted file mode 100644
index 84e1ea8669..0000000000
--- a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Student Attendance
-
-Maintains attendance record of the student. Attendance Records can be created against Course Schedules.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-term.md b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
index 6306444b61..b52bea7108 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-term.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
@@ -1,5 +1,9 @@
# Academic Term
+An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester.
+
+The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
+
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-year.md b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
index 3913eb634b..4fc5f929a5 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-year.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
@@ -1,5 +1,11 @@
# Academic Year
+An academic year is a period of time which schools, colleges and universities use to measure a quantity of study.
+
+The **Academic year** form have the Start and End date for the Academic year.
+
-{next}
\ No newline at end of file
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/course.md b/erpnext/docs/user/manual/en/schools/setup/course.md
index 140131dccd..dc10ed54b1 100644
--- a/erpnext/docs/user/manual/en/schools/setup/course.md
+++ b/erpnext/docs/user/manual/en/schools/setup/course.md
@@ -1,5 +1,15 @@
# Course
+ A course is a unit of teaching that typically lasts one academic term, is led by one or more instructors (teachers or professors), and has a fixed number of students. Students may receive a grade and academic credit after completion of the course.
+
+To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
+
+Once a **Course** is created, a course schedule can defined for the same.
+
+
+
+The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.md b/erpnext/docs/user/manual/en/schools/setup/index.md
index 9de753614c..4e0915277b 100644
--- a/erpnext/docs/user/manual/en/schools/setup/index.md
+++ b/erpnext/docs/user/manual/en/schools/setup/index.md
@@ -1,5 +1,7 @@
# Setup
+The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.txt b/erpnext/docs/user/manual/en/schools/setup/index.txt
index fb9ba05d09..8fb9bb2def 100644
--- a/erpnext/docs/user/manual/en/schools/setup/index.txt
+++ b/erpnext/docs/user/manual/en/schools/setup/index.txt
@@ -2,5 +2,8 @@ course
program
instructor
room
+student-category
+student-batch-name
academic-term
-academic-year
\ No newline at end of file
+academic-year
+school-settings
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/instructor.md b/erpnext/docs/user/manual/en/schools/setup/instructor.md
index 1a4d35161c..6150f025fe 100644
--- a/erpnext/docs/user/manual/en/schools/setup/instructor.md
+++ b/erpnext/docs/user/manual/en/schools/setup/instructor.md
@@ -1,5 +1,18 @@
# Instructor
+An instructoe is a teacher, or professor, of a specialised subject that involves skill.
+
+You can create an Instructor and link it to the Employee master and a Departmemt.
+
+An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
+
+
+It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
+
+
+
+An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/program.md b/erpnext/docs/user/manual/en/schools/setup/program.md
index 64513e20b0..be10166e7b 100644
--- a/erpnext/docs/user/manual/en/schools/setup/program.md
+++ b/erpnext/docs/user/manual/en/schools/setup/program.md
@@ -1,5 +1,19 @@
# Program
+An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
+
+To create a Program go to :
+
+###Schools >> Setup >> Program >> New Program
+
+Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
+
+Add the relevant Course and the Fee details for a program.
+
+
+
+The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/room.md b/erpnext/docs/user/manual/en/schools/setup/room.md
index bb265e3ea2..43ddde9224 100644
--- a/erpnext/docs/user/manual/en/schools/setup/room.md
+++ b/erpnext/docs/user/manual/en/schools/setup/room.md
@@ -1,6 +1,17 @@
# Room
+A classroom is a space (room or lab) where you want to schedule courses or examinations. A room in an educational institute can be a Class room, a laboratory or a Examination hall.
+
+The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom.
+The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
+
+
+
+The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/school-settings.md b/erpnext/docs/user/manual/en/schools/setup/school-settings.md
new file mode 100644
index 0000000000..ce9e9144b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/school-settings.md
@@ -0,0 +1,15 @@
+#School Settings
+
+The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup.
+
+
+
+The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
+
+
+
+You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md b/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
new file mode 100644
index 0000000000..056f910863
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/student-batch-name.md
@@ -0,0 +1,10 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
+
+
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/setup/student-category.md b/erpnext/docs/user/manual/en/schools/setup/student-category.md
new file mode 100644
index 0000000000..0d76927972
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/setup/student-category.md
@@ -0,0 +1,12 @@
+# Student Category
+
+Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
+
+To create Student category go to Setup >> Student Category >> New.
+
+We can create new student category by adding a name and save it
+
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/guardian.md b/erpnext/docs/user/manual/en/schools/student/guardian.md
new file mode 100644
index 0000000000..7bbdbc22c5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/student/guardian.md
@@ -0,0 +1,9 @@
+#Guardian
+
+The Guardian doctype allows you to record the guardian details for a **Student**.
+
+
+
+The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/index.txt b/erpnext/docs/user/manual/en/schools/student/index.txt
index 9b31be4dc9..89704b1fc7 100644
--- a/erpnext/docs/user/manual/en/schools/student/index.txt
+++ b/erpnext/docs/user/manual/en/schools/student/index.txt
@@ -1,5 +1,6 @@
student
+guardian
student-log
student-batch
student-group
-student-group-creation-tool
+student-group-creation-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/schools/student/student-batch.md
index 4987c0313f..056f910863 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-batch.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-batch.md
@@ -1,7 +1,10 @@
# Student Batch
-Student batch is a collection of students from Student Groups.
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
index 130c94491e..1cd9b1e796 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
@@ -1,8 +1,17 @@
# Student Group Creation Tool
-This tool allows you to create student groups in bulk. You can specify multiple parameters to create them.
+The Student group creation tool allows you to create student groups in bulk.
+To create Student group using this tool go to
-
+##Schools >>Student >> Student Group creation tool
+
+Select the **Academic Term** and the **Program** for which a student group is to be created.
+
+
+
+By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
+
+You can leave it unchecked if you don't want to consider batch while making course based groups.
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group.md b/erpnext/docs/user/manual/en/schools/student/student-group.md
index 191e917a8b..cf3f82c5a2 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group.md
@@ -1,8 +1,22 @@
# Student Group
-A student group is a collection of students taking a same course. You can create Course Schedules and Examinations against a Student Group.
-A student group needs to be created for every course in a particular academic term and academic year.
+A student group is a collection of students taking same course. You can create Course Schedules and Examinations against a Student Group.
+
+A Student Group needs to be created for every course for **Academic Term** and **Academic Year**. The student group can be create based on **Batch, Course and Activity**.
+
+To create a Student Group go to:
+
+Schools >> Student >> New Student Group
+
+
+
+To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute.
+
+Once a student group is created you can mark attendance for the group.
+
+
+
+You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
-
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/schools/student/student-log.md
index a037a231ac..160e39fcdc 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-log.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-log.md
@@ -1,6 +1,7 @@
# Student Log
-You can make a note of student activities using student log.
+The Student log Doctype enables you to add and edit addtional information for a student.
+You can make a note of student activities using Student log.
Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/schools/student/student.md
index dd99a80d2f..09e44714e6 100644
--- a/erpnext/docs/user/manual/en/schools/student/student.md
+++ b/erpnext/docs/user/manual/en/schools/student/student.md
@@ -1,10 +1,12 @@
# Student
A Student is a person who has enrolled at your institute and you have accepted their application.
-The student doctype maintains personal details of the student.
-
-You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc
+The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details.
+The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
-{next}
+You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
new file mode 100644
index 0000000000..9d5abd021e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
@@ -0,0 +1,9 @@
+# Email Error in Sending or Receiving
+
+In ERPNext, you can customize the Incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account is saved successfully. If not, then you might receive an error as below.
+
+
+
+This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
+
+Note: Your ERPNext account is connected with an ERPNext email server by default. If you don't want to use your own email server, you can continue sending emails using ERPNext email server, without any configuration required in the Email Account.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
index d175d929da..259229ec8d 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -14,4 +14,5 @@ using-custom-domain-on-erpnext
setup-two-factor-authentication
difference-between-system-user-and-website-user
outgoing-email-gateway
-print-format-sections
\ No newline at end of file
+print-format-sections
+email-error
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
new file mode 100644
index 0000000000..6c98cf34f8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
@@ -0,0 +1,13 @@
+# Download Backup
+
+In the ERPNext, you can manually download database backup. To get the latest database backup, go to:
+
+`Setup > Data > Download Backup`
+
+Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time.
+
+
+
+By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
index 998b5a2164..d15f9175bb 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.txt
@@ -1,2 +1,3 @@
data-import-tool
bulk-rename
+download-backup
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
index 244d893c7b..c05c4af5b6 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -1,6 +1,6 @@
# Setup Wizard
-The Setup Wizard helps you quickly setup your ERPnext by helping you create your company, Items, Customer, Suppliers and will also setup a basic website with this data.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organisation.
Here is a quick overview of the steps:
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
index eb7655826e..b2f680a388 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
@@ -1,10 +1,5 @@
step-1-language
step-2-currency-and-timezone
step-3-user-details
+step-4-two-factor-authentication
step-5-company-details
-step-6-letterhead-and-logo
-step-7-add-users
-step-8-tax-details
-step-9-customer-names
-step-10-suppliers
-step-11-item
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
deleted file mode 100644
index 364b4d6982..0000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Step 10: Suppliers
-
-Enter a few of your Suppliers' names.
-
-
-
----
-
-### Letterhead
-
-A letterhead is the heading at the top of a sheet of letter paper (stationery). That heading usually consists of a name and an address, and a logo or corporate design.
-
-Click on the box ‘Attach Letterhead’ . Select the image file from the place it is stored and click enter.
-
-You may choose to skip this step if your letterhead is not ready.
-
-To select letterhead later through the setup module, read [Letter-head](/docs/user/manual/en/setting-up/print/letter-head.html)
-
-#### To "attach as web-link"
-
-For any attachments in ERPNext, you can also attach as a web-link. If you are using other tools like Dropbox or Google Docs to manage your files, you can set its public link.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
deleted file mode 100644
index c92721c91b..0000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Step 7: Add Users
-
-Add other users and assign them roles based on their job responsibilities.
-
-
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
deleted file mode 100644
index dae88e4432..0000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Step 8: Tax Details
-
-Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
-
-
-
-Just set the tax name and the standard percentage levied.
-
----
-
-Some examples of tax types are given below.
-
-#### VAT
-
-A value added tax (VAT) is a form of consumption tax. From the perspective of the buyer, it is a tax on the purchase price. From that of the seller, it is a tax only on the value added to a product, material, or a service. From an accounting point of view, by the stage of its manufacture or distribution. The manufacturer remits to the government the difference between these two amounts, and retains the rest for themselves to offset the taxes they had previously paid on the inputs.
-
-The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
-
-To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
deleted file mode 100644
index e3489433fc..0000000000
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Step 9: Customers
-
-Enter your Customer names and the contact person from that organisation.
-
-
-
-
----
-
-#### Difference between a customer name and a contact name
-
-A customer name is the name of the organisation and a contact name is the name of the person from that organisation.
-
-For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
-
-Customer Name: American Power Mills
-
-Contact Name: Shiv Agarwal
-
-To understand Customer in detail visit [Customer Details](/docs/user/manual/en/CRM/customer.html)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md b/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
new file mode 100644
index 0000000000..afb6de92d8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
@@ -0,0 +1,7 @@
+# Delivery Note Negative Stock Error
+
+**Question**: When submitting a Delivery Note, receiving a message says that item's stock is insufficient, but we have item's stock available in the Warehouse.
+
+**Answer**: On submission of Delivery Note, stock level is checked as on Posting Date and Posting Time of a Delivery Note. It's possible that you have stock of an Item available in the Warehouse. But if you are creating back-dated Delivery Note, and if item was not available in the warehouse on the Posting Date and Posting Time of Delivery Note, you are likely to receive an error message on the negative stock. You can refer to the Stock Ledger report to confirm the same.
+
+If this is the case, you should edit the Posting Date and Time of a Delivery Note, and ensure that it is after the Posting Date and Time of item's receipt entry.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
index df779de628..acf1375214 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.txt
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -10,4 +10,8 @@ repack-entry
serial-no-naming
stock-entry-purpose
stock-level-report
-track-items-using-barcode
\ No newline at end of file
+track-items-using-barcode
+stock-received-but-not-billed
+return-rejected-item
+item-valuation-transactions
+delivery-note-stock-error
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
new file mode 100644
index 0000000000..5cc6529d89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
@@ -0,0 +1,17 @@
+# Item Valuation Methods and Transactions
+
+In ERPNext, Item's stock valuation is updated on the creation of one of the following transaction.
+
+1. Purchase Receipt
+2. Stock Entry of type Material Receipt
+3. Stock Reconciliation made for updating stock opening balance
+
+You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings.
+
+
+
+You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
+
+
+
+[Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average)
diff --git a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
new file mode 100644
index 0000000000..aaaec2dea0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
@@ -0,0 +1,13 @@
+# Return Rejected Items
+
+In the Purchase Receipt, you can receive the Items in the Accepted or the Rejected Warehouse.
+
+If you are creating Purchase Return for the items received in the Rejected Warehouse, then create return entry following these steps.
+
+1. In the Purchase Receipt Item table, for the item to be returned, in the Received Qty field, enter return entry in negative.
+2. In the Accepted Warehouse field, set value as zero.
+3. In the Rejected Warehouse field, set the quantity to be returned in negative.
+
+For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md b/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
new file mode 100644
index 0000000000..25ef3b8aa6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
@@ -0,0 +1,9 @@
+# Purpose of Stock Received but not Billed
+
+When purchased items are received, an accounts posting is done based on the value of the purchased items in the Stock-in-hand / fixed-assets account. When you sell and deliver those items, an expense (cost-of-goods-sold) is booked, equal to the buying cost of the items.
+
+As stock balance increases through Purchase Receipt, Warehouse account is debited and an adjustment account called **Stock Received But Not Billed** account is credited. At the same time, the negative expense is booked in account **Expense included in Valuation** for the amount added for valuation purpose, to avoid double expense booking.
+
+On receiving Bill from the supplier, you will make Purchase Invoice against a Purchase Receipt. Here **Stock Received But Not Billed** account is debited, hence nullifies the balance in the Stock Received but not Billed Account.
+
+The balance in the Stock Received but not Billed account indicates the value of items for which Purchase Receipt has been made, but billing is pending.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/subscription/__init__.py b/erpnext/docs/user/manual/en/subscription/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/docs/user/manual/en/subscription/index.md b/erpnext/docs/user/manual/en/subscription/index.md
new file mode 100644
index 0000000000..24d75eda95
--- /dev/null
+++ b/erpnext/docs/user/manual/en/subscription/index.md
@@ -0,0 +1,22 @@
+If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
+
+
+
+#### Scenario
+
+Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
+
+To set the subscription for the sales invoice
+Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+
+
+
+**From Date and To Date**: This defines contract period with the customer.
+
+**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
+
+**Notify By Email**: If you want to notify the user about auto recurring invoice.
+
+**Print Format**: Select a print format to define document view which should be emailed to customer.
+
+**Disabled**: It will stop to make auto recurring documents against the subscription
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/subscription/index.txt b/erpnext/docs/user/manual/en/subscription/index.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
index 4ca21aa969..9dc7df3f31 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -8,4 +8,5 @@ bulk-rename
renaming-documents
search-filter
tree-master-renaming
-pos-view
\ No newline at end of file
+pos-view
+letter-head-in-the-report
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
new file mode 100644
index 0000000000..4f8b2e9ea3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
@@ -0,0 +1,15 @@
+# Letter Head in the Report's Print Format
+
+In the reports, Letter Head is fetched from the Company master. To have company's Letter Head fetched correctly in the report, please ensure that you have updated default Letter Head in the Company master.
+
+`Explore > Accounts > Company`
+
+
+
+In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched.
+
+
+
+If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master.
+
+After updating Letter Head in the Company master, refresh your ERPNext account, and then check the print format of a report.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-banner.md b/erpnext/docs/user/manual/en/website/articles/website-banner.md
new file mode 100644
index 0000000000..514e23e58d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-banner.md
@@ -0,0 +1,9 @@
+# Website Banner Resizing
+
+Each ERPNext account website automatically generated from it. On a website, logo is set based on logo image selected in the Setup Wizard. You can change or edit property for your company's logo from the Website Settings.
+
+`Explore > Website > Website Settings`
+
+For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below.
+
+
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 7e65fc9262..b2c328552f 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -27,6 +27,8 @@ doctype_js = {
# setup wizard
setup_wizard_requires = "assets/erpnext/js/setup_wizard.js"
setup_wizard_complete = "erpnext.setup.setup_wizard.setup_wizard.setup_complete"
+setup_wizard_success = "erpnext.setup.setup_wizard.setup_wizard.setup_success"
+setup_wizard_test = "erpnext.setup.setup_wizard.test_setup_wizard.run_setup_wizard_test"
before_install = "erpnext.setup.install.check_setup_wizard_not_completed"
after_install = "erpnext.setup.install.after_install"
@@ -34,6 +36,8 @@ after_install = "erpnext.setup.install.after_install"
boot_session = "erpnext.startup.boot.boot_session"
notification_config = "erpnext.startup.notifications.get_notification_config"
get_help_messages = "erpnext.utilities.activation.get_help_messages"
+get_user_progress_slides = "erpnext.utilities.user_progress.get_user_progress_slides"
+update_and_get_user_progress = "erpnext.utilities.user_progress_utils.update_default_domain_actions_and_get_state"
on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
@@ -180,7 +184,7 @@ doc_events = {
scheduler_events = {
"hourly": [
- "erpnext.controllers.recurring_document.create_recurring_documents",
+ "erpnext.subscription.doctype.subscription.subscription.make_subscription_entry",
'erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.trigger_emails'
],
"daily": [
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index a078ef2033..03626cdc5c 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -289,3 +289,15 @@ def create_user(employee, user = None):
})
user.insert()
return user.name
+
+def get_employee_emails(employee_list):
+ '''Returns list of employee emails either based on user_id or company_email'''
+ employee_emails = []
+ for employee in employee_list:
+ if not employee:
+ continue
+ user, email = frappe.db.get_value('Employee', employee, ['user_id', 'company_email'])
+ if user or email:
+ employee_emails.append(user or email)
+
+ return employee_emails
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_event/test_training_event.js b/erpnext/hr/doctype/training_event/tests/test_training_event.js
similarity index 100%
rename from erpnext/hr/doctype/training_event/test_training_event.js
rename to erpnext/hr/doctype/training_event/tests/test_training_event.js
diff --git a/erpnext/hr/doctype/training_event/tests/test_training_event_attendance.js b/erpnext/hr/doctype/training_event/tests/test_training_event_attendance.js
new file mode 100644
index 0000000000..6364308f73
--- /dev/null
+++ b/erpnext/hr/doctype/training_event/tests/test_training_event_attendance.js
@@ -0,0 +1,40 @@
+QUnit.module('hr');
+
+QUnit.test("test: Training Event", function (assert) {
+ // number of asserts
+ assert.expect(1);
+ let done = assert.async();
+
+ frappe.run_serially([
+ // insert a new Training Event
+ () => frappe.set_route("List", "Training Event", "List"),
+ () => frappe.new_doc("Training Event"),
+ () => frappe.timeout(1),
+ () => frappe.click_link('Edit in full page'),
+ () => cur_frm.set_value("event_name", "Test Event " + frappe.utils.get_random(10)),
+ () => cur_frm.set_value("start_time", "2017-07-26, 2:00 pm PDT"),
+ () => cur_frm.set_value("end_time", "2017-07-26, 2:30 pm PDT"),
+ () => cur_frm.set_value("introduction", "This is a test report"),
+ () => cur_frm.set_value("location", "Fake office"),
+ () => frappe.click_button('Add Row'),
+ () => frappe.db.get_value('Employee', {'employee_name':'Test Employee 1'}, 'name'),
+ (r) => {
+ console.log(r);
+ return cur_frm.fields_dict.employees.grid.grid_rows[0].doc.employee = r.message.name;
+ },
+ () => {
+ return cur_frm.fields_dict.employees.grid.grid_rows[0].doc.attendance = "Optional";
+ },
+ () => frappe.click_button('Save'),
+ () => frappe.timeout(2),
+ () => frappe.click_button('Submit'),
+ () => frappe.timeout(2),
+ () => frappe.click_button('Yes'),
+ () => frappe.timeout(1),
+ () => {
+ assert.equal(cur_frm.doc.docstatus, 1);
+ },
+ () => done()
+ ]);
+
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_event/training_event.js b/erpnext/hr/doctype/training_event/training_event.js
index ebe0c7907c..6a6e8fe0a6 100644
--- a/erpnext/hr/doctype/training_event/training_event.js
+++ b/erpnext/hr/doctype/training_event/training_event.js
@@ -18,4 +18,4 @@ frappe.ui.form.on('Training Event', {
});
}
}
-});
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_event/training_event.json b/erpnext/hr/doctype/training_event/training_event.json
index 03b58b4802..7be9d974fe 100644
--- a/erpnext/hr/doctype/training_event/training_event.json
+++ b/erpnext/hr/doctype/training_event/training_event.json
@@ -25,7 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Event Name",
"length": 0,
@@ -55,7 +55,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Event Status",
"length": 0,
@@ -115,12 +115,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Type",
"length": 0,
"no_copy": 0,
- "options": "Seminar\nTheory\nWorkshop\nConference\nExam\nInternet",
+ "options": "Seminar\nTheory\nWorkshop\nConference\nExam\nInternet\nSelf-Study",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -386,7 +386,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Location",
"length": 0,
@@ -581,37 +581,6 @@
"set_only_once": 0,
"unique": 0
},
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Will send an email about the event to employees with status 'Open'",
- "fieldname": "send_email",
- "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": "Send Email",
- "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": 1,
@@ -672,6 +641,37 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee_emails",
+ "fieldtype": "Small Text",
+ "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": "Employee Emails",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Email",
+ "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,
@@ -684,7 +684,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-05-29 06:13:38.411039",
+ "modified": "2017-08-11 03:11:25.768563",
"modified_by": "Administrator",
"module": "HR",
"name": "Training Event",
diff --git a/erpnext/hr/doctype/training_event/training_event.py b/erpnext/hr/doctype/training_event/training_event.py
index 27ae8cf549..cc568414a0 100644
--- a/erpnext/hr/doctype/training_event/training_event.py
+++ b/erpnext/hr/doctype/training_event/training_event.py
@@ -3,24 +3,10 @@
# For license information, please see license.txt
from __future__ import unicode_literals
-import frappe
-from frappe import _
from frappe.model.document import Document
+from erpnext.hr.doctype.employee.employee import get_employee_emails
class TrainingEvent(Document):
- def on_update(self):
- self.invite_employee()
-
- def on_update_after_submit(self):
- self.invite_employee()
-
- def invite_employee(self):
- if self.event_status == "Scheduled" and self.send_email:
- subject = _("""You are invited for to attend {0} - {1} scheduled from {2} to {3} at {4}."""\
- .format(self.type, self.event_name, self.start_time, self.end_time, self.location))
-
- for emp in self.employees:
- if emp.status== "Open":
- frappe.sendmail(frappe.db.get_value("Employee", emp.employee, "company_email"), \
- subject=subject, content= self.introduction)
- emp.status= "Invited"
\ No newline at end of file
+ def validate(self):
+ self.employee_emails = ', '.join(get_employee_emails([d.employee
+ for d in self.employees]))
diff --git a/erpnext/hr/doctype/training_event_employee/training_event_employee.json b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
index 575d0e7582..a8a72b1a70 100644
--- a/erpnext/hr/doctype/training_event_employee/training_event_employee.json
+++ b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
+ "allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
@@ -11,6 +12,7 @@
"editable_grid": 1,
"fields": [
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -21,6 +23,7 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
+ "in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Employee",
@@ -40,6 +43,7 @@
"unique": 0
},
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -50,6 +54,7 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
+ "in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Employee Name",
@@ -69,6 +74,7 @@
"unique": 0
},
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@@ -79,6 +85,7 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
+ "in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
@@ -96,6 +103,7 @@
"unique": 0
},
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
@@ -107,12 +115,44 @@
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
+ "in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
- "options": "Open\nInvited\nConfirmed\nAttended\nWithdrawn",
+ "options": "Open\nInvited\nCompleted\nFeedback Submitted",
+ "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": "attendance",
+ "fieldtype": "Select",
+ "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": "Attendance",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Mandatory\nOptional",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -126,17 +166,17 @@
"unique": 0
}
],
+ "has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
- "in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-12-14 11:43:40.996578",
+ "modified": "2017-08-11 03:36:22.738253",
"modified_by": "Administrator",
"module": "HR",
"name": "Training Event Employee",
@@ -146,7 +186,9 @@
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
+ "show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
+ "track_changes": 0,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.py b/erpnext/hr/doctype/training_feedback/training_feedback.py
index 2a0403bd53..b7eae38ae4 100644
--- a/erpnext/hr/doctype/training_feedback/training_feedback.py
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.py
@@ -5,6 +5,19 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
+from frappe import _
class TrainingFeedback(Document):
- pass
+ def validate(self):
+ training_event = frappe.get_doc("Training Event", self.training_event)
+ if training_event.docstatus != 1:
+ frappe.throw(_('{0} must be submitted').format(_('Training Event')))
+
+ def on_submit(self):
+ training_event = frappe.get_doc("Training Event", self.training_event)
+ for e in training_event.employees:
+ if e.employee == self.employee:
+ training_event.status = 'Feedback Submitted'
+ break
+
+ training_event.save()
diff --git a/erpnext/hr/doctype/training_result/test_training_result.js b/erpnext/hr/doctype/training_result/test_training_result.js
new file mode 100644
index 0000000000..cb1d7fb27a
--- /dev/null
+++ b/erpnext/hr/doctype/training_result/test_training_result.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: Training Result", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Training Result
+ () => frappe.tests.make('Training Result', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/hr/doctype/training_result/training_result.json b/erpnext/hr/doctype/training_result/training_result.json
index e5fbb5fd42..41142b59e6 100644
--- a/erpnext/hr/doctype/training_result/training_result.json
+++ b/erpnext/hr/doctype/training_result/training_result.json
@@ -26,7 +26,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Training Event",
"length": 0,
@@ -133,6 +133,37 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee_emails",
+ "fieldtype": "Small Text",
+ "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": "Employee Emails",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Email",
+ "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,
@@ -145,7 +176,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-06-15 08:16:01.566531",
+ "modified": "2017-08-11 03:53:21.283968",
"modified_by": "Administrator",
"module": "HR",
"name": "Training Result",
diff --git a/erpnext/hr/doctype/training_result/training_result.py b/erpnext/hr/doctype/training_result/training_result.py
index 36c3cb93bc..7cdc51f801 100644
--- a/erpnext/hr/doctype/training_result/training_result.py
+++ b/erpnext/hr/doctype/training_result/training_result.py
@@ -6,19 +6,27 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.model.document import Document
+from erpnext.hr.doctype.employee.employee import get_employee_emails
class TrainingResult(Document):
+ def validate(self):
+ training_event = frappe.get_doc("Training Event", self.training_event)
+ if training_event.docstatus != 1:
+ frappe.throw(_('{0} must be submitted').format(_('Training Event')))
+
+ self.employee_emails = ', '.join(get_employee_emails([d.employee
+ for d in self.employees]))
+
def on_submit(self):
- self.send_result()
-
- def send_result(self):
- for emp in self.employees:
- message = "Thank You for attending {0}.".format(self.training_event)
- if emp.grade:
- message = message + "Your grade: {0}".format(emp.grade)
- frappe.sendmail(frappe.db.get_value("Employee", emp.employee, "company_email"), \
- subject=_("{0} Results".format(self.training_event)), \
- content=message)
+ training_event = frappe.get_doc("Training Event", self.training_event)
+ training_event.status = 'Completed'
+ for e in self.employees:
+ for e1 in training_event.employees:
+ if e1.employee == e.employee:
+ e1.status = 'Completed'
+ break
+
+ training_event.save()
@frappe.whitelist()
def get_employees(training_event):
diff --git a/erpnext/hr/email_alert/__init__.py b/erpnext/hr/email_alert/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/hr/email_alert/training_feedback/__init__.py b/erpnext/hr/email_alert/training_feedback/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/hr/email_alert/training_feedback/training_feedback.html b/erpnext/hr/email_alert/training_feedback/training_feedback.html
new file mode 100644
index 0000000000..fd8fef9e82
--- /dev/null
+++ b/erpnext/hr/email_alert/training_feedback/training_feedback.html
@@ -0,0 +1,6 @@
+
+
+
+
+
+
+
+
+ `);
+ }
+
+ make_cart() {
+ this.cart = new POSCart({
+ frm: this.frm,
+ wrapper: this.wrapper.find('.cart-container'),
+ events: {
+ on_customer_change: (customer) => this.frm.set_value('customer', customer),
+ on_field_change: (item_code, field, value) => {
+ this.update_item_in_cart(item_code, field, value);
+ },
+ on_numpad: (value) => {
+ if (value == 'Pay') {
+ if (!this.payment) {
+ this.make_payment_modal();
+ }
+ this.payment.open_modal();
+ }
+ },
+ on_select_change: () => {
+ this.cart.numpad.set_inactive();
+ }
+ }
+ });
+ }
+
+ toggle_editing(flag) {
+ let disabled;
+ if (flag !== undefined) {
+ disabled = !flag;
+ } else {
+ disabled = this.frm.doc.docstatus == 1 ? true: false;
+ }
+ const pointer_events = disabled ? 'none' : 'inherit';
+
+ this.wrapper.find('input, button, select').prop("disabled", disabled);
+ this.wrapper.find('.number-pad-container').toggleClass("hide", disabled);
+
+ this.wrapper.find('.cart-container').css('pointer-events', pointer_events);
+ this.wrapper.find('.item-container').css('pointer-events', pointer_events);
+
+ this.page.clear_actions();
+ }
+
+ make_items() {
+ this.items = new POSItems({
+ wrapper: this.wrapper.find('.item-container'),
+ pos_profile: this.pos_profile,
+ events: {
+ update_cart: (item, field, value) => {
+ if(!this.frm.doc.customer) {
+ frappe.throw(__('Please select a customer'));
+ }
+ this.update_item_in_cart(item, field, value);
+ this.cart && this.cart.unselect_all();
+ }
+ }
+ });
+ }
+
+ update_item_in_cart(item_code, field='qty', value=1) {
+ if(this.cart.exists(item_code)) {
+ const item = this.frm.doc.items.find(i => i.item_code === item_code);
+ frappe.flags.hide_serial_batch_dialog = false;
+
+ if (typeof value === 'string' && !in_list(['serial_no', 'batch_no'], field)) {
+ // value can be of type '+1' or '-1'
+ value = item[field] + flt(value);
+ }
+
+ if(field === 'serial_no') {
+ value = item.serial_no + '\n'+ value;
+ }
+
+ if(field === 'qty' && (item.serial_no || item.batch_no)) {
+ this.select_batch_and_serial_no(item);
+ } else {
+ this.update_item_in_frm(item, field, value)
+ .then(() => {
+ // update cart
+ this.update_cart_data(item);
+ });
+ }
+ return;
+ }
+
+ let args = { item_code: item_code };
+ if (in_list(['serial_no', 'batch_no'], field)) {
+ args[field] = value;
+ }
+
+ // add to cur_frm
+ const item = this.frm.add_child('items', args);
+ frappe.flags.hide_serial_batch_dialog = true;
+ this.frm.script_manager
+ .trigger('item_code', item.doctype, item.name)
+ .then(() => {
+ const show_dialog = item.has_serial_no || item.has_batch_no;
+ if (show_dialog && field == 'qty') {
+ // check has serial no/batch no and update cart
+ this.select_batch_and_serial_no(item);
+ } else {
+ // update cart
+ this.update_cart_data(item);
+ }
+ });
+ }
+
+ select_batch_and_serial_no(item) {
+ erpnext.show_serial_batch_selector(this.frm, item, () => {
+ this.update_item_in_frm(item)
+ .then(() => {
+ // update cart
+ this.update_cart_data(item);
+ });
+ }, true);
+ }
+
+ update_cart_data(item) {
+ this.cart.add_item(item);
+ this.cart.update_taxes_and_totals();
+ this.cart.update_grand_total();
+ }
+
+ update_item_in_frm(item, field, value) {
+ if (field) {
+ frappe.model.set_value(item.doctype, item.name, field, value);
+ }
+
+ return this.frm.script_manager
+ .trigger('qty', item.doctype, item.name)
+ .then(() => {
+ if (field === 'qty' && value === 0) {
+ frappe.model.clear_doc(item.doctype, item.name);
+ }
+ });
+ }
+
+ make_payment_modal() {
+ this.payment = new Payment({
+ frm: this.frm,
+ events: {
+ submit_form: () => {
+ this.submit_sales_invoice();
+ }
+ }
+ });
+ }
+
+ submit_sales_invoice() {
+
+ frappe.confirm(__("Permanently Submit {0}?", [this.frm.doc.name]), () => {
+ frappe.call({
+ method: 'erpnext.selling.page.point_of_sale.point_of_sale.submit_invoice',
+ freeze: true,
+ args: {
+ doc: this.frm.doc
+ }
+ }).then(r => {
+ if(r.message) {
+ this.frm.doc = r.message;
+ frappe.show_alert({
+ indicator: 'green',
+ message: __(`Sales invoice ${r.message.name} created succesfully`)
+ });
+
+ this.toggle_editing();
+ this.set_form_action();
+ }
+ });
+ });
+ }
+
+ bind_events() {
+
+ }
+
+ setup_pos_profile() {
+ return frappe.call({
+ method: 'erpnext.stock.get_item_details.get_pos_profile',
+ args: {
+ company: frappe.sys_defaults.company
+ }
+ }).then(r => {
+ this.pos_profile = r.message;
+
+ if (!this.pos_profile) {
+ this.pos_profile = {
+ currency: frappe.defaults.get_default('currency'),
+ selling_price_list: frappe.defaults.get_default('selling_price_list')
+ };
+ }
+ });
+ }
+
+ make_new_invoice() {
+ return frappe.run_serially([
+ () => this.make_sales_invoice_frm(),
+ () => {
+ if (this.cart) {
+ this.cart.frm = this.frm;
+ this.cart.reset();
+ } else {
+ this.make_cart();
+ }
+ this.toggle_editing(true);
+ }
+ ]);
+ }
+
+ make_sales_invoice_frm() {
+ const doctype = 'Sales Invoice';
+ return new Promise(resolve => {
+ if (this.frm) {
+ this.frm = get_frm(this.frm);
+ resolve();
+ } else {
+ frappe.model.with_doctype(doctype, () => {
+ this.frm = get_frm();
+ resolve();
+ });
+ }
+ });
+
+ function get_frm(_frm) {
+ const page = $('');
+ const frm = _frm || new _f.Frm(doctype, page, false);
+ const name = frappe.model.make_new_doc_and_get_name(doctype, true);
+ frm.refresh(name);
+ frm.doc.items = [];
+ frm.set_value('is_pos', 1);
+ frm.meta.default_print_format = 'POS Invoice';
+ return frm;
+ }
+ }
+
+ prepare_menu() {
+ var me = this;
+ this.page.clear_menu();
+
+ // for mobile
+ // this.page.add_menu_item(__("Pay"), function () {
+ //
+ // }).addClass('visible-xs');
+
+ this.page.add_menu_item(__("Form View"), function () {
+ frappe.model.sync(me.frm.doc);
+ frappe.set_route("Form", me.frm.doc.doctype, me.frm.doc.name);
+ });
+
+ this.page.add_menu_item(__("POS Profile"), function () {
+ frappe.set_route('List', 'POS Profile');
+ });
+
+ this.page.add_menu_item(__('POS Settings'), function() {
+ frappe.set_route('Form', 'POS Settings');
+ });
+ }
+
+ set_form_action() {
+ if(this.frm.doc.docstatus !== 1) return;
+
+ this.page.set_secondary_action(__("Print"), () => {
+ if (this.pos_profile && this.pos_profile.print_format_for_online) {
+ this.frm.meta.default_print_format = this.pos_profile.print_format_for_online;
+ }
+ this.frm.print_preview.printit(true);
+ });
+
+ this.page.set_primary_action(__("New"), () => {
+ this.make_new_invoice();
+ });
+
+ this.page.add_menu_item(__("Email"), () => {
+ this.frm.email_doc();
+ });
+ }
+};
+
+class POSCart {
+ constructor({frm, wrapper, events}) {
+ this.frm = frm;
+ this.wrapper = wrapper;
+ this.events = events;
+ this.make();
+ this.bind_events();
+ }
+
+ make() {
+ this.make_dom();
+ this.make_customer_field();
+ this.make_numpad();
+ }
+
+ make_dom() {
+ this.wrapper.append(`
+ `;
+ }
+
+ this.set_class();
+ }
+
+ set_class() {
+ for (const btn in this.add_class) {
+ const class_name = this.add_class[btn];
+ this.get_btn(btn).addClass(class_name);
+ }
+ }
+
+ bind_events() {
+ // bind click event
+ const me = this;
+ this.wrapper.on('click', '.num-col', function() {
+ const $btn = $(this);
+ const btn_value = $btn.attr('data-value');
+ if (!me.disable_highlight.includes(btn_value)) {
+ me.highlight_button($btn);
+ }
+ if (me.reset_btns.includes(btn_value)) {
+ me.reset_value();
+ } else {
+ if (btn_value === me.del_btn) {
+ me.value = me.value.substr(0, me.value.length - 1);
+ } else {
+ me.value += btn_value;
+ }
+ }
+ me.onclick(btn_value);
+ });
+ }
+
+ reset_value() {
+ this.value = '';
+ }
+
+ get_value() {
+ return flt(this.value);
+ }
+
+ get_btn(btn_value) {
+ return this.wrapper.find(`.num-col[data-value="${btn_value}"]`);
+ }
+
+ highlight_button($btn) {
+ $btn.addClass('highlight');
+ setTimeout(() => $btn.removeClass('highlight'), 1000);
+ }
+
+ set_active(btn_value) {
+ const $btn = this.get_btn(btn_value);
+ this.wrapper.find('.num-col').removeClass('active');
+ $btn.addClass('active');
+ }
+
+ set_inactive() {
+ this.wrapper.find('.num-col').removeClass('active');
+ }
+}
+
+class Payment {
+ constructor({frm, events}) {
+ this.frm = frm;
+ this.events = events;
+ this.make();
+ this.bind_events();
+ this.set_primary_action();
+ }
+
+ open_modal() {
+ this.dialog.show();
+ }
+
+ make() {
+ this.set_flag();
+
+ let title = __('Total Amount {0}',
+ [format_currency(this.frm.doc.grand_total, this.frm.doc.currency)]);
+
+ this.dialog = new frappe.ui.Dialog({
+ title: title,
+ fields: this.get_fields(),
+ width: 800
+ });
+
+ this.$body = this.dialog.body;
+
+ this.numpad = new NumberPad({
+ wrapper: $(this.$body).find('[data-fieldname="numpad"]'),
+ button_array: [
+ [1, 2, 3],
+ [4, 5, 6],
+ [7, 8, 9],
+ ['Del', 0, '.'],
+ ],
+ onclick: () => {
+ if(this.fieldname) {
+ this.dialog.set_value(this.fieldname, this.numpad.get_value());
+ }
+ }
+ });
+ }
+
+ bind_events() {
+ var me = this;
+ $(this.dialog.body).find('.input-with-feedback').focusin(function() {
+ me.numpad.reset_value();
+ me.fieldname = $(this).prop('dataset').fieldname;
+ });
+ }
+
+ set_primary_action() {
+ var me = this;
+
+ this.dialog.set_primary_action(__("Submit"), function() {
+ me.dialog.hide();
+ me.events.submit_form();
+ });
+ }
+
+ get_fields() {
+ const me = this;
+
+ let fields = this.frm.doc.payments.map(p => {
+ return {
+ fieldtype: 'Currency',
+ label: __(p.mode_of_payment),
+ options: me.frm.doc.currency,
+ fieldname: p.mode_of_payment,
+ default: p.amount,
+ onchange: () => {
+ const value = this.dialog.get_value(this.fieldname);
+ me.update_payment_value(this.fieldname, value);
+ }
+ };
+ });
+
+ fields = fields.concat([
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'HTML',
+ fieldname: 'numpad'
+ },
+ {
+ fieldtype: 'Section Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Write off Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "write_off_amount",
+ default: me.frm.doc.write_off_amount,
+ onchange: () => {
+ me.update_cur_frm_value('write_off_amount', () => {
+ frappe.flags.change_amount = false;
+ me.update_change_amount();
+ });
+ }
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Change Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "change_amount",
+ default: me.frm.doc.change_amount,
+ onchange: () => {
+ me.update_cur_frm_value('change_amount', () => {
+ frappe.flags.write_off_amount = false;
+ me.update_write_off_amount();
+ });
+ }
+ },
+ {
+ fieldtype: 'Section Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Paid Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "paid_amount",
+ default: me.frm.doc.paid_amount,
+ read_only: 1
+ },
+ {
+ fieldtype: 'Column Break',
+ },
+ {
+ fieldtype: 'Currency',
+ label: __("Outstanding Amount"),
+ options: me.frm.doc.currency,
+ fieldname: "outstanding_amount",
+ default: me.frm.doc.outstanding_amount,
+ read_only: 1
+ },
+ ]);
+
+ return fields;
+ }
+
+ set_flag() {
+ frappe.flags.write_off_amount = true;
+ frappe.flags.change_amount = true;
+ }
+
+ update_cur_frm_value(fieldname, callback) {
+ if (frappe.flags[fieldname]) {
+ const value = this.dialog.get_value(fieldname);
+ this.frm.set_value(fieldname, value)
+ .then(() => {
+ callback();
+ });
+ }
+
+ frappe.flags[fieldname] = true;
+ }
+
+ update_payment_value(fieldname, value) {
+ var me = this;
+ $.each(this.frm.doc.payments, function(i, data) {
+ if (__(data.mode_of_payment) == __(fieldname)) {
+ frappe.model.set_value('Sales Invoice Payment', data.name, 'amount', value)
+ .then(() => {
+ me.update_change_amount();
+ me.update_write_off_amount();
+ });
+ }
+ });
+ }
+
+ update_change_amount() {
+ this.dialog.set_value("change_amount", this.frm.doc.change_amount);
+ this.show_paid_amount();
+ }
+
+ update_write_off_amount() {
+ this.dialog.set_value("write_off_amount", this.frm.doc.write_off_amount);
+ }
+
+ show_paid_amount() {
+ this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
+ this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
+ }
+}
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.json b/erpnext/selling/page/point_of_sale/point_of_sale.json
new file mode 100644
index 0000000000..1e348c09af
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.json
@@ -0,0 +1,20 @@
+{
+ "content": null,
+ "creation": "2017-08-07 17:08:56.737947",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2017-08-07 17:08:56.737947",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "point-of-sale",
+ "owner": "Administrator",
+ "page_name": "Point of Sale",
+ "restrict_to_domain": "Retail",
+ "roles": [],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Point of Sale"
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
new file mode 100644
index 0000000000..8ed288b6e9
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -0,0 +1,71 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+
+@frappe.whitelist()
+def get_items(start, page_length, price_list, item_group, search_value=""):
+ serial_no = ""
+ batch_no = ""
+ item_code = search_value
+
+ if search_value:
+ # search serial no
+ serial_no_data = frappe.db.get_value('Serial No', search_value, ['name', 'item_code'])
+ if serial_no_data:
+ serial_no, item_code = serial_no_data
+
+ if not serial_no:
+ batch_no_data = frappe.db.get_value('Batch', search_value, ['name', 'item'])
+ if batch_no_data:
+ batch_no, item_code = batch_no_data
+
+ lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt'])
+ # locate function is used to sort by closest match from the beginning of the value
+ res = frappe.db.sql("""select i.name as item_code, i.item_name, i.image as item_image,
+ item_det.price_list_rate, item_det.currency
+ from `tabItem` i LEFT JOIN
+ (select item_code, price_list_rate, currency from
+ `tabItem Price` where price_list=%(price_list)s) item_det
+ ON
+ (item_det.item_code=i.name or item_det.item_code=i.variant_of)
+ where
+ i.disabled = 0 and i.has_variants = 0
+ and i.item_group in (select name from `tabItem Group` where lft >= {lft} and rgt <= {rgt})
+ and (i.item_code like %(item_code)s
+ or i.item_name like %(item_code)s or i.barcode like %(item_code)s)
+ limit {start}, {page_length}""".format(start=start, page_length=page_length, lft=lft, rgt=rgt),
+ {
+ 'item_code': '%%%s%%'%(frappe.db.escape(item_code)),
+ 'price_list': price_list
+ } , as_dict=1)
+
+ res = {
+ 'items': res
+ }
+
+ if serial_no:
+ res.update({
+ 'serial_no': serial_no
+ })
+
+ if batch_no:
+ res.update({
+ 'batch_no': batch_no
+ })
+
+ return res
+
+@frappe.whitelist()
+def submit_invoice(doc):
+ if isinstance(doc, basestring):
+ args = json.loads(doc)
+
+ doc = frappe.new_doc('Sales Invoice')
+ doc.update(args)
+ doc.run_method("set_missing_values")
+ doc.run_method("calculate_taxes_and_totals")
+ doc.submit()
+
+ return doc
diff --git a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
new file mode 100644
index 0000000000..c70d076c70
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
@@ -0,0 +1,38 @@
+QUnit.test("test:Point of Sales", function(assert) {
+ assert.expect(1);
+ let done = assert.async();
+
+ frappe.run_serially([
+ () => frappe.set_route('point-of-sale'),
+ () => frappe.timeout(2),
+ () => frappe.set_control('customer', 'Test Customer 1'),
+ () => frappe.timeout(0.2),
+ () => cur_frm.set_value('customer', 'Test Customer 1'),
+ () => frappe.timeout(2),
+ () => frappe.click_link('Test Product 2'),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.cart-items [data-item-code="Test Product 2"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="Rate"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="2"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="5"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="0"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.number-pad [data-value="Pay"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="4"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="5"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_element(`.frappe-control [data-value="0"]`),
+ () => frappe.timeout(0.2),
+ () => frappe.click_button('Submit'),
+ () => frappe.click_button('Yes'),
+ () => frappe.timeout(3),
+ () => assert.ok(cur_frm.doc.docstatus==1, "Sales invoice created successfully"),
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/tests/test_pos_settings.js b/erpnext/selling/page/point_of_sale/tests/test_pos_settings.js
new file mode 100644
index 0000000000..d9b8cf8274
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/tests/test_pos_settings.js
@@ -0,0 +1,17 @@
+QUnit.test("test:POS Settings", function(assert) {
+ assert.expect(1);
+ let done = assert.async();
+
+ frappe.run_serially([
+ () => frappe.set_route('Form', 'POS Settings'),
+ () => cur_frm.set_value('is_online', 1),
+ () => frappe.timeout(0.2),
+ () => cur_frm.save(),
+ () => frappe.timeout(1),
+ () => frappe.ui.toolbar.clear_cache(),
+ () => frappe.timeout(10),
+ () => assert.ok(cur_frm.doc.is_online==1, "Enabled online"),
+ () => frappe.timeout(2),
+ () => done()
+ ]);
+});
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 8c814e3de8..c15d737a31 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -8,6 +8,16 @@ frappe.ui.form.on("Company", {
erpnext.company.setup_queries(frm);
},
+ company_name: function(frm) {
+ if(frm.doc.__islocal) {
+ let parts = frm.doc.company_name.split();
+ let abbr = $.map(parts, function (p) {
+ return p? p.substr(0, 1) : null;
+ }).join("");
+ frm.set_value("abbr", abbr);
+ }
+ },
+
refresh: function(frm) {
if(frm.doc.abbr && !frm.doc.__islocal) {
frm.set_df_property("abbr", "read_only", 1);
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index c338a81a8e..15e6b4b5b9 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -195,6 +195,157 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "sales_settings",
+ "fieldtype": "Section Break",
+ "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": "Sales",
+ "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,
+ "fieldname": "sales_monthly_history",
+ "fieldtype": "Small Text",
+ "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": "Sales Monthly History",
+ "length": 0,
+ "no_copy": 1,
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "monthly_sales_target",
+ "fieldtype": "Currency",
+ "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": "Monthly Sales Target",
+ "length": 0,
+ "no_copy": 0,
+ "options": "default_currency",
+ "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_goals",
+ "fieldtype": "Column Break",
+ "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,
+ "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,
+ "fieldname": "total_monthly_sales",
+ "fieldtype": "Currency",
+ "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": "Total Monthly Sales",
+ "length": 0,
+ "no_copy": 1,
+ "options": "default_currency",
+ "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,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -500,157 +651,6 @@
"set_only_once": 0,
"unique": 0
},
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_settings",
- "fieldtype": "Section Break",
- "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": "Sales",
- "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,
- "fieldname": "sales_monthly_history",
- "fieldtype": "Small Text",
- "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": "Sales Monthly History",
- "length": 0,
- "no_copy": 1,
- "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,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_target",
- "fieldtype": "Currency",
- "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": "Sales Target",
- "length": 0,
- "no_copy": 1,
- "options": "default_currency",
- "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_goals",
- "fieldtype": "Column Break",
- "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,
- "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,
- "fieldname": "total_monthly_sales",
- "fieldtype": "Currency",
- "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": "Total Monthly Sales",
- "length": 0,
- "no_copy": 1,
- "options": "default_currency",
- "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,
- "unique": 0
- },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -1991,7 +1991,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-08-03 16:17:31.206886",
+ "modified": "2017-08-31 11:48:56.278568",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index b945ee4104..d3503cc1fa 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -76,7 +76,10 @@ class Company(Document):
self.create_default_accounts()
self.create_default_warehouses()
- self.install_country_fixtures()
+ if cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
+ # In the case of setup, fixtures should be installed after setup_success
+ # This also prevents db commits before setup is successful
+ install_country_fixtures(self.name)
if not frappe.db.get_value("Cost Center", {"is_group": 0, "company": self.name}):
self.create_default_cost_center()
@@ -95,12 +98,6 @@ class Company(Document):
frappe.clear_cache()
- def install_country_fixtures(self):
- path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(self.country))
- if os.path.exists(path.encode("utf-8")):
- frappe.get_attr("erpnext.regional.{0}.setup.setup"
- .format(self.country.lower()))(self)
-
def create_default_warehouses(self):
for wh_detail in [
{"warehouse_name": _("All Warehouses"), "is_group": 1},
@@ -311,6 +308,13 @@ def get_name_with_abbr(name, company):
return " - ".join(parts)
+def install_country_fixtures(company):
+ company_doc = frappe.get_doc("Company", company)
+ path = frappe.get_app_path('erpnext', 'regional', frappe.scrub(company_doc.country))
+ if os.path.exists(path.encode("utf-8")):
+ frappe.get_attr("erpnext.regional.{0}.setup.setup"
+ .format(company_doc.country.lower()))(company_doc)
+
def update_company_current_month_sales(company):
current_month_year = formatdate(today(), "MM-yyyy")
diff --git a/erpnext/setup/doctype/company/company_dashboard.py b/erpnext/setup/doctype/company/company_dashboard.py
index da7f2b582a..7526dd6c54 100644
--- a/erpnext/setup/doctype/company/company_dashboard.py
+++ b/erpnext/setup/doctype/company/company_dashboard.py
@@ -8,8 +8,8 @@ def get_data():
'graph': True,
'graph_method': "frappe.utils.goal.get_monthly_goal_graph_data",
'graph_method_args': {
- 'title': 'Sales',
- 'goal_value_field': 'sales_target',
+ 'title': _('Sales'),
+ 'goal_value_field': 'monthly_sales_target',
'goal_total_field': 'total_monthly_sales',
'goal_history_field': 'sales_monthly_history',
'goal_doctype': 'Sales Invoice',
diff --git a/erpnext/setup/doctype/setup_progress/__init__.py b/erpnext/setup/doctype/setup_progress/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.js b/erpnext/setup/doctype/setup_progress/setup_progress.js
new file mode 100644
index 0000000000..5c78bd5075
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Setup Progress', {
+ refresh: function() {
+
+ }
+});
diff --git a/erpnext/setup/doctype/setup_progress/setup_progress.json b/erpnext/setup/doctype/setup_progress/setup_progress.json
new file mode 100644
index 0000000000..2f886afe3b
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-08-27 21:01:42.032109",
+ "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": "actions_sb",
+ "fieldtype": "Section Break",
+ "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": "Actions",
+ "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,
+ "fieldname": "actions",
+ "fieldtype": "Table",
+ "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": "Actions",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Setup Progress Action",
+ "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": 1,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-08-28 17:44:43.100932",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Setup Progress",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "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/setup/doctype/setup_progress/setup_progress.py b/erpnext/setup/doctype/setup_progress/setup_progress.py
new file mode 100644
index 0000000000..26eecd9634
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/setup_progress.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe.model.document import Document
+
+class SetupProgress(Document):
+ pass
+
+def get_setup_progress():
+ if not getattr(frappe.local, "setup_progress", None):
+ frappe.local.setup_progress = frappe.get_doc("Setup Progress", "Setup Progress")
+
+ return frappe.local.setup_progress
+
+def get_action_completed_state(action_name):
+ return [d.is_completed for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+
+def update_action_completed_state(action_name):
+ action_table_doc = [d for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+ update_action(action_table_doc)
+
+def update_action(action_table_doc):
+ if not action_table_doc.is_completed and frappe.db.count(action_table_doc.action_doctype) >= action_table_doc.min_doc_count:
+ action_table_doc.is_completed = 1
+ action_table_doc.save()
+
+def update_domain_actions(domain):
+ for d in get_setup_progress().actions:
+ domains = json.loads(d.domains)
+ if domains == [] or domain in domains:
+ update_action(d)
+
+def get_domain_actions_state(domain):
+ state = {}
+ for d in get_setup_progress().actions:
+ domains = json.loads(d.domains)
+ if domains == [] or domain in domains:
+ state[d.action_name] = d.is_completed
+ return state
+
+@frappe.whitelist()
+def set_action_completed_state(action_name):
+ action_table_doc = [d for d in get_setup_progress().actions
+ if d.action_name == action_name][0]
+ action_table_doc.is_completed = 1
+ action_table_doc.save()
diff --git a/erpnext/setup/doctype/setup_progress/test_setup_progress.js b/erpnext/setup/doctype/setup_progress/test_setup_progress.js
new file mode 100644
index 0000000000..9e84e0cb15
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress/test_setup_progress.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: Setup Progress", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Setup Progress
+ () => frappe.tests.make('Setup Progress', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/setup/doctype/setup_progress_action/__init__.py b/erpnext/setup/doctype/setup_progress_action/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json
new file mode 100644
index 0000000000..030fd99a33
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.json
@@ -0,0 +1,192 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-08-27 21:00:40.715360",
+ "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": "action_name",
+ "fieldtype": "Data",
+ "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": "Action Name",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "action_doctype",
+ "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": "Action Doctype",
+ "length": 0,
+ "no_copy": 0,
+ "options": "DocType",
+ "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": "min_doc_count",
+ "fieldtype": "Int",
+ "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": "Min Doc Count",
+ "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,
+ "fieldname": "domains",
+ "fieldtype": "Code",
+ "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": "Domains",
+ "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,
+ "fieldname": "is_completed",
+ "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 Completed",
+ "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
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 1,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-08-28 17:44:58.008526",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Setup Progress Action",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 1,
+ "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/setup/doctype/setup_progress_action/setup_progress_action.py b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.py
new file mode 100644
index 0000000000..24af94347e
--- /dev/null
+++ b/erpnext/setup/doctype/setup_progress_action/setup_progress_action.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 SetupProgressAction(Document):
+ pass
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index ea6da04641..53e58a15af 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -20,6 +20,28 @@ def install(country=None):
{ 'doctype': 'Domain', 'domain': _('Services')},
{ 'doctype': 'Domain', 'domain': _('Education')},
+ # Setup Progress
+ {'doctype': "Setup Progress", "actions": [
+ {"action_name": _("Add Company"), "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
+ "domains": '[]' },
+ {"action_name": _("Add Customers"), "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": _("Add Suppliers"), "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": _("Add Products"), "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
+ {"action_name": _("Add Programs"), "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": _("Add Instructors"), "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": _("Add Courses"), "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": _("Add Rooms"), "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
+ "domains": '["Education"]' },
+ {"action_name": _("Add Users"), "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
+ "domains": '[]' }
+ ]},
+
# address template
{'doctype':"Address Template", "country": country},
diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
index cfc6726d1c..bc26e09677 100644
--- a/erpnext/setup/setup_wizard/sample_data.py
+++ b/erpnext/setup/setup_wizard/sample_data.py
@@ -10,26 +10,27 @@ import random, os, json
from frappe import _
from markdown2 import markdown
-def make_sample_data(args):
+def make_sample_data(domain, make_dependent = False):
"""Create a few opportunities, quotes, material requests, issues, todos, projects
to help the user get started"""
- items = frappe.get_all("Item", {'is_sales_item': 1})
- customers = frappe.get_all("Customer")
- warehouses = frappe.get_all("Warehouse")
+ if make_dependent:
+ items = frappe.get_all("Item", {'is_sales_item': 1})
+ customers = frappe.get_all("Customer")
+ warehouses = frappe.get_all("Warehouse")
- if items and customers:
- for i in range(3):
- customer = random.choice(customers).name
- make_opportunity(items, customer)
- make_quote(items, customer)
+ if items and customers:
+ for i in range(3):
+ customer = random.choice(customers).name
+ make_opportunity(items, customer)
+ make_quote(items, customer)
- make_projects(args.get('domain'))
+ if items and warehouses:
+ make_material_request(frappe.get_all("Item"))
+
+ make_projects(domain)
import_email_alert()
- if items and warehouses:
- make_material_request(frappe.get_all("Item"))
-
frappe.db.commit()
def make_opportunity(items, customer):
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 4dec3d75f7..40d11e5bdc 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -15,6 +15,7 @@ from .sample_data import make_sample_data
from erpnext.accounts.doctype.account.account import RootNotEditable
from frappe.core.doctype.communication.comment import add_info_comment
from erpnext.setup.setup_wizard.domainify import setup_domain
+from erpnext.setup.doctype.company.company import install_country_fixtures
def setup_complete(args=None):
if frappe.db.sql("select name from tabCompany"):
@@ -25,24 +26,16 @@ def setup_complete(args=None):
create_price_lists(args)
create_fiscal_year_and_company(args)
create_sales_tax(args)
- create_users(args)
+ create_employee_for_self(args)
set_defaults(args)
create_territories()
create_feed_and_todo()
create_email_digest()
create_letter_head(args)
- create_taxes(args)
- create_items(args)
- create_customers(args)
- create_suppliers(args)
if args.get('domain').lower() == 'education':
create_academic_year()
create_academic_term()
- create_program(args)
- create_course(args)
- create_instructor(args)
- create_room(args)
if args.get('setup_website'):
website_maker(args)
@@ -58,16 +51,19 @@ def setup_complete(args=None):
frappe.db.commit()
frappe.clear_cache()
- if args.get("add_sample_data"):
- try:
- make_sample_data(args)
- frappe.clear_cache()
- except:
- # clear message
- if frappe.message_log:
- frappe.message_log.pop()
+ try:
+ make_sample_data(args.get('domain'))
+ frappe.clear_cache()
+ except:
+ # clear message
+ if frappe.message_log:
+ frappe.message_log.pop()
- pass
+ pass
+
+def setup_success(args=None):
+ company = frappe.db.sql("select name from tabCompany", as_dict=True)[0]["name"]
+ install_country_fixtures(company)
def create_fiscal_year_and_company(args):
if (args.get('fy_start_date')):
@@ -91,8 +87,7 @@ def create_fiscal_year_and_company(args):
'country': args.get('country'),
'create_chart_of_accounts_based_on': 'Standard Template',
'chart_of_accounts': args.get('chart_of_accounts'),
- 'domain': args.get('domain'),
- 'sales_target': args.get('sales_target')
+ 'domain': args.get('domain')
}).insert()
#Enable shopping cart
@@ -259,22 +254,7 @@ def create_sales_tax(args):
tax_data.get('account_name'),
tax_data.get('tax_rate'), sales_tax)
-def get_country_wise_tax(country):
- data = {}
- with open (os.path.join(os.path.dirname(__file__), "data", "country_wise_tax.json")) as countrywise_tax:
- data = json.load(countrywise_tax).get(country)
-
- return data
-
-def create_taxes(args):
- for i in xrange(1,6):
- if args.get("tax_" + str(i)):
- # replace % in case someone also enters the % symbol
- tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
- account_name = args.get("tax_" + str(i))
-
- make_tax_account_and_template(args.get("company_name") , account_name, tax_rate)
-
+# Tax utils start
def make_tax_account_and_template(company, account_name, tax_rate, template_name=None):
try:
if not isinstance(account_name, (list, tuple)):
@@ -292,15 +272,6 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name
except RootNotEditable:
pass
-def get_tax_account_group(company):
- tax_group = frappe.db.get_value("Account",
- {"account_name": "Duties and Taxes", "is_group": 1, "company": company})
- if not tax_group:
- tax_group = frappe.db.get_value("Account", {"is_group": 1, "root_type": "Liability",
- "account_type": "Tax", "company": company})
-
- return tax_group
-
def make_tax_account(company, account_name, tax_rate):
tax_group = get_tax_account_group(company)
if tax_group:
@@ -345,115 +316,23 @@ def make_sales_and_purchase_tax_templates(accounts, template_name=None):
doc = frappe.get_doc(purchase_tax_template)
doc.insert(ignore_permissions=True)
-def create_items(args):
- for i in xrange(1,6):
- item = args.get("item_" + str(i))
- if item:
- item_group = _(args.get("item_group_" + str(i)))
- is_sales_item = args.get("is_sales_item_" + str(i))
- is_purchase_item = args.get("is_purchase_item_" + str(i))
- is_stock_item = item_group!=_("Services")
- default_warehouse = ""
- if is_stock_item:
- default_warehouse = frappe.db.get_value("Warehouse", filters={
- "warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
- "company": args.get("company_name")
- })
+def get_tax_account_group(company):
+ tax_group = frappe.db.get_value("Account",
+ {"account_name": "Duties and Taxes", "is_group": 1, "company": company})
+ if not tax_group:
+ tax_group = frappe.db.get_value("Account", {"is_group": 1, "root_type": "Liability",
+ "account_type": "Tax", "company": company})
- try:
- frappe.get_doc({
- "doctype":"Item",
- "item_code": item,
- "item_name": item,
- "description": item,
- "show_in_website": 1,
- "is_sales_item": is_sales_item,
- "is_purchase_item": is_purchase_item,
- "is_stock_item": is_stock_item and 1 or 0,
- "item_group": item_group,
- "stock_uom": _(args.get("item_uom_" + str(i))),
- "default_warehouse": default_warehouse
- }).insert()
+ return tax_group
- if args.get("item_img_" + str(i)):
- item_image = args.get("item_img_" + str(i)).split(",")
- if len(item_image)==3:
- filename, filetype, content = item_image
- fileurl = save_file(filename, content, "Item", item, decode=True).file_url
- frappe.db.set_value("Item", item, "image", fileurl)
+# Tax utils end
- if args.get("item_price_" + str(i)):
- item_price = flt(args.get("item_price_" + str(i)))
+def get_country_wise_tax(country):
+ data = {}
+ with open (os.path.join(os.path.dirname(__file__), "data", "country_wise_tax.json")) as countrywise_tax:
+ data = json.load(countrywise_tax).get(country)
- if is_sales_item:
- price_list_name = frappe.db.get_value("Price List", {"selling": 1})
- make_item_price(item, price_list_name, item_price)
-
- if is_purchase_item:
- price_list_name = frappe.db.get_value("Price List", {"buying": 1})
- make_item_price(item, price_list_name, item_price)
-
- except frappe.NameError:
- pass
-
-def make_item_price(item, price_list_name, item_price):
- frappe.get_doc({
- "doctype": "Item Price",
- "price_list": price_list_name,
- "item_code": item,
- "price_list_rate": item_price
- }).insert()
-
-
-def create_customers(args):
- for i in xrange(1,6):
- customer = args.get("customer_" + str(i))
- if customer:
- try:
- doc = frappe.get_doc({
- "doctype":"Customer",
- "customer_name": customer,
- "customer_type": "Company",
- "customer_group": _("Commercial"),
- "territory": args.get("country"),
- "company": args.get("company_name")
- }).insert()
-
- if args.get("customer_contact_" + str(i)):
- create_contact(args.get("customer_contact_" + str(i)),
- "Customer", doc.name)
- except frappe.NameError:
- pass
-
-def create_suppliers(args):
- for i in xrange(1,6):
- supplier = args.get("supplier_" + str(i))
- if supplier:
- try:
- doc = frappe.get_doc({
- "doctype":"Supplier",
- "supplier_name": supplier,
- "supplier_type": _("Local"),
- "company": args.get("company_name")
- }).insert()
-
- if args.get("supplier_contact_" + str(i)):
- create_contact(args.get("supplier_contact_" + str(i)),
- "Supplier", doc.name)
- except frappe.NameError:
- pass
-
-def create_contact(contact, party_type, party):
- """Create contact based on given contact name"""
- contact = contact .split(" ")
-
- contact = frappe.get_doc({
- "doctype":"Contact",
- "first_name":contact[0],
- "last_name": len(contact) > 1 and contact[1] or ""
- })
- contact.append('links', dict(link_doctype=party_type, link_name=party))
- contact.insert()
+ return data
def create_letter_head(args):
if args.get("attach_letterhead"):
@@ -497,7 +376,7 @@ def login_as_first_user(args):
if args.get("email") and hasattr(frappe.local, "login_manager"):
frappe.local.login_manager.login_as(args.get("email"))
-def create_users(args):
+def create_employee_for_self(args):
if frappe.session.user == 'Administrator':
return
@@ -512,50 +391,7 @@ def create_users(args):
emp.flags.ignore_mandatory = True
emp.insert(ignore_permissions = True)
- for i in xrange(1,5):
- email = args.get("user_email_" + str(i))
- fullname = args.get("user_fullname_" + str(i))
- if email:
- if not fullname:
- fullname = email.split("@")[0]
-
- parts = fullname.split(" ", 1)
-
- user = frappe.get_doc({
- "doctype": "User",
- "email": email,
- "first_name": parts[0],
- "last_name": parts[1] if len(parts) > 1 else "",
- "enabled": 1,
- "user_type": "System User"
- })
-
- # default roles
- user.append_roles("Projects User", "Stock User", "Support Team")
-
- if args.get("user_sales_" + str(i)):
- user.append_roles("Sales User", "Sales Manager", "Accounts User")
- if args.get("user_purchaser_" + str(i)):
- user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
- if args.get("user_accountant_" + str(i)):
- user.append_roles("Accounts Manager", "Accounts User")
-
- user.flags.delay_emails = True
-
- if not frappe.db.get_value("User", email):
- user.insert(ignore_permissions=True)
-
- # create employee
- emp = frappe.get_doc({
- "doctype": "Employee",
- "employee_name": fullname,
- "user_id": email,
- "status": "Active",
- "company": args.get("company_name")
- })
- emp.flags.ignore_mandatory = True
- emp.insert(ignore_permissions = True)
-
+# Schools
def create_academic_term():
at = ["Semester 1", "Semester 2", "Semester 3"]
ay = ["2013-14", "2014-15", "2015-16", "2016-17", "2017-18"]
@@ -578,46 +414,3 @@ def create_academic_year():
academic_year.save()
except frappe.DuplicateEntryError:
pass
-
-def create_program(args):
- for i in xrange(1,6):
- if args.get("program_" + str(i)):
- program = frappe.new_doc("Program")
- program.program_code = args.get("program_" + str(i))
- program.program_name = args.get("program_" + str(i))
- try:
- program.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_course(args):
- for i in xrange(1,6):
- if args.get("course_" + str(i)):
- course = frappe.new_doc("Course")
- course.course_code = args.get("course_" + str(i))
- course.course_name = args.get("course_" + str(i))
- try:
- course.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_instructor(args):
- for i in xrange(1,6):
- if args.get("instructor_" + str(i)):
- instructor = frappe.new_doc("Instructor")
- instructor.instructor_name = args.get("instructor_" + str(i))
- try:
- instructor.save()
- except frappe.DuplicateEntryError:
- pass
-
-def create_room(args):
- for i in xrange(1,6):
- if args.get("room_" + str(i)):
- room = frappe.new_doc("Room")
- room.room_name = args.get("room_" + str(i))
- room.seating_capacity = args.get("room_capacity_" + str(i))
- try:
- room.save()
- except frappe.DuplicateEntryError:
- pass
diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py
new file mode 100644
index 0000000000..2db63c1b44
--- /dev/null
+++ b/erpnext/setup/setup_wizard/test_setup_wizard.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe, time
+from frappe.utils.selenium_testdriver import TestDriver
+
+def run_setup_wizard_test():
+ driver = TestDriver()
+ frappe.db.set_default('in_selenium', '1')
+ frappe.db.commit()
+
+ driver.login('#page-setup-wizard')
+ print('Running Setup Wizard Test...')
+
+ # Language slide
+ driver.set_select("language", "English (United States)")
+ driver.wait_for_ajax(True)
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Region slide
+ driver.wait_for_ajax(True)
+ driver.set_select("country", "India")
+ driver.wait_for_ajax(True)
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Profile slide
+ driver.set_field("full_name", "Great Tester")
+ driver.set_field("email", "great@example.com")
+ driver.set_field("password", "test")
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Brand slide
+ driver.set_select("domain", "Manufacturing")
+ driver.wait_till_clickable(".next-btn").click()
+
+ # Org slide
+ driver.set_field("company_name", "For Testing")
+ driver.wait_till_clickable(".next-btn").click()
+ driver.set_field("company_tagline", "Just for GST")
+ driver.set_field("bank_account", "HDFC")
+ driver.wait_till_clickable(".complete-btn").click()
+
+ # Wait for desktop
+ driver.wait_for('#page-desktop', timeout=600)
+
+ console = driver.get_console()
+ if frappe.flags.tests_verbose:
+ for line in console:
+ print(line)
+ print('-' * 40)
+ time.sleep(1)
+
+ frappe.db.set_default('in_selenium', None)
+ frappe.db.commit()
+
+ driver.close()
+
+ return True
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/utils.py b/erpnext/setup/setup_wizard/utils.py
index dc4abd4f50..d821a12989 100644
--- a/erpnext/setup/setup_wizard/utils.py
+++ b/erpnext/setup/setup_wizard/utils.py
@@ -10,6 +10,3 @@ def complete():
#setup_wizard.create_sales_tax(data)
setup_complete(data)
-
-
-
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 5b0ce391a1..b32f41e0c0 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -60,8 +60,8 @@ def get_notification_config():
"targets": {
"Company": {
- "filters" : { "sales_target": ( ">", 0 ) },
- "target_field" : "sales_target",
+ "filters" : { "monthly_sales_target": ( ">", 0 ) },
+ "target_field" : "monthly_sales_target",
"value_field" : "total_monthly_sales"
}
}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 46d536dace..e0ee3708f4 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -166,6 +166,12 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
__("Status"))
}
erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);
+
+ if(doc.docstatus==1 && !doc.subscription) {
+ cur_frm.add_custom_button(__('Subscription'), function() {
+ erpnext.utils.make_subscription(doc.doctype, doc.name)
+ }, __("Make"))
+ }
},
make_sales_invoice: function() {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 41f8b8493e..980f79b2a2 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -3251,6 +3251,67 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription_section",
+ "fieldtype": "Section Break",
+ "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": "Subscription Section",
+ "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,
+ "fieldname": "subscription",
+ "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": "Subscription",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Subscription",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -3487,7 +3548,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-08-23 13:25:34.182268",
+ "modified": "2017-08-31 11:21:59.084183",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index c296d8cb9f..2e150f70d0 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -5,7 +5,8 @@ def get_data():
'fieldname': 'delivery_note',
'non_standard_fieldnames': {
'Stock Entry': 'delivery_note_no',
- 'Quality Inspection': 'reference_name'
+ 'Quality Inspection': 'reference_name',
+ 'Subscription': 'reference_document',
},
'internal_links': {
'Sales Order': ['items', 'against_sales_order'],
@@ -23,5 +24,9 @@ def get_data():
'label': _('Returns'),
'items': ['Stock Entry']
},
+ {
+ 'label': _('Subscription'),
+ 'items': ['Subscription']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.js b/erpnext/stock/doctype/delivery_note/test_delivery_note.js
index 482f892997..bbc97b8d40 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.js
@@ -34,4 +34,3 @@ QUnit.test("test delivery note", function(assert) {
]);
});
-
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 5dc97f623b..f2ea1d88bc 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -488,6 +488,8 @@ class Item(WebsiteGenerator):
def validate_warehouse_for_reorder(self):
warehouse = []
for i in self.get("reorder_levels"):
+ if not i.warehouse_group:
+ i.warehouse_group = i.warehouse
if i.get("warehouse") and i.get("warehouse") not in warehouse:
warehouse += [i.get("warehouse")]
else:
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index ed647d6c8b..87cde0d3e2 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -86,7 +86,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Type",
"length": 0,
@@ -144,7 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Series",
"length": 0,
@@ -211,7 +211,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 1,
"label": "Company",
"length": 0,
@@ -369,7 +369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
@@ -686,7 +686,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-06-13 14:29:18.032657",
+ "modified": "2017-07-26 19:43:31.823549",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request/test_material_request.js b/erpnext/stock/doctype/material_request/test_material_request.js
new file mode 100644
index 0000000000..793cad0f3b
--- /dev/null
+++ b/erpnext/stock/doctype/material_request/test_material_request.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: Material Request", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially('Material Request', [
+ // insert a new Material Request
+ () => frappe.tests.make([
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 19cc44a119..4447fb8cfa 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -48,7 +48,7 @@ frappe.ui.form.on("Purchase Receipt", {
toggle_display_account_head: function(frm) {
var enabled = erpnext.is_perpetual_inventory_enabled(frm.doc.company)
frm.fields_dict["items"].grid.set_column_disp(["cost_center"], enabled);
- }
+ },
});
erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
@@ -98,6 +98,13 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
if(flt(this.frm.doc.per_billed) < 100) {
cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __("Make"));
}
+
+ if(!this.frm.doc.subscription) {
+ cur_frm.add_custom_button(__('Subscription'), function() {
+ erpnext.utils.make_subscription(me.frm.doc.doctype, me.frm.doc.name)
+ }, __("Make"))
+ }
+
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index adcea6d76c..7140dbd8bd 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -2611,6 +2611,67 @@
"set_only_once": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "subscription_detail",
+ "fieldtype": "Section Break",
+ "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": "Subscription Detail",
+ "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,
+ "fieldname": "subscription",
+ "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": "Subscription",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Subscription",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 9722d8791f..9ade1afd8a 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -5,7 +5,8 @@ def get_data():
'fieldname': 'purchase_receipt_no',
'non_standard_fieldnames': {
'Purchase Invoice': 'purchase_receipt',
- 'Landed Cost Voucher': 'receipt_document'
+ 'Landed Cost Voucher': 'receipt_document',
+ 'Subscription': 'reference_document'
},
'internal_links': {
'Purchase Order': ['items', 'purchase_order'],
@@ -25,5 +26,9 @@ def get_data():
'label': _('Returns'),
'items': ['Stock Entry']
},
+ {
+ 'label': _('Subscription'),
+ 'items': ['Subscription']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 80ef70805a..8d084dcb8c 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -79,7 +79,7 @@ def get_item_details(args):
and out.warehouse and out.stock_qty > 0:
if out.has_serial_no:
- out.serial_no = get_serial_no(out)
+ out.serial_no = get_serial_no(out, args.serial_no)
if out.has_batch_no and not args.get("batch_no"):
out.batch_no = get_batch_no(out.item_code, out.warehouse, out.qty)
@@ -554,7 +554,8 @@ def get_gross_profit(out):
return out
@frappe.whitelist()
-def get_serial_no(args):
+def get_serial_no(args, serial_nos=None):
+ serial_no = None
if isinstance(args, basestring):
args = json.loads(args)
args = frappe._dict(args)
@@ -568,4 +569,9 @@ def get_serial_no(args):
args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"stock_qty": args.get('stock_qty')})
args = process_args(args)
serial_no = get_serial_nos_by_fifo(args)
- return serial_no
+
+ if not serial_no and serial_nos:
+ # For POS
+ serial_no = serial_nos
+
+ return serial_no
diff --git a/erpnext/subscription/__init__.py b/erpnext/subscription/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/subscription/doctype/__init__.py b/erpnext/subscription/doctype/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/subscription/doctype/subscription/__init__.py b/erpnext/subscription/doctype/subscription/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/subscription/doctype/subscription/subscription.js b/erpnext/subscription/doctype/subscription/subscription.js
new file mode 100644
index 0000000000..75e1473b00
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/subscription.js
@@ -0,0 +1,36 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Subscription', {
+ setup: function(frm) {
+ frm.fields_dict['reference_document'].get_query = function() {
+ return {
+ filters: {
+ "docstatus": 1
+ }
+ };
+ };
+
+ frm.fields_dict['print_format'].get_query = function() {
+ return {
+ filters: {
+ "doc_type": frm.doc.reference_doctype
+ }
+ };
+ };
+ },
+
+ refresh: function(frm) {
+ if(frm.doc.docstatus == 1) {
+ let label = __('View {0}', [frm.doc.reference_doctype]);
+ frm.add_custom_button(__(label),
+ function() {
+ frappe.route_options = {
+ "subscription": frm.doc.name,
+ };
+ frappe.set_route("List", frm.doc.reference_doctype);
+ }
+ );
+ }
+ }
+});
\ No newline at end of file
diff --git a/erpnext/subscription/doctype/subscription/subscription.json b/erpnext/subscription/doctype/subscription/subscription.json
new file mode 100644
index 0000000000..6cfee1e44f
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/subscription.json
@@ -0,0 +1,731 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "beta": 0,
+ "creation": "2017-07-18 17:50:43.967266",
+ "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": "section_break_1",
+ "fieldtype": "Section Break",
+ "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,
+ "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,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "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": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "SUB-",
+ "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": "reference_doctype",
+ "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": "Reference Doctype",
+ "length": 0,
+ "no_copy": 0,
+ "options": "DocType",
+ "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": "reference_document",
+ "fieldtype": "Dynamic 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": "Reference Document",
+ "length": 0,
+ "no_copy": 1,
+ "options": "reference_doctype",
+ "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": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disabled",
+ "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": "Disabled",
+ "length": 0,
+ "no_copy": 1,
+ "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": "submit_on_creation",
+ "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": "Submit on Creation",
+ "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,
+ "fieldname": "column_break_5",
+ "fieldtype": "Column Break",
+ "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,
+ "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,
+ "fieldname": "start_date",
+ "fieldtype": "Date",
+ "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": "Start Date",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "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": "End Date",
+ "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": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "next_schedule_date",
+ "fieldtype": "Date",
+ "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": "Next Schedule Date",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "frequency_detail",
+ "fieldtype": "Section Break",
+ "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": "",
+ "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,
+ "fieldname": "frequency",
+ "fieldtype": "Select",
+ "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": "Frequency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nDaily\nWeekly\nMonthly\nQuarterly\nHalf-yearly\nYearly",
+ "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": "column_break_12",
+ "fieldtype": "Column Break",
+ "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,
+ "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": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: in_list([\"Monthly\", \"Quarterly\", \"Yearly\"], doc.frequency)",
+ "fieldname": "repeat_on_day",
+ "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": "Repeat on Day",
+ "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,
+ "fieldname": "notification",
+ "fieldtype": "Section Break",
+ "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": "Notification",
+ "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,
+ "fieldname": "notify_by_email",
+ "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": "Notify by Email",
+ "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,
+ "fieldname": "column_break_17",
+ "fieldtype": "Column Break",
+ "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,
+ "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,
+ "depends_on": "notify_by_email",
+ "fieldname": "recipients",
+ "fieldtype": "Small Text",
+ "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": "Recipients",
+ "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,
+ "depends_on": "notify_by_email",
+ "fieldname": "print_format",
+ "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": "Print Format",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Print Format",
+ "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": 1,
+ "columns": 0,
+ "fieldname": "section_break_16",
+ "fieldtype": "Section Break",
+ "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": "",
+ "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,
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "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": "Status",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nDraft\nSubmitted\nCancelled\nCompleted",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amended_from",
+ "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": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Subscription",
+ "permlevel": 0,
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-08-29 15:45:16.157643",
+ "modified_by": "Administrator",
+ "module": "Subscription",
+ "name": "Subscription",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "reference_document",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "reference_document",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/subscription/doctype/subscription/subscription.py b/erpnext/subscription/doctype/subscription/subscription.py
new file mode 100644
index 0000000000..be36211ec2
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/subscription.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import calendar
+from frappe import _
+from frappe.desk.form import assign_to
+from dateutil.relativedelta import relativedelta
+from frappe.utils.user import get_system_managers
+from frappe.utils import cstr, getdate, split_emails, add_days, today
+from frappe.model.document import Document
+
+month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
+class Subscription(Document):
+ def validate(self):
+ self.update_status()
+ self.validate_dates()
+ self.validate_next_schedule_date()
+ self.validate_email_id()
+
+ def before_submit(self):
+ self.set_next_schedule_date()
+
+ def on_submit(self):
+ self.update_subscription_id()
+
+ def on_update_after_submit(self):
+ self.validate_dates()
+ self.set_next_schedule_date()
+
+ def validate_dates(self):
+ if self.end_date and getdate(self.start_date) > getdate(self.end_date):
+ frappe.throw(_("End date must be greater than start date"))
+
+ def validate_next_schedule_date(self):
+ if self.repeat_on_day and self.next_schedule_date:
+ next_date = getdate(self.next_schedule_date)
+ if next_date.day != self.repeat_on_day:
+ # if the repeat day is the last day of the month (31)
+ # and the current month does not have as many days,
+ # then the last day of the current month is a valid date
+ lastday = calendar.monthrange(next_date.year, next_date.month)[1]
+ if self.repeat_on_day < lastday:
+
+ # the specified day of the month is not same as the day specified
+ # or the last day of the month
+ frappe.throw(_("Next Date's day and Repeat on Day of Month must be equal"))
+
+ def validate_email_id(self):
+ if self.notify_by_email:
+ if self.recipients:
+ email_list = split_emails(self.recipients.replace("\n", ""))
+
+ from frappe.utils import validate_email_add
+ for email in email_list:
+ if not validate_email_add(email):
+ frappe.throw(_("{0} is an invalid email address in 'Recipients'").format(email))
+ else:
+ frappe.throw(_("'Recipients' not specified"))
+
+ def set_next_schedule_date(self):
+ self.next_schedule_date = get_next_schedule_date(self.start_date,
+ self.frequency, self.repeat_on_day)
+
+ def update_subscription_id(self):
+ doc = frappe.get_doc(self.reference_doctype, self.reference_document)
+ if not doc.meta.get_field('subscription'):
+ frappe.throw(_("Add custom field Subscription Id in the doctype {0}").format(self.reference_doctype))
+
+ doc.db_set('subscription', self.name)
+
+ def update_status(self):
+ self.status = {
+ '0': 'Draft',
+ '1': 'Submitted',
+ '2': 'Cancelled'
+ }[cstr(self.docstatus or 0)]
+
+def get_next_schedule_date(start_date, frequency, repeat_on_day):
+ mcount = month_map.get(frequency)
+ if mcount:
+ next_date = get_next_date(start_date, mcount, repeat_on_day)
+ else:
+ days = 7 if frequency == 'Weekly' else 1
+ next_date = add_days(start_date, days)
+ return next_date
+
+def make_subscription_entry(date=None):
+ date = date or today()
+ for data in get_subscription_entries(date):
+ schedule_date = getdate(data.next_schedule_date)
+ while schedule_date <= getdate(today()):
+ create_documents(data, schedule_date)
+
+ schedule_date = get_next_schedule_date(schedule_date,
+ data.frequency, data.repeat_on_day)
+
+ if schedule_date:
+ frappe.db.set_value('Subscription', data.name, 'next_schedule_date', schedule_date)
+
+def get_subscription_entries(date):
+ return frappe.db.sql(""" select * from `tabSubscription`
+ where docstatus = 1 and next_schedule_date <=%s
+ and reference_document is not null and reference_document != ''
+ and next_schedule_date <= ifnull(end_date, '2199-12-31')
+ and ifnull(disabled, 0) = 0""", (date), as_dict=1)
+
+def create_documents(data, schedule_date):
+ try:
+ doc = make_new_document(data, schedule_date)
+ if data.notify_by_email:
+ send_notification(doc, data.print_format, data.recipients)
+
+ frappe.db.commit()
+ except Exception:
+ frappe.db.rollback()
+ frappe.db.begin()
+ frappe.log_error(frappe.get_traceback())
+ frappe.db.commit()
+ if data.reference_document and not frappe.flags.in_test:
+ notify_error_to_user(data)
+
+def notify_error_to_user(data):
+ party = ''
+ party_type = ''
+
+ if data.reference_doctype in ['Sales Order', 'Sales Invoice', 'Delivery Note']:
+ party_type = 'customer'
+ elif data.reference_doctype in ['Purchase Order', 'Purchase Invoice', 'Purchase Receipt']:
+ party_type = 'supplier'
+
+ if party_type:
+ party = frappe.db.get_value(data.reference_doctype, data.reference_document, party_type)
+
+ notify_errors(data.reference_document, data.reference_doctype, party, data.owner)
+
+def make_new_document(args, schedule_date):
+ doc = frappe.get_doc(args.reference_doctype, args.reference_document)
+ new_doc = frappe.copy_doc(doc, ignore_no_copy=False)
+ update_doc(new_doc, doc , args, schedule_date)
+ new_doc.insert(ignore_permissions=True)
+
+ if args.submit_on_creation:
+ new_doc.submit()
+
+ return new_doc
+
+def update_doc(new_document, reference_doc, args, schedule_date):
+ new_document.docstatus = 0
+ if new_document.meta.get_field('set_posting_time'):
+ new_document.set('set_posting_time', 1)
+
+ if new_document.meta.get_field('subscription'):
+ new_document.set('subscription', args.name)
+
+ new_document.run_method("on_recurring", reference_doc=reference_doc, subscription_doc=args)
+ for data in new_document.meta.fields:
+ if data.fieldtype == 'Date' and data.reqd:
+ new_document.set(data.fieldname, schedule_date)
+
+def get_next_date(dt, mcount, day=None):
+ dt = getdate(dt)
+ dt += relativedelta(months=mcount, day=day)
+
+ return dt
+
+def send_notification(new_rv, print_format='Standard', recipients=None):
+ """Notify concerned persons about recurring document generation"""
+ recipients = recipients or new_rv.notification_email_address
+ print_format = print_format or new_rv.recurring_print_format
+
+ frappe.sendmail(recipients,
+ subject= _("New {0}: #{1}").format(new_rv.doctype, new_rv.name),
+ message = _("Please find attached {0} #{1}").format(new_rv.doctype, new_rv.name),
+ attachments = [frappe.attach_print(new_rv.doctype, new_rv.name, file_name=new_rv.name, print_format=print_format)])
+
+def notify_errors(doc, doctype, party, owner):
+ recipients = get_system_managers(only_name=True)
+ frappe.sendmail(recipients + [frappe.db.get_value("User", owner, "email")],
+ subject="[Urgent] Error while creating recurring %s for %s" % (doctype, doc),
+ message = frappe.get_template("templates/emails/recurring_document_failed.html").render({
+ "type": doctype,
+ "name": doc,
+ "party": party or ""
+ }))
+
+ assign_task_to_owner(doc, doctype, "Recurring Invoice Failed", recipients)
+
+def assign_task_to_owner(doc, doctype, msg, users):
+ for d in users:
+ args = {
+ 'assign_to' : d,
+ 'doctype' : doctype,
+ 'name' : doc,
+ 'description' : msg,
+ 'priority' : 'High'
+ }
+ assign_to.add(args)
+
+@frappe.whitelist()
+def make_subscription(doctype, docname):
+ doc = frappe.new_doc('Subscription')
+ doc.reference_doctype = doctype
+ doc.reference_document = docname
+ return doc
diff --git a/erpnext/subscription/doctype/subscription/subscription_list.js b/erpnext/subscription/doctype/subscription/subscription_list.js
new file mode 100644
index 0000000000..6a33638b39
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/subscription_list.js
@@ -0,0 +1,12 @@
+frappe.listview_settings['Subscription'] = {
+ add_fields: ["next_schedule_date"],
+ get_indicator: function(doc) {
+ if(doc.next_schedule_date >= frappe.datetime.get_today() ) {
+ return [__("Active"), "green"];
+ } else if(doc.docstatus === 0) {
+ return [__("Draft"), "red", "docstatus,=,0"];
+ } else {
+ return [__("Expired"), "darkgrey"];
+ }
+ }
+};
\ No newline at end of file
diff --git a/erpnext/subscription/doctype/subscription/test_subscription.js b/erpnext/subscription/doctype/subscription/test_subscription.js
new file mode 100644
index 0000000000..2872a2147f
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/test_subscription.js
@@ -0,0 +1,32 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Subscription", function (assert) {
+ assert.expect(4);
+ let done = assert.async();
+ frappe.run_serially([
+ // insert a new Subscription
+ () => {
+ return frappe.tests.make("Subscription", [
+ {reference_doctype: 'Sales Invoice'},
+ {reference_document: 'SINV-00004'},
+ {start_date: frappe.datetime.month_start()},
+ {end_date: frappe.datetime.month_end()},
+ {frequency: 'Weekly'}
+ ]);
+ },
+ () => cur_frm.savesubmit(),
+ () => frappe.timeout(1),
+ () => frappe.click_button('Yes'),
+ () => frappe.timeout(2),
+ () => {
+ assert.ok(cur_frm.doc.frequency.includes("Weekly"), "Set frequency Weekly");
+ assert.ok(cur_frm.doc.reference_doctype.includes("Sales Invoice"), "Set base doctype Sales Invoice");
+ assert.equal(cur_frm.doc.docstatus, 1, "Submitted subscription");
+ assert.equal(cur_frm.doc.next_schedule_date,
+ frappe.datetime.add_days(frappe.datetime.get_today(), 7), "Set schedule date");
+ },
+ () => done()
+ ]);
+});
diff --git a/erpnext/subscription/doctype/subscription/test_subscription.py b/erpnext/subscription/doctype/subscription/test_subscription.py
new file mode 100644
index 0000000000..28f8be7257
--- /dev/null
+++ b/erpnext/subscription/doctype/subscription/test_subscription.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import today, add_days, getdate
+from erpnext.accounts.utils import get_fiscal_year
+from erpnext.accounts.report.financial_statements import get_months
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.subscription.doctype.subscription.subscription import make_subscription_entry
+
+class TestSubscription(unittest.TestCase):
+ def test_daily_subscription(self):
+ qo = frappe.copy_doc(quotation_records[0])
+ qo.submit()
+
+ doc = make_subscription(reference_document=qo.name)
+ self.assertEquals(doc.next_schedule_date, today())
+ make_subscription_entry()
+ frappe.db.commit()
+
+ quotation = frappe.get_doc(doc.reference_doctype, doc.reference_document)
+ self.assertEquals(quotation.subscription, doc.name)
+
+ new_quotation = frappe.db.get_value('Quotation',
+ {'subscription': doc.name, 'name': ('!=', quotation.name)}, 'name')
+
+ new_quotation = frappe.get_doc('Quotation', new_quotation)
+
+ for fieldname in ['customer', 'company', 'order_type', 'total', 'grand_total']:
+ self.assertEquals(quotation.get(fieldname), new_quotation.get(fieldname))
+
+ for fieldname in ['item_code', 'qty', 'rate', 'amount']:
+ self.assertEquals(quotation.items[0].get(fieldname),
+ new_quotation.items[0].get(fieldname))
+
+ def test_monthly_subscription_for_so(self):
+ current_fiscal_year = get_fiscal_year(today(), as_dict=True)
+ start_date = current_fiscal_year.year_start_date
+ end_date = current_fiscal_year.year_end_date
+
+ for doctype in ['Sales Order', 'Sales Invoice']:
+ if doctype == 'Sales Invoice':
+ docname = create_sales_invoice(posting_date=start_date)
+ else:
+ docname = make_sales_order()
+
+ self.monthly_subscription(doctype, docname.name, start_date, end_date)
+
+ def monthly_subscription(self, doctype, docname, start_date, end_date):
+ doc = make_subscription(reference_doctype=doctype, frequency = 'Monthly',
+ reference_document = docname, start_date=start_date, end_date=end_date)
+
+ doc.disabled = 1
+ doc.save()
+ frappe.db.commit()
+
+ make_subscription_entry()
+ docnames = frappe.get_all(doc.reference_doctype, {'subscription': doc.name})
+ self.assertEquals(len(docnames), 1)
+
+ doc = frappe.get_doc('Subscription', doc.name)
+ doc.disabled = 0
+ doc.save()
+
+ months = get_months(getdate(start_date), getdate(today()))
+ make_subscription_entry()
+
+ docnames = frappe.get_all(doc.reference_doctype, {'subscription': doc.name})
+ self.assertEquals(len(docnames), months)
+
+quotation_records = frappe.get_test_records('Quotation')
+
+def make_subscription(**args):
+ args = frappe._dict(args)
+ doc = frappe.get_doc({
+ 'doctype': 'Subscription',
+ 'reference_doctype': args.reference_doctype or 'Quotation',
+ 'reference_document': args.reference_document or \
+ frappe.db.get_value('Quotation', {'docstatus': 1}, 'name'),
+ 'frequency': args.frequency or 'Daily',
+ 'start_date': args.start_date or add_days(today(), -1),
+ 'end_date': args.end_date or add_days(today(), 1),
+ 'submit_on_creation': args.submit_on_creation or 0
+ }).insert(ignore_permissions=True)
+
+ if not args.do_not_submit:
+ doc.submit()
+
+ return doc
\ No newline at end of file
diff --git a/erpnext/templates/emails/training_event.html b/erpnext/templates/emails/training_event.html
new file mode 100644
index 0000000000..51c232d8e8
--- /dev/null
+++ b/erpnext/templates/emails/training_event.html
@@ -0,0 +1,21 @@
+
{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} + +
-
+
+ `);
+ this.$cart_items = this.wrapper.find('.cart-items');
+ this.$empty_state = this.wrapper.find('.cart-items .empty-state');
+ this.$taxes_and_totals = this.wrapper.find('.taxes-and-totals');
+ this.$discount_amount = this.wrapper.find('.discount-amount');
+ this.$grand_total = this.wrapper.find('.grand-total');
+
+ this.toggle_taxes_and_totals(false);
+ this.$grand_total.on('click', () => {
+ this.toggle_taxes_and_totals();
+ });
+ }
+
+ reset() {
+ this.$cart_items.find('.list-item').remove();
+ this.$empty_state.show();
+ this.$taxes_and_totals.html(this.get_taxes_and_totals());
+ this.numpad && this.numpad.reset_value();
+ this.customer_field.set_value("");
+ }
+
+ get_grand_total() {
+ return `
+
+
+
+
+
+
+
+
+ ${__('Item Name')}
+ ${__('Quantity')}
+ ${__('Discount')}
+ ${__('Rate')}
+
+
+
+ No Items added to cart
+
+
+ ${this.get_taxes_and_totals()}
+
+
+ ${this.get_discount_amount()}
+
+
+ ${this.get_grand_total()}
+
+
+
+
+
+ `;
+ }
+
+ get_discount_amount() {
+ const get_currency_symbol = window.get_currency_symbol;
+
+ return `
+ ${__('Grand Total')}
+ 0.00
+
+
+ `;
+ }
+
+ get_taxes_and_totals() {
+ return `
+ ${__('Discount')}
+
+
+
+
+
+
+ ${__('Net Total')}
+ 0.00
+
+
+ `;
+ }
+
+ toggle_taxes_and_totals(flag) {
+ if (flag !== undefined) {
+ this.tax_area_is_shown = flag;
+ } else {
+ this.tax_area_is_shown = !this.tax_area_is_shown;
+ }
+
+ this.$taxes_and_totals.toggle(this.tax_area_is_shown);
+ this.$discount_amount.toggle(this.tax_area_is_shown);
+ }
+
+ update_taxes_and_totals() {
+ const currency = this.frm.doc.currency;
+ this.frm.refresh_field('taxes');
+
+ // Update totals
+ this.$taxes_and_totals.find('.net-total')
+ .html(format_currency(this.frm.doc.net_total, currency));
+
+ // Update taxes
+ const taxes_html = this.frm.doc.taxes.map(tax => {
+ return `
+ ${__('Taxes')}
+ 0.00
+
+ ${tax.description}
+
+ ${format_currency(tax.tax_amount, currency)}
+
+
+ `;
+ }).join("");
+ this.$taxes_and_totals.find('.taxes').html(taxes_html);
+ }
+
+ update_grand_total() {
+ this.$grand_total.find('.grand-total-value').text(
+ format_currency(this.frm.doc.grand_total, this.frm.currency)
+ );
+ }
+
+ make_customer_field() {
+ this.customer_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Link',
+ label: 'Customer',
+ fieldname: 'customer',
+ options: 'Customer',
+ reqd: 1,
+ default: this.frm.doc.customer,
+ onchange: () => {
+ this.events.on_customer_change(this.customer_field.get_value());
+ }
+ },
+ parent: this.wrapper.find('.customer-field'),
+ render_input: true
+ });
+ }
+
+ make_numpad() {
+ this.numpad = new NumberPad({
+ button_array: [
+ [1, 2, 3, 'Qty'],
+ [4, 5, 6, 'Disc'],
+ [7, 8, 9, 'Rate'],
+ ['Del', 0, '.', 'Pay']
+ ],
+ add_class: {
+ 'Pay': 'brand-primary'
+ },
+ disable_highlight: ['Qty', 'Disc', 'Rate', 'Pay'],
+ reset_btns: ['Qty', 'Disc', 'Rate', 'Pay'],
+ del_btn: 'Del',
+ wrapper: this.wrapper.find('.number-pad-container'),
+ onclick: (btn_value) => {
+ // on click
+ if (!this.selected_item && btn_value !== 'Pay') {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select an item in the cart')
+ });
+ return;
+ }
+ if (['Qty', 'Disc', 'Rate'].includes(btn_value)) {
+ this.set_input_active(btn_value);
+ } else if (btn_value !== 'Pay') {
+ if (!this.selected_item.active_field) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select a field to edit from numpad')
+ });
+ return;
+ }
+
+ const item_code = this.selected_item.attr('data-item-code');
+ const field = this.selected_item.active_field;
+ const value = this.numpad.get_value();
+
+ this.events.on_field_change(item_code, field, value);
+ }
+
+ this.events.on_numpad(btn_value);
+ }
+ });
+ }
+
+ set_input_active(btn_value) {
+ this.selected_item.removeClass('qty disc rate');
+
+ this.numpad.set_active(btn_value);
+ if (btn_value === 'Qty') {
+ this.selected_item.addClass('qty');
+ this.selected_item.active_field = 'qty';
+ } else if (btn_value == 'Disc') {
+ this.selected_item.addClass('disc');
+ this.selected_item.active_field = 'discount_percentage';
+ } else if (btn_value == 'Rate') {
+ this.selected_item.addClass('rate');
+ this.selected_item.active_field = 'rate';
+ }
+ }
+
+ add_item(item) {
+ this.$empty_state.hide();
+
+ if (this.exists(item.item_code)) {
+ // update quantity
+ this.update_item(item);
+ } else {
+ // add to cart
+ const $item = $(this.get_item_html(item));
+ $item.appendTo(this.$cart_items);
+ }
+ this.highlight_item(item.item_code);
+ this.scroll_to_item(item.item_code);
+ }
+
+ update_item(item) {
+ const $item = this.$cart_items.find(`[data-item-code="${item.item_code}"]`);
+
+ if(item.qty > 0) {
+ const indicator_class = item.actual_qty >= item.qty ? 'green' : 'red';
+ const remove_class = indicator_class == 'green' ? 'red' : 'green';
+
+ $item.find('.quantity input').val(item.qty);
+ $item.find('.discount').text(item.discount_percentage + '%');
+ $item.find('.rate').text(format_currency(item.rate, this.frm.doc.currency));
+ $item.addClass(indicator_class);
+ $item.removeClass(remove_class);
+ } else {
+ $item.remove();
+ }
+ }
+
+ get_item_html(item) {
+ const rate = format_currency(item.rate, this.frm.doc.currency);
+ const indicator_class = item.actual_qty >= item.qty ? 'green' : 'red';
+ return `
+
+
+ `;
+
+ function get_quantity_html(value) {
+ return `
+
+ ${item.item_name}
+
+
+ ${get_quantity_html(item.qty)}
+
+
+ ${item.discount_percentage}%
+
+
+ ${rate}
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ }
+ }
+
+ exists(item_code) {
+ let $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ return $item.length > 0;
+ }
+
+ highlight_item(item_code) {
+ const $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ $item.addClass('highlight');
+ setTimeout(() => $item.removeClass('highlight'), 1000);
+ }
+
+ scroll_to_item(item_code) {
+ const $item = this.$cart_items.find(`[data-item-code="${item_code}"]`);
+ if ($item.length === 0) return;
+ const scrollTop = $item.offset().top - this.$cart_items.offset().top + this.$cart_items.scrollTop();
+ this.$cart_items.animate({ scrollTop });
+ }
+
+ bind_events() {
+ const me = this;
+ const events = this.events;
+
+ // quantity change
+ this.$cart_items.on('click',
+ '[data-action="increment"], [data-action="decrement"]', function() {
+ const $btn = $(this);
+ const $item = $btn.closest('.list-item[data-item-code]');
+ const item_code = $item.attr('data-item-code');
+ const action = $btn.attr('data-action');
+
+ if(action === 'increment') {
+ events.on_field_change(item_code, 'qty', '+1');
+ } else if(action === 'decrement') {
+ events.on_field_change(item_code, 'qty', '-1');
+ }
+ });
+
+ // this.$cart_items.on('focus', '.quantity input', function(e) {
+ // const $input = $(this);
+ // const $item = $input.closest('.list-item[data-item-code]');
+ // me.set_selected_item($item);
+ // me.set_input_active('Qty');
+ // e.preventDefault();
+ // e.stopPropagation();
+ // return false;
+ // });
+
+ this.$cart_items.on('change', '.quantity input', function() {
+ const $input = $(this);
+ const $item = $input.closest('.list-item[data-item-code]');
+ const item_code = $item.attr('data-item-code');
+ events.on_field_change(item_code, 'qty', flt($input.val()));
+ });
+
+ // current item
+ this.$cart_items.on('click', '.list-item', function() {
+ me.set_selected_item($(this));
+ });
+
+ // disable current item
+ // $('body').on('click', function(e) {
+ // console.log(e);
+ // if($(e.target).is('.list-item')) {
+ // return;
+ // }
+ // me.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ // me.selected_item = null;
+ // });
+
+ this.wrapper.find('.additional_discount_percentage').on('change', (e) => {
+ frappe.model.set_value(this.frm.doctype, this.frm.docname,
+ 'additional_discount_percentage', e.target.value)
+ .then(() => {
+ let discount_wrapper = this.wrapper.find('.discount_amount');
+ discount_wrapper.val(this.frm.doc.discount_amount);
+ discount_wrapper.trigger('change');
+ });
+ });
+
+ this.wrapper.find('.discount_amount').on('change', (e) => {
+ frappe.model.set_value(this.frm.doctype, this.frm.docname,
+ 'discount_amount', e.target.value);
+ this.frm.trigger('discount_amount')
+ .then(() => {
+ let discount_wrapper = this.wrapper.find('.additional_discount_percentage');
+ discount_wrapper.val(this.frm.doc.additional_discount_percentage);
+ this.update_taxes_and_totals();
+ this.update_grand_total();
+ });
+ });
+ }
+
+ set_selected_item($item) {
+ this.selected_item = $item;
+ this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ this.selected_item.addClass('current-item');
+ this.events.on_select_change();
+ }
+
+ unselect_all() {
+ this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
+ this.selected_item = null;
+ this.events.on_select_change();
+ }
+}
+
+class POSItems {
+ constructor({wrapper, pos_profile, events}) {
+ this.wrapper = wrapper;
+ this.pos_profile = pos_profile;
+ this.items = {};
+ this.events = events;
+ this.currency = this.pos_profile.currency;
+
+ this.make_dom();
+ this.make_fields();
+
+ this.init_clusterize();
+ this.bind_events();
+
+ // bootstrap with 20 items
+ this.get_items()
+ .then(({ items }) => {
+ this.all_items = items;
+ this.items = items;
+ this.render_items(items);
+ });
+ }
+
+ make_dom() {
+ this.wrapper.html(`
+
+
+
+
+
+
+
+
+ `);
+
+ this.items_wrapper = this.wrapper.find('.items-wrapper');
+ this.items_wrapper.append(`
+
+
+ `);
+ }
+
+ make_fields() {
+ // Search field
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Data',
+ label: 'Search Item (Ctrl + I)',
+ placeholder: 'Search by item code, serial number, batch no or barcode'
+ },
+ parent: this.wrapper.find('.search-field'),
+ render_input: true,
+ });
+
+ frappe.ui.keys.on('ctrl+i', () => {
+ this.search_field.set_focus();
+ });
+
+ this.search_field.$input.on('input', (e) => {
+ clearTimeout(this.last_search);
+ this.last_search = setTimeout(() => {
+ const search_term = e.target.value;
+ this.filter_items({ search_term });
+ }, 300);
+ });
+
+ this.item_group_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'Link',
+ label: 'Item Group',
+ options: 'Item Group',
+ default: 'All Item Groups',
+ onchange: () => {
+ const item_group = this.item_group_field.get_value();
+ if (item_group) {
+ this.filter_items({ item_group: item_group });
+ }
+ },
+ },
+ parent: this.wrapper.find('.item-group-field'),
+ render_input: true
+ });
+ }
+
+ init_clusterize() {
+ this.clusterize = new Clusterize({
+ scrollElem: this.wrapper.find('.pos-items-wrapper')[0],
+ contentElem: this.wrapper.find('.pos-items')[0],
+ rows_in_block: 6
+ });
+ }
+
+ render_items(items) {
+ let _items = items || this.items;
+
+ const all_items = Object.values(_items).map(item => this.get_item_html(item));
+ let row_items = [];
+
+ const row_container = '
+
+ ';
+ let curr_row = row_container;
+
+ for (let i=0; i < all_items.length; i++) {
+ // wrap 4 items in a div to emulate
+ // a row for clusterize
+ if(i % 4 === 0 && i !== 0) {
+ curr_row += '
';
+ row_items.push(curr_row);
+ curr_row = row_container;
+ }
+ curr_row += all_items[i];
+
+ if(i == all_items.length - 1 && all_items.length % 4 !== 0) {
+ row_items.push(curr_row);
+ }
+ }
+
+ this.clusterize.update(row_items);
+ }
+
+ filter_items({ search_term='', item_group='All Item Groups' }={}) {
+ if (search_term) {
+ search_term = search_term.toLowerCase();
+
+ // memoize
+ this.search_index = this.search_index || {};
+ if (this.search_index[search_term]) {
+ const items = this.search_index[search_term];
+ this.render_items(items);
+ return;
+ }
+ } else if (item_group == "All Item Groups") {
+ return this.render_items(this.all_items);
+ }
+
+ this.get_items({search_value: search_term, item_group })
+ .then(({ items, serial_no, batch_no }) => {
+ if (search_term) {
+ this.search_index[search_term] = items;
+ }
+
+ this.render_items(items);
+ if(serial_no) {
+ this.events.update_cart(items[0].item_code,
+ 'serial_no', serial_no);
+ this.search_field.set_value('');
+ }
+ if(batch_no) {
+ this.events.update_cart(items[0].item_code,
+ 'batch_no', serial_no);
+ this.search_field.set_value('');
+ }
+ });
+ }
+
+ bind_events() {
+ var me = this;
+ this.wrapper.on('click', '.pos-item-wrapper', function() {
+ const $item = $(this);
+ const item_code = $item.attr('data-item-code');
+ me.events.update_cart(item_code, 'qty', '+1');
+ });
+ }
+
+ get(item_code) {
+ return this.items[item_code];
+ }
+
+ get_all() {
+ return this.items;
+ }
+
+ get_item_html(item) {
+ const price_list_rate = format_currency(item.price_list_rate, this.currency);
+ const { item_code, item_name, item_image} = item;
+ const item_title = item_name || item_code;
+
+ const template = `
+
+
+ `;
+
+ return template;
+ }
+
+ get_items({start = 0, page_length = 40, search_value='', item_group="All Item Groups"}={}) {
+ return new Promise(res => {
+ frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
+ args: {
+ start,
+ page_length,
+ 'price_list': this.pos_profile.selling_price_list,
+ item_group,
+ search_value
+ }
+ }).then(r => {
+ // const { items, serial_no, batch_no } = r.message;
+
+ // this.serial_no = serial_no || "";
+ res(r.message);
+ });
+ });
+ }
+}
+
+class NumberPad {
+ constructor({
+ wrapper, onclick, button_array,
+ add_class={}, disable_highlight=[],
+ reset_btns=[], del_btn='',
+ }) {
+ this.wrapper = wrapper;
+ this.onclick = onclick;
+ this.button_array = button_array;
+ this.add_class = add_class;
+ this.disable_highlight = disable_highlight;
+ this.reset_btns = reset_btns;
+ this.del_btn = del_btn;
+ this.make_dom();
+ this.bind_events();
+ this.value = '';
+ }
+
+ make_dom() {
+ if (!this.button_array) {
+ this.button_array = [
+ [1, 2, 3],
+ [4, 5, 6],
+ [7, 8, 9],
+ ['', 0, '']
+ ];
+ }
+
+ this.wrapper.html(`
+
+
+
+
+
+ ${this.button_array.map(get_row).join("")}
+
+ `);
+
+ function get_row(row) {
+ return '' + row.map(get_col).join("") + '
';
+ }
+
+ function get_col(col) {
+ return `${col}
{{_("Training Event")}}
+{{ message }}
+ +{{_("Details")}}
+{{_("Event Name")}}: {{ name }} +{{_("Event Location")}}: {{ location }} +
{{_("Start Time")}}: {{ start_time }} +
{{_("End Time")}}: {{ end_time }} +
{{_("Attendance")}}: {{ attendance }} + +
{{_("Update Response")}}
+{% if not self_study %} +{{_("Please update your status for this training event")}}:
+ + +{% else %} +{{_("Please confirm once you have completed your training")}}:
+ +{% endif %} +{{_("Thank you")}},
+{{ user_fullname }}