diff --git a/src/main/webapp/pharmacy/pharmacy_report_bht_issue_bill.xhtml b/src/main/webapp/pharmacy/pharmacy_report_bht_issue_bill.xhtml index 14270cf358..fb25306624 100644 --- a/src/main/webapp/pharmacy/pharmacy_report_bht_issue_bill.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_report_bht_issue_bill.xhtml @@ -64,21 +64,24 @@ class="ui-button-info" action="#" > - + - - + + -   + -   +
@@ -90,100 +93,229 @@
- + - + #{i.billType} - + - + - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + + +
+ + + + + + #{i.billType} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml b/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml index db6a73af7c..388a1b7a73 100644 --- a/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml +++ b/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml @@ -71,14 +71,19 @@ icon="fas fa-print" class="ui-button-info" action="#" > - + - - + +   @@ -95,92 +100,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Cancelled - + Returned - + - + - + - + - + - + - + - + - + + + + + + +   + +   + +

+   + + + +   + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cancelled + + + + Returned + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ diff --git a/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_receive_bill.xhtml b/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_receive_bill.xhtml index 850a89910a..d8d7b21fb7 100644 --- a/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_receive_bill.xhtml +++ b/src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_receive_bill.xhtml @@ -50,35 +50,35 @@ icon="fas fa-print" class="ui-button-info" action="#" > - + - + - +
+ - + - +
+ - + @@ -92,60 +92,61 @@ --> - + - + - - + + - - + + - + - + - + - - + + - + - + - + - + - + @@ -153,16 +154,117 @@ - +
+
+ + + + + +
+ + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/resources/css/ohmis.css b/src/main/webapp/resources/css/ohmis.css index 70fca88aa9..3e56dd45c5 100644 --- a/src/main/webapp/resources/css/ohmis.css +++ b/src/main/webapp/resources/css/ohmis.css @@ -675,13 +675,23 @@ th.align-right-header .ui-column-title { } } -@media screen { - .printingOnly{ +@media print { + .printingOnly { + display: block !important; + } + .screenOnly { display: none !important; - } } +@media screen { + .printingOnly { + display: none !important; + } + .screenOnly { + display: block !important; + } +} /* Adjust the size of the autocomplete dropdown panel */