Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: disabled Procedure Template shown as enabled in List View

Browse Source
This commit is contained in:
Rucha Mahabal 2020-02-27 13:47:54 +05:30
parent 211d6e4fa9
commit 61203b8701
3 changed files with 213 additions and 813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js
View File

@ -31,17 +31,7 @@ frappe.ui.form.on('Clinical Procedure Template', {
if(!frm.doc.__islocal) {
cur_frm.add_custom_button(__('Change Item Code'), function() {
change_template_code(frm.doc);
} );
if(frm.doc.disabled == 1){
cur_frm.add_custom_button(__('Enable Template'), function() {
enable_template(frm.doc);
} );
}
else{
cur_frm.add_custom_button(__('Disable Template'), function() {
disable_template(frm.doc);
} );
}
});
}
}
});
@ -52,27 +42,6 @@ var mark_change_in_item = function(frm) {
}
};
var disable_template = function(doc){
frappe.call({
method: "erpnext.healthcare.doctype.clinical_procedure_template.clinical_procedure_template.disable_enable_template",
args: {status: 1, name: doc.name, item_code: doc.item_code, is_billable: doc.is_billable},
callback: function(){
cur_frm.reload_doc();
}
});
};
var enable_template = function(doc){
frappe.call({
method: "erpnext.healthcare.doctype.clinical_procedure_template.clinical_procedure_template.disable_enable_template",
args: {status: 0, name: doc.name, item_code: doc.item_code, is_billable: doc.is_billable},
callback: function(){
cur_frm.reload_doc();
}
});
};
var change_template_code = function(doc){
var d = new frappe.ui.Dialog({
title:__("Change Template Code"),

972
erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.json
View File

File diff suppressed because it is too large Load Diff

21
erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
View File

@ -10,6 +10,9 @@ from frappe.model.rename_doc import rename_doc
from frappe.utils import nowdate
class ClinicalProcedureTemplate(Document):
def validate(self):
self.enable_disable_item()
def on_update(self):
#Item and Price List update --> if (change_in_item)
if(self.change_in_item and self.is_billable == 1 and self.item):
@ -25,6 +28,13 @@ class ClinicalProcedureTemplate(Document):
def after_insert(self):
create_item_from_template(self)
def enable_disable_item(self):
if self.is_billable:
if self.disabled:
frappe.db.set_value('Item', self.item, 'disabled', 1)
else:
frappe.db.set_value('Item', self.item, 'disabled', 0)
#Call before delete the template
def on_trash(self):
if(self.item):
@ -65,7 +75,7 @@ def updating_rate(self):
def create_item_from_template(doc):
disabled = 1
if(doc.is_billable == 1):
disabled = 0
@ -121,12 +131,3 @@ def change_item_code_from_template(item_code, doc):
frappe.db.set_value("Clinical Procedure Template", doc.name, "item_code", item_code)
return
@frappe.whitelist()
def disable_enable_template(status, name, item_code):
frappe.db.set_value("Clinical Procedure Template", name, "disabled", status)
if (frappe.db.exists({ #set Item's disabled field to status
"doctype": "Item",
"item_code": item_code})):
frappe.db.set_value("Item", item_code, "disabled", status)
return