@@ -, +, @@ page --- .../prog/en/modules/serials/subscription-detail.tt | 73 +++++++++++++++------- serials/subscription-detail.pl | 66 ++----------------- 2 files changed, 56 insertions(+), 83 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 @@ -1,7 +1,9 @@ [% USE Asset %] [% USE Koha %] +[% USE KohaDates %] [% USE Branches %] [% USE AuthorisedValues %] +[% USE Price %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %]
Price exc. taxes | Price inc. taxes | Fund | |||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Invoice | +Basket | +Order number | +Creation date | +Receive date | +Status | +Fund | +Ordered | +Spent | +|||
Ordered amount | -[% value_tax_excluded_ordered %] | -[% value_tax_included_ordered %] | -[% budget_name_ordered %] | - [% IF ( ordered_exists ) %] - See basket information + [% IF order.invoice %] + [% IF CAN_user_acquisition %] + + [% order.invoice.invoicenumber %] + [% ELSE %] + [% order.invoice.invoicenumber %] [% END %] + [% END %] | -|||||||
Spent amount | -[% value_tax_excluded_spent %] | -[% value_tax_included_spent %] | -[% budget_name_spent %] | +[% IF CAN_user_acquisition_order_manage %] + [% order.basket.basketname %] ([% order.basketno %]) + [% ELSE %] + [% order.basket.basketname %] ([% order.basketno %]) + [% END %] | +[% order.ordernumber %] | +[% order.basket.creationdate | $KohaDates%] | +[% order.datereceived | $KohaDates%] | - [% IF ( spent_exists ) %] - See invoice information + [% SWITCH order.orderstatus %] + [% CASE 'new' %]New + [% CASE 'ordered' %]Ordered + [% CASE 'partial' %]Partial + [% CASE 'complete' %]Complete + [% CASE 'cancelled' %]Cancelled + [% END %] + | +[% order.fund.budget_name %] | ++ [% UNLESS order.datereceived %] + [% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %] + [% END %] + | ++ [% IF order.datereceived %] + [%# FIXME What if unitprice has not been filled? %] + [% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %] [% END %] |