Attachment 145686 Details for Bug 31932 – Bug 31932: The basket summary page template needs a cleanup

[patch] Bug 31932: The basket summary page template needs a cleanup

Bug-31932-The-basket-summary-page-template-needs-a.patch (text/plain), 132.12 KB, created by Martin Renvoize (ashimema) on 2023-01-26 10:28:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-01-26 10:28:30 UTC

Size: 132.12 KB

patch

obsolete

>From c375758a37e9adb181ebd6d0ca40a5e3634f8fb2 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <martin.renvoize@ptfs-europe.com>
>---
> .../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 35b35af7ab3..6bbd74a044a 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 %]
>     <div class="btn-group">
>         <a id="exportbutton" class="btn btn-default" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]"><i class="fa fa-download"></i> Export as CSV</a>
>-      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>-      <ul class="dropdown-menu" id="export-csv-menu">
>-          <li><a href="#">Default</a></li>
>-          [% IF csv_profiles.count %]
>-              [% FOR csv IN csv_profiles %]
>-                <li><a href="#" data-value="[% csv.export_format_id | html %]">[% csv.profile | html %]</a></li>
>-              [% END %]
>-          [% END %]
>-       </ul>
>+        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>+        <ul class="dropdown-menu" id="export-csv-menu">
>+            <li><a href="#">Default</a></li>
>+            [% IF csv_profiles.count %]
>+                [% FOR csv IN csv_profiles %]
>+                    <li><a href="#" data-value="[% csv.export_format_id | html %]">[% csv.profile | html %]</a></li>
>+                [% END %]
>+            [% END %]
>+        </ul>
>     </div>
> [% END %]
> [% USE KohaDates %]
>@@ -36,35 +36,35 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>-            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>-        </li>
>-        <li>
>-            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                [% UNLESS ( basketno ) %]
>-                    [% IF ( delete_confirmed ) %]
>-                        <span>Deleted</span>
>-                    [% ELSE %]
>-                        <span>New</span>
>+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    [% UNLESS ( basketno ) %]
>+                        [% IF ( delete_confirmed ) %]
>+                            <span>Deleted</span>
>+                        [% ELSE %]
>+                            <span>New</span>
>+                        [% END %]
>                     [% END %]
>-                [% END %]
>-                <span>Basket [% basketname | html %]
>-                [% IF ( basketno ) %]
>-                    ([% basketno | html %])
>-                [% END %]
>-                for [% booksellername | html %]</span>
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>+                    <span>Basket [% basketname | html %]
>+                    [% IF ( basketno ) %]
>+                        ([% basketno | html %])
>+                    [% END %]
>+                    for [% booksellername | html %]</span>
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
> [% END %]
> 
> <div class="main container-fluid">
>@@ -72,747 +72,793 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
> 
>-    [% IF (cannot_manage_basket) %]
>-        <div class="dialog alert">You are not authorised to manage this basket.</div>
>-    [% ELSE %]
>+                [% IF (cannot_manage_basket) %]
>+                    <div class="dialog alert">You are not authorised to manage this basket.</div>
>+                [% ELSE %]
> 
>-        [% IF !confirm_close && !edi_confirm %]
>-        [% UNLESS ( selectbasketg ) %]
>-            [% UNLESS ( closedate ) %]
>-            [% UNLESS ( delete_confirmed ) %]
>-                <div id="toolbar" class="btn-toolbar fh-fixedHeader">
>-                    [% IF active %]
>-                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div>
>-                    [% END %]
>-                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
>-                    [% IF CAN_user_acquisition_delete_baskets %]
>-                        <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div>
>-                    [% END %]
>-                   [% IF ( unclosable ) %]
>-                    [% ELSIF ( uncertainprices ) %]
>-                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div>
>-                        <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group">
>-                            <a href="" class="btn btn-default disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a>
>-                        </div>
>-                    [% ELSE %]
>-                        <div class="btn-group">
>-                            <a href="/cgi-bin/koha/acqui/basket.pl?op=close&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a>
>-                        </div>
>-                    [% END %]
>+                    [% IF !confirm_close && !edi_confirm %]
>+                        [% UNLESS ( selectbasketg ) %]
>+                            [% UNLESS ( closedate ) %]
>+                                [% UNLESS ( delete_confirmed ) %]
>+                                    <div id="toolbar" class="btn-toolbar fh-fixedHeader">
>+                                        [% IF active %]
>+                                            <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div>
>+                                        [% END %]
>+                                        <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
>+                                        [% IF CAN_user_acquisition_delete_baskets %]
>+                                            <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete basket</a></div>
>+                                        [% END %]
>+                                        [% IF ( unclosable ) %]
>+                                        [% ELSIF ( uncertainprices ) %]
>+                                            <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div>
>+                                            <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group">
>+                                                <a href="" class="btn btn-default disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a>
>+                                            </div>
>+                                        [% ELSE %]
>+                                            <div class="btn-group">
>+                                                <a href="/cgi-bin/koha/acqui/basket.pl?op=close&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a>
>+                                            </div>
>+                                        [% END %]
> 
>-                    [% PROCESS csv_export %]
>+                                        [% PROCESS csv_export %]
> 
>-                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>-                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
>-                        [% END %]
>+                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+                                            <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div>
>+                                        [% END %]
>+
>+                                        [% IF ( active && books_loop ) %]
>+                                            <div class="btn-group">
>+                                                <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>+                                                    <input type="hidden" name="op" value="email" />
>+                                                    <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                                    <button type="submit" class="btn btn-default" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button>
>+                                                </form>
>+                                            </div>
>+                                        [% END %]
>+                                    </div>
>+                                [% END %]
>+
>+                                
>+                                <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
>+                                    <div class="modal-dialog">
>+                                        <div class="modal-content">
>+                                            <div class="modal-header">
>+                                                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>+                                                <h3>Confirm deletion</h3>
>+                                            </div>
>+                                            [% UNLESS book_foot_loop %]
>+                                                <div class="modal-body">
>+                                                    <p>Are you sure you want to delete this basket?</p>
>+                                                </div>
>+                                                <div class="modal-footer">
>+                                                    <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
>+                                                    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>+                                                        <input type="hidden" name="op" value="delete_confirm" />
>+                                                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                                        <input type="hidden" name="delbiblio" value="0" />
>+                                                        <button type="submit" class="btn btn-default btn-default">Delete basket</button>
>+                                                    </form>
>+                                                </div>
>+                                            [% ELSE %]
>+                                                <div class="modal-body">
>+                                                    <p>Are you sure you want to delete this basket?</p>
>+                                                    <p>Warning:</p>
>+                                                    <p>All orders of this basket will be cancelled and used funds will be refunded.</p>
>+                                                    <p>If items have been created when ordering or receiving, they will be deleted.</p>
>+                                                    <p>You can choose to delete bibliographic records if possible (bibliographic records that have other items or that are used in a subscription or another order will not be deleted).</p>
>+                                                </div>
>+                                                <div class="modal-footer">
>+                                                    <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
>+                                                    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>+                                                        <input type="hidden" name="op" value="delete_confirm" />
>+                                                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                                        <input type="hidden" name="delbiblio" value="0" />
>+                                                        <button type="submit" class="btn btn-default btn-default">Delete basket and orders</button>
>+                                                    </form>
> 
>-                        [% IF ( active && books_loop ) %]
>-                            <div class="btn-group">
>-                                <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>-                                    <input type="hidden" name="op" value="email" />
>-                                    <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-                                    <button type="submit" class="btn btn-default" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button>
>-                                </form>
>-                            </div>
>+                                                    <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>+                                                        <input type="hidden" name="op" value="delete_confirm" />
>+                                                        <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                                        <input type="hidden" name="delbiblio" value="1" />
>+                                                        <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button>
>+                                                    </form>
>+                                                </div>
>+                                            [% END %]
>+                                        </div>
>+                                    </div>
>+                                </div>
>+                                
>+                            [% ELSE %]
>+                                <div id="toolbar" class="btn-toolbar">
>+                                    [% IF grouped %]
>+                                        <div title="Can not reopen baskets that are part of a basket group." class="btn-group">
>+                                            <div class="btn-group"><a href="#" class="btn btn-default disabled" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen basket</a></div>
>+                                        </div>
>+                                    [% ELSE %]
>+                                        <div class="btn-group"><a href="#" class="btn btn-default" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen basket</a></div>
>+
>+                                        [% PROCESS csv_export %]
>+                                    [% END %]
>+                                </div>
>+                            [% END %]
>                         [% END %]
>-                </div>
>-            [% END %]
> 
>-            
>-                <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
>-                    <div class="modal-dialog">
>-                    <div class="modal-content">
>-                    <div class="modal-header">
>-                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button>
>-                        <h3>Confirm deletion</h3>
>-                    </div>
>-                    [% UNLESS book_foot_loop %]
>-                        <div class="modal-body">
>-                           <p>Are you sure you want to delete this basket?</p>
>-                        </div>
>-                        <div class="modal-footer">
>-                            <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
>-                            <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>-                                <input type="hidden" name="op" value="delete_confirm" />
>-                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-                                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-                                <input type="hidden" name="delbiblio" value="0" />
>-                                <button type="submit" class="btn btn-default btn-default">Delete basket</button>
>-                            </form>
>-                        </div>
>-                    [% ELSE %]
>-                        <div class="modal-body">
>-                           <p>Are you sure you want to delete this basket?</p>
>-                           <p>Warning:</p>
>-                           <p>All orders of this basket will be cancelled and used funds will be refunded.</p>
>-                           <p>If items have been created when ordering or receiving, they will be deleted.</p>
>-                           <p>You can choose to delete bibliographic records if possible (bibliographic records that have other items or that are used in a subscription or another order will not be deleted).</p>
>-                        </div>
>-                        <div class="modal-footer">
>-                            <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
>-                            <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>-                                <input type="hidden" name="op" value="delete_confirm" />
>-                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-                                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-                                <input type="hidden" name="delbiblio" value="0" />
>-                                <button type="submit" class="btn btn-default btn-default">Delete basket and orders</button>
>-                            </form>
>+                        [% IF ( NO_BOOKSELLER ) %]
>+                            <h1>Vendor not found</h1>
>+                        [% ELSE %]
>+                            [% IF ( delete_confirmed ) %]
>+                                <div class="dialog message">
>+                                    <h3>Basket deleted</h3>
>+                                </div>
>+                                [% IF (cannotdelbiblios) %]
>+                                    <div class="dialog alert">
>+                                        <p><strong>Warning:</strong></p>
>+                                        <p><strong>The following records could not be deleted:</strong></p>
>+                                        <ul>
>+                                            [% FOREACH cannotdelbiblio IN cannotdelbiblios %]
>+                                                <li>
>+                                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | uri %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]:
>+                                                    <ul>
>+                                                        [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %]
>+                                                        [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %]
>+                                                        [% IF (cannotdelbiblio.countbiblio) %]<li>[% cannotdelbiblio.countbiblio | html %] order(s) attached.</li>[% END %]
>+                                                        [% IF (cannotdelbiblio.othererror) %]<li>Unknown error.</li>[% END %]
>+                                                    </ul>
>+                                                </li>
>+                                            [% END %]
>+                                        </ul>
>+                                    </div>
>+                                    <a href="booksellers.pl">Go back to vendor page</a>
>+                                [% ELSE %]
>+                                    <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
>+                                [% END %]
>+                            [% ELSE %]
> 
>-                            <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>-                                <input type="hidden" name="op" value="delete_confirm" />
>-                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-                                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-                                <input type="hidden" name="delbiblio" value="1" />
>-                                <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button>
>-                            </form>
>+                                [% FOR m IN messages %]
>+                                    <div class="dialog [% m.type | html %]">
>+                                        [% SWITCH m.code %]
>+                                        [% CASE 'no_email' %]
>+                                            <span>This vendor has no contact selected for sending orders to or is missing an e-mail address.</span>
>+                                        [% CASE 'no_basketno' %]
>+                                            <span>No basket given.</span>
>+                                        [% CASE 'no_letter' %]
>+                                            <span>There is no notice template with code ACQORDER defined.</span>
>+                                        [% CASE 'email_sent' %]
>+                                            <span>Order e-mail was sent to the vendor.</span>
>+                                        [% CASE %]
>+                                            <span>ERROR! - [% m.code | html %]</span>
>+                                        [% END %]
>+                                    </div>
>+                                [% END %]
> 
>-                        </div>
>-                    [% END %]
>-                    </div>
>-                    </div>
>-                </div>
>-
>-            [% ELSE %]
>-                <div id="toolbar" class="btn-toolbar">
>-                    [% IF grouped %]
>-                        <div title="Can not reopen baskets that are part of a basket group." class="btn-group">
>-                            <div class="btn-group"><a href="#" class="btn btn-default disabled" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen basket</a></div>
>-                        </div>
>-                    [% ELSE %]
>-                        <div class="btn-group"><a href="#" class="btn btn-default" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen basket</a></div>
>+                                <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
> 
>-                        [% PROCESS csv_export %]
>-                    [% END %]
>-                </div>
>-            [% END %]
>-            [% END %]
>+                                [% IF ( basketno ) %]
>+                                    <div id="acqui_basket_summary" class="row">
>+                                        <div class="rows">
>+                                            <div class="col-sm-6">
>+                                                <ol>
>+                                                    [% IF ( basketnote ) %]
>+                                                        <li><span class="label">Internal note:</span> [% basketnote | html %]</li>
>+                                                    [% END %]
>+                                                    [% IF ( basketbooksellernote ) %]
>+                                                        <li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>
>+                                                    [% END %]
>+                                                    [% IF ( basketcontractno ) %]
>+                                                        <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | uri %]&amp;booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li>
>+                                                    [% END %]
>+                                                    [% IF deliveryplace %]
>+                                                        <li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>
>+                                                    [% END %]
>+                                                    [% IF billingplace %]
>+                                                        <li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>
>+                                                    [% END %]
>+                                                    [% IF ( authorisedbyname ) %]
>+                                                        <li><span class="label">[% tp('basket created by', 'Created by:') | html %]</span>  [% authorisedbyname | html %]</li>
>+                                                    [% END %]
>+                                                    <li id="managedby">
>+                                                        <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>+                                                            <span class="label">Managed by:</span>
>+                                                            <div style="display:inline-block">
>+                                                                <ul id="users_names" style="padding-left:0">
>+                                                                    [% FOREACH user IN users %]
>+                                                                        <li id="user_[% user.borrowernumber | html %]">
>+                                                                            [% user.firstname | html %] [% user.surname | html %]
>+                                                                            <a href="#" data-borrowernumber="[% user.borrowernumber | html %]" class="del_user"><i class="fa fa-trash"></i> Delete user</a>
>+                                                                        </li>
>+                                                                    [% END %]
>+                                                                    <li>
>+                                                                        <a href="#" id="add_user"><i class="fa fa-plus"></i> Add user</a>
>+                                                                    </li>
>+                                                                    <li id="add_user_submit" style="display:none;">
>+                                                                        <button type="submit" class="btn btn-default btn-xs">Save changes</button>
>+                                                                    </li>
>+                                                                </ul>
>+                                                            </div>
>+                                                            <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
>+                                                            <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
>+                                                            <input type="hidden" id="op" name="op" value="mod_users" />
>+                                                        </form>
> 
>-    [% IF ( NO_BOOKSELLER ) %]
>-    <h1>Vendor not found</h1>
>-    [% ELSE %]
>-        [% IF ( delete_confirmed ) %]
>-            <div class="dialog message">
>-                <h3>Basket deleted</h3>
>-            </div>
>-            [% IF (cannotdelbiblios) %]
>-                <div class="dialog alert">
>-                    <p><strong>Warning:</strong></p>
>-                    <p><strong>The following records could not be deleted:</strong></p>
>-                    <ul>
>-                    [% FOREACH cannotdelbiblio IN cannotdelbiblios %]
>-                        <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | uri %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]:
>-                            <ul>
>-                            [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %]
>-                            [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %]
>-                            [% IF (cannotdelbiblio.countbiblio) %]<li>[% cannotdelbiblio.countbiblio | html %] order(s) attached.</li>[% END %]
>-                            [% IF (cannotdelbiblio.othererror) %]<li>Unknown error.</li>[% END %]
>-                            </ul>
>-                        </li>
>-                    [% END %]
>-                    </ul>
>-                </div>
>-                <a href="booksellers.pl">Go back to vendor page</a>
>-            [% ELSE %]
>-                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
>-            [% END %]
>-        [% ELSE %]
>+                                                    </li>
>+                                                    <li id="branch">
>+                                                        <span class="label">Managing library:</span>
>+                                                        [% IF basketbranchcode %]
>+                                                            [% Branches.GetName( basketbranchcode ) | html %]
>+                                                            <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Change library</a>
>+                                                        [% ELSE %]
>+                                                            No library
>+                                                            <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Set library</a>
>+                                                        [% END %]
>+                                                    </li>
>+                                                    [% IF branches_loop.size %]
>+                                                        <li id="managing_library_entry" style="display:none;">
>+                                                            <span class="label">&nbsp;</span>
>+                                                            <div style="float:left">
>+                                                                <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>+                                                                    <select id="select_managing_library" name="branch">
>+                                                                        <option value="">(no library)</option>
>+                                                                        [% FOREACH branch IN branches_loop %]
>+                                                                            [% IF ( basketbranchcode == branch.branchcode ) %]
>+                                                                                <option selected="selected" value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option>
>+                                                                            [% ELSE %]
>+                                                                                <option value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option>
>+                                                                            [% END %]
>+                                                                        [% END %]
>+                                                                    </select>
>+                                                                    <a id="library_entry_cancel" href="#" class="cancel">Cancel</a>
>+                                                                    <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
>+                                                                    <input type="hidden" id="op" name="op" value="mod_branch" />
>+                                                                </form>
>+                                                            </div>
>+                                                        </li>
>+                                                    [% END %]
> 
>-        [% FOR m IN messages %]
>-            <div class="dialog [% m.type | html %]">
>-                [% SWITCH m.code %]
>-                [% CASE 'no_email' %]
>-                    <span>This vendor has no contact selected for sending orders to or is missing an e-mail address.</span>
>-                [% CASE 'no_basketno' %]
>-                    <span>No basket given.</span>
>-                [% CASE 'no_letter' %]
>-                    <span>There is no notice template with code ACQORDER defined.</span>
>-                [% CASE 'email_sent' %]
>-                    <span>Order e-mail was sent to the vendor.</span>
>-                [% CASE %]
>-                    <span>ERROR! - [% m.code | html %]</span>
>-                [% END %]
>-            </div>
>-        [% END %]
>-        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
>-        [% IF ( basketno ) %]
>-            <div id="acqui_basket_summary" class="row">
>-                <div class="rows">
>-                <div class="col-sm-6">
>-                <ol>
>-                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %]
>-                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %]
>-                [% IF ( basketcontractno ) %]
>-                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno | uri %]&amp;booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li>
>-                [% END %]
>-                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>[% END %]
>-                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %]
>-                [% IF ( authorisedbyname ) %]<li><span class="label">[% tp('basket created by', 'Created by:') | html %]</span>  [% authorisedbyname | html %]</li>[% END %]
>-                <li id="managedby">
>-                    <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>-                        <span class="label">Managed by:</span>
>-                        <div style="display:inline-block">
>-                            <ul id="users_names" style="padding-left:0">
>-                                [% FOREACH user IN users %]
>-                                    <li id="user_[% user.borrowernumber | html %]">
>-                                        [% user.firstname | html %] [% user.surname | html %]
>-                                        <a href="#" data-borrowernumber="[% user.borrowernumber | html %]" class="del_user"><i class="fa fa-trash"></i> Delete user</a>
>-                                    </li>
>-                                [% END %]
>-                                <li>
>-                                    <a href="#" id="add_user"><i class="fa fa-plus"></i> Add user</a>
>-                                </li>
>-                                <li id="add_user_submit" style="display:none;">
>-                                    <button type="submit" class="btn btn-default btn-xs">Save changes</button>
>-                                </li>
>-                            </ul>
>-                        </div>
>-                        <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
>-                        <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" />
>-                        <input type="hidden" id="op" name="op" value="mod_users" />
>-                    </form>
>+                                                    [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
> 
>-                </li>
>-                <li id="branch">
>-                    <span class="label">Managing library:</span>
>-                    [% IF basketbranchcode %]
>-                        [% Branches.GetName( basketbranchcode ) | html %]
>-                        <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Change library</a>
>-                    [% ELSE %]
>-                        No library
>-                        <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Set library</a>
>-                    [% END %]
>-                </li>
>-                [% IF branches_loop.size %]
>-                    <li id="managing_library_entry" style="display:none;">
>-                        <span class="label">&nbsp;</span>
>-                        <div style="float:left">
>-                            <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>-                                <select id="select_managing_library" name="branch">
>-                                    <option value="">(no library)</option>
>-                                    [% FOREACH branch IN branches_loop %]
>-                                        [% IF ( basketbranchcode == branch.branchcode ) %]
>-                                            <option selected="selected" value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option>
>-                                        [% ELSE %]
>-                                            <option value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option>
>-                                        [% END %]
>-                                    [% END %]
>-                                </select>
>-                                <a id="library_entry_cancel" href="#" class="cancel">Cancel</a>
>-                                <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" />
>-                                <input type="hidden" id="op" name="op" value="mod_branch" />
>-                            </form>
>-                        </div>
>-                    </li>
>-                [% END %]
>+                                                </ol>
>+                                            </div> 
> 
>-                [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
>+                                            <div class="col-sm-6">
>+                                                <ol>
>+                                                    [% IF ( creationdate ) %]
>+                                                        <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
>+                                                    [% END %]
>+                                                    [% IF ( closedate ) %]
>+                                                        <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>
>+                                                    [% END %]
>+                                                    [% IF ( ediaccount ) %]
>+                                                        [%- BLOCK edi_status -%]
>+                                                            [%- SWITCH edi_order.status -%]
>+                                                                [%- CASE 'Pending'   -%]<span>Pending</span>
>+                                                                [%- CASE 'Sent'      -%]<span>Sent</span>
>+                                                                [%- CASE 'Processed' -%]<span>Processed</span>
>+                                                            [%- END -%]
>+                                                        [%- END -%]
>+                                                        [% IF ( edi_order ) %]
>+                                                            <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li>
>+                                                        [% ELSE %]
>+                                                            <li><span class="label">EDI status:</span> Not ordered</li>
>+                                                        [% END %]
>+                                                    [% END %]
>+                                                    [% IF ( estimateddeliverydate ) %]
>+                                                        <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>
>+                                                    [% END %]
>+                                                    <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
> 
>-                </ol>
>-                </div> 
>+                                                    [% IF basket.create_items %]
>+                                                        <li>
>+                                                            <span class="label">Create items when:</span>
>+                                                            [% SWITCH basket.create_items %]
>+                                                                [% CASE 'receiving' %]<span>Receiving items</span>
>+                                                                [% CASE 'cataloguing' %]<span>Cataloguing items</span>
>+                                                                [% CASE %]<span>Placing orders</span>
>+                                                            [% END %]
>+                                                        </li>
>+                                                    [% END %]
>+                                                </ol>
> 
>-                <div class="col-sm-6">
>-                    <ol>
>-                        [% IF ( creationdate ) %]
>-                            <li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>
>-                        [% END %]
>-                        [% IF ( closedate ) %]
>-                            <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>
>-                        [% END %]
>-                        [% IF ( ediaccount ) %]
>-                            [%- BLOCK edi_status -%]
>-                                [%- SWITCH edi_order.status -%]
>-                                    [%- CASE 'Pending'   -%]<span>Pending</span>
>-                                    [%- CASE 'Sent'      -%]<span>Sent</span>
>-                                    [%- CASE 'Processed' -%]<span>Processed</span>
>-                                [%- END -%]
>-                            [%- END -%]
>-                            [% IF ( edi_order ) %]
>-                            <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li>
>-                            [% ELSE %]
>-                            <li><span class="label">EDI status:</span> Not ordered</li>
>-                            [% END %]
>-                        [% END %]
>-                        [% IF ( estimateddeliverydate ) %]
>-                            <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>
>-                        [% END %]
>-                        <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li>
>+                                                [% IF ( closedate ) %]
>+                                                    <ol>
>+                                                        <li>
>+                                                            <span class="label">Basket group:</span>
>+                                                            [% IF basketgroup.id and not basketgroup.name %]
>+                                                                [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %]
>+                                                            [% END %]
> 
>-                        [% IF basket.create_items %]
>-                            <li>
>-                                <span class="label">Create items when:</span>
>-                                [% SWITCH basket.create_items %]
>-                                    [% CASE 'receiving' %]<span>Receiving items</span>
>-                                    [% CASE 'cataloguing' %]<span>Cataloguing items</span>
>-                                    [% CASE %]<span>Placing orders</span>
>+                                                            [% IF basketgroup.closed %]
>+                                                                [% IF ( CAN_user_acquisition_group_manage ) %]
>+                                                                    <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] <span>(closed)</span></a>
>+                                                                [% ELSE %]
>+                                                                    [% basketgroup.name | html %] <span>(closed)</span>
>+                                                                [% END %]
>+                                                            [% ELSIF ( ! CAN_user_acquisition_group_manage ) %]
>+                                                                [%- IF basketgroup.id -%]
>+                                                            [% basketgroup.name | html %]
>+                                                                [%- ELSE -%]
>+                                                                    <span>No group</span>
>+                                                                [%- END -%]
>+                                                            [% ELSE %]
>+                                                                [% IF ( CAN_user_acquisition_group_manage ) %]
>+                                                                    [% IF ( basketgroup.id ) %]
>+                                                                        [% basketgroup.name | html %]
>+                                                                        <a href="#" id="set_basket_group"><i class="fa fa-pencil"></i> Change basket group</a>
>+                                                                    [% ELSE %]
>+                                                                        No group
>+                                                                        <a href="#" id="set_basket_group"><i class="fa fa-pencil"></i> Set basket group</a>
>+                                                                    [% END %]
>+                                                                [% END %]
>+                                                            [% END %]
>+                                                        </li>
>+                                                        [% IF ( CAN_user_acquisition_group_manage ) %]
>+                                                            <li id="basket_grouping" style="display:none;">
>+                                                                <span class="label">&nbsp;</span>
>+                                                                <div style="float:left">
>+                                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
>+                                                                        <select id="basketgroupid" name="basketgroupid">
>+                                                                            <option value="">No group</option>
>+                                                                            [% FOREACH bg IN basketgroups %]
>+                                                                                [% IF ( bg.default ) %]
>+                                                                                    <option value="[% bg.id | html %]" selected="selected">[% bg.name | html %]</option>
>+                                                                                [% ELSE %]
>+                                                                                    [% UNLESS bg.closed %]
>+                                                                                        <option value="[% bg.id | html %]">[% bg.name | html %]</option>
>+                                                                                    [% ELSE %]
>+                                                                                        <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] <span>(closed)</span></option>
>+                                                                                    [% END %]
>+                                                                                [% END %]
>+                                                                            [% END %]
>+                                                                            <option value="new">Add new group</option>
>+                                                                        </select>
>+                                                                        <a href="#" id="basket_group_cancel" class="cancel">Cancel</a>
>+                                                                        <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>+                                                                        <input type="hidden" value="mod_basket" name="op" />
>+                                                                        <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                                                    </form>
>+                                                                </div>
>+                                                            </li>
>+                                                        [% END # /IF ( CAN_user_acquisition_group_manage ) %]
>+                                                        [% IF basketgroup.deliveryplace %]
>+                                                            <li>
>+                                                                <span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) | html %]
>+                                                            </li>
>+                                                        [% END %]
>+                                                        [% IF basketgroup.billingplace %]
>+                                                            <li>
>+                                                                <span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) | html %]
>+                                                            </li>
>+                                                        [% END %]
>+                                                    </ol>
>+                                                [% END # /IF closeddate %]
>+                                            </div> 
>+                                        </div> 
>+                                    </div> 
>                                 [% END %]
>-                            </li>
>-                        [% END %]
>-                    </ol>
> 
>-                    [% IF ( closedate ) %]
>-                        <ol>
>-                            <li>
>-                                <span class="label">Basket group:</span>
>-                                [% IF basketgroup.id and not basketgroup.name %]
>-                                    [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %]
>+                                [% IF ( duplinbatch ) %]
>+                                    <div class="dialog alert">
>+                                        <h4>Duplicate warning</h4>
>+                                        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" style="margin-left:10px"><i class="fa fa-window-restore"></i> Display them</a></p>
>+                                    </div>
>                                 [% END %]
> 
>-                                [% IF basketgroup.closed %]
>-                                    [% IF ( CAN_user_acquisition_group_manage ) %]
>-                                        <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] <span>(closed)</span></a>
>-                                    [% ELSE %]
>-                                        [% basketgroup.name | html %] <span>(closed)</span>
>-                                    [% END %]
>-                                [% ELSIF ( ! CAN_user_acquisition_group_manage ) %]
>-                                    [%- IF basketgroup.id -%]
>-                                [% basketgroup.name | html %]
>-                                    [%- ELSE -%]
>-                                        <span>No group</span>
>-                                    [%- END -%]
>-                                [% ELSE %]
>-                                    [% IF ( CAN_user_acquisition_group_manage ) %]
>-                                        [% IF ( basketgroup.id ) %]
>-                                            [% basketgroup.name | html %]
>-                                            <a href="#" id="set_basket_group"><i class="fa fa-pencil"></i> Change basket group</a>
>-                                        [% ELSE %]
>-                                            No group
>-                                            <a href="#" id="set_basket_group"><i class="fa fa-pencil"></i> Set basket group</a>
>-                                        [% END %]
>-                                    [% END %]
>-                                [% END %]
>-                            </li>
>-                            [% IF ( CAN_user_acquisition_group_manage ) %]
>-                                <li id="basket_grouping" style="display:none;">
>-                                    <span class="label">&nbsp;</span>
>-                                    <div style="float:left">
>-                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
>-                                            <select id="basketgroupid" name="basketgroupid">
>-                                                <option value="">No group</option>
>-                                                [% FOREACH bg IN basketgroups %]
>-                                                    [% IF ( bg.default ) %]
>-                                                        <option value="[% bg.id | html %]" selected="selected">[% bg.name | html %]</option>
>-                                                    [% ELSE %]
>-                                                        [% UNLESS bg.closed %]
>-                                                            <option value="[% bg.id | html %]">[% bg.name | html %]</option>
>-                                                        [% ELSE %]
>-                                                            <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] <span>(closed)</span></option>
>+                                <div id="acqui_basket_content" class="page-section">
>+                                    [% IF ( books_loop ) %]
>+                                        <h2>Orders</h2>
>+                                        <table id="orders">
>+                                            <thead>
>+                                                <tr>
>+                                                    <th>No.</th>
>+                                                    <th>[% tp('noun', 'Order') | html %]</th>
>+                                                    <th>RRP tax exc.</th>
>+                                                    <th>Actual cost tax exc.</th>
>+                                                    <th>Budgeted cost tax exc.</th>
>+                                                    <th>RRP tax inc.</th>
>+                                                    <th>Actual cost tax inc.</th>
>+                                                    <th>Budgeted cost tax inc.</th>
>+                                                    <th>Replacement price</th>
>+                                                    <th>Qty.</th>
>+                                                    <th>Total tax exc. ([% currency | html %])</th>
>+                                                    <th>Total tax inc. ([% currency | html %])</th>
>+                                                    <th>GST %</th>
>+                                                    <th>GST</th>
>+                                                    <th>Fund</th>
>+                                                    <th>Estimated delivery date</th>
>+                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+                                                        <th>Supplier report</th>
>+                                                    [% END %]
>+                                                    [% IF ( active ) %]
>+                                                        [% UNLESS ( closedate ) %]
>+                                                            <th class="NoSort">Modify</th>
>+                                                            <th class="NoSort">Cancel order</th>
>                                                         [% END %]
>                                                     [% END %]
>+                                                </tr>
>+                                            </thead>
>+                                            <tfoot>
>+                                                [% FOREACH foot_loo IN book_foot_loop %]
>+                                                    <tr>
>+                                                        <th></th>
>+                                                        <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>[% foot_loo.quantity | html %]</th>
>+                                                        <th>[% foot_loo.total_tax_excluded | $Price %]</th>
>+                                                        <th>[% foot_loo.total_tax_included | $Price %]</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>[% foot_loo.tax_value | $Price %]</th>
>+                                                        <th>&nbsp;</th>
>+                                                        <th>&nbsp;</th>
>+                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+                                                            <th>&nbsp;</th>
>+                                                        [% END %]
>+                                                        [% IF ( active ) %]
>+                                                            [% UNLESS ( closedate ) %]
>+                                                                <th>&nbsp;</th>
>+                                                                <th>&nbsp;</th>
>+                                                            [% END %]
>+                                                        [% END %]
>+                                                    </tr>
>                                                 [% END %]
>-                                                <option value="new">Add new group</option>
>-                                            </select>
>-                                            <a href="#" id="basket_group_cancel" class="cancel">Cancel</a>
>-                                            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>-                                            <input type="hidden" value="mod_basket" name="op" />
>-                                            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-                                        </form>
>-                                    </div>
>-                                </li>
>-                            [% END # /IF ( CAN_user_acquisition_group_manage ) %]
>-                            [% IF basketgroup.deliveryplace %]
>-                                <li>
>-                                    <span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) | html %]
>-                                </li>
>-                            [% END %]
>-                            [% IF basketgroup.billingplace %]
>-                                <li>
>-                                    <span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) | html %]
>-                                </li>
>-                            [% END %]
>-                        </ol>
>-                    [% END # /IF closeddate %]
>-                    </div> 
>-                </div> 
>-            </div> 
>-        [% END %]
>-        [% IF ( duplinbatch ) %]<div class="dialog alert">
>-        <h4>Duplicate warning</h4>
>-        <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" style="margin-left:10px"><i class="fa fa-window-restore"></i> Display them</a></p>
>-        </div>[% END %]
>+                                                <tr>
>+                                                    <th></th>
>+                                                    <th>Total ([% currency | html %])</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>[% total_quantity | html %]</th>
>+                                                    <th>[% total_tax_excluded | $Price %]</th>
>+                                                    <th>[% total_tax_included | $Price %]</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>[% total_tax_value | $Price %]</th>
>+                                                    <th>&nbsp;</th>
>+                                                    <th>&nbsp;</th>
>+                                                    [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+                                                        <th>&nbsp;</th>
>+                                                    [% END %]
>+                                                    [% IF ( active ) %]
>+                                                        [% UNLESS ( closedate ) %]
>+                                                            <th>&nbsp;</th>
>+                                                            <th>&nbsp;</th>
>+                                                        [% END %]
>+                                                    [% END %]
>+                                                </tr>
>+                                            </tfoot>
>+                                            <tbody>
>+                                                [% FOREACH books_loo IN books_loop %]
>+                                                    [% IF ( books_loo.order_received ) %]
>+                                                        <tr class="disabled">
>+                                                    [% ELSE %]
>+                                                        <tr>
>+                                                    [% END %]
>+                                                        <td>
>+                                                            [% books_loo.ordernumber | html %]
>+                                                        </td>
>+                                                        <td>
>+                                                            <p>
>+                                                                [% IF ( books_loo.order_received ) %] <span class="order-received">(received)</span>[% 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 %]
>+                                                                    <em>Deleted bibliographic record, can't find title</em><br />
>+                                                                [%- END %]
>+                                                                <br />
>+                                                                [%- 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 ) %]
>+                                                                    <br/>
>+                                                                    Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby | html %] [% END %]
>+                                                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
>+                                                                [% END %]
>+                                                            </p>
>+                                                            [% IF ( books_loo.order_internalnote ) %]
>+                                                                <p class="ordernote"><strong>Internal note: </strong><span id="internal-note-[% books_loo.ordernumber | html %]">[% books_loo.order_internalnote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"><i class="fa fa-pencil"></i> Edit internal note</a></p>
>+                                                            [% ELSE %]
>+                                                                <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"><i class="fa fa-plus"></i> Add internal note</a>
>+                                                            [% END %]
>+                                                            [% IF ( books_loo.order_vendornote ) %]
>+                                                                <p class="ordernote"><strong>Vendor note: </strong> <span id="vendor-note-[% books_loo.ordernumber | html %]">[% books_loo.order_vendornote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"><i class="fa fa-pencil"></i> Edit vendor note</a></p>
>+                                                            [% ELSE %]
>+                                                                <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"><i class="fa fa-plus"></i> Add vendor note</a>
>+                                                            [% END %]
>+                                                            [% IF (books_loo.transferred_from) %]
>+                                                                [% basket = books_loo.transferred_from.basket %]
>+                                                                [% bookseller = books_loo.transferred_from.bookseller %]
>+                                                                [% timestamp = books_loo.transferred_from.timestamp %]
>+                                                                <p>
>+                                                                    Transferred from basket:
>+                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>+                                                                    (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>+                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
>+                                                                    [% timestamp | $KohaDates %]
>+                                                                    </span>
>+                                                                </p>
>+                                                            [% END %]
>+                                                            [% SET claims = books_loo.order_object.claims %]
>+                                                            [% IF claims.count %]
>+                                                                <p>
>+                                                                    This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %]
>+                                                                </p>
>+                                                            [% END %]
>+                                                        </td>
>+                                                        [% 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 %]
>+                                                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] <span>(Uncertain)</span> [% END %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.unitprice_tax_excluded | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.ecost_tax_excluded | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.rrp_tax_included | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.unitprice_tax_included | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.ecost_tax_included | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.replacementprice | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.quantity | html %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.total_tax_excluded | $Price %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.total_tax_included | $Price %]
>+                                                        </td>
>+                                                        <td class="number">
>+                                                            [% books_loo.tax_rate * 100 | html %]
>+                                                        </td>
>+                                                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">
>+                                                            [% books_loo.tax_value | $Price %]
>+                                                        </td>
>+                                                        <td>
>+                                                            [% books_loo.budget_name | html %]
>+                                                        </td>
>+                                                        <td data-order="[% books_loo.estimated_delivery_date | html %]" class="actions">
>+                                                            [% books_loo.estimated_delivery_date | $KohaDates %]
>+                                                            [% IF CAN_user_acquisition_order_manage %]
>+                                                                    <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | html %]">
>+                                                                    <i class="fa fa-pencil"></i> Edit</a>
>+                                                            [% END %]
>+                                                        </td>
>+                                                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+                                                            <td>[% books_loo.suppliers_report | html %]</td>
>+                                                        [% END %]
>+                                                        [% IF ( active ) %]
>+                                                            [% UNLESS ( closedate ) %]
>+                                                                <td>
>+                                                                    <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
>+                                                                    [% UNLESS (books_loo.order_received) %]
>+                                                                        <br />
>+                                                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
>+                                                                    [% END %]
>+                                                                </td>
>+                                                                <td>
>+                                                                    [% IF ( books_loo.orderstatus != "complete") %]
>+                                                                        [% IF ( books_loo.left_holds_on_order ) %]
>+                                                                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order. Cancel holds first">Can't cancel order</span><br>
>+                                                                        [% ELSE %]
>+                                                                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a><br>
>+                                                                        [% END %]
>+                                                                        [% IF ( books_loo.can_del_bib ) %]
>+                                                                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a><br>
>+                                                                        [% ELSE %]
>+                                                                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
>+                                                                        [% END %]
>+                                                                        [% IF ( books_loo.left_item ) %]
>+                                                                            <strong title="Can't delete catalog record, because of [% books_loo.items | html %] existing hold(s)" >[% books_loo.items | html %] item(s) left</strong><br>
>+                                                                        [% END %]
>+                                                                        [% IF ( books_loo.left_biblio ) %]
>+                                                                            <strong title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios | html %] order(s) left</strong><br>
>+                                                                        [% END %]
>+                                                                        [% IF ( books_loo.left_subscription ) %]
>+                                                                            <strong title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions | html %] subscription(s) left</strong><br>
>+                                                                        [% END %]
>+                                                                        [% IF ( books_loo.left_holds ) %]
>+                                                                            <strong title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds | html %] hold(s) left</strong>
>+                                                                        [% END %]
>+                                                                    [% END %]
>+                                                                </td>
>+                                                            [% END %]
>+                                                        [% END %]
>+                                                    </tr>
>+                                                [% END %]
>+                                            </tbody>
>+                                        </table>
>+                                    [% END %]
>+                                    [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
>+                                </div> 
> 
>-        <div id="acqui_basket_content" class="page-section">
>-        [% IF ( books_loop ) %]
>-            <h2>Orders</h2>
>-                <table id="orders">
>-                    <thead>
>-                        <tr>
>-                            <th>No.</th>
>-                            <th>[% tp('noun', 'Order') | html %]</th>
>-                            <th>RRP tax exc.</th>
>-                            <th>Actual cost tax exc.</th>
>-                            <th>Budgeted cost tax exc.</th>
>-                            <th>RRP tax inc.</th>
>-                            <th>Actual cost tax inc.</th>
>-                            <th>Budgeted cost tax inc.</th>
>-                            <th>Replacement price</th>
>-                            <th>Qty.</th>
>-                            <th>Total tax exc. ([% currency | html %])</th>
>-                            <th>Total tax inc. ([% currency | html %])</th>
>-                            <th>GST %</th>
>-                            <th>GST</th>
>-                            <th>Fund</th>
>-                            <th>Estimated delivery date</th>
>-                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
>-                            <th>Supplier report</th>
>-                            [% END %]
>-                            [% IF ( active ) %]
>-                                [% UNLESS ( closedate ) %]
>-                                    <th class="NoSort">Modify</th>
>-                                    <th class="NoSort">Cancel order</th>
>+                                [% IF (cancelledorders_loop) %]
>+                                    <div id="cancelledorders" class="page-section">
>+                                        <h2>Cancelled orders</h2>
>+                                        <table id="cancelledorderst">
>+                                            <thead>
>+                                                <tr>
>+                                                    <th>No.</th>
>+                                                    <th>[% tp('noun', 'Order') | html %]</th>
>+                                                    <th class="tax_excluded">RRP tax exc.</th>
>+                                                    <th class="tax_excluded">ecost tax exc.</th>
>+                                                    <th class="tax_included">RRP tax inc.</th>
>+                                                    <th class="tax_included">ecost tax inc.</th>
>+                                                    <th class="replacementprice">Replacement price</th>
>+                                                    <th>Qty.</th>
>+                                                    <th class="tax_excluded">Total tax exc. ([% currency | html %])</th>
>+                                                    <th class="tax_included">Total tax inc. ([% currency | html %])</th>
>+                                                    <th>GST %</th>
>+                                                    <th>GST</th>
>+                                                    <th>Fund</th>
>+                                                </tr>
>+                                            </thead>
>+                                            <tbody>
>+                                                [% FOREACH order IN cancelledorders_loop %]
>+                                                    <tr style="color:grey">
>+                                                        <td>
>+                                                            [% order.ordernumber | html %]
>+                                                        </td>
>+                                                        <td>
>+                                                            <p>
>+                                                                [% IF ( order.order_received ) %] <span class="order-received">(received)</span>[% END %]
>+                                                                [% IF (order.title) %]
>+                                                                    [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %]
>+                                                                [% ELSE %]
>+                                                                    <em>Deleted bibliographic record, can't find title</em>
>+                                                                [% END %]
>+                                                                <br />
>+                                                                [% 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 ) %]
>+                                                                    <br />
>+                                                                    Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) | html %]
>+                                                                [% END %]
>+                                                            </p>
>+                                                            [% IF order.transferred_to %]
>+                                                                [% basket = order.transferred_to.basket %]
>+                                                                [% bookseller = order.transferred_to.bookseller %]
>+                                                                [% timestamp = order.transferred_to.timestamp %]
>+                                                                <p>Transferred to basket:
>+                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>+                                                                    (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>+                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
>+                                                                        [% timestamp | $KohaDates %]
>+                                                                    </span>
>+                                                                </p>
>+                                                            [% END %]
>+                                                        </td>
>+                                                        <td class="number">
>+                                                            [% order.rrp_tax_excluded | $Price %]
>+                                                            [% IF ( order.uncertain ) %]
>+                                                                <span>(Uncertain)</span>
>+                                                            [% END %]
>+                                                        </td>
>+                                                        <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
>+                                                        <td class="number">[% order.rrp_tax_included | $Price %]</td>
>+                                                        <td class="number">[% order.ecost_tax_included | $Price %]</td>
>+                                                        <td class="number">[% order.replacementprice | $Price %]</td>
>+                                                        <td class="number">[% order.quantity | html %]</td>
>+                                                        <td class="number">[% order.total_tax_excluded | $Price %]</td>
>+                                                        <td class="number">[% order.total_tax_included | $Price %]</td>
>+                                                        <td class="number">[% order.tax_rate * 100 | html %]</td>
>+                                                        <td class="number">[% order.tax_value | $Price %]</td>
>+                                                        <td>[% order.budget_name | html %]
>+                                                    </tr>
>+                                                [% END %]
>+                                            </tbody>
>+                                        </table>
>+                                    </div> 
>                                 [% END %]
>-                            [% END %]
>-                        </tr>
>-                    </thead>
>-                    <tfoot>
>-                    [% FOREACH foot_loo IN book_foot_loop %]
>-                        <tr>
>-                            <th></th>
>-                            <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            <th>[% foot_loo.quantity | html %]</th>
>-                            <th>[% foot_loo.total_tax_excluded | $Price %]</th>
>-                            <th>[% foot_loo.total_tax_included | $Price %]</th>
>-                            <th>&nbsp;</th>
>-                            <th>[% foot_loo.tax_value | $Price %]</th>
>-                            <th>&nbsp;</th>
>-                            <th>&nbsp;</th>
>-                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
>-                            <th>&nbsp;</th>
>-                            [% END %]
>-                            [% IF ( active ) %]
>+                                <br />
>+
>                                 [% UNLESS ( closedate ) %]
>-                                    <th>&nbsp;</th>
>-                                    <th>&nbsp;</th>
>+                                    
>+                                    <div id="addtoBasket" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
>+                                        <div class="modal-dialog" role="document">
>+                                            <div class="modal-content">
>+                                                <div class="modal-header">
>+                                                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                                                    <h4 class="modal-title" id="addtoBasketLabel">Add order to basket</h4>
>+                                                </div>
>+                                                <div class="modal-body">
>+                                                    [% IF active %]
>+                                                        [% INCLUDE 'acquisitions-add-to-basket.inc' %]
>+                                                    [% END %]
>+                                                </div>
>+                                                <div class="modal-footer">
>+                                                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
>+                                                </div>
>+                                            </div>
>+                                        </div>
>+                                    </div>
>                                 [% END %]
>+
>                             [% END %]
>-                        </tr>
>-                    [% END %]
>-                    <tr>
>-                        <th></th>
>-                        <th>Total ([% currency | html %])</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        <th>[% total_quantity | html %]</th>
>-                        <th>[% total_tax_excluded | $Price %]</th>
>-                        <th>[% total_tax_included | $Price %]</th>
>-                        <th>&nbsp;</th>
>-                        <th>[% total_tax_value | $Price %]</th>
>-                        <th>&nbsp;</th>
>-                        <th>&nbsp;</th>
>-                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
>-                        <th>&nbsp;</th>
>-                        [% END %]
>-                        [% IF ( active ) %]
>-                            [% UNLESS ( closedate ) %]
>-                                <th>&nbsp;</th>
>-                                <th>&nbsp;</th>
>-                            [% END %]
>-                        [% END %]
>-                    </tr>
>-                    </tfoot>
>-                    <tbody>
>-                    [% FOREACH books_loo IN books_loop %]
>-                        [% IF ( books_loo.order_received ) %]
>-                            <tr class="disabled">
>-                        [% ELSE %]
>-                            <tr>
>                         [% END %]
>-                            <td>
>-                                [% books_loo.ordernumber | html %]
>-                            </td>
>-                            <td>
>-                                <p>
>-                                    [% IF ( books_loo.order_received ) %] <span class="order-received">(received)</span>[% 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 %]
>-                                        <em>Deleted bibliographic record, can't find title</em><br />
>-                                    [%- END %]
>-                                    <br />
>-                                    [%- 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 ) %]
>-                                        <br/>
>-                                        Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby | html %] [% END %]
>-                                        (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
>-                                    [% END %]
>-                                </p>
>-                                    [% IF ( books_loo.order_internalnote ) %]
>-                                        <p class="ordernote"><strong>Internal note: </strong><span id="internal-note-[% books_loo.ordernumber | html %]">[% books_loo.order_internalnote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"><i class="fa fa-pencil"></i> Edit internal note</a></p>
>-                                    [% ELSE %]
>-                                        <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"><i class="fa fa-plus"></i> Add internal note</a>
>-                                    [% END %]
>-                                    [% IF ( books_loo.order_vendornote ) %]
>-                                        <p class="ordernote"><strong>Vendor note: </strong> <span id="vendor-note-[% books_loo.ordernumber | html %]">[% books_loo.order_vendornote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"><i class="fa fa-pencil"></i> Edit vendor note</a></p>
>-                                    [% ELSE %]
>-                                        <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"><i class="fa fa-plus"></i> Add vendor note</a>
>-                                    [% END %]
>-                                [% IF (books_loo.transferred_from) %]
>-                                  [% basket = books_loo.transferred_from.basket %]
>-                                  [% bookseller = books_loo.transferred_from.bookseller %]
>-                                  [% timestamp = books_loo.transferred_from.timestamp %]
>-                                  <p>Transferred from basket:
>-                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>-                                    (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>-                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
>-                                      [% timestamp | $KohaDates %]
>-                                    </span>
>-                                  </p>
>-                                [% END %]
>-                                [% SET claims = books_loo.order_object.claims %]
>-                                [% IF claims.count %]
>+                    [% ELSE %]
>+                        
>+                    [% END %]
>+
>+                    [% IF ( confirm_close ) %]
>+                        <div id="closebasket_needsconfirmation" class="dialog alert">
>+
>+                            <form action="/cgi-bin/koha/acqui/basket.pl">
>+                                <h1>Are you sure you want to close basket [% basketname | html %]?</h1>
>+                                [% IF ( CAN_user_acquisition_group_manage ) %]
>                                     <p>
>-                                        This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %]
>+                                    <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
>+                                    <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
>                                     </p>
>                                 [% END %]
>-                            </td>
>-                            [% 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 %]
>-                            <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] <span>(Uncertain)</span> [% END %] </td>
>-                            <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td>
>-                            <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
>-                            <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
>-                            <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_included | $Price %]</td>
>-                            <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
>-                            <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
>-                            <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
>-                            <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
>-                            <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
>-                            <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
>-                            <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
>-                            <td>[% books_loo.budget_name | html %]</td>
>-                            <td data-order="[% books_loo.estimated_delivery_date | html %]" class="actions">
>-                                [% books_loo.estimated_delivery_date | $KohaDates %]
>-                                [% IF CAN_user_acquisition_order_manage %]
>-                                <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | html %]">
>-                                    <i class="fa fa-pencil"></i> Edit
>-                                </a>
>-                            </td>
>-                            [% IF Koha.Preference('EDIFACT') && ediaccount %]
>-                            <td>[% books_loo.suppliers_report | html %]</td>
>-                            [% END %]
>-                        [% END %]
>-                            [% IF ( active ) %]
>-                                [% UNLESS ( closedate ) %]
>-                                <td>
>-                                    <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
>-                                    [% UNLESS (books_loo.order_received) %]
>-                                        <br />
>-                                        <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
>-                                    [% END %]
>-                                </td>
>-                                <td>
>-                                [% IF ( books_loo.orderstatus != "complete") %]
>-                                    [% IF ( books_loo.left_holds_on_order ) %]
>-                                        <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order. Cancel holds first">Can't cancel order</span><br>
>-                                    [% ELSE %]
>-                                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a><br>
>-                                    [% END %]
>-                                    [% IF ( books_loo.can_del_bib ) %]
>-                                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a><br>
>-                                    [% ELSE %]
>-                                        <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
>-                                    [% END %]
>-                                    [% IF ( books_loo.left_item ) %]
>-                                        <strong title="Can't delete catalog record, because of [% books_loo.items | html %] existing hold(s)" >[% books_loo.items | html %] item(s) left</strong><br>
>-                                    [% END %]
>-                                    [% IF ( books_loo.left_biblio ) %]
>-                                        <strong title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios | html %] order(s) left</strong><br>
>-                                    [% END %]
>-                                    [% IF ( books_loo.left_subscription ) %]
>-                                        <strong title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions | html %] subscription(s) left</strong><br>
>-                                    [% END %]
>-                                    [% IF ( books_loo.left_holds ) %]
>-                                        <strong title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds | html %] hold(s) left</strong>
>-                                    [% END %]
>-                                [% END %]
>-                                </td>
>-                                [% END %]
>-                            [% END %]
>-                        </tr>
>+                                <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>+                                <input type="hidden" value="close" name="op" />
>+                                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                <input type="hidden" name="confirm" value="1" />
>+                                <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
>+                                <button type="submit" class="approve" accesskey="y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
>+                            </form>
>+                            <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>+                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
>+                            </form>
>+                        </div>
>                     [% END %]
>-                    </tbody>
>-                </table>
>-            [% END %]
>-            [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
>-        </div> 
> 
>-        [% IF (cancelledorders_loop) %]
>-        <div id="cancelledorders" class="page-section">
>-            <h2>Cancelled orders</h2>
>-            <table id="cancelledorderst">
>-              <thead>
>-                <tr>
>-                  <th>No.</th>
>-                  <th>[% tp('noun', 'Order') | html %]</th>
>-                  <th class="tax_excluded">RRP tax exc.</th>
>-                  <th class="tax_excluded">ecost tax exc.</th>
>-                  <th class="tax_included">RRP tax inc.</th>
>-                  <th class="tax_included">ecost tax inc.</th>
>-                  <th class="replacementprice">Replacement price</th>
>-                  <th>Qty.</th>
>-                  <th class="tax_excluded">Total tax exc. ([% currency | html %])</th>
>-                  <th class="tax_included">Total tax inc. ([% currency | html %])</th>
>-                  <th>GST %</th>
>-                  <th>GST</th>
>-                  <th>Fund</th>
>-                </tr>
>-              </thead>
>-              <tbody>
>-                [% FOREACH order IN cancelledorders_loop %]
>-                  <tr style="color:grey">
>-                    <td>
>-                        [% order.ordernumber | html %]
>-                    </td>
>-                    <td>
>-                      <p>
>-                        [% IF ( order.order_received ) %] <span class="order-received">(received)</span>[% END %]
>-                        [% IF (order.title) %]
>-                          [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %]
>-                        [% ELSE %]
>-                          <em>Deleted bibliographic record, can't find title</em>
>-                        [% END %]
>-                        <br />
>-                        [% 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 ) %]
>-                          <br />
>-                          Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) | html %]
>-                        [% END %]
>-                      </p>
>-                      [% IF order.transferred_to %]
>-                        [% basket = order.transferred_to.basket %]
>-                        [% bookseller = order.transferred_to.bookseller %]
>-                        [% timestamp = order.transferred_to.timestamp %]
>-                        <p>Transferred to basket:
>-                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>-                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>-                          on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
>-                            [% timestamp | $KohaDates %]
>-                          </span>
>-                        </p>
>-                      [% END %]
>-                    </td>
>-                    <td class="number">
>-                        [% order.rrp_tax_excluded | $Price %]
>-                        [% IF ( order.uncertain ) %]
>-                            <span>(Uncertain)</span>
>-                        [% END %]
>-                    </td>
>-                    <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
>-                    <td class="number">[% order.rrp_tax_included | $Price %]</td>
>-                    <td class="number">[% order.ecost_tax_included | $Price %]</td>
>-                    <td class="number">[% order.replacementprice | $Price %]</td>
>-                    <td class="number">[% order.quantity | html %]</td>
>-                    <td class="number">[% order.total_tax_excluded | $Price %]</td>
>-                    <td class="number">[% order.total_tax_included | $Price %]</td>
>-                    <td class="number">[% order.tax_rate * 100 | html %]</td>
>-                    <td class="number">[% order.tax_value | $Price %]</td>
>-                    <td>[% order.budget_name | html %]
>-                  </tr>
>-                [% END %]
>-              </tbody>
>-            </table>
>-          </div> 
>-        [% END %]
>-        <br />
>-
>-        [% UNLESS ( closedate ) %]
>-            
>-            <div id="addtoBasket" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true" data-basketno="[% basket.basketname | html %]">
>-                <div class="modal-dialog" role="document">
>-                    <div class="modal-content">
>-                        <div class="modal-header">
>-                            <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>-                            <h4 class="modal-title" id="addtoBasketLabel">Add order to basket</h4>
>-                        </div>
>-                        <div class="modal-body">
>-                            [% IF active %]
>-                                [% INCLUDE 'acquisitions-add-to-basket.inc' %]
>-                            [% END %]
>-                        </div>
>-                        <div class="modal-footer">
>-                            <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
>+                    [% IF edi_confirm %]
>+                        <div id="closebasket_needsconfirmation" class="dialog alert">
>+                            <form action="/cgi-bin/koha/acqui/basket.pl">
>+                                <h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname | html %]?</h1>
>+                                [% IF CAN_user_acquisition_group_manage %]
>+                                    <p>
>+                                        <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
>+                                        <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
>+                                    </p>
>+                                [% END %]
>+                                <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>+                                <input type="hidden" value="ediorder" name="op" />
>+                                <input type="hidden" name="ean" value="[% ean | html %]" />
>+                                <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>+                                <input type="hidden" name="confirm" value="1" />
>+                                <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
>+                                <button type="submit" class="approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
>+                            </form>
>+                            <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>+                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
>+                                <button type="submit" class="deny" accesskey="N"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
>+                            </form>
>                         </div>
>-                    </div>
>-                </div>
>-            </div>
>-        [% END %]
>-
>-[% END %]
>-[% END %]    [% ELSE %] 
>-    [% END %]
>-[% IF ( confirm_close ) %]
>-        <div id="closebasket_needsconfirmation" class="dialog alert">
>-
>-        <form action="/cgi-bin/koha/acqui/basket.pl">
>-            <h1>Are you sure you want to close basket [% basketname | html %]?</h1>
>-            [% IF ( CAN_user_acquisition_group_manage ) %]
>-            <p>
>-            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
>-            <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
>-            </p>
>-            [% END %]
>-            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>-            <input type="hidden" value="close" name="op" />
>-            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-            <input type="hidden" name="confirm" value="1" />
>-            <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
>-            <button type="submit" class="approve" accesskey="y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
>-        </form>
>-        <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>-            <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-            <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
>-        </form>
>-        </div>
>-    [% END %]
>-[% IF edi_confirm %]
>-        <div id="closebasket_needsconfirmation" class="dialog alert">
>-
>-        <form action="/cgi-bin/koha/acqui/basket.pl">
>-            <h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname | html %]?</h1>
>-            [% IF CAN_user_acquisition_group_manage %]
>-            <p>
>-            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
>-            <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
>-            </p>
>-            [% END %]
>-            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>-            <input type="hidden" value="ediorder" name="op" />
>-            <input type="hidden" name="ean" value="[% ean | html %]" />
>-            <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
>-            <input type="hidden" name="confirm" value="1" />
>-            <input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
>-            <button type="submit" class="approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
>-        </form>
>-        <form action="/cgi-bin/koha/acqui/basket.pl" method="get">
>-            <input type="hidden" name="basketno" value="[% basketno | html %]" />
>-            <button type="submit" class="deny" accesskey="N"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
>-        </form>
>-        </div>
>-    [% END %]
>-[% END %][%# IF (cannot_manage_basket) %]
>-
>+                    [% END %]
>+                [% END %][%# IF (cannot_manage_basket) %]
>             </main>
>         </div> 
> 
>@@ -825,53 +871,53 @@
>     </div> 
> 
> 
>-
>-<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
>-    <div class="modal-dialog" role="document">
>-        <form id="modify_order_notes" action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
>-            <div class="modal-content">
>-                <div class="modal-header">
>-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>-                    <h4 class="modal-title" id="noteEditorLabel">Order note</h4>
>+    
>+    <div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
>+        <div class="modal-dialog" role="document">
>+            <form id="modify_order_notes" action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
>+                <div class="modal-content">
>+                    <div class="modal-header">
>+                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                        <h4 class="modal-title" id="noteEditorLabel">Order note</h4>
>+                    </div>
>+                    <div class="modal-body">
>+                        <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea>
>+                        <input type="hidden" id="ordernumber" name="ordernumber" value="" />
>+                        <input type="hidden" name="op" value="save" />
>+                        <input type="hidden" id="type" name="type" value="" />
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-default">Save</button>
>+                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
>+                    </div>
>                 </div>
>-                <div class="modal-body">
>-                <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea>
>-                <input type="hidden" id="ordernumber" name="ordernumber" value="" />
>-                <input type="hidden" name="op" value="save" />
>-                <input type="hidden" id="type" name="type" value="" />
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-default">Save</button>
>-                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
>-            </div>
>-            </div>
>-        </form>
>+            </form>
>+        </div>
>     </div>
>-</div>
> 
>-
>-<div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
>-    <div class="modal-dialog" role="document">
>-        <form id="modify_estimated_delivery_date" action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
>-            <div class="modal-content">
>-                <div class="modal-header">
>-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>-                    <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
>+    
>+    <div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
>+        <div class="modal-dialog" role="document">
>+            <form id="modify_estimated_delivery_date" action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
>+                <div class="modal-content">
>+                    <div class="modal-header">
>+                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
>+                        <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
>+                    </div>
>+                    <div class="modal-body">
>+                        <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]"/>
>+                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                        <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
>+                        <input type="hidden" name="op" value="save" />
>+                    </div>
>+                    <div class="modal-footer">
>+                        <button type="submit" class="btn btn-default">Save</button>
>+                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
>+                    </div>
>                 </div>
>-                <div class="modal-body">
>-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]"/>
>-                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>-                <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
>-                <input type="hidden" name="op" value="save" />
>-            </div>
>-            <div class="modal-footer">
>-                <button type="submit" class="btn btn-default">Save</button>
>-                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
>-            </div>
>-            </div>
>-        </form>
>+            </form>
>+        </div>
>     </div>
>-</div>
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>-- 
>2.39.1

Actions: View | Diff | Splinter Review

Attachments on bug 31932: 145664 | 145665 | 145686 | 145687 | 145736 | 145737