Coop test (#10537)

* 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]>

---------

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

src/main/java/com/divudi/bean/inward/AdmissionController.java

@@ -45,16 +45,19 @@
 import com.divudi.bean.pharmacy.PharmacyRequestForBhtController;
 import com.divudi.data.BillTypeAtomic;
 import com.divudi.data.clinical.ClinicalFindingValueType;
+
 import static com.divudi.data.inward.AdmissionStatus.ADMITTED_BUT_NOT_DISCHARGED;
 import static com.divudi.data.inward.AdmissionStatus.ANY_STATUS;
 import static com.divudi.data.inward.AdmissionStatus.DISCHARGED_AND_FINAL_BILL_COMPLETED;
 import static com.divudi.data.inward.AdmissionStatus.DISCHARGED_BUT_FINAL_BILL_NOT_COMPLETED;
+
 import com.divudi.entity.Department;
 import com.divudi.entity.Staff;
 import com.divudi.entity.clinical.ClinicalFindingValue;
 import com.divudi.entity.inward.AdmissionType;
 import com.divudi.facade.ClinicalFindingValueFacade;
 import com.divudi.java.CommonFunctions;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -71,10 +74,10 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.persistence.TemporalType;
+
 import org.primefaces.event.TabChangeEvent;
 
 /**
- *
  * @author Dr. M. H. B. Ariyaratne, MBBS, MSc, MD(Health Informatics) Acting
  * Consultant (Health Informatics)
  */
@@ -101,7 +104,7 @@ public class AdmissionController implements Serializable, ControllerWithPatient
     ConfigOptionApplicationController configOptionApplicationController;
     @Inject
     private CommonController commonController;
-    ////////////
+    /// /////////
     @EJB
     private AdmissionFacade ejbFacade;
     @EJB
@@ -126,9 +129,9 @@ public class AdmissionController implements Serializable, ControllerWithPatient
     @Inject
     ClinicalFindingValueController clinicalFindingValueController;
 
-    ////////////////////////////
+    /// /////////////////////////
     private CommonFunctions commonFunctions;
-    ///////////////////////
+    /// ////////////////////
     List<Admission> selectedItems;
     private Admission current;
     private Admission currentNonBht;
@@ -140,7 +143,7 @@ public class AdmissionController implements Serializable, ControllerWithPatient
     private List<Patient> patientList;
     private boolean printPreview;
     private List<Admission> currentAdmissions;
-    ///////////////////////////
+    /// ////////////////////////
     String selectText = "";
     private String ageText = "";
     private String bhtText = "";
@@ -252,6 +255,10 @@ public String navigateToInpatientClinicalData() {
     }
 
     public void addCreditCompnay() {
+        if (encounterCreditCompany.getCreditLimit() <= 0) {
+            JsfUtil.addErrorMessage("Credit limit must be greater than zero");
+            return;
+        }
         // need to add encounterCreditCompany to list
         if (encounterCreditCompany.getInstitution() != null) {
             encounterCreditCompany.setPatientEncounter(current);
@@ -390,7 +397,7 @@ public List<Bill> getCreditPaymentBillsBht(Institution institution) {
         return lst;
     }
 
-//    public List<Admission> completePatientPaymentDue(String qry) {
+    //    public List<Admission> completePatientPaymentDue(String qry) {
 //        String sql = "Select b.patientEncounter From "
 //                + " BilledBill b where"
 //                + " b.retired=false "
@@ -491,7 +498,7 @@ public String navigateToAddBabyAdmission() {
         return "/inward/inward_admission_child?faces-redirect=true";
     }
 
-//    // Services & Items Submenu Methods
+    //    // Services & Items Submenu Methods
 //    public String navigateToAddServices() {
 //        return "/inward/inward_bill_service?faces-redirect=true";
 //    }
@@ -620,15 +627,17 @@ public void searchAdmissions() {
             j += "  and c.parentEncounter=:pent ";
             m.put("pent", parentAdmission);
         }
-        
+
         if (admissionTypeForSearch != null) {
             j += "  and c.admissionType=:at ";
             m.put("at", admissionTypeForSearch);
         }
 
+        j += " ORDER BY c.dateOfAdmission DESC ";
+
         items = getFacade().findByJpql(j, m, TemporalType.TIMESTAMP);
     }
-    
+
     public void searchAdmissionsWithoutRoom() {
         if (fromDate == null || toDate == null) {
             JsfUtil.addErrorMessage("Please select date");
@@ -724,7 +733,7 @@ public String navigateToAdmissionProfilePage() {
         bhtSummeryController.setPatientEncounter(current);
         return bhtSummeryController.navigateToInpatientProfile();
     }
-    
+
 
     public List<Admission> completeAdmission(String query) {
         List<Admission> suggestions;
@@ -789,7 +798,7 @@ public List<Admission> completePatientFinaled(String query) {
         return suggestions;
     }
 
-//    public List<Admission> completePatientCredit(String query) {
+    //    public List<Admission> completePatientCredit(String query) {
 //        List<Admission> suggestions;
 //        String sql;
 //        HashMap hm = new HashMap();
@@ -891,7 +900,7 @@ public List<Admission> completePatientPaymentFinalized(String query) {
         return suggestions;
     }
 
-//    public List<Admission> completeDishcahrgedPatient(String query) {
+    //    public List<Admission> completeDishcahrgedPatient(String query) {
 //        List<Admission> suggestions;
 //        String sql;
 //        if (query == null) {
@@ -909,7 +918,7 @@ public void prepareAdd() {
 
     List<Admission> admissionsWithErrors;
 
-//    public List<Admission> getAdmissionsWithErrors() {
+    //    public List<Admission> getAdmissionsWithErrors() {
 //        String sql;
 //        sql = "select p from Admission p where c.patient.retired=false "
 //                + "and (c.patient.patient is null or c.patient.bhtNo is null)";
@@ -1120,7 +1129,7 @@ private boolean errorCheck() {
                 return true;
             }
         }
-        
+
         if (getCurrent().getAdmissionType().isRoomChargesAllowed()) {
             if (getPatientRoom().getRoomFacilityCharge() == null) {
                 JsfUtil.addErrorMessage("Select Room ");
@@ -1268,14 +1277,14 @@ public void updateBHTNo() {
     }
 
     public void saveSelected() {
-        if(admittingProcessStarted){
+        if (admittingProcessStarted) {
             JsfUtil.addErrorMessage("Admittin process already started.");
             return;
         }
-        admittingProcessStarted=true;
-        
+        admittingProcessStarted = true;
+
         if (errorCheck()) {
-            admittingProcessStarted=false;
+            admittingProcessStarted = false;
             return;
         }
         savePatient();
@@ -1331,10 +1340,10 @@ public void saveSelected() {
 
         // Save EncounterCreditCompanies
         // Need to create EncounterCredit
-        admittingProcessStarted=false;
+        admittingProcessStarted = false;
         printPreview = true;
     }
-    
+
     public void saveConvertSelected() {
         if (errorCheck()) {
             return;
@@ -1389,7 +1398,7 @@ public void saveConvertSelected() {
         }
 
         saveEncounterCreditCompanies(current);
-        
+
         getCurrentNonBht().setParentEncounter(current);
         getCurrentNonBht().setDischarged(true);
         getCurrentNonBht().setDateOfDischarge(new Date());
@@ -1948,7 +1957,7 @@ public boolean isAdmittingProcessStarted() {
     public void setAdmittingProcessStarted(boolean admittingProcessStarted) {
         this.admittingProcessStarted = admittingProcessStarted;
     }
-    
+
 
     public AdmissionType getAdmissionTypeForSearch() {
         return admissionTypeForSearch;