Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Healthcare Service Unit Type): move item creation from after_insert to validate #435

Merged
merged 1 commit into from
Apr 30, 2024
Merged

fix(Healthcare Service Unit Type): move item creation from after_insert to validate #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 58 additions & 1 deletion healthcare/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@
frappe.ui.form.on('Healthcare Service Unit Type', {
refresh: function(frm) {
frm.set_df_property('item_code', 'read_only', frm.doc.__islocal ? 0 : 1);
if (!frm.doc.__islocal && frm.doc.is_billable) {
if (!frm.doc.__islocal && frm.doc.is_billable && frm.doc.item) {
frm.add_custom_button(__('Change Item Code'), function() {
change_item_code(cur_frm, frm.doc);
});
}
if (!frm.doc.__islocal && frm.doc.is_billable && !frm.doc.item) {
frm.add_custom_button(__("Create/Link Item"), function() {
create_item(frm);
});
}
},

service_unit_type: function(frm) {
Expand Down Expand Up @@ -84,3 +89,55 @@ let change_item_code = function(frm, doc) {
'Item Code': frm.doc.item_code
});
};

let create_item = function(frm) {
let d = new frappe.ui.Dialog({
title: __("Create/Link Item"),
fields: [
{
"fieldtype": "Link",
"label": "Item",
"fieldname": "item",
"options": "Item",
"mandatory_depends_on": "eval:doc.link_existing_item==1",
"depends_on": "eval:doc.link_existing_item==1"
},
{
"fieldtype": "Data",
"label": "Item Code",
"fieldname": "item_code",
"default": frm.doc.item_code,
"mandatory_depends_on": "eval:doc.link_existing_item==0",
"read_only": 1,
"depends_on": "eval:doc.link_existing_item==0"
},
{
"fieldtype": "Check",
"label": "Link Existing Item",
"fieldname": "link_existing_item",
"default": 0
}
],
primary_action: function() {
if (d.get_value("link_existing_item") && d.get_value("item")) {
frm.set_value("item", d.get_value("item"));
frm.save();
} else if (!d.get_value("link_existing_item") && d.get_value("item_code")) {
frappe.call({
"method": "create_service_unit_item",
"doc": frm.doc,
callback: function() {
frm.reload_doc();
}
});
}
d.hide();
},
primary_action_label: __("Create/Link Code")
});

d.show();
d.set_values({
'Item Code': frm.doc.item_code
});
};
5 changes: 4 additions & 1 deletion healthcare/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"read_only": 1
},
{
"fetch_from": "item.item_name",
"fieldname": "item_code",
"fieldtype": "Data",
"hide_days": 1,
Expand Down Expand Up @@ -153,6 +154,7 @@
"no_copy": 1
},
{
"fetch_from": "item.description",
"fieldname": "description",
"fieldtype": "Small Text",
"hide_days": 1,
Expand All @@ -170,7 +172,7 @@
}
],
"links": [],
"modified": "2021-08-19 17:52:30.266667",
"modified": "2024-04-29 18:59:16.479821",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Healthcare Service Unit Type",
Expand All @@ -192,5 +194,6 @@
"restrict_to_domain": "Healthcare",
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"title_field": "service_unit_type"
}
11 changes: 7 additions & 4 deletions healthcare/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ def validate(self):
else:
frappe.db.set_value("Item", self.item, "disabled", 0)

def after_insert(self):
if self.inpatient_occupancy and self.is_billable:
create_item(self)
if self.inpatient_occupancy and self.is_billable and not self.item:
self.create_service_unit_item()

def on_trash(self):
if self.item:
Expand Down Expand Up @@ -72,10 +71,14 @@ def on_update(self):
frappe.db.set_value("Item", self.item, "disabled", 1)
self.reload()

@frappe.whitelist()
def create_service_unit_item(self):
create_item(self)


def item_price_exists(doc):
item_price = frappe.db.exists({"doctype": "Item Price", "item_code": doc.item_code})
if len(item_price):
if item_price and len(item_price):
return item_price[0][0]
return False

Expand Down
17 changes: 17 additions & 0 deletions healthcare/healthcare/doctype/patient_encounter/patient_encounter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ frappe.ui.form.on('Patient Encounter', {
});

var schedule_inpatient = function(frm) {
let service_unit_type = "";
var dialog = new frappe.ui.Dialog({
title: 'Patient Admission',
fields: [
Expand Down Expand Up @@ -388,6 +389,22 @@ var schedule_inpatient = function(frm) {
};
};

dialog.fields_dict["service_unit_type"].df.onchange = () => {
if (dialog.get_value("service_unit_type") && dialog.get_value("service_unit_type") != service_unit_type) {
service_unit_type = dialog.get_value("service_unit_type");
frappe.db.get_value("Healthcare Service Unit Type", {name: dialog.get_value("service_unit_type")}, ["is_billable", "item"])
.then(r => {
if (r.message.is_billable && !r.message.item) {
frappe.msgprint({
message: __("Selected service unit type doesn't have any item linked"),
title: __("Warning"),
indicator: "orange",
});
}
})
}
};

dialog.show();
dialog.$wrapper.find('.modal-dialog').css('width', '800px');
};
Expand Down
Loading