Skip to content

11201 if selected a4 paper in direct issue two bills displayed #11229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 20, 2025
Merged

11201 if selected a4 paper in direct issue two bills displayed #11229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e86f0fe
add new bill for pharmacy return without traising
ChinthakaPrasad Mar 20, 2025
4bef96b
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
ChinthakaPrasad Mar 20, 2025
5c94cfc
improve purchase return without receipt bill
ChinthakaPrasad Mar 20, 2025
3402cdd
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad…
ChinthakaPrasad Mar 20, 2025
8dde6bc
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
ChinthakaPrasad Mar 20, 2025
c88caad
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad…
ChinthakaPrasad Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions src/main/webapp/pharmacy/pharmacy_return_withouttresing.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
value="#{pharmacyReturnwithouttresing.preBill.netTotal}" >
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>

<p:separator ></p:separator>
<p:separator ></p:separator>
<h:outputLabel value="Sale Value" ></h:outputLabel>
Expand All @@ -342,42 +342,27 @@
value="#{pharmacyReturnwithouttresing.preBill.pharmacyBill.saleValue}" >
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>


</p:panelGrid>




</p:panel>
</div>
</div>

</p:panel>







</p:panel>


</h:form>

<h:form>


<p:panel rendered="#{pharmacyReturnwithouttresing.billPreview}" >




<p:commandButton id="nullButton3" value="No Action" action="#" style="display: none;" ></p:commandButton>
<p:defaultCommand target="btnPrint" />

<div class="nonPrintBlock" >
<div class="nonPrintBlock mb-4" >
<p:commandButton accesskey="p" id="btnPrint" value="Print" ajax="false" action="#" class="ui-button-info" icon="fas fa-print">
<p:printer target="gpBillPreview" ></p:printer>
</p:commandButton>
Expand All @@ -395,13 +380,14 @@


</div>

<!-- <div >
<h:panelGroup id="gpBillPreview">
<phi:issue bill="#{pharmacyReturnwithouttresing.printBill}"></phi:issue>
</h:panelGroup>
</div>-->

<h:panelGroup id="gpBillPreview" >
<h:panelGroup id="gpBillPreview">

<h:panelGroup id="gpBillPreviewSingle" rendered="#{sessionController.loggedPreference.pharmacyBillPaperType eq 'PosPaper'}">

Expand All @@ -425,27 +411,27 @@

<h:panelGroup id="gpBillPreviewFiveFive" rendered="#{sessionController.loggedPreference.pharmacyBillPaperType eq 'FiveFivePaper'}">

<div >
<div>
<h:panelGroup rendered="#{sessionController.loggedPreference.pharmacyBillPrabodha eq false}" >
<phi:saleBill_five_five bill="#{pharmacyReturnwithouttresing.printBill}"></phi:saleBill_five_five>
</h:panelGroup>
</div>

</h:panelGroup>

</h:panelGroup>
</h:panelGroup>

<h:panelGroup id="gpBillPreviewA4" rendered="#{sessionController.loggedPreference.pharmacyBillPaperType eq 'A4Paper'}">

<div >
<h:panelGroup rendered="#{sessionController.loggedPreference.pharmacyBillPrabodha eq false}" >
<phi:pharmacyReturnWithoutTresingA4 bill="#{pharmacyReturnwithouttresing.printBill}" duplicate="false"></phi:pharmacyReturnWithoutTresingA4>
</h:panelGroup>
</div>

</h:panelGroup>
</h:panelGroup>
</p:panel>



</h:form>

</ui:define>

</ui:composition>

</h:body>
</html>
Loading