@@ -, +, @@
---
.../prog/en/modules/serials/subscription-detail.tt | 131 +++++++++++----------
1 file changed, 66 insertions(+), 65 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -61,7 +61,7 @@
- [% END %]
+ [% END # /IF NEEDSCONFIRMATION %]
[% IF mana_code.defined %]
-
+
+
@@ -433,52 +434,52 @@
[% FOR order IN parent_order.orders %]
-
- [% IF order.invoice %]
- [% IF CAN_user_acquisition %]
-
- [% order.invoice.invoicenumber | html %]
- [% ELSE %]
- [% order.invoice.invoicenumber | html %]
- [% END %]
- [% END %]
- |
- | [%# basket %]
- [% order.ordernumber | html %] |
- [% order.basket.creationdate | $KohaDates%] |
- [% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] |
-
- [% SWITCH order.orderstatus %]
- [% CASE 'new' %]New
- [% CASE 'ordered' %]Ordered
- [% CASE 'partial' %]Partial
- [% CASE 'complete' %]Complete
- [% CASE 'cancelled' %]Cancelled
- [% END %]
- |
- [% order.order_internalnote | html %] |
- [% order.order_vendornote | html %] |
- [% order.fund.budget_name | html %] |
- [% order.quantity | html %] |
-
- [% UNLESS order.datereceived %]
- [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %]
- [% END %]
- |
-
- [% IF order.datereceived %]
- [%# FIXME What if unitprice has not been filled? %]
- [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
+ |
+ [% IF order.invoice %]
+ [% IF CAN_user_acquisition %]
+
+ [% order.invoice.invoicenumber | html %]
+ [% ELSE %]
+ [% order.invoice.invoicenumber | html %]
+ [% END %]
[% END %]
- |
-
- [% END %]
- [% END %]
+
+
| [%# basket %]
+
[% order.ordernumber | html %] |
+
[% order.basket.creationdate | $KohaDates%] |
+
[% IF order.datereceived %][% order.datereceived | $KohaDates %][% END %] |
+
+ [% SWITCH order.orderstatus %]
+ [% CASE 'new' %]New
+ [% CASE 'ordered' %]Ordered
+ [% CASE 'partial' %]Partial
+ [% CASE 'complete' %]Complete
+ [% CASE 'cancelled' %]Cancelled
+ [% END %]
+ |
+
[% order.order_internalnote | html %] |
+
[% order.order_vendornote | html %] |
+
[% order.fund.budget_name | html %] |
+
[% order.quantity | html %] |
+
+ [% UNLESS order.datereceived %]
+ [% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %]
+ [% END %]
+ |
+
+ [% IF order.datereceived %]
+ [%# FIXME What if unitprice has not been filled? %]
+ [% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
+ [% END %]
+ |
+
+ [% END # /FOR order %]
+ [% END # /FOR ordernumber %]
-
-
- [% END %]
-
+
+
+ [% END # IF orders_grouped.size %]
+
--