diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 1073c7ef19b..a20b21a6d02 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.30' +__version__ = '10.1.31' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py index 0556e9b9924..24cd3dda9b6 100644 --- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py +++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py @@ -27,10 +27,20 @@ def create_or_update_cheque_print_format(template_name): doc = frappe.get_doc("Cheque Print Template", template_name) cheque_print.html = """ +
+ border-bottom: solid 1px;border-top:solid 1px; width:2cm;text-align: center; position: absolute;"> %(message_to_show)s + position: absolute; min-width: 6cm;"> {{ doc.account_no or '' }} + position: absolute; min-width: 6cm;"> {{doc.party_name}} + position: absolute; min-width: 4cm;"> {{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}} + position: absolute; min-width: 6cm;"> {{doc.company}}
diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js index d5103ca2ad3..565074d8784 100644 --- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js @@ -24,7 +24,7 @@ frappe.ui.form.on('Student Report Generation Tool', { frm.page.clear_indicator(); frm.page.set_primary_action(__('Print Report Card'), () => { let url = "/api/method/erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.preview_report_card"; - open_url_post(url, frm.doc, true); + open_url_post(url, {"doc": frm.doc}, true); }); }, diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py index 7b2e00713ab..f9979752f78 100644 --- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py +++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py @@ -3,7 +3,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +import frappe, json from frappe.model.document import Document from erpnext.education.api import get_grade from frappe.utils.pdf import get_pdf @@ -16,8 +16,8 @@ class StudentReportGenerationTool(Document): @frappe.whitelist() -def preview_report_card(**kwargs): - doc = frappe._dict(**kwargs) +def preview_report_card(doc): + doc = frappe._dict(json.loads(doc)) doc.students = [doc.student] if not (doc.student_name and doc.student_batch): program_enrollment = frappe.get_all("Program Enrollment", fields=["student_batch_name", "student_name"], @@ -33,7 +33,7 @@ def preview_report_card(**kwargs): course_criteria = get_courses_criteria(courses) # get the assessment group as per the user selection - if int(doc.include_all_assessment): + if doc.include_all_assessment: assessment_groups = get_child_assessment_groups(doc.assessment_group) else: assessment_groups = [doc.assessment_group] @@ -55,7 +55,7 @@ def preview_report_card(**kwargs): "assessment_groups": assessment_groups, "course_criteria": course_criteria, "letterhead": letterhead.content, - "add_letterhead": int(doc.add_letterhead) if int(doc.add_letterhead) else 0 + "add_letterhead": doc.add_letterhead if doc.add_letterhead else 0 }) final_template = frappe.render_template(base_template_path, {"body": html, "title": "Report Card"}) diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py index c3fe8f3222e..6cfb8af0a29 100644 --- a/erpnext/stock/doctype/material_request/material_request_dashboard.py +++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py @@ -7,7 +7,7 @@ def get_data(): 'transactions': [ { 'label': _('Related'), - 'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order'] + 'items': ['Request for Quotation', 'Supplier Quotation', 'Purchase Order', "Stock Entry"] }, { 'label': _('Manufacturing'),