Bug 15685: Allow creation of items (AcqCreateItem) to be customizable per-basket
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / basket.tt
index 3524ecd..aa081ba 100644 (file)
@@ -1,33 +1,70 @@
+[% BLOCK csv_export %]
+    <div class="btn-group">
+        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]"><i class="fa fa-download"></i> Export as CSV</a>
+      <a class="btn btn-default btn-sm 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 %]
+              [% FOR csv IN csv_profiles %]
+                <li><a href="#" data-value="[% csv.export_format_id %]">[% csv.profile %]</a></li>
+              [% END %]
+          [% END %]
+       </ul>
+    </div>
+[% END %]
 [% USE KohaDates %]
+[% USE Branches %]
+[% USE Price %]
+[% USE AuthorisedValues %]
+
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %]</title>
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
-
+[% INCLUDE 'datatables.inc' %]
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
 <script type="text/javascript">
 //<![CDATA[
     function updateColumnsVisibility(visible) {
         if ( visible ) {
-            $("table .gste, .gsti").show();
+            $("table .tax_excluded, .tax_included").show();
         } else {
             [% IF ( listincgst ) %]
-                $("table .gste").hide();
+                $("table .tax_excluded").hide();
             [% ELSE %]
-                $("table .gsti").hide();
+                $("table .tax_included").hide();
             [% END %]
         }
     }
 
     $(document).ready(function() {
+        $('#toolbar').fixFloat();
         $("#show_all_details").click(function(){
-            updateColumnsVisibility($(this+":checked").val());
+            updateColumnsVisibility($(this).is(":checked"));
         });
 
-        $("#show_all_details").attr('checked', false);
+        $("#show_all_details").prop('checked', false);
         updateColumnsVisibility(false);
+        [% UNLESS ( closedate ) %]
+            $('#addtoBasket').on('show', function () {
+               $(this).find(".modal-body").html($(".acqui_basket_add")[0].outerHTML);
+            });
+        [% END %]
+
+        $("body").on("click", ".del_user", function(e){
+            e.preventDefault();
+            del_user( $(this).data("borrowernumber") );
+        });
+
+        $("#add_user").on("click",function(e){
+            e.preventDefault();
+            UserSearchPopup();
+        });
+
+        $(".transfer_order").on("click",function(e){
+            e.preventDefault();
+            transfer_order_popup( $(this).data("ordernumber"));
+        });
     });
 //]]>
 </script>
 [% UNLESS ( closedate ) %]
 <script type="text/javascript">
 //<![CDATA[
-            function confirm_close() {
-                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
-                if (is_confirmed) {
-                    window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
-                }
-            }
-            function confirm_deletion() {
-                var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));
-                if (is_confirmed) {
-                    window.location = "[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]";
-                }
+
+            function transfer_order_popup(ordernumber) {
+                var url = "/cgi-bin/koha/acqui/transferorder.pl?"
+                    + "ordernumber=" + ordernumber
+                window.open(url, 'TransferOrder','width=600,height=400,toolbar=false,scrollbars=yes');
             }
-            function confirm_delete_item(ordernumber, biblionumber) {
-                var is_confirmed = confirm(_('Are you sure you want to delete this order ?'));
+
+            function confirm_ediorder() {
+                var is_confirmed = confirm(_("Are you sure you want to close this basket and generate an EDIFACT order?"));
                 if (is_confirmed) {
-                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber;
+                    window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno |html %]";
                 }
             }
-            
-            function confirm_delete_biblio(ordernumber, biblionumber) {
-                var is_confirmed = confirm(_('Are you sure you want to delete this catalog record and order ?'));
-                if (is_confirmed) {
-                    window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
-                    }
-            }
 
 //]]>
 </script>
 [% UNLESS ( grouped ) %]
 <script type="text/javascript">
 //<![CDATA[
-            function confirm_reopen(skip) {
-                var is_confirmed = skip || confirm(_('Are you sure you want to reopen this basket?'));
+            function confirm_reopen() {
+                var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %];
+                var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?"));
                 if (is_confirmed) {
-                    window.location = "[% script_name %]?op=reopen&basketno=[% basketno %]";
+                    window.location = "/cgi-bin/koha/acqui/basket.pl?op=reopen&basketno=[% basketno |html %]";
                 }
             }
 //]]>
         var orderst = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sPaginationType": "four_button",
             [% IF ( active ) %]
-              [% UNLESS ( closedate ) %]
                 "aoColumnDefs": [
-                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+                    [% UNLESS ( closedate ) %]
+                        { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+                    [% END %]
+                    { "sType": "anti-the", "aTargets": [ "anti-the" ] }
                 ],
-              [% END %]
             [% END %]
         } ) );
         var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sPaginationType": "four_button"
         } ) );
-    } );
+        $("#reopenbutton").on("click",function(e){
+            e.preventDefault();
+            confirm_reopen();
+        });
+        // Generates a dynamic link for exporting the selections data as CSV
+        $("#exportbutton, #export-csv-menu a").click(function() {
+            // Building the url from currently checked boxes
+            var url = '/cgi-bin/koha/acqui/basket.pl';
+            url += $('#exportbutton').attr('href');
+            if($(this).attr("data-value")) {
+                url += '&amp;csv_profile=' + $(this).attr("data-value");
+            }
+            // And redirecting to the CSV page
+            location.href = url;
+            return false;
+        });
+    });
+
+    function UserSearchPopup(f) {
+        window.open(
+            "/cgi-bin/koha/acqui/add_user_search.pl",
+            'UserSearchPopup',
+            'width=840, height=500, scrollbars=yes, toolbar=no,'
+         );
+    }
+
+    function add_user(borrowernumber, borrowername) {
+        var ids = $("#users_ids").val();
+        if(ids.length > 0) {
+            ids = ids.split(':');
+        } else {
+            ids = new Array;
+        }
+        if (ids.indexOf(borrowernumber) < 0) {
+            ids.push(borrowernumber);
+            $("#users_ids").val(ids.join(':'));
+            var li = '<li id="user_'+borrowernumber+'">'+borrowername
+            + ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash"></i> '
+                + _("Delete user") + '</a></li>';
+            $("#users_names").append(li);
+            return 0;
+        }
+        return -1;
+    }
+
+    function del_user(borrowernumber) {
+      $("#user_"+borrowernumber).remove();
+      var ids = $("#users_ids").val().split(':');
+      ids.splice(ids.indexOf(borrowernumber.toString()), 1);
+      $("#users_ids").val(ids.join(':'));
+    }
 //]]>
 </script>
-
 <style type="text/css">
 .sortmsg {font-size: 80%;}
 </style>
 [% INCLUDE 'acquisitions-search.inc' %]
 
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</div>
+<div id="breadcrumbs">
+    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
+    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
+    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo;
+    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno |html %])[% END %] for [% booksellername|html %]
+</div>
 
 <div id="doc3" class="yui-t2">
 
 <div id="bd">
     <div id="yui-main">
+    [% IF (cannot_manage_basket) %]
+        <div class="yui-b">
+            <p class="error">You are not authorised to manage this basket.</p>
+        </div>
+    [% ELSE %]
     <div class="yui-b">
-        [% UNLESS ( confirm_close ) %]
+        [% IF !confirm_close && !edi_confirm %]
         [% UNLESS ( selectbasketg ) %]
             [% UNLESS ( closedate ) %]
-                <div id="toolbar">
-                    <script type="text/javascript">
-                        //<![CDATA[
-                        // prepare DOM for YUI Toolbar
-                        $(document).ready(function() {
-                            yuiToolbar();
-                        });
-                        // YUI Toolbar Functions
-                        function yuiToolbar() {
-                            [% IF ( unclosable ) %]
-                                new YAHOO.widget.Button("closebutton", {disabled:true});
-                            [% ELSIF ( uncertainprices ) %]
-                                new YAHOO.widget.Button("uncertpricesbutton");
-                            [% ELSE %]
-                                new YAHOO.widget.Button("closebutton");
-                            [% END %]
-                            new YAHOO.widget.Button("basketheadbutton");
-                            new YAHOO.widget.Button("exportbutton");
-                            new YAHOO.widget.Button("delbasketbutton");
-                        }
-                        //]]>
-                    </script>
-
-                    <ul id="toolbar-list" class="toolbar">
-                    <li><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="button" id="basketheadbutton">Edit basket</a></li>
-                    <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
-                    [% IF ( unclosable ) %]
+            [% UNLESS ( delete_confirmed ) %]
+                <div id="toolbar" class="btn-toolbar">
+                    [% IF active %]
+                        <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" 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 %]&amp;basketno=[% basketno %]&amp;op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
+                    [%# FIXME This action should not be available for everyone %]
+                    <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default btn-sm" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div>
+                   [% IF ( unclosable ) %]
                     [% ELSIF ( uncertainprices ) %]
-                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
+                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div>
                     [% ELSE %]
-                        <li><a href="[% script_name %]?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="closebutton">Close this basket</a></li>
+                        <div class="btn-group">
+                            <a href="/cgi-bin/koha/acqui/basket.pl?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a>
+                        </div>
                     [% END %]
-                        <li><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="exportbutton">Export this basket as CSV</a></li>
-                    </ul>
 
+                    [% PROCESS csv_export %]
+
+                        [% IF ediaccount %]
+                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" 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 %]" />
+                                    <button type="submit" class="btn btn-default btn-sm" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button>
+                                </form>
+                            </div>
+                        [% END %]
                 </div>
+            [% END %]
+
+            <!-- Modal for confirm deletion box-->
+                <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 %]" />
+                                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+                                <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 %]" />
+                                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+                                <input type="hidden" name="delbiblio" value="0" />
+                                <button type="submit" class="btn btn-default btn-default">Delete basket and orders</button>
+                            </form>
+
+                            <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 %]" />
+                                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+                                <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>
+<!-- End of Modal-->
             [% ELSE %]
                 [% UNLESS ( grouped ) %]
-                <div id="toolbar">
-                    <script type="text/javascript">
-                        //<![CDATA[
-                        // prepare DOM for YUI Toolbar
-                        $(document).ready(function() {
-                            yuiToolbar();
-                        });
-                        // YUI Toolbar Functions
-                        function yuiToolbar() {
-                            new YAHOO.widget.Button("reopenbutton");
-                            new YAHOO.widget.Button("exportbutton");
-                        }
-                        //]]>
-                    </script>
-                        <ul id="toolbar-list" class="toolbar">
-                            <li><a href="javascript:confirm_reopen([% skip_confirm_reopen %]);" class="button" id="reopenbutton">Reopen this basket</a></li>
-                            <li><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="exportbutton">Export this basket as CSV</a></li>
-                        </ul>
+                <div id="toolbar" class="btn-toolbar">
+
+                    <div class="btn-group"><a href="#" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen this basket</a></div>
+
+                    [% PROCESS csv_export %]
+
                 </div>
                 [% END %]
             [% END %]
     <h2>Vendor not found</h2>
     [% ELSE %]
         [% IF ( delete_confirmed ) %]
-            <h3>Basket deleted</h3>
-            <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
+            <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 %]">[% cannotdelbiblio.title |html %]</a> by [% cannotdelbiblio.author %]:
+                            <ul>
+                            [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount %] item(s) attached.</li>[% END %]
+                            [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions %] subscription(s) attached.</li>[% END %]
+                            [% IF (cannotdelbiblio.countbiblio) %]<li>[% cannotdelbiblio.countbiblio %] order(s) attached.</li>[% END %]
+                            [% IF (cannotdelbiblio.othererror) %]<li>Unknown error.</li>[% END %]
+                            </ul>
+                        </li>
+                    [% END %]
+                    </ul>
+                </div>
+                <a href="booksellers.pl">Click here to go back to booksellers page</a>
+            [% ELSE %]
+                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" 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 %]
-        <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1>
-        [% IF ( delete_confirm ) %]
-            <h2>
-            <span class="yui-button yui-link-button">
-            <em class="first-child">
-                <a href="[% script_name %]?op=delete_confirm&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="yui-link-button">Yes, delete this basket!</a>
-            </em>
-            </span>
-            <span class="yui-button yui-link-button">
-            <em class="first-child">
-                <a href="[% script_name %]?basketno=[% basketno %]" class="yui-link-button">Cancel</a>
-            </em>
-            </span>
-            </h2>
+
+        [% FOR m IN messages %]
+            <div class="dialog [% m.type %]">
+                [% SWITCH m.code %]
+                [% CASE 'no_email' %]
+                    This vendor has no contact selected for sending orders to or is missing an e-mail address.
+                [% CASE 'no_basketno' %]
+                    No basket given.
+                [% CASE 'no_letter' %]
+                    There is no notice template with code ACQORDER defined.
+                [% CASE 'email_sent' %]
+                    Order e-mail was sent to the vendor.
+                [% CASE %]
+                    ERROR! - [% m.code %]
+                [% END %]
+            </div>
         [% END %]
+        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a></h1>
         [% IF ( basketno ) %]
             <div id="acqui_basket_summary" class="yui-g">
                 <div class="rows">
                 <div class="yui-u first">
                 <ol>
-                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote %]</li>[% END %]
-                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote %]</li>[% END %]
+                [% 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 %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
                 [% END %]
-                [% IF ( deliveryplace ) %]<li><span class="label">Delivery place:</span> [% deliveryplace %]</li>[% END %]
-                [% IF ( billingplace ) %]<li><span class="label">Billing place:</span> [% billingplace %]</li>[% END %]
-                [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname %]</li>[% END %]
+                [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) %]</li>[% END %]
+                [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) %]</li>[% END %]
+                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname %]</li>[% END %]
+                <li id="managedby">
+                    <form action="" method="post">
+                        <span class="label">Managed by:</span>
+                        <div style="float:left">
+                            <ul id="users_names" style="padding-left:0">
+                              [% FOREACH user IN users %]
+                                <li id="user_[% user.borrowernumber %]">
+                                    [% user.firstname %] [% user.surname %]
+                                    <a href="#" data-borrowernumber="[% user.borrowernumber %]" class="del_user"><i class="fa fa-trash"></i> Delete user</a>
+                                </li>
+                              [% END %]
+                            </ul>
+                            <input type="hidden" id="basketno" name="basketno" value="[% basketno %]" />
+                            <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids %]" />
+                            <input type="hidden" id="op" name="op" value="mod_users" />
+                            <input type="button" id="add_user" value="Add user" />
+                            <input type="submit" value="Save changes" />
+                        </div>
+                    </form>
+                </li>
+                <li id="branch">
+                    <span class="label">Library:</span>
+                    [% IF basketbranchcode %]
+                        [% Branches.GetName( basketbranchcode ) %]
+                    [% ELSE %]
+                        No library
+                    [% END %]
+                    [% IF branches_loop.size %]
+                        <form action="" method="post">
+                            <select id="branch" name="branch">
+                                <option value="">(no library)</option>
+                                [% FOREACH branch IN branches_loop %]
+                                    [% IF (branch.selected) %]
+                                        <option selected="selected" value="[% branch.branchcode %]"> [% branch.branchname %]</option>
+                                    [% ELSE %]
+                                        <option value="[% branch.branchcode %]"> [% branch.branchname %]</option>
+                                    [% END %]
+                                [% END %]
+                            </select>
+                            <input type="hidden" id="basketno" name="basketno" value="[% basketno %]" />
+                            <input type="hidden" id="op" name="op" value="mod_branch" />
+                            <input type="submit" value="Change" />
+                        </form>
+                    [% END %]
+                </li>
                 [% 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 ( 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 basket.create_items %]
+                    <li>
+                        <span class="label">Create items when:</span>
+                        [% SWITCH basket.create_items %]
+                            [% CASE 'receiving' %]Receiving items
+                            [% CASE 'cataloguing' %]Cataloguing items
+                            [% CASE %]Placing orders
+                        [% END %]
+                    </li>
+                [% END %]
 
                 </ol>
                 </div>
                 [% IF ( closedate ) %]
                 <div class="yui-u">
+                    [% IF ( CAN_user_acquisition_group_manage ) %]
                     <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
-                        <p>
-                          <label for="basketgroupid"><strong>Basket group:</strong></label>
+                    [% END %]
+                        <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 basketgroup.closed %]
-                            [% basketgroup.name %] (closed)
+                              [% IF ( CAN_user_acquisition_group_manage ) %]
+                                  <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid %]&basketgroupid=[% basketgroup.id %]" title="basketgroup">[% basketgroup.name %] (closed)</a>
+                              [% ELSE %]
+                                  [% basketgroup.name %] (closed)
+                              [% END %]
+                          [% ELSIF ( ! CAN_user_acquisition_group_manage ) %]
+                            [%- IF basketgroup.id -%]
+                                [% basketgroup.name %]
+                            [%- ELSE -%]
+                                No group
+                            [%- END -%]
                           [% ELSE %]
-                            </p>
-                            <p>
                             <select id="basketgroupid" name="basketgroupid">
-                              <option value="new">Add new group</option>
+                              <option value="">No group</option>
                               [% FOREACH bg IN basketgroups %]
                                 [% IF ( bg.default ) %]
                                     <option value="[% bg.id %]" selected="selected">[% bg.name %]</option>
                                   [% END %]
                                 [% END %]
                               [% END %]
+                              <option value="new">Add new group</option>
                             </select>
-                          [% END %]
-                        </p>
-
-                        [% UNLESS basketgroup.closed %]
-                          <p>
                             <input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
                             <input type="hidden" value="mod_basket" name="op" />
                             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                             <input type="submit" value="Change basket group" />
-                          </p>
-                        [% END %]
+                          [% END %]
+                        </li>
+                    [% IF basketgroup.deliveryplace %]<li><span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) %]</li>[% END %]
+                    [% IF basketgroup.billingplace %]<li><span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) %]</li>[% END %]
+                        </ol>
+                    [% IF ( CAN_user_acquisition_group_manage ) %]
                     </form>
-                    [% IF ( basketgroupdeliveryplace ) %]<p>Basket group delivery place: [% basketgroupdeliveryplace %]</p>[% END %]
-                    [% IF ( basketgroupbillingplace ) %]<p>Basket group billing place: [% basketgroupbillingplace %]</p>[% END %]
+                    [% END %]
                 </div>
                 [% END %]
             </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 %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
+        </div>[% END %]
 
-        [% UNLESS ( delete_confirm ) %]
         <div id="acqui_basket_content" class="yui-g">
         [% IF ( books_loop ) %]
         <h2>Orders</h2>
             <table id="orders">
                 <thead>
                     <tr>
-                        <th>Order</th>
-                        <th class="gste">RRP tax exc.</th>
-                        <th class="gste">ecost tax exc.</th>
-                        <th class="gsti">RRP tax inc.</th>
-                        <th class="gsti">ecost tax inc.</th>
+                        <th>No.</th>
+                        <th class="anti-the">Order</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>Qty.</th>
-                        <th class="gste">Total tax exc. ([% currency %])</th>
-                        <th class="gsti">Total tax inc. ([% currency %])</th>
+                        <th class="tax_excluded">Total tax exc. ([% currency %])</th>
+                        <th class="tax_included">Total tax inc. ([% currency %])</th>
                         <th>GST %</th>
                         <th>GST</th>
                         <th>Fund</th>
+                        <th>Supplier report</th>
                         [% IF ( active ) %]
                             [% UNLESS ( closedate ) %]
                                 <th>Modify</th>
-                                <th>Delete</th>
+                                <th>Cancel order</th>
                             [% END %]
                         [% END %]
                     </tr>
                 <tfoot>
                 [% FOREACH foot_loo IN book_foot_loop %]
                     <tr>
-                        <th>Total (GST [% foot_loo.gstgsti %])</th>
-                        <th class="gste"/><th class="gste"/><th class="gsti"/><th class="gsti"/>
+                        <th></th>
+                        <th>Total (GST [% foot_loo.tax_rate * 100 %])</th>
+                        <th class="tax_excluded">&nbsp;</th>
+                        <th class="tax_excluded">&nbsp;</th>
+                        <th class="tax_included">&nbsp;</th>
+                        <th class="tax_included">&nbsp;</th>
                         <th>[% foot_loo.quantity %]</th>
-                        <th class="gste">[% foot_loo.totalgste %]</th>
-                        <th class="gsti">[% foot_loo.totalgsti %]</th>
-                        <th/>
-                        <th>[% foot_loo.gstvalue %]</th>
-                        <th/>
+                        <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price%]</th>
+                        <th class="tax_included">[% foot_loo.total_tax_included | $Price %]</th>
+                        <th>&nbsp;</th>
+                        <th>[% foot_loo.tax_value | $Price %]</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
                         [% IF ( active ) %]
                             [% UNLESS ( closedate ) %]
                                 <th>&nbsp;</th>
                     </tr>
                 [% END %]
                 <tr>
+                    <th></th>
                     <th>Total ([% currency %])</th>
-                    <th class="gste"/><th class="gste"/><th class="gsti"/><th class="gsti"/>
+                    <th class="tax_excluded">&nbsp;</th>
+                    <th class="tax_excluded">&nbsp;</th>
+                    <th class="tax_included">&nbsp;</th>
+                    <th class="tax_included">&nbsp;</th>
                     <th>[% total_quantity %]</th>
-                    <th class="gste">[% total_gste %]</th>
-                    <th class="gsti">[% total_gsti %]</th>
-                    <th/>
-                    <th>[% total_gstvalue %]</th>
-                    <th/>
+                    <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
+                    <th class="tax_included">[% total_tax_included | $Price %]</th>
+                    <th>&nbsp;</th>
+                    <th>[% total_tax_value | $Price %]</th>
+                    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
                     [% IF ( active ) %]
                         [% UNLESS ( closedate ) %]
                             <th>&nbsp;</th>
                 </tfoot>
                 <tbody>
                 [% FOREACH books_loo IN books_loop %]
-                    [% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
+                    [% IF ( books_loo.order_received ) %]
+                        <tr class="disabled">
+                    [% ELSE %]
+                        <tr>
+                    [% END %]
+                        <td>
+                            [% books_loo.ordernumber %]
+                        </td>
                         <td>
-                            <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
-                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
+                            <p>
+                                [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
+                                [% IF books_loo.title %]
+                                    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a>[% IF books_loo.author %] by [% books_loo.author %][% END %]
+                                [% ELSE %]
+                                    <em>Deleted bibliographic record, can't find title</em><br />
+                                [% END %]
                                 <br />
                                 [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
                                 [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
                                 [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
-                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %]
+                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %]
+                                [% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate %][% END %]
                                 [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                                 [% IF ( books_loo.suggestionid ) %]
                                     <br/>
                                     Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
                                     (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
                                 [% END %]
-                                [% IF ( books_loo.notes ) %]
-                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
+                            </p>
+                                [% IF ( books_loo.order_internalnote ) %]
+                                    <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p>
                                 [% ELSE %]
-                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]
+                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>]
                                 [% END %]
-                            </p>
+                                [% IF ( books_loo.order_vendornote ) %]
+                                    <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p>
+                                [% ELSE %]
+                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">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 %]"> [% basket.basketname %]</a>
+                                (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a>)
+                                on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
+                                  [% timestamp | $KohaDates %]
+                                </span>
+                              </p>
+                            [% END %]
                         </td>
-                        <td class="number gste [% IF books_loo.rrpgste.search('^0') %]error[% END %]">[% books_loo.rrpgste %]</td>
-                        <td class="number gste [% IF books_loo.ecostgste.search('^0') %]error[% END %]">[% books_loo.ecostgste %]</td>
-                        <td class="number gsti [% IF books_loo.rrpgsti.search('^0') %]error[% END %]">[% books_loo.rrpgsti %]</td>
-                        <td class="number gsti [% IF books_loo.ecostgsti.search('^0') %]error[% END %]">[% books_loo.ecostgsti %]</td>
-                        <td class="number [% IF books_loo.quantity.search('^0') %]error[% END %]">[% books_loo.quantity %]</td>
-                        <td class="number gste [% IF books_loo.totalgste.search('^0') %]error[% END %]">[% books_loo.totalgste %]</td>
-                        <td class="number gsti [% IF books_loo.totalgsti.search('^0') %]error[% END %]">[% books_loo.totalgsti %]</td>
-                        <td class="number [% IF books_loo.gstgsti.search('^0') %]error[% END %]">[% books_loo.gstgsti %]</td>
-                        <td class="number [% IF books_loo.gstvalue.search('^0') %]error[% END %]">[% books_loo.gstvalue %]</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 tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
+                        <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price%]</td>
+                        <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
+                        <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
+                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
+                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
+                        <td class="number tax_included [% 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 %]</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 %]</td>
+                        <td>[% books_loo.suppliers_report %]</td>
                         [% IF ( active ) %]
                             [% UNLESS ( closedate ) %]
                             <td>
                                 <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Modify</a>
+                                [% UNLESS (books_loo.order_received) %]
+                                    <br />
+                                    <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber %]">Transfer</a>
+                                [% END %]
                             </td>
                             <td>
                             [% IF ( books_loo.left_holds_on_order ) %]
-                            <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
+                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
                             [% ELSE %]
-                            <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a><br>
+                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
                             [% END %]
                             [% IF ( books_loo.can_del_bib ) %]
-                            <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a><br>
+                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" 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 delete order and catalog record</span><br>
+                            <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 ) %]
                             <b title="Can't delete catalog record, because of [% books_loo.items %] existing hold(s)" >[% books_loo.items %] item(s) left</b><br>
             <table id="cancelledorderst">
               <thead>
                 <tr>
+                  <th>No.</th>
                   <th>Order</th>
-                  <th class="gste">RRP tax exc.</th>
-                  <th class="gste">ecost tax exc.</th>
-                  <th class="gsti">RRP tax inc.</th>
-                  <th class="gsti">ecost tax inc.</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>Qty.</th>
-                  <th class="gste">Total tax exc. ([% currency %])</th>
-                  <th class="gsti">Total tax inc. ([% currency %])</th>
+                  <th class="tax_excluded">Total tax exc. ([% currency %])</th>
+                  <th class="tax_included">Total tax inc. ([% currency %])</th>
                   <th>GST %</th>
                   <th>GST</th>
                   <th>Fund</th>
               <tbody>
                 [% FOREACH order IN cancelledorders_loop %]
                   <tr style="color:grey">
+                    <td>
+                        [% order.ordernumber %]
+                    </td>
                     <td>
                       <p>
                         [% IF ( order.order_received ) %] (rcvd)[% END %]
                         [% IF (order.title) %]
-                          [% order.title |html %] by [% order.author %]<br />
+                          [% order.title |html %][% IF order.author %] by [% order.author %][% END %]
                         [% ELSE %]
-                          <em>Deleted bibliographic record, can't find title</em><br />
+                          <em>Deleted bibliographic record, can't find title</em>
                         [% END %]
-                        [% IF ( order.notes ) %] [% order.notes %][% END %]
+                        <br />
+                        [% IF ( order.order_internalnote ) %] [% order.order_internalnote %][% END %]
                         [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
                         [% IF ( order.issn ) %] - [% order.issn %][% END %]
                         [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
-                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
+                        [% IF ( order.publicationyear ) %], [% order.publicationyear %]
+                        [% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate %][% END %]
                         [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
+                        [% IF ( order.cancellationreason ) %]
+                          <br />
+                          Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) %]
+                        [% 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 %]"> [% basket.basketname %]</a>
+                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a>)
+                          on <span title="[% timestamp | $KohaDates with_hours = 1%]">
+                            [% timestamp | $KohaDates %]
+                          </span>
+                        </p>
+                      [% END %]
                     </td>
-                    <td class="number gste">[% order.rrpgste %]</td>
-                    <td class="number gste">[% order.ecostgste %]</td>
-                    <td class="number gsti">[% order.rrpgsti %]</td>
-                    <td class="number gsti">[% order.ecostgsti %]</td>
+                    <td class="number tax_excluded">[% order.rrp_tax_excluded | $Price %]</td>
+                    <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price %]</td>
+                    <td class="number tax_included">[% order.rrp_tax_included | $Price %]</td>
+                    <td class="number tax_included">[% order.ecost_tax_included | $Price %]</td>
                     <td class="number">[% order.quantity %]</td>
-                    <td class="number gste">[% order.totalgste %]</td>
-                    <td class="number gsti">[% order.totalgsti %]</td>
-                    <td class="number">[% order.gstgsti %]</td>
-                    <td class="number">[% order.gstvalue %]</td>
+                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
+                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
+                    <td class="number">[% order.tax_rate * 100 %]</td>
+                    <td class="number">[% order.tax_value | $Price %]</td>
                     <td>[% order.budget_name %]
                   </tr>
                 [% END %]
         [% END %]
         <br />
         [% UNLESS ( closedate ) %]
-        [% INCLUDE 'acquisitions-add-to-basket.inc' %]
+
+    <!-- Modal -->
+    <div id="addtoBasket" class="modal" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true">
+        <div class="modal-dialog">
+        <div class="modal-content">
+        <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 %]
 [% END %]    [% ELSE %] <!-- if we want just to select a basketgroup for a closed basket -->
     [% END %]
 [% IF ( confirm_close ) %]
         <div id="closebasket_needsconfirmation" class="dialog alert">
 
-        <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">
+        <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 %]" name="basketno" />
             <input type="hidden" value="close" name="op" />
             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
             <input type="hidden" name="confirm" value="1" />
             <input type="hidden" name="basketgroupname" value="[% basketgroupname %]" />
-            <input type="submit" class="approve" value="Yes, close (Y)" accesskey="y" />
-            <input type="submit" class="deny" value="No, don't close (N)" accesskey="n" onclick="javascript:window.location='/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]';return false;" />
+            <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 %]" />
+            <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 %]" name="basketno" />
+            <input type="hidden" value="ediorder" name="op" />
+            <input type="hidden" name="ean" value="[% ean %]" />
+            <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+            <input type="hidden" name="confirm" value="1" />
+            <input type="hidden" name="basketgroupname" value="[% basketgroupname %]" />
+            <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 %]" />
+            <button type="submit" class="deny" accesskey="N"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
         </form>
         </div>
     [% END %]
 </div>
+[% END %][%# IF (cannot_manage_basket) %]
 </div>
 <div class="yui-b">
 [% INCLUDE 'acquisitions-menu.inc' %]