Skip to content

Commit

Permalink
Up to date changes to coop staging (#10637)
Browse files Browse the repository at this point in the history
* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10434)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10438)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10434)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10439)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10434)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10440)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10434)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10441)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test ci cd workflow (#10434)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* update workflow file of coop-test application

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Up to date changes to coop testing environment (#10446)

* Coop test (#10442)

* Closes #10386 (#10443)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10334
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #7830
now can search supplier credit bills
Make sure you select the option "Approveal necessary is required for Supplier Payments" as false
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10337
But need to fix pharmacy summery reports, cashier summary as seperate issues

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #3832

For Institutions where GRN payment approval is NOT necessary
(Make the configuration)

Payments Menu > SUpplier Payment > Settle Bills by SUpplier

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10260
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9676

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9679
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10386
New report is filtered by the admission type
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Closes #10387 (#10444)

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Dr. M H B Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Updates changes to coop test (#10449)

* Coop test (#10442)

* Closes #10386 (#10443)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10334
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #7830
now can search supplier credit bills
Make sure you select the option "Approveal necessary is required for Supplier Payments" as false
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10337
But need to fix pharmacy summery reports, cashier summary as seperate issues

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #3832

For Institutions where GRN payment approval is NOT necessary
(Make the configuration)

Payments Menu > SUpplier Payment > Settle Bills by SUpplier

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10260
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9676

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9679
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10386
New report is filtered by the admission type
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Closes #10387 (#10444)

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Dr. M H B Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* 10257 only bills related to the login department should be displayed in search inpatient direct issue by bill item (#10451)

* fix:only show logged department bill items when search inpatient direct issues by bill item

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Coop test (#10442)

* Closes #10386 (#10443)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10334
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #7830
now can search supplier credit bills
Make sure you select the option "Approveal necessary is required for Supplier Payments" as false
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10337
But need to fix pharmacy summery reports, cashier summary as seperate issues

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #3832

For Institutions where GRN payment approval is NOT necessary
(Make the configuration)

Payments Menu > SUpplier Payment > Settle Bills by SUpplier

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10260
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9676

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9679
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10386
New report is filtered by the admission type
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Closes #10387 (#10444)

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Dr. M H B Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* Up to date changes to coop-test application (#10473)

* 10425 improvements in supplier payment management (#10460)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10334
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #7830
now can search supplier credit bills
Make sure you select the option "Approveal necessary is required for Supplier Payments" as false
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10337
But need to fix pharmacy summery reports, cashier summary as seperate issues

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #3832

For Institutions where GRN payment approval is NOT necessary
(Make the configuration)

Payments Menu > SUpplier Payment > Settle Bills by SUpplier

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10260
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9676

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9679
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10425
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>

* 412 need to take fbc graph (#10464)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10334
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #7830
now can search supplier credit bills
Make sure you select the option "Approveal necessary is required for Supplier Payments" as false
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10337
But need to fix pharmacy summery reports, cashier summary as seperate issues

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #3832

For Institutions where GRN payment approval is NOT necessary
(Make the configuration)

Payments Menu > SUpplier Payment > Settle Bills by SUpplier

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Improved supplier payment management where Approval is necessary
Need to improve UIs, navigations,
have to check GRN Returns, not checked
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9681
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10260
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9676

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #9679
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10386
New report is filtered by the admission type
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10387

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10459

No issue was found. sample tunes were not assgined to investigation

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #412

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: buddhika <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
Co-authored-by: buddhika <[email protected]>
Co-authored-by: imexh <[email protected]>

* Closes #10462 (#10468)

Signed-off-by: Dr M H B Ariyaratne <[email protected]>

Co-authored-by: imexh <[email protected]>

* Closes #10467 (#10469)

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

Co-authored-by: imexh <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: Dr. M H B Ariyaratne <[email protected]>
Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
Co-authored-by: buddhika <[email protected]>
Co-authored-by: imexh <[email protected]>

* Mark in UI Improved

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10488
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10488
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Up to date changes to coop testing (#10511)

* Closed #9499 (#10492)

Signed-off-by: pubudu piyankara <[email protected]>

* Closing stock report (#10497)

* code refactor

* code refactor

* code refactor

* batch wise report

* item wise report

* item wise report

* closing stock report

---------

Co-authored-by: imexh <[email protected]>

* 10420 improvements in grn summary   procurements reports (#10494)

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

* Signed-off-by: SandithP2001 <[email protected]>

---------

Co-authored-by: imexh <[email protected]>

* Fixed #10403 (#10495)

Signed-off-by: Lawan Samarasekara <[email protected]>

Co-authored-by: imexh <[email protected]>

* Issue#10477 fix need validation for credit limit (#10503)

* Added Validations to Credit Limit

* Added Validation

* Fixed #10477

* Issue#10504 interim bill button is not showing after final bill is cancelled (#10505)

* 10496 improvements in grn summary   procurements reports bugs (#10506)

* 10459 samples barcode stickers are not generated in some instances (#10461)

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10459

No issue was found. sample tunes were not assgined to investigation

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

---------

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Co-authored-by: imexh <[email protected]>

* 10488 issue in opd doctors mark out (#10489)

* Mark in UI Improved

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10488
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10488
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

---------

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* 6273 need to manage save document send for approval approve status transfer issue (#10501)

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* add new view for tranfer issue request and approval process

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* add method to retrive all tranfer request

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Add approval privillage and only privillage holder can approve the request

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* 10500 consumption report bug fixes (#10508)

* Issue#10458 inpatient credit company payment bill cancellation (#10510)

---------

Signed-off-by: pubudu piyankara <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Co-authored-by: Pubudu Piyankara <[email protected]>
Co-authored-by: Imesh Ranawella <[email protected]>
Co-authored-by: imexh <[email protected]>
Co-authored-by: Sandith Pivithuru <[email protected]>
Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <[email protected]>
Co-authored-by: Dr. M H B Ariyaratne <[email protected]>

* Signed-off-by: Lawan Samarasekara <[email protected]>

* Coop stg to development  (#10538)

* New changes to coop staging environment (#10445)

* 9681 improvements in supplier payment management (#10385)

* Hotfix multiple payment not display and not update in pharmacy income report (#10394)

* 10388 opd credit cogs report   wireframe (#10395)

* 10390 bht issue cogs report   wireframe (#10396)

* bugfixes (#10405)

* 9752 there must be facility to enable label printing (#10399)

* 10392 opd sale cogs report   wireframe (#10406)

* 10260 after grn is canceled it must be removed from the suppler payment list (#10407)

* Issue#10373 Improvements in BHT Pharmacy Issue Report (#10424)

* Create development_pr_validation.yml

* Update development_pr_validation.yml (#10427)

* Gs mgeeth patch 1 (#10428)

* Update development_pr_validation.yml

* Update development_pr_validation.yml

* Update development_pr_validation.yml (#10429)

* Update .gitignore

* 9679 need grn details for supplier payment voucher (#10408)

* Coop test (#10442)

* Closes #10386 (#10443)

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10187
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10176

* add department wise filter for inward pharmacy issue summery

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Closes #10191
Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* Update mp_prod_ci_cd.yml

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Dr M H B Ariyaratne <[email protected]>

* fix: pharmacy tranfer bill improvement done.

Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>

* Payment Approval Basics Completed

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10291
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #10259

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* GRN No, Invoice No added
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9986
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Closes #9939
Also adds Supplier Payment Preperation Bill

Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>

* Signed-off-by: Chinthaka Prasad Wijera…
  • Loading branch information
11 people authored Feb 20, 2025
1 parent c0df20f commit 88c89fd
Show file tree
Hide file tree
Showing 68 changed files with 3,333 additions and 899 deletions.
21 changes: 8 additions & 13 deletions .github/workflows/coop_prod_ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ jobs:
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
ref: 'coop-prod'

- name: Download Build Artifact
uses: actions/download-artifact@v4
Expand All @@ -84,9 +82,8 @@ jobs:
# Ensure deployment directory exists
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
sudo mkdir -p $WAR_DIR
sudo chown -R appuser:appuser /home/appuser/app/latest
sudo su - appuser
mkdir -p $WAR_DIR
chown -R appuser:appuser $WAR_DIR
cd $WAR_DIR
# Remove old backup if it exists
Expand All @@ -101,27 +98,24 @@ jobs:
"
# Copy new WAR file to the server
rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:/tmp/$WAR_NAME
rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
# Move the file to /home/appuser/app/latest/ and set permissions
# Set the WAR file permission
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
sudo mv /tmp/$WAR_NAME $WAR_DIR/
sudo chown appuser:appuser $WAR_DIR/$WAR_NAME
chown appuser:appuser $WAR_DIR/$WAR_NAME
"
# Deploy the WAR using asadmin
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
sudo su - appuser
echo 'AS_ADMIN_PASSWORD=${{ secrets.COOP_PROD_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
rm /tmp/payara-admin-pass.txt
"
# Validate if the application is running
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
sudo su - appuser
echo 'AS_ADMIN_PASSWORD=${{ secrets.COOP_PROD_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
echo 'Application is running.'
else
Expand All @@ -145,3 +139,4 @@ jobs:
# Cleanup
rm -f private_key.pem
141 changes: 141 additions & 0 deletions .github/workflows/digasiri_prod_ci_cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
name: DIGASIRI-PROD Build & Deployment Pipeline

on:
push:
branches:
- digasiri-prod

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Cache Maven Packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Update JDBC Data Sources in persistence.xml
run: |
sed -i 's|<jta-data-source>${JDBC_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/digasiri</jta-data-source>|' src/main/resources/META-INF/persistence.xml
sed -i 's|<jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/digasiriAudit</jta-data-source>|' src/main/resources/META-INF/persistence.xml
- name: Verify JDBC Data Sources in persistence.xml
run: |
grep '<jta-data-source>' src/main/resources/META-INF/persistence.xml
- name: Build with Maven
run: mvn clean package -DskipTests

- name: Archive Build Artifacts
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: target/*.war
overwrite: true

# - name: Run Tests
# run: mvn test

deploy:
needs: build
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Download Build Artifact
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: ./

- name: Deploy to Payara
env:
SERVER_IP: ${{ secrets.DIGASIRI_PROD_SERVER_IP }}
SERVER_USER: ${{ secrets.DIGASIRI_PROD_SERVER_USER }}
SSH_PRIVATE_KEY: ${{ secrets.DIGASIRI_PROD_SSH_PRIVATE_KEY }}
PAYARA_ADMIN_PASS: ${{ secrets.DIGASIRI_PROD_PAYARA_ADMIN_PASS }}
run: |
# Add SSH private key to the SSH agent
echo "$SSH_PRIVATE_KEY" > private_key.pem
chmod 600 private_key.pem
# Variables
WAR_NAME="digasiri.war"
WAR_DIR="/home/appuser/app/latest"
APP_NAME="digasiri"
SUBDOMAIN="digasiri"
# Ensure deployment directory exists
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
mkdir -p $WAR_DIR
chown -R appuser:appuser $WAR_DIR
cd $WAR_DIR
# Remove old backup if it exists
if [ -f $WAR_NAME.old ]; then
rm $WAR_NAME.old
fi
# If the current WAR file exists, back it up
if [ -f $WAR_NAME ]; then
mv $WAR_NAME $WAR_NAME.old
fi
"
# Copy new WAR file to the server
rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
# Set the WAR file permission
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
chown appuser:appuser $WAR_DIR/$WAR_NAME
"
# Deploy the WAR using asadmin
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
rm /tmp/payara-admin-pass.txt
"
# Validate if the application is running
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
echo 'Application is running.'
else
echo 'Application failed to start.'
fi
rm /tmp/payara-admin-pass.txt
"
# Check if the application is reachable
for i in {1..5}; do
RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" https://$SUBDOMAIN.carecode.org/$APP_NAME/faces/index1.xhtml)
if [ "$RESPONSE_CODE" == "200" ]; then
echo "Application is reachable and healthy."
break
elif [ "$i" == "5" ]; then
echo "Application is not reachable or unhealthy at https://$SUBDOMAIN.carecode.org/$APP_NAME (HTTP $RESPONSE_CODE)"
break
fi
sleep 10
done
# Cleanup
rm -f private_key.pem
141 changes: 141 additions & 0 deletions .github/workflows/rmh_prod_ci_cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
name: RMH-PROD Build & Deployment Pipeline

on:
push:
branches:
- rmh-prod

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- name: Cache Maven Packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Update JDBC Data Sources in persistence.xml
run: |
sed -i 's|<jta-data-source>${JDBC_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/rmh</jta-data-source>|' src/main/resources/META-INF/persistence.xml
sed -i 's|<jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/rmhAudit</jta-data-source>|' src/main/resources/META-INF/persistence.xml
- name: Verify JDBC Data Sources in persistence.xml
run: |
grep '<jta-data-source>' src/main/resources/META-INF/persistence.xml
- name: Build with Maven
run: mvn clean package -DskipTests

- name: Archive Build Artifacts
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: target/*.war
overwrite: true

# - name: Run Tests
# run: mvn test

deploy:
needs: build
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Download Build Artifact
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: ./

- name: Deploy to Payara
env:
SERVER_IP: ${{ secrets.RMH_PROD_SERVER_IP }}
SERVER_USER: ${{ secrets.RMH_PROD_SERVER_USER }}
SSH_PRIVATE_KEY: ${{ secrets.RMH_PROD_SSH_PRIVATE_KEY }}
PAYARA_ADMIN_PASS: ${{ secrets.RMH_PROD_PAYARA_ADMIN_PASS }}
run: |
# Add SSH private key to the SSH agent
echo "$SSH_PRIVATE_KEY" > private_key.pem
chmod 600 private_key.pem
# Variables
WAR_NAME="rmh.war"
WAR_DIR="/home/appuser/app/latest"
APP_NAME="rmh"
SUBDOMAIN="rmh"
# Ensure deployment directory exists
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
mkdir -p $WAR_DIR
chown -R appuser:appuser $WAR_DIR
cd $WAR_DIR
# Remove old backup if it exists
if [ -f $WAR_NAME.old ]; then
rm $WAR_NAME.old
fi
# If the current WAR file exists, back it up
if [ -f $WAR_NAME ]; then
mv $WAR_NAME $WAR_NAME.old
fi
"
# Copy new WAR file to the server
rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
# Set the WAR file permission
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
chown appuser:appuser $WAR_DIR/$WAR_NAME
"
# Deploy the WAR using asadmin
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
/opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
rm /tmp/payara-admin-pass.txt
"
# Validate if the application is running
ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
echo 'Application is running.'
else
echo 'Application failed to start.'
fi
rm /tmp/payara-admin-pass.txt
"
# Check if the application is reachable
for i in {1..5}; do
RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" https://$SUBDOMAIN.carecode.org/$APP_NAME/faces/index1.xhtml)
if [ "$RESPONSE_CODE" == "200" ]; then
echo "Application is reachable and healthy."
break
elif [ "$i" == "5" ]; then
echo "Application is not reachable or unhealthy at https://$SUBDOMAIN.carecode.org/$APP_NAME (HTTP $RESPONSE_CODE)"
break
fi
sleep 10
done
# Cleanup
rm -f private_key.pem
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.divudi</groupId>
<artifactId>digasiri</artifactId>
<artifactId>rh</artifactId>
<version>3.0.0</version>
<packaging>war</packaging>
<name>digasiri</name>
<name>rh</name>

<properties>
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
Expand Down
28 changes: 15 additions & 13 deletions src/main/java/com/divudi/bean/common/BillBeanController.java
Original file line number Diff line number Diff line change
Expand Up @@ -2260,19 +2260,21 @@ public void updateInwardDipositList(PatientEncounter patientEncounter, Bill bill
if (patientEncounter.isPaymentFinalized() && patientEncounter.getFinalBill() != null) {
bill.setForwardReferenceBill(patientEncounter.getFinalBill());
getBillFacade().edit(bill);
patientEncounter.getFinalBill().getBackwardReferenceBills().add(bill);
if(patientEncounter.getFinalBill().getBalance() <= 0){
patientEncounter.getFinalBill().setBalance(patientEncounter.getFinalBill().getNetTotal());
}
patientEncounter.getFinalBill().setBalance(patientEncounter.getFinalBill().getBalance() - bill.getNetTotal());
patientEncounter.getFinalBill().setPaidAmount(patientEncounter.getFinalBill().getPaidAmount() + bill.getNetTotal());

if(bill.getBillTypeAtomic() == BillTypeAtomic.INWARD_DEPOSIT){
patientEncounter.getFinalBill().setSettledAmountByPatient(patientEncounter.getFinalBill().getSettledAmountByPatient() + bill.getNetTotal());
}else if(bill.getBillTypeAtomic()== BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_RECEIVED){
patientEncounter.getFinalBill().setSettledAmountBySponsor(patientEncounter.getFinalBill().getSettledAmountBySponsor()+ bill.getNetTotal());
}else if(bill.getBillTypeAtomic()== BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_CANCELLATION){
patientEncounter.getFinalBill().setSettledAmountBySponsor(patientEncounter.getFinalBill().getSettledAmountBySponsor() - Math.abs(bill.getNetTotal()));
if (!patientEncounter.getFinalBill().getBackwardReferenceBills().contains(bill)) {
patientEncounter.getFinalBill().getBackwardReferenceBills().add(bill);
if (patientEncounter.getFinalBill().getBalance() <= 0) {
patientEncounter.getFinalBill().setBalance(patientEncounter.getFinalBill().getNetTotal());
}
patientEncounter.getFinalBill().setBalance(patientEncounter.getFinalBill().getBalance() - bill.getNetTotal());
patientEncounter.getFinalBill().setPaidAmount(patientEncounter.getFinalBill().getPaidAmount() + bill.getNetTotal());

if (bill.getBillTypeAtomic() == BillTypeAtomic.INWARD_DEPOSIT) {
patientEncounter.getFinalBill().setSettledAmountByPatient(patientEncounter.getFinalBill().getSettledAmountByPatient() + bill.getNetTotal());
} else if (bill.getBillTypeAtomic() == BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_RECEIVED) {
patientEncounter.getFinalBill().setSettledAmountBySponsor(patientEncounter.getFinalBill().getSettledAmountBySponsor() + bill.getNetTotal());
} else if (bill.getBillTypeAtomic() == BillTypeAtomic.INPATIENT_CREDIT_COMPANY_PAYMENT_CANCELLATION) {
patientEncounter.getFinalBill().setSettledAmountBySponsor(patientEncounter.getFinalBill().getSettledAmountBySponsor() - Math.abs(bill.getNetTotal()));
}
}
getBillFacade().edit(patientEncounter.getFinalBill());
}
Expand Down
Loading

0 comments on commit 88c89fd

Please sign in to comment.