From 7cdc2d7cce0a465419b260611374b051b22459ea Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 14 Nov 2024 08:20:08 +0530 Subject: [PATCH 1/5] Signed-off-by: DamithDeshan --- src/main/resources/META-INF/.LCKpersistence.xml~ | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/main/resources/META-INF/.LCKpersistence.xml~ diff --git a/src/main/resources/META-INF/.LCKpersistence.xml~ b/src/main/resources/META-INF/.LCKpersistence.xml~ deleted file mode 100644 index 56bd8f6b4c..0000000000 --- a/src/main/resources/META-INF/.LCKpersistence.xml~ +++ /dev/null @@ -1 +0,0 @@ -D:\CC\hmis\src\main\resources\META-INF\persistence.xml \ No newline at end of file From f2aa14d822a2b8e62702bedbd0ae66cd4697c3e1 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 14 Nov 2024 09:42:18 +0530 Subject: [PATCH 2/5] Signed-off-by: PasinduW99 --- pom.xml | 4 ++-- src/main/resources/META-INF/persistence.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b7a9f5e408..19d1e8a40a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.divudi - digasiri-new + rh 3.0.0 war - digasiri-new + rh ${project.build.directory}/endorsed diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 54ad988ed3..843440cd1f 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,7 +2,7 @@ org.eclipse.persistence.jpa.PersistenceProvider - jdbc/southernlanka + jdbc/ruhunu false @@ -13,7 +13,7 @@ - jdbc/southernlankaAudit + jdbc/ruhunuAudit false From 7d47bf3a864b97b136089475c12efe7b06d0bbbf Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Thu, 14 Nov 2024 15:12:18 +0530 Subject: [PATCH 3/5] closes #8772 Signed-off-by: DamithDeshan --- .../webapp/pharmacy/pharmacy_purchase.xhtml | 215 ++++++++++++------ 1 file changed, 142 insertions(+), 73 deletions(-) diff --git a/src/main/webapp/pharmacy/pharmacy_purchase.xhtml b/src/main/webapp/pharmacy/pharmacy_purchase.xhtml index db6645aec7..87e3fdfe0f 100644 --- a/src/main/webapp/pharmacy/pharmacy_purchase.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_purchase.xhtml @@ -20,19 +20,21 @@
- + - +
@@ -56,14 +58,26 @@ - + - + @@ -138,13 +152,16 @@

- + @@ -222,40 +239,44 @@
- +
- +
- +
- + process="itemselectgrid" update="itemList itemselectgrid tot focusItem :#{p:resolveFirstComponentWithId('total',view).clientId} :#{p:resolveFirstComponentWithId('totalSaleValue',view).clientId} msg"/>
@@ -264,9 +285,16 @@
- + @@ -274,8 +302,9 @@ - + @@ -290,10 +319,12 @@
- + @@ -306,17 +337,55 @@ - - + + + + + - - + + + + + + @@ -432,11 +501,6 @@ - - - - - @@ -458,13 +522,18 @@
- - + +
From bca5a57d207bb1720c7e5f952a6ba130da1abede Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 14 Nov 2024 17:17:34 +0530 Subject: [PATCH 4/5] closes #8768 Signed-off-by: PasinduW99 --- src/main/java/com/divudi/bean/opd/OpdBillController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/divudi/bean/opd/OpdBillController.java b/src/main/java/com/divudi/bean/opd/OpdBillController.java index 1e4068bd9e..ba70eaf178 100644 --- a/src/main/java/com/divudi/bean/opd/OpdBillController.java +++ b/src/main/java/com/divudi/bean/opd/OpdBillController.java @@ -3428,6 +3428,7 @@ public List createPayment(Bill bill, PaymentMethod pm) { case Credit: p.setReferenceNo(cd.getPaymentMethodData().getCredit().getReferralNo()); p.setComments(cd.getPaymentMethodData().getCredit().getComment()); + break; case PatientDeposit: if (getPatient().getRunningBalance() != null) { getPatient().setRunningBalance(getPatient().getRunningBalance() - cd.getPaymentMethodData().getPatient_deposit().getTotalValue()); @@ -3435,10 +3436,12 @@ public List createPayment(Bill bill, PaymentMethod pm) { getPatient().setRunningBalance(0.0 - cd.getPaymentMethodData().getPatient_deposit().getTotalValue()); } getPatientFacade().edit(getPatient()); + break; case Slip: p.setPaidValue(cd.getPaymentMethodData().getSlip().getTotalValue()); p.setBank(cd.getPaymentMethodData().getSlip().getInstitution()); p.setRealizedAt(cd.getPaymentMethodData().getSlip().getDate()); + break; case OnCall: case OnlineSettlement: case Staff: @@ -3447,6 +3450,7 @@ public List createPayment(Bill bill, PaymentMethod pm) { staffBean.updateStaffCredit(cd.getPaymentMethodData().getStaffCredit().getToStaff(), cd.getPaymentMethodData().getStaffCredit().getTotalValue()); JsfUtil.addSuccessMessage("Staff Welfare Balance Updated"); } + break; case YouOweMe: case MultiplePaymentMethods: } @@ -3485,11 +3489,13 @@ public List createPayment(Bill bill, PaymentMethod pm) { case Credit: p.setReferenceNo(paymentMethodData.getCredit().getReferralNo()); p.setComments(paymentMethodData.getCredit().getComment()); + break; case PatientDeposit: case Slip: p.setBank(paymentMethodData.getSlip().getInstitution()); p.setPaidValue(paymentMethodData.getSlip().getTotalValue()); p.setRealizedAt(paymentMethodData.getSlip().getDate()); + break; case OnCall: case OnlineSettlement: case Staff: From 24921229c157d00a2eb5b4dc4840170f3a5ac1c3 Mon Sep 17 00:00:00 2001 From: PasinduW99 Date: Thu, 14 Nov 2024 17:18:47 +0530 Subject: [PATCH 5/5] Signed-off-by: PasinduW99 --- src/main/webapp/opd/opd_bill_ac.xhtml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/webapp/opd/opd_bill_ac.xhtml b/src/main/webapp/opd/opd_bill_ac.xhtml index 194fc67fff..95c56f2820 100644 --- a/src/main/webapp/opd/opd_bill_ac.xhtml +++ b/src/main/webapp/opd/opd_bill_ac.xhtml @@ -1058,8 +1058,6 @@ class="ui-button-success mx-2 w-100"> - -