@@ -, +, @@ --- .../prog/en/modules/acqui/basket.tt | 370 +++++++++--------- 1 file changed, 186 insertions(+), 184 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -433,41 +433,70 @@
No. | -[% tp('noun', 'Order') | html %] | -RRP tax exc. | -Actual cost tax exc. | -Budgeted cost tax exc. | -RRP tax inc. | -Actual cost tax inc. | -Budgeted cost tax inc. | -Replacement price | -Qty. | -Total tax exc. ([% currency | html %]) | -Total tax inc. ([% currency | html %]) | -GST % | -GST | -Fund | -Estimated delivery date | - [% IF Koha.Preference('EDIFACT') && ediaccount %] -Supplier report | - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] -Modify | -Cancel order | +
---|
No. | +[% tp('noun', 'Order') | html %] | +RRP tax exc. | +Actual cost tax exc. | +Budgeted cost tax exc. | +RRP tax inc. | +Actual cost tax inc. | +Budgeted cost tax inc. | +Replacement price | +Qty. | +Total tax exc. ([% currency | html %]) | +Total tax inc. ([% currency | html %]) | +GST % | +GST | +Fund | +Estimated delivery date | + [% IF Koha.Preference('EDIFACT') && ediaccount %] +Supplier report | [% END %] - [% END %] -Modify | +Cancel order | + [% END %] + [% END %] + + + + [% FOREACH foot_loo IN book_foot_loop %] +|
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+ | Total (GST [% foot_loo.tax_rate * 100 | html %]) | ++ | + | + | + | + | + | + | [% foot_loo.quantity | html %] | +[% foot_loo.total_tax_excluded | $Price %] | +[% foot_loo.total_tax_included | $Price %] | ++ | [% foot_loo.tax_value | $Price %] | ++ | + [% IF Koha.Preference('EDIFACT') && ediaccount %] + | + [% END %] + [% IF ( active ) %] + [% UNLESS ( closedate ) %] + | + | + [% END %] + [% END %] + | |
- | Total (GST [% foot_loo.tax_rate * 100 | html %]) | +Total ([% currency | html %]) | @@ -475,11 +504,11 @@ | - | [% foot_loo.quantity | html %] | -[% foot_loo.total_tax_excluded | $Price %] | -[% foot_loo.total_tax_included | $Price %] | +[% total_quantity | html %] | +[% total_tax_excluded | $Price %] | +[% total_tax_included | $Price %] | - | [% foot_loo.tax_value | $Price %] | +[% total_tax_value | $Price %] | [% IF Koha.Preference('EDIFACT') && ediaccount %] @@ -492,169 +521,142 @@ [% END %] [% END %] | |||||
- | Total ([% currency | html %]) | -- | - | - | - | - | - | - | [% total_quantity | html %] | -[% total_tax_excluded | $Price %] | -[% total_tax_included | $Price %] | -- | [% total_tax_value | $Price %] | -- | - [% IF Koha.Preference('EDIFACT') && ediaccount %] - | - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] - | - | - [% END %] - [% END %] - | |
- [% books_loo.ordernumber | html %] - | -
-
- [% IF ( books_loo.order_received ) %] (received)[% END %]
- [% IF books_loo.title %]
- [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %]
- [% ELSE %]
- Deleted bibliographic record, can't find title Internal note: [% books_loo.order_internalnote | html %] Edit internal note - [% ELSE %] - Add internal note - [% END %] - [% IF ( books_loo.order_vendornote ) %] -Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note - [% ELSE %] - Add vendor note - [% END %] - [% IF (books_loo.transferred_from) %] - [% basket = books_loo.transferred_from.basket %] - [% bookseller = books_loo.transferred_from.bookseller %] - [% timestamp = books_loo.transferred_from.timestamp %] -Transferred from basket: - [% basket.basketname | html %] - ([% bookseller.name | html %]) - on - [% timestamp | $KohaDates %] - - - [% END %] - [% SET claims = books_loo.order_object.claims %] - [% IF claims.count %] -- This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %] - - [% END %] - |
- [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
- [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
- [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] | -[% books_loo.unitprice_tax_excluded | $Price %] | -[% books_loo.ecost_tax_excluded | $Price %] | -[% books_loo.rrp_tax_included | $Price %] | -[% books_loo.unitprice_tax_included | $Price %] | -[% books_loo.ecost_tax_included | $Price %] | -[% books_loo.replacementprice | $Price %] | -[% books_loo.quantity | html %] | -[% books_loo.total_tax_excluded | $Price %] | -[% books_loo.total_tax_included | $Price %] | -[% books_loo.tax_rate * 100 | html %] | -[% books_loo.tax_value | $Price %] | -[% books_loo.budget_name | html %] | -- [% books_loo.estimated_delivery_date | $KohaDates %] - [% IF CAN_user_acquisition_order_manage %] - - Edit - - | - [% IF Koha.Preference('EDIFACT') && ediaccount %] -[% books_loo.suppliers_report | html %] | + +|||
- Modify
- [% UNLESS (books_loo.order_received) %]
- - Transfer - [% END %] + [% books_loo.ordernumber | html %] |
- [% IF ( books_loo.orderstatus != "complete") %]
- [% IF ( books_loo.left_holds_on_order ) %]
- - [% ELSE %] - Cancel order - [% END %] - [% IF ( books_loo.can_del_bib ) %] - Cancel order and delete catalog record - [% ELSE %] - - [% END %] - [% IF ( books_loo.left_item ) %] - [% books_loo.items | html %] item(s) left - [% END %] - [% IF ( books_loo.left_biblio ) %] - [% books_loo.biblios | html %] order(s) left - [% END %] - [% IF ( books_loo.left_subscription ) %] - [% books_loo.subscriptions | html %] subscription(s) left +
+ [% IF ( books_loo.order_received ) %] (received)[% END %]
+ [% IF books_loo.title %]
+ [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %]
+ [% ELSE %]
+ Deleted bibliographic record, can't find title Internal note: [% books_loo.order_internalnote | html %] Edit internal note + [% ELSE %] + Add internal note + [% END %] + [% IF ( books_loo.order_vendornote ) %] +Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note + [% ELSE %] + Add vendor note + [% END %] + [% IF (books_loo.transferred_from) %] + [% basket = books_loo.transferred_from.basket %] + [% bookseller = books_loo.transferred_from.bookseller %] + [% timestamp = books_loo.transferred_from.timestamp %] +Transferred from basket: + [% basket.basketname | html %] + ([% bookseller.name | html %]) + on + [% timestamp | $KohaDates %] + + [% END %] - [% IF ( books_loo.left_holds ) %] - [% books_loo.holds | html %] hold(s) left + [% SET claims = books_loo.order_object.claims %] + [% IF claims.count %] ++ This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %] + [% END %] - [% END %] |
+ [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
+ [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
+ [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] | +[% books_loo.unitprice_tax_excluded | $Price %] | +[% books_loo.ecost_tax_excluded | $Price %] | +[% books_loo.rrp_tax_included | $Price %] | +[% books_loo.unitprice_tax_included | $Price %] | +[% books_loo.ecost_tax_included | $Price %] | +[% books_loo.replacementprice | $Price %] | +[% books_loo.quantity | html %] | +[% books_loo.total_tax_excluded | $Price %] | +[% books_loo.total_tax_included | $Price %] | +[% books_loo.tax_rate * 100 | html %] | +[% books_loo.tax_value | $Price %] | +[% books_loo.budget_name | html %] | ++ [% books_loo.estimated_delivery_date | $KohaDates %] + [% IF CAN_user_acquisition_order_manage %] + + Edit + + | + [% IF Koha.Preference('EDIFACT') && ediaccount %] +[% books_loo.suppliers_report | html %] | [% END %] [% END %] -