@@ -, +, @@ format date and tidying up in template file --- .../csv_headers/reports/orders_by_budget.tt | 2 +- .../prog/en/modules/reports/orders_by_budget.tt | 158 ++++++++++---------- reports/orders_by_fund.pl | 5 +- 3 files changed, 80 insertions(+), 85 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt @@ -1, +1, @@ -Fund[% sep %]Basket[% sep %]Basket by[% sep %]biblionumber[% sep %]Title[% sep %]Currency[% sep %]Vendor Price[% sep %]RRP[% sep %]Budgeted Cost[% sep %]Quantity[% sep %]Total RRP[% sep %]Total Cost[% sep %]Entry Date[% sep %]Date Received[% sep %]Notes +Fund[% sep %]"Basket Num"[% sep %]"Basket Name"[% sep %]"authorised By"[% sep %]"Biblio Number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor Price"[% sep %]RRP[% sep %]"Budgeted Cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total Cost"[% sep %]"Entry Date"[% sep %]"Date Received"[% sep %]Notes --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt @@ -17,28 +17,26 @@
Fund | Basket | Basket Name | @@ -54,24 +52,18 @@Entry Date | Date Received | Notes | -|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% ordersloo.budget_name |html %] | -- [% ordersloo.basketno |html %] - | +[% ordersloo.basketno |html %] | [% ordersloo.basketname |html %] | -[% ordersloo.authorisedbyname %] | -- [% ordersloo.title |html %] - | +[% ordersloo.authorisedbyname %] | +[% ordersloo.title |html %] | [% ordersloo.currency %] | [% ordersloo.listprice %] | [% ordersloo.rrp %] | @@ -82,59 +74,63 @@[% ordersloo.entrydate %] | [% ordersloo.datereceived %] | [% ordersloo.notes |html %] | -|
TOTAL | [% total_quantity %] | [% total_rrp %] | [% total_ecost %] |