10106 request value approved value was wrong in po (#10591)

* fact: add expense section to direct purchase and update bill with net total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update mp_prod_ci_cd.yml * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10334 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #7830 now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #3832 For Institutions where GRN payment approval is NOT necessary (Make the configuration) Payments Menu > SUpplier Payment > Settle Bills by SUpplier * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9681 Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10425 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10462 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Import export json completed Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Import for Grn Done. Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10471 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10471 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10452 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: buddhika <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Fixes #10584 : Improved bill search with additional filters, optimized queries, and UI enhancements Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes 10586 -adding-a-feature-to-list-bills-with-errors-for-administrators 10586: Added a feature to list bills with errors for administrators. Introduced a 'Bills with Errors' button, implemented filtering by date, institution, department, and bill type, added validation checks for missing Bill Type Atomic and net total mismatches, and enhanced the UI with an export option. Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10106 Signed-off-by: Dr M H B Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Signed-off-by: buddhika <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> Co-authored-by: buddhika <[email protected]>
hmislk · Feb 16, 2025 · 965d5ef · 965d5ef
1 parent 20ea93f
commit 965d5ef
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/src/main/webapp/dataAdmin/bills_with_errors.xhtml b/src/main/webapp/dataAdmin/bills_with_errors.xhtml
@@ -192,17 +192,17 @@
                                          rowsPerPageTemplate="5,10,15,50"
                                          >
 
-                                <p:column rendered="#{webUserController.hasPrivilege('Developers')}" headerText="Bill ID" sortBy="#{bill.id}" filterBy="#{bill.id}" filterMatchMode="contains" >                                
+<!--                                <p:column rendered="#{webUserController.hasPrivilege('Developers')}" headerText="Bill ID" sortBy="#{bill.id}" filterBy="#{bill.id}" filterMatchMode="contains" >                                
                                     <h:outputLabel value="#{bill.id}"/>
-                                </p:column>
+                                </p:column>-->
                                 <p:column
                                     headerText="Bill No" sortBy="#{bill.deptId}" filterBy="#{bill.deptId}" 
                                     filterMatchMode="contains" >                                
                                     <h:outputLabel value="#{bill.deptId}"/>
                                 </p:column>
-                                <p:column headerText="Bill Class" >                                
+<!--                                <p:column headerText="Bill Class" >                                
                                     <h:outputLabel value="#{bill.billClass}"/>
-                                </p:column>
+                                </p:column>-->
                                 <p:column headerText="Bill Type" >                                
                                     <h:outputLabel value="#{bill.billTypeAtomic.label}"/>
                                 </p:column>
@@ -219,30 +219,27 @@
                                 </p:column>
                                 <p:column headerText="No" exportable="false" styleClass="alignTop">
                                     <p:commandButton 
-                                        value="View" 
+                                        title="View" 
                                         icon="fa fa-eye" 
                                         class="m-1 ui-button-info"
-                                        style="width: 100px;"
                                         action="#{billSearch.navigateToViewBillByAtomicBillType()}" 
                                         ajax="false">
                                         <f:setPropertyActionListener value="#{bill}" target="#{billSearch.bill}" />
                                     </p:commandButton>
 
                                     <p:commandButton 
-                                        value="Manage" 
+                                        title="Manage" 
                                         icon="fa fa-tools" 
                                         class="m-1 ui-button-warning" 
-                                        style="width: 100px;"
                                         action="#{billSearch.navigateToManageBillByAtomicBillType()}" 
                                         ajax="false">
                                         <f:setPropertyActionListener value="#{bill}" target="#{billSearch.bill}" />
                                     </p:commandButton>
 
                                     <p:commandButton 
-                                        value="Admin" 
+                                        title="Admin" 
                                         icon="fa fa-shield-alt" 
                                         class="m-1 ui-button-danger" 
-                                        style="width: 100px;"
                                         action="#{billSearch.navigateToAdminBillByAtomicBillType()}" 
                                         ajax="false" 
                                         rendered="#{webUserController.hasPrivilege('Developers')}">

diff --git a/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml b/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
@@ -102,11 +102,11 @@
                             </p:column>
 
                             <p:column headerText="Item Name" >  
-                                #{bi.item.name} 
+                                <h:outputText value="#{bi.item.name}" ></h:outputText>
                             </p:column>  
 
                             <p:column headerText="Code" styleClass="shortNumericColumn"  >  
-                                #{bi.item.code}
+                                <h:outputText value="#{bi.item.code}" ></h:outputText>
                             </p:column>  
 
                             <p:column headerText="Qty" styleClass="averageNumericColumn" width="6em">                         
@@ -127,7 +127,7 @@
                                 <h:panelGroup id="price">
                                     <p:inputText autocomplete="off" value="#{bi.pharmaceuticalBillItem.purchaseRate}" onfocus="this.select()">   
                                         <f:convertNumber pattern="#00.00"/>
-                                        <f:ajax event="blur" render="total :#{p:resolveFirstComponentWithId('tot',view).clientId}"  execute="@this qty" listener="#{purchaseOrderController.onEdit(bi)}" ></f:ajax>
+                                        <f:ajax event="blur" render="total :#{p:resolveFirstComponentWithId('tot',view).clientId}"  execute="@this" listener="#{purchaseOrderController.onEdit(bi)}" ></f:ajax>
                                         <f:ajax event="focus" render=":#{p:resolveFirstComponentWithId('tab',view).clientId}" listener="#{purchaseOrderController.onFocus(bi)}" />
                                     </p:inputText>
                                 </h:panelGroup>

diff --git a/src/main/webapp/resources/pharmacy/po.xhtml b/src/main/webapp/resources/pharmacy/po.xhtml
@@ -140,6 +140,18 @@
                             </h:panelGroup>
                         </ui:repeat>
                     </tbody>
+                    <tfoot>
+                        <tr >
+                            <th></th>
+                            <th colspan="4" >Total</th>
+                            <th style="width: 100px; text-align: right; padding-right: 5px; border: 1px solid black; font-weight: bold;">
+
+                                <h:outputText value="#{cc.attrs.bill.netTotal}">
+                                    <f:convertNumber pattern="#,###.00" />
+                                </h:outputText>
+                            </th>
+                        </tr>
+                    </tfoot>
                 </table>
 
             </div>