Merge branch 'bug_9108' into 3.12-master
This commit is contained in:
commit
243cfbe7ce
|
|
@ -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"){
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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' ) || '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ if ( $run_report ) {
|
|||
total => scalar @$items,
|
||||
itemsloop => $items,
|
||||
run_report => $run_report,
|
||||
dateformat => C4::Context->preference("dateformat"),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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": [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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": [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
} ) );
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
} ) );
|
||||
|
|
|
|||
|
|
@ -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" ]]
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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' %]
|
||||
|
|
|
|||
|
|
@ -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 },
|
||||
],
|
||||
|
|
|
|||
|
|
@ -250,5 +250,4 @@ else {
|
|||
}
|
||||
|
||||
# Print the page
|
||||
$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), );
|
||||
output_html_with_http_headers $query, $cookie, $template->output;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ''),
|
||||
|
|
|
|||
|
|
@ -573,7 +573,5 @@ if (
|
|||
);
|
||||
}
|
||||
|
||||
$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
|
||||
|
||||
output_html_with_http_headers $query, $cookie, $template->output;
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
|
|
@ -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});
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@ if ($do_it) {
|
|||
$template->param(
|
||||
CGIextChoice => $CGIextChoice,
|
||||
CGIsepChoice => $CGIsepChoice,
|
||||
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -207,7 +207,6 @@ $qstring = "limit=$pagesize" . ($qstring ? '&' . $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),
|
||||
|
|
|
|||
|
|
@ -166,7 +166,6 @@ $template->param(
|
|||
step1 => '1',
|
||||
filterdate1 => $filterdate1,
|
||||
filterdate2 => $filterdate2,
|
||||
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
|
||||
borrower_categorycodes => GetBorrowercategoryList(),
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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"),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -148,7 +148,6 @@ $template->param(
|
|||
keydate => $keydate,
|
||||
branchcodes => $branchcodes,
|
||||
branch => $branch,
|
||||
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
|
||||
branchname => $branchname,
|
||||
branch => $branch,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue