Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

closed #9696
hmislk · Dec 19, 2024 · 4239980 · 4239980
1 parent 58df692
commit 4239980
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/src/main/webapp/pharmacy/pharmacy_report_transfer_issue_bill_1.xhtml b/src/main/webapp/pharmacy/pharmacy_report_transfer_issue_bill_1.xhtml
@@ -47,7 +47,7 @@
                                 value="Excel" 
                                 icon="fas fa-file-excel"
                                 class="ui-button-success mx-2">
-                                <p:dataExporter type="xlsx" target="tbl" fileName="Detailed_Transfer_Listing"  />
+                                <p:dataExporter type="xlsx" target="tbl" fileName="Transfer_Issue_by_Bill"  />
                             </p:commandButton>
                             <p:commandButton 
                                 value="Print" 
@@ -87,17 +87,14 @@
                                     <f:facet name="header">
                                         <h:outputLabel value="Bill No"/>
                                     </f:facet>
-                                    <h:outputLabel value="#{i.deptId}" ></h:outputLabel>     
-
-                                    <p:commandButton 
-                                            ajax="false" 
-                                            icon="far fa-eye"
-                                            title="View Bill"
-                                            style="float: right;"
-                                            class="ui-button-info"
-                                            action="pharmacy_reprint_transfer_isssue" >
+
+                                     <p:commandLink 
+                                        ajax="false" 
+                                        value="#{i.deptId}" 
+                                        action="pharmacy_reprint_transfer_isssue" >
                                             <f:setPropertyActionListener target="#{pharmacyBillSearch.bill}" value="#{i}"/>
-                                        </p:commandButton>
+                                    </p:commandLink>
+
                                 </p:column>
 
                                 <p:column headerText="Cancelled No" sortBy="#{i.cancelledBill.deptId}">

diff --git a/src/main/webapp/pharmacy/pharmacy_report_transfer_issue_bill_item_1.xhtml b/src/main/webapp/pharmacy/pharmacy_report_transfer_issue_bill_item_1.xhtml
@@ -47,7 +47,7 @@
                                 value="Excel" 
                                 icon="fas fa-file-excel"
                                 class="ui-button-success mx-2">
-                                <p:dataExporter type="xlsx" target="tbl" fileName="Detailed_Transfer_Listing"  />
+                                <p:dataExporter type="xlsx" target="tbl" fileName="Transfer_Issue_by_Bill_Item"  />
                             </p:commandButton>
                             <p:commandButton 
                                 value="Print" 
@@ -134,7 +134,7 @@
                                     <f:facet name="header">
                                         <h:outputLabel value="Quantity"/>
                                     </f:facet> 
-                                    <h:outputLabel value="#{i.pharmaceuticalBillItem.qty}" >
+                                    <h:outputLabel value="#{0 - i.pharmaceuticalBillItem.qty}" >
                                         <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
                                     </h:outputLabel>
                                 </p:column>
@@ -152,7 +152,7 @@
                                     <f:facet name="header">
                                         <h:outputLabel value="Purchase Value"/>
                                     </f:facet>
-                                    <h:outputLabel value="#{i.pharmaceuticalBillItem.itemBatch.purcahseRate * i.pharmaceuticalBillItem.qty}">
+                                    <h:outputLabel value="#{0 - i.pharmaceuticalBillItem.itemBatch.purcahseRate * i.pharmaceuticalBillItem.qty}">
                                         <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
                                     </h:outputLabel>                                  
                                 </p:column>
@@ -181,7 +181,7 @@
                                         <p:column colspan="6"/>
                                         <p:column style="text-align: right;" >
                                             <f:facet name="footer">
-                                                <h:outputLabel value="#{reportsTransfer.purchaseValue}" >
+                                                <h:outputLabel value="#{0 - reportsTransfer.purchaseValue}" >
                                                     <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
                                                 </h:outputLabel>
                                             </f:facet>

diff --git a/src/main/webapp/pharmacy/pharmacy_report_transfer_receive_bill.xhtml b/src/main/webapp/pharmacy/pharmacy_report_transfer_receive_bill.xhtml
@@ -48,7 +48,7 @@
                                 value="Excel" 
                                 icon="fas fa-file-excel"
                                 class="ui-button-success mx-2">
-                                <p:dataExporter type="xlsx" target="tbl" fileName="Detailed_Transfer_Listing"  />
+                                <p:dataExporter type="xlsx" target="tbl" fileName="Transfer_Receive_by_Bill"  />
                             </p:commandButton>
                             <p:commandButton 
                                 value="Print" 
@@ -88,16 +88,12 @@
                                     <f:facet name="header">
                                         <h:outputLabel value="Bill No"/>
                                     </f:facet>
-                                    <h:outputLabel value="#{i.deptId}" ></h:outputLabel>
-                                    <p:commandButton 
-                                            ajax="false" 
-                                            icon="far fa-eye"
-                                            title="View Bill"
-                                            style="float: right;"
-                                            class="ui-button-info"
-                                            action="pharmacy_reprint_transfer_isssue" >
+                                    <p:commandLink 
+                                        ajax="false" 
+                                        value="#{i.deptId}" 
+                                        action="pharmacy_reprint_transfer_isssue" >
                                             <f:setPropertyActionListener target="#{pharmacyBillSearch.bill}" value="#{i}"/>
-                                        </p:commandButton>  
+                                    </p:commandLink>  
                                 </p:column>
 
                                 <p:column headerText="Date">

diff --git a/src/main/webapp/pharmacy/pharmacy_report_transfer_receive_bill_item_1.xhtml b/src/main/webapp/pharmacy/pharmacy_report_transfer_receive_bill_item_1.xhtml
@@ -48,7 +48,7 @@
                                 value="Excel" 
                                 icon="fas fa-file-excel"
                                 class="ui-button-success mx-2">
-                                <p:dataExporter type="xlsx" target="tbl" fileName="Detailed_Transfer_Listing"  />
+                                <p:dataExporter type="xlsx" target="tbl" fileName="Transfer_Receive_by_Bill_Item"  />
                             </p:commandButton>
                             <p:commandButton 
                                 value="Print"