10280 stock ledger report bug fix

.github/workflows/coop_dev_ci_cd.yml

@@ -96,7 +96,7 @@ jobs:
               mv $WAR_NAME $WAR_NAME.old
             fi
           "
-
+ 
           # Copy new WAR file to the server
           rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:/tmp/$WAR_NAME
 
@@ -126,7 +126,7 @@ jobs:
             fi
             rm /tmp/payara-admin-pass.txt
           "
-
+ 
           # Check if the application is reachable
           for i in {1..5}; do
             RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" https://$SUBDOMAIN.carecode.org/$APP_NAME/faces/index1.xhtml)

src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java

@@ -152,9 +152,25 @@ public String navigateToCancelPharmacyDirectIssueToInpatients() {
         return "/inward/pharmacy_cancel_bill_retail_bht?faces-redirect=true";
     }
 
+    public String navigateToCancelPharmacyRetailSale() {
+        if (bill == null) {
+            JsfUtil.addErrorMessage("No Bill Selected");
+            return null;
+        }
+        paymentMethod = bill.getPaymentMethod();
+        return "/pharmacy/pharmacy_cancel_bill_retail?faces-redirect=true";
+    }
+
     public String navigatePharmacyReprintPo() {
         return "pharmacy_reprint_po?faces-redirect=true";
     }
+
+    public String navigatePharmacyReprintRetailBill() {
+        if(bill==null){
+            JsfUtil.addErrorMessage("No Bill Selected");
+        }
+        return "/pharmacy/pharmacy_reprint_bill_sale?faces-redirect=true";
+    }
 
     public String navigateToReprintPharmacyTransferIssue() {
         if (bill == null) {
@@ -1202,7 +1218,7 @@ private CancelledBill pharmacyCreateCancelBill() {
         cb.invertAndAssignValuesFromOtherBill(getBill());
 
         cb.setPaymentScheme(getBill().getPaymentScheme());
-        cb.setPaymentMethod(getBill().getPaymentMethod());
+        cb.setPaymentMethod(paymentMethod);
         cb.setBalance(0.0);
         cb.setCreatedAt(new Date());
         cb.setCreater(getSessionController().getLoggedUser());
@@ -1964,7 +1980,6 @@ private boolean checkDepartment(Bill bill) {
     ConfigOptionApplicationController configOptionApplicationController;
 
     public void pharmacyRetailCancelBillWithStock() throws ParseException {
-
         if (getBill() != null && getBill().getId() != null && getBill().getId() != 0) {
             if (pharmacyErrorCheck()) {
                 return;
@@ -2004,8 +2019,11 @@ public void pharmacyRetailCancelBillWithStock() throws ParseException {
 
             CancelledBill cb = pharmacyCreateCancelBill();
 
-            cb.setDeptId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getDepartment(), cb.getBillType(), BillClassType.CancelledBill, BillNumberSuffix.SALCAN));
-            cb.setInsId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getInstitution(), cb.getBillType(), BillClassType.CancelledBill, BillNumberSuffix.SALCAN));
+
+            String deptId = getBillNumberBean().departmentBillNumberGeneratorYearly(getSessionController().getDepartment(), BillTypeAtomic.PHARMACY_RETAIL_SALE_CANCELLED);
+
+            cb.setDeptId(deptId);
+            cb.setInsId(deptId);
 
             if (cb.getId() == null) {
                 getBillFacade().create(cb);
@@ -2024,7 +2042,7 @@ public void pharmacyRetailCancelBillWithStock() throws ParseException {
 //                getBill().getReferenceBill().setReferenceBill(null);
 //                getBillFacade().edit(getBill().getReferenceBill());
 //            }
-            getCashTransactionBean().saveBillCashOutTransaction(cb, getSessionController().getLoggedUser());
+//            getCashTransactionBean().saveBillCashOutTransaction(cb, getSessionController().getLoggedUser());
 
             JsfUtil.addSuccessMessage("Cancelled");
             //   ////System.out.println("going to cancel staff payments");

src/main/java/com/divudi/entity/pharmacy/StockHistory.java

@@ -29,7 +29,7 @@
  * @author Buddhika
  */
 @Entity
-public class StockHistory implements Serializable, RetirableEntity  {
+public class StockHistory implements Serializable, RetirableEntity {
 
     private static final long serialVersionUID = 1L;
     @Id
@@ -71,11 +71,18 @@ public class StockHistory implements Serializable, RetirableEntity  {
     int hxWeek;
     // This give the sotck of this Item for this department
     private Double itemStock;
-    // This give the sotck of this Item for this Institution
     private Double institutionItemStock;
-    // This give the sotck of this Item for the system
     private Double totalItemStock;
 
+    private Double itemStockValueAtSaleRate;
+    private Double institutionItemStockValueAtSaleRate;
+    private Double totalItemStockValueAtSaleRate;
+
+    private Double itemStockValueAtPurchaseRate;
+    private Double institutionItemStockValueAtPurchaseRate;
+    private Double totalItemStockValueAtPurchaseRate;
+
+
     //Created Properties
     @ManyToOne
     private WebUser creater;
@@ -89,6 +96,8 @@ public class StockHistory implements Serializable, RetirableEntity  {
     private Date retiredAt;
     private String retireComments;
 
+
+
     public Date getStockAt() {
         return stockAt;
     }
@@ -353,7 +362,53 @@ public Double getTotalItemStock() {
     public void setTotalItemStock(Double totalItemStock) {
         this.totalItemStock = totalItemStock;
     }
-
-
+
+    public Double getItemStockValueAtSaleRate() {
+        return itemStockValueAtSaleRate;
+    }
+
+    public void setItemStockValueAtSaleRate(Double itemStockValueAtSaleRate) {
+        this.itemStockValueAtSaleRate = itemStockValueAtSaleRate;
+    }
+
+    public Double getInstitutionItemStockValueAtSaleRate() {
+        return institutionItemStockValueAtSaleRate;
+    }
+
+    public void setInstitutionItemStockValueAtSaleRate(Double institutionItemStockValueAtSaleRate) {
+        this.institutionItemStockValueAtSaleRate = institutionItemStockValueAtSaleRate;
+    }
+
+    public Double getTotalItemStockValueAtSaleRate() {
+        return totalItemStockValueAtSaleRate;
+    }
+
+    public void setTotalItemStockValueAtSaleRate(Double totalItemStockValueAtSaleRate) {
+        this.totalItemStockValueAtSaleRate = totalItemStockValueAtSaleRate;
+    }
+
+    public Double getItemStockValueAtPurchaseRate() {
+        return itemStockValueAtPurchaseRate;
+    }
+
+    public void setItemStockValueAtPurchaseRate(Double itemStockValueAtPurchaseRate) {
+        this.itemStockValueAtPurchaseRate = itemStockValueAtPurchaseRate;
+    }
+
+    public Double getInstitutionItemStockValueAtPurchaseRate() {
+        return institutionItemStockValueAtPurchaseRate;
+    }
+
+    public void setInstitutionItemStockValueAtPurchaseRate(Double institutionItemStockValueAtPurchaseRate) {
+        this.institutionItemStockValueAtPurchaseRate = institutionItemStockValueAtPurchaseRate;
+    }
+
+    public Double getTotalItemStockValueAtPurchaseRate() {
+        return totalItemStockValueAtPurchaseRate;
+    }
+
+    public void setTotalItemStockValueAtPurchaseRate(Double totalItemStockValueAtPurchaseRate) {
+        this.totalItemStockValueAtPurchaseRate = totalItemStockValueAtPurchaseRate;
+    }
 
 }

src/main/webapp/pharmacy/pharmacy_cancel_bill_retail.xhtml

@@ -21,7 +21,12 @@
                                     <p:spacer width="200" />
                                     <p:inputText placeholder="Enter Comments to Cancel Bill" value="#{pharmacyBillSearch.bill.comments}" class="p-2 w-50" />
                                     <h:panelGrid columns="2" class="my-2">
-                                        <p:commandButton class="ui-button-danger" icon="fas fa-cancel" value="Cancel" ajax="false" action="#{pharmacyBillSearch.pharmacyRetailCancelBillWithStock()}" >
+                                        <p:commandButton
+                                            class="ui-button-danger" 
+                                            icon="fas fa-cancel" 
+                                            value="CANCEL" 
+                                            ajax="false" 
+                                            action="#{pharmacyBillSearch.pharmacyRetailCancelBillWithStock()}" >
                                         </p:commandButton>
                                         <p:commandButton class="ui-button-secondary mx-2" icon="fas fa-arrow-left" value="Back" onclick="history.back(); return false;" >
                                         </p:commandButton>

src/main/webapp/pharmacy/pharmacy_reprint_bill_sale.xhtml

@@ -53,7 +53,7 @@
                                     value="To Cancel"
                                     icon="fa fa-cancel"
                                     class="ui-button-danger"
-                                    action="pharmacy_cancel_bill_retail?faces-redirect=true" 
+                                    action="#{pharmacyBillSearch.navigateToCancelPharmacyRetailSale()}" 
                                     disabled="#{pharmacyBillSearch.bill.cancelled}"
                                     rendered="#{webUserController.hasPrivilege('PharmacySaleCancel')}">                           
                                 </p:commandButton>

src/main/webapp/pharmacy/pharmacy_search_sale_bill.xhtml

@@ -80,7 +80,7 @@
                                             ajax="false" 
                                             value="#{bill.deptId}" 
                                             disabled="#{bill.referenceBill eq null}"
-                                            action="pharmacy_reprint_bill_sale">
+                                            action="#{pharmacyBillSearch.navigatePharmacyReprintRetailBill()}">
                                             <f:setPropertyActionListener value="#{bill.referenceBill}" target="#{pharmacyBillSearch.bill}"/>  
                                         </p:commandLink>
                                     </p:column>

src/main/webapp/reports/inventoryReports/stock_ledger.xhtml

@@ -342,7 +342,7 @@
                                 <h:outputText value="#{f.pbItem.purchaseRate}"><f:convertNumber pattern="#,##0.00" /></h:outputText>
                             </p:column>
                             <p:column headerText="Closing Stock Value" width="15em">
-                                <h:outputText value="" />
+                                <h:outputText value="#{f.itemStockValueAtPurchaseRate}" />
                             </p:column>
                             <p:column headerText="Locator" width="5em">
                                 <h:outputText value="" />