From 906b7deffe88bf245d1b21c1e3b8df800034db2e Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 25 Jul 2013 09:25:21 +0200 Subject: [PATCH] Bug 11864: (code cleanup) re-indent parcel.tt and rename a variable Signed-off-by: remy juliette Signed-off-by: Katrin Fischer Fixed 2 additional tabs. Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 827cd2355e..136fcc1ccc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -355,22 +355,22 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + [% FOREACH key IN funds.keys.sort %] @@ -401,46 +401,46 @@ - [% FOREACH loop_receive IN loop_received %] + [% FOREACH order IN loop_received %] - + - + - - - - - - - + + + + + + -- 2.11.4.GIT
BasketBasket groupOrder LineHoldsSummaryView recordQuantityFundEst costActual costTOTAL
BasketBasket groupOrder lineHoldsSummaryView recordQuantityFundEst costActual costTOTAL
[% loop_receive.basketname %] ([% loop_receive.basketno %])[% order.basketname %] ([% order.basketno %]) - [% IF loop_order.basketgroupid %] - [% loop_receive.basketgroupname %] ([% loop_receive.basketgroupid %]) + [% IF order.basketgroupid %] + [% order.basketgroupname %] ([% order.basketgroupid %]) [% ELSE %] No basket group [% END %] [% loop_receive.ordernumber %][% order.ordernumber %] - [% IF loop_receive.holds > 0 %] - [% loop_receive.holds %] + [% IF order.holds > 0 %] + [% order.holds %] [% ELSE %] 0 [% END %] [% loop_receive.title |html %] - [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] - [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %] - [% IF ( loop_receive.publishercode ) %]
Publisher :[% loop_receive.publishercode %][% END %] - [% IF ( loop_receive.suggestionid ) %] +
[% order.title |html %] + [% IF ( order.author ) %] / [% order.author %][% END %] + [% IF ( order.isbn ) %] - [% order.isbn %][% END %] + [% IF ( order.publishercode ) %]
Publisher :[% order.publishercode %][% END %] + [% IF ( order.suggestionid ) %]
- Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %] - (suggestion #[% loop_receive.suggestionid %]) + Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %] + (suggestion #[% order.suggestionid %]) [% END %]
MARC | Card[% loop_receive.quantityreceived %][% loop_receive.budget.budget_name %][% loop_receive.ecost %][% loop_receive.unitprice %][% loop_receive.total %]MARC | Card[% order.quantityreceived %][% order.budget.budget_name %][% order.ecost %][% order.unitprice %][% order.total %] - [% IF (loop_receive.cannot_cancel) %] + [% IF (order.cannot_cancel) %] [% span_title = BLOCK %] Cannot cancel receipt of this order line because it was created from a partial receipt of order line no. - [% loop_receive.parent_ordernumber %], which is + [% order.parent_ordernumber %], which is already received. Try cancelling this one first and retry. [% END %] @@ -448,7 +448,7 @@ Can't cancel receipt [% ELSE %] - Cancel receipt + Cancel receipt [% END %]