Skip to content

feat: Jubilee Integration#932

Draft
av-dev2 wants to merge 37 commits into
aakvatech:jubilee-integrationfrom
av-dev2:jubilee-integration
Draft

feat: Jubilee Integration#932
av-dev2 wants to merge 37 commits into
aakvatech:jubilee-integrationfrom
av-dev2:jubilee-integration

Conversation

@av-dev2

@av-dev2 av-dev2 commented Apr 17, 2024

Copy link
Copy Markdown
Collaborator

No description provided.

av-dev2 and others added 26 commits March 19, 2024 12:20
…d_si

feat: validate stock of items from sales order and sales invoice
…_non_nhif_insurance

feat: enable requesting service approval number for services/items of Non NHIF Patients
…se_for_sales_order_med_change_REQUEST

chore: stop validation of warehouse for sales order related medication change request
(cherry picked from commit f203741)
…-hotfix/pr-917

chore: add readme content (backport aakvatech#917)
…-hotfix/pr-919

fix: KeyError on hsic_map[template] when template is not on HSIC (backport aakvatech#919)
(cherry picked from commit db8d8dd)

# Conflicts:
#	hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json
…celling_therapy_with_lromt_return

fix: conflict of 'modified' on lrpmt_returns.json file
(cherry picked from commit 143ef1f)

# Conflicts:
#	hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py
…-hotfix/pr-924

feat: Cancel or return therapy sessions via LRPMT Returns doctype (backport aakvatech#924)
…-hotfix/pr-927

feat: therapy automation and controls like other LRPM documents (backport aakvatech#927)
…emized, ipd and itemwise hospital revenue

(cherry picked from commit 2eb9315)
…-hotfix/pr-929

feat: include 'sessions_cancelled' on all the revenue reports like itemized, ipd and itemwise hospital revenue (backport aakvatech#929)
…company and inpatient_record

(cherry picked from commit 7cbbae1)

# Conflicts:
#	hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json
…-hotfix/pr-923

chore: add list view filters for patient, patient_name, appointment, company and inpatient_record (backport aakvatech#923)
@mergify mergify Bot added the conflict label Apr 17, 2024
@av-dev2 av-dev2 removed the conflict label Apr 17, 2024
@av-dev2 av-dev2 force-pushed the jubilee-integration branch from f4ba4f2 to 446df5c Compare April 22, 2024 13:39
@mergify mergify Bot added the conflict label Apr 22, 2024
@av-dev2 av-dev2 removed the conflict label Apr 22, 2024
@av-dev2 av-dev2 marked this pull request as draft June 14, 2024 12:05
@av-dev2 av-dev2 force-pushed the jubilee-integration branch from ecb9455 to 25ec74d Compare June 24, 2024 15:04
@mergify mergify Bot added the conflict label Jun 24, 2024
@av-dev2 av-dev2 removed the conflict label Jun 24, 2024
@av-dev2 av-dev2 force-pushed the jubilee-integration branch from 6ae46a6 to f3bb919 Compare June 27, 2024 17:16
@mergify mergify Bot added the conflict label Jun 27, 2024
@av-dev2 av-dev2 removed the conflict label Jun 27, 2024
Repository owner deleted a comment from mergify Bot Jul 28, 2024
Repository owner deleted a comment from mergify Bot Jul 28, 2024
Repository owner deleted a comment from mergify Bot Jul 28, 2024
Repository owner deleted a comment from mergify Bot Jul 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants