Merge pull request #9839 from rmehta/regional-decorators
[feature] override a function regionally by adding a decorator
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 206399c..0761c1e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
import frappe
from erpnext.hooks import regional_overrides
-__version__ = '8.3.6'
+__version__ = '8.4.2'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 8991c36..fd985d0 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -415,5 +415,5 @@
erpnext.patches.v8_0.update_production_orders
erpnext.patches.v8_1.remove_sales_invoice_from_returned_serial_no
erpnext.patches.v8_1.allow_invoice_copy_to_edit_after_submit
-erpnext.patches.v8_1.update_gst_state
-erpnext.patches.v8_1.add_hsn_sac_codes
\ No newline at end of file
+erpnext.patches.v8_1.add_hsn_sac_codes
+erpnext.patches.v8_1.update_gst_state
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/update_gst_state.py b/erpnext/patches/v8_1/update_gst_state.py
index 2bbb6b8..88fe6eb 100644
--- a/erpnext/patches/v8_1/update_gst_state.py
+++ b/erpnext/patches/v8_1/update_gst_state.py
@@ -2,5 +2,12 @@
from erpnext.regional.india import states
def execute():
+ company = frappe.get_all('Company', filters = {'country': 'India'})
+ if not company:
+ return
+
+ if not frappe.db.get_value("Custom Field", filters={'fieldname':'gst_state'}):
+ return
+
frappe.db.sql("update `tabCustom Field` set options=%s where fieldname='gst_state'", '\n'.join(states))
frappe.db.sql("update `tabAddress` set gst_state='Chhattisgarh' where gst_state='Chattisgarh'")
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
index fa4b500..be628b8 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
@@ -4,6 +4,7 @@
cur_frm.add_fetch("student_group", "course", "course");
cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
+cur_frm.add_fetch("course", "default_grading_scale", "grading_scale");
frappe.ui.form.on("Assessment Plan", {
onload: function(frm) {
diff --git a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
index b5a2fc1..98c0419 100644
--- a/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
+++ b/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py
@@ -4,9 +4,14 @@
from __future__ import unicode_literals
import frappe
from frappe import _
+from frappe.utils import flt
from collections import defaultdict
+from erpnext.schools.api import get_grade
+
def execute(filters=None):
+ data = []
+
args = frappe._dict()
args["assessment_group"] = filters.get("assessment_group")
if args["assessment_group"] == "All Assessment Groups":
@@ -14,65 +19,112 @@
args["course"] = filters.get("course")
args["student_group"] = filters.get("student_group")
- if args["student_group"]:
- cond = "and ap.student_group=%(student_group)s"
- else:
- cond = ''
- # find all assessment plan linked with the filters provided
- assessment_plan = frappe.db.sql('''
- select
- ap.name, ap.student_group, apc.assessment_criteria, apc.maximum_score as max_score
- from
- `tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
- where
- ap.assessment_group=%(assessment_group)s and ap.course=%(course)s and
- ap.name=apc.parent and ap.docstatus=1 {0}
- order by
- apc.assessment_criteria'''.format(cond), (args), as_dict=1)
- assessment_plan_list = set([d["name"] for d in assessment_plan])
- if not assessment_plan_list:
- frappe.throw(_("No assessment plan linked with this assessment group"))
-
- student_group_list = set([d["student_group"] for d in assessment_plan])
- assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
- from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
- where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
- order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
- tuple(assessment_plan_list), as_dict=1)
-
- result_dict = defaultdict(dict)
- kounter = defaultdict(dict)
- for result in assessment_result:
- result_dict[result.student].update({frappe.scrub(result.assessment_criteria): result.grade,
- frappe.scrub(result.assessment_criteria)+"_score": result.score})
- if result.grade in kounter[result.assessment_criteria]:
- kounter[result.assessment_criteria][result.grade] += 1
+ # find all assessment plan and related details linked with the given filters
+ def get_assessment_details():
+ if args["student_group"]:
+ cond = "and ap.student_group=%(student_group)s"
else:
- kounter[result.assessment_criteria].update({result.grade: 1})
+ cond = ''
- student_list = frappe.db.sql('''select sgs.student, sgs.student_name
- from `tabStudent Group` sg, `tabStudent Group Student` sgs
- where sg.name = sgs.parent and sg.name in (%s)
- order by sgs.group_roll_number asc''' %', '.join(['%s']*len(student_group_list)),
- tuple(student_group_list), as_dict=1)
+ assessment_plan = frappe.db.sql('''
+ select
+ ap.name, ap.student_group, ap.grading_scale, apc.assessment_criteria, apc.maximum_score as max_score
+ from
+ `tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
+ where
+ ap.assessment_group=%(assessment_group)s and ap.course=%(course)s and
+ ap.name=apc.parent and ap.docstatus=1 {0}
+ order by
+ apc.assessment_criteria'''.format(cond), (args), as_dict=1)
- for student in student_list:
- student.update(result_dict[student.student])
- data = student_list
+ assessment_plan_list = list(set([d["name"] for d in assessment_plan]))
+ if not assessment_plan_list:
+ frappe.throw(_("No assessment plan linked with this assessment group"))
- columns = get_column(list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan])))
+ assessment_criteria_list = list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan]))
+ student_group_list = list(set([d["student_group"] for d in assessment_plan]))
+ total_maximum_score = flt(sum([flt(d[1]) for d in assessment_criteria_list]))
+ grading_scale = assessment_plan[0]["grading_scale"]
- grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
- grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
- (grading_scale))
- assessment_criteria_list = list(set([d["assessment_criteria"] for d in assessment_plan]))
- chart = get_chart_data(grades, assessment_criteria_list, kounter)
+ return assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale, student_group_list
+
+
+ # get all the result and make a dict map student as the key and value as dict of result
+ def get_result_map():
+ result_dict = defaultdict(dict)
+ kounter = defaultdict(dict)
+ assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
+ from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
+ where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
+ order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
+ tuple(assessment_plan_list), as_dict=1, debug=True)
+
+ for result in assessment_result:
+ if "total_score" in result_dict[result.student]:
+ total_score = result_dict[result.student]["total_score"] + result.score
+ else:
+ total_score = result.score
+ total = get_grade(grading_scale, (total_score/total_maximum_score)*100)
+
+ if result.grade in kounter[result.assessment_criteria]:
+ kounter[result.assessment_criteria][result.grade] += 1
+ else:
+ kounter[result.assessment_criteria].update({result.grade: 1})
+
+ if "Total" not in kounter:
+ kounter["Total"] = {}
+
+ if "total" in result_dict[result.student]:
+ prev_grade = result_dict[result.student]["total"]
+ prev_grade_count = kounter["Total"].get(prev_grade) - 1
+ kounter["Total"].update({prev_grade: prev_grade_count})
+ latest_grade_count = kounter["Total"].get(total)+1 if kounter["Total"].get(total) else 1
+ kounter["Total"].update({total: latest_grade_count})
+
+ result_dict[result.student].update({
+ frappe.scrub(result.assessment_criteria): result.grade,
+ frappe.scrub(result.assessment_criteria)+"_score": result.score,
+ "total_score": total_score,
+ "total": total
+ })
+
+ return result_dict, kounter
+
+ # make data from the result dict
+ def get_data():
+ student_list = frappe.db.sql('''select sgs.student, sgs.student_name
+ from `tabStudent Group` sg, `tabStudent Group Student` sgs
+ where sg.name = sgs.parent and sg.name in (%s)
+ order by sgs.group_roll_number asc''' %', '.join(['%s']*len(student_group_list)),
+ tuple(student_group_list), as_dict=1)
+
+ for student in student_list:
+ student.update(result_dict[student.student])
+ return student_list
+
+
+ # get chart data
+ def get_chart():
+ grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
+ grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
+ (grading_scale))
+ criteria_list = [d[0] for d in assessment_criteria_list] + ["Total"]
+ return get_chart_data(grades, criteria_list, kounter)
+
+
+ assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale,\
+ student_group_list = get_assessment_details()
+ result_dict, kounter = get_result_map()
+ data = get_data()
+
+ columns = get_column(assessment_criteria_list, total_maximum_score)
+ chart = get_chart()
return columns, data, None, chart
-def get_column(assessment_criteria):
+def get_column(assessment_criteria, total_maximum_score):
columns = [{
"fieldname": "student",
"label": _("Student ID"),
@@ -99,6 +151,20 @@
"fieldtype": "Float",
"width": 100
})
+
+ columns += [{
+ "fieldname": "total",
+ "label": "Total",
+ "fieldtype": "Data",
+ "width": 100
+ },
+ {
+ "fieldname": "total_score",
+ "label": "Total Score("+ str(int(total_maximum_score)) + ")",
+ "fieldtype": "Float",
+ "width": 110
+ }]
+
return columns
def get_chart_data(grades, assessment_criteria_list, kounter):
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 2ba2aba..457b6aa 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -5,7 +5,6 @@
frappe.ui.form.on("Sales Order", {
setup: function(frm) {
- $.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm}));
frm.custom_make_buttons = {
'Delivery Note': 'Delivery',
'Sales Invoice': 'Invoice',
@@ -347,3 +346,5 @@
}
}
});
+
+$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index c441df2..46d536d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -63,7 +63,6 @@
});
- $.extend(frm.cscript, new erpnext.stock.DeliveryNoteController({frm: frm}));
},
print_without_amount: function(frm) {
erpnext.stock.delivery_note.set_print_hide(frm.doc);
@@ -86,7 +85,6 @@
}
});
-
erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
setup: function(doc) {
this.setup_posting_date_time_check();
@@ -225,6 +223,8 @@
});
+$.extend(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm}));
+
frappe.ui.form.on('Delivery Note', {
setup: function(frm) {
if(frm.doc.company) {
@@ -268,3 +268,4 @@
dn_fields['taxes'].print_hide = 0;
}
}
+
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 1214346..5315253 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -4,7 +4,6 @@
frappe.ui.form.on('Stock Entry', {
setup: function(frm) {
- $.extend(frm.cscript, new erpnext.stock.StockEntry({frm: frm}));
frm.set_query('production_order', function() {
return {
@@ -583,3 +582,5 @@
});
}
+
+$.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm}));