@@ -141,7 +131,6 @@ function submitForm(form) {
- [% IF ( grouping ) %]
[% IF (closedbg) %]
- [% ELSE %]
-
-
- [% IF (NoEDIMessage) %]
No EDIFACT configuration for [% booksellername | html %]
[% END %]
-
-
- [% UNLESS ( listclosed) %]- Open
- [% ELSE%]- Open
[% END %]
- [% IF ( listclosed) %]- Closed
- [% ELSE %]- Closed
[% END %]
-
-
-
-
-
-
- Name |
- Number |
- Billing place |
- Delivery place |
- Number of baskets |
- Action |
-
-
-
- [% FOREACH basketgroup IN basketgroups %]
- [% IF ( basketgroup.closed ) %]
-
-
- [% IF ( basketgroup.name ) %]
- [% basketgroup.name | html %]
- [% ELSE %]
- Basket group no. [% basketgroup.id | html %]
- [% END %]
- |
- [% basketgroup.id | html %] |
- [% Branches.GetName( basketgroup.billingplace ) | html %] |
- [% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) | html %][% END %] |
- [% basketgroup.basketsqty | html %] |
-
-
-
-
-
- [% IF (ediaccount) %]
-
- [% ELSE %]
- No EDIFACT configuration for [% booksellername | html %]
- [% END %]
- |
-
- [% END %]
- [% END %]
-
-
-
-
- [% END %]
+
+
+
+ [% IF bookseller %]
+
+
+
+ [% END %]
+
+ [% IF basketgroups.size > 0 %]
+
+
+
+ Name |
+ Vendor |
+ Billing place |
+ Delivery place |
+ No. of baskets |
+ No. of ordered titles |
+ No. of received titles |
+ Date closed |
+ Action |
+
+
+
+ [% FOREACH basketgroup IN basketgroups %]
+
+
+ [% IF ( basketgroup.name ) %]
+ [% basketgroup.name %]
+ [% ELSE %]
+ Basket group no. [% basketgroup.id %]
+ [% END %]
+ |
+ [% basketgroup.bookseller.name %] |
+ [% Branches.GetName(basketgroup.billingplace) %] |
+
+ [% IF (basketgroup.freedeliveryplace) %]
+ [% basketgroup.freedeliveryplace %]
+ [% ELSE %]
+ [% Branches.GetName(basketgroup.deliveryplace) %]
+ [% END %]
+ |
+ [% basketgroup.baskets_count %] |
+ [% basketgroup.ordered_titles_count %] |
+ [% basketgroup.received_titles_count %] |
+ [% basketgroup.closeddate | $KohaDates %] |
+
+
+ |
+
+ [% END %]
+
+
+ [% END %]
+
+
+
+ [% IF bookseller %]
+ [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %]
+ [% END %]
+ [% INCLUDE 'acquisitions-menu.inc' %]
+
+
+ [% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js
@@ -233,14 +233,6 @@ function closebasketgroup(bgid) {
div.appendChild(unclosegroup);
}
-function closeandprint(bg){
- if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){
- setTimeout("window.location.reload();",3000);
- }else{
- alert(MSG_FILE_DOWNLOAD_ERROR);
- }
-}
-
//function that lets the user unclose a basketgroup
//as long as they haven't submitted the changes to the page.
function unclosegroup(bgid){
--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
@@ -1,42 +1,89 @@
// These default options are for translation but can be used
// for any other datatables settings
// MSG_DT_* variables comes from datatables.inc
-// To use it, write:
-// $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {
-// // other settings
-// } ) );
+// Since version 1.10, DataTables has a new API while still providing the older
+// one.
+// You can use the new API with these defaults by writing:
+//
+// $('#table_id').kohaDataTable({ ... });
+//
+// To use the older API, write:
+//
+// $("#table_id").dataTable($.extend(true, {}, dataTablesDefaults, { ... });
+
+var DataTableDefaults = {
+ "language": {
+ "emptyTable": window.MSG_DT_EMPTY_TABLE || "No data available in table",
+ "info": window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
+ "infoEmpty": window.MSG_DT_INFO_EMPTY || "No entries to show",
+ "infoFiltered": window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
+ "lengthMenu": window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
+ "loadingRecords": window.MSG_DT_LOADING_RECORDS || "Loading...",
+ "processing": window.MSG_DT_PROCESSING || "Processing...",
+ "search": window.MSG_DT_SEARCH || "Search:",
+ "zeroRecords": window.MSG_DT_ZERO_RECORDS || "No matching records found",
+ "paginate": {
+ "first": window.MSG_DT_FIRST || "First",
+ "last": window.MSG_DT_LAST || "Last",
+ "next": window.MSG_DT_NEXT || "Next",
+ "previous": window.MSG_DT_PREVIOUS || "Previous"
+ },
+ "aria": {
+ "sortAscending": window.MSG_DT_SORT_ASC || ": activate to sort column ascending",
+ "sortDescending": window.MSG_DT_SORT_DESC || ": activate to sort column descending"
+ },
+ "buttons": {
+ "copyTitle" : window.MSG_DT_COPY_TITLE || "Copy to clipboard",
+ "copyKeys" : window.MSG_DT_COPY_KEYS || "Press
ctrl or
⌘ +
C to copy the table data
to your system clipboard.
To cancel, click this message or press escape.",
+ "copySuccess": {
+ "_": window.MSG_DT_COPY_SUCCESS_X || "Copied %d rows to clipboard",
+ "1": window.MSG_DT_COPY_SUCCESS_ONE || "Copied one row to clipboard"
+ }
+ }
+ },
+ "dom": '<"top pager"ilpf>tr<"bottom pager"ip>',
+ "lengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]],
+ "pageLength": 20
+};
+
var dataTablesDefaults = {
"oLanguage": {
"oPaginate": {
- "sFirst" : window.MSG_DT_FIRST || "First",
- "sLast" : window.MSG_DT_LAST || "Last",
- "sNext" : window.MSG_DT_NEXT || "Next",
- "sPrevious" : window.MSG_DT_PREVIOUS || "Previous"
+ "sFirst" : DataTableDefaults.language.paginate.first,
+ "sLast" : DataTableDefaults.language.paginate.last,
+ "sNext" : DataTableDefaults.language.paginate.next,
+ "sPrevious" : DataTableDefaults.language.paginate.previous,
},
- "sEmptyTable" : window.MSG_DT_EMPTY_TABLE || "No data available in table",
- "sInfo" : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
- "sInfoEmpty" : window.MSG_DT_INFO_EMPTY || "No entries to show",
- "sInfoFiltered" : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
- "sLengthMenu" : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
- "sLoadingRecords" : window.MSG_DT_LOADING_RECORDS || "Loading...",
- "sProcessing" : window.MSG_DT_PROCESSING || "Processing...",
- "sSearch" : window.MSG_DT_SEARCH || "Search:",
- "sZeroRecords" : window.MSG_DT_ZERO_RECORDS || "No matching records found",
- buttons: {
- "copyTitle" : window.MSG_DT_COPY_TITLE || "Copy to clipboard",
- "copyKeys" : window.MSG_DT_COPY_KEYS || "Press
ctrl or
⌘ +
C to copy the table data
to your system clipboard.
To cancel, click this message or press escape.",
+ "sEmptyTable" : DataTableDefaults.language.emptyTable,
+ "sInfo" : DataTableDefaults.language.info,
+ "sInfoEmpty" : DataTableDefaults.language.infoEmpty,
+ "sInfoFiltered" : DataTableDefaults.language.infoFiltered,
+ "sLengthMenu" : DataTableDefaults.language.lengthMenu,
+ "sLoadingRecords" : DataTableDefaults.language.loadingRecords,
+ "sProcessing" : DataTableDefaults.language.processing,
+ "sSearch" : DataTableDefaults.language.search,
+ "sZeroRecords" : DataTableDefaults.language.zeroRecords,
+ "buttons": {
+ "copyTitle" : DataTableDefaults.language.buttons.copyTitle,
+ "copyKeys" : DataTableDefaults.language.buttons.copyKeys,
"copySuccess": {
- _: window.MSG_DT_COPY_SUCCESS_X || "Copied %d rows to clipboard",
- 1: window.MSG_DT_COPY_SUCCESS_ONE || "Copied one row to clipboard"
+ "_": DataTableDefaults.language.buttons.copySuccess["_"],
+ "1": DataTableDefaults.language.buttons.copySuccess["1"]
}
}
},
"dom": '<"top pager"ilpfB>tr<"bottom pager"ip>',
"buttons": [],
- "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]],
- "iDisplayLength": 20
+ "aLengthMenu": DataTableDefaults.lengthMenu,
+ "iDisplayLength": DataTableDefaults.pageLength
};
+(function($) {
+ $.fn.kohaDataTable = function(options) {
+ return this.DataTable($.extend(true, {}, DataTableDefaults, options));
+ };
+})(jQuery);
+
// Return an array of string containing the values of a particular column
$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
--