From: Jared Camins-Esakov <jcamins@cpbibliography.com>
Date: Fri, 18 Jan 2013 02:59:34 +0000 (-0500)
Subject: Merge branch 'bug_9108' into 3.12-master
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=243cfbe7cebb8f90225a4b72f7ffb63c3f9b8ca0;hp=4c96b5fb1fae26265cc217fac9c6dc6a96a04e03;p=koha.git

Merge branch 'bug_9108' into 3.12-master
---

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 2eb63f5170..92f1d4c41d 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -300,6 +300,7 @@ sub get_template_and_user {
  	}
 
     if(C4::Context->preference('dateformat')){
+        $template->param( dateformat => C4::Context->preference('dateformat') );
         if(C4::Context->preference('dateformat') eq "metric"){
             $template->param(dateformat_metric => 1);
         } elsif(C4::Context->preference('dateformat') eq "us"){
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 5a1c2480d1..1341dc10b0 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -148,7 +148,6 @@ $template->param(
     loop_suppliers => $loop_suppliers,
     supplier       => ( $booksellerid || $supplier ),
     count          => $supplier_count,
-    dateformat     => C4::Context->preference('dateformat'),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index e89bcae394..1ffbffeed0 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -132,8 +132,6 @@ $template->param(
     basketgroupname         => $basketgroupname,
     from_placed_on          => $from_date,
     to_placed_on            => $to_date,
-    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
-    dateformat              => C4::Dates->new()->format(),
     debug                   => $debug || $input->param('debug') || 0,
     uc(C4::Context->preference("marcflavour")) => 1
 );
diff --git a/acqui/invoice.pl b/acqui/invoice.pl
index 7c51ebcd39..6e6bb25138 100755
--- a/acqui/invoice.pl
+++ b/acqui/invoice.pl
@@ -195,7 +195,6 @@ $template->param(
     total_quantity   => $total_quantity,
     invoiceincgst    => $bookseller->{invoiceincgst},
     currency         => $bookseller->{listprice},
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     budgets_loop             => \@budgets_loop,
 );
 
diff --git a/acqui/invoices.pl b/acqui/invoices.pl
index 4b45e31dba..b7f360e987 100755
--- a/acqui/invoices.pl
+++ b/acqui/invoices.pl
@@ -151,7 +151,6 @@ $template->param(
     branchname               => $branchname,
     suppliers_loop           => \@suppliers_loop,
     branches_loop            => \@branches_loop,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 544370d0b8..6dea529923 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -173,6 +173,5 @@ $template->param(
     estimateddeliverydateto   => $estimateddeliverydateto,
 	total => $total,
 	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 4f2849d43f..de868df8b2 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -175,7 +175,6 @@ $template->param(
     dateto                   => $dateto,
     resultsperpage           => $resultsperpage,
     name                     => $bookseller->{'name'},
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     shipmentdate_today       => C4::Dates->new()->output(),
     booksellerid             => $booksellerid,
     GST                      => C4::Context->preference('gist'),
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index d113de2044..df417c0934 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -105,7 +105,6 @@ if ( $op eq 'display' ) {
         basketcount   => $supplier->{'basketcount'},
         subscriptioncount   => $supplier->{'subscriptioncount'},
         contracts     => $contracts,
-        dateformat    => C4::Context->preference("dateformat"),
     );
 } elsif ( $op eq 'delete' ) {
     # no further message needed for the user
diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 5f34dc235e..9371d01d24 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -133,7 +133,6 @@ if ( $op eq 'add_form' ) {
 			%$budgetperiod_hash
         );
     } # IF-MOD
-    $template->param( DHTMLcalendar_dateformat 	=> C4::Dates->DHTMLcalendar(),);
 }
 
 elsif ( $op eq 'add_validate' ) {
@@ -175,7 +174,6 @@ elsif ( $op eq 'delete_confirmed' ) {
 # display the form for duplicating
 elsif ( $op eq 'duplicate_form'){
     $template->param(
-        DHTMLcalendar_dateformat 	=> C4::Dates->DHTMLcalendar(),
         'duplicate_form' => '1',
         'budget_period_id' => $budget_period_id,
     );
@@ -291,7 +289,6 @@ $template->param(
     active_pagination_bar   => $active_pagination_bar,
     inactive_pagination_bar => $inactive_pagination_bar,
     tab                     => $tab,
-    dateformat              => C4::Context->preference('dateformat'),
 );
 
 $template->param($op=>1);
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 9d3f0acec5..d744953d93 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -51,8 +51,6 @@ $template->param(
     contractnumber => $contractnumber,
     booksellerid   => $booksellerid,
     booksellername => $bookseller->{name},
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    dateformat     => C4::Context->preference("dateformat"),
 );
 
 #ADD_FORM: called if $op is 'add_form'. Used to create form to add or  modify a record
@@ -70,7 +68,6 @@ if ( $op eq 'add_form' ) {
             contractdescription => $contract->{contractdescription},
             contractstartdate => format_date( $contract->{contractstartdate} ),
             contractenddate   => format_date( $contract->{contractenddate} ),
-            DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
         );
     } else {
         $template->param(
@@ -79,7 +76,6 @@ if ( $op eq 'add_form' ) {
             contractdescription      => undef,
             contractstartdate        => undef,
             contractenddate          => undef,
-            DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
         );
     }
 
diff --git a/admin/categorie.pl b/admin/categorie.pl
index 496415839b..952ef7a1fd 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -130,7 +130,6 @@ if ($op eq 'add_form') {
 				reservefee              => sprintf("%.2f",$data->{'reservefee'}),
                                 hidelostitems           => $data->{'hidelostitems'},
 				category_type           => $data->{'category_type'},
-				DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
                 SMSSendDriver => C4::Context->preference("SMSSendDriver"),
                 TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"),
 				"type_".$data->{'category_type'} => 1,
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 91fd1a2068..fe9ae6088e 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -735,8 +735,6 @@ $template->param(
     SpecifyDueDate            => $duedatespec_allow,
     CircAutocompl             => C4::Context->preference("CircAutocompl"),
 	AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-    dateformat                => C4::Context->preference("dateformat"),
-    DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar(),
     export_remove_fields      => C4::Context->preference("ExportRemoveFields"),
     export_with_csv_profile   => C4::Context->preference("ExportWithCsvProfile"),
     canned_bor_notes_loop     => $canned_notes,
diff --git a/circ/overdue.pl b/circ/overdue.pl
index e44e792f0a..cef345cbff 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -221,7 +221,6 @@ $template->param(
     borname => $bornamefilter,
     order => $order,
     showall => $showall,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     dateduefrom => $input->param( 'dateduefrom' ) || '',
     datedueto   => $input->param( 'datedueto' ) || '',
 );
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index e532faff3e..0f5d3da78a 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -201,8 +201,6 @@ $template->param(
     run_report          => $run_report,
     reserveloop         => \@reservedata,
     "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
-    DHTMLcalendar_dateformat    =>  C4::Dates->DHTMLcalendar(),
-    dateformat                  => C4::Context->preference("dateformat"),
     HoldsToPullStartDate        => (C4::Context->preference('HoldsToPullStartDate')?C4::Context->preference('HoldsToPullStartDate'):2),
 );
 
diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index 1517adfb97..209a09e758 100755
--- a/circ/reserveratios.pl
+++ b/circ/reserveratios.pl
@@ -185,7 +185,6 @@ $template->param(
     to              => $enddate,
     ratio           => $ratio,
     reserveloop     => \@reservedata,
-    DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 86f799275c..a037726059 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -120,7 +120,6 @@ foreach my $br ( keys %$branches ) {
 $template->param(
     branchesloop => \@branchesloop,
     show_date    => format_date(C4::Dates->today('iso')),
-	'dateformat_' . (C4::Context->preference("dateformat") || '') => 1,
 	TransfersMaxDaysWarning => C4::Context->preference('TransfersMaxDaysWarning'),
 	latetransfers => $latetransfers ? 1 : 0,
 );
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index cf529f04aa..80bb6097ee 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -58,7 +58,6 @@ if ( $run_report ) {
         total      => scalar @$items,
         itemsloop  => $items,
         run_report => $run_report,
-        dateformat => C4::Context->preference("dateformat"),
     );
 }
 
diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index ec3feb55f2..158b847e05 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -155,7 +155,6 @@ $template->param(
     overloop    => \@overloop,
     overcount   => $overcount,
     show_date   => format_date(C4::Dates->today('iso')),
-    dateformat  => C4::Context->preference("dateformat"),
     ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
 );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 98161b2331..3627077f64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -15,6 +15,9 @@
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     $(document).ready(function() {
         var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
             "aoColumnDefs": [
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 5659c1dc7c..e10ec8f7f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -9,6 +9,9 @@
 <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript">
 //<![CDATA[
+[% IF (dateformat == 'metric') %]
+    dt_add_type_uk_date();
+[% END %]
  $(document).ready(function() {
     var histsearcht = $("#histsearcht").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 8e9b1a3799..21147e50d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -11,6 +11,9 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
         bInfo: false,
         bPaginate: false,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index b146060df4..c825d06e45 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -11,6 +11,9 @@
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
+[% IF (dateformat == 'metric') %]
+    dt_add_type_uk_date();
+[% END %]
 $(document).ready(function() {
     var late_orderst = $("#late_orders").dataTable($.extend(true, {}, dataTablesDefaults, {
         "aoColumnDefs": [
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index fbfa57a0d1..23441f885c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -8,6 +8,9 @@
 <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript">
 //<![CDATA[
+[% IF (dateformat == 'metric') %]
+    dt_add_type_uk_date();
+[% END %]
  $(document).ready(function() {
     var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 616139c4c7..b3220da609 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
+[% IF (dateformat == 'metric') %]
+    dt_add_type_uk_date();
+[% END %]
     var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
     } ) );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 1d6255de08..95634d05d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     var spent = $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
     } ) );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index 8f473e5e4f..5f8da2e661 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -7,6 +7,9 @@
 [% INCLUDE 'datatables-strings.inc' %]
 <script type="text/javascript" id="js">
 $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     $("#table_issues").dataTable($.extend(true, {}, dataTablesDefaults, {
             "aaSorting": [[ 4, "desc" ]]
         })
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index cdab69d245..0b832dcc89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -9,6 +9,9 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 $(document).ready(function() {
+  [% IF (dateformat == 'metric') %]
+      dt_add_type_uk_date();
+  [% END %]
   var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
   }));
   holdst.fnAddFilters("filter");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 90e1530e78..32c91a715b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -6,13 +6,18 @@
 <script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
 [% INCLUDE 'datatables-strings.inc' %]
 <script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
-<script type="text/javascript" id="js">$(document).ready(function() {
+<script type="text/javascript" id="js">
+//<![CDATA[
  $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button",
     }));
  });
-}); </script>
+//]]>
+</script>
 </head>
 <body id="pat_readingrec" class="pat">
 [% INCLUDE 'header.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 558f988d28..cc25c6895c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -9,7 +9,11 @@
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
     var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
+
         "aoColumnDefs": [
             { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
         ],
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 9b920094cf..ef7d9bf24a 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -250,5 +250,4 @@ else {
 }
 
 # Print the page
-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), );
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 9a3dd18bfc..d2302dc7b5 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -704,7 +704,6 @@ $template->param( debug  => $debug  ) if $debug;
 $template->param(
   BorrowerMandatoryField => C4::Context->preference("BorrowerMandatoryField"),#field to test with javascript
   category_type => $category_type,#to know the category type of the borrower
-  DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
   select_city => $select_city,
   "$category_type"  => 1,# associate with step to know where u are
   destination   => $destination,#to know wher u come from and wher u must go in redirect
diff --git a/members/moremember.pl b/members/moremember.pl
index 3928286b13..4ccba00716 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -408,7 +408,6 @@ $template->param( $data->{'categorycode'} => 1 );
 $template->param(
     detailview => 1,
     AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     CANDELETEUSER    => $candeleteuser,
     roaddetails     => $roaddetails,
     borrowernumber  => $borrowernumber,
@@ -427,8 +426,6 @@ $template->param(
     StaffMember     => ($category_type eq 'S'),
     is_child        => ($category_type eq 'C'),
 #   reserveloop     => \@reservedata,
-    dateformat      => C4::Context->preference("dateformat"),
-    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
     samebranch     => $samebranch,
     quickslip		  => $quickslip,
     activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 4ff947881b..07b4f76520 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -573,7 +573,5 @@ if (
     );
 }
 
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
-
 output_html_with_http_headers $query, $cookie, $template->output;
 
diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl
index 65141b9f7a..1b76c55894 100755
--- a/opac/opac-search-history.pl
+++ b/opac/opac-search-history.pl
@@ -45,8 +45,6 @@ my ($template, $loggedinuser, $cookie)
                                 debug => 1,
                                 });
 
-$template->param(dateformat => C4::Context->preference("dateformat"));
-
 # If the user is not logged in, we deal with the cookie
 if (!$loggedinuser) {
 
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index a856081dab..3cf1f53e8d 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -236,8 +236,7 @@ if ($loggedinuser) {
 	}
 }
 
-$template->param(tagsview => 1,
-dateformat => C4::Context->preference("dateformat"));
+$template->param(tagsview => 1);
 
 if ($add_op) {
 	my $adds = 0;
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index dfdb6cd86c..3d5f3b84eb 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -158,7 +158,6 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
 
 $template->param(
                  itemtypeloop =>\@itemtypesloop,
-                 dateformat    => C4::Context->preference("dateformat"),
                 );
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 229104d6bd..5ef5531792 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -355,10 +355,8 @@ $template->param(
     patronupdate => $patronupdate,
     OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
     userview => 1,
-    dateformat    => C4::Context->preference("dateformat"),
 );
 
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
 $template->param(
     SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 25a3594b7c..0f16c8cea3 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -245,7 +245,7 @@ if ($borrower->{cardnumber}) {
     $template->param(
         inputfocus => $inputfocus,
         nofines => 1,
-        "dateformat_" . C4::Context->preference('dateformat') => 1,
+
     );
     if (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) {
         my ($image, $dberror) = GetPatronImage($borrower->{cardnumber});
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index de4b0f34bb..cdc5b9a561 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -72,10 +72,11 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 
 our $sep     = $input->param("sep") // '';
 $sep = "\t" if ($sep eq 'tabulation');
+
 $template->param(
     do_it                    => $do_it,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
+
 if ($do_it) {
     my $results =
       calculate( $line, $column, $podsp, $rodsp, $calc, \@filters );
diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 6ad34955cf..9618faf3a4 100755
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -66,7 +66,6 @@ my ($template, $borrowernumber, $cookie)
 our $sep     = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
 if ($do_it) {
 # Displaying results
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 722faba29e..55243b355a 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -60,7 +60,6 @@ my ($template, $borrowernumber, $cookie)
                 debug => 1,
                 });
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
 if ($do_it) {
 # Displaying results
diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index 9e00ea3e94..6fab3a4aa1 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -140,7 +140,6 @@ if ($do_it) {
 	$template->param(
 		CGIextChoice => $CGIextChoice,
 		CGIsepChoice => $CGIsepChoice,
-		DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     );
 
 }
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index 2a6409d2c9..22b88ae017 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -65,7 +65,6 @@ my ($template, $borrowernumber, $cookie)
 our $sep     = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
 if ($do_it) {
 # Displaying results
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index f27ce105cf..96b71e9463 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -124,7 +124,6 @@ elsif ( $phase eq 'New Term step 4' ) {
 		'definition_description' => $definition_description,
 		'columns' => \@column_loop,
 		'columnstring' => $columnstring,
-                'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),
 	);
 }
 
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index de18072937..631e056f7a 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -776,7 +776,6 @@ foreach (1..6) {
      $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last;
 }
 $template->param(   'referer' => $input->referer(),
-                    'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),
                 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index 372f3c0073..bbd6f52c9c 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -68,7 +68,6 @@ my ($template, $borrowernumber, $cookie)
 our $sep     = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     );
 if ($do_it) {
 # Displaying results
diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index 4b6aa42541..ddc3740c26 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -72,7 +72,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 our $sep     = $input->param("sep");
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 
 my $itemtypes = GetItemTypes();
diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl
index c20a6760ba..bfeaf8b8c5 100755
--- a/reports/reserves_stats.pl
+++ b/reports/reserves_stats.pl
@@ -78,7 +78,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 our $sep     = $input->param("sep") || '';
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
-	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 
 my $itemtypes = GetItemTypes();
diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl
index 47c4b4d3b6..16b8f8aa4b 100755
--- a/reports/stats.screen.pl
+++ b/reports/stats.screen.pl
@@ -261,7 +261,6 @@ else {
         totalwritten => $totalwritten,
         totalrefund  => $totalrefunds,
         totalcash    => $totalcash,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }
diff --git a/reserve/request.pl b/reserve/request.pl
index 705f4f6fa5..506d5fa282 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -631,7 +631,6 @@ foreach my $biblionumber (@biblionumbers) {
 
 $template->param( biblioloop => \@biblioloop );
 $template->param( biblionumbers => $biblionumbers );
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
 
 if ($multihold) {
     $template->param( multi_hold => 1 );
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index e8318540b0..8dff415473 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -97,7 +97,6 @@ if ($date) {
     );
 }
 $template->param (
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     (uc(C4::Context->preference("marcflavour"))) => 1
 );
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/serials/claims.pl b/serials/claims.pl
index 1b97a1b232..5434b2aea9 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -98,8 +98,6 @@ $template->param(
         claimletter => $claimletter,
         supplierloop => \@supplierinfo,
         branchloop   => $branchloop,
-        dateformat    => C4::Context->preference("dateformat"),
-    	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         (uc(C4::Context->preference("marcflavour"))) => 1
         );
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index a3306ea14b..ee1aea4570 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -139,11 +139,9 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b
 my $locations_loop = GetAuthorisedValues("LOC",$subs->{'location'});
 
 $template->param(branchloop => $branchloop,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     locations_loop=>$locations_loop,
 );
 # prepare template variables common to all $op conditions:
-$template->param(  'dateformat_' . C4::Context->preference('dateformat') => 1 );
 if ($op!~/^mod/) {
     letter_loop(q{}, $template);
 }
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 717d5dfd6b..7fa301e99e 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -264,7 +264,6 @@ foreach my $element ( qw(managedby suggestedby acceptedby) ) {
 $template->param(
     %$suggestion_ref,  
     "op_$op"                => 1,
-    dateformat    => C4::Context->preference("dateformat"),
     "op"             =>$op,
 );
 
@@ -384,5 +383,4 @@ foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) {
     $hashlists{ lc($field) . "_loop" } = \@codes_list;
 }
 $template->param(%hashlists);
-$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),);
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/tags/review.pl b/tags/review.pl
index 7517f4167e..23e4cd84df 100755
--- a/tags/review.pl
+++ b/tags/review.pl
@@ -207,7 +207,6 @@ $qstring = "limit=$pagesize" . ($qstring ? '&amp;' . $qstring : '');
 $debug and print STDERR "number of approval_rows: " . scalar(@$tagloop) . "rows\n";
 (scalar @errors) and $template->param(message_loop=>\@errors);
 $template->param(
-	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 	offset => $offset,	# req'd for EXPR
 	op => $op,
 	op_count => scalar(@tags),
diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index e350b9dd21..65ce8131e2 100755
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -166,7 +166,6 @@ $template->param(
     step1                    => '1',
     filterdate1              => $filterdate1,
     filterdate2              => $filterdate2,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     borrower_categorycodes   => GetBorrowercategoryList(),
 );
 
diff --git a/tools/export.pl b/tools/export.pl
index 0415a3a16b..1b5a766513 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -466,7 +466,6 @@ else {
     $template->param(
         branchloop               => \@branchloop,
         itemtypeloop             => \@itemtypesloop,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         authtypeloop             => \@authtypesloop,
         export_remove_fields     => C4::Context->preference("ExportRemoveFields"),
     );
diff --git a/tools/holidays.pl b/tools/holidays.pl
index d5ace27647..09449a3196 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -148,7 +148,6 @@ $template->param(
     keydate                  => $keydate,
     branchcodes              => $branchcodes,
     branch                   => $branch,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     branchname               => $branchname,
     branch                   => $branch,
 );
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 5e7b198af7..fdf316194f 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -125,7 +125,6 @@ $statussth =~ s, and $,,g;
  
 $template->param(branchloop => \@branch_loop,
                 authorised_values=>\@authorised_value_list,   
-                DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
                 today			=>	C4::Dates->today(),
                 minlocation => $minlocation,
                 maxlocation => $maxlocation,
diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index afc526864e..4dd07a9b25 100755
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -118,8 +118,4 @@ else {
         opac_news_count => $opac_news_count,
 		);
 }
-$template->param(
-				DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
-				dateformat    => C4::Context->preference("dateformat"),
-		);
 output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index a2c27c6a02..1bba4a07d8 100755
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -228,7 +228,6 @@ if ( $op eq 'show' ) {
     $template->param('patron_attributes_values', \@patron_attributes_values);
 
     $template->param( fields => \@fields );
-    $template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
 }
 
 # Process modifications
diff --git a/tools/scheduler.pl b/tools/scheduler.pl
index 4d732db3a5..99210ac409 100755
--- a/tools/scheduler.pl
+++ b/tools/scheduler.pl
@@ -109,8 +109,6 @@ $template->param( JOBS           => \@jobloop );
 my $time = localtime(time);
 $template->param( 'time' => $time );
 $template->param(
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    dateformat               => C4::Dates->new()->format(),
     debug                    => $debug,
 );
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index e7d8e02f5e..29386b3273 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -100,10 +100,8 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
 }
 
 $template->param(
-	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-	              dateformat => C4::Dates->new()->format(),
-				       debug => $debug,
-	C4::Search::enabled_staff_search_views,
+    debug => $debug,
+    C4::Search::enabled_staff_search_views,
 );
 
 if ($do_it) {