View | Details | Raw Unified | Return to bug 6427
Collapse All | Expand All

(-)a/circ/add_message.pl (-7 / +1 lines)
Lines 17-24 Link Here
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
19
20
use strict;
20
use Modern::Perl;
21
use warnings;
22
21
23
use CGI qw ( -utf8 );
22
use CGI qw ( -utf8 );
24
23
Lines 26-36 use C4::Context; Link Here
26
use C4::Auth;
25
use C4::Auth;
27
use C4::Output;
26
use C4::Output;
28
use C4::Members;
27
use C4::Members;
29
use C4::Accounts;
30
use C4::Stats;
31
use C4::Koha;
32
use C4::Overdues;
33
use C4::Branch;    # GetBranches
34
28
35
my $input = new CGI;
29
my $input = new CGI;
36
30
(-)a/circ/branchoverdues.pl (-2 / +1 lines)
Lines 49-57 use Data::Dumper; Link Here
49
 	level 3 : only methode is possible  : - Considered Lost
49
 	level 3 : only methode is possible  : - Considered Lost
50
50
51
 	the documents displayed on this interface, are checked on three points
51
 	the documents displayed on this interface, are checked on three points
52
 	- 1) the document must be on accountlines (Type 'FU')
52
    - 1) the document must be overdue with fines
53
 	- 2) item issues is not returned
53
 	- 2) item issues is not returned
54
	- 3) this item as not been already notify
55
54
56
  FIXME: who is the author?
55
  FIXME: who is the author?
57
  FIXME: No privisions (i.e. "actions") for handling notices are implemented.
56
  FIXME: No privisions (i.e. "actions") for handling notices are implemented.
(-)a/circ/circulation.pl (-3 / +1 lines)
Lines 512-519 foreach my $flag ( sort keys %$flags ) { Link Here
512
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
512
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
513
$amountold =~ s/^.*\$//;    # remove upto the $, if any
513
$amountold =~ s/^.*\$//;    # remove upto the $, if any
514
514
515
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
516
517
if ( $borrowernumber && $borrower->{'category_type'} eq 'C') {
515
if ( $borrowernumber && $borrower->{'category_type'} eq 'C') {
518
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
516
    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
519
    my $cnt = scalar(@$catcodes);
517
    my $cnt = scalar(@$catcodes);
Lines 590-596 $template->param( Link Here
590
    duedatespec       => $duedatespec,
588
    duedatespec       => $duedatespec,
591
    message           => $message,
589
    message           => $message,
592
    selectborrower    => $selectborrower,
590
    selectborrower    => $selectborrower,
593
    totaldue          => sprintf('%.2f', $total),
591
    totaldue          => sprintf('%.2f', $borrower->{account_balance}),
594
    inprocess         => $inprocess,
592
    inprocess         => $inprocess,
595
    is_child          => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
593
    is_child          => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
596
    circview => 1,
594
    circview => 1,
(-)a/circ/del_message.pl (-7 / +1 lines)
Lines 17-24 Link Here
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
19
20
use strict;
20
use Modern::Perl;
21
use warnings;
22
21
23
use CGI qw ( -utf8 );
22
use CGI qw ( -utf8 );
24
23
Lines 26-36 use C4::Context; Link Here
26
use C4::Auth;
25
use C4::Auth;
27
use C4::Output;
26
use C4::Output;
28
use C4::Members;
27
use C4::Members;
29
use C4::Accounts;
30
use C4::Stats;
31
use C4::Koha;
32
use C4::Overdues;
33
use C4::Branch;    # GetBranches
34
28
35
my $input = new CGI;
29
my $input = new CGI;
36
30
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc (+33 lines)
Lines 1-7 Link Here
1
[% USE AuthorisedValues %]
1
<script type="text/javascript">
2
<script type="text/javascript">
2
//<![CDATA[
3
//<![CDATA[
3
    var BROWSER_RETURN_TO_SEARCH = _("Return to results");
4
    var BROWSER_RETURN_TO_SEARCH = _("Return to results");
4
    var BROWSER_PREVIOUS = _("Previous");
5
    var BROWSER_PREVIOUS = _("Previous");
5
    var BROWSER_NEXT = _("Next");
6
    var BROWSER_NEXT = _("Next");
7
8
    var STRINGS = {
9
        "DebitTypes": {
10
            "FINE"                      : _("Fine"),
11
            "ACCOUNT_MANAGEMENT_FEE"    : _("Account management fee"),
12
            "SUNDRY"                    : _("Sundry"),
13
            "LOST"                      : _("Lost item"),
14
            "HOLD"                      : _("Hold fee"),
15
            "RENTAL"                    : _("Rental fee"),
16
            "NEW_CARD"                  : _("New card"),
17
            [% FOREACH a IN AuthorisedValues.Get('MANUAL_INV') %]
18
                "[% a.authorised_value %]" : "[% a.lib %]",
19
            [% END %]
20
        },
21
22
        "CreditTypes": {
23
            "CREDIT"                    : _("Credit"),
24
            "PAYMENT"                   : _("Payment"),
25
            "WRITEOFF"                  : _("Writeoff"),
26
            "FOUND"                     : _("Lost item found"),
27
            "FORGIVEN"                  : _("Forgiven"),
28
            [% FOREACH a IN AuthorisedValues.Get('MANUAL_CREDIT') %]
29
                "[% a.authorised_value %]" : "[% a.lib %]",
30
            [% END %]
31
        },
32
33
        "OffsetTypes": {
34
            "DROPBOX"                   : _("Dropbox fine reduction"),
35
            "FINE"                      : _("Fine increment"),
36
            "VOID"                      : _("Voided"),
37
        },
38
    }
6
//]]>
39
//]]>
7
</script>
40
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
Lines 67-73 Link Here
67
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
67
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
68
    [% END %]
68
    [% END %]
69
    [% IF ( CAN_user_updatecharges ) %]
69
    [% IF ( CAN_user_updatecharges ) %]
70
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
70
        [% IF ( accounts_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
71
    [% END %]
71
    [% END %]
72
    [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
72
    [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
73
    <!-- Added check for borrowers permission as this is needed to access Cirulation History -->
73
    <!-- Added check for borrowers permission as this is needed to access Cirulation History -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-1 / +1 lines)
Lines 70-76 in the global namespace %] Link Here
70
	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">Details</a></li>
70
	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">Details</a></li>
71
	[% END %]
71
	[% END %]
72
	 [% IF ( CAN_user_updatecharges ) %]
72
	 [% IF ( CAN_user_updatecharges ) %]
73
	[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Fines</a></li>
73
     [% IF ( accounts_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrower.borrowernumber %]">Fines</a></li>
74
	[% END %]
74
	[% END %]
75
    [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrower.borrowernumber %]">Routing lists</a></li>[% END %]
75
    [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrower.borrowernumber %]">Routing lists</a></li>[% END %]
76
    <!-- Added check for borrowers permission as this is needed to access Cirulation History -->
76
    <!-- Added check for borrowers permission as this is needed to access Cirulation History -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc (+1 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'format_price.inc' %]
1
[% INCLUDE 'format_price.inc' %]
2
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
2
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
3
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/TableTools/media/js/TableTools.min.js"></script>
3
<script type="text/javascript">
4
<script type="text/javascript">
4
//<![CDATA[
5
//<![CDATA[
5
    var MSG_DT_FIRST = _("First");
6
    var MSG_DT_FIRST = _("First");
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc (-1 / +1 lines)
Lines 4-10 Link Here
4
    [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
4
    [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
5
    [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
5
    [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
6
    [% IF ( CAN_user_updatecharges ) %]
6
    [% IF ( CAN_user_updatecharges ) %]
7
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
7
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
8
    [% END %]
8
    [% END %]
9
    [% IF ( intranetreadinghistory ) %]
9
    [% IF ( intranetreadinghistory ) %]
10
        [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
10
        [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js (+24 lines)
Lines 28-33 var dataTablesDefaults = { Link Here
28
    "iDisplayLength": 20
28
    "iDisplayLength": 20
29
};
29
};
30
30
31
// Set the classes that TableTools uses to something suitable for Bootstrap
32
$.extend( true, $.fn.DataTable.TableTools.classes, {
33
    "container": "btn-group",
34
    "buttons": {
35
        "normal": "btn btn-small",
36
        "disabled": "btn btn-small disabled"
37
    },
38
    "collection": {
39
        "container": "DTTT_dropdown dropdown-menu",
40
        "buttons": {
41
            "normal": "",
42
            "disabled": "disabled"
43
        }
44
    }
45
} );
46
47
// Have the collection use a bootstrap compatible dropdown
48
$.extend( true, $.fn.DataTable.TableTools.DEFAULTS.oTags, {
49
    "collection": {
50
        "container": "ul",
51
        "button": "li",
52
        "liner": "a"
53
    }
54
} );
31
55
32
// Return an array of string containing the values of a particular column
56
// Return an array of string containing the values of a particular column
33
$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
57
$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-1 lines)
Lines 45-51 Link Here
45
	- <b>Warning:</b> This report is very resource intensive on
45
	- <b>Warning:</b> This report is very resource intensive on
46
	systems with large numbers of overdue items.</li>[% END %]
46
	systems with large numbers of overdue items.</li>[% END %]
47
	<li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a> - Limited to your library.  See report help for other details.</li>
47
	<li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a> - Limited to your library.  See report help for other details.</li>
48
<!--	<li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li> -->
49
</ul>
48
</ul>
50
	
49
	
51
	</div>
50
	</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +4 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Currency %]
4
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
5
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
5
   [% SET exports_enabled = 1 %]
6
   [% SET exports_enabled = 1 %]
6
[% END %]
7
[% END %]
Lines 687-702 No patron matched <span class="ex">[% message %]</span> Link Here
687
688
688
        	[% IF ( charges ) %]
689
        	[% IF ( charges ) %]
689
			    <li>
690
			    <li>
690
            <span class="circ-hlt">Fees &amp; Charges:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees &amp; charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>.
691
            <span class="circ-hlt">Fees &amp; Charges:</span> Patron has  <a href="/cgi-bin/koha/members/account.pl?borrowernumber=[% borrowernumber %]">Outstanding fees &amp; charges[% IF ( chargesamount ) %] of [% chargesamount | $Currency %][% END %]</a>.
691
                [% IF ( charges_is_blocker ) %]
692
                [% IF ( charges_is_blocker ) %]
692
                    Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
693
                    Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
693
                [% END %]
694
                [% END %]
694
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a></li>
695
            <a href="/cgi-bin/koha/members/account_payment.pl?borrowernumber=[% borrowernumber %]">Make payment</a></li>
695
			[% END %]
696
			[% END %]
696
697
697
        	[% IF ( credits ) %]
698
        	[% IF ( credits ) %]
698
			<li>
699
			<li>
699
                <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount %][% END %]
700
                <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Currency %][% END %]
700
            </li>
701
            </li>
701
			[% END %]
702
			[% END %]
702
703
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 116-122 $(document).ready(function () { Link Here
116
[% IF ( fines ) %]
116
[% IF ( fines ) %]
117
    <div class="dialog alert">
117
    <div class="dialog alert">
118
        <h3>Patron has outstanding fines of [% fines %].</h3>
118
        <h3>Patron has outstanding fines of [% fines %].</h3>
119
        <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber %]">Make payment</a>.</p>
119
        <p><a href="/cgi-bin/koha/members/account_payment.pl?borrowernumber=[% fineborrowernumber %]">Make payment</a>.</p>
120
    </div>
120
    </div>
121
[% END %]
121
[% END %]
122
122
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt (-18 lines)
Lines 108-131 Link Here
108
108
109
<h3>DB table value for reports</h3>
109
<h3>DB table value for reports</h3>
110
110
111
<p><strong>Question:</strong> What do the codes in the accounttype field in the accountlines table stand for?</p>
112
113
<p><strong>Answer:</strong></p>
114
115
<ul>
116
	<li>A = Account management fee</li>
117
	<li>C = Credit</li>
118
	<li>F = Overdue fine</li>
119
	<li>FOR = Forgiven</li>
120
	<li>FU = Overdue, still acccruing</li>
121
	<li>L = Lost item</li>
122
	<li>LR = Lost item returned/refunded</li>
123
	<li>M = Sundry</li>
124
	<li>N = New card</li>
125
	<li>PAY = Payment</li>
126
	<li>W = Writeoff</li>
127
</ul>
128
129
<p><strong>Question:</strong> What are the possible codes for the type field in the statistics table?</p>
111
<p><strong>Question:</strong> What are the possible codes for the type field in the statistics table?</p>
130
112
131
<p><strong>Answer:</strong></p>
113
<p><strong>Answer:</strong></p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-18 / +39 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Currency %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
6
    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
6
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
Lines 67-103 Link Here
67
        </table>
68
        </table>
68
    [% END %]
69
    [% END %]
69
70
70
    [% IF ( accounts && ( totaldue != '0.00' ) ) %]
71
[% IF account_balance %]
72
    [% IF account_debits %]
71
        <table>
73
        <table>
72
            <caption>Account fines and payments</caption>
74
            <caption>Account fees</caption>
73
            <tr>
75
            <tr>
74
                <th>Description of charges</th>
76
                <th>Description</th>
75
                <th>Date</th>
77
                <th>Date</th>
76
                <th>Amount</th>
78
                <th>Amount</th>
77
                <th>Outstanding</th>
79
                <th>Outstanding</th>
78
            </tr>
80
            </tr>
79
81
            [% FOREACH d IN account_debits %]
80
            [% FOREACH account IN accounts %]
82
                [% IF d.amount_outstanding > 0 %]
81
                [% NEXT IF account.amountoutstanding == '0.00' %]
83
                    <tr>
82
                <tr>
84
                        <td>[% d.description %]</td>
83
                    <td>
85
                        <td>[% d.created_on | $KohaDates %]</td>
84
                        [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% END %]
86
                        <td>[% d.amount_original | $Currency %]</td>
85
                        [% account.description %]&nbsp;[% IF ( account.printtitle ) %] [% account.title |html %][% END %]
87
                        <td>[% d.amount_outstanding | $Currency %]</td>
86
                        [% IF ( account.itemnumber ) %]</a>[% END %]
88
                    </tr>
87
                    </td>
89
                [% END %]
88
                    <td>[% account.date | $KohaDates %]</td>
89
                    <td>[% account.amount %]</td>
90
                    <td>[% account.amountoutstanding %]</td>
91
                </tr>
92
            [% END %]
90
            [% END %]
93
94
            <tfoot>
91
            <tfoot>
95
                <tr>
92
                <tr>
96
                    <td colspan="3">Total due</td>
93
                    <td colspan="3">Total due</td>
97
                    <td colspan="2">[% totaldue %]</td>
94
                    <td colspan="2">[% totaldue | $Currency %]</td>
98
                </tr>
95
                </tr>
99
            </tfoot>
96
            </tfoot>
100
        </table>
97
        </table>
101
    [% END %]
98
    [% END %]
102
99
100
    [% FOREACH c IN account_credits %]
101
        [% total_remaining = total_remaining + c.amount_remaining %]
102
    [% END %]
103
    [% IF total_remaining %]
104
        <table>
105
            <caption>Account payments</caption>
106
            <tr>
107
                <th>Date</th>
108
                <th>Amount</th>
109
                <th>Balance remaining</th>
110
            </tr>
111
            [% FOREACH c IN account_credits %]
112
                [% IF c.amount_remaining > 0 %]
113
                    <tr>
114
                        <td>[% c.created_on | $KohaDates %]</td>
115
                        <td>[% c.amount_paid | $Currency %]</td>
116
                        <td>[% c.amount_remaining | $Currency %]</td>
117
                    </tr>
118
                [% END %]
119
            [% END %]
120
        </table>
121
    [% END %]
122
[% END %]
123
103
[% INCLUDE 'intranet-bottom.inc' %]
124
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt (-1 lines)
Lines 65-71 Link Here
65
		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
65
		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
66
        <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
66
        <li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
67
        <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li>
67
        <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a></li>
68
        <!--<li><a href="/cgi-bin/koha/reports/stats.screen.pl">Till reconciliation</a></li> -->
69
	</ul></div>
68
	</ul></div>
70
</div>
69
</div>
71
70
(-)a/members/moremember.pl (-12 / +13 lines)
Lines 224-246 else { Link Here
224
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
224
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
225
@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns
225
@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns
226
226
227
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
228
my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
227
my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
229
my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
228
my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
230
$template->param( lib1 => $lib1 ) if ($lib1);
229
$template->param( lib1 => $lib1 ) if ($lib1);
231
$template->param( lib2 => $lib2 ) if ($lib2);
230
$template->param( lib2 => $lib2 ) if ($lib2);
232
231
233
# If printing a page, send the account informations to the template
232
# If printing a page, send the account informations to the template
234
if ($print eq "page") {
233
if ( $print eq "page" ) {
235
    foreach my $accountline (@$accts) {
234
    my $schema = Koha::Database->new()->schema();
236
        $accountline->{amount} = sprintf '%.2f', $accountline->{amount};
237
        $accountline->{amountoutstanding} = sprintf '%.2f', $accountline->{amountoutstanding};
238
235
239
        if ($accountline->{accounttype} ne 'F' && $accountline->{accounttype} ne 'FU'){
236
    my @account_debits = $schema->resultset('AccountDebit')
240
            $accountline->{printtitle} = 1;
237
      ->search( { borrowernumber => $borrowernumber } );
241
        }
238
    my @account_credits = $schema->resultset('AccountCredit')
242
    }
239
      ->search( { borrowernumber => $borrowernumber } );
243
    $template->param( accounts => $accts );
240
241
    $template->param(
242
        account_debits  => \@account_debits,
243
        account_credits => \@account_credits,
244
    );
244
}
245
}
245
246
246
# Show OPAC privacy preference is system preference is set
247
# Show OPAC privacy preference is system preference is set
Lines 369-376 $template->param( Link Here
369
    branch          => $branch,
370
    branch          => $branch,
370
    todaysdate      => C4::Dates->today(),
371
    todaysdate      => C4::Dates->today(),
371
    totalprice      => sprintf("%.2f", $totalprice),
372
    totalprice      => sprintf("%.2f", $totalprice),
372
    totaldue        => sprintf("%.2f", $total),
373
    totaldue        => sprintf("%.2f", $data->{account_balance}),
373
    totaldue_raw    => $total,
374
    totaldue_raw    => $data->{account_balance},
374
    overdues_exist  => $overdues_exist,
375
    overdues_exist  => $overdues_exist,
375
    StaffMember     => ($category_type eq 'S'),
376
    StaffMember     => ($category_type eq 'S'),
376
    is_child        => ($category_type eq 'C'),
377
    is_child        => ($category_type eq 'C'),
(-)a/members/summary-print.pl (-15 / +6 lines)
Lines 24-29 use C4::Output; Link Here
24
use C4::Members;
24
use C4::Members;
25
use C4::Koha qw( getitemtypeinfo );
25
use C4::Koha qw( getitemtypeinfo );
26
use C4::Circulation qw( GetIssuingCharges );
26
use C4::Circulation qw( GetIssuingCharges );
27
use Koha::Database;
28
29
my $schema = Koha::Database->new()->schema();
27
30
28
my $input          = CGI->new;
31
my $input          = CGI->new;
29
my $borrowernumber = $input->param('borrowernumber');
32
my $borrowernumber = $input->param('borrowernumber');
Lines 41-59 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
41
44
42
my $data = GetMember( 'borrowernumber' => $borrowernumber );
45
my $data = GetMember( 'borrowernumber' => $borrowernumber );
43
46
44
my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
45
foreach my $accountline (@$accts) {
46
    $accountline->{amount} = sprintf '%.2f', $accountline->{amount};
47
    $accountline->{amountoutstanding} = sprintf '%.2f',
48
      $accountline->{amountoutstanding};
49
50
    if (   $accountline->{accounttype} ne 'F'
51
        && $accountline->{accounttype} ne 'FU' )
52
    {
53
        $accountline->{printtitle} = 1;
54
    }
55
}
56
57
my $roadtype =
47
my $roadtype =
58
  C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
48
  C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
59
49
Lines 64-71 $template->param( Link Here
64
    borrowernumber => $borrowernumber,
54
    borrowernumber => $borrowernumber,
65
    address => $data->{'streetnumber'} . " $roadtype " . $data->{'address'},
55
    address => $data->{'streetnumber'} . " $roadtype " . $data->{'address'},
66
56
67
    accounts => $accts,
57
    account_balance => $data->{account_balance},
68
    totaldue => sprintf( "%.2f", $total ),
58
    account_debits => $schema->resultset('AccountDebit')->search({ borrowernumber => $borrowernumber }),
59
    account_credits => $schema->resultset('AccountDebit')->search({ borrowernumber => $borrowernumber }),
69
60
70
    issues     => build_issue_data( GetPendingIssues($borrowernumber) ),
61
    issues     => build_issue_data( GetPendingIssues($borrowernumber) ),
71
    totalprice => $totalprice,
62
    totalprice => $totalprice,
(-)a/offline_circ/enqueue_koc.pl (-1 lines)
Lines 27-33 use C4::Auth; Link Here
27
use C4::Koha;
27
use C4::Koha;
28
use C4::Context;
28
use C4::Context;
29
use C4::Biblio;
29
use C4::Biblio;
30
use C4::Accounts;
31
use C4::Circulation;
30
use C4::Circulation;
32
use C4::Items;
31
use C4::Items;
33
use C4::Members;
32
use C4::Members;
(-)a/offline_circ/process_koc.pl (-4 / +9 lines)
Lines 27-39 use C4::Auth; Link Here
27
use C4::Koha;
27
use C4::Koha;
28
use C4::Context;
28
use C4::Context;
29
use C4::Biblio;
29
use C4::Biblio;
30
use C4::Accounts;
31
use C4::Circulation;
30
use C4::Circulation;
32
use C4::Items;
31
use C4::Items;
33
use C4::Members;
32
use C4::Members;
34
use C4::Stats;
33
use C4::Stats;
35
use C4::UploadedFile;
34
use C4::UploadedFile;
36
use C4::BackgroundJob;
35
use C4::BackgroundJob;
36
use Koha::Accounts;
37
use Koha::Database;
37
38
38
use Date::Calc qw( Add_Delta_Days Date_to_Days );
39
use Date::Calc qw( Add_Delta_Days Date_to_Days );
39
40
Lines 357-364 sub kocReturnItem { Link Here
357
358
358
sub kocMakePayment {
359
sub kocMakePayment {
359
    my ( $circ ) = @_;
360
    my ( $circ ) = @_;
360
    my $borrower = GetMember( 'cardnumber'=>$circ->{ 'cardnumber' } );
361
361
    recordpayment( $borrower->{'borrowernumber'}, $circ->{'amount'} );
362
    my $borrower =
363
      Koha::Database->new()->schema()->resultset('Borrower')
364
      ->single( { cardnumber => $circ->{'cardnumber'} } );
365
366
    AddCredit({ borrower => $borrower, amount => $circ->{'amount'} });
367
362
    push @output, {
368
    push @output, {
363
        payment => 1,
369
        payment => 1,
364
        amount => $circ->{'amount'},
370
        amount => $circ->{'amount'},
365
- 

Return to bug 6427