From d2b1670efb2acc1c8d40a364d679bfe0bb280fe1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 23 Jan 2023 17:23:36 +0000 Subject: [PATCH] Bug 31932: The basket summary page template needs a cleanup This patch reindents the Acquisitions basket template so that it has consistent indentation. These changes should have no visible effect on the page. To test, apply the patch and go to Acquisitions. Locate a vendor and add a basket and some orders if necessary. Test as much of the page's functionality as possible, e.g. toolbar controls, in-table controls, managed-by and managing library controls, etc. Try adding an internal note, adding a vendor note, and deleting the basket. Everything should look correct and work correctly. Viewing the diff while ignoring whitespace changes should show only places where a line break was added. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/basket.tt | 1616 +++++++++-------- 1 file changed, 831 insertions(+), 785 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 35b35af7ab..6bbd74a044 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -5,15 +5,15 @@ [% BLOCK csv_export %]
Export as CSV - - + +
[% END %] [% USE KohaDates %] @@ -36,35 +36,35 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - [% END %]
@@ -72,747 +72,793 @@
- [% IF (cannot_manage_basket) %] -
You are not authorised to manage this basket.
- [% ELSE %] + [% IF (cannot_manage_basket) %] +
You are not authorised to manage this basket.
+ [% ELSE %] - [% IF !confirm_close && !edi_confirm %] - [% UNLESS ( selectbasketg ) %] - [% UNLESS ( closedate ) %] - [% UNLESS ( delete_confirmed ) %] -
- [% IF active %] -
Add to basket
- [% END %] -
Edit basket
- [% IF CAN_user_acquisition_delete_baskets %] -
Delete basket
- [% END %] - [% IF ( unclosable ) %] - [% ELSIF ( uncertainprices ) %] -
Uncertain prices
-
- Close basket -
- [% ELSE %] -
- Close basket -
- [% END %] + [% IF !confirm_close && !edi_confirm %] + [% UNLESS ( selectbasketg ) %] + [% UNLESS ( closedate ) %] + [% UNLESS ( delete_confirmed ) %] +
+ [% IF active %] +
Add to basket
+ [% END %] +
Edit basket
+ [% IF CAN_user_acquisition_delete_baskets %] +
Delete basket
+ [% END %] + [% IF ( unclosable ) %] + [% ELSIF ( uncertainprices ) %] +
Uncertain prices
+
+ Close basket +
+ [% ELSE %] +
+ Close basket +
+ [% END %] - [% PROCESS csv_export %] + [% PROCESS csv_export %] - [% IF Koha.Preference('EDIFACT') && ediaccount %] -
Create EDIFACT order
- [% END %] + [% IF Koha.Preference('EDIFACT') && ediaccount %] +
Create EDIFACT order
+ [% END %] + + [% IF ( active && books_loop ) %] +
+
+ + + +
+
+ [% END %] +
+ [% END %] + + + + + [% ELSE %] +
+ [% IF grouped %] +
+
Reopen basket
+
+ [% ELSE %] +
Reopen basket
+ + [% PROCESS csv_export %] + [% END %] +
+ [% END %] [% END %] -
- [% END %] - - - - [% ELSE %] -
- [% IF grouped %] -
-
Reopen basket
-
- [% ELSE %] -
Reopen basket
+

[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]

- [% PROCESS csv_export %] - [% END %] -
- [% END %] - [% END %] + [% IF ( basketno ) %] +
+
+
+
    + [% IF ( basketnote ) %] +
  1. Internal note: [% basketnote | html %]
    2. + [% END %] + [% IF ( basketbooksellernote ) %] +
  2. Vendor note: [% basketbooksellernote | html %]
    3. + [% END %] + [% IF ( basketcontractno ) %] +
  3. Contract name: [% basketcontractname | html %]
    4. + [% END %] + [% IF deliveryplace %] +
  4. Delivery place: [% Branches.GetName( deliveryplace ) | html %]
    5. + [% END %] + [% IF billingplace %] +
  5. Billing place: [% Branches.GetName( billingplace ) | html %]
    6. + [% END %] + [% IF ( authorisedbyname ) %] +
  6. [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
    7. + [% END %] +
  7. +
    + Managed by: +
    +
      + [% FOREACH user IN users %] +
    • + [% user.firstname | html %] [% user.surname | html %] + Delete user +
      • + [% END %] +
    • + Add user +
      • + +
    +
    + + + +
    - [% IF ( NO_BOOKSELLER ) %] -

    Vendor not found

    - [% ELSE %] - [% IF ( delete_confirmed ) %] -
    -

    Basket deleted

    -
    - [% IF (cannotdelbiblios) %] -
    -

    Warning:

    -

    The following records could not be deleted:

    -
      - [% FOREACH cannotdelbiblio IN cannotdelbiblios %] -
    • [% cannotdelbiblio.title | html %] by [% cannotdelbiblio.author | html %]: -
        - [% IF (cannotdelbiblio.itemcount) %]
      • [% cannotdelbiblio.itemcount | html %] item(s) attached.
        • [% END %] - [% IF (cannotdelbiblio.subscriptions) %]
      • [% cannotdelbiblio.subscriptions | html %] subscription(s) attached.
        • [% END %] - [% IF (cannotdelbiblio.countbiblio) %]
      • [% cannotdelbiblio.countbiblio | html %] order(s) attached.
        • [% END %] - [% IF (cannotdelbiblio.othererror) %]
      • Unknown error.
        • [% END %] -
      -
      • - [% END %] -
    -
    - Go back to vendor page - [% ELSE %] - Show baskets for vendor [% booksellername | html %] Show all active baskets - [% END %] - [% ELSE %] +
    8. +
  8. + Managing library: + [% IF basketbranchcode %] + [% Branches.GetName( basketbranchcode ) | html %] + Change library + [% ELSE %] + No library + Set library + [% END %] +
    9. + [% IF branches_loop.size %] + + [% END %] - [% FOR m IN messages %] -
    - [% SWITCH m.code %] - [% CASE 'no_email' %] - This vendor has no contact selected for sending orders to or is missing an e-mail address. - [% CASE 'no_basketno' %] - No basket given. - [% CASE 'no_letter' %] - There is no notice template with code ACQORDER defined. - [% CASE 'email_sent' %] - Order e-mail was sent to the vendor. - [% CASE %] - ERROR! - [% m.code | html %] - [% END %] -
    - [% END %] -

    [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]

    - [% IF ( basketno ) %] -
    -
    -
    -
      - [% IF ( basketnote ) %]
    1. Internal note: [% basketnote | html %]
      2. [% END %] - [% IF ( basketbooksellernote ) %]
    2. Vendor note: [% basketbooksellernote | html %]
      3. [% END %] - [% IF ( basketcontractno ) %] -
    3. Contract name: [% basketcontractname | html %]
      4. - [% END %] - [% IF deliveryplace %]
    4. Delivery place: [% Branches.GetName( deliveryplace ) | html %]
      5. [% END %] - [% IF billingplace %]
    5. Billing place: [% Branches.GetName( billingplace ) | html %]
      6. [% END %] - [% IF ( authorisedbyname ) %]
    6. [% tp('basket created by', 'Created by:') | html %] [% authorisedbyname | html %]
      7. [% END %] -
    7. -
      - Managed by: -
      -
        - [% FOREACH user IN users %] -
      • - [% user.firstname | html %] [% user.surname | html %] - Delete user -
        • - [% END %] -
      • - Add user -
        • - -
      -
      - - - -
      + [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] -
      8. -
    8. - Managing library: - [% IF basketbranchcode %] - [% Branches.GetName( basketbranchcode ) | html %] - Change library - [% ELSE %] - No library - Set library - [% END %] -
      9. - [% IF branches_loop.size %] - - [% END %] +
    +
    - [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] +
    +
      + [% IF ( creationdate ) %] +
    1. Opened on: [% creationdate | $KohaDates %]
      2. + [% END %] + [% IF ( closedate ) %] +
    2. Closed on: [% closedate | $KohaDates %]
      3. + [% END %] + [% IF ( ediaccount ) %] + [%- BLOCK edi_status -%] + [%- SWITCH edi_order.status -%] + [%- CASE 'Pending' -%]Pending + [%- CASE 'Sent' -%]Sent + [%- CASE 'Processed' -%]Processed + [%- END -%] + [%- END -%] + [% IF ( edi_order ) %] +
    3. EDI status: [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])
      4. + [% ELSE %] +
    4. EDI status: Not ordered
      5. + [% END %] + [% END %] + [% IF ( estimateddeliverydate ) %] +
    5. Estimated delivery date: [% estimateddeliverydate | $KohaDates %]
      6. + [% END %] +
    6. Orders are standing: [% IF is_standing %]Yes[% ELSE %]No[% END %]
      7. -
    -
    + [% IF basket.create_items %] +
  9. + Create items when: + [% SWITCH basket.create_items %] + [% CASE 'receiving' %]Receiving items + [% CASE 'cataloguing' %]Cataloguing items + [% CASE %]Placing orders + [% END %] +
    10. + [% END %] +
-
-
    - [% IF ( creationdate ) %] -
  1. Opened on: [% creationdate | $KohaDates %]
    2. - [% END %] - [% IF ( closedate ) %] -
  2. Closed on: [% closedate | $KohaDates %]
    3. - [% END %] - [% IF ( ediaccount ) %] - [%- BLOCK edi_status -%] - [%- SWITCH edi_order.status -%] - [%- CASE 'Pending' -%]Pending - [%- CASE 'Sent' -%]Sent - [%- CASE 'Processed' -%]Processed - [%- END -%] - [%- END -%] - [% IF ( edi_order ) %] -
  3. EDI status: [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])
    4. - [% ELSE %] -
  4. EDI status: Not ordered
    5. - [% END %] - [% END %] - [% IF ( estimateddeliverydate ) %] -
  5. Estimated delivery date: [% estimateddeliverydate | $KohaDates %]
    6. - [% END %] -
  6. Orders are standing: [% IF is_standing %]Yes[% ELSE %]No[% END %]
    7. + [% IF ( closedate ) %] +
      +
    1. + Basket group: + [% IF basketgroup.id and not basketgroup.name %] + [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] + [% END %] - [% IF basket.create_items %] -
    2. - Create items when: - [% SWITCH basket.create_items %] - [% CASE 'receiving' %]Receiving items - [% CASE 'cataloguing' %]Cataloguing items - [% CASE %]Placing orders + [% IF basketgroup.closed %] + [% IF ( CAN_user_acquisition_group_manage ) %] + [% basketgroup.name | html %] (closed) + [% ELSE %] + [% basketgroup.name | html %] (closed) + [% END %] + [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] + [%- IF basketgroup.id -%] + [% basketgroup.name | html %] + [%- ELSE -%] + No group + [%- END -%] + [% ELSE %] + [% IF ( CAN_user_acquisition_group_manage ) %] + [% IF ( basketgroup.id ) %] + [% basketgroup.name | html %] + Change basket group + [% ELSE %] + No group + Set basket group + [% END %] + [% END %] + [% END %] +
      3. + [% IF ( CAN_user_acquisition_group_manage ) %] + + [% END # /IF ( CAN_user_acquisition_group_manage ) %] + [% IF basketgroup.deliveryplace %] +
    3. + Basket group delivery placename: [% Branches.GetName( basketgroup.deliveryplace ) | html %] +
      4. + [% END %] + [% IF basketgroup.billingplace %] +
    4. + Basket group billing place: [% Branches.GetName( basketgroup.billingplace ) | html %] +
      5. + [% END %] +
    + [% END # /IF closeddate %] +
+
+
[% END %] - - [% END %] - - [% IF ( closedate ) %] -
    -
  1. - Basket group: - [% IF basketgroup.id and not basketgroup.name %] - [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] + [% IF ( duplinbatch ) %] +
    +

    Duplicate warning

    +

    Some records have not been automatically added because they match an existing record in your catalog: Display them

    +
    [% END %] - [% IF basketgroup.closed %] - [% IF ( CAN_user_acquisition_group_manage ) %] - [% basketgroup.name | html %] (closed) - [% ELSE %] - [% basketgroup.name | html %] (closed) - [% END %] - [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] - [%- IF basketgroup.id -%] - [% basketgroup.name | html %] - [%- ELSE -%] - No group - [%- END -%] - [% ELSE %] - [% IF ( CAN_user_acquisition_group_manage ) %] - [% IF ( basketgroup.id ) %] - [% basketgroup.name | html %] - Change basket group - [% ELSE %] - No group - Set basket group - [% END %] - [% END %] - [% END %] -
    2. - [% IF ( CAN_user_acquisition_group_manage ) %] - - [% END # /IF ( CAN_user_acquisition_group_manage ) %] - [% IF basketgroup.deliveryplace %] -
  2. - Basket group delivery placename: [% Branches.GetName( basketgroup.deliveryplace ) | html %] -
    3. - [% END %] - [% IF basketgroup.billingplace %] -
  3. - Basket group billing place: [% Branches.GetName( basketgroup.billingplace ) | html %] -
    4. - [% END %] -
- [% END # /IF closeddate %] -
-
-
- [% END %] - [% IF ( duplinbatch ) %]
-

Duplicate warning

-

Some records have not been automatically added because they match an existing record in your catalog: Display them

-
[% 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 %] + + + + [% FOREACH books_loo IN books_loop %] + [% IF ( books_loo.order_received ) %] + + [% ELSE %] + + [% 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
+ [%- END %] +
+ [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%] + [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%] + [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%] + [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%] + [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%] + [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%] + [%- IF ( books_loo.suggestionid ) %] +
+ Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %] + (suggestion #[% books_loo.suggestionid | html %]) + [% END %] +

+ [% IF ( books_loo.order_internalnote ) %] +

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 + [% END %] + + [% IF Koha.Preference('EDIFACT') && ediaccount %] + [% books_loo.suppliers_report | html %] + [% END %] + [% IF ( active ) %] + [% UNLESS ( closedate ) %] + + Modify + [% UNLESS (books_loo.order_received) %] +
+ Transfer + [% END %] + + + [% IF ( books_loo.orderstatus != "complete") %] + [% IF ( books_loo.left_holds_on_order ) %] + Can't cancel order
+ [% ELSE %] + Cancel order
+ [% END %] + [% IF ( books_loo.can_del_bib ) %] + Cancel order and delete catalog record
+ [% ELSE %] + Can't cancel order and delete catalog record
+ [% 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
+ [% END %] + [% IF ( books_loo.left_holds ) %] + [% books_loo.holds | html %] hold(s) left + [% END %] + [% END %] + + [% END %] + [% END %] + + [% END %] + + + [% END %] + [% IF ( listincgst ) %]** Vendor's listings already include tax.[% END %] + -
- [% IF ( books_loop ) %] -

Orders

- - - - - - - - - - - - - - - - - - - - [% IF Koha.Preference('EDIFACT') && ediaccount %] - - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] - - + [% IF (cancelledorders_loop) %] +
+

Cancelled orders

+
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 priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFundEstimated delivery dateSupplier reportModifyCancel order
+ + + + + + + + + + + + + + + + + + + [% FOREACH order IN cancelledorders_loop %] + + + + + + + + + + + + + + + [% END %] + +
No.[% tp('noun', 'Order') | html %]RRP tax exc.ecost tax exc.RRP tax inc.ecost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFund
+ [% order.ordernumber | html %] + +

+ [% IF ( order.order_received ) %] (received)[% END %] + [% IF (order.title) %] + [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %] + [% ELSE %] + Deleted bibliographic record, can't find title + [% END %] +
+ [% IF ( order.order_internalnote ) %] [% order.order_internalnote | html %][% END %] + [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] + [% IF ( order.issn ) %] - [% order.issn | html %][% END %] + [% IF ( order.publishercode ) %], [% order.publishercode | html %][% END %] + [% IF ( order.publicationyear ) %] + , [% order.publicationyear | html %] + [% ELSIF ( order.copyrightdate ) %] + [% order.copyrightdate | html %] + [% END %] + [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END %] + [% IF ( order.cancellationreason ) %] +
+ Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) | html %] + [% END %] +

+ [% IF order.transferred_to %] + [% basket = order.transferred_to.basket %] + [% bookseller = order.transferred_to.bookseller %] + [% timestamp = order.transferred_to.timestamp %] +

Transferred to basket: + [% basket.basketname | html %] + ([% bookseller.name | html %]) + on + [% timestamp | $KohaDates %] + +

+ [% END %] + 		+ [% order.rrp_tax_excluded | $Price %] + [% IF ( order.uncertain ) %] + (Uncertain) + [% END %] + [% order.ecost_tax_excluded | $Price %][% order.rrp_tax_included | $Price %][% order.ecost_tax_included | $Price %][% order.replacementprice | $Price %][% order.quantity | html %][% order.total_tax_excluded | $Price %][% order.total_tax_included | $Price %][% order.tax_rate * 100 | html %][% order.tax_value | $Price %][% order.budget_name | html %] +
+
[% 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 %] - - [% 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 %] - - - - [% FOREACH books_loo IN books_loop %] - [% IF ( books_loo.order_received ) %] - - [% ELSE %] - [% 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
- [%- END %] -
- [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%] - [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%] - [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%] - [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%] - [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%] - [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%] - [%- IF ( books_loo.suggestionid ) %] -
- Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %] - (suggestion #[% books_loo.suggestionid | html %]) - [% END %] -

- [% IF ( books_loo.order_internalnote ) %] -

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 %] + [% ELSE %] + + [% END %] + + [% IF ( confirm_close ) %] +
+ +
+

Are you sure you want to close basket [% basketname | html %]?

+ [% IF ( CAN_user_acquisition_group_manage ) %]

- 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 %] - [% END %] - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] - - Modify - [% UNLESS (books_loo.order_received) %] -
- Transfer - [% END %] - - - [% IF ( books_loo.orderstatus != "complete") %] - [% IF ( books_loo.left_holds_on_order ) %] - Can't cancel order
- [% ELSE %] - Cancel order
- [% END %] - [% IF ( books_loo.can_del_bib ) %] - Cancel order and delete catalog record
- [% ELSE %] - Can't cancel order and delete catalog record
- [% 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
- [% END %] - [% IF ( books_loo.left_holds ) %] - [% books_loo.holds | html %] hold(s) left - [% END %] - [% END %] - - [% END %] - [% END %] - + + + + + + +
+
+ + +
+
[% END %] - - - [% END %] - [% IF ( listincgst ) %]** Vendor's listings already include tax.[% END %] - - [% IF (cancelledorders_loop) %] -
-

Cancelled orders

- - - - - - - - - - - - - - - - - - - - [% FOREACH order IN cancelledorders_loop %] - - - - - - - - - - - - - - - [% END %] - -
No.[% tp('noun', 'Order') | html %]RRP tax exc.ecost tax exc.RRP tax inc.ecost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFund
- [% order.ordernumber | html %] - -

- [% IF ( order.order_received ) %] (received)[% END %] - [% IF (order.title) %] - [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %] - [% ELSE %] - Deleted bibliographic record, can't find title - [% END %] -
- [% IF ( order.order_internalnote ) %] [% order.order_internalnote | html %][% END %] - [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] - [% IF ( order.issn ) %] - [% order.issn | html %][% END %] - [% IF ( order.publishercode ) %], [% order.publishercode | html %][% END %] - [% IF ( order.publicationyear ) %], [% order.publicationyear | html %] - [% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate | html %][% END %] - [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END %] - [% IF ( order.cancellationreason ) %] -
- Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) | html %] - [% END %] -

- [% IF order.transferred_to %] - [% basket = order.transferred_to.basket %] - [% bookseller = order.transferred_to.bookseller %] - [% timestamp = order.transferred_to.timestamp %] -

Transferred to basket: - [% basket.basketname | html %] - ([% bookseller.name | html %]) - on - [% timestamp | $KohaDates %] - -

- [% END %] - 		- [% order.rrp_tax_excluded | $Price %] - [% IF ( order.uncertain ) %] - (Uncertain) - [% END %] - [% order.ecost_tax_excluded | $Price %][% order.rrp_tax_included | $Price %][% order.ecost_tax_included | $Price %][% order.replacementprice | $Price %][% order.quantity | html %][% order.total_tax_excluded | $Price %][% order.total_tax_included | $Price %][% order.tax_rate * 100 | html %][% order.tax_value | $Price %][% order.budget_name | html %] -
-
- [% END %] -
- - [% UNLESS ( closedate ) %] - - @@ -825,53 +871,53 @@ - -