Skip to content

Commit

Permalink
Merge pull request #10006 from hmislk/Issue#9965/collection-centre-bo…
Browse files Browse the repository at this point in the history 
…ok-wise-detail-bugs

Issue#9965/collection centre book wise detail bugs Closes #9965
  • Loading branch information
@Irani96
Irani96 authored Jan 7, 2025
2 parents 315fc15 + 68d4813 commit c2fbc60
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 112 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/divudi/bean/common/ReportsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@ public void generateCollectionCenterBookWiseDetailReport() {
opdBts.add(BillTypeAtomic.CC_BILL);
opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION);
opdBts.add(BillTypeAtomic.CC_BILL_REFUND);
opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);
// opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);

bundle.setName("Bills");
bundle.setBundleType("billList");
Expand Down
26 changes: 13 additions & 13 deletions src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,27 +157,27 @@
completeMethod="#{stockController.completeAvailableStocks}"
var="i" itemLabel="#{i.itemBatch.item.name}" itemValue="#{i}"
>
<p:column headerText="Item" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column headerText="Item" style="padding: 6px;" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.item.name}">
&nbsp;<p:tag rendered="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'Expired ':
commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'Expired Soon':''}"
severity="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'warning':''}" />
</h:outputLabel>
</p:column>
<p:column headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.item.code}" ></h:outputLabel>
</p:column>
<p:column headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.stock}" >
<f:convertNumber pattern="#,###" ></f:convertNumber>
</h:outputLabel>
</p:column>
<p:column headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.dateOfExpire}">
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
</h:outputLabel>
</p:column>
<p:column headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<p:column style="padding: 6px;" headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
<h:outputLabel value="#{i.itemBatch.retailsaleRate}">
</h:outputLabel>
</p:column>
Expand Down Expand Up @@ -224,14 +224,14 @@
<p:ajax event="rowEditCancel" listener="#{pharmacySaleBhtController.onEdit}"/>


<p:column headerText="Item" style="width: 30%">
<p:column headerText="Item" style="width: 48%; padding: 6px;">
<h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.item.name}" >
&nbsp;<p:tag rendered="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired ':
commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired Soon':''}"
severity="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'warning':''}" />
</h:outputLabel>
</p:column>
<p:column headerText="Quantity">
<p:column style="padding: 6px;width: 10%;" headerText="Quantity">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{bi.qty}" >
Expand All @@ -243,20 +243,20 @@
</f:facet>
</p:cellEditor>
</p:column>
<p:column >

<p:column style="padding: 6px;width: 15%;" >
<p:rowEditor />
</p:column>



<p:column headerText="Expiry">
<p:column style="padding: 6px; width: 17%;" headerText="Expiry">
<h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.dateOfExpire}" >
<f:convertDateTime timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}" ></f:convertDateTime>
</h:outputLabel>

</p:column>
<p:column headerText="Remove">
<p:commandButton class="ui-button-danger" icon="fas fa-trash" value="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false" >
<p:column style="padding: 6px;width: 10%;" headerText="Remove">

<p:commandButton class="ui-button-danger" icon="fas fa-trash" title="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false" >

</p:commandButton>
</p:column>
Expand Down
Loading

0 comments on commit c2fbc60

Please sign in to comment.