Coop stg #10910

GSMgeeth · 2025-03-05T08:22:30Z

No description provided.

* 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Sandith Pivithuru <114053279+SandithP2001@users.noreply.github.com> Co-authored-by: Imesh Ranawella <imeshranawella00@gmail.com> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>

* 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * 10397 improvements in pharmacy transfer issue report (#10455) * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Issue#9847 Inward Payment by Company (#10456) * Added New View For Credit Company Payments Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Added Fetch Method to get Credit Company Payment Bill Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Added New Methods to Facilitate New Credit Company Payments Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Fixed #9847 Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> --------- Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Fixed #10404 (#10457) * 10257 only bills related to the login department should be displayed in search inpatient direct issue by bill item (#10448) * fix:only show logged department bill items when search inpatient direct issues by bill item Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Sandith Pivithuru <114053279+SandithP2001@users.noreply.github.com> Co-authored-by: Imesh Ranawella <imeshranawella00@gmail.com> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>

… coop-stg # Conflicts: # src/main/java/com/divudi/bean/common/ReportsController.java # src/main/java/com/divudi/bean/pharmacy/PharmacySummaryReportController.java # src/main/java/com/divudi/bean/pharmacy/ReportsTransfer.java # src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java # src/main/java/com/divudi/service/BillService.java # src/main/webapp/credit/credit_compnay_bill_payment_inward.xhtml # src/main/webapp/dealerPayment/approve_supplier_payment.xhtml # src/main/webapp/dealerPayment/complete_approved_and_settled_supplier_payment.xhtml # src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml # src/main/webapp/dealerPayment/list_bills_to_settle_supplier_payments.xhtml # src/main/webapp/dealerPayment/settle_approved_supplier_payment.xhtml # src/main/webapp/dealerPayment/view_purchase_bill.xhtml # src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_receive_bill.xhtml # src/main/webapp/pharmacy/reports/summary_reports/pharmacy_income_report.xhtml # src/main/webapp/resources/pharmacy/transferIssue.xhtml # src/main/webapp/resources/sql/bills.sql

…@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10434) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10438) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10434) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10439) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10434) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10440) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10434) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10441) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Coop test ci cd workflow (#10434) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * update workflow file of coop-test application Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Closes #10387 (#10444) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10425 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> * 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 <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10387 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10459 No issue was found. sample tunes were not assgined to investigation Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #412 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: buddhika <budd@dsa.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: buddhika <budd@dsa.com> Co-authored-by: imexh <chandikaranawella@gmail.com> * Closes #10462 (#10468) Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> * Closes #10467 (#10469) Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: buddhika <budd@dsa.com> Co-authored-by: imexh <chandikaranawella@gmail.com> * Mark in UI Improved Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10488 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10488 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Up to date changes to coop testing (#10511) * Closed #9499 (#10492) Signed-off-by: pubudu piyankara <pubudupiyankara.me@gmail.com> * 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 <chandikaranawella@gmail.com> * 10420 improvements in grn summary procurements reports (#10494) * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> --------- Co-authored-by: imexh <chandikaranawella@gmail.com> * Fixed #10403 (#10495) Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> * 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 <buddhika.ari@gmail.com> * Closes #10459 No issue was found. sample tunes were not assgined to investigation Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> * 10488 issue in opd doctors mark out (#10489) * Mark in UI Improved Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10488 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10488 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * 6273 need to manage save document send for approval approve status transfer issue (#10501) * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * add new view for tranfer issue request and approval process Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * add method to retrive all tranfer request Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Add approval privillage and only privillage holder can approve the request Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * 10500 consumption report bug fixes (#10508) * Issue#10458 inpatient credit company payment bill cancellation (#10510) --------- Signed-off-by: pubudu piyankara <pubudupiyankara.me@gmail.com> Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Pubudu Piyankara <139697238+Pubudu-Piyankara@users.noreply.github.com> Co-authored-by: Imesh Ranawella <imeshranawella00@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> Co-authored-by: Sandith Pivithuru <114053279+SandithP2001@users.noreply.github.com> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Dr. M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * 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 <118891516+ChinthakaPrasad@users.noreply.github.com> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad Wijera…

# Conflicts: # src/main/java/com/divudi/bean/inward/BhtSummeryController.java # src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java # src/main/java/com/divudi/bean/pharmacy/PharmacyController.java # src/main/webapp/inward/inward_bill_service.xhtml # src/main/webapp/pharmacy/pharmacy_analytics.xhtml # src/main/webapp/pharmacy/pharmacy_report_grn_detail.xhtml # src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml # src/main/webapp/pharmacy/reports/summary_reports/pharmacy_income_report.xhtml # src/main/webapp/resources/css/ohmis.css

ChinthakaPrasad and others added 7 commits February 7, 2025 10:21

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad…

Loading
Loading status checks…

c0df20f

…@users.noreply.github.com>

Changes from development branch

Verified

This commit was signed with the committer’s verified signature.

GSMgeeth Geeth Sandaru Madhushan

GPG key ID: 77B112886ED1538F

Verified
Learn about vigilant mode

Loading
Loading status checks…

f27b901

GSMgeeth merged commit 6aca40c into development Mar 5, 2025
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Coop stg #10910

Coop stg #10910

GSMgeeth commented Mar 5, 2025

Coop stg #10910

Coop stg #10910

Conversation

GSMgeeth commented Mar 5, 2025