Skip to content

Commit 1023935

Browse files
ChinthakaPrasadChinthakaPrasad
authored
Merge pull request #11285 from hmislk/development
up to date changes to coop test
2 parents 9f017f1 + 5565f06 commit 1023935

File tree

10 files changed

+1666
-229
lines changed

10 files changed

+1666
-229
lines changed

‎src/main/java/com/divudi/bean/lab/LaboratoryReportController.java

Lines changed: 622 additions & 0 deletions
Large diffs are not rendered by default.

‎src/main/java/com/divudi/bean/opd/OpdBillController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3166,7 +3166,7 @@ public void calTotals() {
31663166
}
31673167

31683168
private boolean billFeeIsThereAsSelectedInBillFeeBundle(BillFee bf) {
3169-
System.out.println("billFeeIsThereAsSelectedInBillFeeBundle");
3169+
//System.out.println("billFeeIsThereAsSelectedInBillFeeBundle");
31703170
if (bf == null) {
31713171
return false;
31723172
}

‎src/main/java/com/divudi/bean/pharmacy/PharmacyPreSettleController.java

Lines changed: 284 additions & 51 deletions
Large diffs are not rendered by default.

‎src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public PharmacySaleController() {
200200
private List<ClinicalFindingValue> allergyListOfPatient;
201201
private boolean billSettlingStarted;
202202

203-
PaymentScheme paymentScheme;
203+
private PaymentScheme paymentScheme;
204204

205205
int activeIndex;
206206

‎src/main/java/com/divudi/bean/pharmacy/PharmacySummaryReportController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ public void processPharmacyIncomeReport() {
452452
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_CANCELLED);
453453
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_REFUND);
454454
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_RETURN_ITEMS_AND_PAYMENTS);
455+
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_PREBILL_SETTLED_AT_CASHIER);
455456
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_RETURN_ITEMS_ONLY);
456457
billTypeAtomics.add(BillTypeAtomic.PHARMACY_WHOLESALE);
457458
billTypeAtomics.add(BillTypeAtomic.PHARMACY_WHOLESALE_CANCELLED);

‎src/main/webapp/pharmacy/pharmacy_bill_pre_settle.xhtml

Lines changed: 252 additions & 100 deletions
Large diffs are not rendered by default.

‎src/main/webapp/pharmacy/reports/summary_reports/pharmacy_income_report.xhtml

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@
217217
paginatorPosition="bottom">
218218
<p:column headerText="Bill No" width="16em" style="padding: 0px!important; margin: 0px!important;" >
219219
<h:outputText value="#{row.bill.deptId}" style="padding: 0px!important; margin: 0px!important;" />
220+
<f:facet name="footer" >
221+
<h:outputText value="Total Amounts" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
222+
223+
</h:outputText>
224+
</f:facet>
220225
</p:column>
221226
<p:column headerText="Patient" style="padding: 0px!important; margin: 0px!important;" >
222227
<h:outputText value="#{row.bill.patient.person.nameWithTitle}" style="padding: 0px!important; margin: 0px!important;" />
@@ -231,7 +236,7 @@
231236
<f:convertNumber pattern="#,##0.00" />
232237
</h:outputText>
233238
<f:facet name="footer" >
234-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.netTotal}" style="padding: 0px!important; margin: 0px!important;" >
239+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.netTotal}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
235240
<f:convertNumber pattern="#,##0.00" />
236241
</h:outputText>
237242
</f:facet>
@@ -241,7 +246,7 @@
241246
<f:convertNumber pattern="#,##0.00" />
242247
</h:outputText>
243248
<f:facet name="footer" >
244-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.cashValue}" style="padding: 0px!important; margin: 0px!important;" >
249+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.cashValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
245250
<f:convertNumber pattern="#,##0.00" />
246251
</h:outputText>
247252
</f:facet>
@@ -252,7 +257,7 @@
252257
<f:convertNumber pattern="#,##0.00" />
253258
</h:outputText>
254259
<f:facet name="footer" >
255-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.cardValue}" style="padding: 0px!important; margin: 0px!important;" >
260+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.cardValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
256261
<f:convertNumber pattern="#,##0.00" />
257262
</h:outputText>
258263
</f:facet>
@@ -263,7 +268,7 @@
263268
<f:convertNumber pattern="#,##0.00" />
264269
</h:outputText>
265270
<f:facet name="footer" >
266-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.chequeValue}" style="padding: 0px!important; margin: 0px!important;" >
271+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.chequeValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
267272
<f:convertNumber pattern="#,##0.00" />
268273
</h:outputText>
269274
</f:facet>
@@ -274,7 +279,7 @@
274279
<f:convertNumber pattern="#,##0.00" />
275280
</h:outputText>
276281
<f:facet name="footer" >
277-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.inpatientCreditValue}" style="padding: 0px!important; margin: 0px!important;" >
282+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.inpatientCreditValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
278283
<f:convertNumber pattern="#,##0.00" />
279284
</h:outputText>
280285
</f:facet>
@@ -285,7 +290,7 @@
285290
<f:convertNumber pattern="#,##0.00" />
286291
</h:outputText>
287292
<f:facet name="footer" >
288-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.opdCreditValue}" style="padding: 0px!important; margin: 0px!important;" >
293+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.opdCreditValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
289294
<f:convertNumber pattern="#,##0.00" />
290295
</h:outputText>
291296
</f:facet>
@@ -296,7 +301,7 @@
296301
<f:convertNumber pattern="#,##0.00" />
297302
</h:outputText>
298303
<f:facet name="footer" >
299-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.staffValue}" style="padding: 0px!important; margin: 0px!important;" >
304+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.staffValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
300305
<f:convertNumber pattern="#,##0.00" />
301306
</h:outputText>
302307
</f:facet>
@@ -307,7 +312,7 @@
307312
<f:convertNumber pattern="#,##0.00" />
308313
</h:outputText>
309314
<f:facet name="footer" >
310-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.agentValue}" style="padding: 0px!important; margin: 0px!important;" >
315+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.agentValue}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
311316
<f:convertNumber pattern="#,##0.00" />
312317
</h:outputText>
313318
</f:facet>
@@ -318,7 +323,7 @@
318323
<f:convertNumber pattern="#,##0.00" ></f:convertNumber>
319324
</h:outputText>
320325
<f:facet name="footer" >
321-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.grossTotal}" style="padding: 0px!important; margin: 0px!important;" >
326+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.grossTotal}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
322327
<f:convertNumber pattern="#,##0.00" />
323328
</h:outputText>
324329
</f:facet>
@@ -328,7 +333,7 @@
328333
<f:convertNumber pattern="#,##0.00" ></f:convertNumber>
329334
</h:outputText>
330335
<f:facet name="footer" >
331-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.discount}" style="padding: 0px!important; margin: 0px!important;" >
336+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.discount}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
332337
<f:convertNumber pattern="#,##0.00" />
333338
</h:outputText>
334339
</f:facet>
@@ -339,7 +344,7 @@
339344
<f:convertNumber pattern="#,##0.00" ></f:convertNumber>
340345
</h:outputText>
341346
<f:facet name="footer" >
342-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.serviceCharge}" style="padding: 0px!important; margin: 0px!important;" >
347+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.serviceCharge}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
343348
<f:convertNumber pattern="#,##0.00" />
344349
</h:outputText>
345350
</f:facet>
@@ -350,7 +355,7 @@
350355
<f:convertNumber pattern="#,##0.00" ></f:convertNumber>
351356
</h:outputText>
352357
<f:facet name="footer" >
353-
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.netTotal}" style="padding: 0px!important; margin: 0px!important;" >
358+
<h:outputText value="#{pharmacySummaryReportController.bundle.summaryRow.netTotal}" style="padding: 0px!important; margin: 0px!important; font-weight: bold" >
354359
<f:convertNumber pattern="#,##0.00" />
355360
</h:outputText>
356361
</f:facet>
@@ -366,24 +371,24 @@
366371
<f:setPropertyActionListener value="#{row.bill}" target="#{billSearch.bill}" />
367372
</p:commandLink>
368373

369-
<!-- <p:commandLink
370-
value="Manage"
371-
style="font-size: #{pharmacySummaryReportController.fontSizeForScreen}!important;"
372-
class="mx-1"
373-
action="#{billSearch.navigateToManageBillByAtomicBillType()}"
374-
ajax="false">
375-
<f:setPropertyActionListener value="#{row.bill}" target="#{billSearch.bill}" />
376-
</p:commandLink>-->
377-
378-
<!-- <p:commandLink
379-
value="Admin"
380-
style="font-size: #{pharmacySummaryReportController.fontSizeForScreen}!important;"
381-
class="mx-1"
382-
action="#{billSearch.navigateToAdminBillByAtomicBillType()}"
383-
ajax="false"
384-
rendered="#{webUserController.hasPrivilege('Developers')}">
385-
<f:setPropertyActionListener value="#{row.bill}" target="#{billSearch.bill}" />
386-
</p:commandLink>-->
374+
<!-- <p:commandLink
375+
value="Manage"
376+
style="font-size: #{pharmacySummaryReportController.fontSizeForScreen}!important;"
377+
class="mx-1"
378+
action="#{billSearch.navigateToManageBillByAtomicBillType()}"
379+
ajax="false">
380+
<f:setPropertyActionListener value="#{row.bill}" target="#{billSearch.bill}" />
381+
</p:commandLink>-->
382+
383+
<!-- <p:commandLink
384+
value="Admin"
385+
style="font-size: #{pharmacySummaryReportController.fontSizeForScreen}!important;"
386+
class="mx-1"
387+
action="#{billSearch.navigateToAdminBillByAtomicBillType()}"
388+
ajax="false"
389+
rendered="#{webUserController.hasPrivilege('Developers')}">
390+
<f:setPropertyActionListener value="#{row.bill}" target="#{billSearch.bill}" />
391+
</p:commandLink>-->
387392
</p:column>
388393

389394

0 commit comments

Comments
 (0)