From bdb7b5845e8bfbd0c945d39537846a7cde9b00f5 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 15 Jul 2014 10:59:03 -0400 Subject: [PATCH] Bug 6427 - Update existing intranet scripts --- circ/add_message.pl | 8 +-- circ/branchoverdues.pl | 3 +- circ/circulation.pl | 4 +- circ/del_message.pl | 8 +-- .../prog/en/includes/browser-strings.inc | 33 ++++++++ .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- .../intranet-tmpl/prog/en/includes/datatables.inc | 1 + .../prog/en/includes/members-menu.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 24 ++++++ .../prog/en/modules/circ/circulation-home.tt | 1 - .../prog/en/modules/circ/circulation.tt | 7 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/help/reports/guided_reports.tt | 18 ----- .../prog/en/modules/members/moremember-print.tt | 79 +++++++++++++------- .../prog/en/modules/reports/reports-home.tt | 1 - members/moremember.pl | 25 +++--- offline_circ/enqueue_koc.pl | 1 - offline_circ/process_koc.pl | 12 ++- 19 files changed, 143 insertions(+), 90 deletions(-) diff --git a/circ/add_message.pl b/circ/add_message.pl index 053d197..9e4a604 100755 --- a/circ/add_message.pl +++ b/circ/add_message.pl @@ -17,8 +17,7 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -use strict; -use warnings; +use Modern::Perl; use CGI; @@ -26,11 +25,6 @@ use C4::Context; use C4::Auth; use C4::Output; use C4::Members; -use C4::Accounts; -use C4::Stats; -use C4::Koha; -use C4::Overdues; -use C4::Branch; # GetBranches my $input = new CGI; diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl index c5a8743..3052fe2 100755 --- a/circ/branchoverdues.pl +++ b/circ/branchoverdues.pl @@ -49,9 +49,8 @@ use Data::Dumper; level 3 : only methode is possible : - Considered Lost the documents displayed on this interface, are checked on three points - - 1) the document must be on accountlines (Type 'FU') + - 1) the document must be overdue with fines - 2) item issues is not returned - - 3) this item as not been already notify FIXME: who is the author? FIXME: No privisions (i.e. "actions") for handling notices are implemented. diff --git a/circ/circulation.pl b/circ/circulation.pl index b95bffa..dae62fc 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -467,8 +467,6 @@ foreach my $flag ( sort keys %$flags ) { my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0; $amountold =~ s/^.*\$//; # remove upto the $, if any -my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); - if ( $borrowernumber && $borrower->{'category_type'} eq 'C') { my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); my $cnt = scalar(@$catcodes); @@ -545,7 +543,7 @@ $template->param( duedatespec => $duedatespec, message => $message, CGIselectborrower => $CGIselectborrower, - totaldue => sprintf('%.2f', $total), + totaldue => sprintf('%.2f', $borrower->{account_balance}), inprocess => $inprocess, is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'), circview => 1, diff --git a/circ/del_message.pl b/circ/del_message.pl index 7229373..c2f20b7 100755 --- a/circ/del_message.pl +++ b/circ/del_message.pl @@ -17,8 +17,7 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -use strict; -use warnings; +use Modern::Perl; use CGI; @@ -26,11 +25,6 @@ use C4::Context; use C4::Auth; use C4::Output; use C4::Members; -use C4::Accounts; -use C4::Stats; -use C4::Koha; -use C4::Overdues; -use C4::Branch; # GetBranches my $input = new CGI; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc index 3dda230..01a06a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc @@ -1,7 +1,40 @@ +[% USE AuthorisedValues %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 2fe0a68..e79af4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -67,7 +67,7 @@ [% IF ( detailview ) %]
  • [% ELSE %]
  • [% END %]Details
  • [% END %] [% IF ( CAN_user_updatecharges ) %] - [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • + [% IF ( accounts_view ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]
  • [% ELSE %]
  • [% END %]Routing lists
  • [% END %] [% IF ( intranetreadinghistory ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt index aead23b..759cf78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt @@ -70,7 +70,7 @@ in the global namespace %] [% IF ( detailview ) %]
  • [% ELSE %]
  • [% END %]Details
  • [% END %] [% IF ( CAN_user_updatecharges ) %] - [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • + [% IF ( accounts_view ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]
  • [% ELSE %]
  • [% END %]Routing lists
  • [% END %] [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]
  • [% ELSE %]
  • [% END %]Circulation history
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc index 44d8277..1d038de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc @@ -1,4 +1,5 @@ +