', + { name: y[0], lab_test: y[1], encounter: y[2], invoiced: y[3], practitioner: y[4], practitioner_name: y[5], date: y[6] }) + ).appendTo(html_field); + + row.find("a").click(function () { + frm.doc.template = $(this).attr('data-lab-test'); + frm.doc.prescription = $(this).attr('data-name'); + frm.doc.practitioner = $(this).attr('data-practitioner'); + frm.set_df_property('template', 'read_only', 1); + frm.set_df_property('patient', 'read_only', 1); + frm.set_df_property('practitioner', 'read_only', 1); frm.doc.invoiced = 0; - if($(this).attr("data-invoiced") == 1){ + if ($(this).attr('data-invoiced') === 1) { frm.doc.invoiced = 1; } - refresh_field("invoiced"); - refresh_field("template"); + refresh_field('invoiced'); + refresh_field('template'); d.hide(); return false; }); }); - if(!result.length){ - var msg = __("No Lab Tests found for the Patient {0}", [frm.doc.patient_name.bold()]); + if (!lab_test_list.length) { + var msg = __('No Lab Tests found for the Patient {0}', [frm.doc.patient_name.bold()]); html_field.empty(); - $(repl('
%(msg)s
', {msg: msg})).appendTo(html_field);
+ $(repl('%(msg)s
', { msg: msg })).appendTo(html_field);
}
d.show();
};
-cur_frm.cscript.custom_before_submit = function(doc) {
- if(doc.normal_test_items){
- for(let result in doc.normal_test_items){
- if(!doc.normal_test_items[result].result_value && doc.normal_test_items[result].require_result_value == 1){
- frappe.msgprint(__("Please input all required Result Value(s)"));
- throw("Error");
+cur_frm.cscript.custom_before_submit = function (doc) {
+ if (doc.normal_test_items) {
+ for (let result in doc.normal_test_items) {
+ if (!doc.normal_test_items[result].result_value && !doc.normal_test_items[result].allow_blank && doc.normal_test_items[result].require_result_value) {
+ frappe.throw(__('Please input all required result values'));
}
}
}
- if(doc.special_test_items){
- for(let result in doc.special_test_items){
- if(!doc.special_test_items[result].result_value && doc.special_test_items[result].require_result_value == 1){
- frappe.msgprint(__("Please input all required Result Value(s)"));
- throw("Error");
+ if (doc.descriptive_test_items) {
+ for (let result in doc.descriptive_test_items) {
+ if (!doc.descriptive_test_items[result].result_value && !doc.descriptive_test_items[result].allow_blank && doc.descriptive_test_items[result].require_result_value) {
+ frappe.throw(__('Please input all required result values'));
}
}
}
};
-var make_dialog = function(frm, emailed, printed) {
+var make_dialog = function (frm, emailed, printed) {
var number = frm.doc.mobile;
var dialog = new frappe.ui.Dialog({
title: 'Send SMS',
width: 400,
fields: [
- {fieldname:'sms_type', fieldtype:'Select', label:'Type', options:
- ['Emailed','Printed']},
- {fieldname:'number', fieldtype:'Data', label:'Mobile Number', reqd:1},
- {fieldname:'messages_label', fieldtype:'HTML'},
- {fieldname:'messages', fieldtype:'HTML', reqd:1}
+ { fieldname: 'sms_type', fieldtype: 'Select', label: 'Type', options: ['Emailed', 'Printed'] },
+ { fieldname: 'number', fieldtype: 'Data', label: 'Mobile Number', reqd: 1 },
+ { fieldname: 'message', fieldtype: 'Small Text', label: 'Message', reqd: 1 }
],
- primary_action_label: __("Send"),
- primary_action : function(){
+ primary_action_label: __('Send'),
+ primary_action: function () {
var values = dialog.fields_dict;
- if(!values){
+ if (!values) {
return;
}
- send_sms(values,frm);
+ send_sms(values, frm);
dialog.hide();
}
});
- if(frm.doc.report_preference == "Email"){
+ if (frm.doc.report_preference == 'Print') {
dialog.set_values({
- 'sms_type': "Emailed",
- 'number': number
+ 'sms_type': 'Printed',
+ 'number': number,
+ 'message': printed
});
- dialog.fields_dict.messages_label.html("Message".bold());
- dialog.fields_dict.messages.html(emailed);
- }else{
+ } else {
dialog.set_values({
- 'sms_type': "Printed",
- 'number': number
+ 'sms_type': 'Emailed',
+ 'number': number,
+ 'message': emailed
});
- dialog.fields_dict.messages_label.html("Message".bold());
- dialog.fields_dict.messages.html(printed);
}
var fd = dialog.fields_dict;
- $(fd.sms_type.input).change(function(){
- if(dialog.get_value('sms_type') == 'Emailed'){
+ $(fd.sms_type.input).change(function () {
+ if (dialog.get_value('sms_type') == 'Emailed') {
dialog.set_values({
- 'number': number
+ 'number': number,
+ 'message': emailed
});
- fd.messages_label.html("Message".bold());
- fd.messages.html(emailed);
- }else{
+ } else {
dialog.set_values({
- 'number': number
+ 'number': number,
+ 'message': printed
});
- fd.messages_label.html("Message".bold());
- fd.messages.html(printed);
}
});
dialog.show();
};
-var send_sms = function(v,frm){
- var doc = frm.doc;
- var number = v.number.last_value;
- var messages = v.messages.wrapper.innerText;
+var send_sms = function (vals, frm) {
+ var number = vals.number.value;
+ var message = vals.message.last_value;
+
+ if (!number || !message) {
+ frappe.throw(__('Did not send SMS, missing patient mobile number or message content.'));
+ }
frappe.call({
- method: "frappe.core.doctype.sms_settings.sms_settings.send_sms",
+ method: 'frappe.core.doctype.sms_settings.sms_settings.send_sms',
args: {
receiver_list: [number],
- msg: messages
+ msg: message
},
- callback: function(r) {
- if(r.exc) {frappe.msgprint(r.exc); return; }
- else{
- frappe.call({
- method: "erpnext.healthcare.doctype.lab_test.lab_test.update_lab_test_print_sms_email_status",
- args: {print_sms_email: "sms_sent", name: doc.name},
- callback: function(){
- cur_frm.reload_doc();
- }
- });
+ callback: function (r) {
+ if (r.exc) {
+ frappe.msgprint(r.exc);
+ } else {
+ frm.reload_doc();
}
}
});
};
-var calculate_age = function(birth) {
- var ageMS = Date.parse(Date()) - Date.parse(birth);
- var age = new Date();
+var calculate_age = function (dob) {
+ var ageMS = Date.parse(Date()) - Date.parse(dob);
+ var age = new Date();
age.setTime(ageMS);
- var years = age.getFullYear() - 1970;
- return years + " Year(s) " + age.getMonth() + " Month(s) " + age.getDate() + " Day(s)";
+ var years = age.getFullYear() - 1970;
+ return years + ' Year(s) ' + age.getMonth() + ' Month(s) ' + age.getDate() + ' Day(s)';
};
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.json b/erpnext/healthcare/doctype/lab_test/lab_test.json
index 88eeb46a24..2eb8014b7e 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.json
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.json
@@ -10,49 +10,63 @@
"engine": "InnoDB",
"field_order": [
"naming_series",
+ "template",
+ "lab_test_name",
+ "lab_test_group",
+ "medical_code",
+ "department",
+ "column_break_26",
+ "company",
+ "status",
+ "submitted_date",
+ "result_date",
+ "approved_date",
+ "expected_result_date",
+ "expected_result_time",
+ "printed_on",
+ "invoiced",
+ "sb_first",
"patient",
"patient_name",
"patient_age",
"patient_sex",
+ "inpatient_record",
"report_preference",
"email",
"mobile",
- "practitioner",
"c_b",
- "inpatient_record",
- "company",
- "department",
- "status",
- "submitted_date",
- "approved_date",
- "sample",
- "result_date",
+ "practitioner",
+ "practitioner_name",
+ "requesting_department",
"employee",
"employee_name",
"employee_designation",
"user",
- "invoiced",
- "sb_first",
- "template",
- "lab_test_name",
- "column_break_26",
- "medical_code",
- "lab_test_group",
+ "sample",
"sb_normal",
+ "lab_test_html",
"normal_test_items",
- "sb_special",
- "special_test_items",
+ "sb_descriptive",
+ "descriptive_test_items",
+ "organisms_section",
+ "organism_test_items",
"sb_sensitivity",
"sensitivity_test_items",
"sb_comments",
"lab_test_comment",
"sb_customresult",
"custom_result",
+ "worksheet_section",
+ "worksheet_instructions",
+ "result_legend_section",
+ "legend_print_position",
+ "result_legend",
+ "section_break_50",
"email_sent",
"sms_sent",
"printed",
"normal_toggle",
- "special_toggle",
+ "descriptive_toggle",
"sensitivity_toggle",
"amended_from",
"prescription"
@@ -89,7 +103,6 @@
"fieldname": "patient",
"fieldtype": "Link",
"ignore_user_permissions": 1,
- "in_list_view": 1,
"in_standard_filter": 1,
"label": "Patient",
"options": "Patient",
@@ -120,6 +133,7 @@
"label": "Gender",
"options": "Gender",
"print_hide": 1,
+ "read_only": 1,
"report_hide": 1,
"reqd": 1,
"set_only_once": 1
@@ -128,11 +142,14 @@
"fieldname": "practitioner",
"fieldtype": "Link",
"ignore_user_permissions": 1,
- "label": "Healthcare Practitioner",
+ "in_list_view": 1,
+ "label": "Requesting Practitioner",
+ "no_copy": 1,
"options": "Healthcare Practitioner",
"search_index": 1
},
{
+ "fetch_from": "patient.email",
"fieldname": "email",
"fieldtype": "Data",
"hidden": 1,
@@ -142,6 +159,7 @@
"report_hide": 1
},
{
+ "fetch_from": "patient.mobile",
"fieldname": "mobile",
"fieldtype": "Data",
"hidden": 1,
@@ -166,21 +184,23 @@
"print_hide": 1
},
{
+ "fetch_from": "template.department",
"fieldname": "department",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"in_standard_filter": 1,
"label": "Department",
"options": "Medical Department",
+ "read_only": 1,
"search_index": 1
},
{
"fieldname": "status",
"fieldtype": "Select",
- "hidden": 1,
"label": "Status",
"options": "Draft\nCompleted\nApproved\nRejected\nCancelled",
"print_hide": 1,
+ "read_only": 1,
"report_hide": 1,
"search_index": 1
},
@@ -211,16 +231,39 @@
"read_only": 1,
"report_hide": 1
},
+ {
+ "default": "Today",
+ "fieldname": "expected_result_date",
+ "fieldtype": "Date",
+ "hidden": 1,
+ "label": "Expected Result Date",
+ "read_only": 1
+ },
+ {
+ "fieldname": "expected_result_time",
+ "fieldtype": "Time",
+ "hidden": 1,
+ "label": "Expected Result Time",
+ "read_only": 1
+ },
{
"fieldname": "result_date",
"fieldtype": "Date",
+ "hidden": 1,
"label": "Result Date",
"search_index": 1
},
+ {
+ "allow_on_submit": 1,
+ "fieldname": "printed_on",
+ "fieldtype": "Datetime",
+ "label": "Printed on",
+ "read_only": 1
+ },
{
"fieldname": "employee",
"fieldtype": "Link",
- "label": "Lab Technician",
+ "label": "Employee (Lab Technician)",
"no_copy": 1,
"options": "Employee",
"print_hide": 1,
@@ -230,7 +273,7 @@
"fetch_from": "employee.employee_name",
"fieldname": "employee_name",
"fieldtype": "Data",
- "label": "Technician Name",
+ "label": "Lab Technician Name",
"no_copy": 1,
"print_hide": 1,
"read_only": 1,
@@ -240,7 +283,7 @@
"fetch_from": "employee.designation",
"fieldname": "employee_designation",
"fieldtype": "Data",
- "label": "Designation",
+ "label": "Lab Technician Designation",
"no_copy": 1,
"print_hide": 1,
"read_only": 1,
@@ -257,6 +300,7 @@
"report_hide": 1
},
{
+ "fetch_from": "patient.report_preference",
"fieldname": "report_preference",
"fieldtype": "Data",
"label": "Report Preference",
@@ -272,7 +316,6 @@
"fieldname": "lab_test_name",
"fieldtype": "Data",
"in_list_view": 1,
- "in_standard_filter": 1,
"label": "Test Name",
"no_copy": 1,
"print_hide": 1,
@@ -280,14 +323,11 @@
"report_hide": 1,
"search_index": 1
},
- {
- "fieldname": "column_break_26",
- "fieldtype": "Column Break"
- },
{
"fieldname": "template",
"fieldtype": "Link",
"ignore_user_permissions": 1,
+ "in_standard_filter": 1,
"label": "Test Template",
"options": "Lab Test Template",
"print_hide": 1,
@@ -304,6 +344,14 @@
"print_hide": 1,
"report_hide": 1
},
+ {
+ "fetch_from": "template.medical_code",
+ "fieldname": "medical_code",
+ "fieldtype": "Link",
+ "label": "Medical Code",
+ "options": "Medical Code",
+ "read_only": 1
+ },
{
"fieldname": "sb_normal",
"fieldtype": "Section Break"
@@ -311,19 +359,18 @@
{
"fieldname": "normal_test_items",
"fieldtype": "Table",
- "options": "Normal Test Items"
+ "options": "Normal Test Result",
+ "print_hide": 1
},
{
- "fieldname": "sb_special",
+ "fieldname": "lab_test_html",
+ "fieldtype": "HTML"
+ },
+ {
+ "depends_on": "descriptive_toggle",
+ "fieldname": "organisms_section",
"fieldtype": "Section Break"
},
- {
- "fieldname": "special_test_items",
- "fieldtype": "Table",
- "options": "Special Test Items",
- "print_hide": 1,
- "report_hide": 1
- },
{
"fieldname": "sb_sensitivity",
"fieldtype": "Section Break"
@@ -331,7 +378,7 @@
{
"fieldname": "sensitivity_test_items",
"fieldtype": "Table",
- "options": "Sensitivity Test Items",
+ "options": "Sensitivity Test Result",
"print_hide": 1,
"report_hide": 1
},
@@ -343,7 +390,8 @@
"fieldname": "lab_test_comment",
"fieldtype": "Text",
"ignore_xss_filter": 1,
- "label": "Comments"
+ "label": "Comments",
+ "print_hide": 1
},
{
"collapsible": 1,
@@ -355,7 +403,8 @@
"fieldname": "custom_result",
"fieldtype": "Text Editor",
"ignore_xss_filter": 1,
- "label": "Custom Result"
+ "label": "Custom Result",
+ "print_hide": 1
},
{
"default": "0",
@@ -389,14 +438,6 @@
"print_hide": 1,
"report_hide": 1
},
- {
- "default": "0",
- "fieldname": "special_toggle",
- "fieldtype": "Check",
- "hidden": 1,
- "print_hide": 1,
- "report_hide": 1
- },
{
"default": "0",
"fieldname": "sensitivity_toggle",
@@ -427,17 +468,89 @@
"report_hide": 1
},
{
- "fetch_from": "template.medical_code",
- "fieldname": "medical_code",
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fetch_from": "practitioner.department",
+ "fieldname": "requesting_department",
"fieldtype": "Link",
- "label": "Medical Code",
- "options": "Medical Code",
+ "in_list_view": 1,
+ "label": "Requesting Department",
+ "options": "Medical Department",
"read_only": 1
+ },
+ {
+ "fetch_from": "practitioner.practitioner_name",
+ "fieldname": "practitioner_name",
+ "fieldtype": "Data",
+ "label": "Requesting Practitioner",
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "result_legend_section",
+ "fieldtype": "Section Break",
+ "label": "Result Legend Print"
+ },
+ {
+ "fieldname": "legend_print_position",
+ "fieldtype": "Select",
+ "label": "Print Position",
+ "options": "\nBottom\nTop\nBoth",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "result_legend",
+ "fieldtype": "Text Editor",
+ "label": "Result Legend",
+ "print_hide": 1
+ },
+ {
+ "fieldname": "section_break_50",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "worksheet_instructions",
+ "fieldtype": "Text Editor",
+ "label": "Worksheet Instructions",
+ "print_hide": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "worksheet_section",
+ "fieldtype": "Section Break",
+ "label": "Worksheet Print"
+ },
+ {
+ "fieldname": "descriptive_test_items",
+ "fieldtype": "Table",
+ "options": "Descriptive Test Result",
+ "print_hide": 1,
+ "report_hide": 1
+ },
+ {
+ "fieldname": "sb_descriptive",
+ "fieldtype": "Section Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "descriptive_toggle",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "print_hide": 1,
+ "report_hide": 1
+ },
+ {
+ "fieldname": "organism_test_items",
+ "fieldtype": "Table",
+ "options": "Organism Test Result",
+ "print_hide": 1
}
],
"is_submittable": 1,
"links": [],
- "modified": "2020-06-29 14:24:26.509721",
+ "modified": "2020-07-16 13:35:24.811062",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Lab Test",
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.py b/erpnext/healthcare/doctype/lab_test/lab_test.py
index b2c5e6bf43..865f4a14e3 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.py
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.py
@@ -10,26 +10,30 @@ from frappe.utils import getdate, cstr
class LabTest(Document):
def on_submit(self):
- frappe.db.set_value(self.doctype,self.name,"submitted_date", getdate())
+ self.db_set('submitted_date', getdate())
+ self.db_set('status', 'Completed')
insert_lab_test_to_medical_record(self)
- frappe.db.set_value("Lab Test", self.name, "status", "Completed")
def on_cancel(self):
delete_lab_test_from_medical_record(self)
- frappe.db.set_value("Lab Test", self.name, "status", "Cancelled")
+ self.db_set('status', 'Cancelled')
self.reload()
+ def validate(self):
+ if not self.is_new():
+ self.set_secondary_uom_result()
+
def on_update(self):
- if(self.sensitivity_test_items):
+ if self.sensitivity_test_items:
sensitivity = sorted(self.sensitivity_test_items, key=lambda x: x.antibiotic_sensitivity)
for i, item in enumerate(sensitivity):
- item.idx = i+1
+ item.idx = i + 1
self.sensitivity_test_items = sensitivity
def after_insert(self):
- if(self.prescription):
- frappe.db.set_value("Lab Prescription", self.prescription, "lab_test_created", 1)
- if frappe.db.get_value("Lab Prescription", self.prescription, 'invoiced') == 1:
+ if self.prescription:
+ frappe.db.set_value('Lab Prescription', self.prescription, 'lab_test_created', 1)
+ if frappe.db.get_value('Lab Prescription', self.prescription, 'invoiced'):
self.invoiced = True
if not self.lab_test_name and self.template:
self.load_test_from_template()
@@ -40,109 +44,110 @@ class LabTest(Document):
create_test_from_template(lab_test)
self.reload()
+ def set_secondary_uom_result(self):
+ for item in self.normal_test_items:
+ if item.result_value and item.secondary_uom and item.conversion_factor:
+ try:
+ item.secondary_uom_result = float(item.result_value) * float(item.conversion_factor)
+ except:
+ item.secondary_uom_result = ''
+ frappe.msgprint(_('Result for Secondary UOM not calculated for row #{0}'.format(item.idx)), title = _('Warning'))
+
+
def create_test_from_template(lab_test):
- template = frappe.get_doc("Lab Test Template", lab_test.template)
- patient = frappe.get_doc("Patient", lab_test.patient)
+ template = frappe.get_doc('Lab Test Template', lab_test.template)
+ patient = frappe.get_doc('Patient', lab_test.patient)
lab_test.lab_test_name = template.lab_test_name
lab_test.result_date = getdate()
lab_test.department = template.department
lab_test.lab_test_group = template.lab_test_group
+ lab_test.legend_print_position = template.legend_print_position
+ lab_test.result_legend = template.result_legend
+ lab_test.worksheet_instructions = template.worksheet_instructions
lab_test = create_sample_collection(lab_test, template, patient, None)
lab_test = load_result_format(lab_test, template, None, None)
@frappe.whitelist()
def update_status(status, name):
- frappe.db.sql("""update `tabLab Test` set status=%s, approved_date=%s where name = %s""", (status, getdate(), name))
-
-@frappe.whitelist()
-def update_lab_test_print_sms_email_status(print_sms_email, name):
- frappe.db.set_value("Lab Test",name,print_sms_email,1)
+ if name and status:
+ frappe.db.set_value('Lab Test', name, {
+ 'status': status,
+ 'approved_date': getdate()
+ })
@frappe.whitelist()
def create_multiple(doctype, docname):
+ if not doctype or not docname:
+ frappe.throw(_('Sales Invoice or Patient Encounter is required to create Lab Tests'), title=_('Insufficient Data'))
+
lab_test_created = False
- if doctype == "Sales Invoice":
+ if doctype == 'Sales Invoice':
lab_test_created = create_lab_test_from_invoice(docname)
- elif doctype == "Patient Encounter":
+ elif doctype == 'Patient Encounter':
lab_test_created = create_lab_test_from_encounter(docname)
if lab_test_created:
- frappe.msgprint(_("Lab Test(s) {0} created".format(lab_test_created)))
+ frappe.msgprint(_('Lab Test(s) {0} created'.format(lab_test_created)))
else:
- frappe.msgprint(_("No Lab Tests created"))
+ frappe.msgprint(_('No Lab Tests created'))
-def create_lab_test_from_encounter(encounter_id):
+def create_lab_test_from_encounter(encounter):
lab_test_created = False
- encounter = frappe.get_doc("Patient Encounter", encounter_id)
+ encounter = frappe.get_doc('Patient Encounter', encounter)
- lab_test_ids = frappe.db.sql("""select lp.name, lp.lab_test_code, lp.invoiced
- from `tabPatient Encounter` et, `tabLab Prescription` lp
- where et.patient=%s and lp.parent=%s and
- lp.parent=et.name and lp.lab_test_created=0 and et.docstatus=1""", (encounter.patient, encounter_id))
-
- if lab_test_ids:
- patient = frappe.get_doc("Patient", encounter.patient)
- for lab_test_id in lab_test_ids:
- template = get_lab_test_template(lab_test_id[1])
- if template:
- lab_test = create_lab_test_doc(lab_test_id[2], encounter.practitioner, patient, template, encounter.company)
- lab_test.save(ignore_permissions = True)
- frappe.db.set_value("Lab Prescription", lab_test_id[0], "lab_test_created", 1)
- if not lab_test_created:
- lab_test_created = lab_test.name
- else:
- lab_test_created += ", "+lab_test.name
+ if encounter and encounter.lab_test_prescription:
+ patient = frappe.get_doc('Patient', encounter.patient)
+ for item in encounter.lab_test_prescription:
+ if not item.lab_test_created:
+ template = get_lab_test_template(item.lab_test_code)
+ if template:
+ lab_test = create_lab_test_doc(item.invoiced, encounter.practitioner, patient, template, encounter.company)
+ lab_test.save(ignore_permissions = True)
+ frappe.db.set_value('Lab Prescription', item.name, 'lab_test_created', 1)
+ if not lab_test_created:
+ lab_test_created = lab_test.name
+ else:
+ lab_test_created += ', ' + lab_test.name
return lab_test_created
-def create_lab_test_from_invoice(invoice_name):
+def create_lab_test_from_invoice(sales_invoice):
lab_tests_created = False
- invoice = frappe.get_doc("Sales Invoice", invoice_name)
- if invoice.patient:
- patient = frappe.get_doc("Patient", invoice.patient)
+ invoice = frappe.get_doc('Sales Invoice', sales_invoice)
+ if invoice and invoice.patient:
+ patient = frappe.get_doc('Patient', invoice.patient)
for item in invoice.items:
lab_test_created = 0
- if item.reference_dt == "Lab Prescription":
- lab_test_created = frappe.db.get_value("Lab Prescription", item.reference_dn, "lab_test_created")
- elif item.reference_dt == "Lab Test":
+ if item.reference_dt == 'Lab Prescription':
+ lab_test_created = frappe.db.get_value('Lab Prescription', item.reference_dn, 'lab_test_created')
+ elif item.reference_dt == 'Lab Test':
lab_test_created = 1
if lab_test_created != 1:
template = get_lab_test_template(item.item_code)
if template:
lab_test = create_lab_test_doc(True, invoice.ref_practitioner, patient, template, invoice.company)
- if item.reference_dt == "Lab Prescription":
+ if item.reference_dt == 'Lab Prescription':
lab_test.prescription = item.reference_dn
lab_test.save(ignore_permissions = True)
- if item.reference_dt != "Lab Prescription":
- frappe.db.set_value("Sales Invoice Item", item.name, "reference_dt", "Lab Test")
- frappe.db.set_value("Sales Invoice Item", item.name, "reference_dn", lab_test.name)
+ if item.reference_dt != 'Lab Prescription':
+ frappe.db.set_value('Sales Invoice Item', item.name, 'reference_dt', 'Lab Test')
+ frappe.db.set_value('Sales Invoice Item', item.name, 'reference_dn', lab_test.name)
if not lab_tests_created:
lab_tests_created = lab_test.name
else:
- lab_tests_created += ", " + lab_test.name
+ lab_tests_created += ', ' + lab_test.name
return lab_tests_created
def get_lab_test_template(item):
- template_id = check_template_exists(item)
+ template_id = frappe.db.exists('Lab Test Template', {'item': item})
if template_id:
- return frappe.get_doc("Lab Test Template", template_id)
- return False
-
-def check_template_exists(item):
- template_exists = frappe.db.exists(
- "Lab Test Template",
- {
- 'item': item
- }
- )
- if template_exists:
- return template_exists
+ return frappe.get_doc('Lab Test Template', template_id)
return False
def create_lab_test_doc(invoiced, practitioner, patient, template, company):
- lab_test = frappe.new_doc("Lab Test")
+ lab_test = frappe.new_doc('Lab Test')
lab_test.invoiced = invoiced
lab_test.practitioner = practitioner
lab_test.patient = patient.name
@@ -159,63 +164,71 @@ def create_lab_test_doc(invoiced, practitioner, patient, template, company):
return lab_test
def create_normals(template, lab_test):
- lab_test.normal_toggle = "1"
- normal = lab_test.append("normal_test_items")
+ lab_test.normal_toggle = 1
+ normal = lab_test.append('normal_test_items')
normal.lab_test_name = template.lab_test_name
normal.lab_test_uom = template.lab_test_uom
+ normal.secondary_uom = template.secondary_uom
+ normal.conversion_factor = template.conversion_factor
normal.normal_range = template.lab_test_normal_range
normal.require_result_value = 1
+ normal.allow_blank = 0
normal.template = template.name
def create_compounds(template, lab_test, is_group):
- lab_test.normal_toggle = "1"
+ lab_test.normal_toggle = 1
for normal_test_template in template.normal_test_templates:
- normal = lab_test.append("normal_test_items")
+ normal = lab_test.append('normal_test_items')
if is_group:
normal.lab_test_event = normal_test_template.lab_test_event
else:
normal.lab_test_name = normal_test_template.lab_test_event
normal.lab_test_uom = normal_test_template.lab_test_uom
+ normal.secondary_uom = normal_test_template.secondary_uom
+ normal.conversion_factor = normal_test_template.conversion_factor
normal.normal_range = normal_test_template.normal_range
normal.require_result_value = 1
+ normal.allow_blank = normal_test_template.allow_blank
normal.template = template.name
-def create_specials(template, lab_test):
- lab_test.special_toggle = "1"
- if(template.sensitivity):
- lab_test.sensitivity_toggle = "1"
- for special_test_template in template.special_test_template:
- special = lab_test.append("special_test_items")
- special.lab_test_particulars = special_test_template.particulars
- special.require_result_value = 1
- special.template = template.name
+def create_descriptives(template, lab_test):
+ lab_test.descriptive_toggle = 1
+ if template.sensitivity:
+ lab_test.sensitivity_toggle = 1
+ for descriptive_test_template in template.descriptive_test_templates:
+ descriptive = lab_test.append('descriptive_test_items')
+ descriptive.lab_test_particulars = descriptive_test_template.particulars
+ descriptive.require_result_value = 1
+ descriptive.allow_blank = descriptive_test_template.allow_blank
+ descriptive.template = template.name
def create_sample_doc(template, patient, invoice, company = None):
if template.sample:
sample_exists = frappe.db.exists({
- "doctype": "Sample Collection",
- "patient": patient.name,
- "docstatus": 0,
- "sample": template.sample
+ 'doctype': 'Sample Collection',
+ 'patient': patient.name,
+ 'docstatus': 0,
+ 'sample': template.sample
})
if sample_exists:
- # update Sample Collection by adding quantity
- sample_collection = frappe.get_doc("Sample Collection", sample_exists[0][0])
+ # Update Sample Collection by adding quantity
+ sample_collection = frappe.get_doc('Sample Collection', sample_exists[0][0])
quantity = int(sample_collection.sample_qty) + int(template.sample_qty)
if template.sample_details:
- sample_details = sample_collection.sample_details + "\n==============\n" + _("Test: ")
- sample_details += (template.get("lab_test_name") or template.get("template")) + "\n"
- sample_details += _("Collection Details: ") + "\n\t" + template.sample_details
+ sample_details = sample_collection.sample_details + '\n-\n' + _('Test: ')
+ sample_details += (template.get('lab_test_name') or template.get('template')) + '\n'
+ sample_details += _('Collection Details: ') + '\n\t' + template.sample_details
+ frappe.db.set_value('Sample Collection', sample_collection.name, 'sample_details', sample_details)
- frappe.db.set_value("Sample Collection", sample_collection.name, "sample_details", sample_details)
- frappe.db.set_value("Sample Collection", sample_collection.name, "sample_qty", quantity)
+ frappe.db.set_value('Sample Collection', sample_collection.name, 'sample_qty', quantity)
else:
- #create Sample Collection for template, copy vals from Invoice
- sample_collection = frappe.new_doc("Sample Collection")
- if(invoice):
+ # Create Sample Collection for template, copy vals from Invoice
+ sample_collection = frappe.new_doc('Sample Collection')
+ if invoice:
sample_collection.invoiced = True
+
sample_collection.patient = patient.name
sample_collection.patient_age = patient.get_age()
sample_collection.patient_sex = patient.sex
@@ -224,125 +237,146 @@ def create_sample_doc(template, patient, invoice, company = None):
sample_collection.sample_qty = template.sample_qty
sample_collection.company = company
- if(template.sample_details):
- sample_collection.sample_details = "Test :" + (template.get("lab_test_name") or template.get("template")) +"\n"+"Collection Detials:\n\t"+template.sample_details
+ if template.sample_details:
+ sample_collection.sample_details = 'Test :' + (template.get('lab_test_name') or template.get('template')) + '\n' + 'Collection Detials:\n\t' + template.sample_details
sample_collection.save(ignore_permissions=True)
return sample_collection
def create_sample_collection(lab_test, template, patient, invoice):
- if(frappe.db.get_value("Healthcare Settings", None, "create_sample_collection_for_lab_test") == "1"):
+ if frappe.get_cached_value('Healthcare Settings', None, 'create_sample_collection_for_lab_test'):
sample_collection = create_sample_doc(template, patient, invoice, lab_test.company)
- if(sample_collection):
+ if sample_collection:
lab_test.sample = sample_collection.name
+
return lab_test
def load_result_format(lab_test, template, prescription, invoice):
- if(template.lab_test_template_type == 'Single'):
+ if template.lab_test_template_type == 'Single':
create_normals(template, lab_test)
- elif(template.lab_test_template_type == 'Compound'):
+ elif template.lab_test_template_type == 'Compound':
create_compounds(template, lab_test, False)
- elif(template.lab_test_template_type == 'Descriptive'):
- create_specials(template, lab_test)
- elif(template.lab_test_template_type == 'Grouped'):
- #iterate for each template in the group and create one result for all.
+ elif template.lab_test_template_type == 'Descriptive':
+ create_descriptives(template, lab_test)
+ elif template.lab_test_template_type == 'Grouped':
+ # Iterate for each template in the group and create one result for all.
for lab_test_group in template.lab_test_groups:
- #template_in_group = None
- if(lab_test_group.lab_test_template):
- template_in_group = frappe.get_doc("Lab Test Template",
+ # Template_in_group = None
+ if lab_test_group.lab_test_template:
+ template_in_group = frappe.get_doc('Lab Test Template',
lab_test_group.lab_test_template)
- if(template_in_group):
- if(template_in_group.lab_test_template_type == 'Single'):
+ if template_in_group:
+ if template_in_group.lab_test_template_type == 'Single':
create_normals(template_in_group, lab_test)
- elif(template_in_group.lab_test_template_type == 'Compound'):
- normal_heading = lab_test.append("normal_test_items")
+ elif template_in_group.lab_test_template_type == 'Compound':
+ normal_heading = lab_test.append('normal_test_items')
normal_heading.lab_test_name = template_in_group.lab_test_name
normal_heading.require_result_value = 0
+ normal_heading.allow_blank = 1
normal_heading.template = template_in_group.name
create_compounds(template_in_group, lab_test, True)
- elif(template_in_group.lab_test_template_type == 'Descriptive'):
- special_heading = lab_test.append("special_test_items")
- special_heading.lab_test_name = template_in_group.lab_test_name
- special_heading.require_result_value = 0
- special_heading.template = template_in_group.name
- create_specials(template_in_group, lab_test)
- else:
- normal = lab_test.append("normal_test_items")
+ elif template_in_group.lab_test_template_type == 'Descriptive':
+ descriptive_heading = lab_test.append('descriptive_test_items')
+ descriptive_heading.lab_test_name = template_in_group.lab_test_name
+ descriptive_heading.require_result_value = 0
+ descriptive_heading.allow_blank = 1
+ descriptive_heading.template = template_in_group.name
+ create_descriptives(template_in_group, lab_test)
+ else: # Lab Test Group - Add New Line
+ normal = lab_test.append('normal_test_items')
normal.lab_test_name = lab_test_group.group_event
normal.lab_test_uom = lab_test_group.group_test_uom
+ normal.secondary_uom = lab_test_group.secondary_uom
+ normal.conversion_factor = lab_test_group.conversion_factor
normal.normal_range = lab_test_group.group_test_normal_range
+ normal.allow_blank = lab_test_group.allow_blank
normal.require_result_value = 1
normal.template = template.name
- if(template.lab_test_template_type != 'No Result'):
- if(prescription):
+ if template.lab_test_template_type != 'No Result':
+ if prescription:
lab_test.prescription = prescription
- if(invoice):
- frappe.db.set_value("Lab Prescription", prescription, "invoiced", True)
- lab_test.save(ignore_permissions=True) # insert the result
+ if invoice:
+ frappe.db.set_value('Lab Prescription', prescription, 'invoiced', True)
+ lab_test.save(ignore_permissions=True) # Insert the result
return lab_test
@frappe.whitelist()
def get_employee_by_user_id(user_id):
- emp_id = frappe.db.get_value("Employee",{"user_id":user_id})
- employee = frappe.get_doc("Employee",emp_id)
+ emp_id = frappe.db.get_value('Employee', { 'user_id': user_id })
+ employee = frappe.get_doc('Employee', emp_id)
return employee
def insert_lab_test_to_medical_record(doc):
table_row = False
subject = cstr(doc.lab_test_name)
if doc.practitioner:
- subject += frappe.bold(_("Healthcare Practitioner: "))+ doc.practitioner + "" + subject += frappe.bold(_('Healthcare Practitioner: '))+ doc.practitioner + '
' if doc.normal_test_items: item = doc.normal_test_items[0] - comment = "" + comment = '' if item.lab_test_comment: comment = str(item.lab_test_comment) - table_row = frappe.bold(_("Lab Test Conducted: ")) + item.lab_test_name + table_row = frappe.bold(_('Lab Test Conducted: ')) + item.lab_test_name if item.lab_test_event: - table_row += frappe.bold(_("Lab Test Event: ")) + item.lab_test_event + table_row += frappe.bold(_('Lab Test Event: ')) + item.lab_test_event if item.result_value: - table_row += " " + frappe.bold(_("Lab Test Result: ")) + item.result_value + table_row += ' ' + frappe.bold(_('Lab Test Result: ')) + item.result_value if item.normal_range: - table_row += " " + _("Normal Range:") + item.normal_range - table_row += " " + comment + table_row += ' ' + _('Normal Range:') + item.normal_range + table_row += ' ' + comment - elif doc.special_test_items: - item = doc.special_test_items[0] + elif doc.descriptive_test_items: + item = doc.descriptive_test_items[0] if item.lab_test_particulars and item.result_value: - table_row = item.lab_test_particulars +" "+ item.result_value + table_row = item.lab_test_particulars + ' ' + item.result_value elif doc.sensitivity_test_items: item = doc.sensitivity_test_items[0] if item.antibiotic and item.antibiotic_sensitivity: - table_row = item.antibiotic + " " + item.antibiotic_sensitivity + table_row = item.antibiotic + ' ' + item.antibiotic_sensitivity if table_row: - subject += "
" + table_row + subject += '
' + table_row if doc.lab_test_comment: - subject += "
" + cstr(doc.lab_test_comment) + subject += '
' + cstr(doc.lab_test_comment) - medical_record = frappe.new_doc("Patient Medical Record") + medical_record = frappe.new_doc('Patient Medical Record') medical_record.patient = doc.patient medical_record.subject = subject - medical_record.status = "Open" + medical_record.status = 'Open' medical_record.communication_date = doc.result_date - medical_record.reference_doctype = "Lab Test" + medical_record.reference_doctype = 'Lab Test' medical_record.reference_name = doc.name medical_record.reference_owner = doc.owner - medical_record.save(ignore_permissions=True) + medical_record.save(ignore_permissions = True) def delete_lab_test_from_medical_record(self): - medical_record_id = frappe.db.sql("select name from `tabPatient Medical Record` where reference_name=%s",(self.name)) + medical_record_id = frappe.db.sql('select name from `tabPatient Medical Record` where reference_name= %s', (self.name)) if medical_record_id and medical_record_id[0][0]: - frappe.delete_doc("Patient Medical Record", medical_record_id[0][0]) + frappe.delete_doc('Patient Medical Record', medical_record_id[0][0]) @frappe.whitelist() def get_lab_test_prescribed(patient): - return frappe.db.sql("""select cp.name, cp.lab_test_code, cp.parent, cp.invoiced, ct.practitioner, ct.encounter_date from `tabPatient Encounter` ct, - `tabLab Prescription` cp where ct.patient=%s and cp.parent=ct.name and cp.lab_test_created=0""", (patient)) + return frappe.db.sql( + ''' + select + lp.name, + lp.lab_test_code, + lp.parent, + lp.invoiced, + pe.practitioner, + pe.practitioner_name, + pe.encounter_date + from + `tabPatient Encounter` pe, `tabLab Prescription` lp + where + pe.patient=%s + and lp.parent=pe.name + and lp.lab_test_created=0 + ''', (patient)) diff --git a/erpnext/healthcare/doctype/lab_test/lab_test_list.js b/erpnext/healthcare/doctype/lab_test/lab_test_list.js index 1f6a12f935..b7f157c38b 100644 --- a/erpnext/healthcare/doctype/lab_test/lab_test_list.js +++ b/erpnext/healthcare/doctype/lab_test/lab_test_list.js @@ -2,57 +2,63 @@ (c) ESS 2015-16 */ frappe.listview_settings['Lab Test'] = { - add_fields: ["name", "status", "invoiced"], - filters:[["docstatus","=","0"]], - get_indicator: function(doc) { - if(doc.status=="Approved"){ - return [__("Approved"), "green", "status,=,Approved"]; + add_fields: ['name', 'status', 'invoiced'], + filters: [['docstatus', '=', '0']], + get_indicator: function (doc) { + if (doc.status == 'Approved') { + return [__('Approved'), 'green', 'status, = ,Approved']; } - if(doc.status=="Rejected"){ - return [__("Rejected"), "yellow", "status,=,Rejected"]; + if (doc.status == 'Rejected') { + return [__('Rejected'), 'orange', 'status, =, Rejected']; } }, - onload: function(listview) { - listview.page.add_menu_item(__("Create Multiple"), function() { + onload: function (listview) { + listview.page.add_menu_item(__('Create Multiple'), function () { create_multiple_dialog(listview); }); } }; -var create_multiple_dialog = function(listview){ +var create_multiple_dialog = function (listview) { var dialog = new frappe.ui.Dialog({ title: 'Create Multiple Lab Test', width: 100, fields: [ - {fieldtype: "Link", label: "Patient", fieldname: "patient", options: "Patient", reqd: 1}, - {fieldtype: "Select", label: "Invoice / Patient Encounter", fieldname: "doctype", - options: "\nSales Invoice\nPatient Encounter", reqd: 1}, - {fieldtype: "Dynamic Link", fieldname: "docname", options: "doctype", reqd: 1, - get_query: function(){ + { fieldtype: 'Link', label: 'Patient', fieldname: 'patient', options: 'Patient', reqd: 1 }, + { + fieldtype: 'Select', label: 'Invoice / Patient Encounter', fieldname: 'doctype', + options: '\nSales Invoice\nPatient Encounter', reqd: 1 + }, + { + fieldtype: 'Dynamic Link', fieldname: 'docname', options: 'doctype', reqd: 1, + get_query: function () { return { filters: { - "patient": dialog.get_value("patient"), - "docstatus": 1 + 'patient': dialog.get_value('patient'), + 'docstatus': 1 } }; } } ], - primary_action_label: __("Create Lab Test"), - primary_action : function(){ + primary_action_label: __('Create Lab Test'), + primary_action: function () { frappe.call({ method: 'erpnext.healthcare.doctype.lab_test.lab_test.create_multiple', - args:{ - 'doctype': dialog.get_value("doctype"), - 'docname': dialog.get_value("docname") + args: { + 'doctype': dialog.get_value('doctype'), + 'docname': dialog.get_value('docname') }, - callback: function(data) { - if(!data.exc){ + callback: function (data) { + if (!data.exc) { + if (!data.message) { + frappe.msgprint(__('No Lab Tests created')); + } listview.refresh(); } }, freeze: true, - freeze_message: "Creating Lab Test..." + freeze_message: __('Creating Lab Tests...') }); dialog.hide(); } diff --git a/erpnext/healthcare/doctype/lab_test_group_template/__init__.py b/erpnext/healthcare/doctype/lab_test_group_template/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.json b/erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.json new file mode 100644 index 0000000000..beea7a357e --- /dev/null +++ b/erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.json @@ -0,0 +1,118 @@ +{ + "actions": [], + "allow_copy": 1, + "beta": 1, + "creation": "2016-03-29 17:37:29.913583", + "doctype": "DocType", + "document_type": "Setup", + "engine": "InnoDB", + "field_order": [ + "template_or_new_line", + "lab_test_template", + "lab_test_rate", + "lab_test_description", + "group_event", + "group_test_uom", + "secondary_uom", + "conversion_factor", + "allow_blank", + "column_break_8", + "group_test_normal_range" + ], + "fields": [ + { + "default": "Add Test", + "fieldname": "template_or_new_line", + "fieldtype": "Select", + "options": "Add Test\nAdd New Line", + "print_hide": 1, + "report_hide": 1 + }, + { + "depends_on": "eval:doc.template_or_new_line == 'Add Test'", + "fieldname": "lab_test_template", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "in_list_view": 1, + "label": "Test Name", + "options": "Lab Test Template" + }, + { + "fetch_from": "lab_test_template.lab_test_rate", + "fieldname": "lab_test_rate", + "fieldtype": "Currency", + "label": "Rate", + "print_hide": 1, + "read_only": 1, + "report_hide": 1 + }, + { + "fetch_from": "lab_test_template.lab_test_description", + "fieldname": "lab_test_description", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Description", + "read_only": 1 + }, + { + "depends_on": "eval:doc.template_or_new_line == 'Add New Line'", + "fieldname": "group_event", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Event" + }, + { + "depends_on": "eval:doc.template_or_new_line =='Add New Line'", + "fieldname": "group_test_uom", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "UOM", + "options": "Lab Test UOM" + }, + { + "depends_on": "eval:doc.template_or_new_line == 'Add New Line'", + "fieldname": "group_test_normal_range", + "fieldtype": "Long Text", + "ignore_xss_filter": 1, + "label": "Normal Range" + }, + { + "fieldname": "column_break_8", + "fieldtype": "Column Break" + }, + { + "depends_on": "eval:doc.template_or_new_line =='Add New Line'", + "fieldname": "secondary_uom", + "fieldtype": "Link", + "label": "Secondary UOM", + "options": "Lab Test UOM" + }, + { + "depends_on": "secondary_uom", + "fieldname": "conversion_factor", + "fieldtype": "Float", + "label": "Conversion Factor" + }, + { + "default": "0", + "depends_on": "eval:doc.template_or_new_line == 'Add New Line'", + "fieldname": "allow_blank", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Allow Blank" + } + ], + "istable": 1, + "links": [], + "modified": "2020-06-24 10:59:01.921924", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Lab Test Group Template", + "owner": "Administrator", + "permissions": [], + "restrict_to_domain": "Healthcare", + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.py b/erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.py similarity index 84% rename from erpnext/healthcare/doctype/normal_test_items/normal_test_items.py rename to erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.py index a0069d7252..1e2cef4e18 100644 --- a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.py +++ b/erpnext/healthcare/doctype/lab_test_group_template/lab_test_group_template.py @@ -5,5 +5,5 @@ from __future__ import unicode_literals from frappe.model.document import Document -class NormalTestItems(Document): +class LabTestGroupTemplate(Document): pass diff --git a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json b/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json deleted file mode 100644 index e51d8b7557..0000000000 --- a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json +++ /dev/null @@ -1,310 +0,0 @@ -{ - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-03-29 17:37:29.913583", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 0, - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Add Test", - "depends_on": "", - "fieldname": "template_or_new_line", - "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": "", - "length": 0, - "no_copy": 0, - "options": "Add Test\nAdd new line", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.template_or_new_line == 'Add Test'", - "fieldname": "lab_test_template", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Test Name", - "length": 0, - "no_copy": 0, - "options": "Lab Test Template", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_from": "lab_test_template.lab_test_rate", - "fieldname": "lab_test_rate", - "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": "Rate", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_from": "lab_test_template.lab_test_description", - "fieldname": "lab_test_description", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Description", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.template_or_new_line == 'Add new line'", - "fieldname": "group_event", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Event", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.template_or_new_line =='Add new line'", - "fieldname": "group_test_uom", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "UOM", - "length": 0, - "no_copy": 0, - "options": "Lab Test UOM", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.template_or_new_line == 'Add new line'", - "fieldname": "group_test_normal_range", - "fieldtype": "Long Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Normal Range", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_8", - "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, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-09-04 09:49:24.817787", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Lab Test Groups", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 0, - "track_seen": 0, - "track_views": 0 -} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js index c3eedbbdf1..2e41f518f0 100644 --- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js @@ -1,25 +1,25 @@ // Copyright (c) 2016, ESS // License: ESS license.txt -frappe.ui.form.on("Lab Test Template",{ +frappe.ui.form.on('Lab Test Template', { lab_test_name: function(frm) { if (!frm.doc.lab_test_code) - frm.set_value("lab_test_code", frm.doc.lab_test_name); + frm.set_value('lab_test_code', frm.doc.lab_test_name); if (!frm.doc.lab_test_description) - frm.set_value("lab_test_description", frm.doc.lab_test_name); + frm.set_value('lab_test_description', frm.doc.lab_test_name); }, - refresh: function(frm) { - // Restrict Special, Grouped type templates in Child TestGroups - frm.set_query("lab_test_template", "lab_test_groups", function() { + refresh : function(frm) { + // Restrict Special, Grouped type templates in Child Test Groups + frm.set_query('lab_test_template', 'lab_test_groups', function() { return { filters: { - lab_test_template_type: ['in',['Single','Compound']] + lab_test_template_type: ['in', ['Single','Compound']] } }; }); }, medical_code: function(frm) { - frm.set_query("medical_code", function() { + frm.set_query('medical_code', function() { return { filters: { medical_code_standard: frm.doc.medical_code_standard @@ -30,10 +30,10 @@ frappe.ui.form.on("Lab Test Template",{ }); cur_frm.cscript.custom_refresh = function(doc) { - cur_frm.set_df_property("lab_test_code", "read_only", doc.__islocal ? 0 : 1); + cur_frm.set_df_property('lab_test_code', 'read_only', doc.__islocal ? 0 : 1); if (!doc.__islocal) { - cur_frm.add_custom_button(__("Change Template Code"), function() { + cur_frm.add_custom_button(__('Change Template Code'), function() { change_template_code(doc); }); } @@ -41,12 +41,12 @@ cur_frm.cscript.custom_refresh = function(doc) { let change_template_code = function(doc) { let d = new frappe.ui.Dialog({ - title:__("Change Template Code"), + title:__('Change Template Code'), fields:[ { - "fieldtype": "Data", - "label": "Lab Test Template Code", - "fieldname": "lab_test_code", + 'fieldtype': 'Data', + 'label': 'Lab Test Template Code', + 'fieldname': 'lab_test_code', reqd: 1 } ], @@ -54,49 +54,44 @@ let change_template_code = function(doc) { let values = d.get_values(); if (values) { frappe.call({ - "method": "erpnext.healthcare.doctype.lab_test_template.lab_test_template.change_test_code_from_template", - "args": {lab_test_code: values.lab_test_code, doc: doc}, + 'method': 'erpnext.healthcare.doctype.lab_test_template.lab_test_template.change_test_code_from_template', + 'args': {lab_test_code: values.lab_test_code, doc: doc}, callback: function (data) { - frappe.set_route("Form", "Lab Test Template", data.message); + frappe.set_route('Form', 'Lab Test Template', data.message); } }); } d.hide(); }, - primary_action_label: __("Change Template Code") + primary_action_label: __('Change Template Code') }); d.show(); d.set_values({ - "lab_test_code": doc.lab_test_code + 'lab_test_code': doc.lab_test_code }); }; -frappe.ui.form.on("Lab Test Template", "lab_test_name", function(frm){ - +frappe.ui.form.on('Lab Test Template', 'lab_test_name', function(frm) { frm.doc.change_in_item = 1; - -}); -frappe.ui.form.on("Lab Test Template", "lab_test_rate", function(frm){ - - frm.doc.change_in_item = 1; - -}); -frappe.ui.form.on("Lab Test Template", "lab_test_group", function(frm){ - - frm.doc.change_in_item = 1; - -}); -frappe.ui.form.on("Lab Test Template", "lab_test_description", function(frm){ - - frm.doc.change_in_item = 1; - }); -frappe.ui.form.on("Lab Test Groups", "template_or_new_line", function (frm, cdt, cdn) { +frappe.ui.form.on('Lab Test Template', 'lab_test_rate', function(frm) { + frm.doc.change_in_item = 1; +}); + +frappe.ui.form.on('Lab Test Template', 'lab_test_group', function(frm) { + frm.doc.change_in_item = 1; +}); + +frappe.ui.form.on('Lab Test Template', 'lab_test_description', function(frm) { + frm.doc.change_in_item = 1; +}); + +frappe.ui.form.on('Lab Test Groups', 'template_or_new_line', function (frm, cdt, cdn) { let child = locals[cdt][cdn]; - if (child.template_or_new_line == "Add new line") { - frappe.model.set_value(cdt, cdn, 'lab_test_template', ""); - frappe.model.set_value(cdt, cdn, 'lab_test_description', ""); + if (child.template_or_new_line == 'Add New Line') { + frappe.model.set_value(cdt, cdn, 'lab_test_template', ''); + frappe.model.set_value(cdt, cdn, 'lab_test_description', ''); } }); diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json index ebd2ec0246..db64297269 100644 --- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json +++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json @@ -15,31 +15,38 @@ "lab_test_group", "department", "column_break_3", - "lab_test_template_type", "disabled", + "lab_test_template_type", "is_billable", "lab_test_rate", - "medical_coding_section", - "medical_code_standard", - "medical_code", + "section_break_description", + "lab_test_description", "section_break_normal", "lab_test_uom", - "lab_test_normal_range", + "secondary_uom", + "conversion_factor", "column_break_10", + "lab_test_normal_range", "section_break_compound", "normal_test_templates", "section_break_special", "sensitivity", - "special_test_template", + "descriptive_test_templates", "section_break_group", "lab_test_groups", - "section_break_description", - "lab_test_description", + "medical_coding_section", + "medical_code_standard", + "medical_code", "sb_sample_collection", "sample", "sample_uom", "sample_qty", "sample_details", + "worksheet_section", + "worksheet_instructions", + "result_legend_section", + "legend_print_position", + "result_legend", "change_in_item" ], "fields": [ @@ -95,7 +102,7 @@ "fieldtype": "Column Break" }, { - "description": "Single for results which require only a single input, result UOM and normal value \n
\nCompound for results which require multiple input fields with corresponding event names, result UOMs and normal values\n
\nDescriptive for tests which have multiple result components and corresponding result entry fields. \n
\nGrouped for test templates which are a group of other test templates.\n
\nNo Result for tests with no results. Also, no Lab Test is created. e.g.. Sub Tests for Grouped results.", + "description": "Single: Results which require only a single input.\n
\nCompound: Results which require multiple event inputs.\n
\nDescriptive: Tests which have multiple result components with manual result entry.\n
\nGrouped: Test templates which are a group of other test templates.\n
\nNo Result: Tests with no results, can be ordered and billed but no Lab Test will be created. e.g.. Sub Tests for Grouped results", "fieldname": "lab_test_template_type", "fieldtype": "Select", "in_standard_filter": 1, @@ -120,6 +127,24 @@ "label": "Rate", "mandatory_depends_on": "eval:doc.is_billable == 1" }, + { + "fieldname": "medical_coding_section", + "fieldtype": "Section Break", + "label": "Medical Coding" + }, + { + "depends_on": "medical_code_standard", + "fieldname": "medical_code", + "fieldtype": "Link", + "label": "Medical Code", + "options": "Medical Code" + }, + { + "fieldname": "medical_code_standard", + "fieldtype": "Link", + "label": "Medical Code Standard", + "options": "Medical Code Standard" + }, { "depends_on": "eval:doc.lab_test_template_type == 'Single'", "fieldname": "section_break_normal", @@ -159,7 +184,7 @@ "depends_on": "eval:doc.lab_test_template_type == 'Descriptive'", "fieldname": "section_break_special", "fieldtype": "Section Break", - "label": "Special" + "label": "Descriptive" }, { "default": "0", @@ -167,11 +192,6 @@ "fieldtype": "Check", "label": "Sensitivity" }, - { - "fieldname": "special_test_template", - "fieldtype": "Table", - "options": "Special Test Template" - }, { "depends_on": "eval:doc.lab_test_template_type == 'Grouped'", "fieldname": "section_break_group", @@ -181,20 +201,23 @@ { "fieldname": "lab_test_groups", "fieldtype": "Table", - "options": "Lab Test Groups" + "options": "Lab Test Group Template" }, { + "collapsible": 1, "fieldname": "section_break_description", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Description " }, { "fieldname": "lab_test_description", - "fieldtype": "Text", + "fieldtype": "Text Editor", "ignore_xss_filter": 1, "label": "Description", "no_copy": 1 }, { + "collapsible": 1, "fieldname": "sb_sample_collection", "fieldtype": "Section Break", "label": "Sample Collection" @@ -237,32 +260,61 @@ }, { "fieldname": "sample_details", - "fieldtype": "Text", + "fieldtype": "Small Text", "ignore_xss_filter": 1, "label": "Collection Details" }, { "collapsible": 1, - "fieldname": "medical_coding_section", + "description": "Information to help easily interpret the test report, will be printed as part of the Lab Test result.", + "fieldname": "result_legend_section", "fieldtype": "Section Break", - "label": "Medical Coding" + "label": "Result Legend Print" }, { - "depends_on": "medical_code_standard", - "fieldname": "medical_code", - "fieldtype": "Link", - "label": "Medical Code", - "options": "Medical Code" + "fieldname": "result_legend", + "fieldtype": "Text Editor", + "label": "Result Legend" }, { - "fieldname": "medical_code_standard", + "fieldname": "legend_print_position", + "fieldtype": "Select", + "label": "Print Position", + "options": "Bottom\nTop\nBoth" + }, + { + "fieldname": "secondary_uom", "fieldtype": "Link", - "label": "Medical Code Standard", - "options": "Medical Code Standard" + "label": "Secondary UOM", + "options": "Lab Test UOM" + }, + { + "depends_on": "secondary_uom", + "fieldname": "conversion_factor", + "fieldtype": "Float", + "label": "Conversion Factor", + "mandatory_depends_on": "secondary_uom" + }, + { + "description": "Instructions to be printed on the worksheet", + "fieldname": "worksheet_instructions", + "fieldtype": "Text Editor", + "label": "Worksheet Instructions" + }, + { + "collapsible": 1, + "fieldname": "worksheet_section", + "fieldtype": "Section Break", + "label": "Worksheet Print" + }, + { + "fieldname": "descriptive_test_templates", + "fieldtype": "Table", + "options": "Descriptive Test Template" } ], "links": [], - "modified": "2020-06-29 14:07:20.772219", + "modified": "2020-07-13 12:57:09.925436", "modified_by": "Administrator", "module": "Healthcare", "name": "Lab Test Template", diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py index 3521561f34..6f0d08cf85 100644 --- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py @@ -14,37 +14,37 @@ class LabTestTemplate(Document): create_item_from_template(self) def validate(self): + if self.is_billable and (not self.lab_test_rate or self.lab_test_rate <= 0.0): + frappe.throw(_("Standard Selling Rate should be greater than zero.")) + self.validate_conversion_factor() self.enable_disable_item() def on_update(self): - # if change_in_item update Item and Price List + # If change_in_item update Item and Price List if self.change_in_item and self.is_billable and self.item: self.update_item() item_price = self.item_price_exists() if not item_price: - if self.lab_test_rate != 0.0: - price_list_name = frappe.db.get_value("Price List", {"selling": 1}) - if self.lab_test_rate: - make_item_price(self.lab_test_code, price_list_name, self.lab_test_rate) - else: - make_item_price(self.lab_test_code, price_list_name, 0.0) + if self.lab_test_rate and self.lab_test_rate > 0.0: + price_list_name = frappe.db.get_value('Price List', {'selling': 1}) + make_item_price(self.lab_test_code, price_list_name, self.lab_test_rate) else: - frappe.db.set_value("Item Price", item_price, "price_list_rate", self.lab_test_rate) + frappe.db.set_value('Item Price', item_price, 'price_list_rate', self.lab_test_rate) - frappe.db.set_value(self.doctype, self.name, "change_in_item", 0) + self.db_set('change_in_item', 0) elif not self.is_billable and self.item: - frappe.db.set_value("Item", self.item, "disabled", 1) + frappe.db.set_value('Item', self.item, 'disabled', 1) self.reload() def on_trash(self): - # remove template reference from item and disable item + # Remove template reference from item and disable item if self.item: try: - frappe.delete_doc("Item", self.item) + frappe.delete_doc('Item', self.item) except Exception: - frappe.throw(_("Not permitted. Please disable the Lab Test Template")) + frappe.throw(_('Not permitted. Please disable the Lab Test Template')) def enable_disable_item(self): if self.is_billable: @@ -54,78 +54,86 @@ class LabTestTemplate(Document): frappe.db.set_value('Item', self.item, 'disabled', 0) def update_item(self): - item = frappe.get_doc("Item", self.item) + item = frappe.get_doc('Item', self.item) if item: item.update({ - "item_name": self.lab_test_name, - "item_group": self.lab_test_group, - "disabled": 0, - "standard_rate": self.lab_test_rate, - "description": self.lab_test_description + 'item_name': self.lab_test_name, + 'item_group': self.lab_test_group, + 'disabled': 0, + 'standard_rate': self.lab_test_rate, + 'description': self.lab_test_description }) item.save() def item_price_exists(self): - item_price = frappe.db.exists({"doctype": "Item Price", "item_code": self.lab_test_code}) + item_price = frappe.db.exists({'doctype': 'Item Price', 'item_code': self.lab_test_code}) if item_price: return item_price[0][0] else: return False + def validate_conversion_factor(self): + if self.lab_test_template_type == "Single" and self.secondary_uom and not self.conversion_factor: + frappe.throw(_("Conversion Factor is mandatory")) + if self.lab_test_template_type == "Compound": + for item in self.normal_test_templates: + if item.secondary_uom and not item.conversion_factor: + frappe.throw(_("Conversion Factor is mandatory")) + if self.lab_test_template_type == "Grouped": + for group in self.lab_test_groups: + if group.template_or_new_line == "Add New Line" and group.secondary_uom and not group.conversion_factor: + frappe.throw(_("Conversion Factor is mandatory")) + def create_item_from_template(doc): - disabled = doc.disabled - if doc.is_billable and not doc.disabled: - disabled = 0 - uom = frappe.db.exists('UOM', 'Unit') or frappe.db.get_single_value('Stock Settings', 'stock_uom') - # insert item + # Insert item item = frappe.get_doc({ - "doctype": "Item", - "item_code": doc.lab_test_code, - "item_name":doc.lab_test_name, - "item_group": doc.lab_test_group, - "description":doc.lab_test_description, - "is_sales_item": 1, - "is_service_item": 1, - "is_purchase_item": 0, - "is_stock_item": 0, - "show_in_website": 0, - "is_pro_applicable": 0, - "disabled": disabled, - "stock_uom": uom - }).insert(ignore_permissions=True, ignore_mandatory=True) + 'doctype': 'Item', + 'item_code': doc.lab_test_code, + 'item_name':doc.lab_test_name, + 'item_group': doc.lab_test_group, + 'description':doc.lab_test_description, + 'is_sales_item': 1, + 'is_service_item': 1, + 'is_purchase_item': 0, + 'is_stock_item': 0, + 'include_item_in_manufacturing': 0, + 'show_in_website': 0, + 'is_pro_applicable': 0, + 'disabled': 0 if doc.is_billable and not doc.disabled else doc.disabled, + 'stock_uom': uom + }).insert(ignore_permissions = True, ignore_mandatory = True) - # insert item price - # get item price list to insert item price - if doc.lab_test_rate != 0.0: - price_list_name = frappe.db.get_value("Price List", {"selling": 1}) + # Insert item price + if doc.is_billable and doc.lab_test_rate != 0.0: + price_list_name = frappe.db.get_value('Price List', {'selling': 1}) if doc.lab_test_rate: make_item_price(item.name, price_list_name, doc.lab_test_rate) else: make_item_price(item.name, price_list_name, 0.0) # Set item in the template - frappe.db.set_value("Lab Test Template", doc.name, "item", item.name) + frappe.db.set_value('Lab Test Template', doc.name, 'item', item.name) doc.reload() 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(ignore_permissions=True, ignore_mandatory=True) + 'doctype': 'Item Price', + 'price_list': price_list_name, + 'item_code': item, + 'price_list_rate': item_price + }).insert(ignore_permissions = True, ignore_mandatory = True) @frappe.whitelist() def change_test_code_from_template(lab_test_code, doc): doc = frappe._dict(json.loads(doc)) - if frappe.db.exists({ "doctype": "Item", "item_code": lab_test_code}): - frappe.throw(_("Lab Test Item {0} already exist").format(lab_test_code)) + if frappe.db.exists({'doctype': 'Item', 'item_code': lab_test_code}): + frappe.throw(_('Lab Test Item {0} already exist').format(lab_test_code)) else: - rename_doc("Item", doc.name, lab_test_code, ignore_permissions=True) - frappe.db.set_value("Lab Test Template", doc.name, "lab_test_code", lab_test_code) - frappe.db.set_value("Lab Test Template", doc.name, "lab_test_name", lab_test_code) - rename_doc("Lab Test Template", doc.name, lab_test_code, ignore_permissions=True) - return lab_test_code \ No newline at end of file + rename_doc('Item', doc.name, lab_test_code, ignore_permissions = True) + frappe.db.set_value('Lab Test Template', doc.name, 'lab_test_code', lab_test_code) + frappe.db.set_value('Lab Test Template', doc.name, 'lab_test_name', lab_test_code) + rename_doc('Lab Test Template', doc.name, lab_test_code, ignore_permissions = True) + return lab_test_code diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template_list.js b/erpnext/healthcare/doctype/lab_test_template/lab_test_template_list.js index a86075fc94..a3417ebdfc 100644 --- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template_list.js +++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template_list.js @@ -2,6 +2,6 @@ (c) ESS 2015-16 */ frappe.listview_settings['Lab Test Template'] = { - add_fields: ["lab_test_name", "lab_test_code", "lab_test_rate"], - filters: [["disabled", "=", 0]] + add_fields: ['lab_test_name', 'lab_test_code', 'lab_test_rate'], + filters: [['disabled', '=', 0]] }; diff --git a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.js b/erpnext/healthcare/doctype/normal_test_items/normal_test_items.js deleted file mode 100644 index 0371ddd5c9..0000000000 --- a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.js +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) 2016, ESS -// License: ESS license.txt - - diff --git a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.json b/erpnext/healthcare/doctype/normal_test_items/normal_test_items.json deleted file mode 100644 index a7a952b8cd..0000000000 --- a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.json +++ /dev/null @@ -1,301 +0,0 @@ -{ - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-02-22 15:06:08.295224", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Test Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_event", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Event", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.require_result_value == 1 ", - "fieldname": "result_value", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Result Value", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_uom", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "UOM", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "normal_range", - "fieldtype": "Long Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Normal Range", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_comment", - "fieldtype": "Data", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Comment", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "require_result_value", - "fieldtype": "Check", - "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": "Require Result Value", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "template", - "fieldtype": "Link", - "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": "Template", - "length": 0, - "no_copy": 0, - "options": "Lab Test Template", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-09-04 11:42:43.095726", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Normal Test Items", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 0, - "track_seen": 0, - "track_views": 0 -} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/normal_test_result/__init__.py b/erpnext/healthcare/doctype/normal_test_result/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/normal_test_result/normal_test_result.json b/erpnext/healthcare/doctype/normal_test_result/normal_test_result.json new file mode 100644 index 0000000000..c8f43d3a54 --- /dev/null +++ b/erpnext/healthcare/doctype/normal_test_result/normal_test_result.json @@ -0,0 +1,186 @@ +{ + "actions": [], + "allow_copy": 1, + "beta": 1, + "creation": "2016-02-22 15:06:08.295224", + "doctype": "DocType", + "document_type": "Document", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "lab_test_name", + "lab_test_event", + "result_value", + "lab_test_uom", + "secondary_uom_result", + "secondary_uom", + "conversion_factor", + "column_break_10", + "allow_blank", + "normal_range", + "lab_test_comment", + "bold", + "italic", + "underline", + "template", + "require_result_value" + ], + "fields": [ + { + "fieldname": "lab_test_name", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Test Name", + "read_only": 1 + }, + { + "fieldname": "lab_test_event", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Event", + "read_only": 1 + }, + { + "depends_on": "eval:doc.require_result_value", + "fieldname": "result_value", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Result Value" + }, + { + "depends_on": "eval:doc.require_result_value", + "fieldname": "lab_test_uom", + "fieldtype": "Link", + "label": "UOM", + "options": "Lab Test UOM", + "read_only": 1 + }, + { + "depends_on": "eval:doc.require_result_value", + "fieldname": "normal_range", + "fieldtype": "Long Text", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Normal Range", + "read_only": 1 + }, + { + "depends_on": "eval:doc.require_result_value", + "fieldname": "lab_test_comment", + "fieldtype": "Data", + "hidden": 1, + "in_list_view": 1, + "label": "Comment", + "no_copy": 1, + "print_hide": 1, + "report_hide": 1 + }, + { + "fieldname": "template", + "fieldtype": "Link", + "hidden": 1, + "label": "Template", + "options": "Lab Test Template", + "print_hide": 1, + "report_hide": 1 + }, + { + "depends_on": "eval:doc.require_result_value", + "fieldname": "secondary_uom", + "fieldtype": "Link", + "label": "Secondary UOM", + "options": "Lab Test UOM", + "print_hide": 1, + "read_only": 1 + }, + { + "depends_on": "secondary_uom", + "fieldname": "conversion_factor", + "fieldtype": "Float", + "label": "Conversion Factor", + "mandatory_depends_on": "secondary_uom", + "print_hide": 1, + "read_only": 1 + }, + { + "depends_on": "eval:doc.require_result_value && doc.result_value", + "fieldname": "secondary_uom_result", + "fieldtype": "Data", + "label": "Secondary UOM Result", + "no_copy": 1, + "print_hide": 1, + "read_only": 1 + }, + { + "allow_on_submit": 1, + "default": "0", + "depends_on": "eval:doc.require_result_value", + "fieldname": "bold", + "fieldtype": "Check", + "label": "Bold", + "no_copy": 1, + "print_hide": 1, + "report_hide": 1 + }, + { + "allow_on_submit": 1, + "default": "0", + "depends_on": "eval:doc.require_result_value", + "fieldname": "italic", + "fieldtype": "Check", + "label": "Italic", + "no_copy": 1, + "print_hide": 1, + "report_hide": 1 + }, + { + "allow_on_submit": 1, + "default": "0", + "depends_on": "eval:doc.require_result_value", + "fieldname": "underline", + "fieldtype": "Check", + "label": "Underline", + "no_copy": 1, + "print_hide": 1, + "report_hide": 1 + }, + { + "fieldname": "column_break_10", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "require_result_value", + "fieldtype": "Check", + "hidden": 1, + "label": "Require Result Value", + "print_hide": 1, + "read_only": 1, + "report_hide": 1 + }, + { + "default": "1", + "depends_on": "eval:doc.require_result_value", + "fieldname": "allow_blank", + "fieldtype": "Check", + "label": "Allow Blank", + "print_hide": 1, + "read_only": 1, + "report_hide": 1 + } + ], + "istable": 1, + "links": [], + "modified": "2020-07-08 16:03:17.522893", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Normal Test Result", + "owner": "Administrator", + "permissions": [], + "restrict_to_domain": "Healthcare", + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.py b/erpnext/healthcare/doctype/normal_test_result/normal_test_result.py similarity index 85% rename from erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.py rename to erpnext/healthcare/doctype/normal_test_result/normal_test_result.py index c67531c179..63abf0297e 100644 --- a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.py +++ b/erpnext/healthcare/doctype/normal_test_result/normal_test_result.py @@ -5,5 +5,5 @@ from __future__ import unicode_literals from frappe.model.document import Document -class LabTestGroups(Document): +class NormalTestResult(Document): pass diff --git a/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json b/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json index a36c28d070..8dd6476ea8 100644 --- a/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json +++ b/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json @@ -1,202 +1,84 @@ { - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-02-22 16:09:54.310628", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 1, + "actions": [], + "allow_copy": 1, + "beta": 1, + "creation": "2016-02-22 16:09:54.310628", + "doctype": "DocType", + "document_type": "Setup", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "heading_text", + "lab_test_event", + "allow_blank", + "lab_test_uom", + "secondary_uom", + "conversion_factor", + "column_break_5", + "normal_range" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "heading_text", - "fieldtype": "Heading", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Test", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "heading_text", + "fieldtype": "Heading", + "ignore_xss_filter": 1, + "label": "Test" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_event", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Event", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "lab_test_event", + "fieldtype": "Data", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Event" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_uom", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "UOM", - "length": 0, - "no_copy": 0, - "options": "Lab Test UOM", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "lab_test_uom", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "in_list_view": 1, + "label": "UOM", + "options": "Lab Test UOM" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "normal_range", - "fieldtype": "Long Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Normal Range", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "normal_range", + "fieldtype": "Long Text", + "ignore_xss_filter": 1, + "in_list_view": 1, + "label": "Normal Range" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 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, - "translatable": 0, - "unique": 0 + "fieldname": "column_break_5", + "fieldtype": "Column Break" + }, + { + "fieldname": "secondary_uom", + "fieldtype": "Link", + "label": "Secondary UOM", + "options": "Lab Test UOM" + }, + { + "depends_on": "secondary_uom", + "fieldname": "conversion_factor", + "fieldtype": "Float", + "label": "Conversion Factor", + "mandatory_depends_on": "secondary_uom" + }, + { + "default": "0", + "fieldname": "allow_blank", + "fieldtype": "Check", + "label": "Allow Blank" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-09-04 11:42:30.766950", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Normal Test Template", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 0, - "track_seen": 0, - "track_views": 0 + ], + "istable": 1, + "links": [], + "modified": "2020-06-23 13:28:40.156224", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Normal Test Template", + "owner": "Administrator", + "permissions": [], + "restrict_to_domain": "Healthcare", + "sort_field": "modified", + "sort_order": "DESC" } \ No newline at end of file diff --git a/erpnext/healthcare/doctype/organism/__init__.py b/erpnext/healthcare/doctype/organism/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/organism/organism.js b/erpnext/healthcare/doctype/organism/organism.js new file mode 100644 index 0000000000..fbcb0942e9 --- /dev/null +++ b/erpnext/healthcare/doctype/organism/organism.js @@ -0,0 +1,5 @@ +// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Organism', { +}); diff --git a/erpnext/healthcare/doctype/organism/organism.json b/erpnext/healthcare/doctype/organism/organism.json new file mode 100644 index 0000000000..88a7686777 --- /dev/null +++ b/erpnext/healthcare/doctype/organism/organism.json @@ -0,0 +1,152 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:organism", + "beta": 1, + "creation": "2019-09-06 16:29:07.797960", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "organism", + "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": "Organism", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 1 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "abbr", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Abbr", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 1 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2019-10-04 19:45:33.353753", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Organism", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Healthcare Administrator", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "search_fields": "organism, abbr", + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "organism", + "track_changes": 0, + "track_seen": 0, + "track_views": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/organism/organism.py b/erpnext/healthcare/doctype/organism/organism.py new file mode 100644 index 0000000000..1ead762c2f --- /dev/null +++ b/erpnext/healthcare/doctype/organism/organism.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 Organism(Document): + pass diff --git a/erpnext/healthcare/doctype/organism/test_organism.js b/erpnext/healthcare/doctype/organism/test_organism.js new file mode 100644 index 0000000000..d57e5536c6 --- /dev/null +++ b/erpnext/healthcare/doctype/organism/test_organism.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: Organism", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Organism + () => frappe.tests.make('Organism', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/erpnext/healthcare/doctype/organism/test_organism.py b/erpnext/healthcare/doctype/organism/test_organism.py new file mode 100644 index 0000000000..ecb96650e1 --- /dev/null +++ b/erpnext/healthcare/doctype/organism/test_organism.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt +from __future__ import unicode_literals +import unittest + +class TestOrganism(unittest.TestCase): + pass diff --git a/erpnext/healthcare/doctype/organism_test_item/__init__.py b/erpnext/healthcare/doctype/organism_test_item/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/organism_test_item/organism_test_item.json b/erpnext/healthcare/doctype/organism_test_item/organism_test_item.json new file mode 100644 index 0000000000..56d0a4d905 --- /dev/null +++ b/erpnext/healthcare/doctype/organism_test_item/organism_test_item.json @@ -0,0 +1,144 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 1, + "creation": "2019-09-06 16:37:59.698996", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "organism", + "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": "Organism", + "length": 0, + "no_copy": 0, + "options": "Organism", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "colony_population", + "fieldtype": "Small Text", + "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": "Colony Population", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "colony_uom", + "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": "Colony UOM", + "length": 0, + "no_copy": 0, + "options": "Lab Test UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2019-10-04 19:48:04.104234", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Organism Test Item", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 0, + "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, + "track_views": 0 +} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/organism_test_item/organism_test_item.py b/erpnext/healthcare/doctype/organism_test_item/organism_test_item.py new file mode 100644 index 0000000000..019a55b396 --- /dev/null +++ b/erpnext/healthcare/doctype/organism_test_item/organism_test_item.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 OrganismTestItem(Document): + pass diff --git a/erpnext/healthcare/doctype/organism_test_result/__init__.py b/erpnext/healthcare/doctype/organism_test_result/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/organism_test_result/organism_test_result.json b/erpnext/healthcare/doctype/organism_test_result/organism_test_result.json new file mode 100644 index 0000000000..8b238de4cd --- /dev/null +++ b/erpnext/healthcare/doctype/organism_test_result/organism_test_result.json @@ -0,0 +1,144 @@ +{ + "allow_copy": 0, + "allow_events_in_timeline": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 1, + "creation": "2019-09-06 16:37:59.698996", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "organism", + "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": "Organism", + "length": 0, + "no_copy": 0, + "options": "Organism", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "colony_population", + "fieldtype": "Small Text", + "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": "Colony Population", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fetch_if_empty": 0, + "fieldname": "colony_uom", + "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": "Colony UOM", + "length": 0, + "no_copy": 0, + "options": "Lab Test UOM", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2019-10-04 19:48:04.104234", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Organism Test Result", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 0, + "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, + "track_views": 0 +} \ No newline at end of file diff --git a/erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.py b/erpnext/healthcare/doctype/organism_test_result/organism_test_result.py similarity index 61% rename from erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.py rename to erpnext/healthcare/doctype/organism_test_result/organism_test_result.py index a2d488b2f8..02393c2700 100644 --- a/erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.py +++ b/erpnext/healthcare/doctype/organism_test_result/organism_test_result.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors +# Copyright (c) 2019, 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 POSClosingVoucherInvoices(Document): +class OrganismTestResult(Document): pass diff --git a/erpnext/healthcare/doctype/patient/patient.py b/erpnext/healthcare/doctype/patient/patient.py index 30a1e45f0e..63dd8d4793 100644 --- a/erpnext/healthcare/doctype/patient/patient.py +++ b/erpnext/healthcare/doctype/patient/patient.py @@ -172,3 +172,15 @@ def get_patient_detail(patient): if vital_sign: details.update(vital_sign[0]) return details + +def get_timeline_data(doctype, name): + """Return timeline data from medical records""" + return dict(frappe.db.sql(''' + SELECT + unix_timestamp(communication_date), count(*) + FROM + `tabPatient Medical Record` + WHERE + patient=%s + and `communication_date` > date_sub(curdate(), interval 1 year) + GROUP BY communication_date''', name)) diff --git a/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json b/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json index 15c94344e9..eb0021ff75 100644 --- a/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json +++ b/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json @@ -63,7 +63,8 @@ { "fieldname": "assessment_datetime", "fieldtype": "Datetime", - "label": "Assessment Datetime" + "label": "Assessment Datetime", + "reqd": 1 }, { "fieldname": "section_break_7", @@ -139,7 +140,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2020-05-25 14:38:38.302399", + "modified": "2020-06-25 00:25:13.208400", "modified_by": "Administrator", "module": "Healthcare", "name": "Patient Assessment", diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js index edcee99d4b..6353d19ef1 100644 --- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js @@ -220,7 +220,7 @@ var schedule_inpatient = function(frm) { } }, freeze: true, - freeze_message: 'Scheduling Patient Admission' + freeze_message: __('Scheduling Patient Admission') }); frm.refresh_fields(); dialog.hide(); diff --git a/erpnext/healthcare/doctype/sensitivity_test_items/sensitivity_test_items.json b/erpnext/healthcare/doctype/sensitivity_test_items/sensitivity_test_items.json deleted file mode 100644 index 86f5e26f0a..0000000000 --- a/erpnext/healthcare/doctype/sensitivity_test_items/sensitivity_test_items.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-02-22 15:18:01.769903", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "antibiotic", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Antibiotic", - "length": 0, - "no_copy": 0, - "options": "Antibiotic", - "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": "antibiotic_sensitivity", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Sensitivity", - "length": 0, - "no_copy": 0, - "options": "Sensitivity", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2017-10-05 11:08:06.327972", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Sensitivity Test Items", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "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/healthcare/doctype/sensitivity_test_result/__init__.py b/erpnext/healthcare/doctype/sensitivity_test_result/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.json b/erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.json new file mode 100644 index 0000000000..768c17710f --- /dev/null +++ b/erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.json @@ -0,0 +1,103 @@ +{ + "allow_copy": 1, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "beta": 1, + "creation": "2016-02-22 15:18:01.769903", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "Document", + "editable_grid": 1, + "fields": [ + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "antibiotic", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Antibiotic", + "length": 0, + "no_copy": 0, + "options": "Antibiotic", + "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": "antibiotic_sensitivity", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Sensitivity", + "length": 0, + "no_copy": 0, + "options": "Sensitivity", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2017-10-05 11:08:06.327972", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Sensitivity Test Result", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "quick_entry": 0, + "read_only": 0, + "read_only_onload": 0, + "restrict_to_domain": "Healthcare", + "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/healthcare/doctype/special_test_items/special_test_items.py b/erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.py similarity index 84% rename from erpnext/healthcare/doctype/special_test_items/special_test_items.py rename to erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.py index 17080b7e3b..64f1e6ca25 100644 --- a/erpnext/healthcare/doctype/special_test_items/special_test_items.py +++ b/erpnext/healthcare/doctype/sensitivity_test_result/sensitivity_test_result.py @@ -5,5 +5,5 @@ from __future__ import unicode_literals from frappe.model.document import Document -class SpecialTestItems(Document): +class SensitivityTestResult(Document): pass diff --git a/erpnext/healthcare/doctype/special_test_items/special_test_items.json b/erpnext/healthcare/doctype/special_test_items/special_test_items.json deleted file mode 100644 index a15806e8a5..0000000000 --- a/erpnext/healthcare/doctype/special_test_items/special_test_items.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-02-22 15:12:36.202380", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lab_test_particulars", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Particulars", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.require_result_value == 1", - "fieldname": "result_value", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Value", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "", - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0, - "width": "" - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "require_result_value", - "fieldtype": "Check", - "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": "Require Result Value", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "template", - "fieldtype": "Link", - "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": "Template", - "length": 0, - "no_copy": 0, - "options": "Lab Test Template", - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 1, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-09-04 12:01:18.801216", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Special Test Items", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 0, - "track_seen": 0, - "track_views": 0 -} \ No newline at end of file diff --git a/erpnext/healthcare/doctype/special_test_template/special_test_template.json b/erpnext/healthcare/doctype/special_test_template/special_test_template.json deleted file mode 100644 index 372af0a959..0000000000 --- a/erpnext/healthcare/doctype/special_test_template/special_test_template.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "allow_copy": 1, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 1, - "creation": "2016-02-22 16:12:12.394200", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 1, - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "particulars", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 1, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Result Component", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2017-10-04 16:20:09.565316", - "modified_by": "Administrator", - "module": "Healthcare", - "name": "Special Test Template", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "restrict_to_domain": "Healthcare", - "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/healthcare/doctype/special_test_template/special_test_template.py b/erpnext/healthcare/doctype/special_test_template/special_test_template.py deleted file mode 100644 index e4e0d5b7bd..0000000000 --- a/erpnext/healthcare/doctype/special_test_template/special_test_template.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2015, ESS and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -from frappe.model.document import Document - -class SpecialTestTemplate(Document): - pass diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py index c19be17ba8..e0f015f3d7 100644 --- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py +++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe.utils import today class TherapyPlan(Document): def validate(self): @@ -45,4 +46,6 @@ def make_therapy_session(therapy_plan, patient, therapy_type): therapy_session.rate = therapy_type.rate therapy_session.exercises = therapy_type.exercises + if frappe.flags.in_test: + therapy_session.start_date = today() return therapy_session.as_dict() \ No newline at end of file diff --git a/erpnext/healthcare/doctype/therapy_session/therapy_session.json b/erpnext/healthcare/doctype/therapy_session/therapy_session.json index c75d9342ef..dc0cafcf9c 100644 --- a/erpnext/healthcare/doctype/therapy_session/therapy_session.json +++ b/erpnext/healthcare/doctype/therapy_session/therapy_session.json @@ -154,7 +154,8 @@ { "fieldname": "start_date", "fieldtype": "Date", - "label": "Start Date" + "label": "Start Date", + "reqd": 1 }, { "fieldname": "start_time", @@ -219,7 +220,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2020-06-29 14:33:34.836594", + "modified": "2020-06-30 10:56:10.354268", "modified_by": "Administrator", "module": "Healthcare", "name": "Therapy Session", diff --git a/erpnext/healthcare/healthcare_dashboard/healthcare/healthcare.json b/erpnext/healthcare/healthcare_dashboard/healthcare/healthcare.json new file mode 100644 index 0000000000..2fea6682ed --- /dev/null +++ b/erpnext/healthcare/healthcare_dashboard/healthcare/healthcare.json @@ -0,0 +1,62 @@ +{ + "cards": [ + { + "card": "Total Patients" + }, + { + "card": "Total Patients Admitted" + }, + { + "card": "Open Appointments" + }, + { + "card": "Appointments to Bill" + } + ], + "charts": [ + { + "chart": "Patient Appointments", + "width": "Full" + }, + { + "chart": "In-Patient Status", + "width": "Half" + }, + { + "chart": "Clinical Procedures Status", + "width": "Half" + }, + { + "chart": "Lab Tests", + "width": "Half" + }, + { + "chart": "Clinical Procedures", + "width": "Half" + }, + { + "chart": "Symptoms", + "width": "Half" + }, + { + "chart": "Diagnoses", + "width": "Half" + }, + { + "chart": "Department wise Patient Appointments", + "width": "Full" + } + ], + "creation": "2020-07-14 18:17:54.823311", + "dashboard_name": "Healthcare", + "docstatus": 0, + "doctype": "Dashboard", + "idx": 0, + "is_default": 0, + "is_standard": 1, + "modified": "2020-07-22 15:36:34.220387", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Healthcare", + "owner": "Administrator" +} \ No newline at end of file diff --git a/erpnext/healthcare/number_card/appointments_to_bill/appointments_to_bill.json b/erpnext/healthcare/number_card/appointments_to_bill/appointments_to_bill.json new file mode 100644 index 0000000000..3e4d4e27df --- /dev/null +++ b/erpnext/healthcare/number_card/appointments_to_bill/appointments_to_bill.json @@ -0,0 +1,21 @@ +{ + "creation": "2020-07-14 18:17:54.792773", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Patient Appointment", + "dynamic_filters_json": "[[\"Patient Appointment\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]", + "filters_json": "[[\"Patient Appointment\",\"invoiced\",\"=\",0,false]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Appointments To Bill", + "modified": "2020-07-22 13:27:58.038577", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Appointments to Bill", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/healthcare/number_card/open_appointments/open_appointments.json b/erpnext/healthcare/number_card/open_appointments/open_appointments.json new file mode 100644 index 0000000000..8d121cc58a --- /dev/null +++ b/erpnext/healthcare/number_card/open_appointments/open_appointments.json @@ -0,0 +1,21 @@ +{ + "creation": "2020-07-14 18:17:54.771092", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Patient Appointment", + "dynamic_filters_json": "[[\"Patient Appointment\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]", + "filters_json": "[[\"Patient Appointment\",\"status\",\"=\",\"Open\",false]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Open Appointments", + "modified": "2020-07-22 13:27:09.542122", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Open Appointments", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/healthcare/number_card/total_patients/total_patients.json b/erpnext/healthcare/number_card/total_patients/total_patients.json new file mode 100644 index 0000000000..75441a6842 --- /dev/null +++ b/erpnext/healthcare/number_card/total_patients/total_patients.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-14 18:17:54.727946", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Patient", + "filters_json": "[[\"Patient\",\"status\",\"=\",\"Active\",false]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Patients", + "modified": "2020-07-22 13:26:02.643534", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Total Patients", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/healthcare/number_card/total_patients_admitted/total_patients_admitted.json b/erpnext/healthcare/number_card/total_patients_admitted/total_patients_admitted.json new file mode 100644 index 0000000000..69a967df93 --- /dev/null +++ b/erpnext/healthcare/number_card/total_patients_admitted/total_patients_admitted.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-14 18:17:54.749754", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Patient", + "filters_json": "[[\"Patient\",\"inpatient_status\",\"=\",\"Admitted\",false]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Patients Admitted", + "modified": "2020-07-22 13:26:20.027788", + "modified_by": "Administrator", + "module": "Healthcare", + "name": "Total Patients Admitted", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/healthcare/page/patient_progress/__init__.py b/erpnext/healthcare/page/patient_progress/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/healthcare/page/patient_progress/patient_progress.css b/erpnext/healthcare/page/patient_progress/patient_progress.css new file mode 100644 index 0000000000..5d85a7487f --- /dev/null +++ b/erpnext/healthcare/page/patient_progress/patient_progress.css @@ -0,0 +1,165 @@ +/* sidebar */ + +.layout-side-section .frappe-control[data-fieldname='patient'] { + max-width: 300px; +} + +.patient-image-container { + margin-top: 17px; +} + +.patient-image { + display: inline-block; + width: 100%; + height: 0; + padding: 50% 0px; + background-size: cover; + background-repeat: no-repeat; + background-position: center center; + border-radius: 4px; +} + +.patient-details { + margin: -5px 5px; +} + +.important-links { + margin: 30px 5px; +} + +.patient-name { + font-size: 20px; +} + +/* heatmap */ + +.heatmap-container { + height: 170px; +} + +.patient-heatmap { + width: 80%; + display: inline-block; +} + +.patient-heatmap .chart-container { + margin-left: 30px; +} + +.patient-heatmap .frappe-chart { + margin-top: 5px; +} + +.patient-heatmap .frappe-chart .chart-legend { + display: none; +} + +.heatmap-container .chart-filter { + position: relative; + top: 5px; + margin-right: 10px; +} + +/* percentage chart */ + +.percentage-chart-container { + height: 130px; +} + +.percentage-chart-container .chart-filter { + position: relative; + top: 5px; + margin-right: 10px; +} + +.therapy-session-percentage-chart .frappe-chart { + position: absolute; + top: 5px; +} + +/* line charts */ + +.date-field .clearfix { + display: none; +} + +.date-field .help-box { + display: none; +} + +.date-field .frappe-control { + margin-bottom: 0px !important; +} + +.date-field .form-group { + margin-bottom: 0px !important; +} + +/* common */ + +text.title { + text-transform: uppercase; + font-size: 11px; + margin-left: 20px; + margin-top: 20px; + display: block; +} + +.chart-filter-search { + margin-left: 35px; + width: 25%; +} + +.chart-column-container { + border-bottom: 1px solid #d1d8dd; + margin: 5px 0; +} + +.line-chart-container .frappe-chart { + margin-top: -20px; +} + +.line-chart-container { + margin-bottom: 20px; +} + +.chart-control { + align-self: center; + display: flex; + flex-direction: row-reverse; + margin-top: -25px; +} + +.chart-control > * { + margin-right: 10px; +} + +/* mobile */ + +@media (max-width: 991px) { + .patient-progress-sidebar { + display: flex; + } + + .percentage-chart-container { + border-top: 1px solid #d1d8dd; + } + + .percentage-chart-container .chart-filter { + position: relative; + top: 12px; + margin-right: 10px; + } + + .patient-progress-sidebar .important-links { + margin: 0; + } + + .patient-progress-sidebar .patient-details { + width: 50%; + } + + .chart-filter-search { + width: 40%; + } +} diff --git a/erpnext/healthcare/page/patient_progress/patient_progress.html b/erpnext/healthcare/page/patient_progress/patient_progress.html new file mode 100644 index 0000000000..c20537ea81 --- /dev/null +++ b/erpnext/healthcare/page/patient_progress/patient_progress.html @@ -0,0 +1,68 @@ +
+
\ No newline at end of file
diff --git a/erpnext/healthcare/page/patient_progress/patient_progress.js b/erpnext/healthcare/page/patient_progress/patient_progress.js
new file mode 100644
index 0000000000..2410b0ce84
--- /dev/null
+++ b/erpnext/healthcare/page/patient_progress/patient_progress.js
@@ -0,0 +1,531 @@
+frappe.pages['patient-progress'].on_page_load = function(wrapper) {
+
+ frappe.ui.make_app_page({
+ parent: wrapper,
+ title: __('Patient Progress')
+ });
+
+ let patient_progress = new PatientProgress(wrapper);
+ $(wrapper).bind('show', ()=> {
+ patient_progress.show();
+ });
+};
+
+class PatientProgress {
+
+ constructor(wrapper) {
+ this.wrapper = $(wrapper);
+ this.page = wrapper.page;
+ this.sidebar = this.wrapper.find('.layout-side-section');
+ this.main_section = this.wrapper.find('.layout-main-section');
+ }
+
+ show() {
+ frappe.breadcrumbs.add('Healthcare');
+ this.sidebar.empty();
+
+ let me = this;
+ let patient = frappe.ui.form.make_control({
+ parent: me.sidebar,
+ df: {
+ fieldtype: 'Link',
+ options: 'Patient',
+ fieldname: 'patient',
+ placeholder: __('Select Patient'),
+ only_select: true,
+ change: () => {
+ me.patient_id = '';
+ if (me.patient_id != patient.get_value() && patient.get_value()) {
+ me.start = 0;
+ me.patient_id = patient.get_value();
+ me.make_patient_profile();
+ }
+ }
+ }
+ });
+ patient.refresh();
+
+ if (frappe.route_options && !this.patient) {
+ patient.set_value(frappe.route_options.patient);
+ this.patient_id = frappe.route_options.patient;
+ }
+
+ this.sidebar.find('[data-fieldname="patient"]').append('');
+ }
+
+ make_patient_profile() {
+ this.page.set_title(__('Patient Progress'));
+ this.main_section.empty().append(frappe.render_template('patient_progress'));
+ this.render_patient_details();
+ this.render_heatmap();
+ this.render_percentage_chart('therapy_type', 'Therapy Type Distribution');
+ this.create_percentage_chart_filters();
+ this.show_therapy_progress();
+ this.show_assessment_results();
+ this.show_therapy_assessment_correlation();
+ this.show_assessment_parameter_progress();
+ }
+
+ get_patient_info() {
+ return frappe.xcall('frappe.client.get', {
+ doctype: 'Patient',
+ name: this.patient_id
+ }).then((patient) => {
+ if (patient) {
+ this.patient = patient;
+ }
+ });
+ }
+
+ get_therapy_sessions_count() {
+ return frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_therapy_sessions_count', {
+ patient: this.patient_id,
+ }
+ ).then(data => {
+ if (data) {
+ this.total_therapy_sessions = data.total_therapy_sessions;
+ this.therapy_sessions_this_month = data.therapy_sessions_this_month;
+ }
+ });
+ }
+
+ render_patient_details() {
+ this.get_patient_info().then(() => {
+ this.get_therapy_sessions_count().then(() => {
+ $('.patient-info').empty().append(frappe.render_template('patient_progress_sidebar', {
+ patient_image: this.patient.image,
+ patient_name: this.patient.patient_name,
+ patient_gender: this.patient.sex,
+ patient_mobile: this.patient.mobile,
+ total_therapy_sessions: this.total_therapy_sessions,
+ therapy_sessions_this_month: this.therapy_sessions_this_month
+ }));
+
+ this.setup_patient_profile_links();
+ });
+ });
+ }
+
+ setup_patient_profile_links() {
+ this.wrapper.find('.patient-profile-link').on('click', () => {
+ frappe.set_route('Form', 'Patient', this.patient_id);
+ });
+
+ this.wrapper.find('.therapy-plan-link').on('click', () => {
+ frappe.route_options = {
+ 'patient': this.patient_id,
+ 'docstatus': 1
+ };
+ frappe.set_route('List', 'Therapy Plan');
+ });
+
+ this.wrapper.find('.patient-history').on('click', () => {
+ frappe.route_options = {
+ 'patient': this.patient_id
+ };
+ frappe.set_route('patient_history');
+ });
+ }
+
+ render_heatmap() {
+ this.heatmap = new frappe.Chart('.patient-heatmap', {
+ type: 'heatmap',
+ countLabel: 'Interactions',
+ data: {},
+ discreteDomains: 0
+ });
+ this.update_heatmap_data();
+ this.create_heatmap_chart_filters();
+ }
+
+ update_heatmap_data(date_from) {
+ frappe.xcall('erpnext.healthcare.page.patient_progress.patient_progress.get_patient_heatmap_data', {
+ patient: this.patient_id,
+ date: date_from || frappe.datetime.year_start(),
+ }).then((data) => {
+ this.heatmap.update( {dataPoints: data} );
+ });
+ }
+
+ create_heatmap_chart_filters() {
+ this.get_patient_info().then(() => {
+ let filters = [
+ {
+ label: frappe.dashboard_utils.get_year(frappe.datetime.now_date()),
+ options: frappe.dashboard_utils.get_years_since_creation(this.patient.creation),
+ action: (selected_item) => {
+ this.update_heatmap_data(frappe.datetime.obj_to_str(selected_item));
+ }
+ },
+ ];
+ frappe.dashboard_utils.render_chart_filters(filters, 'chart-filter', '.heatmap-container');
+ });
+ }
+
+ render_percentage_chart(field, title) {
+ frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_therapy_sessions_distribution_data', {
+ patient: this.patient_id,
+ field: field
+ }
+ ).then(chart => {
+ if (chart.labels.length) {
+ this.percentage_chart = new frappe.Chart('.therapy-session-percentage-chart', {
+ title: title,
+ type: 'percentage',
+ data: {
+ labels: chart.labels,
+ datasets: chart.datasets
+ },
+ truncateLegends: 1,
+ barOptions: {
+ height: 11,
+ depth: 1
+ },
+ height: 160,
+ maxSlices: 8,
+ colors: ['#5e64ff', '#743ee2', '#ff5858', '#ffa00a', '#feef72', '#28a745', '#98d85b', '#a9a7ac'],
+ });
+ } else {
+ this.wrapper.find('.percentage-chart-container').hide();
+ }
+ });
+ }
+
+ create_percentage_chart_filters() {
+ let filters = [
+ {
+ label: 'Therapy Type',
+ options: ['Therapy Type', 'Exercise Type'],
+ fieldnames: ['therapy_type', 'exercise_type'],
+ action: (selected_item, fieldname) => {
+ let title = selected_item + ' Distribution';
+ this.render_percentage_chart(fieldname, title);
+ }
+ },
+ ];
+ frappe.dashboard_utils.render_chart_filters(filters, 'chart-filter', '.percentage-chart-container');
+ }
+
+ create_time_span_filters(action_method, parent) {
+ let chart_control = $(parent).find('.chart-control');
+ let filters = [
+ {
+ label: 'Last Month',
+ options: ['Select Date Range', 'Last Week', 'Last Month', 'Last Quarter', 'Last Year'],
+ action: (selected_item) => {
+ if (selected_item === 'Select Date Range') {
+ this.render_date_range_fields(action_method, chart_control);
+ } else {
+ // hide date range field if visible
+ let date_field = $(parent).find('.date-field');
+ if (date_field.is(':visible')) {
+ date_field.hide();
+ }
+ this[action_method](selected_item);
+ }
+ }
+ }
+ ];
+ frappe.dashboard_utils.render_chart_filters(filters, 'chart-filter', chart_control, 1);
+ }
+
+ render_date_range_fields(action_method, parent) {
+ let date_field = $(parent).find('.date-field');
+
+ if (!date_field.length) {
+ let date_field_wrapper = $(
+ ``
+ ).appendTo(parent);
+
+ let date_range_field = frappe.ui.form.make_control({
+ df: {
+ fieldtype: 'DateRange',
+ fieldname: 'from_date',
+ placeholder: 'Date Range',
+ input_class: 'input-xs',
+ reqd: 1,
+ change: () => {
+ let selected_date_range = date_range_field.get_value();
+ if (selected_date_range && selected_date_range.length === 2) {
+ this[action_method](selected_date_range);
+ }
+ }
+ },
+ parent: date_field_wrapper,
+ render_input: 1
+ });
+ } else if (!date_field.is(':visible')) {
+ date_field.show();
+ }
+ }
+
+ show_therapy_progress() {
+ let me = this;
+ let therapy_type = frappe.ui.form.make_control({
+ parent: $('.therapy-type-search'),
+ df: {
+ fieldtype: 'Link',
+ options: 'Therapy Type',
+ fieldname: 'therapy_type',
+ placeholder: __('Select Therapy Type'),
+ only_select: true,
+ change: () => {
+ if (me.therapy_type != therapy_type.get_value() && therapy_type.get_value()) {
+ me.therapy_type = therapy_type.get_value();
+ me.render_therapy_progress_chart();
+ }
+ }
+ }
+ });
+ therapy_type.refresh();
+ this.create_time_span_filters('render_therapy_progress_chart', '.therapy-progress');
+ }
+
+ render_therapy_progress_chart(time_span='Last Month') {
+ if (!this.therapy_type) return;
+
+ frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_therapy_progress_data', {
+ patient: this.patient_id,
+ therapy_type: this.therapy_type,
+ time_span: time_span
+ }
+ ).then(chart => {
+ let data = {
+ labels: chart.labels,
+ datasets: chart.datasets
+ }
+ let parent = '.therapy-progress-line-chart';
+ if (!chart.labels.length) {
+ this.show_null_state(parent);
+ } else {
+ if (!this.therapy_line_chart) {
+ this.therapy_line_chart = new frappe.Chart(parent, {
+ type: 'axis-mixed',
+ height: 250,
+ data: data,
+ lineOptions: {
+ regionFill: 1
+ },
+ axisOptions: {
+ xIsSeries: 1
+ },
+ });
+ } else {
+ $(parent).find('.chart-container').show();
+ $(parent).find('.chart-empty-state').hide();
+ this.therapy_line_chart.update(data);
+ }
+ }
+ });
+ }
+
+ show_assessment_results() {
+ let me = this;
+ let assessment_template = frappe.ui.form.make_control({
+ parent: $('.assessment-template-search'),
+ df: {
+ fieldtype: 'Link',
+ options: 'Patient Assessment Template',
+ fieldname: 'assessment_template',
+ placeholder: __('Select Assessment Template'),
+ only_select: true,
+ change: () => {
+ if (me.assessment_template != assessment_template.get_value() && assessment_template.get_value()) {
+ me.assessment_template = assessment_template.get_value();
+ me.render_assessment_result_chart();
+ }
+ }
+ }
+ });
+ assessment_template.refresh();
+ this.create_time_span_filters('render_assessment_result_chart', '.assessment-results');
+ }
+
+ render_assessment_result_chart(time_span='Last Month') {
+ if (!this.assessment_template) return;
+
+ frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_patient_assessment_data', {
+ patient: this.patient_id,
+ assessment_template: this.assessment_template,
+ time_span: time_span
+ }
+ ).then(chart => {
+ let data = {
+ labels: chart.labels,
+ datasets: chart.datasets,
+ yMarkers: [
+ { label: 'Max Score', value: chart.max_score }
+ ],
+ }
+ let parent = '.assessment-results-line-chart';
+ if (!chart.labels.length) {
+ this.show_null_state(parent);
+ } else {
+ if (!this.assessment_line_chart) {
+ this.assessment_line_chart = new frappe.Chart(parent, {
+ type: 'axis-mixed',
+ height: 250,
+ data: data,
+ lineOptions: {
+ regionFill: 1
+ },
+ axisOptions: {
+ xIsSeries: 1
+ },
+ tooltipOptions: {
+ formatTooltipY: d => d + __(' out of ') + chart.max_score
+ }
+ });
+ } else {
+ $(parent).find('.chart-container').show();
+ $(parent).find('.chart-empty-state').hide();
+ this.assessment_line_chart.update(data);
+ }
+ }
+ });
+ }
+
+ show_therapy_assessment_correlation() {
+ let me = this;
+ let assessment = frappe.ui.form.make_control({
+ parent: $('.assessment-correlation-template-search'),
+ df: {
+ fieldtype: 'Link',
+ options: 'Patient Assessment Template',
+ fieldname: 'assessment',
+ placeholder: __('Select Assessment Template'),
+ only_select: true,
+ change: () => {
+ if (me.assessment != assessment.get_value() && assessment.get_value()) {
+ me.assessment = assessment.get_value();
+ me.render_therapy_assessment_correlation_chart();
+ }
+ }
+ }
+ });
+ assessment.refresh();
+ this.create_time_span_filters('render_therapy_assessment_correlation_chart', '.therapy-assessment-correlation');
+ }
+
+ render_therapy_assessment_correlation_chart(time_span='Last Month') {
+ if (!this.assessment) return;
+
+ frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_therapy_assessment_correlation_data', {
+ patient: this.patient_id,
+ assessment_template: this.assessment,
+ time_span: time_span
+ }
+ ).then(chart => {
+ let data = {
+ labels: chart.labels,
+ datasets: chart.datasets,
+ yMarkers: [
+ { label: 'Max Score', value: chart.max_score }
+ ],
+ }
+ let parent = '.therapy-assessment-correlation-chart';
+ if (!chart.labels.length) {
+ this.show_null_state(parent);
+ } else {
+ if (!this.correlation_chart) {
+ this.correlation_chart = new frappe.Chart(parent, {
+ type: 'axis-mixed',
+ height: 300,
+ data: data,
+ axisOptions: {
+ xIsSeries: 1
+ }
+ });
+ } else {
+ $(parent).find('.chart-container').show();
+ $(parent).find('.chart-empty-state').hide();
+ this.correlation_chart.update(data);
+ }
+ }
+ });
+ }
+
+ show_assessment_parameter_progress() {
+ let me = this;
+ let parameter = frappe.ui.form.make_control({
+ parent: $('.assessment-parameter-search'),
+ df: {
+ fieldtype: 'Link',
+ options: 'Patient Assessment Parameter',
+ fieldname: 'assessment',
+ placeholder: __('Select Assessment Parameter'),
+ only_select: true,
+ change: () => {
+ if (me.parameter != parameter.get_value() && parameter.get_value()) {
+ me.parameter = parameter.get_value();
+ me.render_assessment_parameter_progress_chart();
+ }
+ }
+ }
+ });
+ parameter.refresh();
+ this.create_time_span_filters('render_assessment_parameter_progress_chart', '.assessment-parameter-progress');
+ }
+
+ render_assessment_parameter_progress_chart(time_span='Last Month') {
+ if (!this.parameter) return;
+
+ frappe.xcall(
+ 'erpnext.healthcare.page.patient_progress.patient_progress.get_assessment_parameter_data', {
+ patient: this.patient_id,
+ parameter: this.parameter,
+ time_span: time_span
+ }
+ ).then(chart => {
+ let data = {
+ labels: chart.labels,
+ datasets: chart.datasets
+ }
+ let parent = '.assessment-parameter-progress-chart';
+ if (!chart.labels.length) {
+ this.show_null_state(parent);
+ } else {
+ if (!this.parameter_chart) {
+ this.parameter_chart = new frappe.Chart(parent, {
+ type: 'line',
+ height: 250,
+ data: data,
+ lineOptions: {
+ regionFill: 1
+ },
+ axisOptions: {
+ xIsSeries: 1
+ },
+ tooltipOptions: {
+ formatTooltipY: d => d + '%'
+ }
+ });
+ } else {
+ $(parent).find('.chart-container').show();
+ $(parent).find('.chart-empty-state').hide();
+ this.parameter_chart.update(data);
+ }
+ }
+ });
+ }
+
+ show_null_state(parent) {
+ let null_state = $(parent).find('.chart-empty-state');
+ if (null_state.length) {
+ $(null_state).show();
+ } else {
+ null_state = $(
+ `
+
+
+
+
+
+
+
+
+
+
+
+
+ Therapy Progress
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Assessment Results
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Therapy Type and Assessment Correlation
+
+
+
+
+
+
+
+
+
+
+
+
+ Assessment Parameter Wise Progress
+
+
+
+
+
+
+
+
+
+ ${__(
+ "No Data..."
+ )}
`
+ );
+ $(parent).append(null_state);
+ }
+ $(parent).find('.chart-container').hide();
+ }
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/page/patient_progress/patient_progress.json b/erpnext/healthcare/page/patient_progress/patient_progress.json
new file mode 100644
index 0000000000..0175cb9c45
--- /dev/null
+++ b/erpnext/healthcare/page/patient_progress/patient_progress.json
@@ -0,0 +1,33 @@
+{
+ "content": null,
+ "creation": "2020-06-12 15:46:23.111928",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2020-07-23 21:45:45.540055",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "patient-progress",
+ "owner": "Administrator",
+ "page_name": "patient-progress",
+ "restrict_to_domain": "Healthcare",
+ "roles": [
+ {
+ "role": "Healthcare Administrator"
+ },
+ {
+ "role": "Physician"
+ },
+ {
+ "role": "Patient"
+ },
+ {
+ "role": "System Manager"
+ }
+ ],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Patient Progress"
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/page/patient_progress/patient_progress.py b/erpnext/healthcare/page/patient_progress/patient_progress.py
new file mode 100644
index 0000000000..a04fb2b592
--- /dev/null
+++ b/erpnext/healthcare/page/patient_progress/patient_progress.py
@@ -0,0 +1,197 @@
+import frappe
+from datetime import datetime
+from frappe import _
+from frappe.utils import getdate, get_timespan_date_range
+import json
+
+@frappe.whitelist()
+def get_therapy_sessions_count(patient):
+ total = frappe.db.count('Therapy Session', filters={
+ 'docstatus': 1,
+ 'patient': patient
+ })
+
+ month_start = datetime.today().replace(day=1)
+ this_month = frappe.db.count('Therapy Session', filters={
+ 'creation': ['>', month_start],
+ 'docstatus': 1,
+ 'patient': patient
+ })
+
+ return {
+ 'total_therapy_sessions': total,
+ 'therapy_sessions_this_month': this_month
+ }
+
+
+@frappe.whitelist()
+def get_patient_heatmap_data(patient, date):
+ return dict(frappe.db.sql("""
+ SELECT
+ unix_timestamp(communication_date), count(*)
+ FROM
+ `tabPatient Medical Record`
+ WHERE
+ communication_date > subdate(%(date)s, interval 1 year) and
+ communication_date < subdate(%(date)s, interval -1 year) and
+ patient = %(patient)s
+ GROUP BY communication_date
+ ORDER BY communication_date asc""", {'date': date, 'patient': patient}))
+
+
+@frappe.whitelist()
+def get_therapy_sessions_distribution_data(patient, field):
+ if field == 'therapy_type':
+ result = frappe.db.get_all('Therapy Session',
+ filters = {'patient': patient, 'docstatus': 1},
+ group_by = field,
+ order_by = field,
+ fields = [field, 'count(*)'],
+ as_list = True)
+
+ elif field == 'exercise_type':
+ data = frappe.db.get_all('Therapy Session', filters={
+ 'docstatus': 1,
+ 'patient': patient
+ }, as_list=True)
+ therapy_sessions = [entry[0] for entry in data]
+
+ result = frappe.db.get_all('Exercise',
+ filters = {
+ 'parenttype': 'Therapy Session',
+ 'parent': ['in', therapy_sessions],
+ 'docstatus': 1
+ },
+ group_by = field,
+ order_by = field,
+ fields = [field, 'count(*)'],
+ as_list = True)
+
+ return {
+ 'labels': [r[0] for r in result if r[0] != None],
+ 'datasets': [{
+ 'values': [r[1] for r in result]
+ }]
+ }
+
+
+@frappe.whitelist()
+def get_therapy_progress_data(patient, therapy_type, time_span):
+ date_range = get_date_range(time_span)
+ query_values = {'from_date': date_range[0], 'to_date': date_range[1], 'therapy_type': therapy_type, 'patient': patient}
+ result = frappe.db.sql("""
+ SELECT
+ start_date, total_counts_targeted, total_counts_completed
+ FROM
+ `tabTherapy Session`
+ WHERE
+ start_date BETWEEN %(from_date)s AND %(to_date)s and
+ docstatus = 1 and
+ therapy_type = %(therapy_type)s and
+ patient = %(patient)s
+ ORDER BY start_date""", query_values, as_list=1)
+
+ return {
+ 'labels': [r[0] for r in result if r[0] != None],
+ 'datasets': [
+ { 'name': _('Targetted'), 'values': [r[1] for r in result if r[0] != None] },
+ { 'name': _('Completed'), 'values': [r[2] for r in result if r[0] != None] }
+ ]
+ }
+
+@frappe.whitelist()
+def get_patient_assessment_data(patient, assessment_template, time_span):
+ date_range = get_date_range(time_span)
+ query_values = {'from_date': date_range[0], 'to_date': date_range[1], 'assessment_template': assessment_template, 'patient': patient}
+ result = frappe.db.sql("""
+ SELECT
+ assessment_datetime, total_score, total_score_obtained
+ FROM
+ `tabPatient Assessment`
+ WHERE
+ DATE(assessment_datetime) BETWEEN %(from_date)s AND %(to_date)s and
+ docstatus = 1 and
+ assessment_template = %(assessment_template)s and
+ patient = %(patient)s
+ ORDER BY assessment_datetime""", query_values, as_list=1)
+
+ return {
+ 'labels': [getdate(r[0]) for r in result if r[0] != None],
+ 'datasets': [
+ { 'name': _('Score Obtained'), 'values': [r[2] for r in result if r[0] != None] }
+ ],
+ 'max_score': result[0][1] if result else None
+ }
+
+@frappe.whitelist()
+def get_therapy_assessment_correlation_data(patient, assessment_template, time_span):
+ date_range = get_date_range(time_span)
+ query_values = {'from_date': date_range[0], 'to_date': date_range[1], 'assessment': assessment_template, 'patient': patient}
+ result = frappe.db.sql("""
+ SELECT
+ therapy.therapy_type, count(*), avg(assessment.total_score_obtained), total_score
+ FROM
+ `tabPatient Assessment` assessment INNER JOIN `tabTherapy Session` therapy
+ ON
+ assessment.therapy_session = therapy.name
+ WHERE
+ DATE(assessment.assessment_datetime) BETWEEN %(from_date)s AND %(to_date)s and
+ assessment.docstatus = 1 and
+ assessment.patient = %(patient)s and
+ assessment.assessment_template = %(assessment)s
+ GROUP BY therapy.therapy_type
+ """, query_values, as_list=1)
+
+ return {
+ 'labels': [r[0] for r in result if r[0] != None],
+ 'datasets': [
+ { 'name': _('Sessions'), 'chartType': 'bar', 'values': [r[1] for r in result if r[0] != None] },
+ { 'name': _('Average Score'), 'chartType': 'line', 'values': [round(r[2], 2) for r in result if r[0] != None] }
+ ],
+ 'max_score': result[0][1] if result else None
+ }
+
+@frappe.whitelist()
+def get_assessment_parameter_data(patient, parameter, time_span):
+ date_range = get_date_range(time_span)
+ query_values = {'from_date': date_range[0], 'to_date': date_range[1], 'parameter': parameter, 'patient': patient}
+ results = frappe.db.sql("""
+ SELECT
+ assessment.assessment_datetime,
+ sheet.score,
+ template.scale_max
+ FROM
+ `tabPatient Assessment Sheet` sheet
+ INNER JOIN `tabPatient Assessment` assessment
+ ON sheet.parent = assessment.name
+ INNER JOIN `tabPatient Assessment Template` template
+ ON template.name = assessment.assessment_template
+ WHERE
+ DATE(assessment.assessment_datetime) BETWEEN %(from_date)s AND %(to_date)s and
+ assessment.docstatus = 1 and
+ sheet.parameter = %(parameter)s and
+ assessment.patient = %(patient)s
+ ORDER BY
+ assessment.assessment_datetime asc
+ """, query_values, as_list=1)
+
+ score_percentages = []
+ for r in results:
+ if r[2] != 0 and r[0] != None:
+ score = round((int(r[1]) / int(r[2])) * 100, 2)
+ score_percentages.append(score)
+
+ return {
+ 'labels': [getdate(r[0]) for r in results if r[0] != None],
+ 'datasets': [
+ { 'name': _('Score'), 'values': score_percentages }
+ ]
+ }
+
+def get_date_range(time_span):
+ try:
+ time_span = json.loads(time_span)
+ return time_span
+ except json.decoder.JSONDecodeError:
+ return get_timespan_date_range(time_span.lower())
+
diff --git a/erpnext/healthcare/page/patient_progress/patient_progress_sidebar.html b/erpnext/healthcare/page/patient_progress/patient_progress_sidebar.html
new file mode 100644
index 0000000000..cd62dd3903
--- /dev/null
+++ b/erpnext/healthcare/page/patient_progress/patient_progress_sidebar.html
@@ -0,0 +1,29 @@
+
\ No newline at end of file
diff --git a/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json b/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json
index e8e95d8439..f7d16769c6 100644
--- a/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json
+++ b/erpnext/healthcare/print_format/lab_test_print/lab_test_print.json
@@ -7,16 +7,17 @@
"docstatus": 0,
"doctype": "Print Format",
"font": "Default",
- "html": "\n {% if letter_head and not no_letterhead -%}\n
\n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n Lab Tests have to be Submitted for Print .. !\n {% elif (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"lab_test_approval_required\") == '1' and doc.approval_status != \"Approved\") %}\n Lab Tests have to be Approved for Print .. !\n {%- else -%}\n\n \n {%- if doc.normal_test_items -%}\n
\n\n \n \n {%- if doc.special_test_items -%}\n
\n {%- endif -%}\n\n
\n",
+ "html": "{{ letter_head }}
\n \n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n Lab Tests have to be Submitted for Print .. !\n {% elif (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"lab_test_approval_required\") == '1' and doc.approval_status != \"Approved\") %}\n Lab Tests have to be Approved for Print .. !\n {%- else -%}\n
\n
\n\n \n\n
\n\n \n
\n\n \n \n
\n {% if doc.patient %}\n \n : {{doc.patient}}\n
\n {% else %}\n \n : Patient Name\n
\n {%- endif -%}\n \n
\n\n \n \n
\n \n : {{doc.patient_age}}\n
\n \n
\n\n \n \n
\n \n : {{doc.patient_sex}}\n
\n \n\n
\n\n \n
\n\n {% if doc.sample_date %}\n \n \n
\n {% if doc.practitioner %}\n \n : {{doc.practitioner}}\n
\n {%- endif -%}\n \n
\n {%- endif -%}\n\n {% if doc.result_date %}\n \n \n
\n \n : {{doc.sample_date}}\n
\n \n
\n {%- endif -%}\n\n \n \n
\n \n : {{doc.result_date}}\n
\n \n
\n\n Department of {{doc.department}}
\n| Name of Test | \nResult | \nNormal Range | \n
|---|---|---|
| {{ doc.lab_test_name }} | ||
| \n {%- if doc.normal_test_items|length > 1 %} {%- endif -%}\n {%- if row.lab_test_name -%}{{ row.lab_test_name }}\n {%- else -%} {%- endif -%}\n {%- if row.lab_test_event -%} {{ row.lab_test_event }}{%- endif -%}\n | \n\n\n {%- if row.result_value -%}{{ row.result_value }}{%- endif -%} \n {%- if row.lab_test_uom -%}{{ row.lab_test_uom }}{%- endif -%}\n | \n\n\n \n {%- if row.normal_range -%}{{ row.normal_range }}{%- endif -%}\n \n | \n
| Name of Test | \nResult | \n
|---|---|
| {{ doc.lab_test_name }} | |
| {{ row.lab_test_particulars }} | \n\n {%- if row.result_value -%}{{ row.result_value }}{%- endif -%}\n | \n
| Antibiotic | \nSensitivity | \n
| {{ row.antibiotic }} | \n{{ row.antibiotic_sensitivity }} | \n
\n {%- if (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"employee_name_and_designation_in_print\") == '1') -%}\n
\n{{doc.employee_name}}
\n{{doc.employee_designation}}
\n {%- else -%}\n{{frappe.db.get_value(\"Healthcare Settings\", \"None\", \"custom_signature_in_print\") }}
\n {%- endif -%}\n\n {% if letter_head and not no_letterhead -%}\n
\n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n\n\t
\n\t\n \n {%- if doc.normal_test_items -%}\n
\n\n\t\n \n {%- if doc.descriptive_test_items -%}\n
\n \n \n {%- if doc.normal_test_items -%}\n
\n\n \n \n {%- if doc.descriptive_test_items -%}\n
\n
",
"idx": 0,
"line_breaks": 0,
- "modified": "2018-09-04 12:03:47.066918",
+ "modified": "2020-07-08 15:34:28.866798",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Lab Test Print",
"owner": "Administrator",
"print_format_builder": 0,
- "print_format_type": "Server",
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
"show_section_headings": 0,
"standard": "Yes"
}
\ No newline at end of file
diff --git a/erpnext/healthcare/utils.py b/erpnext/healthcare/utils.py
index 9abaa0784a..dbd3b83f09 100644
--- a/erpnext/healthcare/utils.py
+++ b/erpnext/healthcare/utils.py
@@ -40,7 +40,7 @@ def get_appointments_to_invoice(patient, company):
patient_appointments = frappe.get_list(
'Patient Appointment',
fields = '*',
- filters = {'patient': patient.name, 'company': company, 'invoiced': 0},
+ filters = {'patient': patient.name, 'company': company, 'invoiced': 0, 'status': ['not in', 'Cancelled']},
order_by = 'appointment_date'
)
diff --git a/erpnext/healthcare/web_form/lab_test/lab_test.json b/erpnext/healthcare/web_form/lab_test/lab_test.json
index 88a9756e12..35099174e8 100644
--- a/erpnext/healthcare/web_form/lab_test/lab_test.json
+++ b/erpnext/healthcare/web_form/lab_test/lab_test.json
@@ -1,255 +1,459 @@
{
- "accept_payment": 0,
- "allow_comments": 0,
- "allow_delete": 0,
- "allow_edit": 1,
- "allow_incomplete": 0,
- "allow_multiple": 1,
- "allow_print": 1,
- "amount": 0.0,
- "amount_based_on_field": 0,
- "creation": "2017-06-06 16:12:33.052258",
- "currency": "INR",
- "doc_type": "Lab Test",
- "docstatus": 0,
- "doctype": "Web Form",
- "idx": 0,
- "introduction_text": "Lab Test",
- "is_standard": 1,
- "login_required": 1,
- "max_attachment_size": 0,
- "modified": "2018-09-04 08:50:41.314546",
- "modified_by": "Administrator",
- "module": "Healthcare",
- "name": "lab-test",
- "owner": "Administrator",
- "payment_button_label": "Buy Now",
- "print_format": "Lab Test Print",
- "published": 1,
- "route": "lab-test",
- "show_in_grid": 0,
- "show_sidebar": 1,
- "sidebar_items": [],
- "success_url": "/lab-test",
- "title": "Lab Test",
+ "accept_payment": 0,
+ "allow_comments": 1,
+ "allow_delete": 0,
+ "allow_edit": 1,
+ "allow_incomplete": 0,
+ "allow_multiple": 1,
+ "allow_print": 1,
+ "amount": 0.0,
+ "amount_based_on_field": 0,
+ "creation": "2017-06-06 16:12:33.052258",
+ "currency": "INR",
+ "doc_type": "Lab Test",
+ "docstatus": 0,
+ "doctype": "Web Form",
+ "idx": 0,
+ "introduction_text": "Lab Test",
+ "is_standard": 1,
+ "login_required": 1,
+ "max_attachment_size": 0,
+ "modified": "2020-06-22 12:59:49.126398",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "lab-test",
+ "owner": "Administrator",
+ "payment_button_label": "Buy Now",
+ "print_format": "Lab Test Print",
+ "published": 1,
+ "route": "lab-test",
+ "route_to_success_link": 0,
+ "show_attachments": 0,
+ "show_in_grid": 0,
+ "show_sidebar": 1,
+ "sidebar_items": [],
+ "success_url": "/lab-test",
+ "title": "Lab Test",
"web_form_fields": [
{
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "label": "Series",
- "max_length": 0,
- "max_value": 0,
- "options": "LP-",
- "read_only": 0,
- "reqd": 1,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "lab_test_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Test Name",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "default": "0",
- "fieldname": "invoiced",
- "fieldtype": "Check",
- "hidden": 0,
- "label": "Invoiced",
- "max_length": 0,
- "max_value": 0,
- "options": "",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Department",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Medical Department",
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "patient",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Patient",
- "max_length": 0,
- "max_value": 0,
- "options": "Patient",
- "read_only": 0,
- "reqd": 1,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "patient_name",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Patient Name",
- "max_length": 0,
- "max_value": 0,
- "options": "patient.patient_name",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Company",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Company",
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "practitioner",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Healthcare Practitioner",
- "max_length": 0,
- "max_value": 0,
- "options": "Healthcare Practitioner",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "label": "Status",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Draft\nCompleted\nApproved\nRejected\nCancelled",
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "label": "Status",
- "max_length": 0,
- "max_value": 0,
- "options": "Draft\nCompleted\nApproved\nRejected\nCancelled",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "submitted_date",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "label": "Submitted Date",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "department",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Department",
- "max_length": 0,
- "max_value": 0,
- "options": "Medical Department",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_first",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "sample",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Sample ID",
- "max_length": 0,
- "max_value": 0,
- "options": "Sample Collection",
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "patient",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Patient",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Patient",
+ "read_only": 0,
+ "reqd": 1,
"show_in_filter": 0
- },
+ },
{
- "default": "",
- "fieldname": "result_date",
- "fieldtype": "Date",
- "hidden": 0,
- "label": "Result Date",
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "patient_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Patient Name",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "report_preference",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Report Preference",
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "patient_age",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Age",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "lab_test_name",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Test Name",
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "patient_sex",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Gender",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Gender",
+ "read_only": 0,
+ "reqd": 1,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "normal_test_items",
- "fieldtype": "Table",
- "hidden": 0,
- "max_length": 0,
- "max_value": 0,
- "options": "Normal Test Items",
- "read_only": 1,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "inpatient_record",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Inpatient Record",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Inpatient Record",
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "special_test_items",
- "fieldtype": "Table",
- "hidden": 0,
- "max_length": 0,
- "max_value": 0,
- "options": "Special Test Items",
- "read_only": 1,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "report_preference",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Report Preference",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "sensitivity_test_items",
- "fieldtype": "Table",
- "hidden": 0,
- "max_length": 0,
- "max_value": 0,
- "options": "Sensitivity Test Items",
- "read_only": 1,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "email",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Email",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "lab_test_comment",
- "fieldtype": "Text",
- "hidden": 0,
- "label": "Comments",
- "max_length": 0,
- "max_value": 0,
- "read_only": 1,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "mobile",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Mobile",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "fieldname": "custom_result",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "label": "Custom Result",
- "max_length": 0,
- "max_value": 0,
- "read_only": 1,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "c_b",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "default": "0",
- "fieldname": "sensitivity_toggle",
- "fieldtype": "Check",
- "hidden": 1,
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "practitioner",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Requesting Practitioner",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Healthcare Practitioner",
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "default": "0",
- "fieldname": "special_toggle",
- "fieldtype": "Check",
- "hidden": 1,
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "practitioner_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Requesting Practitioner",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
"show_in_filter": 0
- },
+ },
{
- "default": "0",
- "fieldname": "normal_toggle",
- "fieldtype": "Check",
- "hidden": 1,
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "requesting_department",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Requesting Department",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Medical Department",
+ "read_only": 1,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Employee (Lab Technician)",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Employee",
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Lab Technician Name",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "employee_designation",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Lab Technician Designation",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 1,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_normal",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "lab_test_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "normal_test_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Normal Test Result",
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_descriptive",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "descriptive_test_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Descriptive Test Result",
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "depends_on": "special_toggle",
+ "fieldname": "organisms_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "organisms",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Organism Test Result",
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_sensitivity",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sensitivity_test_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Sensitivity Test Result",
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_comments",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "lab_test_comment",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "label": "Comments",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "sb_customresult",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "label": "Custom Result",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "custom_result",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "label": "Custom Result",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
"show_in_filter": 0
}
]
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index e8dda207ec..95a836fe65 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -249,7 +249,7 @@ doc_events = {
"validate": "erpnext.regional.india.utils.update_grand_total_for_rcm"
},
"Payment Entry": {
- "on_submit": ["erpnext.regional.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.update_payment_req_status"],
+ "on_submit": ["erpnext.regional.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.update_payment_req_status", "erpnext.accounts.doctype.dunning.dunning.resolve_dunning"],
"on_trash": "erpnext.regional.check_deletion_permission"
},
'Address': {
@@ -552,4 +552,4 @@ global_search_doctypes = {
{'doctype': 'Hotel Room Package', 'index': 3},
{'doctype': 'Hotel Room Type', 'index': 4}
]
-}
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/attendance_count/attendance_count.json b/erpnext/hr/dashboard_chart/attendance_count/attendance_count.json
new file mode 100644
index 0000000000..4666aec4c6
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/attendance_count/attendance_count.json
@@ -0,0 +1,27 @@
+{
+ "chart_name": "Attendance Count",
+ "chart_type": "Report",
+ "creation": "2020-07-22 11:56:32.730068",
+ "custom_options": "{\n\t\t\"type\": \"line\",\n\t\t\"axisOptions\": {\n\t\t\t\"shortenYAxisNumbers\": 1\n\t\t},\n\t\t\"tooltipOptions\": {}\n\t}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"month\":\"frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth() + 1\",\"year\":\"frappe.datetime.str_to_obj(frappe.datetime.get_today()).getFullYear();\",\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\"}",
+ "filters_json": "{}",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 14:32:40.334424",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Attendance Count",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Monthly Attendance Sheet",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Line",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/department_wise_employee_count/department_wise_employee_count.json b/erpnext/hr/dashboard_chart/department_wise_employee_count/department_wise_employee_count.json
new file mode 100644
index 0000000000..c21bfb9f36
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/department_wise_employee_count/department_wise_employee_count.json
@@ -0,0 +1,29 @@
+{
+ "chart_name": "Department Wise Employee Count",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.760730",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"status\",\"=\",\"Active\",false]]",
+ "group_by_based_on": "department",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 14:27:40.574194",
+ "modified": "2020-07-22 14:33:38.036794",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Department Wise Employee Count",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Donut",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/department_wise_openings/department_wise_openings.json b/erpnext/hr/dashboard_chart/department_wise_openings/department_wise_openings.json
new file mode 100644
index 0000000000..b1953d40ff
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/department_wise_openings/department_wise_openings.json
@@ -0,0 +1,29 @@
+{
+ "aggregate_function_based_on": "planned_vacancies",
+ "chart_name": "Department Wise Openings",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.849775",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Job Opening",
+ "filters_json": "[]",
+ "group_by_based_on": "department",
+ "group_by_type": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 14:33:44.834801",
+ "modified": "2020-07-22 14:34:45.273591",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Department Wise Openings",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/designation_wise_employee_count/designation_wise_employee_count.json b/erpnext/hr/dashboard_chart/designation_wise_employee_count/designation_wise_employee_count.json
new file mode 100644
index 0000000000..b10235cb8e
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/designation_wise_employee_count/designation_wise_employee_count.json
@@ -0,0 +1,29 @@
+{
+ "chart_name": "Designation Wise Employee Count",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.790337",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"status\",\"=\",\"Active\",false]]",
+ "group_by_based_on": "designation",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 14:27:40.602783",
+ "modified": "2020-07-22 14:31:49.665555",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Designation Wise Employee Count",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Donut",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/designation_wise_openings/designation_wise_openings.json b/erpnext/hr/dashboard_chart/designation_wise_openings/designation_wise_openings.json
new file mode 100644
index 0000000000..49ea98a4fc
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/designation_wise_openings/designation_wise_openings.json
@@ -0,0 +1,30 @@
+{
+ "aggregate_function_based_on": "planned_vacancies",
+ "chart_name": "Designation Wise Openings",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.820217",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Job Opening",
+ "dynamic_filters_json": "",
+ "filters_json": "[]",
+ "group_by_based_on": "designation",
+ "group_by_type": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 14:33:44.806626",
+ "modified": "2020-07-22 14:34:32.711881",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Designation Wise Openings",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/gender_diversity_ratio/gender_diversity_ratio.json b/erpnext/hr/dashboard_chart/gender_diversity_ratio/gender_diversity_ratio.json
new file mode 100644
index 0000000000..48578c9728
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/gender_diversity_ratio/gender_diversity_ratio.json
@@ -0,0 +1,29 @@
+{
+ "chart_name": "Gender Diversity Ratio",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.667291",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"status\",\"=\",\"Active\",false]]",
+ "group_by_based_on": "gender",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 14:27:40.143783",
+ "modified": "2020-07-22 14:32:50.962459",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Gender Diversity Ratio",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Pie",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_chart/job_application_status/job_application_status.json b/erpnext/hr/dashboard_chart/job_application_status/job_application_status.json
new file mode 100644
index 0000000000..42a830970e
--- /dev/null
+++ b/erpnext/hr/dashboard_chart/job_application_status/job_application_status.json
@@ -0,0 +1,29 @@
+{
+ "chart_name": "Job Application Status",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:32.699696",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Job Applicant",
+ "dynamic_filters_json": "",
+ "filters_json": "[[\"Job Applicant\",\"creation\",\"Timespan\",\"last month\",false]]",
+ "group_by_based_on": "status",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-28 16:19:12.109979",
+ "modified": "2020-07-28 16:19:45.279490",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Job Application Status",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Pie",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/hr/dashboard_fixtures.py b/erpnext/hr/dashboard_fixtures.py
deleted file mode 100644
index 1e9b4f3c93..0000000000
--- a/erpnext/hr/dashboard_fixtures.py
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-import erpnext
-import json
-from frappe import _
-
-def get_data():
- return frappe._dict({
- "dashboards": get_dashboards(),
- "charts": get_charts(),
- "number_cards": get_number_cards(),
- })
-
-def get_dashboards():
- dashboards = []
- dashboards.append(get_human_resource_dashboard())
- return dashboards
-
-def get_human_resource_dashboard():
- return {
- "name": "Human Resource",
- "dashboard_name": "Human Resource",
- "is_default": 1,
- "charts": [
- { "chart": "Attendance Count", "width": "Full"},
- { "chart": "Gender Diversity Ratio", "width": "Half"},
- { "chart": "Job Application Status", "width": "Half"},
- { "chart": 'Designation Wise Employee Count', "width": "Half"},
- { "chart": 'Department Wise Employee Count', "width": "Half"},
- { "chart": 'Designation Wise Openings', "width": "Half"},
- { "chart": 'Department Wise Openings', "width": "Half"}
- ],
- "cards": [
- {"card": "Total Employees"},
- {"card": "New Joinees (Last year)"},
- {'card': "Employees Left (Last year)"},
- {'card': "Total Applicants (Last month)"},
- ]
- }
-
-def get_recruitment_dashboard():
- pass
-
-
-def get_charts():
- company = erpnext.get_default_company()
- date = frappe.utils.get_datetime()
-
- month_map = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov","Dec"]
-
-
- if not company:
- company = frappe.db.get_value("Company", {"is_group": 0}, "name")
-
- dashboard_charts = [
- get_dashboards_chart_doc('Gender Diversity Ratio', "Group By", "Pie",
- document_type = "Employee", group_by_type="Count", group_by_based_on="gender",
- filters_json = json.dumps([["Employee", "status", "=", "Active"]]))
- ]
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Job Application Status', "Group By", "Pie",
- document_type = "Job Applicant", group_by_type="Count", group_by_based_on="status",
- filters_json = json.dumps([["Job Applicant", "creation", "Previous", "1 month"]]))
- )
-
- custom_options = '''{
- "type": "line",
- "axisOptions": {
- "shortenYAxisNumbers": 1
- },
- "tooltipOptions": {}
- }'''
-
- filters_json = json.dumps({
- "month": month_map[date.month - 1],
- "year": str(date.year),
- "company":company
- })
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Attendance Count', "Report", "Line",
- report_name = "Monthly Attendance Sheet", is_custom =1, group_by_type="Count",
- filters_json = filters_json, custom_options=custom_options)
- )
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Department Wise Employee Count', "Group By", "Donut",
- document_type = "Employee", group_by_type="Count", group_by_based_on="department",
- filters_json = json.dumps([["Employee", "status", "=", "Active"]]))
- )
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Designation Wise Employee Count', "Group By", "Donut",
- document_type = "Employee", group_by_type="Count", group_by_based_on="designation",
- filters_json = json.dumps([["Employee", "status", "=", "Active"]]))
- )
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Designation Wise Openings', "Group By", "Bar",
- document_type = "Job Opening", group_by_type="Sum", group_by_based_on="designation",
- time_interval = "Monthly", aggregate_function_based_on = "planned_vacancies")
- )
- dashboard_charts.append(
- get_dashboards_chart_doc('Department Wise Openings', "Group By", "Bar",
- document_type = "Job Opening", group_by_type="Sum", group_by_based_on="department",
- time_interval = "Monthly", aggregate_function_based_on = "planned_vacancies")
- )
- return dashboard_charts
-
-
-def get_number_cards():
- number_cards = []
-
- number_cards = [
- get_number_cards_doc("Employee", "Total Employees", filters_json = json.dumps([
- ["Employee","status","=","Active"]
- ])
- )
- ]
-
- number_cards.append(
- get_number_cards_doc("Employee", "New Joinees (Last year)", filters_json = json.dumps([
- ["Employee","date_of_joining","Timespan","last year"],
- ["Employee","status","=","Active"]
- ])
- )
- )
-
- number_cards.append(
- get_number_cards_doc("Employee", "Employees Left (Last year)", filters_json = json.dumps([
- ["Employee", "relieving_date", "Timespan", "last year"],
- ["Employee", "status", "=", "Left"]
- ])
- )
- )
-
- number_cards.append(
- get_number_cards_doc("Job Applicant", "Total Applicants (Last month)", filters_json = json.dumps([
- ["Job Applicant", "creation", "Timespan", "last month"]
- ])
- )
- )
-
- return number_cards
-
-
-def get_number_cards_doc(document_type, label, **args):
- args = frappe._dict(args)
-
- return {
- "doctype": "Number Card",
- "document_type": document_type,
- "function": args.func or "Count",
- "is_public": args.is_public or 1,
- "label": _(label),
- "name": args.name or label,
- "show_percentage_stats": args.show_percentage_stats or 1,
- "stats_time_interval": args.stats_time_interval or 'Monthly',
- "filters_json": args.filters_json or '[]',
- "aggregate_function_based_on": args.aggregate_function_based_on or None
- }
-
-def get_dashboards_chart_doc(name, chart_type, graph_type, **args):
- args = frappe._dict(args)
-
- return {
- "name": name,
- "chart_name": _(args.chart_name or name),
- "chart_type": chart_type,
- "document_type": args.document_type or None,
- "report_name": args.report_name or None,
- "is_custom": args.is_custom or 0,
- "group_by_type": args.group_by_type or None,
- "group_by_based_on": args.group_by_based_on or None,
- "based_on": args.based_on or None,
- "value_based_on": args.value_based_on or None,
- "number_of_groups": args.number_of_groups or 0,
- "is_public": args.is_public or 1,
- "timespan": args.timespan or "Last Year",
- "time_interval": args.time_interval or "Yearly",
- "timeseries": args.timeseries or 0,
- "filters_json": args.filters_json or '[]',
- "type": graph_type,
- "custom_options": args.custom_options or '',
- "doctype": "Dashboard Chart",
- "aggregate_function_based_on": args.aggregate_function_based_on or None
- }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/department_approver/department_approver.py b/erpnext/hr/doctype/department_approver/department_approver.py
index d4c118f802..afd54b8346 100644
--- a/erpnext/hr/doctype/department_approver/department_approver.py
+++ b/erpnext/hr/doctype/department_approver/department_approver.py
@@ -11,6 +11,7 @@ class DepartmentApprover(Document):
pass
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_approvers(doctype, txt, searchfield, start, page_len, filters):
if not filters.get("employee"):
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
index c1285675e5..d6047e1846 100644
--- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
@@ -8,10 +8,20 @@ frappe.ui.form.on('Employee Onboarding', {
frm.add_fetch("employee_onboarding_template", "designation", "designation");
frm.add_fetch("employee_onboarding_template", "employee_grade", "employee_grade");
+
+ frm.set_query("job_applicant", function () {
+ return {
+ filters:{
+ "status": "Accepted",
+ }
+ };
+ });
+
frm.set_query('job_offer', function () {
return {
filters: {
- 'job_applicant': frm.doc.job_applicant
+ 'job_applicant': frm.doc.job_applicant,
+ 'docstatus': 1
}
};
});
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json
index 3b95cabf8f..783c7574ef 100644
--- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.json
@@ -1,620 +1,203 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "HR-EMP-ONB-.YYYY.-.#####",
- "beta": 0,
- "creation": "2018-05-09 04:57:20.016220",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "autoname": "HR-EMP-ONB-.YYYY.-.#####",
+ "creation": "2018-05-09 04:57:20.016220",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "job_applicant",
+ "job_offer",
+ "employee_name",
+ "employee",
+ "date_of_joining",
+ "boarding_status",
+ "notify_users_by_email",
+ "column_break_7",
+ "employee_onboarding_template",
+ "company",
+ "department",
+ "designation",
+ "employee_grade",
+ "project",
+ "table_for_activity",
+ "activities",
+ "amended_from"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "job_applicant",
- "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": "Job Applicant",
- "length": 0,
- "no_copy": 0,
- "options": "Job Applicant",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "job_offer",
- "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": "Job Offer",
- "length": 0,
- "no_copy": 0,
- "options": "Job Offer",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_from": "job_applicant.applicant_name",
- "fieldname": "employee_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": "Employee Name",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "employee",
- "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": "Employee",
- "length": 0,
- "no_copy": 0,
- "options": "Employee",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "date_of_joining",
- "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": "Date of Joining",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "boarding_status",
- "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": "Status",
- "length": 0,
- "no_copy": 0,
- "options": "\nPending\nIn Process\nCompleted",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "job_applicant",
+ "fieldtype": "Link",
+ "label": "Job Applicant",
+ "options": "Job Applicant",
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "notify_users_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 users 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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "job_offer",
+ "fieldtype": "Link",
+ "label": "Job Offer",
+ "options": "Job Offer",
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_7",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fetch_from": "job_applicant.applicant_name",
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Employee Name",
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "employee_onboarding_template",
- "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": "Employee Onboarding Template",
- "length": 0,
- "no_copy": 0,
- "options": "Employee Onboarding Template",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "label": "Employee",
+ "options": "Employee",
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company",
- "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": "Company",
- "length": 0,
- "no_copy": 0,
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "date_of_joining",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Date of Joining",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "department",
- "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": "Department",
- "length": 0,
- "no_copy": 0,
- "options": "Department",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "fieldname": "boarding_status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "\nPending\nIn Process\nCompleted",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "designation",
- "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": "Designation",
- "length": 0,
- "no_copy": 0,
- "options": "Designation",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "allow_on_submit": 1,
+ "default": "0",
+ "fieldname": "notify_users_by_email",
+ "fieldtype": "Check",
+ "label": "Notify users by email",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "employee_grade",
- "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": "Employee Grade",
- "length": 0,
- "no_copy": 0,
- "options": "Employee Grade",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "project",
- "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": "Project",
- "length": 0,
- "no_copy": 0,
- "options": "Project",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "employee_onboarding_template",
+ "fieldtype": "Link",
+ "label": "Employee Onboarding Template",
+ "options": "Employee Onboarding Template",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "table_for_activity",
- "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,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "options": "Company",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "activities",
- "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": "Activities",
- "length": 0,
- "no_copy": 0,
- "options": "Employee Boarding Activity",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Department",
+ "options": "Department",
+ "show_days": 1,
+ "show_seconds": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": "Employee Onboarding",
- "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,
- "translatable": 0,
- "unique": 0
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Designation",
+ "options": "Designation",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "employee_grade",
+ "fieldtype": "Link",
+ "label": "Employee Grade",
+ "options": "Employee Grade",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "label": "Project",
+ "options": "Project",
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "table_for_activity",
+ "fieldtype": "Section Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "activities",
+ "fieldtype": "Table",
+ "label": "Activities",
+ "options": "Employee Boarding Activity",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Employee Onboarding",
+ "print_hide": 1,
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
}
- ],
- "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": "2019-08-01 16:15:55.968224",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Employee Onboarding",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2020-06-25 15:22:24.923835",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee Onboarding",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "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,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "employee_name",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee_name",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py
index 19ff3bd497..6cc2bf5cd8 100644
--- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py
@@ -13,6 +13,12 @@ class IncompleteTaskError(frappe.ValidationError): pass
class EmployeeOnboarding(EmployeeBoardingController):
def validate(self):
super(EmployeeOnboarding, self).validate()
+ self.validate_duplicate_employee_onboarding()
+
+ def validate_duplicate_employee_onboarding(self):
+ emp_onboarding = frappe.db.exists("Employee Onboarding",{"job_applicant": self.job_applicant})
+ if emp_onboarding and emp_onboarding != self.name:
+ frappe.throw(_("Employee Onboarding: {0} is already for Job Applicant: {1}").format(frappe.bold(emp_onboarding), frappe.bold(self.job_applicant)))
def validate_employee_creation(self):
if self.docstatus != 1:
diff --git a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
index 35c9f728b6..4e9ee3b143 100644
--- a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
+++ b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
@@ -8,6 +8,7 @@ import unittest
from frappe.utils import nowdate
from erpnext.hr.doctype.employee_onboarding.employee_onboarding import make_employee
from erpnext.hr.doctype.employee_onboarding.employee_onboarding import IncompleteTaskError
+from erpnext.hr.doctype.job_offer.test_job_offer import create_job_offer
class TestEmployeeOnboarding(unittest.TestCase):
def test_employee_onboarding_incomplete_task(self):
@@ -15,8 +16,13 @@ class TestEmployeeOnboarding(unittest.TestCase):
frappe.delete_doc('Employee Onboarding', {'employee_name': 'Test Researcher'})
_set_up()
applicant = get_job_applicant()
+
+ job_offer = create_job_offer(job_applicant=applicant.name)
+ job_offer.submit()
+
onboarding = frappe.new_doc('Employee Onboarding')
onboarding.job_applicant = applicant.name
+ onboarding.job_offer = job_offer.name
onboarding.company = '_Test Company'
onboarding.designation = 'Researcher'
onboarding.append('activities', {
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
index 3cc8dd5036..4e188add3e 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
+++ b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
@@ -9,6 +9,7 @@ frappe.views.calendar["Holiday List"] = {
"title": "description",
"allDay": "allDay"
},
+ order_by: `from_date`,
get_events_method: "erpnext.hr.doctype.holiday_list.holiday_list.get_events",
filters: [
{
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index 05071e1974..c62515597c 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -10,10 +10,14 @@ frappe.ui.form.on("Job Applicant", {
refresh: function(frm) {
if (!frm.doc.__islocal) {
if (frm.doc.__onload && frm.doc.__onload.job_offer) {
+ $('[data-doctype="Employee Onboarding"]').find("button").show();
+ $('[data-doctype="Job Offer"]').find("button").hide();
frm.add_custom_button(__("Job Offer"), function() {
frappe.set_route("Form", "Job Offer", frm.doc.__onload.job_offer);
}, __("View"));
} else {
+ $('[data-doctype="Employee Onboarding"]').find("button").hide();
+ $('[data-doctype="Job Offer"]').find("button").show();
frm.add_custom_button(__("Job Offer"), function() {
frappe.route_options = {
"job_applicant": frm.doc.name,
diff --git a/erpnext/hr/doctype/job_offer/job_offer.py b/erpnext/hr/doctype/job_offer/job_offer.py
index f9ee44a4de..e7e1a37480 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.py
+++ b/erpnext/hr/doctype/job_offer/job_offer.py
@@ -15,6 +15,9 @@ class JobOffer(Document):
def validate(self):
self.validate_vacancies()
+ job_offer = frappe.db.exists("Job Offer",{"job_applicant": self.job_applicant})
+ if job_offer and job_offer != self.name:
+ frappe.throw(_("Job Offer: {0} is already for Job Applicant: {1}").format(frappe.bold(job_offer), frappe.bold(self.job_applicant)))
def validate_vacancies(self):
staffing_plan = get_staffing_plan_detail(self.designation, self.company, self.offer_date)
diff --git a/erpnext/hr/doctype/vehicle/vehicle.py b/erpnext/hr/doctype/vehicle/vehicle.py
index a75cfa6125..1df5068268 100644
--- a/erpnext/hr/doctype/vehicle/vehicle.py
+++ b/erpnext/hr/doctype/vehicle/vehicle.py
@@ -13,4 +13,11 @@ class Vehicle(Document):
if getdate(self.start_date) > getdate(self.end_date):
frappe.throw(_("Insurance Start date should be less than Insurance End date"))
if getdate(self.carbon_check_date) > getdate():
- frappe.throw(_("Last carbon check date cannot be a future date"))
\ No newline at end of file
+ frappe.throw(_("Last carbon check date cannot be a future date"))
+
+def get_timeline_data(doctype, name):
+ '''Return timeline for vehicle log'''
+ return dict(frappe.db.sql('''select unix_timestamp(date), count(*)
+ from `tabVehicle Log` where license_plate=%s
+ and date > date_sub(curdate(), interval 1 year)
+ group by date''', name))
diff --git a/erpnext/hr/hr_dashboard/human_resource/human_resource.json b/erpnext/hr/hr_dashboard/human_resource/human_resource.json
new file mode 100644
index 0000000000..f74d9a3c57
--- /dev/null
+++ b/erpnext/hr/hr_dashboard/human_resource/human_resource.json
@@ -0,0 +1,58 @@
+{
+ "cards": [
+ {
+ "card": "Total Employees"
+ },
+ {
+ "card": "New Joinees (Last year)"
+ },
+ {
+ "card": "Employees Left (Last year)"
+ },
+ {
+ "card": "Total Applicants (Last month)"
+ }
+ ],
+ "charts": [
+ {
+ "chart": "Attendance Count",
+ "width": "Full"
+ },
+ {
+ "chart": "Gender Diversity Ratio",
+ "width": "Half"
+ },
+ {
+ "chart": "Job Application Status",
+ "width": "Half"
+ },
+ {
+ "chart": "Designation Wise Employee Count",
+ "width": "Half"
+ },
+ {
+ "chart": "Department Wise Employee Count",
+ "width": "Half"
+ },
+ {
+ "chart": "Designation Wise Openings",
+ "width": "Half"
+ },
+ {
+ "chart": "Department Wise Openings",
+ "width": "Half"
+ }
+ ],
+ "creation": "2020-07-22 11:56:33.015888",
+ "dashboard_name": "Human Resource",
+ "docstatus": 0,
+ "doctype": "Dashboard",
+ "idx": 0,
+ "is_default": 0,
+ "is_standard": 1,
+ "modified": "2020-07-22 14:42:12.789249",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Human Resource",
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/erpnext/hr/number_card/employees_left_(last_year)/employees_left_(last_year).json b/erpnext/hr/number_card/employees_left_(last_year)/employees_left_(last_year).json
new file mode 100644
index 0000000000..6a91912eff
--- /dev/null
+++ b/erpnext/hr/number_card/employees_left_(last_year)/employees_left_(last_year).json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:32.947790",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"relieving_date\",\"Timespan\",\"last year\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Employees Left (Last year)",
+ "modified": "2020-07-23 12:03:26.747447",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employees Left (Last year)",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/hr/number_card/new_joinees_(last_year)/new_joinees_(last_year).json b/erpnext/hr/number_card/new_joinees_(last_year)/new_joinees_(last_year).json
new file mode 100644
index 0000000000..8f5ad9ce31
--- /dev/null
+++ b/erpnext/hr/number_card/new_joinees_(last_year)/new_joinees_(last_year).json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:32.914057",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"date_of_joining\",\"Timespan\",\"last year\",false],[\"Employee\",\"status\",\"=\",\"Active\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "New Joinees (Last year)",
+ "modified": "2020-07-22 14:32:09.352301",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "New Joinees (Last year)",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/hr/number_card/total_applicants_(last_month)/total_applicants_(last_month).json b/erpnext/hr/number_card/total_applicants_(last_month)/total_applicants_(last_month).json
new file mode 100644
index 0000000000..1af42cabf6
--- /dev/null
+++ b/erpnext/hr/number_card/total_applicants_(last_month)/total_applicants_(last_month).json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:32.977716",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Job Applicant",
+ "dynamic_filters_json": "",
+ "filters_json": "[[\"Job Applicant\",\"creation\",\"Timespan\",\"last month\"]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Applicants (Last month)",
+ "modified": "2020-07-22 14:32:27.656855",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Total Applicants (Last month)",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/hr/number_card/total_employees/total_employees.json b/erpnext/hr/number_card/total_employees/total_employees.json
new file mode 100644
index 0000000000..932e255c9c
--- /dev/null
+++ b/erpnext/hr/number_card/total_employees/total_employees.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:32.874849",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Employee",
+ "dynamic_filters_json": "[[\"Employee\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee\",\"status\",\"=\",\"Active\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Employees",
+ "modified": "2020-07-22 14:31:59.118650",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Total Employees",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
index bd4ed3c4ca..42f7cdb50f 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
@@ -5,12 +5,25 @@
frappe.query_reports["Monthly Attendance Sheet"] = {
"filters": [
{
- "fieldname":"month",
+ "fieldname": "month",
"label": __("Month"),
"fieldtype": "Select",
- "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
- "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
- "Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+ "reqd": 1 ,
+ "options": [
+ { "value": 1, "label": __("Jan") },
+ { "value": 2, "label": __("Feb") },
+ { "value": 3, "label": __("Mar") },
+ { "value": 4, "label": __("Apr") },
+ { "value": 5, "label": __("May") },
+ { "value": 6, "label": __("June") },
+ { "value": 7, "label": __("July") },
+ { "value": 8, "label": __("Aug") },
+ { "value": 9, "label": __("Sep") },
+ { "value": 10, "label": __("Oct") },
+ { "value": 11, "label": __("Nov") },
+ { "value": 12, "label": __("Dec") },
+ ],
+ "default": frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth() + 1
},
{
"fieldname":"year",
@@ -22,7 +35,15 @@ frappe.query_reports["Monthly Attendance Sheet"] = {
"fieldname":"employee",
"label": __("Employee"),
"fieldtype": "Link",
- "options": "Employee"
+ "options": "Employee",
+ get_query: () => {
+ var company = frappe.query_report.get_filter_value('company');
+ return {
+ filters: {
+ 'company': company
+ }
+ };
+ }
},
{
"fieldname":"company",
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
index 47daab1901..46082129e2 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
@@ -248,10 +248,7 @@ def get_conditions(filters):
if not (filters.get("month") and filters.get("year")):
msgprint(_("Please select month and year"), raise_exception=1)
- filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
- "Dec"].index(filters.month) + 1
-
- filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
+ filters["total_days_in_month"] = monthrange(cint(filters.year), cint(filters.month))[1]
conditions = " and month(attendance_date) = %(month)s and year(attendance_date) = %(year)s"
diff --git a/erpnext/hr/report/recruitment_analytics/__init__.py b/erpnext/hr/report/recruitment_analytics/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/hr/report/recruitment_analytics/recruitment_analytics.js b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.js
new file mode 100644
index 0000000000..9620f52000
--- /dev/null
+++ b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.js
@@ -0,0 +1,23 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Recruitment Analytics"] = {
+ "filters": [
+ {
+ "fieldname":"company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("Company"),
+ "reqd": 1
+ },
+ {
+ "fieldname":"on_date",
+ "label": __("On Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.now_date(),
+ "reqd": 1,
+ },
+ ]
+};
\ No newline at end of file
diff --git a/erpnext/hr/report/recruitment_analytics/recruitment_analytics.json b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.json
new file mode 100644
index 0000000000..30a8e17eb8
--- /dev/null
+++ b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0,
+ "creation": "2020-05-14 16:28:45.743869",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2020-05-14 16:28:45.743869",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Recruitment Analytics",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Staffing Plan",
+ "report_name": "Recruitment Analytics",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "HR Manager"
+ },
+ {
+ "role": "HR User"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/recruitment_analytics/recruitment_analytics.py b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.py
new file mode 100644
index 0000000000..e961114ac2
--- /dev/null
+++ b/erpnext/hr/report/recruitment_analytics/recruitment_analytics.py
@@ -0,0 +1,190 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+
+ if not filters: filters = {}
+ filters = frappe._dict(filters)
+
+ columns = get_columns()
+
+ data = get_data(filters)
+
+ return columns, data
+
+
+def get_columns():
+ return [
+ {
+ "label": _("Staffing Plan"),
+ "fieldtype": "Link",
+ "fieldname": "staffing_plan",
+ "options": "Staffing Plan",
+ "width": 150
+ },
+ {
+ "label": _("Job Opening"),
+ "fieldtype": "Link",
+ "fieldname": "job_opening",
+ "options": "Job Opening",
+ "width": 100
+ },
+ {
+ "label": _("Job Applicant"),
+ "fieldtype": "Link",
+ "fieldname": "job_applicant",
+ "options": "Job Applicant",
+ "width": 150
+ },
+ {
+ "label": _("Applicant name"),
+ "fieldtype": "data",
+ "fieldname": "applicant_name",
+ "width": 120
+ },
+ {
+ "label": _("Application Status"),
+ "fieldtype": "Data",
+ "fieldname": "application_status",
+ "width": 100
+ },
+ {
+ "label": _("Job Offer"),
+ "fieldtype": "Link",
+ "fieldname": "job_offer",
+ "options": "job Offer",
+ "width": 150
+ },
+ {
+ "label": _("Designation"),
+ "fieldtype": "Data",
+ "fieldname": "designation",
+ "width": 100
+ },
+ {
+ "label": _("Offer Date"),
+ "fieldtype": "date",
+ "fieldname": "offer_date",
+ "width": 100
+ },
+ {
+ "label": _("Job Offer status"),
+ "fieldtype": "Data",
+ "fieldname": "job_offer_status",
+ "width": 150
+ }
+ ]
+
+def get_data(filters):
+ data = []
+ staffing_plan_details = get_staffing_plan(filters)
+ staffing_plan_list = list(set([details["name"] for details in staffing_plan_details]))
+ sp_jo_map , jo_list = get_job_opening(staffing_plan_list)
+ jo_ja_map , ja_list = get_job_applicant(jo_list)
+ ja_joff_map = get_job_offer(ja_list)
+
+ for sp in sp_jo_map.keys():
+ parent_row = get_parent_row(sp_jo_map, sp, jo_ja_map, ja_joff_map)
+ data += parent_row
+
+ return data
+
+
+def get_parent_row(sp_jo_map, sp, jo_ja_map, ja_joff_map):
+ data = []
+ if sp in sp_jo_map.keys():
+ for jo in sp_jo_map[sp]:
+ row = {
+ "staffing_plan" : sp,
+ "job_opening" : jo["name"],
+ }
+ data.append(row)
+ child_row = get_child_row( jo["name"], jo_ja_map, ja_joff_map)
+ data += child_row
+ return data
+
+def get_child_row(jo, jo_ja_map, ja_joff_map):
+ data = []
+ if jo in jo_ja_map.keys():
+ for ja in jo_ja_map[jo]:
+ row = {
+ "indent":1,
+ "job_applicant": ja.name,
+ "applicant_name": ja.applicant_name,
+ "application_status": ja.status,
+ }
+ if ja.name in ja_joff_map.keys():
+ jo_detail =ja_joff_map[ja.name][0]
+ row["job_offer"] = jo_detail.name
+ row["job_offer_status"] = jo_detail.status
+ row["offer_date"]= jo_detail.offer_date.strftime("%d-%m-%Y")
+ row["designation"] = jo_detail.designation
+
+ data.append(row)
+ return data
+
+def get_staffing_plan(filters):
+
+ staffing_plan = frappe.db.sql("""
+ select
+ sp.name, sp.department, spd.designation, spd.vacancies, spd.current_count, spd.parent, sp.to_date
+ from
+ `tabStaffing Plan Detail` spd , `tabStaffing Plan` sp
+ where
+ spd.parent = sp.name
+ And
+ sp.to_date > '{0}'
+ """.format(filters.on_date), as_dict = 1)
+
+ return staffing_plan
+
+def get_job_opening(sp_list):
+
+ job_openings = frappe.get_all("Job Opening", filters = [["staffing_plan", "IN", sp_list]], fields =["name", "staffing_plan"])
+
+ sp_jo_map = {}
+ jo_list = []
+
+ for openings in job_openings:
+ if openings.staffing_plan not in sp_jo_map.keys():
+ sp_jo_map[openings.staffing_plan] = [openings]
+ else:
+ sp_jo_map[openings.staffing_plan].append(openings)
+
+ jo_list.append(openings.name)
+
+ return sp_jo_map, jo_list
+
+def get_job_applicant(jo_list):
+
+ jo_ja_map = {}
+ ja_list =[]
+
+ applicants = frappe.get_all("Job Applicant", filters = [["job_title", "IN", jo_list]], fields =["name", "job_title","applicant_name", 'status'])
+
+ for applicant in applicants:
+ if applicant.job_title not in jo_ja_map.keys():
+ jo_ja_map[applicant.job_title] = [applicant]
+ else:
+ jo_ja_map[applicant.job_title].append(applicant)
+
+ ja_list.append(applicant.name)
+
+ return jo_ja_map , ja_list
+
+def get_job_offer(ja_list):
+ ja_joff_map = {}
+
+ offers = frappe.get_all("Job Offer", filters = [["job_applicant", "IN", ja_list]], fields =["name", "job_applicant", "status", 'offer_date', 'designation'])
+
+ for offer in offers:
+ if offer.job_applicant not in ja_joff_map.keys():
+ ja_joff_map[offer.job_applicant] = [offer]
+ else:
+ ja_joff_map[offer.job_applicant].append(offer)
+
+ return ja_joff_map
\ No newline at end of file
diff --git a/erpnext/loan_management/doctype/loan/loan.json b/erpnext/loan_management/doctype/loan/loan.json
index 192beee7e3..aa5e21b426 100644
--- a/erpnext/loan_management/doctype/loan/loan.json
+++ b/erpnext/loan_management/doctype/loan/loan.json
@@ -20,8 +20,8 @@
"section_break_8",
"loan_type",
"loan_amount",
- "is_secured_loan",
"rate_of_interest",
+ "is_secured_loan",
"disbursement_date",
"disbursed_amount",
"column_break_11",
@@ -334,7 +334,7 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2020-07-02 20:46:40.128142",
+ "modified": "2020-08-01 12:36:11.255233",
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan",
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
index c65996e65f..23815d5982 100644
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ b/erpnext/loan_management/doctype/loan/test_loan.py
@@ -269,7 +269,7 @@ class TestLoan(unittest.TestCase):
self.assertTrue(loan_security_shortfall)
self.assertEquals(loan_security_shortfall.loan_amount, 1000000.00)
- self.assertEquals(loan_security_shortfall.security_value, 400000.00)
+ self.assertEquals(loan_security_shortfall.security_value, 800000.00)
self.assertEquals(loan_security_shortfall.shortfall_amount, 600000.00)
frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = 250
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
index 961c05c9c1..2bb6fd84e5 100644
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
+++ b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
@@ -14,6 +14,7 @@ class LoanSecurityPledge(Document):
def validate(self):
self.set_pledge_amount()
self.validate_duplicate_securities()
+ self.validate_loan_security_type()
def on_submit(self):
if self.loan:
@@ -31,6 +32,27 @@ class LoanSecurityPledge(Document):
frappe.throw(_('Loan Security {0} added multiple times').format(frappe.bold(
security.loan_security)))
+ def validate_loan_security_type(self):
+ existing_pledge = ''
+
+ if self.loan:
+ existing_pledge = frappe.db.get_value('Loan Security Pledge', {'loan': self.loan}, ['name'])
+
+ if existing_pledge:
+ loan_security_type = frappe.db.get_value('Pledge', {'parent': existing_pledge}, ['loan_security_type'])
+ else:
+ loan_security_type = self.securities[0].loan_security_type
+
+ ltv_ratio_map = frappe._dict(frappe.get_all("Loan Security Type",
+ fields=["name", "loan_to_value_ratio"], as_list=1))
+
+ ltv_ratio = ltv_ratio_map.get(loan_security_type)
+
+ for security in self.securities:
+ if ltv_ratio_map.get(security.loan_security_type) != ltv_ratio:
+ frappe.throw(_("Loan Securities with different LTV ratio cannot be pledged against one loan"))
+
+
def set_pledge_amount(self):
total_security_value = 0
maximum_loan_value = 0
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
index ffd96737a5..02efe240bd 100644
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
+++ b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
@@ -7,6 +7,7 @@ import frappe
from frappe.utils import get_datetime
from frappe.model.document import Document
from six import iteritems
+from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import get_pledged_security_qty
class LoanSecurityShortfall(Document):
pass
@@ -50,31 +51,30 @@ def check_for_ltv_shortfall(process_loan_security_shortfall):
"valid_upto": (">=", update_time)
}, as_list=1))
- ltv_ratio_map = frappe._dict(frappe.get_all("Loan Security Type",
- fields=["name", "loan_to_value_ratio"], as_list=1))
-
- loans = frappe.db.sql(""" SELECT l.name, l.loan_amount, l.total_principal_paid, lp.loan_security, lp.haircut, lp.qty, lp.loan_security_type
- FROM `tabLoan` l, `tabPledge` lp , `tabLoan Security Pledge`p WHERE lp.parent = p.name and p.loan = l.name and l.docstatus = 1
- and l.is_secured_loan and l.status = 'Disbursed' and p.status = 'Pledged'""", as_dict=1)
+ loans = frappe.get_all('Loan', fields=['name', 'loan_amount', 'total_principal_paid'],
+ filters={'status': 'Disbursed', 'is_secured_loan': 1})
loan_security_map = {}
for loan in loans:
- loan_security_map.setdefault(loan.name, {
- "loan_amount": loan.loan_amount - loan.total_principal_paid,
- "security_value": 0.0
- })
+ outstanding_amount = loan.loan_amount - loan.total_principal_paid
+ pledged_securities = get_pledged_security_qty(loan.name)
+ ltv_ratio = ''
+ security_value = 0.0
- current_loan_security_amount = loan_security_price_map.get(loan.loan_security, 0) * loan.qty
- ltv_ratio = ltv_ratio_map.get(loan.loan_security_type)
+ for security, qty in pledged_securities.items():
+ if not ltv_ratio:
+ ltv_ratio = get_ltv_ratio(security)
+ security_value += loan_security_price_map.get(security) * qty
- loan_security_map[loan.name]['security_value'] += current_loan_security_amount - (current_loan_security_amount * loan.haircut/100)
+ current_ratio = (outstanding_amount/security_value) * 100
- for loan, value in iteritems(loan_security_map):
- if (value["loan_amount"]/value['security_value'] * 100) > ltv_ratio:
- create_loan_security_shortfall(loan, value, process_loan_security_shortfall)
+ if current_ratio > ltv_ratio:
+ shortfall_amount = outstanding_amount - ((security_value * ltv_ratio) / 100)
+ create_loan_security_shortfall(loan.name, outstanding_amount, security_value, shortfall_amount,
+ process_loan_security_shortfall)
-def create_loan_security_shortfall(loan, value, process_loan_security_shortfall):
+def create_loan_security_shortfall(loan, loan_amount, security_value, shortfall_amount, process_loan_security_shortfall):
existing_shortfall = frappe.db.get_value("Loan Security Shortfall", {"loan": loan, "status": "Pending"}, "name")
@@ -85,9 +85,14 @@ def create_loan_security_shortfall(loan, value, process_loan_security_shortfall)
ltv_shortfall.loan = loan
ltv_shortfall.shortfall_time = get_datetime()
- ltv_shortfall.loan_amount = value["loan_amount"]
- ltv_shortfall.security_value = value["security_value"]
- ltv_shortfall.shortfall_amount = value["loan_amount"] - value["security_value"]
+ ltv_shortfall.loan_amount = loan_amount
+ ltv_shortfall.security_value = security_value
+ ltv_shortfall.shortfall_amount = shortfall_amount
ltv_shortfall.process_loan_security_shortfall = process_loan_security_shortfall
ltv_shortfall.save()
+def get_ltv_ratio(loan_security):
+ loan_security_type = frappe.db.get_value('Loan Security', loan_security, 'loan_security_type')
+ ltv_ratio = frappe.db.get_value('Loan Security Type', loan_security_type, 'loan_to_value_ratio')
+ return ltv_ratio
+
diff --git a/erpnext/manufacturing/dashboard_chart/completed_operation/completed_operation.json b/erpnext/manufacturing/dashboard_chart/completed_operation/completed_operation.json
new file mode 100644
index 0000000000..d74ae2faf4
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/completed_operation/completed_operation.json
@@ -0,0 +1,28 @@
+{
+ "based_on": "creation",
+ "chart_name": "Completed Operation",
+ "chart_type": "Sum",
+ "creation": "2020-07-08 22:40:22.441658",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Work Order Operation",
+ "filters_json": "[[\"Work Order Operation\",\"docstatus\",\"=\",1,false]]",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-21 16:57:09.767009",
+ "modified": "2020-07-21 16:57:55.719802",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Completed Operation",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Quarterly",
+ "timeseries": 1,
+ "timespan": "Last Year",
+ "type": "Line",
+ "use_report_chart": 0,
+ "value_based_on": "completed_qty",
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/job_card_analysis/job_card_analysis.json b/erpnext/manufacturing/dashboard_chart/job_card_analysis/job_card_analysis.json
new file mode 100644
index 0000000000..e3cbba6e81
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/job_card_analysis/job_card_analysis.json
@@ -0,0 +1,26 @@
+{
+ "chart_name": "Job Card Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.549096",
+ "custom_options": "{\"barOptions\": {\"stacked\": 1}}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.defaults.get_user_default(\\\"year_start_date\\\")\",\"to_date\":\"frappe.defaults.get_user_default(\\\"year_end_date\\\")\"}",
+ "filters_json": "{\"docstatus\":1,\"range\":\"Monthly\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-21 17:47:06.537924",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Job Card Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Job Card Summary",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/last_month_downtime_analysis/last_month_downtime_analysis.json b/erpnext/manufacturing/dashboard_chart/last_month_downtime_analysis/last_month_downtime_analysis.json
new file mode 100644
index 0000000000..46d2215a00
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/last_month_downtime_analysis/last_month_downtime_analysis.json
@@ -0,0 +1,26 @@
+{
+ "chart_name": "Last Month Downtime Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.516460",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{}",
+ "filters_json": "{\"from_date\":\"2020-06-21 00:00:00\",\"to_date\":\"2020-07-21 18:46:45\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-21 18:46:50.767333",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Last Month Downtime Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Downtime Analysis",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/pending_work_order/pending_work_order.json b/erpnext/manufacturing/dashboard_chart/pending_work_order/pending_work_order.json
new file mode 100644
index 0000000000..91cd12b366
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/pending_work_order/pending_work_order.json
@@ -0,0 +1,26 @@
+{
+ "chart_name": "Pending Work Order",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.499217",
+ "custom_options": "{\"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"height\": 300}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.defaults.get_user_default(\\\"year_start_date\\\")\",\"to_date\":\"frappe.defaults.get_user_default(\\\"year_end_date\\\")\"}",
+ "filters_json": "{\"charts_based_on\":\"Age\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-21 17:46:42.917598",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Pending Work Order",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Work Order Summary",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Donut",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/produced_quantity/produced_quantity.json b/erpnext/manufacturing/dashboard_chart/produced_quantity/produced_quantity.json
new file mode 100644
index 0000000000..ba1a29d25b
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/produced_quantity/produced_quantity.json
@@ -0,0 +1,30 @@
+{
+ "based_on": "modified",
+ "chart_name": "Produced Quantity",
+ "chart_type": "Sum",
+ "creation": "2020-07-08 22:40:22.416285",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Work Order",
+ "dynamic_filters_json": "[[\"Work Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Work Order\",\"docstatus\",\"=\",\"1\",false]]",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-21 17:46:34.058882",
+ "modified": "2020-07-21 17:54:11.233531",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Produced Quantity",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 1,
+ "timespan": "Last Year",
+ "type": "Line",
+ "use_report_chart": 0,
+ "value_based_on": "produced_qty",
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/quality_inspection_analysis/quality_inspection_analysis.json b/erpnext/manufacturing/dashboard_chart/quality_inspection_analysis/quality_inspection_analysis.json
new file mode 100644
index 0000000000..8388f3d72b
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/quality_inspection_analysis/quality_inspection_analysis.json
@@ -0,0 +1,25 @@
+{
+ "chart_name": "Quality Inspection Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.483617",
+ "custom_options": "{\"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"height\": 300}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "filters_json": "{\"from_date\":\"2019-07-09\",\"to_date\":\"2020-07-09\"}",
+ "idx": 0,
+ "use_report_chart": 1,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-09 12:15:51.564487",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Quality Inspection Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Quality Inspection Summary",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Donut",
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/work_order_analysis/work_order_analysis.json b/erpnext/manufacturing/dashboard_chart/work_order_analysis/work_order_analysis.json
new file mode 100644
index 0000000000..879826a7ad
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/work_order_analysis/work_order_analysis.json
@@ -0,0 +1,26 @@
+{
+ "chart_name": "Work Order Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.465459",
+ "custom_options": "{\"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"height\": 300}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.defaults.get_user_default(\\\"year_start_date\\\")\",\"to_date\":\"frappe.defaults.get_user_default(\\\"year_end_date\\\")\"}",
+ "filters_json": "{\"charts_based_on\":\"Status\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-21 17:50:23.806007",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Work Order Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Work Order Summary",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Donut",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_chart/work_order_qty_analysis/work_order_qty_analysis.json b/erpnext/manufacturing/dashboard_chart/work_order_qty_analysis/work_order_qty_analysis.json
new file mode 100644
index 0000000000..93572799d6
--- /dev/null
+++ b/erpnext/manufacturing/dashboard_chart/work_order_qty_analysis/work_order_qty_analysis.json
@@ -0,0 +1,26 @@
+{
+ "chart_name": "Work Order Qty Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-08 22:40:22.532889",
+ "custom_options": "{\"barOptions\": {\"stacked\": 1}}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"from_date\":\"frappe.defaults.get_user_default(\\\"year_start_date\\\")\",\"to_date\":\"frappe.defaults.get_user_default(\\\"year_end_date\\\")\"}",
+ "filters_json": "{\"charts_based_on\":\"Quantity\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-21 17:46:59.020709",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Work Order Qty Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Work Order Summary",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 8062342cfc..c51f655a66 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -911,6 +911,7 @@ def get_bom_diff(bom1, bom2):
return out
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def item_query(doctype, txt, searchfield, start, page_len, filters):
meta = frappe.get_meta("Item", cached=True)
searchfields = meta.get_search_fields()
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index f962a1157b..b7d968e974 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -632,6 +632,7 @@ class WorkOrder(Document):
return bom
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_bom_operations(doctype, txt, searchfield, start, page_len, filters):
if txt:
filters['operation'] = ('like', '%%%s%%' % txt)
diff --git a/erpnext/manufacturing/manufacturing_dashboard/manufacturing/manufacturing.json b/erpnext/manufacturing/manufacturing_dashboard/manufacturing/manufacturing.json
new file mode 100644
index 0000000000..314efe7a80
--- /dev/null
+++ b/erpnext/manufacturing/manufacturing_dashboard/manufacturing/manufacturing.json
@@ -0,0 +1,62 @@
+{
+ "cards": [
+ {
+ "card": "Monthly Total Work Order"
+ },
+ {
+ "card": "Monthly Completed Work Order"
+ },
+ {
+ "card": "Ongoing Job Card"
+ },
+ {
+ "card": "Monthly Quality Inspection"
+ }
+ ],
+ "charts": [
+ {
+ "chart": "Produced Quantity",
+ "width": "Half"
+ },
+ {
+ "chart": "Completed Operation",
+ "width": "Half"
+ },
+ {
+ "chart": "Work Order Analysis",
+ "width": "Half"
+ },
+ {
+ "chart": "Quality Inspection Analysis",
+ "width": "Half"
+ },
+ {
+ "chart": "Pending Work Order",
+ "width": "Half"
+ },
+ {
+ "chart": "Last Month Downtime Analysis",
+ "width": "Half"
+ },
+ {
+ "chart": "Work Order Qty Analysis",
+ "width": "Full"
+ },
+ {
+ "chart": "Job Card Analysis",
+ "width": "Full"
+ }
+ ],
+ "creation": "2020-07-08 22:40:22.626607",
+ "dashboard_name": "Manufacturing",
+ "docstatus": 0,
+ "doctype": "Dashboard",
+ "idx": 0,
+ "is_default": 0,
+ "is_standard": 1,
+ "modified": "2020-07-09 12:39:39.455039",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Manufacturing",
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/number_card/monthly_completed_work_order/monthly_completed_work_order.json b/erpnext/manufacturing/number_card/monthly_completed_work_order/monthly_completed_work_order.json
new file mode 100644
index 0000000000..36c0b9ae75
--- /dev/null
+++ b/erpnext/manufacturing/number_card/monthly_completed_work_order/monthly_completed_work_order.json
@@ -0,0 +1,19 @@
+{
+ "creation": "2020-07-08 22:40:22.575086",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Work Order",
+ "filters_json": "[[\"Work Order\",\"status\",\"=\",\"Completed\"],[\"Work Order\",\"docstatus\",\"=\",1],[\"Work Order\",\"creation\",\"between\",[\"2020-06-08\",\"2020-07-08\"]]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Monthly Completed Work Orders",
+ "modified": "2020-07-09 12:22:54.809813",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Monthly Completed Work Order",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/number_card/monthly_quality_inspection/monthly_quality_inspection.json b/erpnext/manufacturing/number_card/monthly_quality_inspection/monthly_quality_inspection.json
new file mode 100644
index 0000000000..91a45365c0
--- /dev/null
+++ b/erpnext/manufacturing/number_card/monthly_quality_inspection/monthly_quality_inspection.json
@@ -0,0 +1,19 @@
+{
+ "creation": "2020-07-08 22:40:22.606867",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Quality Inspection",
+ "filters_json": "[[\"Quality Inspection\",\"docstatus\",\"=\",1],[\"Quality Inspection\",\"creation\",\"between\",[\"2020-06-08\",\"2020-07-08\"]]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Monthly Quality Inspections",
+ "modified": "2020-07-09 12:23:34.838154",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Monthly Quality Inspection",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/number_card/monthly_total_work_order/monthly_total_work_order.json b/erpnext/manufacturing/number_card/monthly_total_work_order/monthly_total_work_order.json
new file mode 100644
index 0000000000..80d3b1520a
--- /dev/null
+++ b/erpnext/manufacturing/number_card/monthly_total_work_order/monthly_total_work_order.json
@@ -0,0 +1,19 @@
+{
+ "creation": "2020-07-08 22:40:22.562715",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Work Order",
+ "filters_json": "[[\"Work Order\",\"docstatus\",\"=\",1],[\"Work Order\",\"creation\",\"between\",[\"2020-06-08\",\"2020-07-08\"]]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Monthly Total Work Orders",
+ "modified": "2020-07-09 12:22:25.698795",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Monthly Total Work Order",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/number_card/ongoing_job_card/ongoing_job_card.json b/erpnext/manufacturing/number_card/ongoing_job_card/ongoing_job_card.json
new file mode 100644
index 0000000000..ba23ff3453
--- /dev/null
+++ b/erpnext/manufacturing/number_card/ongoing_job_card/ongoing_job_card.json
@@ -0,0 +1,19 @@
+{
+ "creation": "2020-07-08 22:40:22.592042",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Job Card",
+ "filters_json": "[[\"Job Card\",\"status\",\"!=\",\"Completed\"],[\"Job Card\",\"docstatus\",\"=\",1]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Ongoing Job Cards",
+ "modified": "2020-07-09 12:23:18.218233",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Ongoing Job Card",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly"
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
index e3e440ebc6..dc424b7605 100644
--- a/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
+++ b/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py
@@ -30,7 +30,7 @@ def get_columns(filters):
"width": 180
}
])
-
+
columns.extend([
{
"label": _("Finished Good"),
@@ -73,7 +73,7 @@ def get_columns(filters):
])
return columns
-
+
def get_data(filters):
cond = "1=1"
@@ -95,6 +95,7 @@ def get_data(filters):
return results
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_work_orders(doctype, txt, searchfield, start, page_len, filters):
cond = "1=1"
if filters.get('bom_no'):
diff --git a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
index 5ac3923187..ebc01c65af 100644
--- a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
+++ b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
@@ -369,6 +369,3 @@ class ProductionPlanReport(object):
"fieldtype": "Float",
"width": 140
}])
-
-def document_query(doctype, txt, searchfield, start, page_len, filters):
- pass
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js
index 3e9d0baba5..199dcfc04f 100644
--- a/erpnext/non_profit/doctype/member/member.js
+++ b/erpnext/non_profit/doctype/member/member.js
@@ -29,6 +29,14 @@ frappe.ui.form.on('Member', {
frappe.set_route('query-report', 'Accounts Receivable', {member:frm.doc.name});
});
+ if (!frm.doc.customer) {
+ frm.add_custom_button(__('Create Customer'), () => {
+ frm.call('make_customer_and_link').then(() => {
+ frm.reload_doc();
+ });
+ });
+ }
+
// indicator
erpnext.utils.set_party_dashboard_indicators(frm);
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index d1294ccc08..c52082ca23 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -53,6 +53,19 @@ class Member(Document):
return subscription
+ def make_customer_and_link(self):
+ if self.customer:
+ frappe.msgprint(_("A customer is already linked to this Member"))
+ cust = create_customer(frappe._dict({
+ 'fullname': self.member_name,
+ 'email': self.email_id or self.user,
+ 'phone': None
+ }))
+
+ self.customer = cust
+ self.save()
+
+
def get_or_create_member(user_details):
member_list = frappe.get_all("Member", filters={'email': user_details.email, 'membership_type': user_details.plan_id})
if member_list and member_list[0]:
@@ -83,8 +96,10 @@ def create_customer(user_details):
try:
contact = frappe.new_doc("Contact")
contact.first_name = user_details.fullname
- contact.add_phone(user_details.mobile, is_primary_phone=1, is_primary_mobile_no=1)
- contact.add_email(user_details.email, is_primary=1)
+ if user_details.mobile:
+ contact.add_phone(user_details.mobile, is_primary_phone=1, is_primary_mobile_no=1)
+ if user_details.email:
+ contact.add_email(user_details.email, is_primary=1)
contact.insert(ignore_permissions=True)
contact.append("links", {
@@ -121,7 +136,7 @@ def create_member_subscription_order(user_details):
'subscription_id': 'sub_EZycCvXFvqnC6p'
}
"""
- # {"plan_id":"IFF Starter","fullname":"Shivam Mishra","mobile":"7506056962","email":"shivam@shivam.dev","pan":"Testing123"}
+
user_details = frappe._dict(user_details)
member = get_or_create_member(user_details)
if not member:
diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json
index 9f10d0cfc7..238f4c31fd 100644
--- a/erpnext/non_profit/doctype/membership/membership.json
+++ b/erpnext/non_profit/doctype/membership/membership.json
@@ -120,13 +120,15 @@
{
"fieldname": "webhook_payload",
"fieldtype": "Code",
+ "hidden": 1,
"label": "Webhook Payload",
"options": "JSON",
"read_only": 1
}
],
+ "index_web_pages_for_search": 1,
"links": [],
- "modified": "2020-04-06 14:29:33.856060",
+ "modified": "2020-07-27 14:28:11.532696",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Membership",
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 7a0caed621..729e111e57 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -81,7 +81,12 @@ def verify_signature(data):
@frappe.whitelist(allow_guest=True)
def trigger_razorpay_subscription(*args, **kwargs):
data = frappe.request.get_data(as_text=True)
- verify_signature(data)
+ try:
+ verify_signature(data)
+ except Exception as e:
+ signature = frappe.request.headers.get('X-Razorpay-Signature')
+ log = "{0} \n\n {1} \n\n {2} \n\n {3}".format(e, frappe.get_traceback(), signature, data)
+ frappe.log_error(e, "Webhook Verification Error")
if isinstance(data, six.string_types):
data = json.loads(data)
@@ -99,36 +104,40 @@ def trigger_razorpay_subscription(*args, **kwargs):
except Exception as e:
error_log = frappe.log_error(frappe.get_traceback() + '\n' + data_json , _("Membership Webhook Failed"))
notify_failure(error_log)
- return False
+ return { status: 'Failed' }
if not member:
- return False
+ return { status: 'Failed' }
+ try:
+ if data.event == "subscription.activated":
+ member.customer_id = payment.customer_id
+ elif data.event == "subscription.charged":
+ membership = frappe.new_doc("Membership")
+ membership.update({
+ "member": member.name,
+ "membership_status": "Current",
+ "membership_type": member.membership_type,
+ "currency": "INR",
+ "paid": 1,
+ "payment_id": payment.id,
+ "webhook_payload": data_json,
+ "from_date": datetime.fromtimestamp(subscription.current_start),
+ "to_date": datetime.fromtimestamp(subscription.current_end),
+ "amount": payment.amount / 100 # Convert to rupees from paise
+ })
+ membership.insert(ignore_permissions=True)
- if data.event == "subscription.activated":
- member.customer_id = payment.customer_id
- elif data.event == "subscription.charged":
- membership = frappe.new_doc("Membership")
- membership.update({
- "member": member.name,
- "membership_status": "Current",
- "membership_type": member.membership_type,
- "currency": "INR",
- "paid": 1,
- "payment_id": payment.id,
- "webhook_payload": data_json,
- "from_date": datetime.fromtimestamp(subscription.current_start),
- "to_date": datetime.fromtimestamp(subscription.current_end),
- "amount": payment.amount / 100 # Convert to rupees from paise
- })
- membership.insert(ignore_permissions=True)
+ # Update these values anyway
+ member.subscription_start = datetime.fromtimestamp(subscription.start_at)
+ member.subscription_end = datetime.fromtimestamp(subscription.end_at)
+ member.subscription_activated = 1
+ member.save(ignore_permissions=True)
+ except Exception as e:
+ log = frappe.log_error(e, "Error creating membership entry")
+ notify_failure(log)
+ return { status: 'Failed' }
- # Update these values anyway
- member.subscription_start = datetime.fromtimestamp(subscription.start_at)
- member.subscription_end = datetime.fromtimestamp(subscription.end_at)
- member.subscription_activated = 1
- member.save(ignore_permissions=True)
-
- return True
+ return { status: 'Success' }
def notify_failure(log):
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d9d3a4aadf..49af0ba6ee 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -14,7 +14,8 @@ erpnext.patches.v4_0.apply_user_permissions
erpnext.patches.v4_0.move_warehouse_user_to_restrictions
erpnext.patches.v4_0.global_defaults_to_system_settings
erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
-execute:frappe.reload_doc("HR", "doctype", "HR Settings") #2020-01-16
+execute:frappe.reload_doc("accounts", "doctype", "POS Payment Method") #2020-05-28
+execute:frappe.reload_doc("HR", "doctype", "HR Settings") #2020-01-16 #2020-07-24
execute:frappe.reload_doc('stock', 'doctype', 'warehouse') # 2017-04-24
execute:frappe.reload_doc('accounts', 'doctype', 'sales_invoice') # 2016-08-31
execute:frappe.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
@@ -437,7 +438,6 @@ erpnext.patches.v8_5.remove_project_type_property_setter
erpnext.patches.v8_7.sync_india_custom_fields
erpnext.patches.v8_7.fix_purchase_receipt_status
erpnext.patches.v8_6.rename_bom_update_tool
-erpnext.patches.v8_7.set_offline_in_pos_settings #11-09-17
erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017 #22-11-2017 #15-12-2017
erpnext.patches.v8_9.rename_company_sales_target_field
erpnext.patches.v8_8.set_bom_rate_as_per_uom
@@ -677,7 +677,8 @@ erpnext.patches.v12_0.update_end_date_and_status_in_email_campaign
erpnext.patches.v13_0.move_tax_slabs_from_payroll_period_to_income_tax_slab #123
erpnext.patches.v12_0.fix_quotation_expired_status
erpnext.patches.v12_0.update_appointment_reminder_scheduler_entry
-erpnext.patches.v12_0.retain_permission_rules_for_video_doctype
+erpnext.patches.v12_0.rename_pos_closing_doctype
+erpnext.patches.v13_0.replace_pos_payment_mode_table
erpnext.patches.v12_0.remove_duplicate_leave_ledger_entries #2020-05-22
erpnext.patches.v13_0.patch_to_fix_reverse_linking_in_additional_salary_encashment_and_incentive
execute:frappe.reload_doc("HR", "doctype", "Employee Advance")
@@ -696,8 +697,10 @@ erpnext.patches.v12_0.update_bom_in_so_mr
execute:frappe.delete_doc("Report", "Department Analytics")
execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True)
erpnext.patches.v12_0.update_uom_conversion_factor
+execute:frappe.delete_doc_if_exists("Page", "pos") #29-05-2020
erpnext.patches.v13_0.delete_old_purchase_reports
erpnext.patches.v12_0.set_italian_import_supplier_invoice_permissions
+erpnext.patches.v13_0.update_subscription
erpnext.patches.v12_0.unhide_cost_center_field
erpnext.patches.v13_0.update_sla_enhancements
erpnext.patches.v12_0.update_address_template_for_india
@@ -708,5 +711,10 @@ execute:frappe.delete_doc_if_exists("DocType", "Bank Reconciliation")
erpnext.patches.v13_0.move_doctype_reports_and_notification_from_hr_to_payroll #22-06-2020
erpnext.patches.v13_0.move_payroll_setting_separately_from_hr_settings #22-06-2020
erpnext.patches.v13_0.check_is_income_tax_component #22-06-2020
+erpnext.patches.v13_0.loyalty_points_entry_for_pos_invoice #22-07-2020
erpnext.patches.v12_0.add_taxjar_integration_field
+erpnext.patches.v12_0.fix_percent_complete_for_projects
+erpnext.patches.v13_0.delete_report_requested_items_to_order
erpnext.patches.v12_0.update_item_tax_template_company
+erpnext.patches.v13_0.move_branch_code_to_bank_account
+erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes
diff --git a/erpnext/patches/v11_0/refactor_autoname_naming.py b/erpnext/patches/v11_0/refactor_autoname_naming.py
index d67c7235e8..5dc5d3bf0c 100644
--- a/erpnext/patches/v11_0/refactor_autoname_naming.py
+++ b/erpnext/patches/v11_0/refactor_autoname_naming.py
@@ -54,7 +54,7 @@ doctype_series_map = {
'Payroll Entry': 'HR-PRUN-.YYYY.-.#####',
'Period Closing Voucher': 'ACC-PCV-.YYYY.-.#####',
'Plant Analysis': 'AG-PLA-.YYYY.-.#####',
- 'POS Closing Voucher': 'POS-CLO-.YYYY.-.#####',
+ 'POS Closing Entry': 'POS-CLO-.YYYY.-.#####',
'Prepared Report': 'SYS-PREP-.YYYY.-.#####',
'Program Enrollment': 'EDU-ENR-.YYYY.-.#####',
'Quotation Item': '',
diff --git a/erpnext/patches/v12_0/fix_percent_complete_for_projects.py b/erpnext/patches/v12_0/fix_percent_complete_for_projects.py
new file mode 100644
index 0000000000..3622df6bc8
--- /dev/null
+++ b/erpnext/patches/v12_0/fix_percent_complete_for_projects.py
@@ -0,0 +1,14 @@
+import frappe
+from frappe.utils import flt
+
+def execute():
+ for project in frappe.get_all("Project", fields=["name", "percent_complete_method"]):
+ total = frappe.db.count('Task', dict(project=project.name))
+ if project.percent_complete_method == "Task Completion" and total > 0:
+ completed = frappe.db.sql("""select count(name) from tabTask where
+ project=%s and status in ('Cancelled', 'Completed')""", project.name)[0][0]
+ percent_complete = flt(flt(completed) / total * 100, 2)
+ if project.percent_complete != percent_complete:
+ frappe.db.set_value("Project", project.name, "percent_complete", percent_complete)
+ if percent_complete == 100:
+ frappe.db.set_value("Project", project.name, "status", "Completed")
diff --git a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
index 1ddbae6cd2..a670adebfd 100644
--- a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
+++ b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
@@ -7,8 +7,7 @@ def execute():
if frappe.db.table_exists('Bank') and frappe.db.table_exists('Bank Account') and frappe.db.has_column('Bank Account', 'swift_number'):
frappe.db.sql("""
UPDATE `tabBank` b, `tabBank Account` ba
- SET b.swift_number = ba.swift_number, b.branch_code = ba.branch_code
- WHERE b.name = ba.bank
+ SET b.swift_number = ba.swift_number WHERE b.name = ba.bank
""")
frappe.reload_doc('accounts', 'doctype', 'bank_account')
diff --git a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
index 8889056e2d..06331d7ff7 100644
--- a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
+++ b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
@@ -100,8 +100,10 @@ def get_item_tax_template(item_tax_templates, item_tax_map, item_code, parenttyp
tax_type = None
else:
company = get_company(parts[-1], parenttype, parent)
- parent_account = frappe.db.get_value("Account",
- filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0, "company": company}, fieldname="parent_account")
+ parent_account = frappe.get_value("Account", {"account_name": account_name, "company": company}, "parent_account")
+ if not parent_account:
+ parent_account = frappe.db.get_value("Account",
+ filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0, "company": company}, fieldname="parent_account")
if not parent_account:
parent_account = frappe.db.get_value("Account",
filters={"account_type": "Tax", "root_type": "Liability", "is_group": 1, "company": company})
@@ -115,8 +117,11 @@ def get_item_tax_template(item_tax_templates, item_tax_map, item_code, parenttyp
if not tax_type:
account = frappe.new_doc("Account")
account.update(filters)
- account.insert()
- tax_type = account.name
+ try:
+ account.insert()
+ tax_type = account.name
+ except frappe.DuplicateEntryError:
+ tax_type = frappe.db.get_value("Account", {"account_name": account_name, "company": company}, "name")
account_type = frappe.get_cached_value("Account", tax_type, "account_type")
diff --git a/erpnext/patches/v12_0/rename_pos_closing_doctype.py b/erpnext/patches/v12_0/rename_pos_closing_doctype.py
new file mode 100644
index 0000000000..0577f81234
--- /dev/null
+++ b/erpnext/patches/v12_0/rename_pos_closing_doctype.py
@@ -0,0 +1,25 @@
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ if frappe.db.table_exists("POS Closing Voucher"):
+ if not frappe.db.exists("DocType", "POS Closing Entry"):
+ frappe.rename_doc('DocType', 'POS Closing Voucher', 'POS Closing Entry', force=True)
+
+ if not frappe.db.exists('DocType', 'POS Closing Entry Taxes'):
+ frappe.rename_doc('DocType', 'POS Closing Voucher Taxes', 'POS Closing Entry Taxes', force=True)
+
+ if not frappe.db.exists('DocType', 'POS Closing Voucher Details'):
+ frappe.rename_doc('DocType', 'POS Closing Voucher Details', 'POS Closing Entry Detail', force=True)
+
+ frappe.reload_doc('Accounts', 'doctype', 'POS Closing Entry')
+ frappe.reload_doc('Accounts', 'doctype', 'POS Closing Entry Taxes')
+ frappe.reload_doc('Accounts', 'doctype', 'POS Closing Entry Detail')
+
+ if frappe.db.exists("DocType", "POS Closing Voucher"):
+ frappe.delete_doc("DocType", "POS Closing Voucher")
+ frappe.delete_doc("DocType", "POS Closing Voucher Taxes")
+ frappe.delete_doc("DocType", "POS Closing Voucher Details")
+ frappe.delete_doc("DocType", "POS Closing Voucher Invoices")
\ No newline at end of file
diff --git a/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py b/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py
deleted file mode 100644
index ca8a13b13c..0000000000
--- a/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # to retain the roles and permissions from Education Module
- # after moving doctype to core
- permissions = frappe.db.sql("""
- SELECT
- *
- FROM
- `tabDocPerm`
- WHERE
- parent='Video'
- """, as_dict=True)
-
- frappe.reload_doc('core', 'doctype', 'video')
- doc = frappe.get_doc('DocType', 'Video')
- doc.permissions = []
- for perm in permissions:
- doc.append('permissions', perm)
- doc.save()
diff --git a/erpnext/patches/v13_0/delete_report_requested_items_to_order.py b/erpnext/patches/v13_0/delete_report_requested_items_to_order.py
new file mode 100644
index 0000000000..94a9fa85a8
--- /dev/null
+++ b/erpnext/patches/v13_0/delete_report_requested_items_to_order.py
@@ -0,0 +1,12 @@
+import frappe
+
+def execute():
+ """ Check for one or multiple Auto Email Reports and delete """
+ auto_email_reports = frappe.db.get_values("Auto Email Report", {"report": "Requested Items to Order"}, ["name"])
+ for auto_email_report in auto_email_reports:
+ frappe.delete_doc("Auto Email Report", auto_email_report[0])
+
+ frappe.db.sql("""
+ DELETE FROM `tabReport`
+ WHERE name = 'Requested Items to Order'
+ """)
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py b/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py
new file mode 100644
index 0000000000..5920bf1f70
--- /dev/null
+++ b/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py
@@ -0,0 +1,51 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+ if frappe.db.exists('DocType', 'Lab Test') and frappe.db.exists('DocType', 'Lab Test Template'):
+ # rename child doctypes
+ doctypes = {
+ 'Lab Test Groups': 'Lab Test Group Template',
+ 'Normal Test Items': 'Normal Test Result',
+ 'Sensitivity Test Items': 'Sensitivity Test Result',
+ 'Special Test Items': 'Descriptive Test Result',
+ 'Special Test Template': 'Descriptive Test Template'
+ }
+
+ frappe.reload_doc('healthcare', 'doctype', 'lab_test')
+ frappe.reload_doc('healthcare', 'doctype', 'lab_test_template')
+
+ for old_dt, new_dt in doctypes.items():
+ if not frappe.db.table_exists(new_dt) and frappe.db.table_exists(old_dt):
+ frappe.rename_doc('DocType', old_dt, new_dt, force=True)
+ frappe.reload_doc('healthcare', 'doctype', frappe.scrub(new_dt))
+ frappe.delete_doc_if_exists('DocType', old_dt)
+
+ parent_fields = {
+ 'Lab Test Group Template': 'lab_test_groups',
+ 'Descriptive Test Template': 'descriptive_test_templates',
+ 'Normal Test Result': 'normal_test_items',
+ 'Sensitivity Test Result': 'sensitivity_test_items',
+ 'Descriptive Test Result': 'descriptive_test_items'
+ }
+
+ for doctype, parentfield in parent_fields.items():
+ frappe.db.sql("""
+ UPDATE `tab{0}`
+ SET parentfield = %(parentfield)s
+ """.format(doctype), {'parentfield': parentfield})
+
+ # rename field
+ frappe.reload_doc('healthcare', 'doctype', 'lab_test')
+ if frappe.db.has_column('Lab Test', 'special_toggle'):
+ rename_field('Lab Test', 'special_toggle', 'descriptive_toggle')
+
+ if frappe.db.exists('DocType', 'Lab Test Group Template'):
+ # fix select field option
+ frappe.reload_doc('healthcare', 'doctype', 'lab_test_group_template')
+ frappe.db.sql("""
+ UPDATE `tabLab Test Group Template`
+ SET template_or_new_line = 'Add New Line'
+ WHERE template_or_new_line = 'Add new line'
+ """)
diff --git a/erpnext/patches/v13_0/loyalty_points_entry_for_pos_invoice.py b/erpnext/patches/v13_0/loyalty_points_entry_for_pos_invoice.py
new file mode 100644
index 0000000000..ee7734053c
--- /dev/null
+++ b/erpnext/patches/v13_0/loyalty_points_entry_for_pos_invoice.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ '''`sales_invoice` field from loyalty point entry is splitted into `invoice_type` & `invoice` fields'''
+
+ frappe.reload_doc("Accounts", "doctype", "loyalty_point_entry")
+
+ if not frappe.db.has_column('Loyalty Point Entry', 'sales_invoice'):
+ return
+
+ frappe.db.sql(
+ """UPDATE `tabLoyalty Point Entry` lpe
+ SET lpe.`invoice_type` = 'Sales Invoice', lpe.`invoice` = lpe.`sales_invoice`
+ WHERE lpe.`sales_invoice` IS NOT NULL
+ AND (lpe.`invoice` IS NULL OR lpe.`invoice` = '')""")
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/move_branch_code_to_bank_account.py b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
new file mode 100644
index 0000000000..833ae2a48f
--- /dev/null
+++ b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
@@ -0,0 +1,17 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+
+ frappe.reload_doc('accounts', 'doctype', 'bank_account')
+ frappe.reload_doc('accounts', 'doctype', 'bank')
+
+ if frappe.db.has_column('Bank', 'branch_code') and frappe.db.has_column('Bank Account', 'branch_code'):
+ frappe.db.sql("""UPDATE `tabBank` b, `tabBank Account` ba
+ SET ba.branch_code = b.branch_code
+ WHERE ba.bank = b.name AND
+ ifnull(b.branch_code, '') != '' AND ifnull(ba.branch_code, '') = ''""")
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/replace_pos_payment_mode_table.py b/erpnext/patches/v13_0/replace_pos_payment_mode_table.py
new file mode 100644
index 0000000000..1ca211bf1b
--- /dev/null
+++ b/erpnext/patches/v13_0/replace_pos_payment_mode_table.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ frappe.reload_doc("accounts", "doctype", "POS Payment Method")
+ pos_profiles = frappe.get_all("POS Profile")
+
+ for pos_profile in pos_profiles:
+ if not pos_profile.get("payments"): return
+
+ payments = frappe.db.sql("""
+ select idx, parentfield, parenttype, parent, mode_of_payment, `default` from `tabSales Invoice Payment` where parent=%s
+ """, pos_profile.name, as_dict=1)
+ if payments:
+ for payment_mode in payments:
+ pos_payment_method = frappe.new_doc("POS Payment Method")
+ pos_payment_method.idx = payment_mode.idx
+ pos_payment_method.default = payment_mode.default
+ pos_payment_method.mode_of_payment = payment_mode.mode_of_payment
+ pos_payment_method.parent = payment_mode.parent
+ pos_payment_method.parentfield = payment_mode.parentfield
+ pos_payment_method.parenttype = payment_mode.parenttype
+ pos_payment_method.db_insert()
+
+ frappe.db.sql("""delete from `tabSales Invoice Payment` where parent=%s""", pos_profile.name)
diff --git a/erpnext/patches/v13_0/update_subscription.py b/erpnext/patches/v13_0/update_subscription.py
new file mode 100644
index 0000000000..871ebf17c4
--- /dev/null
+++ b/erpnext/patches/v13_0/update_subscription.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from six import iteritems
+
+def execute():
+
+ frappe.reload_doc('accounts', 'doctype', 'subscription')
+ frappe.reload_doc('accounts', 'doctype', 'subscription_invoice')
+ frappe.reload_doc('accounts', 'doctype', 'subscription_plan')
+
+ if frappe.db.has_column('Subscription', 'customer'):
+ frappe.db.sql("""
+ UPDATE `tabSubscription`
+ SET
+ start_date = start,
+ party_type = 'Customer',
+ party = customer,
+ sales_tax_template = tax_template
+ WHERE IFNULL(party,'') = ''
+ """)
+
+ frappe.db.sql("""
+ UPDATE `tabSubscription Invoice`
+ SET document_type = 'Sales Invoice'
+ WHERE IFNULL(document_type, '') = ''
+ """)
+
+ price_determination_map = {
+ 'Fixed rate': 'Fixed Rate',
+ 'Based on price list': 'Based On Price List'
+ }
+
+ for key, value in iteritems(price_determination_map):
+ frappe.db.sql("""
+ UPDATE `tabSubscription Plan`
+ SET price_determination = %s
+ WHERE price_determination = %s
+ """, (value, key))
\ No newline at end of file
diff --git a/erpnext/patches/v8_7/set_offline_in_pos_settings.py b/erpnext/patches/v8_7/set_offline_in_pos_settings.py
deleted file mode 100644
index 7d2882e064..0000000000
--- a/erpnext/patches/v8_7/set_offline_in_pos_settings.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'pos_field')
- frappe.reload_doc('accounts', 'doctype', 'pos_settings')
-
- doc = frappe.get_doc('POS Settings')
- doc.use_pos_in_offline_mode = 1
- doc.save()
\ No newline at end of file
diff --git a/erpnext/payroll/dashboard_chart/department_wise_salary(last_month)/department_wise_salary(last_month).json b/erpnext/payroll/dashboard_chart/department_wise_salary(last_month)/department_wise_salary(last_month).json
new file mode 100644
index 0000000000..61ae86ff02
--- /dev/null
+++ b/erpnext/payroll/dashboard_chart/department_wise_salary(last_month)/department_wise_salary(last_month).json
@@ -0,0 +1,30 @@
+{
+ "aggregate_function_based_on": "rounded_total",
+ "chart_name": "Department Wise Salary(Last Month)",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:34.511940",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Salary Slip",
+ "dynamic_filters_json": "[[\"Salary Slip\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Salary Slip\",\"docstatus\",\"=\",\"1\",false],[\"Salary Slip\",\"start_date\",\"Timespan\",\"last month\",false]]",
+ "group_by_based_on": "department",
+ "group_by_type": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 12:46:05.272076",
+ "modified": "2020-07-22 12:48:12.080992",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Department Wise Salary(Last Month)",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/payroll/dashboard_chart/designation_wise_salary(last_month)/designation_wise_salary(last_month).json b/erpnext/payroll/dashboard_chart/designation_wise_salary(last_month)/designation_wise_salary(last_month).json
new file mode 100644
index 0000000000..b3c4e59395
--- /dev/null
+++ b/erpnext/payroll/dashboard_chart/designation_wise_salary(last_month)/designation_wise_salary(last_month).json
@@ -0,0 +1,30 @@
+{
+ "aggregate_function_based_on": "rounded_total",
+ "chart_name": "Designation Wise Salary(Last Month)",
+ "chart_type": "Group By",
+ "creation": "2020-07-22 11:56:34.550339",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Salary Slip",
+ "dynamic_filters_json": "[[\"Salary Slip\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Salary Slip\",\"docstatus\",\"=\",\"1\",false],[\"Salary Slip\",\"start_date\",\"Timespan\",\"last month\",false]]",
+ "group_by_based_on": "designation",
+ "group_by_type": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 12:22:18.412822",
+ "modified": "2020-07-22 12:39:07.923382",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Designation Wise Salary(Last Month)",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Bar",
+ "use_report_chart": 0,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/payroll/dashboard_chart/outgoing_salary/outgoing_salary.json b/erpnext/payroll/dashboard_chart/outgoing_salary/outgoing_salary.json
new file mode 100644
index 0000000000..c77c8a5a36
--- /dev/null
+++ b/erpnext/payroll/dashboard_chart/outgoing_salary/outgoing_salary.json
@@ -0,0 +1,29 @@
+{
+ "based_on": "end_date",
+ "chart_name": "Outgoing Salary",
+ "chart_type": "Sum",
+ "creation": "2020-07-22 11:56:34.478848",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "document_type": "Salary Slip",
+ "dynamic_filters_json": "[[\"Salary Slip\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Salary Slip\",\"docstatus\",\"=\",\"1\",false]]",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "last_synced_on": "2020-07-22 12:11:27.481231",
+ "modified": "2020-07-22 12:20:05.777715",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Outgoing Salary",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "time_interval": "Monthly",
+ "timeseries": 1,
+ "timespan": "Last Year",
+ "type": "Line",
+ "use_report_chart": 0,
+ "value_based_on": "rounded_total",
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/payroll/dashboard_fixtures.py b/erpnext/payroll/dashboard_fixtures.py
deleted file mode 100644
index ae7a9ff51a..0000000000
--- a/erpnext/payroll/dashboard_fixtures.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-import erpnext
-from erpnext.hr.dashboard_fixtures import get_dashboards_chart_doc, get_number_cards_doc
-import json
-from frappe import _
-
-def get_data():
- return frappe._dict({
- "dashboards": get_dashboards(),
- "charts": get_charts(),
- "number_cards": get_number_cards(),
- })
-
-def get_dashboards():
- dashboards = []
- dashboards.append(get_payroll_dashboard())
- return dashboards
-
-def get_payroll_dashboard():
- return {
- "name": "Payroll",
- "dashboard_name": "Payroll",
- "is_default": 1,
- "charts": [
- { "chart": "Outgoing Salary", "width": "Full"},
- { "chart": "Designation Wise Salary(Last Month)", "width": "Half"},
- { "chart": "Department Wise Salary(Last Month)", "width": "Half"},
- ],
- "cards": [
- {"card": "Total Declaration Submitted"},
- {"card": "Total Salary Structure"},
- {"card": "Total Incentive Given(Last month)"},
- {"card": "Total Outgoing Salary(Last month)"},
- ]
- }
-
-def get_charts():
- dashboard_charts= [
- get_dashboards_chart_doc('Outgoing Salary', "Sum", "Line",
- document_type = "Salary Slip", based_on="end_date",
- value_based_on = "rounded_total", time_interval = "Monthly", timeseries = 1,
- filters_json = json.dumps([["Salary Slip", "docstatus", "=", 1]]))
- ]
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Department Wise Salary(Last Month)', "Group By", "Bar",
- document_type = "Salary Slip", group_by_type="Sum", group_by_based_on="department",
- time_interval = "Monthly", aggregate_function_based_on = "rounded_total",
- filters_json = json.dumps([
- ["Salary Slip", "docstatus", "=", 1],
- ["Salary Slip", "start_date", "Previous","1 month"]
- ])
- )
- )
-
- dashboard_charts.append(
- get_dashboards_chart_doc('Designation Wise Salary(Last Month)', "Group By", "Bar",
- document_type = "Salary Slip", group_by_type="Sum", group_by_based_on="designation",
- time_interval = "Monthly", aggregate_function_based_on = "rounded_total",
- filters_json = json.dumps([
- ["Salary Slip", "docstatus", "=", 1],
- ["Salary Slip", "start_date", "Previous","1 month"]
- ])
- )
- )
-
- return dashboard_charts
-
-def get_number_cards():
- number_cards = [get_number_cards_doc("Employee Tax Exemption Declaration", "Total Declaration Submitted", filters_json = json.dumps([
- ["Employee Tax Exemption Declaration", "docstatus", "=","1"],
- ["Employee Tax Exemption Declaration","creation","Previous","1 year"]
- ])
- )]
-
- number_cards.append(get_number_cards_doc("Employee Incentive", "Total Incentive Given(Last month)",
- time_interval = "Monthly", func = "Sum", aggregate_function_based_on = "incentive_amount",
- filters_json = json.dumps([
- ["Employee Incentive", "docstatus", "=", 1],
- ["Employee Incentive","payroll_date","Previous","1 year"]
- ]))
- )
-
- number_cards.append(get_number_cards_doc("Salary Slip", "Total Outgoing Salary(Last month)",
- time_interval = "Monthly", time_span= "Monthly", func = "Sum", aggregate_function_based_on = "rounded_total",
- filters_json = json.dumps([
- ["Salary Slip", "docstatus", "=", 1],
- ["Salary Slip", "start_date","Previous","1 month"]
- ]))
- )
- number_cards.append(get_number_cards_doc("Salary Structure", "Total Salary Structure",
- filters_json = json.dumps([
- ["Salary Structure", "docstatus", "=", 1]
- ]))
- )
-
- return number_cards
\ No newline at end of file
diff --git a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py
index d7d00e6480..ef844fbd3b 100644
--- a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py
+++ b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.py
@@ -223,6 +223,7 @@ def get_benefit_amount_based_on_pro_rata(sal_struct, component_max_benefit):
return benefit_amount
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_earning_components(doctype, txt, searchfield, start, page_len, filters):
if len(filters) < 2:
return {}
diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.js b/erpnext/payroll/doctype/payroll_entry/payroll_entry.js
index 8d35a7be47..1abc869c53 100644
--- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.js
+++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.js
@@ -213,7 +213,7 @@ frappe.ui.form.on('Payroll Entry', {
},
doc: frm.doc,
freeze: true,
- freeze_message: 'Validating Employee Attendance...'
+ freeze_message: __('Validating Employee Attendance...')
});
}else{
frm.fields_dict.attendance_detail_html.html("");
@@ -237,7 +237,7 @@ const submit_salary_slip = function (frm) {
callback: function() {frm.events.refresh(frm);},
doc: frm.doc,
freeze: true,
- freeze_message: 'Submitting Salary Slips and creating Journal Entry...'
+ freeze_message: __('Submitting Salary Slips and creating Journal Entry...')
});
},
function() {
diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
index ad9b6d86c8..554484febb 100644
--- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
@@ -540,6 +540,7 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr
frappe.msgprint(_("Could not submit some Salary Slips"))
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""
select name from `tabPayroll Entry`
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.json b/erpnext/payroll/doctype/salary_slip/salary_slip.json
index 88931c2a4b..27a974ac83 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.json
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.json
@@ -74,9 +74,7 @@
"fieldtype": "Date",
"in_list_view": 1,
"label": "Posting Date",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "employee",
@@ -89,9 +87,7 @@
"oldfieldtype": "Link",
"options": "Employee",
"reqd": 1,
- "search_index": 1,
- "show_days": 1,
- "show_seconds": 1
+ "search_index": 1
},
{
"fetch_from": "employee.employee_name",
@@ -102,9 +98,7 @@
"label": "Employee Name",
"oldfieldname": "employee_name",
"oldfieldtype": "Data",
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fetch_from": "employee.department",
@@ -115,20 +109,18 @@
"oldfieldname": "department",
"oldfieldtype": "Link",
"options": "Department",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"depends_on": "eval:doc.designation",
"fetch_from": "employee.designation",
"fieldname": "designation",
- "fieldtype": "Read Only",
+ "fieldtype": "Link",
"label": "Designation",
"oldfieldname": "designation",
"oldfieldtype": "Link",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Designation",
+ "read_only": 1
},
{
"fetch_from": "employee.branch",
@@ -139,16 +131,12 @@
"oldfieldname": "branch",
"oldfieldtype": "Link",
"options": "Branch",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1,
"width": "50%"
},
{
@@ -156,27 +144,21 @@
"fieldtype": "Select",
"label": "Status",
"options": "Draft\nSubmitted\nCancelled",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "journal_entry",
"fieldtype": "Link",
"label": "Journal Entry",
"options": "Journal Entry",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "payroll_entry",
"fieldtype": "Link",
"label": "Payroll Entry",
"options": "Payroll Entry",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "company",
@@ -186,9 +168,7 @@
"label": "Company",
"options": "Company",
"remember_last_selected_value": 1,
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"allow_on_submit": 1,
@@ -197,62 +177,46 @@
"ignore_user_permissions": 1,
"label": "Letter Head",
"options": "Letter Head",
- "print_hide": 1,
- "show_days": 1,
- "show_seconds": 1
+ "print_hide": 1
},
{
"fieldname": "section_break_10",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"default": "0",
"fieldname": "salary_slip_based_on_timesheet",
"fieldtype": "Check",
"label": "Salary Slip Based on Timesheet",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "start_date",
"fieldtype": "Date",
- "label": "Start Date",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Start Date"
},
{
"fieldname": "end_date",
"fieldtype": "Date",
- "label": "End Date",
- "show_days": 1,
- "show_seconds": 1
+ "label": "End Date"
},
{
"fieldname": "column_break_15",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"fieldname": "salary_structure",
"fieldtype": "Link",
"label": "Salary Structure",
"options": "Salary Structure",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
"fieldname": "payroll_frequency",
"fieldtype": "Select",
"label": "Payroll Frequency",
- "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
- "show_days": 1,
- "show_seconds": 1
+ "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily"
},
{
"fieldname": "total_working_days",
@@ -261,18 +225,14 @@
"oldfieldname": "total_days_in_month",
"oldfieldtype": "Int",
"read_only": 1,
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "leave_without_pay",
"fieldtype": "Float",
"label": "Leave Without Pay",
"oldfieldname": "leave_without_pay",
- "oldfieldtype": "Currency",
- "show_days": 1,
- "show_seconds": 1
+ "oldfieldtype": "Currency"
},
{
"fieldname": "payment_days",
@@ -281,52 +241,38 @@
"oldfieldname": "payment_days",
"oldfieldtype": "Float",
"read_only": 1,
- "reqd": 1,
- "show_days": 1,
- "show_seconds": 1
+ "reqd": 1
},
{
"fieldname": "hourly_wages",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"fieldname": "timesheets",
"fieldtype": "Table",
"label": "Salary Slip Timesheet",
- "options": "Salary Slip Timesheet",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Salary Slip Timesheet"
},
{
"fieldname": "column_break_20",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"fieldname": "total_working_hours",
"fieldtype": "Float",
"label": "Total Working Hours",
- "print_hide_if_no_value": 1,
- "show_days": 1,
- "show_seconds": 1
+ "print_hide_if_no_value": 1
},
{
"fieldname": "hour_rate",
"fieldtype": "Currency",
"label": "Hour Rate",
"options": "Company:company:default_currency",
- "print_hide_if_no_value": 1,
- "show_days": 1,
- "show_seconds": 1
+ "print_hide_if_no_value": 1
},
{
"fieldname": "section_break_26",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"fieldname": "bank_name",
@@ -334,9 +280,7 @@
"label": "Bank Name",
"oldfieldname": "bank_name",
"oldfieldtype": "Data",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "bank_account_no",
@@ -344,46 +288,34 @@
"label": "Bank Account No.",
"oldfieldname": "bank_account_no",
"oldfieldtype": "Data",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "section_break_32",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"default": "0",
"fieldname": "deduct_tax_for_unclaimed_employee_benefits",
"fieldtype": "Check",
- "label": "Deduct Tax For Unclaimed Employee Benefits",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Deduct Tax For Unclaimed Employee Benefits"
},
{
"default": "0",
"fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof",
"fieldtype": "Check",
- "label": "Deduct Tax For Unsubmitted Tax Exemption Proof",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Deduct Tax For Unsubmitted Tax Exemption Proof"
},
{
"fieldname": "earning_deduction",
"fieldtype": "Section Break",
"label": "Earning & Deduction",
- "oldfieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "oldfieldtype": "Section Break"
},
{
"fieldname": "earning",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1,
"width": "50%"
},
{
@@ -392,16 +324,12 @@
"label": "Earnings",
"oldfieldname": "earning_details",
"oldfieldtype": "Table",
- "options": "Salary Detail",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Salary Detail"
},
{
"fieldname": "deduction",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1,
"width": "50%"
},
{
@@ -410,16 +338,12 @@
"label": "Deductions",
"oldfieldname": "deduction_details",
"oldfieldtype": "Table",
- "options": "Salary Detail",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Salary Detail"
},
{
"fieldname": "totals",
"fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "oldfieldtype": "Section Break"
},
{
"fieldname": "gross_pay",
@@ -428,15 +352,11 @@
"oldfieldname": "gross_pay",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "column_break_25",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"fieldname": "total_deduction",
@@ -445,32 +365,24 @@
"oldfieldname": "total_deduction",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"depends_on": "total_loan_repayment",
"fieldname": "loan_repayment",
"fieldtype": "Section Break",
- "label": "Loan repayment",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Loan repayment"
},
{
"fieldname": "loans",
"fieldtype": "Table",
"label": "Employee Loan",
"options": "Salary Slip Loan",
- "print_hide": 1,
- "show_days": 1,
- "show_seconds": 1
+ "print_hide": 1
},
{
"fieldname": "section_break_43",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"default": "0",
@@ -478,9 +390,7 @@
"fieldtype": "Currency",
"label": "Total Principal Amount",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"default": "0",
@@ -488,15 +398,11 @@
"fieldtype": "Currency",
"label": "Total Interest Amount",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "column_break_45",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"default": "0",
@@ -504,16 +410,12 @@
"fieldtype": "Currency",
"label": "Total Loan Repayment",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "net_pay_info",
"fieldtype": "Section Break",
- "label": "net pay info",
- "show_days": 1,
- "show_seconds": 1
+ "label": "net pay info"
},
{
"description": "Gross Pay - Total Deduction - Loan Repayment",
@@ -523,15 +425,11 @@
"oldfieldname": "net_pay",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "column_break_53",
- "fieldtype": "Column Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Column Break"
},
{
"bold": 1,
@@ -539,15 +437,11 @@
"fieldtype": "Currency",
"label": "Rounded Total",
"options": "Company:company:default_currency",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "section_break_55",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"description": "Net Pay (in words) will be visible once you save the Salary Slip.",
@@ -556,9 +450,7 @@
"label": "Total in words",
"oldfieldname": "net_pay_in_words",
"oldfieldtype": "Data",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "amended_from",
@@ -570,9 +462,7 @@
"oldfieldtype": "Data",
"options": "Salary Slip",
"print_hide": 1,
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fetch_from": "employee.payroll_cost_center",
@@ -581,40 +471,32 @@
"fieldtype": "Link",
"label": "Payroll Cost Center",
"options": "Cost Center",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "mode_of_payment",
"fieldtype": "Select",
"label": "Mode Of Payment",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "absent_days",
"fieldtype": "Float",
"label": "Absent Days",
- "read_only": 1,
- "show_days": 1,
- "show_seconds": 1
+ "read_only": 1
},
{
"fieldname": "unmarked_days",
"fieldtype": "Float",
"hidden": 1,
- "label": "Unmarked days",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Unmarked days"
}
],
"icon": "fa fa-file-text",
"idx": 9,
"is_submittable": 1,
"links": [],
- "modified": "2020-06-25 14:42:43.921828",
+ "modified": "2020-07-22 12:41:03.659422",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Salary Slip",
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py
index 1e2983e421..4ccf56435d 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py
@@ -869,10 +869,10 @@ class SalarySlip(TransactionBase):
# other taxes and charges on income tax
for d in tax_slab.other_taxes_and_charges:
- if flt(d.min_taxable_income) and flt(d.min_taxable_income) > tax_amount:
+ if flt(d.min_taxable_income) and flt(d.min_taxable_income) > annual_taxable_earning:
continue
- if flt(d.max_taxable_income) and flt(d.max_taxable_income) < tax_amount:
+ if flt(d.max_taxable_income) and flt(d.max_taxable_income) < annual_taxable_earning:
continue
tax_amount += tax_amount * flt(d.percent) / 100
diff --git a/erpnext/payroll/number_card/total_declaration_submitted/total_declaration_submitted.json b/erpnext/payroll/number_card/total_declaration_submitted/total_declaration_submitted.json
new file mode 100644
index 0000000000..fa5739b2f3
--- /dev/null
+++ b/erpnext/payroll/number_card/total_declaration_submitted/total_declaration_submitted.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:34.575627",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Employee Tax Exemption Declaration",
+ "dynamic_filters_json": "[[\"Employee Tax Exemption Declaration\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Employee Tax Exemption Declaration\",\"creation\",\"Timespan\",\"last year\",false],[\"Employee Tax Exemption Declaration\",\"docstatus\",\"=\",\"1\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Declaration Submitted",
+ "modified": "2020-07-22 13:22:46.001099",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Total Declaration Submitted",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/payroll/number_card/total_incentive_given(last_month)/total_incentive_given(last_month).json b/erpnext/payroll/number_card/total_incentive_given(last_month)/total_incentive_given(last_month).json
new file mode 100644
index 0000000000..2106706173
--- /dev/null
+++ b/erpnext/payroll/number_card/total_incentive_given(last_month)/total_incentive_given(last_month).json
@@ -0,0 +1,22 @@
+{
+ "aggregate_function_based_on": "incentive_amount",
+ "creation": "2020-07-22 11:56:34.599047",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Employee Incentive",
+ "dynamic_filters_json": "",
+ "filters_json": "[[\"Employee Incentive\",\"docstatus\",\"=\",\"1\",false],[\"Employee Incentive\",\"payroll_date\",\"Timespan\",\"last year\",false]]",
+ "function": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Incentive Given(Last month)",
+ "modified": "2020-07-23 12:05:26.963616",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Total Incentive Given(Last month)",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/payroll/number_card/total_outgoing_salary(last_month)/total_outgoing_salary(last_month).json b/erpnext/payroll/number_card/total_outgoing_salary(last_month)/total_outgoing_salary(last_month).json
new file mode 100644
index 0000000000..44ee72203f
--- /dev/null
+++ b/erpnext/payroll/number_card/total_outgoing_salary(last_month)/total_outgoing_salary(last_month).json
@@ -0,0 +1,22 @@
+{
+ "aggregate_function_based_on": "rounded_total",
+ "creation": "2020-07-22 11:56:34.626019",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Salary Slip",
+ "dynamic_filters_json": "[[\"Salary Slip\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Salary Slip\",\"docstatus\",\"=\",\"1\",false],[\"Salary Slip\",\"start_date\",\"Timespan\",\"last month\",false]]",
+ "function": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Outgoing Salary(Last month)",
+ "modified": "2020-07-22 13:54:14.678954",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Total Outgoing Salary(Last month)",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/payroll/number_card/total_salary_structure/total_salary_structure.json b/erpnext/payroll/number_card/total_salary_structure/total_salary_structure.json
new file mode 100644
index 0000000000..030935f96d
--- /dev/null
+++ b/erpnext/payroll/number_card/total_salary_structure/total_salary_structure.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-22 11:56:34.688843",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Salary Structure",
+ "dynamic_filters_json": "[[\"Salary Structure\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Salary Structure\",\"docstatus\",\"=\",\"1\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Total Salary Structure",
+ "modified": "2020-07-22 13:24:03.938846",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Total Salary Structure",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/payroll/payroll_dashboard/payroll/payroll.json b/erpnext/payroll/payroll_dashboard/payroll/payroll.json
new file mode 100644
index 0000000000..fb49d88de7
--- /dev/null
+++ b/erpnext/payroll/payroll_dashboard/payroll/payroll.json
@@ -0,0 +1,42 @@
+{
+ "cards": [
+ {
+ "card": "Total Declaration Submitted"
+ },
+ {
+ "card": "Total Salary Structure"
+ },
+ {
+ "card": "Total Incentive Given(Last month)"
+ },
+ {
+ "card": "Total Outgoing Salary(Last month)"
+ }
+ ],
+ "charts": [
+ {
+ "chart": "Outgoing Salary",
+ "width": "Full"
+ },
+ {
+ "chart": "Designation Wise Salary(Last Month)",
+ "width": "Half"
+ },
+ {
+ "chart": "Department Wise Salary(Last Month)",
+ "width": "Half"
+ }
+ ],
+ "creation": "2020-07-22 11:56:34.727185",
+ "dashboard_name": "Payroll",
+ "docstatus": 0,
+ "doctype": "Dashboard",
+ "idx": 0,
+ "is_default": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 13:20:18.608969",
+ "modified_by": "Administrator",
+ "module": "Payroll",
+ "name": "Payroll",
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/erpnext/portal/doctype/products_settings/products_settings.py b/erpnext/portal/doctype/products_settings/products_settings.py
index 82afebf2f1..ae7dc68020 100644
--- a/erpnext/portal/doctype/products_settings/products_settings.py
+++ b/erpnext/portal/doctype/products_settings/products_settings.py
@@ -11,9 +11,9 @@ from frappe.model.document import Document
class ProductsSettings(Document):
def validate(self):
if self.home_page_is_products:
- website_settings = frappe.get_doc('Website Settings')
- website_settings.home_page = 'products'
- website_settings.save()
+ frappe.db.set_value("Website Settings", None, "home_page", "products")
+ elif frappe.db.get_single_value("Website Settings", "home_page") == 'products':
+ frappe.db.set_value("Website Settings", None, "home_page", "home")
self.validate_field_filters()
self.validate_attribute_filters()
@@ -40,4 +40,3 @@ def home_page_is_products(doc, method):
home_page_is_products = cint(frappe.db.get_single_value('Products Settings', 'home_page_is_products'))
if home_page_is_products:
doc.home_page = 'products'
-
diff --git a/erpnext/portal/product_configurator/utils.py b/erpnext/portal/product_configurator/utils.py
index f8af30a1c3..9eef16bed3 100644
--- a/erpnext/portal/product_configurator/utils.py
+++ b/erpnext/portal/product_configurator/utils.py
@@ -239,7 +239,8 @@ def get_next_attribute_and_values(item_code, selected_attributes):
if exact_match:
data = get_product_info_for_website(exact_match[0])
product_info = data.product_info
- product_info["allow_items_not_in_stock"] = cint(data.cart_settings.allow_items_not_in_stock)
+ if product_info:
+ product_info["allow_items_not_in_stock"] = cint(data.cart_settings.allow_items_not_in_stock)
if not data.cart_settings.show_price:
product_info = None
else:
diff --git a/erpnext/portal/utils.py b/erpnext/portal/utils.py
index 56e4fcde73..d6d4469420 100644
--- a/erpnext/portal/utils.py
+++ b/erpnext/portal/utils.py
@@ -88,21 +88,30 @@ def create_customer_or_supplier():
party.flags.ignore_mandatory = True
party.insert(ignore_permissions=True)
+ alternate_doctype = "Customer" if doctype == "Supplier" else "Supplier"
+
+ if party_exists(alternate_doctype, user):
+ # if user is both customer and supplier, alter fullname to avoid contact name duplication
+ fullname += "-" + doctype
+
+ create_party_contact(doctype, fullname, user, party.name)
+
+ return party
+
+def create_party_contact(doctype, fullname, user, party_name):
contact = frappe.new_doc("Contact")
contact.update({
"first_name": fullname,
"email_id": user
})
- contact.append('links', dict(link_doctype=doctype, link_name=party.name))
+ contact.append('links', dict(link_doctype=doctype, link_name=party_name))
+ contact.append('email_ids', dict(email_id=user))
contact.flags.ignore_mandatory = True
contact.insert(ignore_permissions=True)
- return party
-
-
def party_exists(doctype, user):
+ # check if contact exists against party and if it is linked to the doctype
contact_name = frappe.db.get_value("Contact", {"email_id": user})
-
if contact_name:
contact = frappe.get_doc('Contact', contact_name)
doctypes = [d.link_doctype for d in contact.links]
diff --git a/erpnext/projects/dashboard_chart/project_summary/project_summary.json b/erpnext/projects/dashboard_chart/project_summary/project_summary.json
new file mode 100644
index 0000000000..157ee1b954
--- /dev/null
+++ b/erpnext/projects/dashboard_chart/project_summary/project_summary.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Project Summary",
+ "chart_type": "Report",
+ "creation": "2020-07-20 20:17:16.363681",
+ "custom_options": "{\"type\": \"bar\", \"colors\": [\"#fc4f51\", \"#78d6ff\", \"#7575ff\"], \"axisOptions\": { \"shortenYAxisNumbers\": 1}, \"barOptions\": { \"stacked\": 1 }}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\"}",
+ "filters_json": "{\"status\":\"Open\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 17:16:39.627076",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Project Summary",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Project Summary",
+ "timeseries": 0,
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/projects/dashboard_fixtures.py b/erpnext/projects/dashboard_fixtures.py
deleted file mode 100644
index d89ffe9d83..0000000000
--- a/erpnext/projects/dashboard_fixtures.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-import json
-from frappe import _
-
-def get_company_for_dashboards():
- company = frappe.defaults.get_defaults().company
- if company:
- return company
- else:
- company_list = frappe.get_list("Company")
- if company_list:
- return company_list[0].name
- return None
-
-def get_data():
- return frappe._dict({
- "dashboards": get_dashboards(),
- "charts": get_charts(),
- })
-
-def get_dashboards():
- return [{
- "doctype": "Dashboard",
- "name": "Project",
- "dashboard_name": "Project",
- "charts": [
- { "chart": "Project Summary", "width": "Full" }
- ]
- }]
-
-def get_charts():
- company = frappe.get_doc("Company", get_company_for_dashboards())
-
- return [
- {
- 'doctype': 'Dashboard Chart',
- 'name': 'Project Summary',
- 'chart_name': _('Project Summary'),
- 'chart_type': 'Report',
- 'report_name': 'Project Summary',
- 'is_public': 1,
- 'is_custom': 1,
- 'filters_json': json.dumps({"company": company.name, "status": "Open"}),
- 'type': 'Bar',
- 'custom_options': '{"type": "bar", "colors": ["#fc4f51", "#78d6ff", "#7575ff"], "axisOptions": { "shortenYAxisNumbers": 1}, "barOptions": { "stacked": 1 }}',
- }
- ]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 32ea05b42a..5bbd29c4c4 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -239,6 +239,7 @@ def get_list_context(context=None):
}
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_users_for_project(doctype, txt, searchfield, start, page_len, filters):
conditions = []
return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)
@@ -472,7 +473,7 @@ def create_kanban_board_if_not_exists(project):
from frappe.desk.doctype.kanban_board.kanban_board import quick_kanban_board
if not frappe.db.exists('Kanban Board', project):
- quick_kanban_board('Task', project, 'status')
+ quick_kanban_board('Task', project, 'status', project)
return True
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 4bdda68b69..fb84094ffe 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -175,6 +175,9 @@ class Task(NestedSet):
self.update_nsm_model()
+ def after_delete(self):
+ self.update_project()
+
def update_status(self):
if self.status not in ('Cancelled', 'Completed') and self.exp_end_date:
from datetime import datetime
@@ -190,6 +193,7 @@ def check_if_child_exists(name):
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_project(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
return frappe.db.sql(""" select name from `tabProject`
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 7fe22bec4b..9e807f728e 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -214,6 +214,7 @@ def get_projectwise_timesheet_data(project, parent=None):
and sales_invoice is null""".format(cond), {'project': project, 'parent': parent}, as_dict=1)
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_timesheet(doctype, txt, searchfield, start, page_len, filters):
if not filters: filters = {}
diff --git a/erpnext/projects/doctype/timesheet/timesheet_dashboard.py b/erpnext/projects/doctype/timesheet/timesheet_dashboard.py
new file mode 100644
index 0000000000..acff97a226
--- /dev/null
+++ b/erpnext/projects/doctype/timesheet/timesheet_dashboard.py
@@ -0,0 +1,13 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'time_sheet',
+ 'transactions': [
+ {
+ 'label': _('References'),
+ 'items': ['Sales Invoice', 'Salary Slip']
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/erpnext/projects/projects_dashboard/project/project.json b/erpnext/projects/projects_dashboard/project/project.json
new file mode 100644
index 0000000000..f7824cee55
--- /dev/null
+++ b/erpnext/projects/projects_dashboard/project/project.json
@@ -0,0 +1,21 @@
+{
+ "cards": [],
+ "charts": [
+ {
+ "chart": "Project Summary",
+ "width": "Full"
+ }
+ ],
+ "creation": "2020-07-20 20:17:16.397373",
+ "dashboard_name": "Project",
+ "docstatus": 0,
+ "doctype": "Dashboard",
+ "idx": 0,
+ "is_default": 0,
+ "is_standard": 1,
+ "modified": "2020-07-22 17:17:03.780625",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Project",
+ "owner": "Administrator"
+}
\ No newline at end of file
diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index d0d88ebdf0..c39f908e43 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py
@@ -7,6 +7,7 @@ from __future__ import unicode_literals
import frappe
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def query_task(doctype, txt, searchfield, start, page_len, filters):
from frappe.desk.reportview import build_match_conditions
diff --git a/erpnext/public/css/pos.css b/erpnext/public/css/pos.css
index 613a5ffa6e..e80e3ed126 100644
--- a/erpnext/public/css/pos.css
+++ b/erpnext/public/css/pos.css
@@ -1,179 +1,216 @@
-[data-route="point-of-sale"] .layout-main-section-wrapper {
- margin-bottom: 0;
-}
-[data-route="point-of-sale"] .pos-items-wrapper {
- max-height: calc(100vh - 210px);
-}
-.pos {
- padding: 15px;
-}
-.list-item {
- min-height: 40px;
- height: auto;
-}
-.cart-container {
- padding: 0 15px;
- display: inline-block;
- width: 39%;
- vertical-align: top;
-}
-.item-container {
- padding: 0 15px;
- display: inline-block;
- width: 60%;
- vertical-align: top;
-}
-.search-field {
- width: 60%;
-}
-.search-field input::placeholder {
- font-size: 12px;
-}
-.item-group-field {
- width: 40%;
- margin-left: 15px;
-}
-.cart-wrapper {
- margin-bottom: 12px;
-}
-.cart-wrapper .list-item__content:not(:first-child) {
- justify-content: flex-end;
-}
-.cart-wrapper .list-item--head .list-item__content:nth-child(2) {
- flex: 1.5;
-}
-.cart-items {
- height: 150px;
- overflow: auto;
-}
-.cart-items .list-item.current-item {
- background-color: #fffce7;
-}
-.cart-items .list-item.current-item.qty input {
- border: 1px solid #5E64FF;
- font-weight: bold;
-}
-.cart-items .list-item.current-item.disc .discount {
- font-weight: bold;
-}
-.cart-items .list-item.current-item.rate .rate {
- font-weight: bold;
-}
-.cart-items .list-item .quantity {
- flex: 1.5;
-}
-.cart-items input {
- text-align: right;
- height: 22px;
- font-size: 12px;
-}
-.fields {
- display: flex;
-}
-.pos-items-wrapper {
- max-height: 480px;
- overflow-y: auto;
-}
-.pos-items {
- overflow: hidden;
-}
-.pos-item-wrapper {
- display: flex;
- flex-direction: column;
- position: relative;
- width: 25%;
-}
-.image-view-container {
- display: block;
-}
-.image-view-container .image-field {
- height: auto;
-}
-.empty-state {
- height: 100%;
- position: relative;
-}
-.empty-state span {
- position: absolute;
- color: #8D99A6;
- font-size: 12px;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
-}
-@keyframes yellow-fade {
- 0% {
- background-color: #fffce7;
- }
- 100% {
- background-color: transparent;
- }
-}
-.highlight {
- animation: yellow-fade 1s ease-in 1;
-}
-input[type=number]::-webkit-inner-spin-button,
-input[type=number]::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
-}
-.number-pad {
- border-collapse: collapse;
- cursor: pointer;
- display: table;
-}
-.num-row {
- display: table-row;
-}
-.num-col {
- display: table-cell;
- border: 1px solid #d1d8dd;
-}
-.num-col > div {
- width: 50px;
- height: 50px;
- text-align: center;
- line-height: 50px;
-}
-.num-col.active {
- background-color: #fffce7;
-}
-.num-col.brand-primary {
- background-color: #5E64FF;
- color: #ffffff;
-}
-.discount-amount .discount-inputs {
- display: flex;
- flex-direction: column;
- padding: 15px 0;
-}
-.discount-amount input:first-child {
- margin-bottom: 10px;
-}
-.taxes-and-totals {
- border-top: 1px solid #d1d8dd;
-}
-.taxes-and-totals .taxes {
- display: flex;
- flex-direction: column;
- padding: 15px 0;
- align-items: flex-end;
-}
-.taxes-and-totals .taxes > div:first-child {
- margin-bottom: 10px;
-}
-.grand-total {
- border-top: 1px solid #d1d8dd;
-}
-.grand-total .list-item {
- height: 60px;
-}
-.grand-total .grand-total-value {
- font-size: 18px;
-}
-.rounded-total-value {
- font-size: 18px;
-}
-.quantity-total {
- font-size: 18px;
-}
+[data-route="point-of-sale"] .layout-main-section { border: none; font-size: 12px; }
+[data-route="point-of-sale"] .layout-main-section-wrapper { margin-bottom: 0; }
+[data-route="point-of-sale"] .pos-items-wrapper { max-height: calc(100vh - 210px); }
+:root { --border-color: #d1d8dd; --text-color: #8d99a6; --primary: #5e64ff; }
+[data-route="point-of-sale"] .flex { display: flex; }
+[data-route="point-of-sale"] .grid { display: grid; }
+[data-route="point-of-sale"] .absolute { position: absolute; }
+[data-route="point-of-sale"] .relative { position: relative; }
+[data-route="point-of-sale"] .abs-center { top: 50%; left: 50%; transform: translate(-50%, -50%); }
+[data-route="point-of-sale"] .inline { display: inline; }
+[data-route="point-of-sale"] .float-right { float: right; }
+[data-route="point-of-sale"] .grid-cols-1 { grid-template-columns: repeat(1, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .grid-cols-3 { grid-template-columns: repeat(3, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .grid-cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .grid-cols-5 { grid-template-columns: repeat(5, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .grid-cols-10 { grid-template-columns: repeat(10, minmax(0, 1fr)); }
+[data-route="point-of-sale"] .gap-2 { grid-gap: 0.5rem; gap: 0.5rem; }
+[data-route="point-of-sale"] .gap-4 { grid-gap: 1rem; gap: 1rem; }
+[data-route="point-of-sale"] .gap-6 { grid-gap: 1.25rem; gap: 1.25rem; }
+[data-route="point-of-sale"] .gap-8 { grid-gap: 1.5rem; gap: 1.5rem; }
+[data-route="point-of-sale"] .row-gap-2 { grid-row-gap: 0.5rem; row-gap: 0.5rem; }
+[data-route="point-of-sale"] .col-gap-4 { grid-column-gap: 1rem; column-gap: 1rem; }
+[data-route="point-of-sale"] .col-span-2 { grid-column: span 2 / span 2; }
+[data-route="point-of-sale"] .col-span-3 { grid-column: span 3 / span 3; }
+[data-route="point-of-sale"] .col-span-4 { grid-column: span 4 / span 4; }
+[data-route="point-of-sale"] .col-span-6 { grid-column: span 6 / span 6; }
+[data-route="point-of-sale"] .col-span-10 { grid-column: span 10 / span 10; }
+[data-route="point-of-sale"] .row-span-2 { grid-row: span 2 / span 2; }
+[data-route="point-of-sale"] .grid-auto-row { grid-auto-rows: 5.5rem; }
+[data-route="point-of-sale"] .d-none { display: none; }
+[data-route="point-of-sale"] .flex-wrap { flex-wrap: wrap; }
+[data-route="point-of-sale"] .flex-row { flex-direction: row; }
+[data-route="point-of-sale"] .flex-col { flex-direction: column; }
+[data-route="point-of-sale"] .flex-row-rev { flex-direction: row-reverse; }
+[data-route="point-of-sale"] .flex-col-rev { flex-direction: column-reverse; }
+[data-route="point-of-sale"] .flex-1 { flex: 1 1 0%; }
+[data-route="point-of-sale"] .items-center { align-items: center; }
+[data-route="point-of-sale"] .items-end { align-items: flex-end; }
+[data-route="point-of-sale"] .f-grow-1 { flex-grow: 1; }
+[data-route="point-of-sale"] .f-grow-2 { flex-grow: 2; }
+[data-route="point-of-sale"] .f-grow-3 { flex-grow: 3; }
+[data-route="point-of-sale"] .f-grow-4 { flex-grow: 4; }
+[data-route="point-of-sale"] .f-shrink-0 { flex-shrink: 0; }
+[data-route="point-of-sale"] .f-shrink-1 { flex-shrink: 1; }
+[data-route="point-of-sale"] .f-shrink-2 { flex-shrink: 2; }
+[data-route="point-of-sale"] .f-shrink-3 { flex-shrink: 3; }
+[data-route="point-of-sale"] .shadow { box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 2px 0 rgba(0, 0, 0, 0.06); }
+[data-route="point-of-sale"] .shadow-sm { box-shadow: 0 0.5px 3px 0 rgba(0, 0, 0, 0.125); }
+[data-route="point-of-sale"] .shadow-inner { box-shadow: inset 0 2px 4px 0 rgba(0, 0, 0, 0.1); }
+[data-route="point-of-sale"] .rounded { border-radius: 0.3rem; }
+[data-route="point-of-sale"] .rounded-b { border-bottom-left-radius: 0.3rem; border-bottom-right-radius: 0.3rem; }
+[data-route="point-of-sale"] .p-8 { padding: 2rem; }
+[data-route="point-of-sale"] .p-16 { padding: 4rem; }
+[data-route="point-of-sale"] .p-32 { padding: 8rem; }
+[data-route="point-of-sale"] .p-6 { padding: 1.5rem; }
+[data-route="point-of-sale"] .p-4 { padding: 1rem; }
+[data-route="point-of-sale"] .p-3 { padding: 0.75rem; }
+[data-route="point-of-sale"] .p-2 { padding: 0.5rem; }
+[data-route="point-of-sale"] .m-8 { margin: 2rem; }
+[data-route="point-of-sale"] .p-1 { padding: 0.25rem; }
+[data-route="point-of-sale"] .pr-0 { padding-right: 0rem; }
+[data-route="point-of-sale"] .pl-0 { padding-left: 0rem; }
+[data-route="point-of-sale"] .pt-0 { padding-top: 0rem; }
+[data-route="point-of-sale"] .pb-0 { padding-bottom: 0rem; }
+[data-route="point-of-sale"] .mr-0 { margin-right: 0rem; }
+[data-route="point-of-sale"] .ml-0 { margin-left: 0rem; }
+[data-route="point-of-sale"] .mt-0 { margin-top: 0rem; }
+[data-route="point-of-sale"] .mb-0 { margin-bottom: 0rem; }
+[data-route="point-of-sale"] .pr-2 { padding-right: 0.5rem; }
+[data-route="point-of-sale"] .pl-2 { padding-left: 0.5rem; }
+[data-route="point-of-sale"] .pt-2 { padding-top: 0.5rem; }
+[data-route="point-of-sale"] .pb-2 { padding-bottom: 0.5rem; }
+[data-route="point-of-sale"] .pr-3 { padding-right: 0.75rem; }
+[data-route="point-of-sale"] .pl-3 { padding-left: 0.75rem; }
+[data-route="point-of-sale"] .pt-3 { padding-top: 0.75rem; }
+[data-route="point-of-sale"] .pb-3 { padding-bottom: 0.75rem; }
+[data-route="point-of-sale"] .pr-4 { padding-right: 1rem; }
+[data-route="point-of-sale"] .pl-4 { padding-left: 1rem; }
+[data-route="point-of-sale"] .pt-4 { padding-top: 1rem; }
+[data-route="point-of-sale"] .pb-4 { padding-bottom: 1rem; }
+[data-route="point-of-sale"] .mr-4 { margin-right: 1rem; }
+[data-route="point-of-sale"] .ml-4 { margin-left: 1rem; }
+[data-route="point-of-sale"] .mt-4 { margin-top: 1rem; }
+[data-route="point-of-sale"] .mb-4 { margin-bottom: 1rem; }
+[data-route="point-of-sale"] .mr-2 { margin-right: 0.5rem; }
+[data-route="point-of-sale"] .ml-2 { margin-left: 0.5rem; }
+[data-route="point-of-sale"] .mt-2 { margin-top: 0.5rem; }
+[data-route="point-of-sale"] .mb-2 { margin-bottom: 0.5rem; }
+[data-route="point-of-sale"] .mr-1 { margin-right: 0.25rem; }
+[data-route="point-of-sale"] .ml-1 { margin-left: 0.25rem; }
+[data-route="point-of-sale"] .mt-1 { margin-top: 0.25rem; }
+[data-route="point-of-sale"] .mb-1 { margin-bottom: 0.25rem; }
+[data-route="point-of-sale"] .mr-auto { margin-right: auto; }
+[data-route="point-of-sale"] .ml-auto { margin-left: auto; }
+[data-route="point-of-sale"] .mt-auto { margin-top: auto; }
+[data-route="point-of-sale"] .mb-auto { margin-bottom: auto; }
+[data-route="point-of-sale"] .pr-6 { padding-right: 1.5rem; }
+[data-route="point-of-sale"] .pl-6 { padding-left: 1.5rem; }
+[data-route="point-of-sale"] .pt-6 { padding-top: 1.5rem; }
+[data-route="point-of-sale"] .pb-6 { padding-bottom: 1.5rem; }
+[data-route="point-of-sale"] .mr-6 { margin-right: 1.5rem; }
+[data-route="point-of-sale"] .ml-6 { margin-left: 1.5rem; }
+[data-route="point-of-sale"] .mt-6 { margin-top: 1.5rem; }
+[data-route="point-of-sale"] .mb-6 { margin-bottom: 1.5rem; }
+[data-route="point-of-sale"] .mr-8 { margin-right: 2rem; }
+[data-route="point-of-sale"] .ml-8 { margin-left: 2rem; }
+[data-route="point-of-sale"] .mt-8 { margin-top: 2rem; }
+[data-route="point-of-sale"] .mb-8 { margin-bottom: 2rem; }
+[data-route="point-of-sale"] .pr-8 { padding-right: 2rem; }
+[data-route="point-of-sale"] .pl-8 { padding-left: 2rem; }
+[data-route="point-of-sale"] .pt-8 { padding-top: 2rem; }
+[data-route="point-of-sale"] .pb-8 { padding-bottom: 2rem; }
+[data-route="point-of-sale"] .pr-16 { padding-right: 4rem; }
+[data-route="point-of-sale"] .pl-16 { padding-left: 4rem; }
+[data-route="point-of-sale"] .pt-16 { padding-top: 4rem; }
+[data-route="point-of-sale"] .pb-16 { padding-bottom: 4rem; }
+[data-route="point-of-sale"] .w-full { width: 100%; }
+[data-route="point-of-sale"] .h-full { height: 100%; }
+[data-route="point-of-sale"] .w-quarter { width: 25%; }
+[data-route="point-of-sale"] .w-half { width: 50%; }
+[data-route="point-of-sale"] .w-66 { width: 66.66%; }
+[data-route="point-of-sale"] .w-33 { width: 33.33%; }
+[data-route="point-of-sale"] .w-60 { width: 60%; }
+[data-route="point-of-sale"] .w-40 { width: 40%; }
+[data-route="point-of-sale"] .w-fit { width: fit-content; }
+[data-route="point-of-sale"] .w-6 { width: 2rem; }
+[data-route="point-of-sale"] .h-6 { min-height: 2rem; height: 2rem; }
+[data-route="point-of-sale"] .w-8 { width: 2.5rem; }
+[data-route="point-of-sale"] .h-8 { min-height: 2.5rem; height: 2.5rem; }
+[data-route="point-of-sale"] .w-10 { width: 3rem; }
+[data-route="point-of-sale"] .h-10 { min-height:3rem; height: 3rem; }
+[data-route="point-of-sale"] .h-12 { min-height: 3.3rem; height: 3.3rem; }
+[data-route="point-of-sale"] .w-12 { width: 3.3rem; }
+[data-route="point-of-sale"] .h-14 { min-height: 4.2rem; height: 4.2rem; }
+[data-route="point-of-sale"] .h-16 { min-height: 4.6rem; height: 4.6rem; }
+[data-route="point-of-sale"] .h-18 { min-height: 5rem; height: 5rem; }
+[data-route="point-of-sale"] .w-18 { width: 5.4rem; }
+[data-route="point-of-sale"] .w-24 { width: 7.2rem; }
+[data-route="point-of-sale"] .w-26 { width: 8.4rem; }
+[data-route="point-of-sale"] .h-24 { min-height: 7.2rem; height: 7.2rem; }
+[data-route="point-of-sale"] .h-32 { min-height: 9.6rem; height: 9.6rem; }
+[data-route="point-of-sale"] .w-46 { width: 15rem; }
+[data-route="point-of-sale"] .h-46 { min-height:15rem; height: 15rem; }
+[data-route="point-of-sale"] .h-100 { height: 100vh; }
+[data-route="point-of-sale"] .mx-h-70 { max-height: 67rem; }
+[data-route="point-of-sale"] .border-grey-300 { border-color: #e2e8f0; }
+[data-route="point-of-sale"] .border-grey { border: 1px solid #d1d8dd; }
+[data-route="point-of-sale"] .border-white { border: 1px solid #fff; }
+[data-route="point-of-sale"] .border-b-grey { border-bottom: 1px solid #d1d8dd; }
+[data-route="point-of-sale"] .border-t-grey { border-top: 1px solid #d1d8dd; }
+[data-route="point-of-sale"] .border-r-grey { border-right: 1px solid #d1d8dd; }
+[data-route="point-of-sale"] .text-dark-grey { color: #5f5f5f; }
+[data-route="point-of-sale"] .text-grey { color: #8d99a6; }
+[data-route="point-of-sale"] .text-grey-100 { color: #d1d8dd; }
+[data-route="point-of-sale"] .text-grey-200 { color: #a0aec0; }
+[data-route="point-of-sale"] .bg-green-200 { background-color: #c6f6d5; }
+[data-route="point-of-sale"] .text-bold { font-weight: bold; }
+[data-route="point-of-sale"] .italic { font-style: italic; }
+[data-route="point-of-sale"] .font-weight-450 { font-weight: 450; }
+[data-route="point-of-sale"] .justify-around { justify-content: space-around; }
+[data-route="point-of-sale"] .justify-between { justify-content: space-between; }
+[data-route="point-of-sale"] .justify-center { justify-content: center; }
+[data-route="point-of-sale"] .justify-end { justify-content: flex-end; }
+[data-route="point-of-sale"] .bg-white { background-color: white; }
+[data-route="point-of-sale"] .bg-light-grey { background-color: #f0f4f7; }
+[data-route="point-of-sale"] .bg-grey-100 { background-color: #f7fafc; }
+[data-route="point-of-sale"] .bg-grey-200 { background-color: #edf2f7; }
+[data-route="point-of-sale"] .bg-grey { background-color: #f4f5f6; }
+[data-route="point-of-sale"] .text-center { text-align: center; }
+[data-route="point-of-sale"] .text-right { text-align: right; }
+[data-route="point-of-sale"] .text-sm { font-size: 1rem; }
+[data-route="point-of-sale"] .text-md-0 { font-size: 1.25rem; }
+[data-route="point-of-sale"] .text-md { font-size: 1.4rem; }
+[data-route="point-of-sale"] .text-lg { font-size: 1.6rem; }
+[data-route="point-of-sale"] .text-xl { font-size: 2.2rem; }
+[data-route="point-of-sale"] .text-2xl { font-size: 2.8rem; }
+[data-route="point-of-sale"] .text-2-5xl { font-size: 3rem; }
+[data-route="point-of-sale"] .text-3xl { font-size: 3.8rem; }
+[data-route="point-of-sale"] .text-6xl { font-size: 4.8rem; }
+[data-route="point-of-sale"] .line-through { text-decoration: line-through; }
+[data-route="point-of-sale"] .text-primary { color: #5e64ff; }
+[data-route="point-of-sale"] .text-white { color: #fff; }
+[data-route="point-of-sale"] .text-green-500 { color: #48bb78; }
+[data-route="point-of-sale"] .bg-primary { background-color: #5e64ff; }
+[data-route="point-of-sale"] .border-primary { border-color: #5e64ff; }
+[data-route="point-of-sale"] .text-danger { color: #e53e3e; }
+[data-route="point-of-sale"] .scroll-x { overflow-x: scroll;overflow-y: hidden; }
+[data-route="point-of-sale"] .scroll-y { overflow-y: scroll;overflow-x: hidden; }
+[data-route="point-of-sale"] .overflow-hidden { overflow: hidden; }
+[data-route="point-of-sale"] .whitespace-nowrap { white-space: nowrap; }
+[data-route="point-of-sale"] .sticky { position: sticky; top: -1px; }
+[data-route="point-of-sale"] .bg-white { background-color: #fff; }
+[data-route="point-of-sale"] .bg-selected { background-color: #fffdf4; }
+[data-route="point-of-sale"] .border-dashed { border-width:1px; border-style: dashed; }
+[data-route="point-of-sale"] .z-100 { z-index: 100; }
+
+[data-route="point-of-sale"] .frappe-control { margin: 0 !important; width: 100%; }
+[data-route="point-of-sale"] .form-control { font-size: 12px; }
+[data-route="point-of-sale"] .form-group { margin: 0 !important; }
+[data-route="point-of-sale"] .pointer { cursor: pointer; }
+[data-route="point-of-sale"] .no-select { user-select: none; }
+[data-route="point-of-sale"] .item-wrapper:hover { transform: scale(1.02, 1.02); }
+[data-route="point-of-sale"] .hover-underline:hover { text-decoration: underline; }
+[data-route="point-of-sale"] .item-wrapper { transition: scale 0.2s ease-in-out; }
+[data-route="point-of-sale"] .cart-items-section .cart-item-wrapper:not(:first-child) { border-top: none; }
+[data-route="point-of-sale"] .customer-transactions .invoice-wrapper:not(:first-child) { border-top: none; }
+
+[data-route="point-of-sale"] .payment-summary-wrapper:last-child { border-bottom: none; }
+[data-route="point-of-sale"] .item-summary-wrapper:last-child { border-bottom: none; }
+[data-route="point-of-sale"] .total-summary-wrapper:last-child { border-bottom: none; }
+[data-route="point-of-sale"] .invoices-container .invoice-wrapper:last-child { border-bottom: none; }
+[data-route="point-of-sale"] .summary-btns:last-child { margin-right: 0px; }
+[data-route="point-of-sale"] ::-webkit-scrollbar { width: 1px }
+
+[data-route="point-of-sale"] .indicator.grey::before { background-color: #8d99a6; }
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index b72ceb2113..405a33c72a 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -34,12 +34,12 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.calculate_discount_amount();
// Advance calculation applicable to Sales /Purchase Invoice
- if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)
+ if(in_list(["Sales Invoice", "POS Invoice", "Purchase Invoice"], this.frm.doc.doctype)
&& this.frm.doc.docstatus < 2 && !this.frm.doc.is_return) {
this.calculate_total_advance(update_paid_amount);
}
- if (this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.is_pos &&
+ if (in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype) && this.frm.doc.is_pos &&
this.frm.doc.is_return) {
this.update_paid_amount_for_return();
}
@@ -425,7 +425,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
? this.frm.doc["taxes"][tax_count - 1].total + flt(this.frm.doc.rounding_adjustment)
: this.frm.doc.net_total);
- if(in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"], this.frm.doc.doctype)) {
+ if(in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "POS Invoice"], this.frm.doc.doctype)) {
this.frm.doc.base_grand_total = (this.frm.doc.total_taxes_and_charges) ?
flt(this.frm.doc.grand_total * this.frm.doc.conversion_rate) : this.frm.doc.base_net_total;
} else {
@@ -604,7 +604,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
// NOTE:
// paid_amount and write_off_amount is only for POS/Loyalty Point Redemption Invoice
// total_advance is only for non POS Invoice
- if(this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.is_return){
+ if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype) && this.frm.doc.is_return){
this.calculate_paid_amount();
}
@@ -612,7 +612,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount"]);
- if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)) {
+ if(in_list(["Sales Invoice", "POS Invoice", "Purchase Invoice"], this.frm.doc.doctype)) {
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
@@ -634,7 +634,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
this.frm.refresh_field("base_paid_amount");
}
- if(this.frm.doc.doctype == "Sales Invoice") {
+ if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype)) {
let total_amount_for_payment = (this.frm.doc.redeem_loyalty_points && this.frm.doc.loyalty_amount)
? flt(total_amount_to_pay - this.frm.doc.loyalty_amount, precision("base_grand_total"))
: total_amount_to_pay;
@@ -691,11 +691,13 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)) {
$.each(this.frm.doc['payments'] || [], function(index, data) {
if(data.default && payment_status && total_amount_to_pay > 0) {
- data.base_amount = flt(total_amount_to_pay, precision("base_amount"));
- data.amount = flt(total_amount_to_pay / me.frm.doc.conversion_rate, precision("amount"));
+ let base_amount = flt(total_amount_to_pay, precision("base_amount", data));
+ frappe.model.set_value(data.doctype, data.name, "base_amount", base_amount);
+ let amount = flt(total_amount_to_pay / me.frm.doc.conversion_rate, precision("amount", data));
+ frappe.model.set_value(data.doctype, data.name, "amount", amount);
payment_status = false;
} else if(me.frm.doc.paid_amount) {
- data.amount = 0.0;
+ frappe.model.set_value(data.doctype, data.name, "amount", 0.0);
}
});
}
@@ -707,7 +709,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
var base_paid_amount = 0.0;
if(this.frm.doc.is_pos) {
$.each(this.frm.doc['payments'] || [], function(index, data){
- data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount"));
+ data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount", data));
paid_amount += data.amount;
base_paid_amount += data.base_amount;
});
@@ -719,14 +721,14 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
paid_amount += flt(this.frm.doc.loyalty_amount / me.frm.doc.conversion_rate, precision("paid_amount"));
}
- this.frm.doc.paid_amount = flt(paid_amount, precision("paid_amount"));
- this.frm.doc.base_paid_amount = flt(base_paid_amount, precision("base_paid_amount"));
+ this.frm.set_value('paid_amount', flt(paid_amount, precision("paid_amount")));
+ this.frm.set_value('base_paid_amount', flt(base_paid_amount, precision("base_paid_amount")));
},
calculate_change_amount: function(){
this.frm.doc.change_amount = 0.0;
this.frm.doc.base_change_amount = 0.0;
- if(this.frm.doc.doctype == "Sales Invoice"
+ if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype)
&& this.frm.doc.paid_amount > this.frm.doc.grand_total && !this.frm.doc.is_return) {
var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type; });
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 3c56a636bd..4e50f3d7f6 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -651,7 +651,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
let child = frappe.model.add_child(me.frm.doc, "taxes");
child.charge_type = "On Net Total";
child.account_head = tax;
- child.rate = 0;
+ child.rate = rate;
}
});
}
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index d89d4712e6..459c01b269 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -3,7 +3,7 @@ frappe.provide("erpnext.financial_statements");
erpnext.financial_statements = {
"filters": get_filters(),
"formatter": function(value, row, column, data, default_formatter) {
- if (column.fieldname=="account") {
+ if (data && column.fieldname=="account") {
value = data.account_name || value;
column.link_onclick =
@@ -13,7 +13,7 @@ erpnext.financial_statements = {
value = default_formatter(value, row, column, data);
- if (!data.parent_account) {
+ if (data && !data.parent_account) {
value = $(`${value}`);
var $value = $(value).css("font-weight", "bold");
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 44a8cd0067..6a923ae423 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -55,6 +55,7 @@ frappe.ready(function() {
shopping_cart.show_shoppingcart_dropdown();
shopping_cart.set_cart_count();
shopping_cart.bind_dropdown_cart_buttons();
+ shopping_cart.show_cart_navbar();
});
$.extend(shopping_cart, {
@@ -177,4 +178,12 @@ $.extend(shopping_cart, {
},
+ show_cart_navbar: function () {
+ frappe.call({
+ method: "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.is_cart_enabled",
+ callback: function(r) {
+ $(".shopping-cart").toggleClass('hidden', r.message ? false : true);
+ }
+ });
+ }
});
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index d75633e5a9..d9f6e1d433 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -43,6 +43,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
label: __(me.warehouse_details.type),
default: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
onchange: function(e) {
+ me.warehouse_details.name = this.get_value();
if(me.has_batch && !me.has_serial_no) {
fields = fields.concat(me.get_batch_fields());
@@ -50,7 +51,6 @@ erpnext.SerialNoBatchSelector = Class.extend({
fields = fields.concat(me.get_serial_no_fields());
}
- me.warehouse_details.name = this.get_value();
var batches = this.layout.fields_dict.batches;
if(batches) {
batches.grid.df.data = [];
@@ -98,8 +98,13 @@ erpnext.SerialNoBatchSelector = Class.extend({
numbers.then((data) => {
let auto_fetched_serial_numbers = data.message;
let records_length = auto_fetched_serial_numbers.length;
+ if (!records_length) {
+ const warehouse = me.dialog.fields_dict.warehouse.get_value().bold();
+ frappe.msgprint(__(`Serial numbers unavailable for Item ${me.item.item_code.bold()}
+ under warehouse ${warehouse}. Please try changing warehouse.`));
+ }
if (records_length < qty) {
- frappe.msgprint(`Fetched only ${records_length} serial numbers.`);
+ frappe.msgprint(__(`Fetched only ${records_length} available serial numbers.`));
}
let serial_no_list_field = this.dialog.fields_dict.serial_no;
numbers = auto_fetched_serial_numbers.join('\n');
@@ -333,8 +338,8 @@ erpnext.SerialNoBatchSelector = Class.extend({
};
},
change: function () {
- let val = this.get_value();
- if (val.length === 0) {
+ const batch_no = this.get_value();
+ if (!batch_no) {
this.grid_row.on_grid_fields_dict
.available_qty.set_value(0);
return;
@@ -354,14 +359,11 @@ erpnext.SerialNoBatchSelector = Class.extend({
return;
}
- let batch_number = me.item.batch_no ||
- this.grid_row.on_grid_fields_dict.batch_no.get_value();
-
if (me.warehouse_details.name) {
frappe.call({
method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
args: {
- batch_no: batch_number,
+ batch_no,
warehouse: me.warehouse_details.name,
item_code: me.item_code
},
@@ -445,6 +447,28 @@ erpnext.SerialNoBatchSelector = Class.extend({
serial_no_filters['warehouse'] = me.warehouse_details.name;
}
+ if (me.frm.doc.doctype === 'POS Invoice' && !this.showing_reserved_serial_nos_error) {
+ frappe.call({
+ method: "erpnext.stock.doctype.serial_no.serial_no.get_pos_reserved_serial_nos",
+ args: {
+ item_code: me.item_code,
+ warehouse: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : ''
+ }
+ }).then((data) => {
+ if (!data.message[1].length) {
+ this.showing_reserved_serial_nos_error = true;
+ const warehouse = me.dialog.fields_dict.warehouse.get_value().bold();
+ const d = frappe.msgprint(__(`Serial numbers unavailable for Item ${me.item.item_code.bold()}
+ under warehouse ${warehouse}. Please try changing warehouse.`));
+ d.get_close_btn().on('click', () => {
+ this.showing_reserved_serial_nos_error = false;
+ d.hide();
+ });
+ }
+ serial_no_filters['name'] = ["not in", data.message[0]]
+ })
+ }
+
return [
{fieldtype: 'Section Break', label: __('Serial Numbers')},
{
diff --git a/erpnext/public/js/website_theme.js b/erpnext/public/js/website_theme.js
index 84de2f5b51..9662f78538 100644
--- a/erpnext/public/js/website_theme.js
+++ b/erpnext/public/js/website_theme.js
@@ -4,8 +4,8 @@
frappe.ui.form.on('Website Theme', {
validate(frm) {
let theme_scss = frm.doc.theme_scss;
- if (theme_scss.includes('frappe/public/scss/website')
- && !theme_scss.includes('erpnext/public/scss/website')
+ if (theme_scss && (theme_scss.includes('frappe/public/scss/website')
+ && !theme_scss.includes('erpnext/public/scss/website'))
) {
frm.set_value('theme_scss',
`${frm.doc.theme_scss}\n@import "erpnext/public/scss/website";`);
diff --git a/erpnext/regional/india/taxes.js b/erpnext/regional/india/taxes.js
index 4d36cff1e6..fbccc6b078 100644
--- a/erpnext/regional/india/taxes.js
+++ b/erpnext/regional/india/taxes.js
@@ -10,6 +10,8 @@ erpnext.setup_auto_gst_taxation = (doctype) => {
frm.trigger('get_tax_template');
},
get_tax_template: function(frm) {
+ if (!frm.doc.company) return;
+
let party_details = {
'shipping_address': frm.doc.shipping_address || '',
'shipping_address_name': frm.doc.shipping_address_name || '',
diff --git a/erpnext/selling/dashboard_chart/item_wise_annual_sales/item_wise_annual_sales.json b/erpnext/selling/dashboard_chart/item_wise_annual_sales/item_wise_annual_sales.json
new file mode 100644
index 0000000000..290e526f11
--- /dev/null
+++ b/erpnext/selling/dashboard_chart/item_wise_annual_sales/item_wise_annual_sales.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Item-wise Annual Sales",
+ "chart_type": "Report",
+ "creation": "2020-07-20 20:17:16.474566",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"to_date\":\"frappe.datetime.nowdate()\"}",
+ "filters_json": "{\"from_date\":\"2020-06-22\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 14:42:25.512675",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Item-wise Annual Sales",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Item-wise Sales History",
+ "timeseries": 0,
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/selling/dashboard_chart/sales_order_analysis/sales_order_analysis.json b/erpnext/selling/dashboard_chart/sales_order_analysis/sales_order_analysis.json
new file mode 100644
index 0000000000..5e1a0d9258
--- /dev/null
+++ b/erpnext/selling/dashboard_chart/sales_order_analysis/sales_order_analysis.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Sales Order Analysis",
+ "chart_type": "Report",
+ "creation": "2020-07-20 20:17:16.440393",
+ "custom_options": "{\"type\": \"donut\", \"height\": 300, \"axisOptions\": {\"shortenYAxisNumbers\": 1}}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"to_date\":\"frappe.datetime.nowdate()\"}",
+ "filters_json": "{\"status\":[\"To Bill\",\"To Deliver\"],\"group_by_so\":0,\"from_date\":\"2020-06-22\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 17:06:05.750660",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Order Analysis",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Sales Order Analysis",
+ "timeseries": 0,
+ "type": "Donut",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/selling/dashboard_chart/sales_order_trends/sales_order_trends.json b/erpnext/selling/dashboard_chart/sales_order_trends/sales_order_trends.json
new file mode 100644
index 0000000000..914d915d94
--- /dev/null
+++ b/erpnext/selling/dashboard_chart/sales_order_trends/sales_order_trends.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Sales Order Trends",
+ "chart_type": "Report",
+ "creation": "2020-07-20 20:17:16.508240",
+ "custom_options": "{\"type\": \"line\", \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"tooltipOptions\": {}, \"lineOptions\": {\"regionFill\": 1}}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"fiscal_year\":\"frappe.sys_defaults.fiscal_year\"}",
+ "filters_json": "{\"period\":\"Monthly\",\"based_on\":\"Item\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 16:24:45.726270",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Order Trends",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Sales Order Trends",
+ "timeseries": 0,
+ "type": "Line",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/selling/dashboard_chart/top_customers/top_customers.json b/erpnext/selling/dashboard_chart/top_customers/top_customers.json
new file mode 100644
index 0000000000..59a2ba37dd
--- /dev/null
+++ b/erpnext/selling/dashboard_chart/top_customers/top_customers.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Top Customers",
+ "chart_type": "Report",
+ "creation": "2020-07-20 20:17:16.539281",
+ "custom_options": "",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"fiscal_year\":\"frappe.sys_defaults.fiscal_year\"}",
+ "filters_json": "{\"period\":\"Yearly\",\"based_on\":\"Customer\"}",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "modified": "2020-07-22 17:03:10.320147",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Top Customers",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Delivery Note Trends",
+ "timeseries": 0,
+ "type": "Bar",
+ "use_report_chart": 1,
+ "y_axis": []
+}
\ No newline at end of file
diff --git a/erpnext/selling/dashboard_fixtures.py b/erpnext/selling/dashboard_fixtures.py
deleted file mode 100644
index 889cb88dce..0000000000
--- a/erpnext/selling/dashboard_fixtures.py
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-import frappe
-import json
-from frappe import _
-from frappe.utils import nowdate
-from erpnext.accounts.utils import get_fiscal_year
-
-def get_data():
- return frappe._dict({
- "dashboards": get_dashboards(),
- "charts": get_charts(),
- "number_cards": get_number_cards(),
- })
-
-def get_company_for_dashboards():
- company = frappe.defaults.get_defaults().company
- if company:
- return company
- else:
- company_list = frappe.get_list("Company")
- if company_list:
- return company_list[0].name
- return None
-
-company = frappe.get_doc("Company", get_company_for_dashboards())
-fiscal_year = get_fiscal_year(nowdate(), as_dict=1)
-fiscal_year_name = fiscal_year.get("name")
-start_date = str(fiscal_year.get("year_start_date"))
-end_date = str(fiscal_year.get("year_end_date"))
-
-def get_dashboards():
- return [{
- "name": "Selling",
- "dashboard_name": "Selling",
- "charts": [
- { "chart": "Sales Order Trends", "width": "Full"},
- { "chart": "Top Customers", "width": "Half"},
- { "chart": "Sales Order Analysis", "width": "Half"},
- { "chart": "Item-wise Annual Sales", "width": "Full"}
- ],
- "cards": [
- { "card": "Annual Sales"},
- { "card": "Sales Orders to Deliver"},
- { "card": "Sales Orders to Bill"},
- { "card": "Active Customers"}
- ]
- }]
-
-def get_charts():
- return [
- {
- "name": "Sales Order Analysis",
- "chart_name": _("Sales Order Analysis"),
- "chart_type": "Report",
- "custom_options": json.dumps({
- "type": "donut",
- "height": 300,
- "axisOptions": {"shortenYAxisNumbers": 1}
- }),
- "doctype": "Dashboard Chart",
- "filters_json": json.dumps({
- "company": company.name,
- "from_date": start_date,
- "to_date": end_date
- }),
- "is_custom": 1,
- "is_public": 1,
- "owner": "Administrator",
- "report_name": "Sales Order Analysis",
- "type": "Donut"
- },
- {
- "name": "Item-wise Annual Sales",
- "chart_name": _("Item-wise Annual Sales"),
- "chart_type": "Report",
- "doctype": "Dashboard Chart",
- "filters_json": json.dumps({
- "company": company.name,
- "from_date": start_date,
- "to_date": end_date
- }),
- "is_custom": 1,
- "is_public": 1,
- "owner": "Administrator",
- "report_name": "Item-wise Sales History",
- "type": "Bar"
- },
- {
- "name": "Sales Order Trends",
- "chart_name": _("Sales Order Trends"),
- "chart_type": "Report",
- "custom_options": json.dumps({
- "type": "line",
- "axisOptions": {"shortenYAxisNumbers": 1},
- "tooltipOptions": {},
- "lineOptions": {
- "regionFill": 1
- }
- }),
- "doctype": "Dashboard Chart",
- "filters_json": json.dumps({
- "company": company.name,
- "period": "Monthly",
- "fiscal_year": fiscal_year_name,
- "based_on": "Item"
- }),
- "is_custom": 1,
- "is_public": 1,
- "owner": "Administrator",
- "report_name": "Sales Order Trends",
- "type": "Line"
- },
- {
- "name": "Top Customers",
- "chart_name": _("Top Customers"),
- "chart_type": "Report",
- "doctype": "Dashboard Chart",
- "filters_json": json.dumps({
- "company": company.name,
- "period": "Monthly",
- "fiscal_year": fiscal_year_name,
- "based_on": "Customer"
- }),
- "is_custom": 1,
- "is_public": 1,
- "owner": "Administrator",
- "report_name": "Delivery Note Trends",
- "type": "Bar"
- }
- ]
-
-def get_number_cards():
- return [
- {
- "name": "Annual Sales",
- "aggregate_function_based_on": "base_net_total",
- "doctype": "Number Card",
- "document_type": "Sales Order",
- "filters_json": json.dumps([
- ["Sales Order", "transaction_date", "Between", [start_date, end_date], False],
- ["Sales Order", "status", "not in", ["Draft", "Cancelled", "Closed", None], False],
- ["Sales Order", "docstatus", "=", 1, False],
- ["Sales Order", "company", "=", company.name, False]
- ]),
- "function": "Sum",
- "is_public": 1,
- "label": _("Annual Sales"),
- "owner": "Administrator",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
- },
- {
- "name": "Sales Orders to Deliver",
- "doctype": "Number Card",
- "document_type": "Sales Order",
- "filters_json": json.dumps([
- ["Sales Order", "status", "in", ["To Deliver and Bill", "To Deliver", None], False],
- ["Sales Order", "docstatus", "=", 1, False],
- ["Sales Order", "company", "=", company.name, False]
- ]),
- "function": "Count",
- "is_public": 1,
- "label": _("Sales Orders to Deliver"),
- "owner": "Administrator",
- "show_percentage_stats": 1,
- "stats_time_interval": "Weekly"
- },
- {
- "name": "Sales Orders to Bill",
- "doctype": "Number Card",
- "document_type": "Sales Order",
- "filters_json": json.dumps([
- ["Sales Order", "status", "in", ["To Deliver and Bill", "To Bill", None], False],
- ["Sales Order", "docstatus", "=", 1, False],
- ["Sales Order", "company", "=", company.name, False]
- ]),
- "function": "Count",
- "is_public": 1,
- "label": _("Sales Orders to Bill"),
- "owner": "Administrator",
- "show_percentage_stats": 1,
- "stats_time_interval": "Weekly"
- },
- {
- "name": "Active Customers",
- "doctype": "Number Card",
- "document_type": "Customer",
- "filters_json": json.dumps([["Customer", "disabled", "=", "0"]]),
- "function": "Count",
- "is_public": 1,
- "label": "Active Customers",
- "owner": "Administrator",
- "show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
- }
- ]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index e614acdb82..ca62488a8c 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -340,6 +340,7 @@ def get_loyalty_programs(doc):
return lp_details
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_customer_list(doctype, txt, searchfield, start, page_len, filters=None):
from erpnext.controllers.queries import get_fields
fields = ["name", "customer_name", "customer_group", "territory"]
@@ -542,6 +543,7 @@ def make_address(args, is_primary_address=1):
return address
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_customer_primary_contact(doctype, txt, searchfield, start, page_len, filters):
customer = filters.get('customer')
return frappe.db.sql("""
diff --git a/erpnext/selling/doctype/lead_source/lead_source.json b/erpnext/selling/doctype/lead_source/lead_source.json
index 868f6d11d0..373e83af9c 100644
--- a/erpnext/selling/doctype/lead_source/lead_source.json
+++ b/erpnext/selling/doctype/lead_source/lead_source.json
@@ -1,7 +1,7 @@
{
"allow_copy": 0,
"allow_import": 0,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "field:source_name",
"beta": 0,
"creation": "2016-09-16 01:47:47.382372",
@@ -74,7 +74,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-16 02:03:01.441622",
+ "modified": "2020-09-16 02:03:01.441622",
"modified_by": "Administrator",
"module": "Selling",
"name": "Lead Source",
@@ -128,4 +128,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js
deleted file mode 100644
index f24caf767f..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('POS Closing Voucher', {
- onload: function(frm) {
- frm.set_query("pos_profile", function(doc) {
- return {
- filters: {
- 'user': doc.user
- }
- };
- });
-
- frm.set_query("user", function(doc) {
- return {
- query: "erpnext.selling.doctype.pos_closing_voucher.pos_closing_voucher.get_cashiers",
- filters: {
- 'parent': doc.pos_profile
- }
- };
- });
- },
-
- total_amount: function(frm) {
- get_difference_amount(frm);
- },
- custody_amount: function(frm){
- get_difference_amount(frm);
- },
- expense_amount: function(frm){
- get_difference_amount(frm);
- },
- refresh: function(frm) {
- get_closing_voucher_details(frm);
- },
- period_start_date: function(frm) {
- get_closing_voucher_details(frm);
- },
- period_end_date: function(frm) {
- get_closing_voucher_details(frm);
- },
- company: function(frm) {
- get_closing_voucher_details(frm);
- },
- pos_profile: function(frm) {
- get_closing_voucher_details(frm);
- },
- user: function(frm) {
- get_closing_voucher_details(frm);
- },
-});
-
-frappe.ui.form.on('POS Closing Voucher Details', {
- collected_amount: function(doc, cdt, cdn) {
- var row = locals[cdt][cdn];
- frappe.model.set_value(cdt, cdn, "difference", row.collected_amount - row.expected_amount);
- }
-});
-
-var get_difference_amount = function(frm){
- frm.doc.difference = frm.doc.total_amount - frm.doc.custody_amount - frm.doc.expense_amount;
- refresh_field("difference");
-};
-
-var get_closing_voucher_details = function(frm) {
- if (frm.doc.period_end_date && frm.doc.period_start_date && frm.doc.company && frm.doc.pos_profile && frm.doc.user) {
- frappe.call({
- method: "get_closing_voucher_details",
- doc: frm.doc,
- callback: function(r) {
- if (r.message) {
- refresh_field("payment_reconciliation");
- refresh_field("sales_invoices_summary");
- refresh_field("taxes");
-
- refresh_field("grand_total");
- refresh_field("net_total");
- refresh_field("total_quantity");
- refresh_field("total_amount");
-
- frm.get_field("payment_reconciliation_details").$wrapper.html(r.message);
- }
- }
- });
- }
-
-};
diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json
deleted file mode 100644
index 2ac57794b4..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.json
+++ /dev/null
@@ -1,1016 +0,0 @@
-{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "POS-CLO-.YYYY.-.#####",
- "beta": 0,
- "creation": "2018-05-28 19:06:40.830043",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Today",
- "fieldname": "period_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": "Period Start Date",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Today",
- "fieldname": "period_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": "Period End Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_3",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Today",
- "fieldname": "posting_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": "Posting Date",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_5",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company",
- "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": "Company",
- "length": 0,
- "no_copy": 0,
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_7",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "pos_profile",
- "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": "POS Profile",
- "length": 0,
- "no_copy": 0,
- "options": "POS Profile",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "user",
- "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": "Cashier",
- "length": 0,
- "no_copy": 0,
- "options": "User",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expense_details_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": "Expense Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expense_amount",
- "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": "Expense Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "custody_amount",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Amount in Custody",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_13",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_amount",
- "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 Collected Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "difference",
- "fieldtype": "Currency",
- "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": "Difference",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_9",
- "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": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "payment_reconciliation_details",
- "fieldtype": "HTML",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_11",
- "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": "Modes of Payment",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "payment_reconciliation",
- "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": "Payment Reconciliation",
- "length": 0,
- "no_copy": 0,
- "options": "POS Closing Voucher Details",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_13",
- "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": "Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "grand_total",
- "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": "Grand Total",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "net_total",
- "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": "Net Total",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_quantity",
- "fieldtype": "Float",
- "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 Quantity",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_16",
- "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,
- "label": "Taxes",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "taxes",
- "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": "Taxes",
- "length": 0,
- "no_copy": 0,
- "options": "POS Closing Voucher Taxes",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_12",
- "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": "Linked Invoices",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_invoices_summary",
- "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": "Sales Invoices Summary",
- "length": 0,
- "no_copy": 0,
- "options": "POS Closing Voucher Invoices",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_14",
- "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,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 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": "POS Closing Voucher",
- "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,
- "translatable": 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": "2019-01-28 12:33:45.217813",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "POS Closing Voucher",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
- "write": 1
- }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py b/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py
deleted file mode 100644
index bb5f83ed05..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py
+++ /dev/null
@@ -1,188 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from collections import defaultdict
-from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data
-import json
-
-class POSClosingVoucher(Document):
- def get_closing_voucher_details(self):
- filters = {
- 'doc': self.name,
- 'from_date': self.period_start_date,
- 'to_date': self.period_end_date,
- 'company': self.company,
- 'pos_profile': self.pos_profile,
- 'user': self.user,
- 'is_pos': 1
- }
-
- invoice_list = get_invoices(filters)
- self.set_invoice_list(invoice_list)
-
- sales_summary = get_sales_summary(invoice_list)
- self.set_sales_summary_values(sales_summary)
- self.total_amount = sales_summary['grand_total']
-
- if not self.get('payment_reconciliation'):
- mop = get_mode_of_payment_details(invoice_list)
- self.set_mode_of_payments(mop)
-
- taxes = get_tax_details(invoice_list)
- self.set_taxes(taxes)
-
- return self.get_payment_reconciliation_details()
-
- def validate(self):
- user = frappe.get_all('POS Closing Voucher',
- filters = {
- 'user': self.user,
- 'docstatus': 1
- },
- or_filters = {
- 'period_start_date': ('between', [self.period_start_date, self.period_end_date]),
- 'period_end_date': ('between', [self.period_start_date, self.period_end_date])
- })
-
- if user:
- frappe.throw(_("POS Closing Voucher alreday exists for {0} between date {1} and {2}")
- .format(self.user, self.period_start_date, self.period_end_date))
-
- def set_invoice_list(self, invoice_list):
- self.sales_invoices_summary = []
- for invoice in invoice_list:
- self.append('sales_invoices_summary', {
- 'invoice': invoice['name'],
- 'qty_of_items': invoice['pos_total_qty'],
- 'grand_total': invoice['grand_total']
- })
-
- def set_sales_summary_values(self, sales_summary):
- self.grand_total = sales_summary['grand_total']
- self.net_total = sales_summary['net_total']
- self.total_quantity = sales_summary['total_qty']
-
- def set_mode_of_payments(self, mop):
- self.payment_reconciliation = []
- for m in mop:
- self.append('payment_reconciliation', {
- 'mode_of_payment': m['name'],
- 'expected_amount': m['amount']
- })
-
- def set_taxes(self, taxes):
- self.taxes = []
- for tax in taxes:
- self.append('taxes', {
- 'rate': tax['rate'],
- 'amount': tax['amount']
- })
-
- def get_payment_reconciliation_details(self):
- currency = get_company_currency(self)
- return frappe.render_template("erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html",
- {"data": self, "currency": currency})
-
-@frappe.whitelist()
-def get_cashiers(doctype, txt, searchfield, start, page_len, filters):
- cashiers_list = frappe.get_all("POS Profile User", filters=filters, fields=['user'])
- cashiers = [cashier for cashier in set(c['user'] for c in cashiers_list)]
- return [[c] for c in cashiers]
-
-def get_mode_of_payment_details(invoice_list):
- mode_of_payment_details = []
- invoice_list_names = ",".join(['"' + invoice['name'] + '"' for invoice in invoice_list])
- if invoice_list:
- inv_mop_detail = frappe.db.sql("""select a.owner, a.posting_date,
- ifnull(b.mode_of_payment, '') as mode_of_payment, sum(b.base_amount) as paid_amount
- from `tabSales Invoice` a, `tabSales Invoice Payment` b
- where a.name = b.parent
- and a.name in ({invoice_list_names})
- group by a.owner, a.posting_date, mode_of_payment
- union
- select a.owner,a.posting_date,
- ifnull(b.mode_of_payment, '') as mode_of_payment, sum(b.base_paid_amount) as paid_amount
- from `tabSales Invoice` a, `tabPayment Entry` b,`tabPayment Entry Reference` c
- where a.name = c.reference_name
- and b.name = c.parent
- and a.name in ({invoice_list_names})
- group by a.owner, a.posting_date, mode_of_payment
- union
- select a.owner, a.posting_date,
- ifnull(a.voucher_type,'') as mode_of_payment, sum(b.credit)
- from `tabJournal Entry` a, `tabJournal Entry Account` b
- where a.name = b.parent
- and a.docstatus = 1
- and b.reference_type = "Sales Invoice"
- and b.reference_name in ({invoice_list_names})
- group by a.owner, a.posting_date, mode_of_payment
- """.format(invoice_list_names=invoice_list_names), as_dict=1)
-
- inv_change_amount = frappe.db.sql("""select a.owner, a.posting_date,
- ifnull(b.mode_of_payment, '') as mode_of_payment, sum(a.base_change_amount) as change_amount
- from `tabSales Invoice` a, `tabSales Invoice Payment` b
- where a.name = b.parent
- and a.name in ({invoice_list_names})
- and b.mode_of_payment = 'Cash'
- and a.base_change_amount > 0
- group by a.owner, a.posting_date, mode_of_payment""".format(invoice_list_names=invoice_list_names), as_dict=1)
-
- for d in inv_change_amount:
- for det in inv_mop_detail:
- if det["owner"] == d["owner"] and det["posting_date"] == d["posting_date"] and det["mode_of_payment"] == d["mode_of_payment"]:
- paid_amount = det["paid_amount"] - d["change_amount"]
- det["paid_amount"] = paid_amount
-
- payment_details = defaultdict(int)
- for d in inv_mop_detail:
- payment_details[d.mode_of_payment] += d.paid_amount
-
- for m in payment_details:
- mode_of_payment_details.append({'name': m, 'amount': payment_details[m]})
-
- return mode_of_payment_details
-
-def get_tax_details(invoice_list):
- tax_breakup = []
- tax_details = defaultdict(int)
- for invoice in invoice_list:
- doc = frappe.get_doc("Sales Invoice", invoice.name)
- itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(doc)
-
- if itemised_tax:
- for a in itemised_tax:
- for b in itemised_tax[a]:
- for c in itemised_tax[a][b]:
- if c == 'tax_rate':
- tax_details[itemised_tax[a][b][c]] += itemised_tax[a][b]['tax_amount']
-
- for t in tax_details:
- tax_breakup.append({'rate': t, 'amount': tax_details[t]})
-
- return tax_breakup
-
-def get_sales_summary(invoice_list):
- net_total = sum(item['net_total'] for item in invoice_list)
- grand_total = sum(item['grand_total'] for item in invoice_list)
- total_qty = sum(item['pos_total_qty'] for item in invoice_list)
-
- return {'net_total': net_total, 'grand_total': grand_total, 'total_qty': total_qty}
-
-def get_company_currency(doc):
- currency = frappe.get_cached_value('Company', doc.company, "default_currency")
- return frappe.get_doc('Currency', currency)
-
-def get_invoices(filters):
- return frappe.db.sql("""select a.name, a.base_grand_total as grand_total,
- a.base_net_total as net_total, a.pos_total_qty
- from `tabSales Invoice` a
- where a.docstatus = 1 and a.posting_date >= %(from_date)s
- and a.posting_date <= %(to_date)s and a.company=%(company)s
- and a.pos_profile = %(pos_profile)s and a.is_pos = %(is_pos)s
- and a.owner = %(user)s""",
- filters, as_dict=1)
diff --git a/erpnext/selling/doctype/pos_closing_voucher/test_pos_closing_voucher.py b/erpnext/selling/doctype/pos_closing_voucher/test_pos_closing_voucher.py
deleted file mode 100644
index 8899aaff41..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher/test_pos_closing_voucher.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-import frappe
-import unittest
-from frappe.utils import nowdate
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
-
-class TestPOSClosingVoucher(unittest.TestCase):
- def test_pos_closing_voucher(self):
- old_user = frappe.session.user
- user = 'test@example.com'
- test_user = frappe.get_doc('User', user)
-
- roles = ("Accounts Manager", "Accounts User", "Sales Manager")
- test_user.add_roles(*roles)
- frappe.set_user(user)
-
- pos_profile = make_pos_profile()
- pos_profile.append('applicable_for_users', {
- 'default': 1,
- 'user': user
- })
-
- pos_profile.save()
-
- si1 = create_sales_invoice(is_pos=1, rate=3500, do_not_submit=1)
- si1.append('payments', {
- 'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 3500
- })
- si1.submit()
-
- si2 = create_sales_invoice(is_pos=1, rate=3200, do_not_submit=1)
- si2.append('payments', {
- 'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 3200
- })
- si2.submit()
-
- pcv_doc = create_pos_closing_voucher(user=user,
- pos_profile=pos_profile.name, collected_amount=6700)
-
- pcv_doc.get_closing_voucher_details()
-
- self.assertEqual(pcv_doc.total_quantity, 2)
- self.assertEqual(pcv_doc.net_total, 6700)
-
- payment = pcv_doc.payment_reconciliation[0]
- self.assertEqual(payment.mode_of_payment, 'Cash')
-
- si1.load_from_db()
- si1.cancel()
-
- si2.load_from_db()
- si2.cancel()
-
- test_user.load_from_db()
- test_user.remove_roles(*roles)
-
- frappe.set_user(old_user)
- frappe.db.sql("delete from `tabPOS Profile`")
-
-def create_pos_closing_voucher(**args):
- args = frappe._dict(args)
-
- doc = frappe.get_doc({
- 'doctype': 'POS Closing Voucher',
- 'period_start_date': args.period_start_date or nowdate(),
- 'period_end_date': args.period_end_date or nowdate(),
- 'posting_date': args.posting_date or nowdate(),
- 'company': args.company or "_Test Company",
- 'pos_profile': args.pos_profile,
- 'user': args.user or "Administrator",
- })
-
- doc.get_closing_voucher_details()
- if doc.get('payment_reconciliation'):
- doc.payment_reconciliation[0].collected_amount = (args.collected_amount or
- doc.payment_reconciliation[0].expected_amount)
-
- doc.save()
- return doc
\ No newline at end of file
diff --git a/erpnext/selling/doctype/pos_closing_voucher_details/pos_closing_voucher_details.json b/erpnext/selling/doctype/pos_closing_voucher_details/pos_closing_voucher_details.json
deleted file mode 100644
index a52688462a..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher_details/pos_closing_voucher_details.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-05-28 19:10:47.580174",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "mode_of_payment",
- "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": "Mode of Payment",
- "length": 0,
- "no_copy": 0,
- "options": "Mode of Payment",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0.0",
- "fieldname": "collected_amount",
- "fieldtype": "Currency",
- "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": "Collected Amount",
- "length": 0,
- "no_copy": 0,
- "options": "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": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expected_amount",
- "fieldtype": "Currency",
- "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": "Expected Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "difference",
- "fieldtype": "Currency",
- "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": "Difference",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2018-05-29 17:47:16.311557",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "POS Closing Voucher Details",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.json b/erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.json
deleted file mode 100644
index 7304550784..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher_invoices/pos_closing_voucher_invoices.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-05-29 14:50:08.687453",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "invoice",
- "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": "Invoices",
- "length": 0,
- "no_copy": 0,
- "options": "Sales Invoice",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "qty_of_items",
- "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": "Quantity of Items",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "grand_total",
- "fieldtype": "Currency",
- "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": "Grand Total",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2018-05-29 17:46:46.539993",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "POS Closing Voucher Invoices",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/pos_closing_voucher_taxes/pos_closing_voucher_taxes.json b/erpnext/selling/doctype/pos_closing_voucher_taxes/pos_closing_voucher_taxes.json
deleted file mode 100644
index 3089e0621f..0000000000
--- a/erpnext/selling/doctype/pos_closing_voucher_taxes/pos_closing_voucher_taxes.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2018-05-30 09:11:22.535470",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "rate",
- "fieldtype": "Percent",
- "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": "Rate",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "amount",
- "fieldtype": "Currency",
- "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": "Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2018-05-30 09:11:22.535470",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "POS Closing Voucher Taxes",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.py b/erpnext/selling/doctype/product_bundle/product_bundle.py
index 0c85a1b53c..d3281f733f 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.py
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.py
@@ -29,6 +29,7 @@ class ProductBundle(Document):
frappe.throw(_("Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save").format(item.idx, frappe.bold(item.item_code)))
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_new_item_code(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 8e21927fa5..6d34c2ac7f 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -654,6 +654,7 @@
"fieldname": "base_in_words",
"fieldtype": "Data",
"label": "In Words (Company Currency)",
+ "length": 240,
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -713,6 +714,7 @@
"fieldname": "in_words",
"fieldtype": "Data",
"label": "In Words",
+ "length": 240,
"oldfieldname": "in_words_export",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -930,7 +932,7 @@
"is_submittable": 1,
"links": [],
"max_attachments": 1,
- "modified": "2019-12-30 19:14:56.630270",
+ "modified": "2020-07-18 04:59:09.960118",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index cd4e1d0792..a68b7387b7 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -928,6 +928,7 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "In Words (Company Currency)",
+ "length": 240,
"oldfieldname": "in_words",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -986,6 +987,7 @@
"hide_days": 1,
"hide_seconds": 1,
"label": "In Words",
+ "length": 240,
"oldfieldname": "in_words_export",
"oldfieldtype": "Data",
"print_hide": 1,
@@ -1458,7 +1460,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2020-06-30 11:56:42.301317",
+ "modified": "2020-07-31 14:13:17.962015",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
@@ -1532,7 +1534,7 @@
"sort_field": "modified",
"sort_order": "DESC",
"timeline_field": "customer",
- "title_field": "title",
+ "title_field": "customer",
"track_changes": 1,
"track_seen": 1
}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index ffb66354fa..f88289871e 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -888,6 +888,7 @@ def make_purchase_order(source_name, for_supplier=None, selected_items=[], targe
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def get_supplier(doctype, txt, searchfield, start, page_len, filters):
supp_master_name = frappe.defaults.get_user_default("supp_master_name")
if supp_master_name == "Supplier Name":
diff --git a/erpnext/selling/number_card/active_customers/active_customers.json b/erpnext/selling/number_card/active_customers/active_customers.json
new file mode 100644
index 0000000000..3377634847
--- /dev/null
+++ b/erpnext/selling/number_card/active_customers/active_customers.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-20 20:17:16.653866",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Customer",
+ "dynamic_filters_json": "",
+ "filters_json": "[[\"Customer\",\"disabled\",\"=\",\"0\"]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Active Customers",
+ "modified": "2020-07-22 14:20:32.268103",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Active Customers",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/selling/number_card/annual_sales/annual_sales.json b/erpnext/selling/number_card/annual_sales/annual_sales.json
new file mode 100644
index 0000000000..8746ee4c6a
--- /dev/null
+++ b/erpnext/selling/number_card/annual_sales/annual_sales.json
@@ -0,0 +1,22 @@
+{
+ "aggregate_function_based_on": "base_net_total",
+ "creation": "2020-07-20 20:17:16.568132",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Sales Order",
+ "dynamic_filters_json": "[[\"Sales Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Sales Order\",\"status\",\"not in\",[\"Draft\",\"Cancelled\",\"Closed\",null],false],[\"Sales Order\",\"docstatus\",\"=\",\"1\",false],[\"Sales Order\",\"modified\",\"Timespan\",\"this year\",false]]",
+ "function": "Sum",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Annual Sales",
+ "modified": "2020-07-22 16:56:33.747156",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Annual Sales",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Monthly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/selling/number_card/sales_orders_to_bill/sales_orders_to_bill.json b/erpnext/selling/number_card/sales_orders_to_bill/sales_orders_to_bill.json
new file mode 100644
index 0000000000..27fea45723
--- /dev/null
+++ b/erpnext/selling/number_card/sales_orders_to_bill/sales_orders_to_bill.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-20 20:17:16.625001",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Sales Order",
+ "dynamic_filters_json": "[[\"Sales Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Sales Order\",\"status\",\"in\",[\"To Deliver and Bill\",\"To Bill\",null],false],[\"Sales Order\",\"docstatus\",\"=\",\"1\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Sales Orders to Bill",
+ "modified": "2020-07-22 14:20:09.918626",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Orders to Bill",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/selling/number_card/sales_orders_to_deliver/sales_orders_to_deliver.json b/erpnext/selling/number_card/sales_orders_to_deliver/sales_orders_to_deliver.json
new file mode 100644
index 0000000000..6e19cf4d3e
--- /dev/null
+++ b/erpnext/selling/number_card/sales_orders_to_deliver/sales_orders_to_deliver.json
@@ -0,0 +1,21 @@
+{
+ "creation": "2020-07-20 20:17:16.596857",
+ "docstatus": 0,
+ "doctype": "Number Card",
+ "document_type": "Sales Order",
+ "dynamic_filters_json": "[[\"Sales Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
+ "filters_json": "[[\"Sales Order\",\"status\",\"in\",[\"To Deliver and Bill\",\"To Deliver\",null],false],[\"Sales Order\",\"docstatus\",\"=\",\"1\",false]]",
+ "function": "Count",
+ "idx": 0,
+ "is_public": 1,
+ "is_standard": 1,
+ "label": "Sales Orders to Deliver",
+ "modified": "2020-07-22 14:19:28.833784",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Sales Orders to Deliver",
+ "owner": "Administrator",
+ "show_percentage_stats": 1,
+ "stats_time_interval": "Weekly",
+ "type": "Document Type"
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/onscan.js b/erpnext/selling/page/point_of_sale/onscan.js
new file mode 100644
index 0000000000..428dc75cf8
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/onscan.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t()):e.onScan=t()}(this,function(){var d={attachTo:function(e,t){if(void 0!==e.scannerDetectionData)throw new Error("onScan.js is already initialized for DOM element "+e);var n={onScan:function(e,t){},onScanError:function(e){},onKeyProcess:function(e,t){},onKeyDetect:function(e,t){},onPaste:function(e,t){},keyCodeMapper:function(e){return d.decodeKeyEvent(e)},onScanButtonLongPress:function(){},scanButtonKeyCode:!1,scanButtonLongPressTime:500,timeBeforeScanTest:100,avgTimeByChar:30,minLength:6,suffixKeyCodes:[9,13],prefixKeyCodes:[],ignoreIfFocusOn:!1,stopPropagation:!1,preventDefault:!1,captureEvents:!1,reactToKeydown:!0,reactToPaste:!1,singleScanQty:1};return t=this._mergeOptions(n,t),e.scannerDetectionData={options:t,vars:{firstCharTime:0,lastCharTime:0,accumulatedString:"",testTimer:!1,longPressTimeStart:0,longPressed:!1}},!0===t.reactToPaste&&e.addEventListener("paste",this._handlePaste,t.captureEvents),!1!==t.scanButtonKeyCode&&e.addEventListener("keyup",this._handleKeyUp,t.captureEvents),!0!==t.reactToKeydown&&!1===t.scanButtonKeyCode||e.addEventListener("keydown",this._handleKeyDown,t.captureEvents),this},detachFrom:function(e){e.scannerDetectionData.options.reactToPaste&&e.removeEventListener("paste",this._handlePaste),!1!==e.scannerDetectionData.options.scanButtonKeyCode&&e.removeEventListener("keyup",this._handleKeyUp),e.removeEventListener("keydown",this._handleKeyDown),e.scannerDetectionData=void 0},getOptions:function(e){return e.scannerDetectionData.options},setOptions:function(e,t){switch(e.scannerDetectionData.options.reactToPaste){case!0:!1===t.reactToPaste&&e.removeEventListener("paste",this._handlePaste);break;case!1:!0===t.reactToPaste&&e.addEventListener("paste",this._handlePaste)}switch(e.scannerDetectionData.options.scanButtonKeyCode){case!1:!1!==t.scanButtonKeyCode&&e.addEventListener("keyup",this._handleKeyUp);break;default:!1===t.scanButtonKeyCode&&e.removeEventListener("keyup",this._handleKeyUp)}return e.scannerDetectionData.options=this._mergeOptions(e.scannerDetectionData.options,t),this._reinitialize(e),this},decodeKeyEvent:function(e){var t=this._getNormalizedKeyNum(e);switch(!0){case 48<=t&&t<=90:case 106<=t&&t<=111:if(void 0!==e.key&&""!==e.key)return e.key;var n=String.fromCharCode(t);switch(e.shiftKey){case!1:n=n.toLowerCase();break;case!0:n=n.toUpperCase()}return n;case 96<=t&&t<=105:return t-96}return""},simulate:function(e,t){return this._reinitialize(e),Array.isArray(t)?t.forEach(function(e){var t={};"object"!=typeof e&&"function"!=typeof e||null===e?t.keyCode=parseInt(e):t=e;var n=new KeyboardEvent("keydown",t);document.dispatchEvent(n)}):this._validateScanCode(e,t),this},_reinitialize:function(e){var t=e.scannerDetectionData.vars;t.firstCharTime=0,t.lastCharTime=0,t.accumulatedString=""},_isFocusOnIgnoredElement:function(e){var t=e.scannerDetectionData.options.ignoreIfFocusOn;if(!t)return!1;var n=document.activeElement;if(Array.isArray(t)){for(var a=0;a{{ letter_head }}
\n \n {%- endif %}\n\n {% if (doc.docstatus != 1) %}\n
WORKSHEET
\n\t
\n
\n\n\t\n\n
\n\n \n
\n\n \n \n
\n {% if doc.patient_name %}\n \n {{ doc.patient_name }}\n
\n {% else %}\n \n {{ doc.patient }}\n
\n {%- endif -%}\n \n
\n\n \n \n
\n \n {{ doc.patient_age or '' }}\n
\n \n
\n\n \n \n
\n \n {{ doc.patient_sex or '' }}\n
\n \n\n
\n \n
\n\n {% if doc.sample_date %}\n \n \n
\n {% if doc.practitioner_name %}\n \n {{ doc.practitioner_name }}\n
\n {% else %}\n\t\t\t{% if doc.referring_practitioner_name %}\n \n {{ doc.referring_practitioner_name }}\n
\n\t\t {% endif %}\n {%- endif -%}\n \n
\n {%- endif -%}\n \n \n
\n \n {{ doc.sample_date }}\n
\n \n
\n\n\tDepartment of {{ doc.department }}
\n| Name of Test | \nResult | \nNormal Range | \n
|---|---|---|
| {{ doc.lab_test_name }} | ||
| \n {%- if doc.normal_test_items|length > 1 %} {%- endif -%}\n {%- if row.lab_test_name -%}{{ row.lab_test_name }}\n {%- else -%} {%- endif -%}\n {%- if row.lab_test_event -%} {{ row.lab_test_event }}{%- endif -%}\n | \n\n\n {%- if row.lab_test_uom -%} {{ row.lab_test_uom }}{%- endif -%}\n | \n\n\n \n {%- if row.normal_range -%}{{ row.normal_range }}{%- endif -%}\n \n | \n
| Name of Test | \nResult | \n
|---|---|
| {{ doc.lab_test_name }} | |
| {{ row.lab_test_name }} | \n\t\t\t\t\n\t\t\t |
| {{ row.lab_test_particulars }} | \n\n |
\n {% if doc.worksheet_instructions %}\n
\n Instructions\n {{ doc.worksheet_instructions }}\n {%- endif -%}\n
\n {% elif (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"require_test_result_approval\") == '1' and doc.status != \"Approved\") %}\n Lab Tests have to be Approved for Print .. !\n {%- else -%}\n \n Instructions\n {{ doc.worksheet_instructions }}\n {%- endif -%}\n
\n
\n\n \n\n
\n\n \n
\n\n \n \n
\n {% if doc.patient_name %}\n \n {{ doc.patient_name }}\n
\n {% else %}\n \n {{ doc.patient }}\n
\n {%- endif -%}\n \n
\n\n \n \n
\n \n {{ doc.patient_age or '' }}\n
\n \n
\n\n \n \n
\n \n {{ doc.patient_sex or '' }}\n
\n \n\n
\n\n \n
\n\n {% if doc.sample_date %}\n \n \n
\n {% if doc.practitioner_name %}\n \n {{ doc.practitioner_name }}\n
\n\t\t{% else %}\n\t\t {% if doc.referring_practitioner_name %}\n \n {{ doc.referring_practitioner_name }}\n
\n\t\t\t{% endif %}\n {%- endif -%}\n \n
\n {%- endif -%}\n\n {% if doc.result_date %}\n \n \n
\n \n {{ doc.sample_date }}\n
\n \n
\n {%- endif -%}\n\n \n \n
\n \n {{ doc.result_date }}\n
\n \n
\n\n\tDepartment of {{ doc.department }}
\n\n\t\t{% if doc.result_legend and (doc.legend_print_position == \"Top\" or doc.legend_print_position == \"Both\")%}\n\t\tResult Legend:\n\t\t{{ doc.result_legend }}\n\t\t{%- endif -%}\n\t
\n\n | Name of Test | \nResult | \nNormal Range | \n
|---|---|---|
| {{ doc.lab_test_name }} | ||
| \n {%- if doc.normal_test_items|length > 1 %} {%- endif -%}\n {%- if row.lab_test_name -%}{{ row.lab_test_name }}\n {%- else -%} {%- endif -%}\n {%- if row.lab_test_event -%} {{ row.lab_test_event }}{%- endif -%}\n | \n\n\n\t\t\t\t\t{%- if row.result_value -%}\n\t\t\t\t\t\t{%- if row.bold -%}{% endif %}\n\t\t\t\t\t\t{%- if row.underline -%}{% endif %}\n\t\t\t\t\t\t{%- if row.italic -%}{% endif %}\n {{ row.result_value }}\n {%- if row.lab_test_uom -%} {{ row.lab_test_uom }}{%- endif -%}\n\t\t\t\t\t\t{%- if row.italic -%}{% endif %}\n\t\t\t\t\t\t{%- if row.underline -%}{% endif %}\n\t\t\t\t\t\t{%- if row.bold -%}{% endif %}\n\t\t\t\t\t{%- endif -%}\n \n\t\t\t\t\t{%- if row.secondary_uom and row.conversion_factor and row.secondary_uom_result -%}\n\t\t\t\t\t\t \n\t\t\t\t\t\t{%- if row.bold -%}{% endif %}\n\t\t\t\t\t\t{%- if row.underline -%}{% endif %}\n\t\t\t\t\t\t{%- if row.italic -%}{% endif %}\n {{ row.secondary_uom_result }}\n {{ row.secondary_uom }}\n\t\t\t\t\t\t{%- if row.italic -%}{% endif %}\n\t\t\t\t\t\t{%- if row.underline -%}{% endif %}\n\t\t\t\t\t\t{%- if row.bold -%}{% endif %}\n\t\t\t\t\t\t \n\t\t\t\t\t{%- endif -%}\n | \n\n \n \n {%- if row.normal_range -%}{{ row.normal_range }}{%- endif -%}\n \n | \n
| Name of Test | \nResult | \n
|---|---|
| {{ doc.lab_test_name }} | |
| {{ row.lab_test_name }} | \n\t\t\t\t\n\t\t\t |
| {{ row.lab_test_particulars }} | \n\n {%- if row.result_value -%}{{ row.result_value }}{%- endif -%}\n | \n
| Organism | \n\t\t\t\tColony Population | \n\t\t\t
| {{ row.organism }} | \n\t\t\t\t\n\t\t\t\t\t{{ row.colony_population }}\n\t\t\t\t\t{% if row.colony_uom %}\n\t\t\t\t\t\t{{ row.colony_uom }}\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t
| Antibiotic | \n\t\t\t\tSensitivity | \n\t\t\t
| {{ row.antibiotic }} | \n\t\t\t\t{{ row.antibiotic_sensitivity }} | \n\t\t\t
\n {% if doc.custom_result %}\n
\n
\n\n \n
{{ doc.custom_result }}
\n {%- endif -%}\n \n {% if doc.lab_test_comment %}\n
\n Comments\n {{ doc.lab_test_comment }}\n {%- endif -%}\n
\n\n \n Comments\n {{ doc.lab_test_comment }}\n {%- endif -%}\n
\n {%- if (frappe.db.get_value(\"Healthcare Settings\", \"None\", \"employee_name_and_designation_in_print\") == '1') -%}\n {%- if doc.employee_name -%}\n
\n\n {{ doc.employee_name }}
\n {%- endif -%}\n {%- if doc.employee_designation -%}\n{{ doc.employee_designation }}
\n {%- endif -%}\n {%- else -%}\n {%- if frappe.db.get_value(\"Healthcare Settings\", \"None\", \"custom_signature_in_print\") -%}\n{{ frappe.db.get_value(\"Healthcare Settings\", \"None\", \"custom_signature_in_print\") }}
\n {%- endif -%}\n {%- endif -%}\n\n {% if doc.result_legend and (doc.legend_print_position == \"Bottom\" or doc.legend_print_position == \"Both\" or doc.legend_print_position == \"\")%}\n
\n Result Legend\n {{ doc.result_legend }}\n {%- endif -%}\n
\n {%- endif -%}\n\n Result Legend\n {{ doc.result_legend }}\n {%- endif -%}\n
-
-
-
-
-
-
-
- `);
- }
-
- 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, batch_no) => {
- this.update_item_in_cart(item_code, field, value, batch_no);
- },
- on_numpad: (value) => {
- if (value == __('Pay')) {
- if (!this.payment) {
- this.make_payment_modal();
- } else {
- this.frm.doc.payments.map(p => {
- this.payment.dialog.set_value(p.mode_of_payment, p.amount);
- });
-
- this.payment.set_title();
- }
- this.payment.open_modal();
- }
- },
- on_select_change: () => {
- this.cart.numpad.set_inactive();
- this.set_form_action();
- },
- get_item_details: (item_code) => {
- return this.items.get(item_code);
- },
- get_loyalty_details: () => {
- var me = this;
- if (this.frm.doc.customer) {
- frappe.call({
- method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details",
- args: {
- "customer": me.frm.doc.customer,
- "expiry_date": me.frm.doc.posting_date,
- "company": me.frm.doc.company,
- "silent": true
- },
- callback: function(r) {
- if (r.message.loyalty_program && r.message.loyalty_points) {
- me.cart.events.set_loyalty_details(r.message, true);
- }
- if (!r.message.loyalty_program) {
- var loyalty_details = {
- loyalty_points: 0,
- loyalty_program: '',
- expense_account: '',
- cost_center: ''
- }
- me.cart.events.set_loyalty_details(loyalty_details, false);
- }
- }
- });
- }
- },
- set_loyalty_details: (details, view_status) => {
- if (view_status) {
- this.cart.available_loyalty_points.$wrapper.removeClass("hide");
- } else {
- this.cart.available_loyalty_points.$wrapper.addClass("hide");
- }
- this.cart.available_loyalty_points.set_value(details.loyalty_points);
- this.cart.available_loyalty_points.refresh_input();
- this.frm.set_value("loyalty_program", details.loyalty_program);
- this.frm.set_value("loyalty_redemption_account", details.expense_account);
- this.frm.set_value("loyalty_redemption_cost_center", details.cost_center);
- }
- }
- });
-
- frappe.ui.form.on('Sales Invoice', 'selling_price_list', (frm) => {
- if(this.items && frm.doc.pos_profile) {
- this.items.reset_items();
- }
- })
- }
-
- 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'),
- frm: this.frm,
- 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, batch_no) {
- frappe.dom.freeze();
- if(this.cart.exists(item_code, batch_no)) {
- const search_field = batch_no ? 'batch_no' : 'item_code';
- const search_value = batch_no || item_code;
- const item = this.frm.doc.items.find(i => i[search_field] === search_value);
- 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 actual_batch_qty and actual_qty if there is only one batch. In such
- // a case, no point showing the dialog
- const show_dialog = item.has_serial_no || item.has_batch_no;
-
- if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
- (item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
- this.select_batch_and_serial_no(item);
- } else {
- this.update_item_in_frm(item, field, value)
- .then(() => {
- frappe.dom.unfreeze();
- frappe.run_serially([
- () => {
- let items = this.frm.doc.items.map(item => item.name);
- if (items && items.length > 0 && items.includes(item.name)) {
- this.frm.doc.items.forEach(item_row => {
- // update cart
- this.on_qty_change(item_row);
- });
- } else {
- this.on_qty_change(item);
- }
- },
- () => this.post_qty_change(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;
-
- frappe.run_serially([
- () => {
- return this.frm.script_manager.trigger('item_code', item.doctype, item.name)
- .then(() => {
- this.frm.script_manager.trigger('qty', item.doctype, item.name)
- .then(() => {
- frappe.run_serially([
- () => {
- let items = this.frm.doc.items.map(i => i.name);
- if (items && items.length > 0 && items.includes(item.name)) {
- this.frm.doc.items.forEach(item_row => {
- // update cart
- this.on_qty_change(item_row);
- });
- } else {
- this.on_qty_change(item);
- }
- },
- () => this.post_qty_change(item)
- ]);
- });
- });
- },
- () => {
- const show_dialog = item.has_serial_no || item.has_batch_no;
-
- // if actual_batch_qty and actual_qty if then there is only one batch. In such
- // a case, no point showing the dialog
- if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
- (item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
- // check has serial no/batch no and update cart
- this.select_batch_and_serial_no(item);
- }
- }
- ]);
- }
-
- on_qty_change(item) {
- frappe.run_serially([
- () => this.update_cart_data(item),
- ]);
- }
-
- post_qty_change(item) {
- this.cart.update_taxes_and_totals();
- this.cart.update_grand_total();
- this.cart.update_qty_total();
- this.cart.scroll_to_item(item.item_code);
- this.set_form_action();
- }
-
- select_batch_and_serial_no(row) {
- frappe.dom.unfreeze();
-
- erpnext.show_serial_batch_selector(this.frm, row, () => {
- this.frm.doc.items.forEach(item => {
- this.update_item_in_frm(item, 'qty', item.qty)
- .then(() => {
- // update cart
- frappe.run_serially([
- () => {
- if (item.qty === 0) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- },
- () => this.update_cart_data(item),
- () => this.post_qty_change(item)
- ]);
- });
- })
- }, () => {
- this.on_close(row);
- }, true);
- }
-
- on_close(item) {
- if (!this.cart.exists(item.item_code, item.batch_no) && item.qty) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- }
-
- update_cart_data(item) {
- this.cart.add_item(item);
- frappe.dom.unfreeze();
- }
-
- update_item_in_frm(item, field, value) {
- if (field == 'qty' && value < 0) {
- frappe.msgprint(__("Quantity must be positive"));
- value = item.qty;
- } else {
- if (in_list(["qty", "serial_no", "batch"], field)) {
- item[field] = value;
- if (field == "serial_no" && value) {
- let serial_nos = value.split("\n");
- item["qty"] = serial_nos.filter(d => {
- return d!=="";
- }).length;
- }
- } else {
- return 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' && item.qty === 0) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- })
-
- return Promise.resolve();
- }
-
- make_payment_modal() {
- this.payment = new Payment({
- frm: this.frm,
- events: {
- submit_form: () => {
- this.submit_sales_invoice();
- }
- }
- });
- }
-
- submit_sales_invoice() {
- this.frm.savesubmit()
- .then((r) => {
- if (r && r.doc) {
- this.frm.doc.docstatus = r.doc.docstatus;
- frappe.show_alert({
- indicator: 'green',
- message: __(`Sales invoice ${r.doc.name} created succesfully`)
- });
-
- this.toggle_editing();
- this.set_form_action();
- this.set_primary_action_in_modal();
- }
- });
- }
-
- set_primary_action_in_modal() {
- if (!this.frm.msgbox) {
- this.frm.msgbox = frappe.msgprint(
- `
- ${__('Print')}
-
- ${__('New')}`
- );
-
- $(this.frm.msgbox.body).find('.btn-default').on('click', () => {
- this.frm.msgbox.hide();
- this.make_new_invoice();
- })
- }
- }
-
- change_pos_profile() {
- return new Promise((resolve) => {
- const on_submit = ({ company, pos_profile, set_as_default }) => {
- if (pos_profile) {
- this.pos_profile = pos_profile;
- }
-
- if (set_as_default) {
- frappe.call({
- method: "erpnext.accounts.doctype.pos_profile.pos_profile.set_default_profile",
- args: {
- 'pos_profile': pos_profile,
- 'company': company
- }
- }).then(() => {
- this.on_change_pos_profile();
- });
- } else {
- this.on_change_pos_profile();
- }
- }
-
-
- let me = this;
-
- var dialog = frappe.prompt([{
- fieldtype: 'Link',
- label: __('Company'),
- options: 'Company',
- fieldname: 'company',
- default: me.frm.doc.company,
- reqd: 1,
- onchange: function(e) {
- me.get_default_pos_profile(this.value).then((r) => {
- dialog.set_value('pos_profile', (r && r.name)? r.name : '');
- });
- }
- },
- {
- fieldtype: 'Link',
- label: __('POS Profile'),
- options: 'POS Profile',
- fieldname: 'pos_profile',
- default: me.frm.doc.pos_profile,
- reqd: 1,
- get_query: () => {
- return {
- query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
- filters: {
- company: dialog.get_value('company')
- }
- };
- }
- }, {
- fieldtype: 'Check',
- label: __('Set as default'),
- fieldname: 'set_as_default'
- }],
- on_submit,
- __('Select POS Profile')
- );
- });
- }
-
- on_change_pos_profile() {
- return frappe.run_serially([
- () => this.make_sales_invoice_frm(),
- () => {
- this.frm.doc.pos_profile = this.pos_profile;
- this.set_pos_profile_data()
- .then(() => {
- this.reset_cart();
- if (this.items) {
- this.items.reset_items();
- }
- });
- }
- ]);
- }
-
- get_default_pos_profile(company) {
- return frappe.xcall("erpnext.stock.get_item_details.get_pos_profile",
- {'company': company})
- }
-
- setup_company() {
- return new Promise(resolve => {
- if(!this.frm.doc.company) {
- frappe.prompt({fieldname:"company", options: "Company", fieldtype:"Link",
- label: __("Select Company"), reqd: 1}, (data) => {
- this.company = data.company;
- resolve(this.company);
- }, __("Select Company"));
- } else {
- resolve();
- }
- })
- }
-
- make_new_invoice() {
- return frappe.run_serially([
- () => this.make_sales_invoice_frm(),
- () => this.set_pos_profile_data(),
- () => {
- if (this.cart) {
- this.cart.frm = this.frm;
- this.cart.reset();
- this.cart.reset_pos_field_value();
- } else {
- this.make_items();
- this.make_cart();
- }
- this.toggle_editing(true);
- },
- ]);
- }
-
- reset_cart() {
- this.cart.frm = this.frm;
- this.cart.reset();
- this.items.reset_search_field();
- }
-
- make_sales_invoice_frm() {
- const doctype = 'Sales Invoice';
- return new Promise(resolve => {
- if (this.frm) {
- this.frm = get_frm(this.frm);
- if(this.company) {
- this.frm.doc.company = this.company;
- }
-
- resolve();
- } else {
- frappe.model.with_doctype(doctype, () => {
- this.frm = get_frm();
- resolve();
- });
- }
- });
-
- function get_frm(_frm) {
- const page = $('');
- const frm = _frm || new frappe.ui.form.Form(doctype, page, false);
- const name = frappe.model.make_new_doc_and_get_name(doctype, true);
- frm.refresh(name);
- frm.doc.items = [];
- frm.doc.is_pos = 1;
-
- return frm;
- }
- }
-
- set_pos_profile_data() {
- if (this.company) {
- this.frm.doc.company = this.company;
- }
-
- if (!this.frm.doc.company) {
- return;
- }
-
- return new Promise(resolve => {
- return this.frm.call({
- doc: this.frm.doc,
- method: "set_missing_values",
- }).then((r) => {
- if(!r.exc) {
- if (!this.frm.doc.pos_profile) {
- frappe.dom.unfreeze();
- this.raise_exception_for_pos_profile();
- }
- this.frm.script_manager.trigger("update_stock");
- frappe.model.set_default_values(this.frm.doc);
- this.frm.cscript.calculate_taxes_and_totals();
-
- if (r.message) {
- this.frm.meta.default_print_format = r.message.print_format || "";
- this.frm.allow_edit_rate = r.message.allow_edit_rate;
- this.frm.allow_edit_discount = r.message.allow_edit_discount;
- this.frm.doc.campaign = r.message.campaign;
- this.frm.allow_print_before_pay = r.message.allow_print_before_pay;
- }
- }
-
- resolve();
- });
- });
- }
-
- prepare_menu() {
- var me = this;
- this.page.clear_menu();
-
- 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');
- });
-
- this.page.add_menu_item(__('Change POS Profile'), function() {
- me.change_pos_profile();
- });
- this.page.add_menu_item(__('Close the POS'), function() {
- var voucher = frappe.model.get_new_doc('POS Closing Voucher');
- voucher.pos_profile = me.frm.doc.pos_profile;
- voucher.user = frappe.session.user;
- voucher.company = me.frm.doc.company;
- voucher.period_start_date = me.frm.doc.posting_date;
- voucher.period_end_date = me.frm.doc.posting_date;
- voucher.posting_date = me.frm.doc.posting_date;
- frappe.set_route('Form', 'POS Closing Voucher', voucher.name);
- });
- }
-
- set_form_action() {
- if(this.frm.doc.docstatus == 1 || (this.frm.allow_print_before_pay == 1 && this.frm.doc.items.length > 0)){
- this.page.set_secondary_action(__("Print"), async() => {
- if(this.frm.doc.docstatus != 1 ){
- await this.frm.save();
- }
- this.frm.print_preview.printit(true);
- });
- }
- if(this.frm.doc.items.length == 0){
- this.page.clear_secondary_action();
- }
-
- if (this.frm.doc.docstatus == 1) {
- this.page.set_primary_action(__("New"), () => {
- this.make_new_invoice();
- });
- this.page.add_menu_item(__("Email"), () => {
- this.frm.email_doc();
- });
- }
- }
-};
-
-const [Qty,Disc,Rate,Del,Pay] = [__("Qty"), __('Disc'), __('Rate'), __('Del'), __('Pay')];
-
-class POSCart {
- constructor({frm, wrapper, events}) {
- this.frm = frm;
- this.item_data = {};
- this.wrapper = wrapper;
- this.events = events;
- this.make();
- this.bind_events();
- }
-
- make() {
- this.make_dom();
- this.make_customer_field();
- this.make_pos_fields();
- this.make_loyalty_points();
- this.make_numpad();
- }
-
- make_dom() {
- this.wrapper.append(`
- `;
- }
-
- this.set_class();
-
- if(this.disable_btns) {
- this.disable_btns.forEach((btn) => {
- const $btn = this.get_btn(btn);
- $btn.prop("disabled", true)
- $btn.hover(() => {
- $btn.css('cursor','not-allowed');
- })
- })
- }
- }
-
- enable_buttons(btns) {
- btns.forEach((btn) => {
- const $btn = this.get_btn(btn);
- $btn.prop("disabled", false)
- $btn.hover(() => {
- $btn.css('cursor','pointer');
- })
- })
- }
-
- 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();
- this.dialog = new frappe.ui.Dialog({
- fields: this.get_fields(),
- width: 800,
- invoice_frm: this.frm
- });
-
- this.set_title();
-
- 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());
- }
- }
- });
- }
-
- set_title() {
- let title = __('Total Amount {0}',
- [format_currency(this.frm.doc.rounded_total || this.frm.doc.grand_total,
- this.frm.doc.currency)]);
-
- this.dialog.set_title(title);
- }
-
- bind_events() {
- var me = this;
- $(this.dialog.body).find('.input-with-feedback').focusin(function() {
- me.numpad.reset_value();
- me.fieldname = $(this).prop('dataset').fieldname;
- if (me.frm.doc.outstanding_amount > 0 &&
- !in_list(['write_off_amount', 'change_amount'], me.fieldname)) {
- me.frm.doc.payments.forEach((data) => {
- if (data.mode_of_payment == me.fieldname && !data.amount) {
- me.dialog.set_value(me.fieldname,
- me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate);
- return;
- }
- })
- }
- });
- }
-
- 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) || 0;
- me.update_payment_value(this.fieldname, value);
- }
- };
- });
-
- fields = fields.concat([
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'HTML',
- fieldname: 'numpad'
- },
- {
- fieldtype: 'Section Break',
- depends_on: 'eval: this.invoice_frm.doc.loyalty_program'
- },
- {
- fieldtype: 'Check',
- label: 'Redeem Loyalty Points',
- fieldname: 'redeem_loyalty_points',
- onchange: () => {
- me.update_cur_frm_value("redeem_loyalty_points", () => {
- frappe.flags.redeem_loyalty_points = false;
- me.update_loyalty_points();
- });
- }
- },
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'Int',
- fieldname: "loyalty_points",
- label: __("Loyalty Points"),
- depends_on: "redeem_loyalty_points",
- onchange: () => {
- me.update_cur_frm_value("loyalty_points", () => {
- frappe.flags.loyalty_points = false;
- me.update_loyalty_points();
- });
- }
- },
- {
- fieldtype: 'Currency',
- label: __("Loyalty Amount"),
- fieldname: "loyalty_amount",
- options: me.frm.doc.currency,
- read_only: 1,
- depends_on: "redeem_loyalty_points"
- },
- {
- 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;
- frappe.flags.loyalty_points = true;
- frappe.flags.redeem_loyalty_points = true;
- frappe.flags.payment_method = 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);
- }
-
- update_payment_amount() {
- var me = this;
- $.each(this.frm.doc.payments, function(i, data) {
- console.log("setting the ", data.mode_of_payment, " for the value", data.amount);
- me.dialog.set_value(data.mode_of_payment, data.amount);
- });
- }
-
- update_loyalty_points() {
- if (this.dialog.get_value("redeem_loyalty_points")) {
- this.dialog.set_value("loyalty_points", this.frm.doc.loyalty_points);
- this.dialog.set_value("loyalty_amount", this.frm.doc.loyalty_amount);
- this.update_payment_amount();
- this.show_paid_amount();
- }
- }
-
-}
+ // online
+ wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
+ window.cur_pos = wrapper.pos;
+};
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.json b/erpnext/selling/page/point_of_sale/point_of_sale.json
index 6d2f5f2f8d..99b86e42c2 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.json
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.json
@@ -1,33 +1,33 @@
{
- "content": null,
- "creation": "2017-08-07 17:08:56.737947",
- "docstatus": 0,
- "doctype": "Page",
- "idx": 0,
- "modified": "2017-09-11 13:49:05.415211",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "point-of-sale",
- "owner": "Administrator",
- "page_name": "Point of Sale",
- "restrict_to_domain": "Retail",
+ "content": null,
+ "creation": "2020-01-28 22:05:44.819140",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2020-06-01 15:41:06.348380",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "point-of-sale",
+ "owner": "Administrator",
+ "page_name": "Point of Sale",
+ "restrict_to_domain": "Retail",
"roles": [
{
"role": "Accounts User"
- },
+ },
{
"role": "Accounts Manager"
- },
+ },
{
"role": "Sales User"
- },
+ },
{
"role": "Sales Manager"
}
- ],
- "script": null,
- "standard": "Yes",
- "style": null,
- "system_page": 0,
- "title": "Point of Sale"
+ ],
+ "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
index 1ae1fde588..9f8410f40b 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -6,6 +6,7 @@ import frappe, json
from frappe.utils.nestedset import get_root_of
from frappe.utils import cint
from erpnext.accounts.doctype.pos_profile.pos_profile import get_item_groups
+from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_stock_availability
from six import string_types
@@ -43,6 +44,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
SELECT
name AS item_code,
item_name,
+ description,
stock_uom,
image AS item_image,
idx AS idx,
@@ -53,10 +55,11 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
disabled = 0
AND has_variants = 0
AND is_sales_item = 1
+ AND is_fixed_asset = 0
AND item_group in (SELECT name FROM `tabItem Group` WHERE lft >= {lft} AND rgt <= {rgt})
AND {condition}
ORDER BY
- idx desc
+ name asc
LIMIT
{start}, {page_length}"""
.format(
@@ -73,32 +76,14 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
fields = ["item_code", "price_list_rate", "currency"],
filters = {'price_list': price_list, 'item_code': ['in', items]})
- item_prices, bin_data = {}, {}
+ item_prices = {}
for d in item_prices_data:
item_prices[d.item_code] = d
- # prepare filter for bin query
- bin_filters = {'item_code': ['in', items]}
- if warehouse:
- bin_filters['warehouse'] = warehouse
- if display_items_in_stock:
- bin_filters['actual_qty'] = [">", 0]
-
- # query item bin
- bin_data = frappe.get_all(
- 'Bin', fields=['item_code', 'sum(actual_qty) as actual_qty'],
- filters=bin_filters, group_by='item_code'
- )
-
- # convert list of dict into dict as {item_code: actual_qty}
- bin_dict = {}
- for b in bin_data:
- bin_dict[b.get('item_code')] = b.get('actual_qty')
-
for item in items_data:
item_code = item.item_code
item_price = item_prices.get(item_code) or {}
- item_stock_qty = bin_dict.get(item_code)
+ item_stock_qty = get_stock_availability(item_code, warehouse)
if display_items_in_stock and not item_stock_qty:
pass
@@ -116,6 +101,13 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
'items': result
}
+ if len(res['items']) == 1:
+ res['items'][0].setdefault('serial_no', serial_no)
+ res['items'][0].setdefault('batch_no', batch_no)
+ res['items'][0].setdefault('barcode', barcode)
+
+ return res
+
if serial_no:
res.update({
'serial_no': serial_no
@@ -168,6 +160,7 @@ def get_item_group_condition(pos_profile):
return cond % tuple(item_groups)
@frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
def item_group_query(doctype, txt, searchfield, start, page_len, filters):
item_groups = []
cond = "1=1"
@@ -186,6 +179,73 @@ def item_group_query(doctype, txt, searchfield, start, page_len, filters):
{'txt': '%%%s%%' % txt})
@frappe.whitelist()
-def get_pos_fields():
- return frappe.get_all("POS Field", fields=["label", "fieldname",
- "fieldtype", "default_value", "reqd", "read_only", "options"])
+def check_opening_entry(user):
+ open_vouchers = frappe.db.get_all("POS Opening Entry",
+ filters = {
+ "user": user,
+ "pos_closing_entry": ["in", ["", None]],
+ "docstatus": 1
+ },
+ fields = ["name", "company", "pos_profile", "period_start_date"],
+ order_by = "period_start_date desc"
+ )
+
+ return open_vouchers
+
+@frappe.whitelist()
+def create_opening_voucher(pos_profile, company, balance_details):
+ import json
+ balance_details = json.loads(balance_details)
+
+ new_pos_opening = frappe.get_doc({
+ 'doctype': 'POS Opening Entry',
+ "period_start_date": frappe.utils.get_datetime(),
+ "posting_date": frappe.utils.getdate(),
+ "user": frappe.session.user,
+ "pos_profile": pos_profile,
+ "company": company,
+ })
+ new_pos_opening.set("balance_details", balance_details)
+ new_pos_opening.submit()
+
+ return new_pos_opening.as_dict()
+
+@frappe.whitelist()
+def get_past_order_list(search_term, status, limit=20):
+ fields = ['name', 'grand_total', 'currency', 'customer', 'posting_time', 'posting_date']
+ invoice_list = []
+
+ if search_term and status:
+ invoices_by_customer = frappe.db.get_all('POS Invoice', filters={
+ 'customer': ['like', '%{}%'.format(search_term)],
+ 'status': status
+ }, fields=fields)
+ invoices_by_name = frappe.db.get_all('POS Invoice', filters={
+ 'name': ['like', '%{}%'.format(search_term)],
+ 'status': status
+ }, fields=fields)
+
+ invoice_list = invoices_by_customer + invoices_by_name
+ elif status:
+ invoice_list = frappe.db.get_all('POS Invoice', filters={
+ 'status': status
+ }, fields=fields)
+
+ return invoice_list
+
+@frappe.whitelist()
+def set_customer_info(fieldname, customer, value=""):
+ if fieldname == 'loyalty_program':
+ frappe.db.set_value('Customer', customer, 'loyalty_program', value)
+
+ contact = frappe.get_cached_value('Customer', customer, 'customer_primary_contact')
+
+ if contact:
+ contact_doc = frappe.get_doc('Contact', contact)
+ if fieldname == 'email_id':
+ contact_doc.set('email_ids', [{ 'email_id': value, 'is_primary': 1}])
+ frappe.db.set_value('Customer', customer, 'email_id', value)
+ elif fieldname == 'mobile_no':
+ contact_doc.set('phone_nos', [{ 'phone': value, 'is_primary_mobile_no': 1}])
+ frappe.db.set_value('Customer', customer, 'mobile_no', value)
+ contact_doc.save()
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
new file mode 100644
index 0000000000..483ef78d64
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -0,0 +1,714 @@
+{% include "erpnext/selling/page/point_of_sale/onscan.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_selector.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_cart.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_details.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_payment.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_number_pad.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_past_order_list.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_past_order_summary.js" %}
+
+erpnext.PointOfSale.Controller = class {
+ constructor(wrapper) {
+ this.wrapper = $(wrapper).find('.layout-main-section');
+ this.page = wrapper.page;
+
+ this.load_assets();
+ }
+
+ load_assets() {
+ // after loading assets first check if opening entry has been made
+ frappe.require(['assets/erpnext/css/pos.css'], this.check_opening_entry.bind(this));
+ }
+
+ check_opening_entry() {
+ return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.check_opening_entry", { "user": frappe.session.user })
+ .then((r) => {
+ if (r.message.length) {
+ // assuming only one opening voucher is available for the current user
+ this.prepare_app_defaults(r.message[0]);
+ } else {
+ this.create_opening_voucher();
+ }
+ });
+ }
+
+ create_opening_voucher() {
+ const table_fields = [
+ { fieldname: "mode_of_payment", fieldtype: "Link", in_list_view: 1, label: "Mode of Payment", options: "Mode of Payment", reqd: 1 },
+ { fieldname: "opening_amount", fieldtype: "Currency", in_list_view: 1, label: "Opening Amount", options: "company:company_currency", reqd: 1 }
+ ];
+
+ const dialog = new frappe.ui.Dialog({
+ title: __('Create POS Opening Entry'),
+ fields: [
+ {
+ fieldtype: 'Link', label: __('Company'), default: frappe.defaults.get_default('company'),
+ options: 'Company', fieldname: 'company', reqd: 1
+ },
+ {
+ fieldtype: 'Link', label: __('POS Profile'),
+ options: 'POS Profile', fieldname: 'pos_profile', reqd: 1,
+ onchange: () => {
+ const pos_profile = dialog.fields_dict.pos_profile.get_value();
+ const company = dialog.fields_dict.company.get_value();
+ const user = frappe.session.user
+
+ if (!pos_profile || !company || !user) return;
+
+ // auto fetch last closing entry's balance details
+ frappe.db.get_list("POS Closing Entry", {
+ filters: { company, pos_profile, user },
+ limit: 1,
+ order_by: 'period_end_date desc'
+ }).then((res) => {
+ if (!res.length) return;
+ const pos_closing_entry = res[0];
+ frappe.db.get_doc("POS Closing Entry", pos_closing_entry.name).then(({ payment_reconciliation }) => {
+ dialog.fields_dict.balance_details.df.data = [];
+ payment_reconciliation.forEach(pay => {
+ const { mode_of_payment, closing_amount } = pay;
+ dialog.fields_dict.balance_details.df.data.push({
+ mode_of_payment: mode_of_payment
+ });
+ });
+ dialog.fields_dict.balance_details.grid.refresh();
+ });
+ });
+ }
+ },
+ {
+ fieldname: "balance_details",
+ fieldtype: "Table",
+ label: "Opening Balance Details",
+ cannot_add_rows: false,
+ in_place_edit: true,
+ reqd: 1,
+ data: [],
+ fields: table_fields
+ }
+ ],
+ primary_action: ({ company, pos_profile, balance_details }) => {
+ if (!balance_details.length) {
+ frappe.show_alert({
+ message: __("Please add Mode of payments and opening balance details."),
+ indicator: 'red'
+ })
+ frappe.utils.play_sound("error");
+ return;
+ }
+ frappe.dom.freeze();
+ return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.create_opening_voucher",
+ { pos_profile, company, balance_details })
+ .then((r) => {
+ frappe.dom.unfreeze();
+ dialog.hide();
+ if (r.message) {
+ this.prepare_app_defaults(r.message);
+ }
+ })
+ },
+ primary_action_label: __('Submit')
+ });
+ dialog.show();
+ }
+
+ prepare_app_defaults(data) {
+ this.pos_opening = data.name;
+ this.company = data.company;
+ this.pos_profile = data.pos_profile;
+ this.pos_opening_time = data.period_start_date;
+
+ frappe.db.get_value('Stock Settings', undefined, 'allow_negative_stock').then(({ message }) => {
+ this.allow_negative_stock = flt(message.allow_negative_stock) || false;
+ });
+
+ frappe.db.get_doc("POS Profile", this.pos_profile).then((profile) => {
+ this.customer_groups = profile.customer_groups.map(group => group.customer_group);
+ this.cart.make_customer_selector();
+ });
+
+ this.item_stock_map = {};
+
+ this.make_app();
+ }
+
+ set_opening_entry_status() {
+ this.page.set_title_sub(
+ `
+
+ Opened at ${moment(this.pos_opening_time).format("Do MMMM, h:mma")}
+
+ `);
+ }
+
+ make_app() {
+ return frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => {
+ this.set_opening_entry_status();
+ this.prepare_dom();
+ this.prepare_components();
+ this.prepare_menu();
+ },
+ () => this.make_new_invoice(),
+ () => frappe.dom.unfreeze(),
+ () => this.page.set_title(__('Point of Sale Beta')),
+ ]);
+ }
+
+ prepare_dom() {
+ this.wrapper.append(`
+ `
+ );
+
+ this.$components_wrapper = this.wrapper.find('.app');
+ }
+
+ prepare_components() {
+ this.init_item_selector();
+ this.init_item_details();
+ this.init_item_cart();
+ this.init_payments();
+ this.init_recent_order_list();
+ this.init_order_summary();
+ }
+
+ prepare_menu() {
+ var me = this;
+ this.page.clear_menu();
+
+ 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(__("Toggle Recent Orders"), () => {
+ const show = this.recent_order_list.$component.hasClass('d-none');
+ this.toggle_recent_order_list(show);
+ });
+
+ this.page.add_menu_item(__("Save as Draft"), this.save_draft_invoice.bind(this));
+
+ frappe.ui.keys.on("ctrl+s", this.save_draft_invoice.bind(this));
+
+ this.page.add_menu_item(__('Close the POS'), this.close_pos.bind(this));
+
+ frappe.ui.keys.on("shift+ctrl+s", this.close_pos.bind(this));
+ }
+
+ save_draft_invoice() {
+ if (!this.$components_wrapper.is(":visible")) return;
+
+ if (this.frm.doc.items.length == 0) {
+ frappe.show_alert({
+ message:__("You must add atleast one item to save it as draft."),
+ indicator:'red'
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ this.frm.save(undefined, undefined, undefined, () => {
+ frappe.show_alert({
+ message:__("There was an error saving the document."),
+ indicator:'red'
+ });
+ frappe.utils.play_sound("error");
+ }).then(() => {
+ frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => this.make_new_invoice(),
+ () => frappe.dom.unfreeze(),
+ ]);
+ })
+ }
+
+ close_pos() {
+ if (!this.$components_wrapper.is(":visible")) return;
+
+ let voucher = frappe.model.get_new_doc('POS Closing Entry');
+ voucher.pos_profile = this.frm.doc.pos_profile;
+ voucher.user = frappe.session.user;
+ voucher.company = this.frm.doc.company;
+ voucher.pos_opening_entry = this.pos_opening;
+ voucher.period_end_date = frappe.datetime.now_datetime();
+ voucher.posting_date = frappe.datetime.now_date();
+ frappe.set_route('Form', 'POS Closing Entry', voucher.name);
+ }
+
+ init_item_selector() {
+ this.item_selector = new erpnext.PointOfSale.ItemSelector({
+ wrapper: this.$components_wrapper,
+ pos_profile: this.pos_profile,
+ events: {
+ item_selected: args => this.on_cart_update(args),
+
+ get_frm: () => this.frm || {},
+
+ get_allowed_item_group: () => this.item_groups
+ }
+ })
+ }
+
+ init_item_cart() {
+ this.cart = new erpnext.PointOfSale.ItemCart({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ cart_item_clicked: (item_code, batch_no, uom) => {
+ const item_row = this.frm.doc.items.find(
+ i => i.item_code === item_code
+ && i.uom === uom
+ && (!batch_no || (batch_no && i.batch_no === batch_no))
+ );
+ this.item_details.toggle_item_details_section(item_row);
+ },
+
+ numpad_event: (value, action) => this.update_item_field(value, action),
+
+ checkout: () => this.payment.checkout(),
+
+ edit_cart: () => this.payment.edit_cart(),
+
+ customer_details_updated: (details) => {
+ this.customer_details = details;
+ // will add/remove LP payment method
+ this.payment.render_loyalty_points_payment_mode();
+ },
+
+ get_allowed_customer_group: () => this.customer_groups
+ }
+ })
+ }
+
+ init_item_details() {
+ this.item_details = new erpnext.PointOfSale.ItemDetails({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ toggle_item_selector: (minimize) => {
+ this.item_selector.resize_selector(minimize);
+ this.cart.toggle_numpad(minimize);
+ },
+
+ form_updated: async (cdt, cdn, fieldname, value) => {
+ const item_row = frappe.model.get_doc(cdt, cdn);
+ if (item_row && item_row[fieldname] != value) {
+
+ if (fieldname === 'qty' && flt(value) == 0) {
+ this.remove_item_from_cart();
+ return;
+ }
+
+ const { item_code, batch_no, uom } = this.item_details.current_item;
+ const event = {
+ field: fieldname,
+ value,
+ item: { item_code, batch_no, uom }
+ }
+ return this.on_cart_update(event)
+ }
+ },
+
+ item_field_focused: (fieldname) => {
+ this.cart.toggle_numpad_field_edit(fieldname);
+ },
+ set_value_in_current_cart_item: (selector, value) => {
+ this.cart.update_selector_value_in_cart_item(selector, value, this.item_details.current_item);
+ },
+ clone_new_batch_item_in_frm: (batch_serial_map, current_item) => {
+ // called if serial nos are 'auto_selected' and if those serial nos belongs to multiple batches
+ // for each unique batch new item row is added in the form & cart
+ Object.keys(batch_serial_map).forEach(batch => {
+ const { item_code, batch_no } = current_item;
+ const item_to_clone = this.frm.doc.items.find(i => i.item_code === item_code && i.batch_no === batch_no);
+ const new_row = this.frm.add_child("items", { ...item_to_clone });
+ // update new serialno and batch
+ new_row.batch_no = batch;
+ new_row.serial_no = batch_serial_map[batch].join(`\n`);
+ new_row.qty = batch_serial_map[batch].length;
+ this.frm.doc.items.forEach(row => {
+ if (item_code === row.item_code) {
+ this.update_cart_html(row);
+ }
+ });
+ })
+ },
+ remove_item_from_cart: () => this.remove_item_from_cart(),
+ get_item_stock_map: () => this.item_stock_map,
+ close_item_details: () => {
+ this.item_details.toggle_item_details_section(undefined);
+ this.cart.prev_action = undefined;
+ this.cart.toggle_item_highlight();
+ },
+ get_available_stock: (item_code, warehouse) => this.get_available_stock(item_code, warehouse)
+ }
+ });
+ }
+
+ init_payments() {
+ this.payment = new erpnext.PointOfSale.Payment({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm || {},
+
+ get_customer_details: () => this.customer_details || {},
+
+ toggle_other_sections: (show) => {
+ if (show) {
+ this.item_details.$component.hasClass('d-none') ? '' : this.item_details.$component.addClass('d-none');
+ this.item_selector.$component.addClass('d-none');
+ } else {
+ this.item_selector.$component.removeClass('d-none');
+ }
+ },
+
+ submit_invoice: () => {
+ this.frm.savesubmit()
+ .then((r) => {
+ // this.set_invoice_status();
+ this.toggle_components(false);
+ this.order_summary.toggle_component(true);
+ this.order_summary.load_summary_of(this.frm.doc, true);
+ frappe.show_alert({
+ indicator: 'green',
+ message: __(`POS invoice ${r.doc.name} created succesfully`)
+ });
+ });
+ }
+ }
+ });
+ }
+
+ init_recent_order_list() {
+ this.recent_order_list = new erpnext.PointOfSale.PastOrderList({
+ wrapper: this.$components_wrapper,
+ events: {
+ open_invoice_data: (name) => {
+ frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ this.order_summary.load_summary_of(doc);
+ });
+ },
+ reset_summary: () => this.order_summary.show_summary_placeholder()
+ }
+ })
+ }
+
+ init_order_summary() {
+ this.order_summary = new erpnext.PointOfSale.PastOrderSummary({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ process_return: (name) => {
+ this.recent_order_list.toggle_component(false);
+ frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ frappe.run_serially([
+ () => this.make_return_invoice(doc),
+ () => this.cart.load_invoice(),
+ () => this.item_selector.toggle_component(true)
+ ]);
+ });
+ },
+ edit_order: (name) => {
+ this.recent_order_list.toggle_component(false);
+ frappe.run_serially([
+ () => this.frm.refresh(name),
+ () => this.cart.load_invoice(),
+ () => this.item_selector.toggle_component(true)
+ ]);
+ },
+ new_order: () => {
+ frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => this.make_new_invoice(),
+ () => this.item_selector.toggle_component(true),
+ () => frappe.dom.unfreeze(),
+ ]);
+ }
+ }
+ })
+ }
+
+
+
+ toggle_recent_order_list(show) {
+ this.toggle_components(!show);
+ this.recent_order_list.toggle_component(show);
+ this.order_summary.toggle_component(show);
+ }
+
+ toggle_components(show) {
+ this.cart.toggle_component(show);
+ this.item_selector.toggle_component(show);
+
+ // do not show item details or payment if recent order is toggled off
+ !show ? (this.item_details.toggle_component(false) || this.payment.toggle_component(false)) : '';
+ }
+
+ make_new_invoice() {
+ return frappe.run_serially([
+ () => this.make_sales_invoice_frm(),
+ () => this.set_pos_profile_data(),
+ () => this.set_pos_profile_status(),
+ () => this.cart.load_invoice(),
+ ]);
+ }
+
+ make_sales_invoice_frm() {
+ const doctype = 'POS Invoice';
+ return new Promise(resolve => {
+ if (this.frm) {
+ this.frm = this.get_new_frm(this.frm);
+ this.frm.doc.items = [];
+ this.frm.doc.is_pos = 1
+ resolve();
+ } else {
+ frappe.model.with_doctype(doctype, () => {
+ this.frm = this.get_new_frm();
+ this.frm.doc.items = [];
+ this.frm.doc.is_pos = 1
+ resolve();
+ });
+ }
+ });
+ }
+
+ get_new_frm(_frm) {
+ const doctype = 'POS Invoice';
+ const page = $('
-
- `);
-
-
- 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.$qty_total = this.wrapper.find('.quantity-total');
- // this.$loyalty_button = this.wrapper.find('.loyalty-button');
-
- // this.$loyalty_button.on('click', () => {
- // this.loyalty_button.show();
- // })
-
- 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("");
- this.frm.msgbox = "";
-
- let total_item_qty = 0.0;
- this.frm.set_value("pos_total_qty",total_item_qty);
-
- this.$discount_amount.find('input:text').val('');
- this.wrapper.find('.grand-total-value').text(
- format_currency(this.frm.doc.grand_total, this.frm.currency));
- this.wrapper.find('.rounded-total-value').text(
- format_currency(this.frm.doc.rounded_total, this.frm.currency));
- this.$qty_total.find(".quantity-total").text(total_item_qty);
-
- const customer = this.frm.doc.customer;
- this.customer_field.set_value(customer);
-
- if (this.numpad) {
- const disable_btns = this.disable_numpad_control()
- const enable_btns = [__('Rate'), __('Disc')]
-
- if (disable_btns) {
- enable_btns.filter(btn => !disable_btns.includes(btn))
- }
-
- this.numpad.enable_buttons(enable_btns);
- }
- }
-
- reset_pos_field_value() {
- let value = '';
- if (this.custom_pos_fields) {
- this.custom_pos_fields.forEach(r => {
- value = this.frm.doc[r.fieldname] || r.default_value || '';
-
- if (this.fields) {
- this.fields[r.fieldname].set_value(value);
- }
- })
- }
-
- this.wrapper.find('.pos-fields').toggle(false);
- this.wrapper.find('.pos-fields-octicon').toggle(true);
- }
-
- get_grand_total() {
- let total = this.get_total_template('Grand Total', 'grand-total-value');
-
- if (!cint(frappe.sys_defaults.disable_rounded_total)) {
- total += this.get_total_template('Rounded Total', 'rounded-total-value');
- }
-
- return total;
- }
-
- get_item_qty_total() {
- let total = this.get_total_template('Total Qty', 'quantity-total');
- return total;
- }
-
- get_total_template(label, class_name) {
- return `
-
-
-
-
-
-
-
-
-
- ${__('Item Name')}
- ${__('Quantity')}
- ${__('Discount')}
- ${__('Rate')}
-
-
-
- ${__('No Items added to cart')}
-
-
- ${this.get_taxes_and_totals()}
-
- `+
- (!this.frm.allow_edit_discount ? `` : `${this.get_discount_amount()}`)+
- `
-
- ${this.get_grand_total()}
-
-
- ${this.get_item_qty_total()}
-
-
-
-
-
-
-
-
-
- `;
- }
-
- get_discount_amount() {
- const get_currency_symbol = window.get_currency_symbol;
-
- return `
- ${__(label)}
- 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() {
- if (!this.frm.doc.taxes) { return; }
-
- 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.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)
- );
-
- this.$grand_total.find('.rounded-total-value').text(
- format_currency(this.frm.doc.rounded_total, this.frm.currency)
- );
- }
-
- update_qty_total() {
- var total_item_qty = 0;
- $.each(this.frm.doc["items"] || [], function (i, d) {
- if (d.qty > 0) {
- total_item_qty += d.qty;
- }
- });
- this.$qty_total.find('.quantity-total').text(total_item_qty);
- this.frm.set_value("pos_total_qty",total_item_qty);
- }
-
- make_customer_field() {
- this.customer_field = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Link',
- label: 'Customer',
- fieldname: 'customer',
- options: 'Customer',
- reqd: 1,
- get_query: function() {
- return {
- query: 'erpnext.controllers.queries.customer_query'
- }
- },
- onchange: () => {
- this.events.on_customer_change(this.customer_field.get_value());
- this.events.get_loyalty_details();
- }
- },
- parent: this.wrapper.find('.customer-field'),
- render_input: true
- });
-
- this.customer_field.set_value(this.frm.doc.customer);
- }
-
- make_pos_fields() {
- const me = this;
-
- this.fields = {};
- this.wrapper.find('.pos-fields-octicon, .more-fields-section').click(() => {
- this.wrapper.find('.pos-fields').toggle();
- this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
- });
- this.wrapper.find('.pos-fields').toggle(false);
-
- return new Promise(res => {
- frappe.call({
- method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_fields",
- freeze: true,
- }).then(r => {
- if(r.message.length) {
- this.wrapper.find('.pos-field-section').css('display','block');
- this.custom_pos_fields = r.message;
- if (r.message.length < 3) {
- this.wrapper.find('.pos-fields').toggle(true);
- this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
- }
-
- r.message.forEach(field => {
- this.fields[field.fieldname] = frappe.ui.form.make_control({
- df: {
- fieldtype: field.fieldtype,
- label: field.label,
- fieldname: field.fieldname,
- options: field.options,
- reqd: field.reqd || 0,
- read_only: field.read_only || 0,
- default: field.default_value,
- onchange: function() {
- if (this.value) {
- me.frm.set_value(this.df.fieldname, this.value);
- }
- },
- get_query: () => {
- return this.get_query_for_pos_fields(field.fieldname)
- },
- },
- parent: this.wrapper.find('.pos-fields'),
- render_input: true
- });
-
- if (this.frm.doc[field.fieldname]) {
- this.fields[field.fieldname].set_value(this.frm.doc[field.fieldname]);
- }
- });
- }
- });
- });
- }
-
- get_query_for_pos_fields(field) {
- if (this.frm.fields_dict && this.frm.fields_dict[field]
- && this.frm.fields_dict[field].get_query) {
- return this.frm.fields_dict[field].get_query(this.frm.doc);
- }
- }
-
- make_loyalty_points() {
- this.available_loyalty_points = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Int',
- label: 'Available Loyalty Points',
- read_only: 1,
- fieldname: 'available_loyalty_points'
- },
- parent: this.wrapper.find('.loyalty-program-field')
- });
- this.available_loyalty_points.set_value(this.frm.doc.loyalty_points);
- }
-
-
- disable_numpad_control() {
- let disabled_btns = [];
- if(!this.frm.allow_edit_rate) {
- disabled_btns.push(__('Rate'));
- }
- if(!this.frm.allow_edit_discount) {
- disabled_btns.push(__('Disc'));
- }
- return disabled_btns;
- }
-
-
- make_numpad() {
-
- var pay_class = {}
- pay_class[__('Pay')]='brand-primary'
- this.numpad = new NumberPad({
- button_array: [
- [1, 2, 3, Qty],
- [4, 5, 6, Disc],
- [7, 8, 9, Rate],
- [Del, 0, '.', Pay]
- ],
- add_class: pay_class,
- disable_highlight: [Qty, Disc, Rate, Pay],
- reset_btns: [Qty, Disc, Rate, Pay],
- del_btn: Del,
- disable_btns: this.disable_numpad_control(),
- 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;
- }
-
- if (this.selected_item.active_field == 'discount_percentage' && this.numpad.get_value() > cint(100)) {
- frappe.show_alert({
- indicator: 'red',
- message: __('Discount amount cannot be greater than 100%')
- });
- this.numpad.reset_value();
- } else {
- const item_code = unescape(this.selected_item.attr('data-item-code'));
- const batch_no = this.selected_item.attr('data-batch-no');
- const field = this.selected_item.active_field;
- const value = this.numpad.get_value();
-
- this.events.on_field_change(item_code, field, value, batch_no);
- }
- }
-
- 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, item.batch_no)) {
- // update quantity
- this.update_item(item);
- } else if (flt(item.qty) > 0.0) {
- // add to cart
- const $item = $(this.get_item_html(item));
- $item.appendTo(this.$cart_items);
- }
- this.highlight_item(item.item_code);
- }
-
- update_item(item) {
- const item_selector = item.batch_no ?
- `[data-batch-no="${item.batch_no}"]` : `[data-item-code="${escape(item.item_code)}"]`;
-
- const $item = this.$cart_items.find(item_selector);
-
- if(item.qty > 0) {
- const is_stock_item = this.get_item_details(item.item_code).is_stock_item;
- const indicator_class = (!is_stock_item || 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 is_stock_item = this.get_item_details(item.item_code).is_stock_item;
- const rate = format_currency(item.rate, this.frm.doc.currency);
- const indicator_class = (!is_stock_item || item.actual_qty >= item.qty) ? 'green' : 'red';
- const batch_no = item.batch_no || '';
-
- return `
-
-
- `;
-
- function get_quantity_html(value) {
- return `
-
- ${item.item_name}
-
-
- ${get_quantity_html(item.qty)}
-
-
- ${item.discount_percentage}%
-
-
- ${rate}
-
-
-
-
-
-
-
-
-
-
-
-
- `;
- }
- }
-
- get_item_details(item_code) {
- if (!this.item_data[item_code]) {
- this.item_data[item_code] = this.events.get_item_details(item_code);
- }
-
- return this.item_data[item_code];
- }
-
- exists(item_code, batch_no) {
- const is_exists = batch_no ?
- `[data-batch-no="${batch_no}"]` : `[data-item-code="${escape(item_code)}"]`;
-
- let $item = this.$cart_items.find(is_exists);
-
- return $item.length > 0;
- }
-
- highlight_item(item_code) {
- const $item = this.$cart_items.find(`[data-item-code="${escape(item_code)}"]`);
- $item.addClass('highlight');
- setTimeout(() => $item.removeClass('highlight'), 1000);
- }
-
- scroll_to_item(item_code) {
- const $item = this.$cart_items.find(`[data-item-code="${escape(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 = unescape($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('change', '.quantity input', function() {
- const $input = $(this);
- const $item = $input.closest('.list-item[data-item-code]');
- const item_code = unescape($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));
- });
-
- this.wrapper.find('.additional_discount_percentage').on('change', (e) => {
- const discount_percentage = flt(e.target.value,
- precision("additional_discount_percentage"));
-
- frappe.model.set_value(this.frm.doctype, this.frm.docname,
- 'additional_discount_percentage', discount_percentage)
- .then(() => {
- let discount_wrapper = this.wrapper.find('.discount_amount');
- discount_wrapper.val(flt(this.frm.doc.discount_amount,
- precision('discount_amount')));
- discount_wrapper.trigger('change');
- });
- });
-
- this.wrapper.find('.discount_amount').on('change', (e) => {
- const discount_amount = flt(e.target.value, precision('discount_amount'));
- frappe.model.set_value(this.frm.doctype, this.frm.docname,
- 'discount_amount', discount_amount);
- this.frm.trigger('discount_amount')
- .then(() => {
- this.update_discount_fields();
- this.update_taxes_and_totals();
- this.update_grand_total();
- });
- });
- }
-
- update_discount_fields() {
- let discount_wrapper = this.wrapper.find('.additional_discount_percentage');
- let discount_amt_wrapper = this.wrapper.find('.discount_amount');
- discount_wrapper.val(flt(this.frm.doc.additional_discount_percentage,
- precision('additional_discount_percentage')));
- discount_amt_wrapper.val(flt(this.frm.doc.discount_amount,
- precision('discount_amount')));
- }
-
- 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, frm, events}) {
- this.wrapper = wrapper;
- this.frm = frm;
- this.items = {};
- this.events = events;
- this.currency = this.frm.doc.currency;
-
- frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name", (r) => {
- this.parent_item_group = r.name;
- this.make_dom();
- this.make_fields();
-
- this.init_clusterize();
- this.bind_events();
- this.load_items_data();
- })
- }
-
- load_items_data() {
- // bootstrap with 20 items
- this.get_items()
- .then(({ items }) => {
- this.all_items = items;
- this.items = items;
- this.render_items(items);
- });
- }
-
- reset_items() {
- this.wrapper.find('.pos-items').empty();
- this.init_clusterize();
- this.load_items_data();
- }
-
- make_dom() {
- this.wrapper.html(`
-
-
-
-
-
-
-
-
- `);
-
- this.items_wrapper = this.wrapper.find('.items-wrapper');
- this.items_wrapper.append(`
-
-
- `);
- }
-
- make_fields() {
- // Search field
- const me = this;
- 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;
- const item_group = this.item_group_field ?
- this.item_group_field.get_value() : '';
-
- this.filter_items({ search_term:search_term, item_group: item_group});
- }, 300);
- });
-
- this.item_group_field = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Link',
- label: 'Item Group',
- options: 'Item Group',
- default: me.parent_item_group,
- onchange: () => {
- const item_group = this.item_group_field.get_value();
- if (item_group) {
- this.filter_items({ item_group: item_group });
- }
- },
- get_query: () => {
- return {
- query: 'erpnext.selling.page.point_of_sale.point_of_sale.item_group_query',
- filters: {
- pos_profile: this.frm.doc.pos_profile
- }
- };
- }
- },
- 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) {
- row_items.push(curr_row);
- }
- }
-
- this.clusterize.update(row_items);
- }
-
- filter_items({ search_term='', item_group=this.parent_item_group }={}) {
- 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.items = items;
- this.render_items(items);
- this.set_item_in_the_cart(items);
- return;
- }
- } else if (item_group == this.parent_item_group) {
- this.items = this.all_items;
- return this.render_items(this.all_items);
- }
-
- this.get_items({search_value: search_term, item_group })
- .then(({ items, serial_no, batch_no, barcode }) => {
- if (search_term && !barcode) {
- this.search_index[search_term] = items;
- }
-
- this.items = items;
- this.render_items(items);
- this.set_item_in_the_cart(items, serial_no, batch_no, barcode);
- });
- }
-
- set_item_in_the_cart(items, serial_no, batch_no, barcode) {
- if (serial_no) {
- this.events.update_cart(items[0].item_code,
- 'serial_no', serial_no);
- this.reset_search_field();
- return;
- }
-
- if (batch_no) {
- this.events.update_cart(items[0].item_code,
- 'batch_no', batch_no);
- this.reset_search_field();
- return;
- }
-
- if (items.length === 1 && (serial_no || batch_no || barcode)) {
- this.events.update_cart(items[0].item_code,
- 'qty', '+1');
- this.reset_search_field();
- }
- }
-
- reset_search_field() {
- this.search_field.set_value('');
- this.search_field.$input.trigger("input");
- }
-
- bind_events() {
- var me = this;
- this.wrapper.on('click', '.pos-item-wrapper', function() {
- const $item = $(this);
- const item_code = unescape($item.attr('data-item-code'));
- me.events.update_cart(item_code, 'qty', '+1');
- });
- }
-
- get(item_code) {
- let item = {};
- this.items.map(data => {
- if (data.item_code === item_code) {
- item = data;
- }
- })
-
- return item
- }
-
- 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=this.parent_item_group}={}) {
- const price_list = this.frm.doc.selling_price_list;
- return new Promise(res => {
- frappe.call({
- method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
- freeze: true,
- args: {
- start,
- page_length,
- price_list,
- item_group,
- search_value,
- pos_profile: this.frm.doc.pos_profile
- }
- }).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='', disable_btns
- }) {
- 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.disable_btns = disable_btns || [];
- 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}
');
+ const frm = _frm || new frappe.ui.form.Form(doctype, page, false);
+ const name = frappe.model.make_new_doc_and_get_name(doctype, true);
+ frm.refresh(name);
+
+ return frm;
+ }
+
+ async make_return_invoice(doc) {
+ frappe.dom.freeze();
+ this.frm = this.get_new_frm(this.frm);
+ this.frm.doc.items = [];
+ const res = await frappe.call({
+ method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
+ args: {
+ 'source_name': doc.name,
+ 'target_doc': this.frm.doc
+ }
+ });
+ frappe.model.sync(res.message);
+ await this.set_pos_profile_data();
+ frappe.dom.unfreeze();
+ }
+
+ set_pos_profile_data() {
+ if (this.company && !this.frm.doc.company) this.frm.doc.company = this.company;
+ if (this.pos_profile && !this.frm.doc.pos_profile) this.frm.doc.pos_profile = this.pos_profile;
+ if (!this.frm.doc.company) return;
+
+ return new Promise(resolve => {
+ return this.frm.call({
+ doc: this.frm.doc,
+ method: "set_missing_values",
+ }).then((r) => {
+ if(!r.exc) {
+ if (!this.frm.doc.pos_profile) {
+ frappe.dom.unfreeze();
+ this.raise_exception_for_pos_profile();
+ }
+ this.frm.trigger("update_stock");
+ this.frm.trigger('calculate_taxes_and_totals');
+ if(this.frm.doc.taxes_and_charges) this.frm.script_manager.trigger("taxes_and_charges");
+ frappe.model.set_default_values(this.frm.doc);
+ if (r.message) {
+ this.frm.pos_print_format = r.message.print_format || "";
+ this.frm.meta.default_print_format = r.message.print_format || "";
+ this.frm.allow_edit_rate = r.message.allow_edit_rate;
+ this.frm.allow_edit_discount = r.message.allow_edit_discount;
+ this.frm.doc.campaign = r.message.campaign;
+ }
+ }
+ resolve();
+ });
+ });
+ }
+
+ raise_exception_for_pos_profile() {
+ setTimeout(() => frappe.set_route('List', 'POS Profile'), 2000);
+ frappe.throw(__("POS Profile is required to use Point-of-Sale"));
+ }
+
+ set_invoice_status() {
+ const [status, indicator] = frappe.listview_settings["POS Invoice"].get_indicator(this.frm.doc);
+ this.page.set_indicator(__(`${status}`), indicator);
+ }
+
+ set_pos_profile_status() {
+ this.page.set_indicator(__(`${this.pos_profile}`), "blue");
+ }
+
+ async on_cart_update(args) {
+ frappe.dom.freeze();
+ try {
+ let { field, value, item } = args;
+ const { item_code, batch_no, serial_no, uom } = item;
+ let item_row = this.get_item_from_frm(item_code, batch_no, uom);
+
+ const item_selected_from_selector = field === 'qty' && value === "+1"
+
+ if (item_row) {
+ item_selected_from_selector && (value = item_row.qty + flt(value))
+
+ field === 'qty' && (value = flt(value));
+
+ if (field === 'qty' && value > 0 && !this.allow_negative_stock)
+ await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
+
+ if (this.is_current_item_being_edited(item_row) || item_selected_from_selector) {
+ await frappe.model.set_value(item_row.doctype, item_row.name, field, value);
+ this.update_cart_html(item_row);
+ }
+
+ } else {
+ if (!this.frm.doc.customer) {
+ frappe.dom.unfreeze();
+ frappe.show_alert({
+ message: __('You must select a customer before adding an item.'),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+ item_selected_from_selector && (value = flt(value))
+
+ const args = { item_code, batch_no, [field]: value };
+
+ if (serial_no) args['serial_no'] = serial_no;
+
+ if (field === 'serial_no') args['qty'] = value.split(`\n`).length || 0;
+
+ item_row = this.frm.add_child('items', args);
+
+ if (field === 'qty' && value !== 0 && !this.allow_negative_stock)
+ await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
+
+ await this.trigger_new_item_events(item_row);
+
+ this.check_serial_batch_selection_needed(item_row) && this.edit_item_details_of(item_row);
+ this.update_cart_html(item_row);
+ }
+ } catch (error) {
+ console.log(error);
+ } finally {
+ frappe.dom.unfreeze();
+ }
+ }
+
+ get_item_from_frm(item_code, batch_no, uom) {
+ const has_batch_no = batch_no;
+ return this.frm.doc.items.find(
+ i => i.item_code === item_code
+ && (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
+ && (i.uom === uom)
+ );
+ }
+
+ edit_item_details_of(item_row) {
+ this.item_details.toggle_item_details_section(item_row);
+ }
+
+ is_current_item_being_edited(item_row) {
+ const { item_code, batch_no } = this.item_details.current_item;
+
+ return item_code !== item_row.item_code || batch_no != item_row.batch_no ? false : true;
+ }
+
+ update_cart_html(item_row, remove_item) {
+ this.cart.update_item_html(item_row, remove_item);
+ this.cart.update_totals_section(this.frm);
+ }
+
+ check_serial_batch_selection_needed(item_row) {
+ // right now item details is shown for every type of item.
+ // if item details is not shown for every item then this fn will be needed
+ const serialized = item_row.has_serial_no;
+ const batched = item_row.has_batch_no;
+ const no_serial_selected = !item_row.serial_no;
+ const no_batch_selected = !item_row.batch_no;
+
+ if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
+ (serialized && batched && (no_batch_selected || no_serial_selected))) {
+ return true;
+ }
+ return false;
+ }
+
+ async trigger_new_item_events(item_row) {
+ await this.frm.script_manager.trigger('item_code', item_row.doctype, item_row.name)
+ await this.frm.script_manager.trigger('qty', item_row.doctype, item_row.name)
+ }
+
+ async check_stock_availability(item_row, qty_needed, warehouse) {
+ const available_qty = (await this.get_available_stock(item_row.item_code, warehouse)).message;
+
+ frappe.dom.unfreeze();
+ if (!(available_qty > 0)) {
+ frappe.model.clear_doc(item_row.doctype, item_row.name);
+ frappe.throw(__(`Item Code: ${item_row.item_code.bold()} is not available under warehouse ${warehouse.bold()}.`))
+ } else if (available_qty < qty_needed) {
+ frappe.show_alert({
+ message: __(`Stock quantity not enough for Item Code: ${item_row.item_code.bold()} under warehouse ${warehouse.bold()}.
+ Available quantity ${available_qty.toString().bold()}.`),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.item_details.qty_control.set_value(flt(available_qty));
+ }
+ frappe.dom.freeze();
+ }
+
+ get_available_stock(item_code, warehouse) {
+ const me = this;
+ return frappe.call({
+ method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.get_stock_availability",
+ args: {
+ 'item_code': item_code,
+ 'warehouse': warehouse,
+ },
+ callback(res) {
+ if (!me.item_stock_map[item_code])
+ me.item_stock_map[item_code] = {}
+ me.item_stock_map[item_code][warehouse] = res.message;
+ }
+ });
+ }
+
+ update_item_field(value, field_or_action) {
+ if (field_or_action === 'checkout') {
+ this.item_details.toggle_item_details_section(undefined);
+ } else if (field_or_action === 'remove') {
+ this.remove_item_from_cart();
+ } else {
+ const field_control = this.item_details[`${field_or_action}_control`];
+ if (!field_control) return;
+ field_control.set_focus();
+ value != "" && field_control.set_value(value);
+ }
+ }
+
+ remove_item_from_cart() {
+ frappe.dom.freeze();
+ const { doctype, name, current_item } = this.item_details;
+
+ frappe.model.set_value(doctype, name, 'qty', 0);
+
+ this.frm.script_manager.trigger('qty', doctype, name).then(() => {
+ frappe.model.clear_doc(doctype, name);
+ this.update_cart_html(current_item, true);
+ this.item_details.toggle_item_details_section(undefined);
+ frappe.dom.unfreeze();
+ })
+ }
+}
+
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
new file mode 100644
index 0000000000..c23a6ad58f
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -0,0 +1,951 @@
+erpnext.PointOfSale.ItemCart = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.customer_info = undefined;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ ``
+ )
+
+ this.$component = this.wrapper.find('.item-cart');
+ }
+
+ init_child_components() {
+ this.init_customer_selector();
+ this.init_cart_components();
+ }
+
+ init_customer_selector() {
+ this.$component.append(
+ ``
+ )
+ this.$customer_section = this.$component.find('.customer-section');
+ }
+
+ reset_customer_selector() {
+ const frm = this.events.get_frm();
+ frm.set_value('customer', '');
+ this.$customer_section.removeClass('border pr-4 pl-4');
+ this.make_customer_selector();
+ this.customer_field.set_focus();
+ }
+
+ init_cart_components() {
+ this.$component.append(
+ `
`
+ )
+
+ set_dynamic_rate_header_width();
+ this.scroll_to_item($item_to_update);
+
+ function set_dynamic_rate_header_width() {
+ const rate_cols = Array.from(me.$cart_items_wrapper.find(".rate-col"));
+ me.$cart_header.find(".rate-list-header").css("width", "");
+ me.$cart_items_wrapper.find(".rate-col").css("width", "");
+ let max_width = rate_cols.reduce((max_width, elm) => {
+ if ($(elm).width() > max_width)
+ max_width = $(elm).width();
+ return max_width;
+ }, 0);
+
+ max_width += 1;
+ if (max_width == 1) max_width = "";
+
+ me.$cart_header.find(".rate-list-header").css("width", max_width);
+ me.$cart_items_wrapper.find(".rate-col").css("width", max_width);
+ }
+
+ function get_rate_discount_html() {
+ if (item_data.rate && item_data.amount && item_data.rate !== item_data.amount) {
+ return `
+
+
`
+ );
+ this.$cart_container = this.$component.find('.cart-container');
+
+ this.make_cart_totals_section();
+ this.make_cart_items_section();
+ this.make_cart_numpad();
+ }
+
+ make_cart_items_section() {
+ this.$cart_header = this.$component.find('.cart-header');
+ this.$cart_items_wrapper = this.$component.find('.cart-items-section');
+
+ this.make_no_items_placeholder();
+ }
+
+ make_no_items_placeholder() {
+ this.$cart_header.addClass('d-none');
+ this.$cart_items_wrapper.html(
+ `
+
+
+
+
+
+
+ Item
+ Qty
+ Amount
+
+
`
+ )
+ this.$cart_items_wrapper.addClass('mt-4 border-grey border-dashed');
+ }
+
+ make_cart_totals_section() {
+ this.$totals_section = this.$component.find('.cart-totals-section');
+
+ this.$totals_section.append(
+ `No items in cart
+
+ + Add Discount
+
+
+
`
+ )
+
+ this.$add_discount_elem = this.$component.find(".add-discount");
+ }
+
+ make_cart_numpad() {
+ this.$numpad_section = this.$component.find('.numpad-section');
+
+ this.number_pad = new erpnext.PointOfSale.NumberPad({
+ wrapper: this.$numpad_section,
+ events: {
+ numpad_event: this.on_numpad_event.bind(this)
+ },
+ cols: 5,
+ keys: [
+ [ 1, 2, 3, 'Quantity' ],
+ [ 4, 5, 6, 'Discount' ],
+ [ 7, 8, 9, 'Rate' ],
+ [ '.', 0, 'Delete', 'Remove' ]
+ ],
+ css_classes: [
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2 text-bold text-danger' ]
+ ],
+ fieldnames_map: { 'Quantity': 'qty', 'Discount': 'discount_percentage' }
+ })
+
+ this.$numpad_section.prepend(
+ `
+
+
+
+
+ Net Total
+
+
+ 0.00
+
+
+
+
+ Grand Total
+
+
+ 0.00
+
+ Checkout
+
+
+ Edit Cart
+
+
+
+
+
`
+ )
+
+ this.$numpad_section.append(
+ `
+ Checkout
+
`
+ )
+ }
+
+ bind_events() {
+ const me = this;
+ this.$customer_section.on('click', '.add-remove-customer', function (e) {
+ const customer_info_is_visible = me.$cart_container.hasClass('d-none');
+ customer_info_is_visible ?
+ me.toggle_customer_info(false) : me.reset_customer_selector();
+ });
+
+ this.$customer_section.on('click', '.customer-header', function(e) {
+ // don't triggger the event if .add-remove-customer btn is clicked which is under .customer-header
+ if ($(e.target).closest('.add-remove-customer').length) return;
+
+ const show = !me.$cart_container.hasClass('d-none');
+ me.toggle_customer_info(show);
+ });
+
+ this.$cart_items_wrapper.on('click', '.cart-item-wrapper', function() {
+ const $cart_item = $(this);
+
+ me.toggle_item_highlight(this);
+
+ const payment_section_hidden = me.$totals_section.find('.edit-cart-btn').hasClass('d-none');
+ if (!payment_section_hidden) {
+ // payment section is visible
+ // edit cart first and then open item details section
+ me.$totals_section.find(".edit-cart-btn").click();
+ }
+
+ const item_code = unescape($cart_item.attr('data-item-code'));
+ const batch_no = unescape($cart_item.attr('data-batch-no'));
+ const uom = unescape($cart_item.attr('data-uom'));
+ me.events.cart_item_clicked(item_code, batch_no, uom);
+ this.numpad_value = '';
+ });
+
+ this.$component.on('click', '.checkout-btn', function() {
+ if (!$(this).hasClass('bg-primary')) return;
+
+ me.events.checkout();
+ me.toggle_checkout_btn(false);
+
+ me.$add_discount_elem.removeClass("d-none");
+ });
+
+ this.$totals_section.on('click', '.edit-cart-btn', () => {
+ this.events.edit_cart();
+ this.toggle_checkout_btn(true);
+
+ this.$add_discount_elem.addClass("d-none");
+ });
+
+ this.$component.on('click', '.add-discount', () => {
+ const can_edit_discount = this.$add_discount_elem.find('.edit-discount').length;
+
+ if(!this.discount_field || can_edit_discount) this.show_discount_control();
+ });
+
+ frappe.ui.form.on("POS Invoice", "paid_amount", frm => {
+ // called when discount is applied
+ this.update_totals_section(frm);
+ });
+ }
+
+ attach_shortcuts() {
+ for (let row of this.number_pad.keys) {
+ for (let btn of row) {
+ let shortcut_key = `ctrl+${frappe.scrub(String(btn))[0]}`;
+ if (btn === 'Delete') shortcut_key = 'ctrl+backspace';
+ if (btn === 'Remove') shortcut_key = 'shift+ctrl+backspace'
+ if (btn === '.') shortcut_key = 'ctrl+>';
+
+ // to account for fieldname map
+ const fieldname = this.number_pad.fieldnames[btn] ? this.number_pad.fieldnames[btn] :
+ typeof btn === 'string' ? frappe.scrub(btn) : btn;
+
+ frappe.ui.keys.on(`${shortcut_key}`, () => {
+ const cart_is_visible = this.$component.is(":visible");
+ if (cart_is_visible && this.item_is_selected && this.$numpad_section.is(":visible")) {
+ this.$numpad_section.find(`.numpad-btn[data-button-value="${fieldname}"]`).click();
+ }
+ })
+ }
+ }
+
+ frappe.ui.keys.on("ctrl+enter", () => {
+ const cart_is_visible = this.$component.is(":visible");
+ const payment_section_hidden = this.$totals_section.find('.edit-cart-btn').hasClass('d-none');
+ if (cart_is_visible && payment_section_hidden) {
+ this.$component.find(".checkout-btn").click();
+ }
+ });
+ }
+
+ toggle_item_highlight(item) {
+ const $cart_item = $(item);
+ const item_is_highlighted = $cart_item.hasClass("shadow");
+
+ if (!item || item_is_highlighted) {
+ this.item_is_selected = false;
+ this.$cart_container.find('.cart-item-wrapper').removeClass("shadow").css("opacity", "1");
+ } else {
+ $cart_item.addClass("shadow");
+ this.item_is_selected = true;
+ this.$cart_container.find('.cart-item-wrapper').css("opacity", "1");
+ this.$cart_container.find('.cart-item-wrapper').not(item).removeClass("shadow").css("opacity", "0.65");
+ }
+ // highlight with inner shadow
+ // $cart_item.addClass("shadow-inner bg-selected");
+ // me.$cart_container.find('.cart-item-wrapper').not(this).removeClass("shadow-inner bg-selected");
+ }
+
+ make_customer_selector() {
+ this.$customer_section.html(``);
+ const me = this;
+ const query = { query: 'erpnext.controllers.queries.customer_query' };
+ const allowed_customer_group = this.events.get_allowed_customer_group() || [];
+ if (allowed_customer_group.length) {
+ query.filters = {
+ customer_group: ['in', allowed_customer_group]
+ }
+ }
+ this.customer_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Customer'),
+ fieldtype: 'Link',
+ options: 'Customer',
+ placeholder: __('Search by customer name, phone, email.'),
+ get_query: () => query,
+ onchange: function() {
+ if (this.value) {
+ const frm = me.events.get_frm();
+ frappe.dom.freeze();
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'customer', this.value);
+ frm.script_manager.trigger('customer', frm.doc.doctype, frm.doc.name).then(() => {
+ frappe.run_serially([
+ () => me.fetch_customer_details(this.value),
+ () => me.events.customer_details_updated(me.customer_info),
+ () => me.update_customer_section(),
+ () => me.update_totals_section(),
+ () => frappe.dom.unfreeze()
+ ]);
+ })
+ }
+ },
+ },
+ parent: this.$customer_section.find('.customer-search-field'),
+ render_input: true,
+ });
+ this.customer_field.toggle_label(false);
+ }
+
+ fetch_customer_details(customer) {
+ if (customer) {
+ return new Promise((resolve) => {
+ frappe.db.get_value('Customer', customer, ["email_id", "mobile_no", "image", "loyalty_program"]).then(({ message }) => {
+ const { loyalty_program } = message;
+ // if loyalty program then fetch loyalty points too
+ if (loyalty_program) {
+ frappe.call({
+ method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details_with_points",
+ args: { customer, loyalty_program, "silent": true },
+ callback: (r) => {
+ const { loyalty_points, conversion_factor } = r.message;
+ if (!r.exc) {
+ this.customer_info = { ...message, customer, loyalty_points, conversion_factor };
+ resolve();
+ }
+ }
+ });
+ } else {
+ this.customer_info = { ...message, customer };
+ resolve();
+ }
+ });
+ });
+ } else {
+ return new Promise((resolve) => {
+ this.customer_info = {}
+ resolve();
+ });
+ }
+ }
+
+ show_discount_control() {
+ this.$add_discount_elem.removeClass("pr-4 pl-4");
+ this.$add_discount_elem.html(
+ `
+ `
+ );
+ const me = this;
+
+ this.discount_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Discount'),
+ fieldtype: 'Data',
+ placeholder: __('Enter discount percentage.'),
+ onchange: function() {
+ if (this.value || this.value == 0) {
+ const frm = me.events.get_frm();
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', this.value);
+ me.hide_discount_control(this.value);
+ }
+ },
+ },
+ parent: this.$add_discount_elem.find('.add-dicount-field'),
+ render_input: true,
+ });
+ this.discount_field.toggle_label(false);
+ this.discount_field.set_focus();
+ }
+
+ hide_discount_control(discount) {
+ this.$add_discount_elem.addClass('pr-4 pl-4');
+ this.$add_discount_elem.html(
+ `
+
+ ${String(discount).bold()}% off
+
+ `
+ );
+ }
+
+ update_customer_section() {
+ const { customer, email_id='', mobile_no='', image } = this.customer_info || {};
+
+ if (customer) {
+ this.$customer_section.addClass('border pr-4 pl-4').html(
+ `
+
`
+ );
+ } else {
+ // reset customer selector
+ this.reset_customer_selector();
+ }
+
+ function get_customer_description() {
+ if (!email_id && !mobile_no) {
+ return `
+ ${get_customer_image()}
+
+
+
+ ${customer}
+ ${get_customer_description()}
+
+
+
+ Click to add email / phone
`
+ } else if (email_id && !mobile_no) {
+ return `${email_id}
`
+ } else if (mobile_no && !email_id) {
+ return `${mobile_no}
`
+ } else {
+ return `${email_id} | ${mobile_no}
`
+ }
+ }
+
+ function get_customer_image() {
+ if (image) {
+ return `
+ 
+
`
+ } else {
+ return `
+ ${frappe.get_abbr(customer)}
+
`
+ }
+ }
+ }
+
+ update_totals_section(frm) {
+ if (!frm) frm = this.events.get_frm();
+
+ this.render_net_total(frm.doc.base_net_total);
+ this.render_grand_total(frm.doc.base_grand_total);
+
+ const taxes = frm.doc.taxes.map(t => { return { description: t.description, rate: t.rate }})
+ this.render_taxes(frm.doc.base_total_taxes_and_charges, taxes);
+ }
+
+ render_net_total(value) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.net-total').html(
+ `
+
+ Net Total
+
+
`
+ )
+
+ this.$numpad_section.find('.numpad-net-total').html(`Net Total: ${format_currency(value, currency)}`)
+ }
+
+ render_grand_total(value) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.grand-total').html(
+ `${format_currency(value, currency)}
+
+
+ Grand Total
+
+
`
+ )
+
+ this.$numpad_section.find('.numpad-grand-total').html(`Grand Total: ${format_currency(value, currency)}`)
+ }
+
+ render_taxes(value, taxes) {
+ if (taxes.length) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.taxes').html(
+ `${format_currency(value, currency)}
+
+
`
+ )
+ } else {
+ this.$totals_section.find('.taxes').html('')
+ }
+ }
+
+ get_cart_item({ item_code, batch_no, uom }) {
+ const batch_attr = `[data-batch-no="${escape(batch_no)}"]`;
+ const item_code_attr = `[data-item-code="${escape(item_code)}"]`;
+ const uom_attr = `[data-uom=${escape(uom)}]`;
+
+ const item_selector = batch_no ?
+ `.cart-item-wrapper${batch_attr}${uom_attr}` : `.cart-item-wrapper${item_code_attr}${uom_attr}`;
+
+ return this.$cart_items_wrapper.find(item_selector);
+ }
+
+ update_item_html(item, remove_item) {
+ const $item = this.get_cart_item(item);
+
+ if (remove_item) {
+ $item && $item.remove();
+ } else {
+ const { item_code, batch_no, uom } = item;
+ const search_field = batch_no ? 'batch_no' : 'item_code';
+ const search_value = batch_no || item_code;
+ const item_row = this.events.get_frm().doc.items.find(i => i[search_field] === search_value && i.uom === uom);
+
+ this.render_cart_item(item_row, $item);
+ }
+
+ const no_of_cart_items = this.$cart_items_wrapper.children().length;
+ no_of_cart_items > 0 && this.highlight_checkout_btn(no_of_cart_items > 0);
+
+ this.update_empty_cart_section(no_of_cart_items);
+ }
+
+ render_cart_item(item_data, $item_to_update) {
+ const currency = this.events.get_frm().doc.currency;
+ const me = this;
+
+ if (!$item_to_update.length) {
+ this.$cart_items_wrapper.append(
+ `
+
+ Tax Charges
+
+ ${
+ taxes.map((t, i) => {
+ let margin_left = '';
+ if (i !== 0) margin_left = 'ml-2';
+ return `${t.description}`
+ }).join('')
+ }
+
+
+
+ ${format_currency(value, currency)}
+
+
`
+ )
+ $item_to_update = this.get_cart_item(item_data);
+ }
+
+ $item_to_update.html(
+ `
+
+ ${get_rate_discount_html()}
+
+ ${item_data.item_name}
+
+ ${get_description_html()}
+
+
`
+ } else {
+ return `
+
+ ${item_data.qty || 0}
+
+
+
+ ${format_currency(item_data.amount, currency)}
+ ${format_currency(item_data.rate, currency)}
+
+
`
+ }
+ }
+
+ function get_description_html() {
+ if (item_data.description) {
+ if (item_data.description.indexOf('
+ ${item_data.qty || 0}
+
+
+
+ ${format_currency(item_data.rate, currency)}
+ ') != -1) {
+ try {
+ item_data.description = $(item_data.description).text();
+ } catch (error) {
+ item_data.description = item_data.description.replace(/
/g, ' ').replace(/<\/div>/g, ' ').replace(/ +/g, ' ');
+ }
+ }
+ item_data.description = frappe.ellipsis(item_data.description, 45);
+ return ``
+ );
+ } else {
+ this.$item_image.html(frappe.get_abbr(item_code));
+ }
+
+ }
+
+ render_discount_dom(item) {
+ if (item.discount_percentage) {
+ this.$dicount_section.html(
+ `
+ `
+ );
+
+ this.$component = this.wrapper.find('.items-selector');
+ }
+
+ async load_items_data() {
+ if (!this.item_group) {
+ const res = await frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name");
+ this.parent_item_group = res.message.name;
+ };
+ if (!this.price_list) {
+ const res = await frappe.db.get_value("POS Profile", this.pos_profile, "selling_price_list");
+ this.price_list = res.message.selling_price_list;
+ }
+
+ this.get_items({}).then(({message}) => {
+ this.render_item_list(message.items);
+ });
+ }
+
+ get_items({start = 0, page_length = 40, search_value=''}) {
+ const price_list = this.events.get_frm().doc?.selling_price_list || this.price_list;
+ let { item_group, pos_profile } = this;
+
+ !item_group && (item_group = this.parent_item_group);
+
+ return frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
+ freeze: true,
+ args: { start, page_length, price_list, item_group, search_value, pos_profile },
+ });
+ }
+
+
+ render_item_list(items) {
+ this.$items_container = this.$component.find('.items-container');
+ this.$items_container.html('');
+
+ items.forEach(item => {
+ const item_html = this.get_item_html(item);
+ this.$items_container.append(item_html);
+ })
+ }
+
+ get_item_html(item) {
+ const { item_image, serial_no, batch_no, barcode, actual_qty, stock_uom } = item;
+ const indicator_color = actual_qty > 10 ? "green" : actual_qty !== 0 ? "orange" : "red";
+
+ function get_item_image_html() {
+ if (item_image) {
+ return `
+ `
+ )
+
+ this.$component = this.wrapper.find('.past-order-list');
+ this.$invoices_container = this.$component.find('.invoices-container');
+ }
+
+ bind_events() {
+ this.search_field.$input.on('input', (e) => {
+ clearTimeout(this.last_search);
+ this.last_search = setTimeout(() => {
+ const search_term = e.target.value;
+ this.refresh_list(search_term, this.status_field.get_value());
+ }, 300);
+ });
+ const me = this;
+ this.$invoices_container.on('click', '.invoice-wrapper', function() {
+ const invoice_name = unescape($(this).attr('data-invoice-name'));
+
+ me.events.open_invoice_data(invoice_name);
+ })
+ }
+
+ make_filter_section() {
+ const me = this;
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Search'),
+ fieldtype: 'Data',
+ placeholder: __('Search by invoice id or customer name')
+ },
+ parent: this.$component.find('.search-field'),
+ render_input: true,
+ });
+ this.status_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Invoice Status'),
+ fieldtype: 'Select',
+ options: `Draft\nPaid\nConsolidated\nReturn`,
+ placeholder: __('Filter by invoice status'),
+ onchange: function() {
+ me.refresh_list(me.search_field.get_value(), this.value);
+ }
+ },
+ parent: this.$component.find('.status-field'),
+ render_input: true,
+ });
+ this.search_field.toggle_label(false);
+ this.status_field.toggle_label(false);
+ this.status_field.set_value('Paid');
+ }
+
+ toggle_component(show) {
+ show ?
+ this.$component.removeClass('d-none') && this.refresh_list() :
+ this.$component.addClass('d-none');
+ }
+
+ refresh_list() {
+ frappe.dom.freeze();
+ this.events.reset_summary();
+ const search_term = this.search_field.get_value();
+ const status = this.status_field.get_value();
+
+ this.$invoices_container.html('');
+
+ return frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_past_order_list",
+ freeze: true,
+ args: { search_term, status },
+ callback: (response) => {
+ frappe.dom.unfreeze();
+ response.message.forEach(invoice => {
+ const invoice_html = this.get_invoice_html(invoice);
+ this.$invoices_container.append(invoice_html);
+ });
+ }
+ });
+ }
+
+ get_invoice_html(invoice) {
+ const posting_datetime = moment(invoice.posting_date+" "+invoice.posting_time).format("Do MMMM, h:mma");
+ return (
+ `
+ `
+ )
+
+ this.$component = this.wrapper.find('.past-order-summary');
+ this.$summary_wrapper = this.$component.find('.summary-wrapper');
+ this.$summary_container = this.$component.find('.summary-container');
+ }
+
+ init_child_components() {
+ this.init_upper_section();
+ this.init_items_summary();
+ this.init_totals_summary();
+ this.init_payments_summary();
+ this.init_summary_buttons();
+ this.init_email_print_dialog();
+ }
+
+ init_upper_section() {
+ this.$summary_container.append(
+ ``
+ );
+
+ this.$upper_section = this.$summary_container.find('.upper-section');
+ }
+
+ init_items_summary() {
+ this.$summary_container.append(
+ `
+ `
+ )
+ this.$component = this.wrapper.find('.payment-section');
+ this.$payment_modes = this.$component.find('.payment-modes');
+ this.$totals_remarks = this.$component.find('.totals-remarks');
+ this.$totals = this.$component.find('.totals');
+ this.$remarks = this.$component.find('.remarks');
+ this.$numpad = this.$component.find('.number-pad');
+ this.$invoice_details_section = this.$component.find('.invoice-details-section');
+ }
+
+ make_invoice_fields_control() {
+ frappe.db.get_doc("POS Settings", undefined).then((doc) => {
+ const fields = doc.invoice_fields;
+ if (!fields.length) return;
+
+ this.$invoice_details_section.html(
+ `
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n
" + .format(frappe.bold(old_name), frappe.bold(new_name), document)) + + msg += ', '.join([get_link_to_form("Stock Reconciliation", d.parent) for d in records]) + "
" + + msg += _("Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" + .format(frappe.bold(old_name))) + + frappe.throw(_(msg), title=_("Merge not allowed")) + def set_last_purchase_rate(self, new_name): last_purchase_rate = get_last_purchase_details(new_name).get("base_net_rate", 0) frappe.db.set_value("Item", new_name, "last_purchase_rate", last_purchase_rate) diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.py b/erpnext/stock/doctype/item_alternative/item_alternative.py index 522dfc67a9..190cb62e99 100644 --- a/erpnext/stock/doctype/item_alternative/item_alternative.py +++ b/erpnext/stock/doctype/item_alternative/item_alternative.py @@ -43,6 +43,7 @@ class ItemAlternative(Document): frappe.throw(_("Already record exists for the item {0}").format(self.item_code)) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_alternative_items(doctype, txt, searchfield, start, page_len, filters): return frappe.db.sql(""" (select alternative_item_code from `tabItem Alternative` where item_code = %(item_code)s and alternative_item_code like %(txt)s) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 60f5ff3629..3c4e35349e 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -49,17 +49,21 @@ frappe.ui.form.on('Material Request', { // set schedule_date set_schedule_date(frm); - let filters = {'company': frm.doc.company} - - frm.set_query("warehouse", "items", function() { + frm.set_query("warehouse", "items", function(doc) { return { - filters: filters + filters: {'company': doc.company} }; }); - frm.set_query("set_warehouse", function(){ + frm.set_query("set_warehouse", function(doc){ return { - filters: filters + filters: {'company': doc.company} + }; + }); + + frm.set_query("set_from_warehouse", function(doc){ + return { + filters: {'company': doc.company} }; }); }, diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 25f1ed9505..335175f21d 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -370,6 +370,7 @@ def get_items_based_on_default_supplier(supplier): return supplier_items @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, page_len, filters): conditions = "" if txt: @@ -403,6 +404,7 @@ def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, pa return material_requests @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_default_supplier_query(doctype, txt, searchfield, start, page_len, filters): doc = frappe.get_doc("Material Request", filters.get("doc")) item_list = [] diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py index 4f831d7a85..a7a29cca7f 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.py +++ b/erpnext/stock/doctype/packing_slip/packing_slip.py @@ -176,6 +176,7 @@ class PackingSlip(Document): self.update_item_details() @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def item_details(doctype, txt, searchfield, start, page_len, filters): from erpnext.controllers.queries import get_match_cond return frappe.db.sql("""select name, item_name, description from `tabItem` diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js index 3a5ef76980..ee218f2f68 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.js +++ b/erpnext/stock/doctype/pick_list/pick_list.js @@ -3,6 +3,9 @@ frappe.ui.form.on('Pick List', { setup: (frm) => { + frm.set_indicator_formatter('item_code', + function(doc) { return (doc.stock_qty === 0) ? "red" : "green"; }); + frm.custom_make_buttons = { 'Delivery Note': 'Delivery Note', 'Stock Entry': 'Stock Entry', diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py index 4b8b594ed9..0da57b734b 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.py +++ b/erpnext/stock/doctype/pick_list/pick_list.py @@ -26,11 +26,12 @@ class PickList(Document): continue if not item.serial_no: frappe.throw(_("Row #{0}: {1} does not have any available serial numbers in {2}".format( - frappe.bold(item.idx), frappe.bold(item.item_code), frappe.bold(item.warehouse)))) + frappe.bold(item.idx), frappe.bold(item.item_code), frappe.bold(item.warehouse))), + title=_("Serial Nos Required")) if len(item.serial_no.split('\n')) == item.picked_qty: continue frappe.throw(_('For item {0} at row {1}, count of serial numbers does not match with the picked quantity') - .format(frappe.bold(item.item_code), frappe.bold(item.idx))) + .format(frappe.bold(item.item_code), frappe.bold(item.idx)), title=_("Quantity Mismatch")) def set_item_locations(self, save=False): items = self.aggregate_item_qty() @@ -40,6 +41,9 @@ class PickList(Document): if self.parent_warehouse: from_warehouses = frappe.db.get_descendants('Warehouse', self.parent_warehouse) + # Create replica before resetting, to handle empty table on update after submit. + locations_replica = self.get('locations') + # reset self.delete_key('locations') for item_doc in items: @@ -48,7 +52,7 @@ class PickList(Document): self.item_location_map.setdefault(item_code, get_available_item_locations(item_code, from_warehouses, self.item_count_map.get(item_code), self.company)) - locations = get_items_with_location_and_quantity(item_doc, self.item_location_map) + locations = get_items_with_location_and_quantity(item_doc, self.item_location_map, self.docstatus) item_doc.idx = None item_doc.name = None @@ -62,6 +66,16 @@ class PickList(Document): location.update(row) self.append('locations', location) + # If table is empty on update after submit, set stock_qty, picked_qty to 0 so that indicator is red + # and give feedback to the user. This is to avoid empty Pick Lists. + if not self.get('locations') and self.docstatus == 1: + for location in locations_replica: + location.stock_qty = 0 + location.picked_qty = 0 + self.append('locations', location) + frappe.msgprint(_("Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."), + title=_("Out of Stock"), indicator="red") + if save: self.save() @@ -97,11 +111,13 @@ def validate_item_locations(pick_list): if not pick_list.locations: frappe.throw(_("Add items in the Item Locations table")) -def get_items_with_location_and_quantity(item_doc, item_location_map): +def get_items_with_location_and_quantity(item_doc, item_location_map, docstatus): available_locations = item_location_map.get(item_doc.item_code) locations = [] - remaining_stock_qty = item_doc.stock_qty + # if stock qty is zero on submitted entry, show positive remaining qty to recalculate in case of restock. + remaining_stock_qty = item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty + while remaining_stock_qty > 0 and available_locations: item_location = available_locations.pop(0) item_location = frappe._dict(item_location) @@ -119,13 +135,11 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): if item_location.serial_no: serial_nos = '\n'.join(item_location.serial_no[0: cint(stock_qty)]) - auto_set_serial_no = frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo") - locations.append(frappe._dict({ 'qty': qty, 'stock_qty': stock_qty, 'warehouse': item_location.warehouse, - 'serial_no': serial_nos if auto_set_serial_no else item_doc.serial_no, + 'serial_no': serial_nos, 'batch_no': item_location.batch_no })) @@ -137,7 +151,7 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): item_location.qty = qty_diff if item_location.serial_no: # set remaining serial numbers - item_location.serial_no = item_location.serial_no[-qty_diff:] + item_location.serial_no = item_location.serial_no[-int(qty_diff):] available_locations = [item_location] + available_locations # update available locations for the item @@ -146,9 +160,14 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): def get_available_item_locations(item_code, from_warehouses, required_qty, company, ignore_validation=False): locations = [] - if frappe.get_cached_value('Item', item_code, 'has_serial_no'): + has_serial_no = frappe.get_cached_value('Item', item_code, 'has_serial_no') + has_batch_no = frappe.get_cached_value('Item', item_code, 'has_batch_no') + + if has_batch_no and has_serial_no: + locations = get_available_item_locations_for_serial_and_batched_item(item_code, from_warehouses, required_qty, company) + elif has_serial_no: locations = get_available_item_locations_for_serialized_item(item_code, from_warehouses, required_qty, company) - elif frappe.get_cached_value('Item', item_code, 'has_batch_no'): + elif has_batch_no: locations = get_available_item_locations_for_batched_item(item_code, from_warehouses, required_qty, company) else: locations = get_available_item_locations_for_other_item(item_code, from_warehouses, required_qty, company) @@ -158,8 +177,9 @@ def get_available_item_locations(item_code, from_warehouses, required_qty, compa remaining_qty = required_qty - total_qty_available if remaining_qty > 0 and not ignore_validation: - frappe.msgprint(_('{0} units of {1} is not available.') - .format(remaining_qty, frappe.get_desk_link('Item', item_code))) + frappe.msgprint(_('{0} units of Item {1} is not available.') + .format(remaining_qty, frappe.get_desk_link('Item', item_code)), + title=_("Insufficient Stock")) return locations @@ -226,6 +246,34 @@ def get_available_item_locations_for_batched_item(item_code, from_warehouses, re return batch_locations +def get_available_item_locations_for_serial_and_batched_item(item_code, from_warehouses, required_qty, company): + # Get batch nos by FIFO + locations = get_available_item_locations_for_batched_item(item_code, from_warehouses, required_qty, company) + + filters = frappe._dict({ + 'item_code': item_code, + 'company': company, + 'warehouse': ['!=', ''], + 'batch_no': '' + }) + + # Get Serial Nos by FIFO for Batch No + for location in locations: + filters.batch_no = location.batch_no + filters.warehouse = location.warehouse + location.qty = required_qty if location.qty > required_qty else location.qty # if extra qty in batch + + serial_nos = frappe.get_list('Serial No', + fields=['name'], + filters=filters, + limit=location.qty, + order_by='purchase_date') + + serial_nos = [sn.name for sn in serial_nos] + location.serial_no = serial_nos + + return locations + def get_available_item_locations_for_other_item(item_code, from_warehouses, required_qty, company): # gets all items available in different warehouses warehouses = [x.get('name') for x in frappe.get_list("Warehouse", {'company': company}, "name")] diff --git a/erpnext/stock/doctype/pick_list/test_pick_list.py b/erpnext/stock/doctype/pick_list/test_pick_list.py index 1b9ff41cc3..8ea7f89dc4 100644 --- a/erpnext/stock/doctype/pick_list/test_pick_list.py +++ b/erpnext/stock/doctype/pick_list/test_pick_list.py @@ -7,6 +7,8 @@ import frappe import unittest test_dependencies = ['Item', 'Sales Invoice', 'Stock Entry', 'Batch'] +from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt +from erpnext.stock.doctype.item.test_item import create_item from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation \ import EmptyStockReconciliationItemsError @@ -49,7 +51,7 @@ class TestPickList(unittest.TestCase): self.assertEqual(pick_list.locations[0].warehouse, '_Test Warehouse - _TC') self.assertEqual(pick_list.locations[0].qty, 5) - def test_pick_list_splits_row_according_to_warhouse_availability(self): + def test_pick_list_splits_row_according_to_warehouse_availability(self): try: frappe.get_doc({ 'doctype': 'Stock Reconciliation', @@ -122,7 +124,10 @@ class TestPickList(unittest.TestCase): }] }) - stock_reconciliation.submit() + try: + stock_reconciliation.submit() + except EmptyStockReconciliationItemsError: + pass pick_list = frappe.get_doc({ 'doctype': 'Pick List', @@ -145,6 +150,85 @@ class TestPickList(unittest.TestCase): self.assertEqual(pick_list.locations[0].qty, 5) self.assertEqual(pick_list.locations[0].serial_no, '123450\n123451\n123452\n123453\n123454') + def test_pick_list_shows_batch_no_for_batched_item(self): + # check if oldest batch no is picked + item = frappe.db.exists("Item", {'item_name': 'Batched Item'}) + if not item: + item = create_item("Batched Item") + item.has_batch_no = 1 + item.create_new_batch = 1 + item.batch_number_series = "B-BATCH-.##" + item.save() + else: + item = frappe.get_doc("Item", {'item_name': 'Batched Item'}) + + pr1 = make_purchase_receipt(item_code="Batched Item", qty=1, rate=100.0) + + pr1.load_from_db() + oldest_batch_no = pr1.items[0].batch_no + + pr2 = make_purchase_receipt(item_code="Batched Item", qty=2, rate=100.0) + + pick_list = frappe.get_doc({ + 'doctype': 'Pick List', + 'company': '_Test Company', + 'purpose': 'Material Transfer', + 'locations': [{ + 'item_code': 'Batched Item', + 'qty': 1, + 'stock_qty': 1, + 'conversion_factor': 1, + }] + }) + pick_list.set_item_locations() + + self.assertEqual(pick_list.locations[0].batch_no, oldest_batch_no) + + pr1.cancel() + pr2.cancel() + + + def test_pick_list_for_batched_and_serialised_item(self): + # check if oldest batch no and serial nos are picked + item = frappe.db.exists("Item", {'item_name': 'Batched and Serialised Item'}) + if not item: + item = create_item("Batched and Serialised Item") + item.has_batch_no = 1 + item.create_new_batch = 1 + item.has_serial_no = 1 + item.batch_number_series = "B-BATCH-.##" + item.serial_no_series = "S-.####" + item.save() + else: + item = frappe.get_doc("Item", {'item_name': 'Batched and Serialised Item'}) + + pr1 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0) + + pr1.load_from_db() + oldest_batch_no = pr1.items[0].batch_no + oldest_serial_nos = pr1.items[0].serial_no + + pr2 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0) + + pick_list = frappe.get_doc({ + 'doctype': 'Pick List', + 'company': '_Test Company', + 'purpose': 'Material Transfer', + 'locations': [{ + 'item_code': 'Batched and Serialised Item', + 'qty': 2, + 'stock_qty': 2, + 'conversion_factor': 1, + }] + }) + pick_list.set_item_locations() + + self.assertEqual(pick_list.locations[0].batch_no, oldest_batch_no) + self.assertEqual(pick_list.locations[0].serial_no, oldest_serial_nos) + + pr1.cancel() + pr2.cancel() + def test_pick_list_for_items_from_multiple_sales_orders(self): try: frappe.get_doc({ diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json index 71fbf9a866..8665986004 100644 --- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json +++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -180,7 +180,7 @@ ], "istable": 1, "links": [], - "modified": "2020-03-13 19:08:21.995986", + "modified": "2020-06-24 17:18:57.357120", "modified_by": "Administrator", "module": "Stock", "name": "Pick List Item", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index df9eb50843..92e33ca64e 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -1,5 +1,7 @@ { + "actions": [], "allow_import": 1, + "allow_workflow": 1, "autoname": "naming_series:", "creation": "2013-05-21 16:16:39", "doctype": "DocType", @@ -768,6 +770,7 @@ "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", + "length": 240, "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -820,6 +823,7 @@ "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", + "length": 240, "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -1106,7 +1110,7 @@ "idx": 261, "is_submittable": 1, "links": [], - "modified": "2020-07-15 10:01:39.302238", + "modified": "2020-07-18 05:19:12.148115", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index 568e742876..c3bb514184 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -59,6 +59,7 @@ class QualityInspection(Document): (quality_inspection, self.modified, self.reference_name, self.item_code)) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def item_query(doctype, txt, searchfield, start, page_len, filters): if filters.get("from"): from frappe.desk.reportview import get_match_cond @@ -88,6 +89,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): {'parent': filters.get('parent'), 'txt': "%%%s%%" % txt}) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def quality_inspection_query(doctype, txt, searchfield, start, page_len, filters): return frappe.get_all('Quality Inspection', limit_start=start, diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 2be14c8006..3acf3a9316 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -1,6 +1,7 @@ { "actions": [], "allow_import": 1, + "allow_rename": 1, "autoname": "field:serial_no", "creation": "2013-05-16 10:59:15", "description": "Distinct unit of an Item", @@ -426,7 +427,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], - "modified": "2020-06-25 15:53:50.900855", + "modified": "2020-07-20 20:50:16.660433", "modified_by": "Administrator", "module": "Stock", "name": "Serial No", diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 90f0f5881d..f7ff916c5a 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe +import json from frappe.model.naming import make_autoname from frappe.utils import cint, cstr, flt, add_days, nowdate, getdate @@ -190,6 +191,23 @@ class SerialNo(StockController): if sle_exists: frappe.throw(_("Cannot delete Serial No {0}, as it is used in stock transactions").format(self.name)) + def before_rename(self, old, new, merge=False): + if merge: + frappe.throw(_("Sorry, Serial Nos cannot be merged")) + + def after_rename(self, old, new, merge=False): + """rename serial_no text fields""" + for dt in frappe.db.sql("""select parent from tabDocField + where fieldname='serial_no' and fieldtype in ('Text', 'Small Text', 'Long Text')"""): + + for item in frappe.db.sql("""select name, serial_no from `tab%s` + where serial_no like %s""" % (dt[0], frappe.db.escape('%' + old + '%'))): + + serial_nos = map(lambda i: new if i.upper()==old.upper() else i, item[1].split('\n')) + frappe.db.sql("""update `tab%s` set serial_no = %s + where name=%s""" % (dt[0], '%s', '%s'), + ('\n'.join(list(serial_nos)), item[0])) + def update_serial_no_reference(self, serial_no=None): last_sle = self.get_last_sle(serial_no) self.set_purchase_details(last_sle.get("purchase_sle")) @@ -520,15 +538,54 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note): return serial_nos @frappe.whitelist() -def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None): - import json +def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None, for_doctype=None): filters = { "item_code": item_code, "warehouse": warehouse, "delivery_document_no": "", "sales_invoice": "" } - if batch_nos: filters["batch_no"] = ["in", json.loads(batch_nos)] + + if batch_nos: + try: + filters["batch_no"] = ["in", json.loads(batch_nos)] + except: + filters["batch_no"] = ["in", [batch_nos]] + + if for_doctype == 'POS Invoice': + reserved_serial_nos, unreserved_serial_nos = get_pos_reserved_serial_nos(filters, qty) + return unreserved_serial_nos serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") return [item['name'] for item in serial_numbers] + +@frappe.whitelist() +def get_pos_reserved_serial_nos(filters, qty=None): + batch_no_cond = "" + if filters.get("batch_no"): + batch_no_cond = "and item.batch_no = {}".format(frappe.db.escape(filters.get('batch_no'))) + + reserved_serial_nos_str = [d.serial_no for d in frappe.db.sql("""select item.serial_no as serial_no + from `tabPOS Invoice` p, `tabPOS Invoice Item` item + where p.name = item.parent + and p.consolidated_invoice is NULL + and p.docstatus = 1 + and item.docstatus = 1 + and item.item_code = %s + and item.warehouse = %s + {} + """.format(batch_no_cond), [filters.get('item_code'), filters.get('warehouse')], as_dict=1)] + + reserved_serial_nos = [] + for s in reserved_serial_nos_str: + if not s: continue + + serial_nos = s.split("\n") + serial_nos = ' '.join(serial_nos).split() # remove whitespaces + if len(serial_nos): reserved_serial_nos += serial_nos + + filters["name"] = ["not in", reserved_serial_nos] + serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") + unreserved_serial_nos = [item['name'] for item in serial_numbers] + + return reserved_serial_nos, unreserved_serial_nos \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 0fbc63101e..8e25804511 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -413,7 +413,7 @@ class TestStockEntry(unittest.TestCase): def test_serial_item_error(self): se, serial_nos = self.test_serial_by_series() if not frappe.db.exists('Serial No', 'ABCD'): - make_serialized_item("_Test Serialized Item", "ABCD\nEFGH") + make_serialized_item(item_code="_Test Serialized Item", serial_no="ABCD\nEFGH") se = frappe.copy_doc(test_records[0]) se.purpose = "Material Transfer" @@ -823,15 +823,29 @@ class TestStockEntry(unittest.TestCase): ]) ) -def make_serialized_item(item_code=None, serial_no=None, target_warehouse=None): +def make_serialized_item(**args): + args = frappe._dict(args) se = frappe.copy_doc(test_records[0]) - se.get("items")[0].item_code = item_code or "_Test Serialized Item With Series" - se.get("items")[0].serial_no = serial_no + + if args.company: + se.company = args.company + + se.get("items")[0].item_code = args.item_code or "_Test Serialized Item With Series" + + if args.serial_no: + se.get("items")[0].serial_no = args.serial_no + + if args.cost_center: + se.get("items")[0].cost_center = args.cost_center + + if args.expense_account: + se.get("items")[0].expense_account = args.expense_account + se.get("items")[0].qty = 2 se.get("items")[0].transfer_qty = 2 - if target_warehouse: - se.get("items")[0].t_warehouse = target_warehouse + if args.target_warehouse: + se.get("items")[0].t_warehouse = args.target_warehouse se.set_stock_entry_type() se.insert() diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json index 5d534af157..1cc600b9ca 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.json +++ b/erpnext/stock/doctype/warehouse/warehouse.json @@ -10,12 +10,14 @@ "field_order": [ "warehouse_detail", "warehouse_name", + "column_break_3", + "warehouse_type", + "parent_warehouse", "is_group", - "company", - "disabled", "column_break_4", "account", - "warehouse_type", + "company", + "disabled", "address_and_contact", "address_html", "column_break_10", @@ -31,7 +33,6 @@ "state", "pin", "tree_details", - "parent_warehouse", "lft", "rgt", "old_parent" @@ -44,7 +45,6 @@ "oldfieldtype": "Section Break" }, { - "description": "If blank, parent Warehouse Account or company default will be considered", "fieldname": "warehouse_name", "fieldtype": "Data", "label": "Warehouse Name", @@ -85,12 +85,14 @@ "fieldtype": "Column Break" }, { + "description": "If blank, parent Warehouse Account or company default will be considered in transactions", "fieldname": "account", "fieldtype": "Link", "label": "Account", "options": "Account" }, { + "depends_on": "eval:!doc.__islocal", "fieldname": "address_and_contact", "fieldtype": "Section Break", "label": "Address and Contact" @@ -224,13 +226,17 @@ "fieldtype": "Link", "label": "Warehouse Type", "options": "Warehouse Type" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Section Break" } ], "icon": "fa fa-building", "idx": 1, "is_tree": 1, "links": [], - "modified": "2020-03-18 18:11:53.282358", + "modified": "2020-08-03 18:41:52.442502", "modified_by": "Administrator", "module": "Stock", "name": "Warehouse", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index b8554c83e2..1a7c15ebca 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -401,13 +401,30 @@ def get_item_warehouse(item, args, overwrite_warehouse, defaults={}): return warehouse def update_barcode_value(out): - from erpnext.accounts.doctype.sales_invoice.pos import get_barcode_data barcode_data = get_barcode_data([out]) # If item has one barcode then update the value of the barcode field if barcode_data and len(barcode_data.get(out.item_code)) == 1: out['barcode'] = barcode_data.get(out.item_code)[0] +def get_barcode_data(items_list): + # get itemwise batch no data + # exmaple: {'LED-GRE': [Batch001, Batch002]} + # where LED-GRE is item code, SN0001 is serial no and Pune is warehouse + + itemwise_barcode = {} + for item in items_list: + barcodes = frappe.db.sql(""" + select barcode from `tabItem Barcode` where parent = %s + """, item.item_code, as_dict=1) + + for barcode in barcodes: + if item.item_code not in itemwise_barcode: + itemwise_barcode.setdefault(item.item_code, []) + itemwise_barcode[item.item_code].append(barcode.get("barcode")) + + return itemwise_barcode + @frappe.whitelist() def get_item_tax_info(company, tax_category, item_codes): out = {} diff --git a/erpnext/stock/number_card/total_active_items/total_active_items.json b/erpnext/stock/number_card/total_active_items/total_active_items.json new file mode 100644 index 0000000000..f6863b96d7 --- /dev/null +++ b/erpnext/stock/number_card/total_active_items/total_active_items.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-20 21:01:04.422436", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Item", + "filters_json": "[[\"Item\",\"disabled\",\"=\",0]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Active Items", + "modified": "2020-07-22 13:08:30.430677", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Active Items", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/number_card/total_stock_value/total_stock_value.json b/erpnext/stock/number_card/total_stock_value/total_stock_value.json new file mode 100644 index 0000000000..8e480a6b3e --- /dev/null +++ b/erpnext/stock/number_card/total_stock_value/total_stock_value.json @@ -0,0 +1,21 @@ +{ + "aggregate_function_based_on": "stock_value", + "creation": "2020-07-20 21:01:04.495481", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Bin", + "filters_json": "[]", + "function": "Sum", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Stock Value", + "modified": "2020-07-22 13:08:48.412001", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Stock Value", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/number_card/total_warehouses/total_warehouses.json b/erpnext/stock/number_card/total_warehouses/total_warehouses.json new file mode 100644 index 0000000000..ab0836a3af --- /dev/null +++ b/erpnext/stock/number_card/total_warehouses/total_warehouses.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-20 21:01:04.457598", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Warehouse", + "filters_json": "[[\"Warehouse\",\"disabled\",\"=\",0]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Warehouses", + "modified": "2020-07-22 13:08:40.258927", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Warehouses", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.js b/erpnext/stock/report/stock_ageing/stock_ageing.js index ccde61a167..8495142ba5 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.js +++ b/erpnext/stock/report/stock_ageing/stock_ageing.js @@ -36,6 +36,27 @@ frappe.query_reports["Stock Ageing"] = { "fieldtype": "Link", "options": "Brand" }, + { + "fieldname":"range1", + "label": __("Ageing Range 1"), + "fieldtype": "Int", + "default": "30", + "reqd": 1 + }, + { + "fieldname":"range2", + "label": __("Ageing Range 2"), + "fieldtype": "Int", + "default": "60", + "reqd": 1 + }, + { + "fieldname":"range3", + "label": __("Ageing Range 3"), + "fieldtype": "Int", + "default": "90", + "reqd": 1 + }, { "fieldname":"show_warehouse_wise_stock", "label": __("Show Warehouse-wise Stock"), diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index d5878cb662..4af3c541a6 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -4,12 +4,11 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import date_diff, flt +from frappe.utils import date_diff, flt, cint from six import iteritems from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos def execute(filters=None): - columns = get_columns(filters) item_details = get_fifo_queue(filters) to_date = filters["to_date"] @@ -25,6 +24,7 @@ def execute(filters=None): average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) + range1, range2, range3, above_range3 = get_range_age(filters, fifo_queue, to_date) row = [details.name, details.item_name, details.description, details.item_group, details.brand] @@ -33,6 +33,7 @@ def execute(filters=None): row.append(details.warehouse) row.extend([item_dict.get("total_qty"), average_age, + range1, range2, range3, above_range3, earliest_age, latest_age, details.stock_uom]) data.append(row) @@ -55,7 +56,25 @@ def get_average_age(fifo_queue, to_date): return flt(age_qty / total_qty, 2) if total_qty else 0.0 +def get_range_age(filters, fifo_queue, to_date): + range1 = range2 = range3 = above_range3 = 0.0 + for item in fifo_queue: + age = date_diff(to_date, item[1]) + + if age <= filters.range1: + range1 += flt(item[0]) + elif age <= filters.range2: + range2 += flt(item[0]) + elif age <= filters.range3: + range3 += flt(item[0]) + else: + above_range3 += flt(item[0]) + + return range1, range2, range3, above_range3 + def get_columns(filters): + range_columns = [] + setup_ageing_columns(filters, range_columns) columns = [ { "label": _("Item Code"), @@ -112,7 +131,9 @@ def get_columns(filters): "fieldname": "average_age", "fieldtype": "Float", "width": 100 - }, + }]) + columns.extend(range_columns) + columns.extend([ { "label": _("Earliest"), "fieldname": "earliest", @@ -263,3 +284,18 @@ def get_chart_data(data, filters): }, "type" : "bar" } + +def setup_ageing_columns(filters, range_columns): + for i, label in enumerate(["0-{range1}".format(range1=filters["range1"]), + "{range1}-{range2}".format(range1=cint(filters["range1"])+ 1, range2=filters["range2"]), + "{range2}-{range3}".format(range2=cint(filters["range2"])+ 1, range3=filters["range3"]), + "{range3}-{above}".format(range3=cint(filters["range3"])+ 1, above=_("Above"))]): + add_column(range_columns, label="Age ("+ label +")", fieldname='range' + str(i+1)) + +def add_column(range_columns, label, fieldname, fieldtype='Float', width=140): + range_columns.append(dict( + label=label, + fieldname=fieldname, + fieldtype=fieldtype, + width=width + )) \ No newline at end of file diff --git a/erpnext/stock/stock_dashboard/stock/stock.json b/erpnext/stock/stock_dashboard/stock/stock.json new file mode 100644 index 0000000000..dee7fed6c2 --- /dev/null +++ b/erpnext/stock/stock_dashboard/stock/stock.json @@ -0,0 +1,47 @@ +{ + "cards": [ + { + "card": "Total Active Items" + }, + { + "card": "Total Warehouses" + }, + { + "card": "Total Stock Value" + } + ], + "charts": [ + { + "chart": "Warehouse wise Stock Value", + "width": "Full" + }, + { + "chart": "Purchase Receipt Trends", + "width": "Half" + }, + { + "chart": "Delivery Trends", + "width": "Half" + }, + { + "chart": "Oldest Items", + "width": "Half" + }, + { + "chart": "Item Shortage Summary", + "width": "Half" + } + ], + "creation": "2020-07-20 21:01:04.549136", + "dashboard_name": "Stock", + "docstatus": 0, + "doctype": "Dashboard", + "idx": 0, + "is_default": 1, + "is_standard": 1, + "modified": "2020-07-22 13:09:33.096694", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock", + "owner": "Administrator" +} \ No newline at end of file diff --git a/erpnext/templates/generators/item/item_configure.html b/erpnext/templates/generators/item/item_configure.html index 04f89eca9d..b8b0d98bdc 100644 --- a/erpnext/templates/generators/item/item_configure.html +++ b/erpnext/templates/generators/item/item_configure.html @@ -2,7 +2,7 @@ {% set cart_settings = shopping_cart.cart_settings %}
${item_data.description}
`
+ }
+ return ``;
+ }
+ }
+
+ scroll_to_item($item) {
+ if ($item.length === 0) return;
+ const scrollTop = $item.offset().top - this.$cart_items_wrapper.offset().top + this.$cart_items_wrapper.scrollTop();
+ this.$cart_items_wrapper.animate({ scrollTop });
+ }
+
+ update_selector_value_in_cart_item(selector, value, item) {
+ const $item_to_update = this.get_cart_item(item);
+ $item_to_update.attr(`data-${selector}`, value);
+ }
+
+ toggle_checkout_btn(show_checkout) {
+ if (show_checkout) {
+ this.$totals_section.find('.checkout-btn').removeClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ } else {
+ this.$totals_section.find('.checkout-btn').addClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').removeClass('d-none');
+ }
+ }
+
+ highlight_checkout_btn(toggle) {
+ const has_primary_class = this.$totals_section.find('.checkout-btn').hasClass('bg-primary');
+ if (toggle && !has_primary_class) {
+ this.$totals_section.find('.checkout-btn').addClass('bg-primary text-white text-lg');
+ } else if (!toggle && has_primary_class) {
+ this.$totals_section.find('.checkout-btn').removeClass('bg-primary text-white text-lg');
+ }
+ }
+
+ update_empty_cart_section(no_of_cart_items) {
+ const $no_item_element = this.$cart_items_wrapper.find('.no-item-wrapper');
+
+ // if cart has items and no item is present
+ no_of_cart_items > 0 && $no_item_element && $no_item_element.remove()
+ && this.$cart_items_wrapper.removeClass('mt-4 border-grey border-dashed') && this.$cart_header.removeClass('d-none');
+
+ no_of_cart_items === 0 && !$no_item_element.length && this.make_no_items_placeholder();
+ }
+
+ on_numpad_event($btn) {
+ const current_action = $btn.attr('data-button-value');
+ const action_is_field_edit = ['qty', 'discount_percentage', 'rate'].includes(current_action);
+
+ this.highlight_numpad_btn($btn, current_action);
+
+ const action_is_pressed_twice = this.prev_action === current_action;
+ const first_click_event = !this.prev_action;
+ const field_to_edit_changed = this.prev_action && this.prev_action != current_action;
+
+ if (action_is_field_edit) {
+
+ if (first_click_event || field_to_edit_changed) {
+ this.prev_action = current_action;
+ } else if (action_is_pressed_twice) {
+ this.prev_action = undefined;
+ }
+ this.numpad_value = '';
+
+ } else if (current_action === 'checkout') {
+ this.prev_action = undefined;
+ this.toggle_item_highlight();
+ this.events.numpad_event(undefined, current_action);
+ return;
+ } else if (current_action === 'remove') {
+ this.prev_action = undefined;
+ this.toggle_item_highlight();
+ this.events.numpad_event(undefined, current_action);
+ return;
+ } else {
+ this.numpad_value = current_action === 'delete' ? this.numpad_value.slice(0, -1) : this.numpad_value + current_action;
+ this.numpad_value = this.numpad_value || 0;
+ }
+
+ const first_click_event_is_not_field_edit = !action_is_field_edit && first_click_event;
+
+ if (first_click_event_is_not_field_edit) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select a field to edit from numpad')
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ if (flt(this.numpad_value) > 100 && this.prev_action === 'discount_percentage') {
+ frappe.show_alert({
+ message: __('Discount cannot be greater than 100%'),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.numpad_value = current_action;
+ }
+
+ this.events.numpad_event(this.numpad_value, this.prev_action);
+ }
+
+ highlight_numpad_btn($btn, curr_action) {
+ const curr_action_is_highlighted = $btn.hasClass('shadow-inner');
+ const curr_action_is_action = ['qty', 'discount_percentage', 'rate', 'done'].includes(curr_action);
+
+ if (!curr_action_is_highlighted) {
+ $btn.addClass('shadow-inner bg-selected');
+ }
+ if (this.prev_action === curr_action && curr_action_is_highlighted) {
+ // if Qty is pressed twice
+ $btn.removeClass('shadow-inner bg-selected');
+ }
+ if (this.prev_action && this.prev_action !== curr_action && curr_action_is_action) {
+ // Order: Qty -> Rate then remove Qty highlight
+ const prev_btn = $(`[data-button-value='${this.prev_action}']`);
+ prev_btn.removeClass('shadow-inner bg-selected');
+ }
+ if (!curr_action_is_action || curr_action === 'done') {
+ // if numbers are clicked
+ setTimeout(() => {
+ $btn.removeClass('shadow-inner bg-selected');
+ }, 100);
+ }
+ }
+
+ toggle_numpad(show) {
+ if (show) {
+ this.$totals_section.addClass('d-none');
+ this.$numpad_section.removeClass('d-none');
+ } else {
+ this.$totals_section.removeClass('d-none');
+ this.$numpad_section.addClass('d-none');
+ }
+ this.reset_numpad();
+ }
+
+ reset_numpad() {
+ this.numpad_value = '';
+ this.prev_action = undefined;
+ this.$numpad_section.find('.shadow-inner').removeClass('shadow-inner bg-selected');
+ }
+
+ toggle_numpad_field_edit(fieldname) {
+ if (['qty', 'discount_percentage', 'rate'].includes(fieldname)) {
+ this.$numpad_section.find(`[data-button-value="${fieldname}"]`).click();
+ }
+ }
+
+ toggle_customer_info(show) {
+ if (show) {
+ this.$cart_container.addClass('d-none')
+ this.$customer_section.addClass('flex-1 scroll-y').removeClass('mb-0 border pr-4 pl-4')
+ this.$customer_section.find('.icon').addClass('w-24 h-24 text-2xl').removeClass('w-12 h-12 text-md')
+ this.$customer_section.find('.customer-header').removeClass('h-18');
+ this.$customer_section.find('.customer-details').addClass('sticky z-100 bg-white');
+
+ this.$customer_section.find('.customer-name').html(
+ `${this.customer_info.customer}
+ `
+ )
+
+ this.$customer_section.find('.customer-details').append(
+ `
+
`
+ )
+ // transactions need to be in diff div from sticky elem for scrolling
+ this.$customer_section.append(``)
+
+ this.render_customer_info_form();
+ this.fetch_customer_transactions();
+
+ } else {
+ this.$cart_container.removeClass('d-none');
+ this.$customer_section.removeClass('flex-1 scroll-y').addClass('mb-0 border pr-4 pl-4');
+ this.$customer_section.find('.icon').addClass('w-12 h-12 text-md').removeClass('w-24 h-24 text-2xl');
+ this.$customer_section.find('.customer-header').addClass('h-18')
+ this.$customer_section.find('.customer-details').removeClass('sticky z-100 bg-white');
+
+ this.update_customer_section();
+ }
+ }
+
+ render_customer_info_form() {
+ const $customer_form = this.$customer_section.find('.customer-form');
+
+ const dfs = [{
+ fieldname: 'email_id',
+ label: __('Email'),
+ fieldtype: 'Data',
+ options: 'email',
+ placeholder: __("Enter customer's email")
+ },{
+ fieldname: 'mobile_no',
+ label: __('Phone Number'),
+ fieldtype: 'Data',
+ placeholder: __("Enter customer's phone number")
+ },{
+ fieldname: 'loyalty_program',
+ label: __('Loyalty Program'),
+ fieldtype: 'Link',
+ options: 'Loyalty Program',
+ placeholder: __("Select Loyalty Program")
+ },{
+ fieldname: 'loyalty_points',
+ label: __('Loyalty Points'),
+ fieldtype: 'Int',
+ read_only: 1
+ }];
+
+ const me = this;
+ dfs.forEach(df => {
+ this[`customer_${df.fieldname}_field`] = frappe.ui.form.make_control({
+ df: { ...df,
+ onchange: handle_customer_field_change,
+ },
+ parent: $customer_form.find(`.${df.fieldname}-field`),
+ render_input: true,
+ });
+ this[`customer_${df.fieldname}_field`].set_value(this.customer_info[df.fieldname]);
+ })
+
+ function handle_customer_field_change() {
+ const current_value = me.customer_info[this.df.fieldname];
+ const current_customer = me.customer_info.customer;
+
+ if (this.value && current_value != this.value && this.df.fieldname != 'loyalty_points') {
+ frappe.call({
+ method: 'erpnext.selling.page.point_of_sale.point_of_sale.set_customer_info',
+ args: {
+ fieldname: this.df.fieldname,
+ customer: current_customer,
+ value: this.value
+ },
+ callback: (r) => {
+ if(!r.exc) {
+ me.customer_info[this.df.fieldname] = this.value;
+ frappe.show_alert({
+ message: __("Customer contact updated successfully."),
+ indicator: 'green'
+ });
+ frappe.utils.play_sound("submit");
+ }
+ }
+ });
+ }
+ }
+ }
+
+ fetch_customer_transactions() {
+ frappe.db.get_list('POS Invoice', {
+ filters: { customer: this.customer_info.customer, docstatus: 1 },
+ fields: ['name', 'grand_total', 'status', 'posting_date', 'posting_time', 'currency'],
+ limit: 20
+ }).then((res) => {
+ const transaction_container = this.$customer_section.find('.customer-transactions');
+
+ if (!res.length) {
+ transaction_container.removeClass('flex-1 border rounded').html(
+ `CONTACT DETAILS
+
+
+
+
+
+
+ RECENT TRANSACTIONS
+ No recent transactions found
`
+ )
+ return;
+ };
+
+ const elapsed_time = moment(res[0].posting_date+" "+res[0].posting_time).fromNow();
+ this.$customer_section.find('.last-transacted-on').html(`Last transacted ${elapsed_time}`);
+
+ res.forEach(invoice => {
+ const posting_datetime = moment(invoice.posting_date+" "+invoice.posting_time).format("Do MMMM, h:mma");
+ let indicator_color = '';
+
+ if (in_list(['Paid', 'Consolidated'], invoice.status)) (indicator_color = 'green');
+ if (invoice.status === 'Draft') (indicator_color = 'red');
+ if (invoice.status === 'Return') (indicator_color = 'grey');
+
+ transaction_container.append(
+ `
+
`
+ )
+ });
+ })
+ }
+
+ load_invoice() {
+ const frm = this.events.get_frm();
+ this.fetch_customer_details(frm.doc.customer).then(() => {
+ this.events.customer_details_updated(this.customer_info);
+ this.update_customer_section();
+ })
+
+ this.$cart_items_wrapper.html('');
+ if (frm.doc.items.length) {
+ frm.doc.items.forEach(item => {
+ this.update_item_html(item);
+ });
+ } else {
+ this.make_no_items_placeholder();
+ this.highlight_checkout_btn(false);
+ }
+
+ this.update_totals_section(frm);
+
+ if(frm.doc.docstatus === 1) {
+ this.$totals_section.find('.checkout-btn').addClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ this.$totals_section.find('.grand-total').removeClass('border-b-grey');
+ } else {
+ this.$totals_section.find('.checkout-btn').removeClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ this.$totals_section.find('.grand-total').addClass('border-b-grey');
+ }
+
+ this.toggle_component(true);
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_item_details.js b/erpnext/selling/page/point_of_sale/pos_item_details.js
new file mode 100644
index 0000000000..86a1be9faf
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_details.js
@@ -0,0 +1,394 @@
+erpnext.PointOfSale.ItemDetails = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.current_item = {};
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ ``
+ )
+
+ this.$component = this.wrapper.find('.item-details');
+ }
+
+ init_child_components() {
+ this.$component.html(
+ `
+
+ ${invoice.name}
+
+ ${posting_datetime}
+
+
+
+
+ ${format_currency(invoice.grand_total, invoice.currency, 0) || 0}
+
+ ${invoice.status}
+
+
`
+ )
+
+ this.$item_name = this.$component.find('.item-name');
+ this.$item_description = this.$component.find('.item-description');
+ this.$item_price = this.$component.find('.item-price');
+ this.$item_image = this.$component.find('.item-image');
+ this.$form_container = this.$component.find('.form-container');
+ this.$dicount_section = this.$component.find('.discount-section');
+ }
+
+ toggle_item_details_section(item) {
+ const { item_code, batch_no, uom } = this.current_item;
+ const item_code_is_same = item && item_code === item.item_code;
+ const batch_is_same = item && batch_no == item.batch_no;
+ const uom_is_same = item && uom === item.uom;
+
+ this.item_has_changed = !item ? false : item_code_is_same && batch_is_same && uom_is_same ? false : true;
+
+ this.events.toggle_item_selector(this.item_has_changed);
+ this.toggle_component(this.item_has_changed);
+
+ if (this.item_has_changed) {
+ this.doctype = item.doctype;
+ this.item_meta = frappe.get_meta(this.doctype);
+ this.name = item.name;
+ this.item_row = item;
+ this.currency = this.events.get_frm().doc.currency;
+
+ this.current_item = { item_code: item.item_code, batch_no: item.batch_no, uom: item.uom };
+
+ this.render_dom(item);
+ this.render_discount_dom(item);
+ this.render_form(item);
+ } else {
+ this.validate_serial_batch_item();
+ this.current_item = {};
+ }
+ }
+
+ validate_serial_batch_item() {
+ const doc = this.events.get_frm().doc;
+ const item_row = doc.items.find(item => item.name === this.name);
+
+ if (!item_row) return;
+
+ const serialized = item_row.has_serial_no;
+ const batched = item_row.has_batch_no;
+ const no_serial_selected = !item_row.serial_no;
+ const no_batch_selected = !item_row.batch_no;
+
+ if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
+ (serialized && batched && (no_batch_selected || no_serial_selected))) {
+
+ frappe.show_alert({
+ message: __("Item will be removed since no serial / batch no selected."),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("cancel");
+ this.events.remove_item_from_cart();
+ }
+ }
+
+ render_dom(item) {
+ let { item_code ,item_name, description, image, price_list_rate } = item;
+
+ function get_description_html() {
+ if (description) {
+ description = description.indexOf('...') === -1 && description.length > 75 ? description.substr(0, 73) + '...' : description;
+ return description;
+ }
+ return ``;
+ }
+
+ this.$item_name.html(item_name);
+ this.$item_description.html(get_description_html());
+ this.$item_price.html(format_currency(price_list_rate, this.currency));
+ if (image) {
+ this.$item_image.html(
+ `
+
+ ITEM DETAILS
+ Close
+
+
+
+
+
+
+
+
+
+ STOCK DETAILS
+
+
+ ${format_currency(item.price_list_rate, this.currency)}
+
+
+ ${item.discount_percentage}% off
+
`
+ )
+ this.$item_price.html(format_currency(item.rate, this.currency));
+ } else {
+ this.$dicount_section.html(``)
+ }
+ }
+
+ render_form(item) {
+ const fields_to_display = this.get_form_fields(item);
+ this.$form_container.html('');
+
+ fields_to_display.forEach((fieldname, idx) => {
+ this.$form_container.append(
+ `
+
+
`
+ )
+
+ const field_meta = this.item_meta.fields.find(df => df.fieldname === fieldname);
+ fieldname === 'discount_percentage' ? (field_meta.label = __('Discount (%)')) : '';
+ const me = this;
+
+ this[`${fieldname}_control`] = frappe.ui.form.make_control({
+ df: {
+ ...field_meta,
+ onchange: function() {
+ me.events.form_updated(me.doctype, me.name, fieldname, this.value);
+ }
+ },
+ parent: this.$form_container.find(`.${fieldname}-control`),
+ render_input: true,
+ })
+ this[`${fieldname}_control`].set_value(item[fieldname]);
+ });
+
+ this.make_auto_serial_selection_btn(item);
+
+ this.bind_custom_control_change_event();
+ }
+
+ get_form_fields(item) {
+ const fields = ['qty', 'uom', 'rate', 'price_list_rate', 'discount_percentage', 'warehouse', 'actual_qty'];
+ if (item.has_serial_no) fields.push('serial_no');
+ if (item.has_batch_no) fields.push('batch_no');
+ return fields;
+ }
+
+ make_auto_serial_selection_btn(item) {
+ if (item.has_serial_no) {
+ this.$form_container.append(
+ ``
+ )
+ if (!item.has_batch_no) {
+ this.$form_container.append(
+ ``
+ )
+ }
+ this.$form_container.append(
+ `
+ Auto Fetch Serial Numbers
+
`
+ )
+ this.$form_container.find('.serial_no-control').find('textarea').css('height', '9rem');
+ this.$form_container.find('.serial_no-control').parent().addClass('row-span-2');
+ }
+ }
+
+ bind_custom_control_change_event() {
+ const me = this;
+ if (this.rate_control) {
+ this.rate_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'rate', this.value).then(() => {
+ const item_row = frappe.get_doc(me.doctype, me.name);
+ const doc = me.events.get_frm().doc;
+
+ me.$item_price.html(format_currency(item_row.rate, doc.currency));
+ me.render_discount_dom(item_row);
+ });
+ }
+ }
+ }
+
+ if (this.warehouse_control) {
+ this.warehouse_control.df.reqd = 1;
+ this.warehouse_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'warehouse', this.value).then(() => {
+ me.item_stock_map = me.events.get_item_stock_map();
+ const available_qty = me.item_stock_map[me.item_row.item_code][this.value];
+ if (available_qty === undefined) {
+ me.events.get_available_stock(me.item_row.item_code, this.value).then(() => {
+ // item stock map is updated now reset warehouse
+ me.warehouse_control.set_value(this.value);
+ })
+ } else if (available_qty === 0) {
+ me.warehouse_control.set_value('');
+ frappe.throw(__(`Item Code: ${me.item_row.item_code.bold()} is not available under warehouse ${this.value.bold()}.`));
+ }
+ me.actual_qty_control.set_value(available_qty);
+ });
+ }
+ }
+ this.warehouse_control.refresh();
+ }
+
+ if (this.discount_percentage_control) {
+ this.discount_percentage_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'discount_percentage', this.value).then(() => {
+ const item_row = frappe.get_doc(me.doctype, me.name);
+ me.rate_control.set_value(item_row.rate);
+ });
+ }
+ }
+ }
+
+ if (this.serial_no_control) {
+ this.serial_no_control.df.reqd = 1;
+ this.serial_no_control.df.onchange = async function() {
+ !me.current_item.batch_no && await me.auto_update_batch_no();
+ me.events.form_updated(me.doctype, me.name, 'serial_no', this.value);
+ }
+ this.serial_no_control.refresh();
+ }
+
+ if (this.batch_no_control) {
+ this.batch_no_control.df.reqd = 1;
+ this.batch_no_control.df.get_query = () => {
+ return {
+ query: 'erpnext.controllers.queries.get_batch_no',
+ filters: {
+ item_code: me.item_row.item_code,
+ warehouse: me.item_row.warehouse
+ }
+ }
+ };
+ this.batch_no_control.df.onchange = function() {
+ me.events.set_value_in_current_cart_item('batch-no', this.value);
+ me.events.form_updated(me.doctype, me.name, 'batch_no', this.value);
+ me.current_item.batch_no = this.value;
+ }
+ this.batch_no_control.refresh();
+ }
+
+ if (this.uom_control) {
+ this.uom_control.df.onchange = function() {
+ me.events.set_value_in_current_cart_item('uom', this.value);
+ me.events.form_updated(me.doctype, me.name, 'uom', this.value);
+ me.current_item.uom = this.value;
+ }
+ }
+ }
+
+ async auto_update_batch_no() {
+ if (this.serial_no_control && this.batch_no_control) {
+ const selected_serial_nos = this.serial_no_control.get_value().split(`\n`).filter(s => s);
+ if (!selected_serial_nos.length) return;
+
+ // find batch nos of the selected serial no
+ const serials_with_batch_no = await frappe.db.get_list("Serial No", {
+ filters: { 'name': ["in", selected_serial_nos]},
+ fields: ["batch_no", "name"]
+ });
+ const batch_serial_map = serials_with_batch_no.reduce((acc, r) => {
+ acc[r.batch_no] || (acc[r.batch_no] = []);
+ acc[r.batch_no] = [...acc[r.batch_no], r.name];
+ return acc;
+ }, {});
+ // set current item's batch no and serial no
+ const batch_no = Object.keys(batch_serial_map)[0];
+ const batch_serial_nos = batch_serial_map[batch_no].join(`\n`);
+ // eg. 10 selected serial no. -> 5 belongs to first batch other 5 belongs to second batch
+ const serial_nos_belongs_to_other_batch = selected_serial_nos.length !== batch_serial_map[batch_no].length;
+
+ const current_batch_no = this.batch_no_control.get_value();
+ current_batch_no != batch_no && await this.batch_no_control.set_value(batch_no);
+
+ if (serial_nos_belongs_to_other_batch) {
+ this.serial_no_control.set_value(batch_serial_nos);
+ this.qty_control.set_value(batch_serial_map[batch_no].length);
+ }
+
+ delete batch_serial_map[batch_no];
+
+ if (serial_nos_belongs_to_other_batch)
+ this.events.clone_new_batch_item_in_frm(batch_serial_map, this.current_item);
+ }
+ }
+
+ bind_events() {
+ this.bind_auto_serial_fetch_event();
+ this.bind_fields_to_numpad_fields();
+
+ this.$component.on('click', '.close-btn', () => {
+ this.events.close_item_details();
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("escape", () => {
+ const item_details_visible = this.$component.is(":visible");
+ if (item_details_visible) {
+ this.events.close_item_details();
+ }
+ });
+ }
+
+ bind_fields_to_numpad_fields() {
+ const me = this;
+ this.$form_container.on('click', '.input-with-feedback', function() {
+ const fieldname = $(this).attr('data-fieldname');
+ if (this.last_field_focused != fieldname) {
+ me.events.item_field_focused(fieldname);
+ this.last_field_focused = fieldname;
+ }
+ });
+ }
+
+ bind_auto_serial_fetch_event() {
+ this.$form_container.on('click', '.auto-fetch-btn', () => {
+ this.batch_no_control.set_value('');
+ let qty = this.qty_control.get_value();
+ let numbers = frappe.call({
+ method: "erpnext.stock.doctype.serial_no.serial_no.auto_fetch_serial_number",
+ args: {
+ qty,
+ item_code: this.current_item.item_code,
+ warehouse: this.warehouse_control.get_value() || '',
+ batch_nos: this.current_item.batch_no || '',
+ for_doctype: 'POS Invoice'
+ }
+ });
+
+ numbers.then((data) => {
+ let auto_fetched_serial_numbers = data.message;
+ let records_length = auto_fetched_serial_numbers.length;
+ if (!records_length) {
+ const warehouse = this.warehouse_control.get_value().bold();
+ frappe.msgprint(__(`Serial numbers unavailable for Item ${this.current_item.item_code.bold()}
+ under warehouse ${warehouse}. Please try changing warehouse.`));
+ } else if (records_length < qty) {
+ frappe.msgprint(`Fetched only ${records_length} available serial numbers.`);
+ this.qty_control.set_value(records_length);
+ }
+ numbers = auto_fetched_serial_numbers.join(`\n`);
+ this.serial_no_control.set_value(numbers);
+ });
+ })
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js
new file mode 100644
index 0000000000..ee0c06d45d
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js
@@ -0,0 +1,265 @@
+erpnext.PointOfSale.ItemSelector = class {
+ constructor({ frm, wrapper, events, pos_profile }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.pos_profile = pos_profile;
+
+ this.inti_component();
+ }
+
+ inti_component() {
+ this.prepare_dom();
+ this.make_search_bar();
+ this.load_items_data();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+
+
+
+
+
+ ALL ITEMS
+
+
+
+ 
+
`
+ } else {
+ return `
+ ${frappe.get_abbr(item.item_name)}
+
`
+ }
+ }
+
+ return (
+ `
+ ${get_item_image_html()}
+
`
+ )
+ }
+
+ make_search_bar() {
+ const me = this;
+ this.$component.find('.search-field').html('');
+ this.$component.find('.item-group-field').html('');
+
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Search'),
+ fieldtype: 'Data',
+ placeholder: __('Search by item code, serial number, batch no or barcode')
+ },
+ parent: this.$component.find('.search-field'),
+ render_input: true,
+ });
+ this.item_group_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Item Group'),
+ fieldtype: 'Link',
+ options: 'Item Group',
+ placeholder: __('Select item group'),
+ onchange: function() {
+ me.item_group = this.value;
+ !me.item_group && (me.item_group = me.parent_item_group);
+ me.filter_items();
+ },
+ get_query: function () {
+ return {
+ query: 'erpnext.selling.page.point_of_sale.point_of_sale.item_group_query',
+ filters: {
+ pos_profile: me.events.get_frm().doc?.pos_profile
+ }
+ }
+ },
+ },
+ parent: this.$component.find('.item-group-field'),
+ render_input: true,
+ });
+ this.search_field.toggle_label(false);
+ this.item_group_field.toggle_label(false);
+ }
+
+ bind_events() {
+ const me = this;
+ onScan.attachTo(document, {
+ onScan: (sScancode) => {
+ if (this.search_field && this.$component.is(':visible')) {
+ this.search_field.set_focus();
+ $(this.search_field.$input[0]).val(sScancode).trigger("input");
+ this.barcode_scanned = true;
+ }
+ }
+ });
+
+ this.$component.on('click', '.item-wrapper', function() {
+ const $item = $(this);
+ const item_code = unescape($item.attr('data-item-code'));
+ let batch_no = unescape($item.attr('data-batch-no'));
+ let serial_no = unescape($item.attr('data-serial-no'));
+ let uom = unescape($item.attr('data-uom'));
+
+ // escape(undefined) returns "undefined" then unescape returns "undefined"
+ batch_no = batch_no === "undefined" ? undefined : batch_no;
+ serial_no = serial_no === "undefined" ? undefined : serial_no;
+ uom = uom === "undefined" ? undefined : uom;
+
+ me.events.item_selected({ field: 'qty', value: "+1", item: { item_code, batch_no, serial_no, uom }});
+ })
+
+ 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);
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+i", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible) return;
+ this.search_field.set_focus();
+ });
+ frappe.ui.keys.on("ctrl+g", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible) return;
+ this.item_group_field.set_focus();
+ });
+ // for selecting the last filtered item on search
+ frappe.ui.keys.on("enter", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible || this.search_field.get_value() === "") return;
+
+ if (this.items.length == 1) {
+ this.$items_container.find(".item-wrapper").click();
+ frappe.utils.play_sound("submit");
+ $(this.search_field.$input[0]).val("").trigger("input");
+ } else if (this.items.length == 0 && this.barcode_scanned) {
+ // only show alert of barcode is scanned and enter is pressed
+ frappe.show_alert({
+ message: __("No items found. Scan barcode again."),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.barcode_scanned = false;
+ $(this.search_field.$input[0]).val("").trigger("input");
+ }
+ });
+ }
+
+ filter_items({ search_term='' }={}) {
+ 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.items = items;
+ this.render_item_list(items);
+ return;
+ }
+ }
+
+ this.get_items({ search_value: search_term })
+ .then(({ message }) => {
+ const { items, serial_no, batch_no, barcode } = message;
+ if (search_term && !barcode) {
+ this.search_index[search_term] = items;
+ }
+ this.items = items;
+ this.render_item_list(items);
+ });
+ }
+
+ resize_selector(minimize) {
+ minimize ?
+ this.$component.find('.search-field').removeClass('mr-8') :
+ this.$component.find('.search-field').addClass('mr-8');
+
+ minimize ?
+ this.$component.find('.filter-section').addClass('flex-col') :
+ this.$component.find('.filter-section').removeClass('flex-col');
+
+ minimize ?
+ this.$component.removeClass('col-span-6').addClass('col-span-2') :
+ this.$component.removeClass('col-span-2').addClass('col-span-6')
+
+ minimize ?
+ this.$items_container.removeClass('grid-cols-4').addClass('grid-cols-1') :
+ this.$items_container.removeClass('grid-cols-1').addClass('grid-cols-4')
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_number_pad.js b/erpnext/selling/page/point_of_sale/pos_number_pad.js
new file mode 100644
index 0000000000..2ffc2c0229
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_number_pad.js
@@ -0,0 +1,49 @@
+erpnext.PointOfSale.NumberPad = class {
+ constructor({ wrapper, events, cols, keys, css_classes, fieldnames_map }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.cols = cols;
+ this.keys = keys;
+ this.css_classes = css_classes || [];
+ this.fieldnames = fieldnames_map || {};
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.bind_events();
+ }
+
+ prepare_dom() {
+ const { cols, keys, css_classes, fieldnames } = this;
+
+ function get_keys() {
+ return keys.reduce((a, row, i) => {
+ return a + row.reduce((a2, number, j) => {
+ const class_to_append = css_classes && css_classes[i] ? css_classes[i][j] : '';
+ const fieldname = fieldnames && fieldnames[number] ?
+ fieldnames[number] :
+ typeof number === 'string' ? frappe.scrub(number) : number;
+
+ return a2 + `
+
+
+
+ ${frappe.ellipsis(item.item_name, 18)}
+
+ ${format_currency(item.price_list_rate, item.currency, 0) || 0}
+ ${number}
`
+ }, '')
+ }, '');
+ }
+
+ this.wrapper.html(
+ `
+ ${get_keys()}
+
`
+ )
+ }
+
+ bind_events() {
+ const me = this;
+ this.wrapper.on('click', '.numpad-btn', function() {
+ const $btn = $(this);
+ me.events.numpad_event($btn);
+ })
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_list.js b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
new file mode 100644
index 0000000000..9181ee8000
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
@@ -0,0 +1,130 @@
+erpnext.PointOfSale.PastOrderList = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.make_filter_section();
+ this.bind_events();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+
+
+
+
+
+ RECENT ORDERS
+
+
+
`
+ )
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
new file mode 100644
index 0000000000..24326b2256
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
@@ -0,0 +1,452 @@
+erpnext.PointOfSale.PastOrderSummary = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+ ${invoice.name}
+
+
+
+
+ ${invoice.customer}
+
+
+
+ ${format_currency(invoice.grand_total, invoice.currency, 0) || 0}
+ ${posting_datetime}
+
+
+
+
+ Select an invoice to load summary data
+
+
+
+
+
`
+ )
+
+ this.$items_summary_container = this.$summary_container.find('.items-summary-container');
+ }
+
+ init_totals_summary() {
+ this.$summary_container.append(
+ `ITEMS
+
+
+
`
+ )
+
+ this.$totals_summary_container = this.$summary_container.find('.summary-totals-container');
+ }
+
+ init_payments_summary() {
+ this.$summary_container.append(
+ `TOTALS
+
+
+
`
+ )
+
+ this.$payment_summary_container = this.$summary_container.find('.payments-summary-container');
+ }
+
+ init_summary_buttons() {
+ this.$summary_container.append(
+ ``
+ )
+
+ this.$summary_btns = this.$summary_container.find('.summary-btns');
+ }
+
+ init_email_print_dialog() {
+ const email_dialog = new frappe.ui.Dialog({
+ title: 'Email Receipt',
+ fields: [
+ {fieldname:'email_id', fieldtype:'Data', options: 'Email', label:'Email ID'},
+ // {fieldname:'remarks', fieldtype:'Text', label:'Remarks (if any)'}
+ ],
+ primary_action: () => {
+ this.send_email();
+ },
+ primary_action_label: __('Send'),
+ });
+ this.email_dialog = email_dialog;
+
+ const print_dialog = new frappe.ui.Dialog({
+ title: 'Print Receipt',
+ fields: [
+ {fieldname:'print', fieldtype:'Data', label:'Print Preview'}
+ ],
+ primary_action: () => {
+ this.events.get_frm().print_preview.printit(true);
+ },
+ primary_action_label: __('Print'),
+ });
+ this.print_dialog = print_dialog;
+ }
+
+ get_upper_section_html(doc) {
+ const { status } = doc; let indicator_color = '';
+
+ in_list(['Paid', 'Consolidated'], status) && (indicator_color = 'green');
+ status === 'Draft' && (indicator_color = 'red');
+ status === 'Return' && (indicator_color = 'grey');
+
+ return `PAYMENTS
+
+
+
+ ${doc.customer}
+ ${this.customer_email}
+ Sold by: ${doc.owner}
+
+
`
+ }
+
+ get_discount_html(doc) {
+ if (doc.discount_amount) {
+ return `${format_currency(doc.paid_amount, doc.currency)}
+
+
+ ${doc.name}
+ ${doc.status}
+
+
`;
+ } else {
+ return ``;
+ }
+ }
+
+ get_net_total_html(doc) {
+ return `
+
+
+ Discount
+
+ (${doc.additional_discount_percentage} %)
+
+
+ ${format_currency(doc.discount_amount, doc.currency)}
+
+
`
+ }
+
+ get_taxes_html(doc) {
+ return `
+
+
+ Net Total
+
+
+
+ ${format_currency(doc.net_total, doc.currency)}
+
+
`
+ }
+
+ get_grand_total_html(doc) {
+ return `
+
+ Tax Charges
+
+ ${
+ doc.taxes.map((t, i) => {
+ let margin_left = '';
+ if (i !== 0) margin_left = 'ml-2';
+ return `${t.description} @${t.rate}%`
+ }).join('')
+ }
+
+
+
+ ${format_currency(doc.base_total_taxes_and_charges, doc.currency)}
+
+
`
+ }
+
+ get_item_html(doc, item_data) {
+ return `
+
+
+ Grand Total
+
+
+
+ ${format_currency(doc.grand_total, doc.currency)}
+
+
`
+
+ function get_rate_discount_html() {
+ if (item_data.rate && item_data.price_list_rate && item_data.rate !== item_data.price_list_rate) {
+ return `(${item_data.discount_percentage}% off)
+
+ ${item_data.qty || 0}
+
+
+
+
+ ${item_data.item_name}
+
+
+ ${get_rate_discount_html()}
+
+ ${format_currency(item_data.rate, doc.currency)}
`
+ } else {
+ return `${format_currency(item_data.price_list_rate || item_data.rate, doc.currency)}
`
+ }
+ }
+ }
+
+ get_payment_html(doc, payment) {
+ return `
+
`
+ }
+
+ bind_events() {
+ this.$summary_container.on('click', '.return-btn', () => {
+ this.events.process_return(this.doc.name);
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.edit-btn', () => {
+ this.events.edit_order(this.doc.name);
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.new-btn', () => {
+ this.events.new_order();
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.email-btn', () => {
+ this.email_dialog.fields_dict.email_id.set_value(this.customer_email);
+ this.email_dialog.show();
+ });
+
+ this.$summary_container.on('click', '.print-btn', () => {
+ // this.print_dialog.show();
+ const frm = this.events.get_frm();
+ frm.doc = this.doc;
+ frm.print_preview.printit(true);
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+p", () => {
+ const print_btn_visible = this.$summary_container.find('.print-btn').is(":visible");
+ const summary_visible = this.$component.is(":visible");
+ if (!summary_visible || !print_btn_visible) return;
+
+ this.$summary_container.find('.print-btn').click();
+ });
+ }
+
+ toggle_component(show) {
+ show ?
+ this.$component.removeClass('d-none') :
+ this.$component.addClass('d-none');
+ }
+
+ send_email() {
+ const frm = this.events.get_frm();
+ const recipients = this.email_dialog.get_values().recipients;
+ const doc = this.doc || frm.doc;
+ const print_format = frm.pos_print_format;
+
+ frappe.call({
+ method:"frappe.core.doctype.communication.email.make",
+ args: {
+ recipients: recipients,
+ subject: __(frm.meta.name) + ': ' + doc.name,
+ doctype: doc.doctype,
+ name: doc.name,
+ send_email: 1,
+ print_format,
+ sender_full_name: frappe.user.full_name(),
+ _lang : doc.language
+ },
+ callback: r => {
+ if(!r.exc) {
+ frappe.utils.play_sound("email");
+ if(r.message["emails_not_sent_to"]) {
+ frappe.msgprint(__("Email not sent to {0} (unsubscribed / disabled)",
+ [ frappe.utils.escape_html(r.message["emails_not_sent_to"]) ]) );
+ } else {
+ frappe.show_alert({
+ message: __('Email sent successfully.'),
+ indicator: 'green'
+ });
+ }
+ this.email_dialog.hide();
+ } else {
+ frappe.msgprint(__("There were errors while sending email. Please try again."));
+ }
+ }
+ });
+ }
+
+ add_summary_btns(map) {
+ this.$summary_btns.html('');
+ map.forEach(m => {
+ if (m.condition) {
+ m.visible_btns.forEach(b => {
+ const class_name = b.split(' ')[0].toLowerCase();
+ this.$summary_btns.append(
+ `
+
+
+ ${payment.mode_of_payment}
+
+
+
+ ${format_currency(payment.amount, doc.currency)}
+
+ ${b}
+
`
+ )
+ });
+ }
+ });
+ this.$summary_btns.children().last().removeClass('mr-4');
+ }
+
+ show_summary_placeholder() {
+ this.$summary_wrapper.addClass("d-none");
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ }
+
+ switch_to_post_submit_summary() {
+ // switch to full width view
+ this.$component.removeClass('col-span-6').addClass('col-span-10');
+ this.$summary_wrapper.removeClass('w-66').addClass('w-40');
+
+ // switch place holder with summary container
+ this.$component.find('.no-summary-placeholder').addClass('d-none');
+ this.$summary_wrapper.removeClass('d-none');
+ }
+
+ switch_to_recent_invoice_summary() {
+ // switch full width view with 60% view
+ this.$component.removeClass('col-span-10').addClass('col-span-6');
+ this.$summary_wrapper.removeClass('w-40').addClass('w-66');
+
+ // switch place holder with summary container
+ this.$component.find('.no-summary-placeholder').addClass('d-none');
+ this.$summary_wrapper.removeClass('d-none');
+ }
+
+ get_condition_btn_map(after_submission) {
+ if (after_submission)
+ return [{ condition: true, visible_btns: ['Print Receipt', 'Email Receipt', 'New Order'] }];
+
+ return [
+ { condition: this.doc.docstatus === 0, visible_btns: ['Edit Order'] },
+ { condition: !this.doc.is_return && this.doc.docstatus === 1, visible_btns: ['Print Receipt', 'Email Receipt', 'Return']},
+ { condition: this.doc.is_return && this.doc.docstatus === 1, visible_btns: ['Print Receipt', 'Email Receipt']}
+ ];
+ }
+
+ load_summary_of(doc, after_submission=false) {
+ this.$summary_wrapper.removeClass("d-none");
+
+ after_submission ?
+ this.switch_to_post_submit_summary() : this.switch_to_recent_invoice_summary();
+
+ this.doc = doc;
+
+ this.attach_basic_info(doc);
+
+ this.attach_items_info(doc);
+
+ this.attach_totals_info(doc);
+
+ this.attach_payments_info(doc);
+
+ const condition_btns_map = this.get_condition_btn_map(after_submission);
+
+ this.add_summary_btns(condition_btns_map);
+ }
+
+ attach_basic_info(doc) {
+ frappe.db.get_value('Customer', this.doc.customer, 'email_id').then(({ message }) => {
+ this.customer_email = message.email_id || '';
+ const upper_section_dom = this.get_upper_section_html(doc);
+ this.$upper_section.html(upper_section_dom);
+ });
+ }
+
+ attach_items_info(doc) {
+ this.$items_summary_container.html('');
+ doc.items.forEach(item => {
+ const item_dom = this.get_item_html(doc, item);
+ this.$items_summary_container.append(item_dom);
+ });
+ }
+
+ attach_payments_info(doc) {
+ this.$payment_summary_container.html('');
+ doc.payments.forEach(p => {
+ if (p.amount) {
+ const payment_dom = this.get_payment_html(doc, p);
+ this.$payment_summary_container.append(payment_dom);
+ }
+ });
+ if (doc.redeem_loyalty_points && doc.loyalty_amount) {
+ const payment_dom = this.get_payment_html(doc, {
+ mode_of_payment: 'Loyalty Points',
+ amount: doc.loyalty_amount,
+ });
+ this.$payment_summary_container.append(payment_dom);
+ }
+ }
+
+ attach_totals_info(doc) {
+ this.$totals_summary_container.html('');
+
+ const discount_dom = this.get_discount_html(doc);
+ const net_total_dom = this.get_net_total_html(doc);
+ const taxes_dom = this.get_taxes_html(doc);
+ const grand_total_dom = this.get_grand_total_html(doc);
+ this.$totals_summary_container.append(discount_dom);
+ this.$totals_summary_container.append(net_total_dom);
+ this.$totals_summary_container.append(taxes_dom);
+ this.$totals_summary_container.append(grand_total_dom);
+ }
+
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
new file mode 100644
index 0000000000..e1c54f64a7
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -0,0 +1,503 @@
+{% include "erpnext/selling/page/point_of_sale/pos_number_pad.js" %}
+
+erpnext.PointOfSale.Payment = class {
+ constructor({ events, wrapper }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.initialize_numpad();
+ this.bind_events();
+ this.attach_shortcuts();
+
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+ PAYMENT METHOD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Complete Order
+
+
+
+ ADDITIONAL INFORMATION
+
+ `
+ );
+ this.$invoice_fields = this.$invoice_details_section.find('.invoice-fields');
+ const frm = this.events.get_frm();
+
+ fields.forEach(df => {
+ this.$invoice_fields.append(
+ ``
+ );
+
+ this[`${df.fieldname}_field`] = frappe.ui.form.make_control({
+ df: {
+ ...df,
+ onchange: function() {
+ frm.set_value(this.df.fieldname, this.value);
+ }
+ },
+ parent: this.$invoice_fields.find(`.${df.fieldname}-field`),
+ render_input: true,
+ });
+ this[`${df.fieldname}_field`].set_value(frm.doc[df.fieldname]);
+ })
+ });
+ }
+
+ initialize_numpad() {
+ const me = this;
+ this.number_pad = new erpnext.PointOfSale.NumberPad({
+ wrapper: this.$numpad,
+ events: {
+ numpad_event: function($btn) {
+ me.on_numpad_clicked($btn);
+ }
+ },
+ cols: 3,
+ keys: [
+ [ 1, 2, 3 ],
+ [ 4, 5, 6 ],
+ [ 7, 8, 9 ],
+ [ '.', 0, 'Delete' ]
+ ],
+ })
+
+ this.numpad_value = '';
+ }
+
+ on_numpad_clicked($btn) {
+ const me = this;
+ const button_value = $btn.attr('data-button-value');
+
+ highlight_numpad_btn($btn);
+ this.numpad_value = button_value === 'delete' ? this.numpad_value.slice(0, -1) : this.numpad_value + button_value;
+ this.selected_mode.$input.get(0).focus();
+ this.selected_mode.set_value(this.numpad_value);
+
+ function highlight_numpad_btn($btn) {
+ $btn.addClass('shadow-inner bg-selected');
+ setTimeout(() => {
+ $btn.removeClass('shadow-inner bg-selected');
+ }, 100);
+ }
+ }
+
+ bind_events() {
+ const me = this;
+
+ this.$payment_modes.on('click', '.mode-of-payment', function(e) {
+ const mode_clicked = $(this);
+ // if clicked element doesn't have .mode-of-payment class then return
+ if (!$(e.target).is(mode_clicked)) return;
+
+ const mode = mode_clicked.attr('data-mode');
+
+ // hide all control fields and shortcuts
+ $(`.mode-of-payment-control`).addClass('d-none');
+ $(`.cash-shortcuts`).addClass('d-none');
+ me.$payment_modes.find(`.pay-amount`).removeClass('d-none');
+ me.$payment_modes.find(`.loyalty-amount-name`).addClass('d-none');
+
+ // remove highlight from all mode-of-payments
+ $('.mode-of-payment').removeClass('border-primary');
+
+ if (mode_clicked.hasClass('border-primary')) {
+ // clicked one is selected then unselect it
+ mode_clicked.removeClass('border-primary');
+ me.selected_mode = '';
+ me.toggle_numpad(false);
+ } else {
+ // clicked one is not selected then select it
+ mode_clicked.addClass('border-primary');
+ mode_clicked.find('.mode-of-payment-control').removeClass('d-none');
+ mode_clicked.find('.cash-shortcuts').removeClass('d-none');
+ me.$payment_modes.find(`.${mode}-amount`).addClass('d-none');
+ me.$payment_modes.find(`.${mode}-name`).removeClass('d-none');
+ me.toggle_numpad(true);
+
+ me.selected_mode = me[`${mode}_control`];
+ const doc = me.events.get_frm().doc;
+ me.selected_mode?.$input?.get(0).focus();
+ !me.selected_mode?.get_value() ? me.selected_mode?.set_value(doc.grand_total - doc.paid_amount) : '';
+ }
+ })
+
+ this.$payment_modes.on('click', '.shortcut', function(e) {
+ const value = $(this).attr('data-value');
+ me.selected_mode.set_value(value);
+ })
+
+ // this.$totals_remarks.on('click', '.remarks', () => {
+ // this.toggle_remarks_control();
+ // })
+
+ this.$component.on('click', '.submit-order', () => {
+ const doc = this.events.get_frm().doc;
+ const paid_amount = doc.paid_amount;
+ const items = doc.items;
+
+ if (paid_amount == 0 || !items.length) {
+ const message = items.length ? __("You cannot submit the order without payment.") : __("You cannot submit empty order.")
+ frappe.show_alert({ message, indicator: "orange" });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ this.events.submit_invoice();
+ })
+
+ frappe.ui.form.on('POS Invoice', 'paid_amount', (frm) => {
+ this.update_totals_section(frm.doc);
+
+ // need to re calculate cash shortcuts after discount is applied
+ const is_cash_shortcuts_invisible = this.$payment_modes.find('.cash-shortcuts').hasClass('d-none');
+ this.attach_cash_shortcuts(frm.doc);
+ !is_cash_shortcuts_invisible && this.$payment_modes.find('.cash-shortcuts').removeClass('d-none');
+ })
+
+ frappe.ui.form.on('POS Invoice', 'loyalty_amount', (frm) => {
+ const formatted_currency = format_currency(frm.doc.loyalty_amount, frm.doc.currency);
+ this.$payment_modes.find(`.loyalty-amount-amount`).html(formatted_currency);
+ });
+
+ frappe.ui.form.on("Sales Invoice Payment", "amount", (frm, cdt, cdn) => {
+ // for setting correct amount after loyalty points are redeemed
+ const default_mop = locals[cdt][cdn];
+ const mode = default_mop.mode_of_payment.replace(' ', '_').toLowerCase();
+ if (this[`${mode}_control`] && this[`${mode}_control`].get_value() != default_mop.amount) {
+ this[`${mode}_control`].set_value(default_mop.amount);
+ }
+ });
+
+ this.$component.on('click', '.invoice-details-section', function(e) {
+ if ($(e.target).closest('.invoice-fields').length) return;
+
+ me.$payment_modes.addClass('d-none');
+ me.$invoice_fields.toggleClass("d-none");
+ me.toggle_numpad(false);
+ });
+ this.$component.on('click', '.payment-section', () => {
+ this.$invoice_fields.addClass("d-none");
+ this.$payment_modes.toggleClass('d-none');
+ this.toggle_numpad(true);
+ })
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+enter", () => {
+ const payment_is_visible = this.$component.is(":visible");
+ const active_mode = this.$payment_modes.find(".border-primary");
+ if (payment_is_visible && active_mode.length) {
+ this.$component.find('.submit-order').click();
+ }
+ });
+
+ frappe.ui.keys.on("tab", () => {
+ const payment_is_visible = this.$component.is(":visible");
+ const mode_of_payments = Array.from(this.$payment_modes.find(".mode-of-payment")).map(m => $(m).attr("data-mode"));
+ let active_mode = this.$payment_modes.find(".border-primary");
+ active_mode = active_mode.length ? active_mode.attr("data-mode") : undefined;
+
+ if (!active_mode) return;
+
+ const mode_index = mode_of_payments.indexOf(active_mode);
+ const next_mode_index = (mode_index + 1) % mode_of_payments.length;
+ const next_mode_to_be_clicked = this.$payment_modes.find(`.mode-of-payment[data-mode="${mode_of_payments[next_mode_index]}"]`);
+
+ if (payment_is_visible && mode_index != next_mode_index) {
+ next_mode_to_be_clicked.click();
+ }
+ });
+ }
+
+ toggle_numpad(show) {
+ if (show) {
+ this.$numpad.removeClass('d-none');
+ this.$remarks.addClass('d-none');
+ this.$totals_remarks.addClass('w-60 justify-center').removeClass('justify-end w-full');
+ } else {
+ this.$numpad.addClass('d-none');
+ this.$remarks.removeClass('d-none');
+ this.$totals_remarks.removeClass('w-60 justify-center').addClass('justify-end w-full');
+ }
+ }
+
+ render_payment_section() {
+ this.render_payment_mode_dom();
+ this.make_invoice_fields_control();
+ this.update_totals_section();
+ }
+
+ edit_cart() {
+ this.events.toggle_other_sections(false);
+ this.toggle_component(false);
+ }
+
+ checkout() {
+ this.events.toggle_other_sections(true);
+ this.toggle_component(true);
+
+ this.render_payment_section();
+ }
+
+ toggle_remarks_control() {
+ if (this.$remarks.find('.frappe-control').length) {
+ this.$remarks.html('+ Add Remark');
+ } else {
+ this.$remarks.html('');
+ this[`remark_control`] = frappe.ui.form.make_control({
+ df: {
+ label: __('Remark'),
+ fieldtype: 'Data',
+ onchange: function() {}
+ },
+ parent: this.$totals_remarks.find(`.remarks`),
+ render_input: true,
+ });
+ this[`remark_control`].set_value('');
+ }
+ }
+
+ render_payment_mode_dom() {
+ const doc = this.events.get_frm().doc;
+ const payments = doc.payments;
+ const currency = doc.currency;
+
+ this.$payment_modes.html(
+ `${
+ payments.map((p, i) => {
+ const mode = p.mode_of_payment.replace(' ', '_').toLowerCase();
+ const payment_type = p.type;
+ const margin = i % 2 === 0 ? 'pr-2' : 'pl-2';
+ const amount = p.amount > 0 ? format_currency(p.amount, currency) : '';
+
+ return (
+ `
+
`
+ )
+ }).join('')
+ }`
+ )
+
+ payments.forEach(p => {
+ const mode = p.mode_of_payment.replace(' ', '_').toLowerCase();
+ const me = this;
+ this[`${mode}_control`] = frappe.ui.form.make_control({
+ df: {
+ label: __(`${p.mode_of_payment}`),
+ fieldtype: 'Currency',
+ placeholder: __(`Enter ${p.mode_of_payment} amount.`),
+ onchange: function() {
+ if (this.value || this.value == 0) {
+ frappe.model.set_value(p.doctype, p.name, 'amount', flt(this.value))
+ .then(() => me.update_totals_section());
+
+ const formatted_currency = format_currency(this.value, currency);
+ me.$payment_modes.find(`.${mode}-amount`).html(formatted_currency);
+ }
+ }
+ },
+ parent: this.$payment_modes.find(`.${mode}.mode-of-payment-control`),
+ render_input: true,
+ });
+ this[`${mode}_control`].toggle_label(false);
+ this[`${mode}_control`].set_value(p.amount);
+
+ if (p.default) {
+ setTimeout(() => {
+ this.$payment_modes.find(`.${mode}.mode-of-payment-control`).parent().click();
+ }, 500);
+ }
+ })
+
+ this.render_loyalty_points_payment_mode();
+
+ this.attach_cash_shortcuts(doc);
+ }
+
+ attach_cash_shortcuts(doc) {
+ const grand_total = doc.grand_total;
+ const currency = doc.currency;
+
+ const shortcuts = this.get_cash_shortcuts(flt(grand_total));
+
+ this.$payment_modes.find('.cash-shortcuts').remove();
+ this.$payment_modes.find('[data-payment-type="Cash"]').find('.mode-of-payment-control').after(
+ `
+ ${p.mode_of_payment}
+
+ ${amount}
+
+
+ ${
+ shortcuts.map(s => {
+ return `
`
+ )
+ }
+
+ get_cash_shortcuts(grand_total) {
+ let steps = [1, 5, 10];
+ const digits = String(Math.round(grand_total)).length;
+
+ steps = steps.map(x => x * (10 ** (digits - 2)));
+
+ const get_nearest = (amount, x) => {
+ let nearest_x = Math.ceil((amount / x)) * x;
+ return nearest_x === amount ? nearest_x + x : nearest_x;
+ }
+
+ return steps.reduce((finalArr, x) => {
+ let nearest_x = get_nearest(grand_total, x);
+ nearest_x = finalArr.indexOf(nearest_x) != -1 ? nearest_x + x : nearest_x;
+ return [...finalArr, nearest_x];
+ }, []);
+ }
+
+ render_loyalty_points_payment_mode() {
+ const me = this;
+ const doc = this.events.get_frm().doc;
+ const { loyalty_program, loyalty_points, conversion_factor } = this.events.get_customer_details();
+
+ this.$payment_modes.find(`.mode-of-payment[data-mode="loyalty-amount"]`).parent().remove();
+
+ if (!loyalty_program) return;
+
+ let description, read_only, max_redeemable_amount;
+ if (!loyalty_points) {
+ description = __(`You don't have enough points to redeem.`);
+ read_only = true;
+ } else {
+ max_redeemable_amount = flt(flt(loyalty_points) * flt(conversion_factor), precision("loyalty_amount", doc))
+ description = __(`You can redeem upto ${format_currency(max_redeemable_amount)}.`);
+ read_only = false;
+ }
+
+ const margin = this.$payment_modes.children().length % 2 === 0 ? 'pr-2' : 'pl-2';
+ const amount = doc.loyalty_amount > 0 ? format_currency(doc.loyalty_amount, doc.currency) : '';
+ this.$payment_modes.append(
+ `
+ ${format_currency(s, currency)}
+
`
+ }).join('')
+ }
+
+
`
+ )
+
+ this['loyalty-amount_control'] = frappe.ui.form.make_control({
+ df: {
+ label: __('Redeem Loyalty Points'),
+ fieldtype: 'Currency',
+ placeholder: __(`Enter amount to be redeemed.`),
+ options: 'company:currency',
+ read_only,
+ onchange: async function() {
+ if (!loyalty_points) return;
+
+ if (this.value > max_redeemable_amount) {
+ frappe.show_alert({
+ message: __(`You cannot redeem more than ${format_currency(max_redeemable_amount)}.`),
+ indicator: "red"
+ });
+ frappe.utils.play_sound("submit");
+ me['loyalty-amount_control'].set_value(0);
+ return;
+ }
+ const redeem_loyalty_points = this.value > 0 ? 1 : 0;
+ await frappe.model.set_value(doc.doctype, doc.name, 'redeem_loyalty_points', redeem_loyalty_points);
+ frappe.model.set_value(doc.doctype, doc.name, 'loyalty_points', parseInt(this.value / conversion_factor));
+ },
+ description
+ },
+ parent: this.$payment_modes.find(`.loyalty-amount.mode-of-payment-control`),
+ render_input: true,
+ });
+ this['loyalty-amount_control'].toggle_label(false);
+
+ // this.render_add_payment_method_dom();
+ }
+
+ render_add_payment_method_dom() {
+ const docstatus = this.events.get_frm().doc.docstatus;
+ if (docstatus === 0)
+ this.$payment_modes.append(
+ `
+ Redeem Loyalty Points
+
+ ${amount}
+ ${loyalty_program}
+
+
+
`
+ )
+ }
+
+ update_totals_section(doc) {
+ if (!doc) doc = this.events.get_frm().doc;
+ const paid_amount = doc.paid_amount;
+ const remaining = doc.grand_total - doc.paid_amount;
+ const change = doc.change_amount || remaining <= 0 ? -1 * remaining : undefined;
+ const currency = doc.currency
+ const label = change ? __('Change') : __('To Be Paid');
+
+ this.$totals.html(
+ `+ Add Payment Method
+
+
+ Paid Amount
+ ${format_currency(paid_amount, currency)}
+
+
`
+ )
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+ }
\ No newline at end of file
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
deleted file mode 100644
index 79d1700b4e..0000000000
--- a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
+++ /dev/null
@@ -1,38 +0,0 @@
-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(3),
- () => 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/print_format/__init__.py b/erpnext/selling/print_format/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/selling/print_format/gst_pos_invoice/__init__.py b/erpnext/selling/print_format/gst_pos_invoice/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json b/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json
new file mode 100644
index 0000000000..9094a07bcc
--- /dev/null
+++ b/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json
@@ -0,0 +1,23 @@
+{
+ "align_labels_right": 0,
+ "creation": "2017-08-08 12:33:04.773099",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "POS Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n${label}
+ ${format_currency(change || remaining, currency)}
+ \n\t{{ doc.company }}
\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"
\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t{{ _(\"GSTIN\") }}:{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"
GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t
\n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}
\n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}
\n\t{% endif %}\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"
\", \" \") %}\n\t\t{{ _(\"Customer\") }}:
\n\t\t{{ doc.customer_name }}
\n\t\t{{ customer_address }}\n\t{% endif %}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t {{ _(\"HSN/SAC\") }}: {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.rate }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t\t{% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t | \n\t\t
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 0, + "line_breaks": 0, + "modified": "2020-04-29 16:47:02.743246", + "modified_by": "Administrator", + "module": "Selling", + "name": "GST POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/print_format/pos_invoice/__init__.py b/erpnext/selling/print_format/pos_invoice/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/selling/print_format/pos_invoice/pos_invoice.json b/erpnext/selling/print_format/pos_invoice/pos_invoice.json new file mode 100644 index 0000000000..99094ed9b0 --- /dev/null +++ b/erpnext/selling/print_format/pos_invoice/pos_invoice.json @@ -0,0 +1,22 @@ +{ + "align_labels_right": 0, + "creation": "2011-12-21 11:08:55", + "custom_format": 1, + "disabled": 0, + "doc_type": "POS Invoice", + "docstatus": 0, + "doctype": "Print Format", + "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n\n\n\t{{ doc.company }}
\n\t{{ doc.select_print_heading or _(\"Invoice\") }}
\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{{ _(\"Customer\") }}: {{ doc.customer_name }}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.get_formatted(\"rate\") }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t {% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t\t | \n\t\t\t
\n
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 1, + "line_breaks": 0, + "modified": "2020-04-29 16:45:58.942375", + "modified_by": "Administrator", + "module": "Selling", + "name": "POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/print_format/return_pos_invoice/__init__.py b/erpnext/selling/print_format/return_pos_invoice/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json b/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json new file mode 100644 index 0000000000..d7f335059c --- /dev/null +++ b/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json @@ -0,0 +1,24 @@ +{ + "align_labels_right": 0, + "creation": "2020-05-14 17:02:44.207166", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "POS Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font": "Default", + "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n\n\n\t{{ doc.company }}
\n\t{{ doc.select_print_heading or _(\"Return Invoice\") }}
\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Original Invoice\") }}: {{ doc.return_against }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{{ _(\"Customer\") }}: {{ doc.customer_name }}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.get_formatted(\"rate\") }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t {% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc)}}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\")}}\n\t\t\t\t | \n\t\t\t
\n
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 0, + "line_breaks": 0, + "modified": "2020-05-14 17:13:29.354015", + "modified_by": "Administrator", + "module": "Selling", + "name": "Return POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py index 1bc4657f29..0a70b97648 100644 --- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py +++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py @@ -191,7 +191,7 @@ def get_conditions(filters): conditions += "AND so_item.item_code = '%s'" %frappe.db.escape(filters.item_code) if filters.get("customer"): - conditions += "AND so.customer = '%s'" %frappe.db.escape(filters.customer) + conditions += "AND so.customer = %s" %frappe.db.escape(filters.customer) return conditions diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py index 7e8e6e9e8b..f5feb95f1a 100644 --- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py +++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py @@ -96,7 +96,7 @@ def prepare_data(data, filters): # prepare data for report view row["qty_to_bill"] = flt(row["qty"]) - flt(row["billed_qty"]) - row["delay"] = 0 if row["delay"] < 0 else row["delay"] + row["delay"] = 0 if row["delay"] and row["delay"] < 0 else row["delay"] if filters.get("group_by_so"): so_name = row["sales_order"] diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 4a7dd5ad9b..333a563aa5 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -142,7 +142,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]); // check if child doctype is Sales Order Item/Qutation Item and calculate the rate - if(in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), cdt) + if(in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item", "POS Invoice Item"]), cdt) this.apply_pricing_rule_on_item(item); else item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0), @@ -312,6 +312,11 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ batch_no: function(doc, cdt, cdn) { var me = this; var item = frappe.get_doc(cdt, cdn); + + if (item.serial_no) { + return; + } + item.serial_no = null; var has_serial_no; frappe.db.get_value('Item', {'item_code': item.item_code}, 'has_serial_no', (r) => { diff --git a/erpnext/selling/selling_dashboard/selling/selling.json b/erpnext/selling/selling_dashboard/selling/selling.json new file mode 100644 index 0000000000..52e6714965 --- /dev/null +++ b/erpnext/selling/selling_dashboard/selling/selling.json @@ -0,0 +1,46 @@ +{ + "cards": [ + { + "card": "Annual Sales" + }, + { + "card": "Sales Orders to Deliver" + }, + { + "card": "Sales Orders to Bill" + }, + { + "card": "Active Customers" + } + ], + "charts": [ + { + "chart": "Sales Order Trends", + "width": "Full" + }, + { + "chart": "Top Customers", + "width": "Half" + }, + { + "chart": "Sales Order Analysis", + "width": "Half" + }, + { + "chart": "Item-wise Annual Sales", + "width": "Full" + } + ], + "creation": "2020-07-20 20:17:16.688162", + "dashboard_name": "Selling", + "docstatus": 0, + "doctype": "Dashboard", + "idx": 0, + "is_default": 0, + "is_standard": 1, + "modified": "2020-07-22 15:31:22.299903", + "modified_by": "Administrator", + "module": "Selling", + "name": "Selling", + "owner": "Administrator" +} \ No newline at end of file diff --git a/erpnext/setup/doctype/party_type/party_type.py b/erpnext/setup/doctype/party_type/party_type.py index b29c305ee7..96e60936a4 100644 --- a/erpnext/setup/doctype/party_type/party_type.py +++ b/erpnext/setup/doctype/party_type/party_type.py @@ -10,6 +10,7 @@ class PartyType(Document): pass @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_party_type(doctype, txt, searchfield, start, page_len, filters): cond = '' if filters and filters.get('account'): diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js index ffc5daba62..21fa4c3065 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js @@ -1,31 +1,22 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -$.extend(cur_frm.cscript, { - onload: function() { - if(cur_frm.doc.__onload && cur_frm.doc.__onload.quotation_series) { - cur_frm.fields_dict.quotation_series.df.options = cur_frm.doc.__onload.quotation_series; - cur_frm.refresh_field("quotation_series"); +frappe.ui.form.on("Shopping Cart Settings", { + onload: function(frm) { + if(frm.doc.__onload && frm.doc.__onload.quotation_series) { + frm.fields_dict.quotation_series.df.options = frm.doc.__onload.quotation_series; + frm.refresh_field("quotation_series"); } }, - refresh: function(){ - toggle_mandatory(cur_frm) - }, - enable_checkout: function(){ - toggle_mandatory(cur_frm) - }, - enabled: function() { - if (cur_frm.doc.enabled === 1) { - cur_frm.doc.show_configure_button = 1; - cur_frm.refresh_field('show_configure_button'); + enabled: function(frm) { + if (frm.doc.enabled === 1) { + frm.set_value('enable_variants', 1); + } + else { + frm.set_value('company', ''); + frm.set_value('price_list', ''); + frm.set_value('default_customer_group', ''); + frm.set_value('quotation_series', ''); } } }); - - -function toggle_mandatory (cur_frm){ - cur_frm.toggle_reqd("payment_gateway_account", false); - if(cur_frm.doc.enabled && cur_frm.doc.enable_checkout) { - cur_frm.toggle_reqd("payment_gateway_account", true); - } -} diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json index e828f54878..32004efdca 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json @@ -1,750 +1,193 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2013-06-19 15:57:32", - "custom": 0, - "description": "Default settings for Shopping Cart", - "docstatus": 0, - "doctype": "DocType", - "document_type": "System", - "editable_grid": 0, - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "enabled", - "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": "Enable Shopping Cart", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "description": "", - "fieldname": "display_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": "Display Settings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "description": "", - "fieldname": "show_attachments", - "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": "Show Public Attachments", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "description": "", - "fieldname": "show_price", - "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": "Show Price", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "show_stock_availability", - "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": "Show Stock Availability", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "show_configure_button", - "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": "Show Configure Button", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "show_contact_us_button", - "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": "Show Contact Us Button", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "show_stock_availability", - "fieldname": "show_quantity_in_website", - "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": "Show Stock Quantity", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fetch_if_empty": 0, - "fieldname": "show_apply_coupon_code_in_website", - "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": "Show Apply Coupon Code", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "allow_items_not_in_stock", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Allow items not in stock to be added to cart", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "enabled", - "fieldname": "section_break_2", - "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, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fieldname": "company", - "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": "Company", - "length": 0, - "no_copy": 0, - "options": "Company", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 1, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Prices will not be shown if Price List is not set", - "fieldname": "price_list", - "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": "Price List", - "length": 0, - "no_copy": 0, - "options": "Price List", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_4", - "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, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fieldname": "default_customer_group", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Customer Group", - "length": 0, - "no_copy": 0, - "options": "Customer Group", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "quotation_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": "Quotation Series", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval:doc.enable_checkout", - "columns": 0, - "depends_on": "enabled", - "fieldname": "section_break_8", - "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": "Checkout Settings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "collapsible_depends_on": "", - "columns": 0, - "depends_on": "", - "fieldname": "enable_checkout", - "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": "Enable Checkout", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Orders", - "description": "After payment completion redirect user to selected page.", - "fieldname": "payment_success_url", - "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": "Payment Success Url", - "length": 0, - "no_copy": 0, - "options": "\nOrders\nInvoices\nMy Account", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_11", - "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, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "payment_gateway_account", - "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": "Payment Gateway Account", - "length": 0, - "no_copy": 0, - "options": "Payment Gateway Account", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-shopping-cart", - "idx": 1, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 1, - "istable": 0, - "max_attachments": 0, - "modified": "2019-10-14 13:54:24.575322", - "modified_by": "Administrator", - "module": "Shopping Cart", - "name": "Shopping Cart Settings", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "Website Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_order": "ASC", - "track_changes": 0, - "track_seen": 0, - "track_views": 0 - } \ No newline at end of file + "actions": [], + "creation": "2013-06-19 15:57:32", + "description": "Default settings for Shopping Cart", + "doctype": "DocType", + "document_type": "System", + "engine": "InnoDB", + "field_order": [ + "enabled", + "display_settings", + "show_attachments", + "show_price", + "show_stock_availability", + "enable_variants", + "column_break_7", + "show_contact_us_button", + "show_quantity_in_website", + "show_apply_coupon_code_in_website", + "allow_items_not_in_stock", + "section_break_2", + "company", + "price_list", + "column_break_4", + "default_customer_group", + "quotation_series", + "section_break_8", + "enable_checkout", + "payment_success_url", + "column_break_11", + "payment_gateway_account" + ], + "fields": [ + { + "default": "0", + "fieldname": "enabled", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Enable Shopping Cart" + }, + { + "fieldname": "display_settings", + "fieldtype": "Section Break", + "label": "Display Settings" + }, + { + "default": "0", + "fieldname": "show_attachments", + "fieldtype": "Check", + "label": "Show Public Attachments" + }, + { + "default": "0", + "fieldname": "show_price", + "fieldtype": "Check", + "label": "Show Price" + }, + { + "default": "0", + "fieldname": "show_stock_availability", + "fieldtype": "Check", + "label": "Show Stock Availability" + }, + { + "default": "0", + "fieldname": "show_contact_us_button", + "fieldtype": "Check", + "label": "Show Contact Us Button" + }, + { + "default": "0", + "depends_on": "show_stock_availability", + "fieldname": "show_quantity_in_website", + "fieldtype": "Check", + "label": "Show Stock Quantity" + }, + { + "default": "0", + "fieldname": "show_apply_coupon_code_in_website", + "fieldtype": "Check", + "label": "Show Apply Coupon Code" + }, + { + "default": "0", + "fieldname": "allow_items_not_in_stock", + "fieldtype": "Check", + "label": "Allow items not in stock to be added to cart" + }, + { + "depends_on": "enabled", + "fieldname": "section_break_2", + "fieldtype": "Section Break" + }, + { + "fieldname": "company", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Company", + "mandatory_depends_on": "eval: doc.enabled === 1", + "options": "Company", + "remember_last_selected_value": 1 + }, + { + "description": "Prices will not be shown if Price List is not set", + "fieldname": "price_list", + "fieldtype": "Link", + "label": "Price List", + "mandatory_depends_on": "eval: doc.enabled === 1", + "options": "Price List" + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "default_customer_group", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Customer Group", + "mandatory_depends_on": "eval: doc.enabled === 1", + "options": "Customer Group" + }, + { + "fieldname": "quotation_series", + "fieldtype": "Select", + "label": "Quotation Series", + "mandatory_depends_on": "eval: doc.enabled === 1" + }, + { + "collapsible": 1, + "collapsible_depends_on": "eval:doc.enable_checkout", + "depends_on": "enabled", + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "label": "Checkout Settings" + }, + { + "default": "0", + "fieldname": "enable_checkout", + "fieldtype": "Check", + "label": "Enable Checkout" + }, + { + "default": "Orders", + "description": "After payment completion redirect user to selected page.", + "fieldname": "payment_success_url", + "fieldtype": "Select", + "label": "Payment Success Url", + "options": "\nOrders\nInvoices\nMy Account" + }, + { + "fieldname": "column_break_11", + "fieldtype": "Column Break" + }, + { + "fieldname": "payment_gateway_account", + "fieldtype": "Link", + "label": "Payment Gateway Account", + "options": "Payment Gateway Account" + }, + { + "fieldname": "column_break_7", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "enable_variants", + "fieldtype": "Check", + "label": "Enable Variants" + } + ], + "icon": "fa fa-shopping-cart", + "idx": 1, + "issingle": 1, + "links": [], + "modified": "2020-08-02 18:21:43.873303", + "modified_by": "Administrator", + "module": "Shopping Cart", + "name": "Shopping Cart Settings", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "email": 1, + "print": 1, + "read": 1, + "role": "Website Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "ASC" +} \ No newline at end of file diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py index 3098190383..c069b90e98 100644 --- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py @@ -80,6 +80,7 @@ def get_shopping_cart_settings(): return frappe.local.shopping_cart_settings +@frappe.whitelist(allow_guest=True) def is_cart_enabled(): return get_shopping_cart_settings().enabled diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index 90ecd46259..5545f13e8c 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -50,11 +50,12 @@ def get_leaderboards(): return leaderboards @frappe.whitelist() -def get_all_customers(from_date, company, field, limit = None): +def get_all_customers(date_range, company, field, limit = None): if field == "outstanding_amount": filters = [['docstatus', '=', '1'], ['company', '=', company]] - if from_date: - filters.append(['posting_date', '>=', from_date]) + if date_range: + date_range = frappe.parse_json(date_range) + filters.append(['posting_date', '>=', 'between', [date_range[0], date_range[1]]]) return frappe.db.get_all('Sales Invoice', fields = ['customer as name', 'sum(outstanding_amount) as value'], filters = filters, @@ -68,18 +69,20 @@ def get_all_customers(from_date, company, field, limit = None): elif field == "total_qty_sold": select_field = "sum(so_item.stock_qty)" + date_condition = get_date_condition(date_range, 'so.transaction_date') + return frappe.db.sql(""" select so.customer as name, {0} as value FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item ON so.name = so_item.parent - where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s + where so.docstatus = 1 {1} and so.company = %s group by so.customer order by value DESC limit %s - """.format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec + """.format(select_field, date_condition), (company, cint(limit)), as_dict=1) @frappe.whitelist() -def get_all_items(from_date, company, field, limit = None): +def get_all_items(date_range, company, field, limit = None): if field in ("available_stock_qty", "available_stock_value"): select_field = "sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)" return frappe.db.get_all('Bin', @@ -102,23 +105,25 @@ def get_all_items(from_date, company, field, limit = None): select_field = "sum(order_item.stock_qty)" select_doctype = "Purchase Order" + date_condition = get_date_condition(date_range, 'sales_order.transaction_date') + return frappe.db.sql(""" select order_item.item_code as name, {0} as value from `tab{1}` sales_order join `tab{1} Item` as order_item on sales_order.name = order_item.parent where sales_order.docstatus = 1 - and sales_order.company = %s and sales_order.transaction_date >= %s + and sales_order.company = %s {2} group by order_item.item_code order by value desc limit %s - """.format(select_field, select_doctype), (company, from_date, cint(limit)), as_dict=1) #nosec + """.format(select_field, select_doctype, date_condition), (company, cint(limit)), as_dict=1) #nosec @frappe.whitelist() -def get_all_suppliers(from_date, company, field, limit = None): +def get_all_suppliers(date_range, company, field, limit = None): if field == "outstanding_amount": filters = [['docstatus', '=', '1'], ['company', '=', company]] - if from_date: - filters.append(['posting_date', '>=', from_date]) + if date_range: + filters.append(['posting_date', 'between' [date_range[0], date_range[1]]]) return frappe.db.get_all('Purchase Invoice', fields = ['supplier as name', 'sum(outstanding_amount) as value'], filters = filters, @@ -132,18 +137,22 @@ def get_all_suppliers(from_date, company, field, limit = None): elif field == "total_qty_purchased": select_field = "sum(purchase_order_item.stock_qty)" + date_condition = get_date_condition(date_range, 'purchase_order.modified') + return frappe.db.sql(""" select purchase_order.supplier as name, {0} as value FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item` as purchase_order_item ON purchase_order.name = purchase_order_item.parent - where purchase_order.docstatus = 1 and purchase_order.modified >= %s + where + purchase_order.docstatus = 1 + {1} and purchase_order.company = %s group by purchase_order.supplier order by value DESC - limit %s""".format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec + limit %s""".format(select_field, date_condition), (company, cint(limit)), as_dict=1) #nosec @frappe.whitelist() -def get_all_sales_partner(from_date, company, field, limit = None): +def get_all_sales_partner(date_range, company, field, limit = None): if field == "total_sales_amount": select_field = "sum(`base_net_total`)" elif field == "total_commission": @@ -154,8 +163,9 @@ def get_all_sales_partner(from_date, company, field, limit = None): 'docstatus': 1, 'company': company } - if from_date: - filters['transaction_date'] = ['>=', from_date] + if date_range: + date_range = frappe.parse_json(date_range) + filters['transaction_date'] = ['between', [date_range[0], date_range[1]]] return frappe.get_list('Sales Order', fields=[ '`sales_partner` as name', @@ -163,15 +173,27 @@ def get_all_sales_partner(from_date, company, field, limit = None): ], filters=filters, group_by='sales_partner', order_by='value DESC', limit=limit) @frappe.whitelist() -def get_all_sales_person(from_date, company, field = None, limit = 0): +def get_all_sales_person(date_range, company, field = None, limit = 0): + date_condition = get_date_condition(date_range, 'sales_order.transaction_date') + return frappe.db.sql(""" select sales_team.sales_person as name, sum(sales_order.base_net_total) as value from `tabSales Order` as sales_order join `tabSales Team` as sales_team on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order' where sales_order.docstatus = 1 - and sales_order.transaction_date >= %s and sales_order.company = %s + {date_condition} group by sales_team.sales_person order by value DESC limit %s - """, (from_date, company, cint(limit)), as_dict=1) + """.format(date_condition=date_condition), (company, cint(limit)), as_dict=1) + +def get_date_condition(date_range, field): + date_condition = '' + if date_range: + date_range = frappe.parse_json(date_range) + from_date, to_date = date_range + date_condition = "and {0} between {1} and {2}".format( + field, frappe.db.escape(from_date), frappe.db.escape(to_date) + ) + return date_condition \ No newline at end of file diff --git a/erpnext/stock/dashboard_chart/delivery_trends/delivery_trends.json b/erpnext/stock/dashboard_chart/delivery_trends/delivery_trends.json new file mode 100644 index 0000000000..b3f6e35012 --- /dev/null +++ b/erpnext/stock/dashboard_chart/delivery_trends/delivery_trends.json @@ -0,0 +1,27 @@ +{ + "based_on": "posting_date", + "chart_name": "Delivery Trends", + "chart_type": "Sum", + "color": "#4d4da8", + "creation": "2020-07-20 21:01:04.255291", + "docstatus": 0, + "doctype": "Dashboard Chart", + "document_type": "Delivery Note", + "filters_json": "[[\"Delivery Note\",\"docstatus\",\"=\",1]]", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "modified": "2020-07-22 13:03:24.937045", + "modified_by": "Administrator", + "module": "Stock", + "name": "Delivery Trends", + "number_of_groups": 0, + "owner": "Administrator", + "time_interval": "Monthly", + "timeseries": 1, + "timespan": "Last Year", + "type": "Bar", + "use_report_chart": 0, + "value_based_on": "base_net_total", + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/stock/dashboard_chart/item_shortage_summary/item_shortage_summary.json b/erpnext/stock/dashboard_chart/item_shortage_summary/item_shortage_summary.json new file mode 100644 index 0000000000..ce711247e7 --- /dev/null +++ b/erpnext/stock/dashboard_chart/item_shortage_summary/item_shortage_summary.json @@ -0,0 +1,23 @@ +{ + "chart_name": "Item Shortage Summary", + "chart_type": "Report", + "creation": "2020-07-20 21:01:04.383451", + "docstatus": 0, + "doctype": "Dashboard Chart", + "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\"}", + "filters_json": "{}", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "modified": "2020-07-22 13:07:01.905334", + "modified_by": "Administrator", + "module": "Stock", + "name": "Item Shortage Summary", + "number_of_groups": 0, + "owner": "Administrator", + "report_name": "Item Shortage Report", + "timeseries": 0, + "type": "Bar", + "use_report_chart": 1, + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/stock/dashboard_chart/oldest_items/oldest_items.json b/erpnext/stock/dashboard_chart/oldest_items/oldest_items.json new file mode 100644 index 0000000000..9c10a5346b --- /dev/null +++ b/erpnext/stock/dashboard_chart/oldest_items/oldest_items.json @@ -0,0 +1,24 @@ +{ + "chart_name": "Oldest Items", + "chart_type": "Report", + "creation": "2020-07-20 21:01:04.336845", + "custom_options": "{\"colors\": [\"#5e64ff\"]}", + "docstatus": 0, + "doctype": "Dashboard Chart", + "dynamic_filters_json": "{\"company\":\"frappe.defaults.get_user_default(\\\"Company\\\")\",\"to_date\":\"frappe.datetime.nowdate()\"}", + "filters_json": "{\"range1\":30,\"range2\":60,\"range3\":90,\"show_warehouse_wise_stock\":0}", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "modified": "2020-07-29 14:50:26.846482", + "modified_by": "Administrator", + "module": "Stock", + "name": "Oldest Items", + "number_of_groups": 0, + "owner": "Administrator", + "report_name": "Stock Ageing", + "timeseries": 0, + "type": "Bar", + "use_report_chart": 1, + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/stock/dashboard_chart/purchase_receipt_trends/purchase_receipt_trends.json b/erpnext/stock/dashboard_chart/purchase_receipt_trends/purchase_receipt_trends.json new file mode 100644 index 0000000000..584a6cc867 --- /dev/null +++ b/erpnext/stock/dashboard_chart/purchase_receipt_trends/purchase_receipt_trends.json @@ -0,0 +1,27 @@ +{ + "based_on": "posting_date", + "chart_name": "Purchase Receipt Trends", + "chart_type": "Sum", + "color": "#78d6ff", + "creation": "2020-07-20 21:01:04.205230", + "docstatus": 0, + "doctype": "Dashboard Chart", + "document_type": "Purchase Receipt", + "filters_json": "[[\"Purchase Receipt\",\"docstatus\",\"=\",1]]", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "modified": "2020-07-22 13:05:25.923130", + "modified_by": "Administrator", + "module": "Stock", + "name": "Purchase Receipt Trends", + "number_of_groups": 0, + "owner": "Administrator", + "time_interval": "Monthly", + "timeseries": 1, + "timespan": "Last Year", + "type": "Bar", + "use_report_chart": 0, + "value_based_on": "base_net_total", + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/stock/dashboard_chart/warehouse_wise_stock_value/warehouse_wise_stock_value.json b/erpnext/stock/dashboard_chart/warehouse_wise_stock_value/warehouse_wise_stock_value.json new file mode 100644 index 0000000000..a07b55382c --- /dev/null +++ b/erpnext/stock/dashboard_chart/warehouse_wise_stock_value/warehouse_wise_stock_value.json @@ -0,0 +1,22 @@ +{ + "chart_name": "Warehouse wise Stock Value", + "chart_type": "Custom", + "creation": "2020-07-20 21:01:04.296157", + "docstatus": 0, + "doctype": "Dashboard Chart", + "filters_json": "{}", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "modified": "2020-07-22 13:01:01.815123", + "modified_by": "Administrator", + "module": "Stock", + "name": "Warehouse wise Stock Value", + "number_of_groups": 0, + "owner": "Administrator", + "source": "Warehouse wise Stock Value", + "timeseries": 0, + "type": "Bar", + "use_report_chart": 0, + "y_axis": [] +} \ No newline at end of file diff --git a/erpnext/stock/dashboard_fixtures.py b/erpnext/stock/dashboard_fixtures.py deleted file mode 100644 index 7625b1ad28..0000000000 --- a/erpnext/stock/dashboard_fixtures.py +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -import frappe -import json -from frappe import _ -from frappe.utils import nowdate -from erpnext.accounts.dashboard_fixtures import _get_fiscal_year -from erpnext.buying.dashboard_fixtures import get_company_for_dashboards - -def get_data(): - fiscal_year = _get_fiscal_year(nowdate()) - - if not fiscal_year: - return frappe._dict() - - company = frappe.get_doc("Company", get_company_for_dashboards()) - fiscal_year_name = fiscal_year.get("name") - start_date = str(fiscal_year.get("year_start_date")) - end_date = str(fiscal_year.get("year_end_date")) - - return frappe._dict({ - "dashboards": get_dashboards(), - "charts": get_charts(company, fiscal_year_name, start_date, end_date), - "number_cards": get_number_cards(company, fiscal_year_name, start_date, end_date), - }) - -def get_dashboards(): - return [{ - "name": "Stock", - "dashboard_name": "Stock", - "charts": [ - { "chart": "Warehouse wise Stock Value", "width": "Full"}, - { "chart": "Purchase Receipt Trends", "width": "Half"}, - { "chart": "Delivery Trends", "width": "Half"}, - { "chart": "Oldest Items", "width": "Half"}, - { "chart": "Item Shortage Summary", "width": "Half"} - ], - "cards": [ - { "card": "Total Active Items"}, - { "card": "Total Warehouses"}, - { "card": "Total Stock Value"} - ] - }] - -def get_charts(company, fiscal_year_name, start_date, end_date): - return [ - { - "doctype": "Dashboard Chart", - "name": "Purchase Receipt Trends", - "time_interval": "Monthly", - "chart_name": _("Purchase Receipt Trends"), - "timespan": "Last Year", - "color": "#7b933d", - "value_based_on": "base_net_total", - "filters_json": json.dumps([["Purchase Receipt", "docstatus", "=", 1]]), - "chart_type": "Sum", - "timeseries": 1, - "based_on": "posting_date", - "owner": "Administrator", - "document_type": "Purchase Receipt", - "type": "Bar", - "width": "Half", - "is_public": 1 - }, - { - "doctype": "Dashboard Chart", - "name": "Delivery Trends", - "time_interval": "Monthly", - "chart_name": _("Delivery Trends"), - "timespan": "Last Year", - "color": "#7b933d", - "value_based_on": "base_net_total", - "filters_json": json.dumps([["Delivery Note", "docstatus", "=", 1]]), - "chart_type": "Sum", - "timeseries": 1, - "based_on": "posting_date", - "owner": "Administrator", - "document_type": "Delivery Note", - "type": "Bar", - "width": "Half", - "is_public": 1 - }, - { - "name": "Warehouse wise Stock Value", - "chart_name": _("Warehouse wise Stock Value"), - "chart_type": "Custom", - "doctype": "Dashboard Chart", - "filters_json": json.dumps({}), - "is_custom": 0, - "is_public": 1, - "owner": "Administrator", - "source": "Warehouse wise Stock Value", - "type": "Bar" - }, - { - "name": "Oldest Items", - "chart_name": _("Oldest Items"), - "chart_type": "Report", - "custom_options": json.dumps({ - "colors": ["#5e64ff"] - }), - "doctype": "Dashboard Chart", - "filters_json": json.dumps({ - "company": company.name, - "to_date": nowdate(), - "show_warehouse_wise_stock": 0 - }), - "is_custom": 1, - "is_public": 1, - "owner": "Administrator", - "report_name": "Stock Ageing", - "type": "Bar" - }, - { - "name": "Item Shortage Summary", - "chart_name": _("Item Shortage Summary"), - "chart_type": "Report", - "doctype": "Dashboard Chart", - "filters_json": json.dumps({ - "company": company.name - }), - "is_custom": 1, - "is_public": 1, - "owner": "Administrator", - "report_name": "Item Shortage Report", - "type": "Bar" - } - ] - -def get_number_cards(company, fiscal_year_name, start_date, end_date): - return [ - { - "name": "Total Active Items", - "label": _("Total Active Items"), - "function": "Count", - "doctype": "Number Card", - "document_type": "Item", - "filters_json": json.dumps([["Item", "disabled", "=", 0]]), - "is_public": 1, - "owner": "Administrator", - "show_percentage_stats": 1, - "stats_time_interval": "Monthly" - }, - { - "name": "Total Warehouses", - "label": _("Total Warehouses"), - "function": "Count", - "doctype": "Number Card", - "document_type": "Warehouse", - "filters_json": json.dumps([["Warehouse", "disabled", "=", 0]]), - "is_public": 1, - "owner": "Administrator", - "show_percentage_stats": 1, - "stats_time_interval": "Monthly" - }, - { - "name": "Total Stock Value", - "label": _("Total Stock Value"), - "function": "Sum", - "aggregate_function_based_on": "stock_value", - "doctype": "Number Card", - "document_type": "Bin", - "filters_json": json.dumps([]), - "is_public": 1, - "owner": "Administrator", - "show_percentage_stats": 1, - "stats_time_interval": "Daily" - } - ] \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 84d2057f96..66efcf8cd8 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -801,6 +801,7 @@ "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", + "length": 240, "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -851,6 +852,7 @@ "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", + "length": 240, "oldfieldname": "in_words_export", "oldfieldtype": "Data", "print_hide": 1, @@ -1253,7 +1255,7 @@ "idx": 146, "is_submittable": 1, "links": [], - "modified": "2020-05-19 17:03:45.880106", + "modified": "2020-07-18 05:13:55.580420", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 735f35f36f..38e5fe53a7 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -117,7 +117,7 @@ frappe.ui.form.on("Item", { const stock_exists = (frm.doc.__onload && frm.doc.__onload.stock_exists) ? 1 : 0; - ['is_stock_item', 'has_serial_no', 'has_batch_no'].forEach((fieldname) => { + ['is_stock_item', 'has_serial_no', 'has_batch_no', 'has_variants'].forEach((fieldname) => { frm.set_df_property(fieldname, 'read_only', stock_exists); }); diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 963c87a0af..45526a3910 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -473,6 +473,7 @@ }, { "default": "0", + "depends_on": "has_batch_no", "fieldname": "retain_sample", "fieldtype": "Check", "label": "Retain Sample" @@ -499,7 +500,7 @@ "oldfieldtype": "Select" }, { - "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset", + "depends_on": "has_serial_no", "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", "fieldname": "serial_no_series", "fieldtype": "Data", @@ -1061,7 +1062,7 @@ "image_field": "image", "links": [], "max_attachments": 1, - "modified": "2020-06-30 12:01:07.534447", + "modified": "2020-07-31 21:21:10.956453", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index a75ee67ec4..d7b43bf399 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -13,7 +13,7 @@ from erpnext.controllers.item_variant import (ItemVariantExistsError, from erpnext.setup.doctype.item_group.item_group import (get_parent_item_groups, invalidate_cache_for) from frappe import _, msgprint from frappe.utils import (cint, cstr, flt, formatdate, get_timestamp, getdate, - now_datetime, random_string, strip) + now_datetime, random_string, strip, get_link_to_form, nowtime) from frappe.utils.html_utils import clean_html from frappe.website.doctype.website_slideshow.website_slideshow import \ get_slideshow @@ -194,7 +194,7 @@ class Item(WebsiteGenerator): if default_warehouse: stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse, qty=self.opening_stock, - rate=self.valuation_rate, company=default.company) + rate=self.valuation_rate, company=default.company, posting_date=getdate(), posting_time=nowtime()) stock_entry.add_comment("Comment", _("Opening Stock")) @@ -634,6 +634,9 @@ class Item(WebsiteGenerator): + ": \n" + ", ".join([self.meta.get_label(fld) for fld in field_list])) def after_rename(self, old_name, new_name, merge): + if merge: + self.validate_duplicate_item_in_stock_reconciliation(old_name, new_name) + if self.route: invalidate_cache_for_item(self) clear_cache(self.route) @@ -656,6 +659,27 @@ class Item(WebsiteGenerator): frappe.db.set_value(dt, d.name, "item_wise_tax_detail", json.dumps(item_wise_tax_detail), update_modified=False) + def validate_duplicate_item_in_stock_reconciliation(self, old_name, new_name): + records = frappe.db.sql(""" SELECT parent, COUNT(*) as records + FROM `tabStock Reconciliation Item` + WHERE item_code = %s and docstatus = 1 + GROUP By item_code, warehouse, parent + HAVING records > 1 + """, new_name, as_dict=1) + + if not records: return + document = _("Stock Reconciliation") if len(records) == 1 else _("Stock Reconciliations") + + msg = _("The items {0} and {1} are present in the following {2} :" + .format(frappe.bold(old_name), frappe.bold(new_name), document)) + + msg += ', '.join([get_link_to_form("Stock Reconciliation", d.parent) for d in records]) + "
" + + msg += _("Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" + .format(frappe.bold(old_name))) + + frappe.throw(_(msg), title=_("Merge not allowed")) + def set_last_purchase_rate(self, new_name): last_purchase_rate = get_last_purchase_details(new_name).get("base_net_rate", 0) frappe.db.set_value("Item", new_name, "last_purchase_rate", last_purchase_rate) diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.py b/erpnext/stock/doctype/item_alternative/item_alternative.py index 522dfc67a9..190cb62e99 100644 --- a/erpnext/stock/doctype/item_alternative/item_alternative.py +++ b/erpnext/stock/doctype/item_alternative/item_alternative.py @@ -43,6 +43,7 @@ class ItemAlternative(Document): frappe.throw(_("Already record exists for the item {0}").format(self.item_code)) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_alternative_items(doctype, txt, searchfield, start, page_len, filters): return frappe.db.sql(""" (select alternative_item_code from `tabItem Alternative` where item_code = %(item_code)s and alternative_item_code like %(txt)s) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 60f5ff3629..3c4e35349e 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -49,17 +49,21 @@ frappe.ui.form.on('Material Request', { // set schedule_date set_schedule_date(frm); - let filters = {'company': frm.doc.company} - - frm.set_query("warehouse", "items", function() { + frm.set_query("warehouse", "items", function(doc) { return { - filters: filters + filters: {'company': doc.company} }; }); - frm.set_query("set_warehouse", function(){ + frm.set_query("set_warehouse", function(doc){ return { - filters: filters + filters: {'company': doc.company} + }; + }); + + frm.set_query("set_from_warehouse", function(doc){ + return { + filters: {'company': doc.company} }; }); }, diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 25f1ed9505..335175f21d 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -370,6 +370,7 @@ def get_items_based_on_default_supplier(supplier): return supplier_items @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, page_len, filters): conditions = "" if txt: @@ -403,6 +404,7 @@ def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, pa return material_requests @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_default_supplier_query(doctype, txt, searchfield, start, page_len, filters): doc = frappe.get_doc("Material Request", filters.get("doc")) item_list = [] diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py index 4f831d7a85..a7a29cca7f 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.py +++ b/erpnext/stock/doctype/packing_slip/packing_slip.py @@ -176,6 +176,7 @@ class PackingSlip(Document): self.update_item_details() @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def item_details(doctype, txt, searchfield, start, page_len, filters): from erpnext.controllers.queries import get_match_cond return frappe.db.sql("""select name, item_name, description from `tabItem` diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js index 3a5ef76980..ee218f2f68 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.js +++ b/erpnext/stock/doctype/pick_list/pick_list.js @@ -3,6 +3,9 @@ frappe.ui.form.on('Pick List', { setup: (frm) => { + frm.set_indicator_formatter('item_code', + function(doc) { return (doc.stock_qty === 0) ? "red" : "green"; }); + frm.custom_make_buttons = { 'Delivery Note': 'Delivery Note', 'Stock Entry': 'Stock Entry', diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py index 4b8b594ed9..0da57b734b 100644 --- a/erpnext/stock/doctype/pick_list/pick_list.py +++ b/erpnext/stock/doctype/pick_list/pick_list.py @@ -26,11 +26,12 @@ class PickList(Document): continue if not item.serial_no: frappe.throw(_("Row #{0}: {1} does not have any available serial numbers in {2}".format( - frappe.bold(item.idx), frappe.bold(item.item_code), frappe.bold(item.warehouse)))) + frappe.bold(item.idx), frappe.bold(item.item_code), frappe.bold(item.warehouse))), + title=_("Serial Nos Required")) if len(item.serial_no.split('\n')) == item.picked_qty: continue frappe.throw(_('For item {0} at row {1}, count of serial numbers does not match with the picked quantity') - .format(frappe.bold(item.item_code), frappe.bold(item.idx))) + .format(frappe.bold(item.item_code), frappe.bold(item.idx)), title=_("Quantity Mismatch")) def set_item_locations(self, save=False): items = self.aggregate_item_qty() @@ -40,6 +41,9 @@ class PickList(Document): if self.parent_warehouse: from_warehouses = frappe.db.get_descendants('Warehouse', self.parent_warehouse) + # Create replica before resetting, to handle empty table on update after submit. + locations_replica = self.get('locations') + # reset self.delete_key('locations') for item_doc in items: @@ -48,7 +52,7 @@ class PickList(Document): self.item_location_map.setdefault(item_code, get_available_item_locations(item_code, from_warehouses, self.item_count_map.get(item_code), self.company)) - locations = get_items_with_location_and_quantity(item_doc, self.item_location_map) + locations = get_items_with_location_and_quantity(item_doc, self.item_location_map, self.docstatus) item_doc.idx = None item_doc.name = None @@ -62,6 +66,16 @@ class PickList(Document): location.update(row) self.append('locations', location) + # If table is empty on update after submit, set stock_qty, picked_qty to 0 so that indicator is red + # and give feedback to the user. This is to avoid empty Pick Lists. + if not self.get('locations') and self.docstatus == 1: + for location in locations_replica: + location.stock_qty = 0 + location.picked_qty = 0 + self.append('locations', location) + frappe.msgprint(_("Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."), + title=_("Out of Stock"), indicator="red") + if save: self.save() @@ -97,11 +111,13 @@ def validate_item_locations(pick_list): if not pick_list.locations: frappe.throw(_("Add items in the Item Locations table")) -def get_items_with_location_and_quantity(item_doc, item_location_map): +def get_items_with_location_and_quantity(item_doc, item_location_map, docstatus): available_locations = item_location_map.get(item_doc.item_code) locations = [] - remaining_stock_qty = item_doc.stock_qty + # if stock qty is zero on submitted entry, show positive remaining qty to recalculate in case of restock. + remaining_stock_qty = item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty + while remaining_stock_qty > 0 and available_locations: item_location = available_locations.pop(0) item_location = frappe._dict(item_location) @@ -119,13 +135,11 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): if item_location.serial_no: serial_nos = '\n'.join(item_location.serial_no[0: cint(stock_qty)]) - auto_set_serial_no = frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo") - locations.append(frappe._dict({ 'qty': qty, 'stock_qty': stock_qty, 'warehouse': item_location.warehouse, - 'serial_no': serial_nos if auto_set_serial_no else item_doc.serial_no, + 'serial_no': serial_nos, 'batch_no': item_location.batch_no })) @@ -137,7 +151,7 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): item_location.qty = qty_diff if item_location.serial_no: # set remaining serial numbers - item_location.serial_no = item_location.serial_no[-qty_diff:] + item_location.serial_no = item_location.serial_no[-int(qty_diff):] available_locations = [item_location] + available_locations # update available locations for the item @@ -146,9 +160,14 @@ def get_items_with_location_and_quantity(item_doc, item_location_map): def get_available_item_locations(item_code, from_warehouses, required_qty, company, ignore_validation=False): locations = [] - if frappe.get_cached_value('Item', item_code, 'has_serial_no'): + has_serial_no = frappe.get_cached_value('Item', item_code, 'has_serial_no') + has_batch_no = frappe.get_cached_value('Item', item_code, 'has_batch_no') + + if has_batch_no and has_serial_no: + locations = get_available_item_locations_for_serial_and_batched_item(item_code, from_warehouses, required_qty, company) + elif has_serial_no: locations = get_available_item_locations_for_serialized_item(item_code, from_warehouses, required_qty, company) - elif frappe.get_cached_value('Item', item_code, 'has_batch_no'): + elif has_batch_no: locations = get_available_item_locations_for_batched_item(item_code, from_warehouses, required_qty, company) else: locations = get_available_item_locations_for_other_item(item_code, from_warehouses, required_qty, company) @@ -158,8 +177,9 @@ def get_available_item_locations(item_code, from_warehouses, required_qty, compa remaining_qty = required_qty - total_qty_available if remaining_qty > 0 and not ignore_validation: - frappe.msgprint(_('{0} units of {1} is not available.') - .format(remaining_qty, frappe.get_desk_link('Item', item_code))) + frappe.msgprint(_('{0} units of Item {1} is not available.') + .format(remaining_qty, frappe.get_desk_link('Item', item_code)), + title=_("Insufficient Stock")) return locations @@ -226,6 +246,34 @@ def get_available_item_locations_for_batched_item(item_code, from_warehouses, re return batch_locations +def get_available_item_locations_for_serial_and_batched_item(item_code, from_warehouses, required_qty, company): + # Get batch nos by FIFO + locations = get_available_item_locations_for_batched_item(item_code, from_warehouses, required_qty, company) + + filters = frappe._dict({ + 'item_code': item_code, + 'company': company, + 'warehouse': ['!=', ''], + 'batch_no': '' + }) + + # Get Serial Nos by FIFO for Batch No + for location in locations: + filters.batch_no = location.batch_no + filters.warehouse = location.warehouse + location.qty = required_qty if location.qty > required_qty else location.qty # if extra qty in batch + + serial_nos = frappe.get_list('Serial No', + fields=['name'], + filters=filters, + limit=location.qty, + order_by='purchase_date') + + serial_nos = [sn.name for sn in serial_nos] + location.serial_no = serial_nos + + return locations + def get_available_item_locations_for_other_item(item_code, from_warehouses, required_qty, company): # gets all items available in different warehouses warehouses = [x.get('name') for x in frappe.get_list("Warehouse", {'company': company}, "name")] diff --git a/erpnext/stock/doctype/pick_list/test_pick_list.py b/erpnext/stock/doctype/pick_list/test_pick_list.py index 1b9ff41cc3..8ea7f89dc4 100644 --- a/erpnext/stock/doctype/pick_list/test_pick_list.py +++ b/erpnext/stock/doctype/pick_list/test_pick_list.py @@ -7,6 +7,8 @@ import frappe import unittest test_dependencies = ['Item', 'Sales Invoice', 'Stock Entry', 'Batch'] +from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt +from erpnext.stock.doctype.item.test_item import create_item from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation \ import EmptyStockReconciliationItemsError @@ -49,7 +51,7 @@ class TestPickList(unittest.TestCase): self.assertEqual(pick_list.locations[0].warehouse, '_Test Warehouse - _TC') self.assertEqual(pick_list.locations[0].qty, 5) - def test_pick_list_splits_row_according_to_warhouse_availability(self): + def test_pick_list_splits_row_according_to_warehouse_availability(self): try: frappe.get_doc({ 'doctype': 'Stock Reconciliation', @@ -122,7 +124,10 @@ class TestPickList(unittest.TestCase): }] }) - stock_reconciliation.submit() + try: + stock_reconciliation.submit() + except EmptyStockReconciliationItemsError: + pass pick_list = frappe.get_doc({ 'doctype': 'Pick List', @@ -145,6 +150,85 @@ class TestPickList(unittest.TestCase): self.assertEqual(pick_list.locations[0].qty, 5) self.assertEqual(pick_list.locations[0].serial_no, '123450\n123451\n123452\n123453\n123454') + def test_pick_list_shows_batch_no_for_batched_item(self): + # check if oldest batch no is picked + item = frappe.db.exists("Item", {'item_name': 'Batched Item'}) + if not item: + item = create_item("Batched Item") + item.has_batch_no = 1 + item.create_new_batch = 1 + item.batch_number_series = "B-BATCH-.##" + item.save() + else: + item = frappe.get_doc("Item", {'item_name': 'Batched Item'}) + + pr1 = make_purchase_receipt(item_code="Batched Item", qty=1, rate=100.0) + + pr1.load_from_db() + oldest_batch_no = pr1.items[0].batch_no + + pr2 = make_purchase_receipt(item_code="Batched Item", qty=2, rate=100.0) + + pick_list = frappe.get_doc({ + 'doctype': 'Pick List', + 'company': '_Test Company', + 'purpose': 'Material Transfer', + 'locations': [{ + 'item_code': 'Batched Item', + 'qty': 1, + 'stock_qty': 1, + 'conversion_factor': 1, + }] + }) + pick_list.set_item_locations() + + self.assertEqual(pick_list.locations[0].batch_no, oldest_batch_no) + + pr1.cancel() + pr2.cancel() + + + def test_pick_list_for_batched_and_serialised_item(self): + # check if oldest batch no and serial nos are picked + item = frappe.db.exists("Item", {'item_name': 'Batched and Serialised Item'}) + if not item: + item = create_item("Batched and Serialised Item") + item.has_batch_no = 1 + item.create_new_batch = 1 + item.has_serial_no = 1 + item.batch_number_series = "B-BATCH-.##" + item.serial_no_series = "S-.####" + item.save() + else: + item = frappe.get_doc("Item", {'item_name': 'Batched and Serialised Item'}) + + pr1 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0) + + pr1.load_from_db() + oldest_batch_no = pr1.items[0].batch_no + oldest_serial_nos = pr1.items[0].serial_no + + pr2 = make_purchase_receipt(item_code="Batched and Serialised Item", qty=2, rate=100.0) + + pick_list = frappe.get_doc({ + 'doctype': 'Pick List', + 'company': '_Test Company', + 'purpose': 'Material Transfer', + 'locations': [{ + 'item_code': 'Batched and Serialised Item', + 'qty': 2, + 'stock_qty': 2, + 'conversion_factor': 1, + }] + }) + pick_list.set_item_locations() + + self.assertEqual(pick_list.locations[0].batch_no, oldest_batch_no) + self.assertEqual(pick_list.locations[0].serial_no, oldest_serial_nos) + + pr1.cancel() + pr2.cancel() + def test_pick_list_for_items_from_multiple_sales_orders(self): try: frappe.get_doc({ diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json index 71fbf9a866..8665986004 100644 --- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json +++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -180,7 +180,7 @@ ], "istable": 1, "links": [], - "modified": "2020-03-13 19:08:21.995986", + "modified": "2020-06-24 17:18:57.357120", "modified_by": "Administrator", "module": "Stock", "name": "Pick List Item", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index df9eb50843..92e33ca64e 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -1,5 +1,7 @@ { + "actions": [], "allow_import": 1, + "allow_workflow": 1, "autoname": "naming_series:", "creation": "2013-05-21 16:16:39", "doctype": "DocType", @@ -768,6 +770,7 @@ "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", + "length": 240, "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -820,6 +823,7 @@ "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", + "length": 240, "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -1106,7 +1110,7 @@ "idx": 261, "is_submittable": 1, "links": [], - "modified": "2020-07-15 10:01:39.302238", + "modified": "2020-07-18 05:19:12.148115", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index 568e742876..c3bb514184 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -59,6 +59,7 @@ class QualityInspection(Document): (quality_inspection, self.modified, self.reference_name, self.item_code)) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def item_query(doctype, txt, searchfield, start, page_len, filters): if filters.get("from"): from frappe.desk.reportview import get_match_cond @@ -88,6 +89,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): {'parent': filters.get('parent'), 'txt': "%%%s%%" % txt}) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def quality_inspection_query(doctype, txt, searchfield, start, page_len, filters): return frappe.get_all('Quality Inspection', limit_start=start, diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 2be14c8006..3acf3a9316 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -1,6 +1,7 @@ { "actions": [], "allow_import": 1, + "allow_rename": 1, "autoname": "field:serial_no", "creation": "2013-05-16 10:59:15", "description": "Distinct unit of an Item", @@ -426,7 +427,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], - "modified": "2020-06-25 15:53:50.900855", + "modified": "2020-07-20 20:50:16.660433", "modified_by": "Administrator", "module": "Stock", "name": "Serial No", diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 90f0f5881d..f7ff916c5a 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe +import json from frappe.model.naming import make_autoname from frappe.utils import cint, cstr, flt, add_days, nowdate, getdate @@ -190,6 +191,23 @@ class SerialNo(StockController): if sle_exists: frappe.throw(_("Cannot delete Serial No {0}, as it is used in stock transactions").format(self.name)) + def before_rename(self, old, new, merge=False): + if merge: + frappe.throw(_("Sorry, Serial Nos cannot be merged")) + + def after_rename(self, old, new, merge=False): + """rename serial_no text fields""" + for dt in frappe.db.sql("""select parent from tabDocField + where fieldname='serial_no' and fieldtype in ('Text', 'Small Text', 'Long Text')"""): + + for item in frappe.db.sql("""select name, serial_no from `tab%s` + where serial_no like %s""" % (dt[0], frappe.db.escape('%' + old + '%'))): + + serial_nos = map(lambda i: new if i.upper()==old.upper() else i, item[1].split('\n')) + frappe.db.sql("""update `tab%s` set serial_no = %s + where name=%s""" % (dt[0], '%s', '%s'), + ('\n'.join(list(serial_nos)), item[0])) + def update_serial_no_reference(self, serial_no=None): last_sle = self.get_last_sle(serial_no) self.set_purchase_details(last_sle.get("purchase_sle")) @@ -520,15 +538,54 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note): return serial_nos @frappe.whitelist() -def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None): - import json +def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None, for_doctype=None): filters = { "item_code": item_code, "warehouse": warehouse, "delivery_document_no": "", "sales_invoice": "" } - if batch_nos: filters["batch_no"] = ["in", json.loads(batch_nos)] + + if batch_nos: + try: + filters["batch_no"] = ["in", json.loads(batch_nos)] + except: + filters["batch_no"] = ["in", [batch_nos]] + + if for_doctype == 'POS Invoice': + reserved_serial_nos, unreserved_serial_nos = get_pos_reserved_serial_nos(filters, qty) + return unreserved_serial_nos serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") return [item['name'] for item in serial_numbers] + +@frappe.whitelist() +def get_pos_reserved_serial_nos(filters, qty=None): + batch_no_cond = "" + if filters.get("batch_no"): + batch_no_cond = "and item.batch_no = {}".format(frappe.db.escape(filters.get('batch_no'))) + + reserved_serial_nos_str = [d.serial_no for d in frappe.db.sql("""select item.serial_no as serial_no + from `tabPOS Invoice` p, `tabPOS Invoice Item` item + where p.name = item.parent + and p.consolidated_invoice is NULL + and p.docstatus = 1 + and item.docstatus = 1 + and item.item_code = %s + and item.warehouse = %s + {} + """.format(batch_no_cond), [filters.get('item_code'), filters.get('warehouse')], as_dict=1)] + + reserved_serial_nos = [] + for s in reserved_serial_nos_str: + if not s: continue + + serial_nos = s.split("\n") + serial_nos = ' '.join(serial_nos).split() # remove whitespaces + if len(serial_nos): reserved_serial_nos += serial_nos + + filters["name"] = ["not in", reserved_serial_nos] + serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") + unreserved_serial_nos = [item['name'] for item in serial_numbers] + + return reserved_serial_nos, unreserved_serial_nos \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 0fbc63101e..8e25804511 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -413,7 +413,7 @@ class TestStockEntry(unittest.TestCase): def test_serial_item_error(self): se, serial_nos = self.test_serial_by_series() if not frappe.db.exists('Serial No', 'ABCD'): - make_serialized_item("_Test Serialized Item", "ABCD\nEFGH") + make_serialized_item(item_code="_Test Serialized Item", serial_no="ABCD\nEFGH") se = frappe.copy_doc(test_records[0]) se.purpose = "Material Transfer" @@ -823,15 +823,29 @@ class TestStockEntry(unittest.TestCase): ]) ) -def make_serialized_item(item_code=None, serial_no=None, target_warehouse=None): +def make_serialized_item(**args): + args = frappe._dict(args) se = frappe.copy_doc(test_records[0]) - se.get("items")[0].item_code = item_code or "_Test Serialized Item With Series" - se.get("items")[0].serial_no = serial_no + + if args.company: + se.company = args.company + + se.get("items")[0].item_code = args.item_code or "_Test Serialized Item With Series" + + if args.serial_no: + se.get("items")[0].serial_no = args.serial_no + + if args.cost_center: + se.get("items")[0].cost_center = args.cost_center + + if args.expense_account: + se.get("items")[0].expense_account = args.expense_account + se.get("items")[0].qty = 2 se.get("items")[0].transfer_qty = 2 - if target_warehouse: - se.get("items")[0].t_warehouse = target_warehouse + if args.target_warehouse: + se.get("items")[0].t_warehouse = args.target_warehouse se.set_stock_entry_type() se.insert() diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json index 5d534af157..1cc600b9ca 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.json +++ b/erpnext/stock/doctype/warehouse/warehouse.json @@ -10,12 +10,14 @@ "field_order": [ "warehouse_detail", "warehouse_name", + "column_break_3", + "warehouse_type", + "parent_warehouse", "is_group", - "company", - "disabled", "column_break_4", "account", - "warehouse_type", + "company", + "disabled", "address_and_contact", "address_html", "column_break_10", @@ -31,7 +33,6 @@ "state", "pin", "tree_details", - "parent_warehouse", "lft", "rgt", "old_parent" @@ -44,7 +45,6 @@ "oldfieldtype": "Section Break" }, { - "description": "If blank, parent Warehouse Account or company default will be considered", "fieldname": "warehouse_name", "fieldtype": "Data", "label": "Warehouse Name", @@ -85,12 +85,14 @@ "fieldtype": "Column Break" }, { + "description": "If blank, parent Warehouse Account or company default will be considered in transactions", "fieldname": "account", "fieldtype": "Link", "label": "Account", "options": "Account" }, { + "depends_on": "eval:!doc.__islocal", "fieldname": "address_and_contact", "fieldtype": "Section Break", "label": "Address and Contact" @@ -224,13 +226,17 @@ "fieldtype": "Link", "label": "Warehouse Type", "options": "Warehouse Type" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Section Break" } ], "icon": "fa fa-building", "idx": 1, "is_tree": 1, "links": [], - "modified": "2020-03-18 18:11:53.282358", + "modified": "2020-08-03 18:41:52.442502", "modified_by": "Administrator", "module": "Stock", "name": "Warehouse", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index b8554c83e2..1a7c15ebca 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -401,13 +401,30 @@ def get_item_warehouse(item, args, overwrite_warehouse, defaults={}): return warehouse def update_barcode_value(out): - from erpnext.accounts.doctype.sales_invoice.pos import get_barcode_data barcode_data = get_barcode_data([out]) # If item has one barcode then update the value of the barcode field if barcode_data and len(barcode_data.get(out.item_code)) == 1: out['barcode'] = barcode_data.get(out.item_code)[0] +def get_barcode_data(items_list): + # get itemwise batch no data + # exmaple: {'LED-GRE': [Batch001, Batch002]} + # where LED-GRE is item code, SN0001 is serial no and Pune is warehouse + + itemwise_barcode = {} + for item in items_list: + barcodes = frappe.db.sql(""" + select barcode from `tabItem Barcode` where parent = %s + """, item.item_code, as_dict=1) + + for barcode in barcodes: + if item.item_code not in itemwise_barcode: + itemwise_barcode.setdefault(item.item_code, []) + itemwise_barcode[item.item_code].append(barcode.get("barcode")) + + return itemwise_barcode + @frappe.whitelist() def get_item_tax_info(company, tax_category, item_codes): out = {} diff --git a/erpnext/stock/number_card/total_active_items/total_active_items.json b/erpnext/stock/number_card/total_active_items/total_active_items.json new file mode 100644 index 0000000000..f6863b96d7 --- /dev/null +++ b/erpnext/stock/number_card/total_active_items/total_active_items.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-20 21:01:04.422436", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Item", + "filters_json": "[[\"Item\",\"disabled\",\"=\",0]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Active Items", + "modified": "2020-07-22 13:08:30.430677", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Active Items", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/number_card/total_stock_value/total_stock_value.json b/erpnext/stock/number_card/total_stock_value/total_stock_value.json new file mode 100644 index 0000000000..8e480a6b3e --- /dev/null +++ b/erpnext/stock/number_card/total_stock_value/total_stock_value.json @@ -0,0 +1,21 @@ +{ + "aggregate_function_based_on": "stock_value", + "creation": "2020-07-20 21:01:04.495481", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Bin", + "filters_json": "[]", + "function": "Sum", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Stock Value", + "modified": "2020-07-22 13:08:48.412001", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Stock Value", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Daily", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/number_card/total_warehouses/total_warehouses.json b/erpnext/stock/number_card/total_warehouses/total_warehouses.json new file mode 100644 index 0000000000..ab0836a3af --- /dev/null +++ b/erpnext/stock/number_card/total_warehouses/total_warehouses.json @@ -0,0 +1,20 @@ +{ + "creation": "2020-07-20 21:01:04.457598", + "docstatus": 0, + "doctype": "Number Card", + "document_type": "Warehouse", + "filters_json": "[[\"Warehouse\",\"disabled\",\"=\",0]]", + "function": "Count", + "idx": 0, + "is_public": 1, + "is_standard": 1, + "label": "Total Warehouses", + "modified": "2020-07-22 13:08:40.258927", + "modified_by": "Administrator", + "module": "Stock", + "name": "Total Warehouses", + "owner": "Administrator", + "show_percentage_stats": 1, + "stats_time_interval": "Monthly", + "type": "Document Type" +} \ No newline at end of file diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.js b/erpnext/stock/report/stock_ageing/stock_ageing.js index ccde61a167..8495142ba5 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.js +++ b/erpnext/stock/report/stock_ageing/stock_ageing.js @@ -36,6 +36,27 @@ frappe.query_reports["Stock Ageing"] = { "fieldtype": "Link", "options": "Brand" }, + { + "fieldname":"range1", + "label": __("Ageing Range 1"), + "fieldtype": "Int", + "default": "30", + "reqd": 1 + }, + { + "fieldname":"range2", + "label": __("Ageing Range 2"), + "fieldtype": "Int", + "default": "60", + "reqd": 1 + }, + { + "fieldname":"range3", + "label": __("Ageing Range 3"), + "fieldtype": "Int", + "default": "90", + "reqd": 1 + }, { "fieldname":"show_warehouse_wise_stock", "label": __("Show Warehouse-wise Stock"), diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index d5878cb662..4af3c541a6 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -4,12 +4,11 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import date_diff, flt +from frappe.utils import date_diff, flt, cint from six import iteritems from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos def execute(filters=None): - columns = get_columns(filters) item_details = get_fifo_queue(filters) to_date = filters["to_date"] @@ -25,6 +24,7 @@ def execute(filters=None): average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) + range1, range2, range3, above_range3 = get_range_age(filters, fifo_queue, to_date) row = [details.name, details.item_name, details.description, details.item_group, details.brand] @@ -33,6 +33,7 @@ def execute(filters=None): row.append(details.warehouse) row.extend([item_dict.get("total_qty"), average_age, + range1, range2, range3, above_range3, earliest_age, latest_age, details.stock_uom]) data.append(row) @@ -55,7 +56,25 @@ def get_average_age(fifo_queue, to_date): return flt(age_qty / total_qty, 2) if total_qty else 0.0 +def get_range_age(filters, fifo_queue, to_date): + range1 = range2 = range3 = above_range3 = 0.0 + for item in fifo_queue: + age = date_diff(to_date, item[1]) + + if age <= filters.range1: + range1 += flt(item[0]) + elif age <= filters.range2: + range2 += flt(item[0]) + elif age <= filters.range3: + range3 += flt(item[0]) + else: + above_range3 += flt(item[0]) + + return range1, range2, range3, above_range3 + def get_columns(filters): + range_columns = [] + setup_ageing_columns(filters, range_columns) columns = [ { "label": _("Item Code"), @@ -112,7 +131,9 @@ def get_columns(filters): "fieldname": "average_age", "fieldtype": "Float", "width": 100 - }, + }]) + columns.extend(range_columns) + columns.extend([ { "label": _("Earliest"), "fieldname": "earliest", @@ -263,3 +284,18 @@ def get_chart_data(data, filters): }, "type" : "bar" } + +def setup_ageing_columns(filters, range_columns): + for i, label in enumerate(["0-{range1}".format(range1=filters["range1"]), + "{range1}-{range2}".format(range1=cint(filters["range1"])+ 1, range2=filters["range2"]), + "{range2}-{range3}".format(range2=cint(filters["range2"])+ 1, range3=filters["range3"]), + "{range3}-{above}".format(range3=cint(filters["range3"])+ 1, above=_("Above"))]): + add_column(range_columns, label="Age ("+ label +")", fieldname='range' + str(i+1)) + +def add_column(range_columns, label, fieldname, fieldtype='Float', width=140): + range_columns.append(dict( + label=label, + fieldname=fieldname, + fieldtype=fieldtype, + width=width + )) \ No newline at end of file diff --git a/erpnext/stock/stock_dashboard/stock/stock.json b/erpnext/stock/stock_dashboard/stock/stock.json new file mode 100644 index 0000000000..dee7fed6c2 --- /dev/null +++ b/erpnext/stock/stock_dashboard/stock/stock.json @@ -0,0 +1,47 @@ +{ + "cards": [ + { + "card": "Total Active Items" + }, + { + "card": "Total Warehouses" + }, + { + "card": "Total Stock Value" + } + ], + "charts": [ + { + "chart": "Warehouse wise Stock Value", + "width": "Full" + }, + { + "chart": "Purchase Receipt Trends", + "width": "Half" + }, + { + "chart": "Delivery Trends", + "width": "Half" + }, + { + "chart": "Oldest Items", + "width": "Half" + }, + { + "chart": "Item Shortage Summary", + "width": "Half" + } + ], + "creation": "2020-07-20 21:01:04.549136", + "dashboard_name": "Stock", + "docstatus": 0, + "doctype": "Dashboard", + "idx": 0, + "is_default": 1, + "is_standard": 1, + "modified": "2020-07-22 13:09:33.096694", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock", + "owner": "Administrator" +} \ No newline at end of file diff --git a/erpnext/templates/generators/item/item_configure.html b/erpnext/templates/generators/item/item_configure.html index 04f89eca9d..b8b0d98bdc 100644 --- a/erpnext/templates/generators/item/item_configure.html +++ b/erpnext/templates/generators/item/item_configure.html @@ -2,7 +2,7 @@ {% set cart_settings = shopping_cart.cart_settings %}
- {% if cart_settings.show_configure_button | int %}
+ {% if cart_settings.enable_variants | int %}
diff --git a/erpnext/utilities/doctype/video/__init__.py b/erpnext/utilities/doctype/video/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/erpnext/utilities/doctype/video/test_video.py b/erpnext/utilities/doctype/video/test_video.py
new file mode 100644
index 0000000000..33ea31c919
--- /dev/null
+++ b/erpnext/utilities/doctype/video/test_video.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestVideo(unittest.TestCase):
+ pass
diff --git a/erpnext/utilities/doctype/video/video.js b/erpnext/utilities/doctype/video/video.js
new file mode 100644
index 0000000000..056bd3ccd6
--- /dev/null
+++ b/erpnext/utilities/doctype/video/video.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Video', {
+ // refresh: function(frm) {
+
+ // }
+});
diff --git a/erpnext/utilities/doctype/video/video.json b/erpnext/utilities/doctype/video/video.json
new file mode 100644
index 0000000000..5d2cc13348
--- /dev/null
+++ b/erpnext/utilities/doctype/video/video.json
@@ -0,0 +1,106 @@
+{
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:title",
+ "creation": "2018-10-17 05:47:13.087395",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "title",
+ "provider",
+ "url",
+ "column_break_4",
+ "publish_date",
+ "duration",
+ "section_break_7",
+ "description"
+ ],
+ "fields": [
+ {
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Title",
+ "reqd": 1,
+ "unique": 1
+ },
+ {
+ "fieldname": "provider",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Provider",
+ "options": "YouTube\nVimeo",
+ "reqd": 1
+ },
+ {
+ "fieldname": "url",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "URL",
+ "reqd": 1
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "publish_date",
+ "fieldtype": "Date",
+ "label": "Publish Date"
+ },
+ {
+ "fieldname": "duration",
+ "fieldtype": "Data",
+ "label": "Duration"
+ },
+ {
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "in_list_view": 1,
+ "label": "Description",
+ "reqd": 1
+ }
+ ],
+ "links": [],
+ "modified": "2020-07-21 19:29:46.603734",
+ "modified_by": "Administrator",
+ "module": "Utilities",
+ "name": "Video",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "All",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/video/video.py b/erpnext/utilities/doctype/video/video.py
new file mode 100644
index 0000000000..3c17b560f3
--- /dev/null
+++ b/erpnext/utilities/doctype/video/video.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class Video(Document):
+ pass
diff --git a/yarn.lock b/yarn.lock
index c5509d6e1a..b19f566fd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1084,9 +1084,9 @@ lodash.set@^4.3.2:
integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.7.14:
- version "4.17.15"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
- integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+ version "4.17.19"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+ integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
lowercase-keys@^1.0.0:
version "1.0.1"