@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 12 ++++++-- .../prog/en/modules/acqui/acqui-home.tt | 11 ++++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 32 ++++++++++++++----- .../prog/en/modules/acqui/basketgroup.tt | 36 ++++++++++++++++++++-- .../prog/en/modules/acqui/basketheader.tt | 32 ++++++++++++++----- .../prog/en/modules/acqui/booksellers.tt | 16 +++++++++- .../prog/en/modules/acqui/cancelorder.tt | 25 ++++++++++----- .../prog/en/modules/acqui/duplicate_orders.tt | 28 ++++++++++++----- .../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 14 ++++++++- .../prog/en/modules/acqui/edifactmsgs.tt | 18 ++++++++--- .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 20 +++++++++--- .../prog/en/modules/acqui/histsearch.tt | 28 ++++++++++++++++- .../prog/en/modules/acqui/invoice-files.tt | 21 ++++++++++++- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 18 ++++++++++- .../prog/en/modules/acqui/invoices.tt | 15 ++++++++- .../prog/en/modules/acqui/lateorders.tt | 15 ++++++++- .../prog/en/modules/acqui/modordernotes.tt | 23 +++++++++++++- .../prog/en/modules/acqui/neworderempty.tt | 31 ++++++++++++++++++- .../en/modules/acqui/neworderempty_duplicate.tt | 20 +++++++++++- .../prog/en/modules/acqui/newordersubscription.tt | 22 ++++++++++++- .../prog/en/modules/acqui/newordersuggestion.tt | 22 ++++++++++++- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 17 +++++++++- .../prog/en/modules/acqui/orderreceive.tt | 21 ++++++++++++- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 21 +++++++++++-- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 19 +++++++++++- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 17 +++++++++- .../prog/en/modules/acqui/supplier.tt | 35 ++++++++++++++++++++- .../prog/en/modules/acqui/uncertainprice.tt | 27 +++++++++++++++- .../prog/en/modules/acqui/z3950_search.tt | 33 +++++++++++++++++++- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 8 ++++- 30 files changed, 590 insertions(+), 67 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -10,8 +10,16 @@ [% INCLUDE 'header.inc' %] [% PROCESS 'about-team.inc' %] - - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -13,7 +13,16 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -33,13 +33,31 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - - + + [% ELSE %] - [% booksellername | html %] › Basket grouping
+
  • + [% booksellername | html %] +
  • +
  • + + Basket grouping + +
  • + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -18,16 +18,34 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -17,7 +17,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -6,13 +6,24 @@ [% INCLUDE 'header.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -21,15 +21,29 @@ Basket [% basket.basketno | html %] › Duplicate existing orders [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -7,7 +7,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -13,11 +13,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -5,11 +5,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -13,7 +13,33 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -11,7 +11,26 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -17,7 +17,23 @@ [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -13,7 +13,20 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -14,7 +14,20 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -12,7 +12,28 @@ [% INCLUDE 'header.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -15,7 +15,36 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + [% INCLUDE 'blocking_errors.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -7,7 +7,25 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -14,7 +14,27 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -13,7 +13,27 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'suggestions-add-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -14,7 +14,22 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -16,7 +16,26 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -22,16 +22,31 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -11,7 +11,24 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -14,7 +14,22 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -97,7 +97,40 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -12,7 +12,32 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -16,7 +16,38 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    [% IF ( opsearch ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -12,7 +12,13 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'home-search.inc' %] - +
    --