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

(-)a/C4/Members.pm (+1 lines)
Lines 770-775 sub GetMemberAccountRecords { Link Here
770
            my $biblio = $item->biblio;
770
            my $biblio = $item->biblio;
771
            $data->{biblionumber} = $biblio->biblionumber;
771
            $data->{biblionumber} = $biblio->biblionumber;
772
            $data->{title}        = $biblio->title;
772
            $data->{title}        = $biblio->title;
773
            $data->{homebranch}   = $biblio->{homebranch};
773
        }
774
        }
774
        $acctlines[$numlines] = $data;
775
        $acctlines[$numlines] = $data;
775
        $numlines++;
776
        $numlines++;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-2 / +18 lines)
Lines 45-51 $(document).ready(function() { Link Here
45
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</div>
45
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</div>
46
46
47
<div id="doc3" class="yui-t2">
47
<div id="doc3" class="yui-t2">
48
   
48
49
   <div id="bd">
49
   <div id="bd">
50
	<div id="yui-main">
50
	<div id="yui-main">
51
	<div class="yui-b">
51
	<div class="yui-b">
Lines 67-72 $(document).ready(function() { Link Here
67
      <tr>
67
      <tr>
68
          <th class="title-string">Date</th>
68
          <th class="title-string">Date</th>
69
          <th>Description of charges</th>
69
          <th>Description of charges</th>
70
          <th>Home library</th>
70
          <th>Note</th>
71
          <th>Note</th>
71
          <th>Amount</th>
72
          <th>Amount</th>
72
          <th>Outstanding</th>
73
          <th>Outstanding</th>
Lines 109-114 $(document).ready(function() { Link Here
109
        [%- END -%]
110
        [%- END -%]
110
        [%- IF account.description %], [% account.description %][% END %]
111
        [%- IF account.description %], [% account.description %][% END %]
111
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% account.title |html %]</a>[% END %]</td>
112
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% account.title |html %]</a>[% END %]</td>
113
      <td>[%- IF account.homebranch %][% account.homebranch %][% END %]</td>
112
      <td>[% account.note | html_line_break %]</td>
114
      <td>[% account.note | html_line_break %]</td>
113
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
115
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
114
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td>
116
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td>
Lines 131-141 $(document).ready(function() { Link Here
131
  [% END %]
133
  [% END %]
132
<tfoot>
134
<tfoot>
133
  <tr>
135
  <tr>
134
    <td colspan="4">Total due</td>
136
    <td colspan="5">Total due</td>
135
    [% IF ( totalcredit ) %]
137
    [% IF ( totalcredit ) %]
138
<<<<<<< HEAD
136
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
139
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
137
    [% ELSE %]
140
    [% ELSE %]
138
       <td class="debit"style="text-align: right;">[% total | $Price %]</td>
141
       <td class="debit"style="text-align: right;">[% total | $Price %]</td>
142
=======
143
      [% IF ( reverse_col ) %]
144
        <td colspan="4" class="credit">
145
      [% ELSE %]
146
        <td colspan="3" class="credit">
147
      [% END %]
148
    [% ELSE %]
149
      [% IF ( reverse_col ) %]
150
        <td colspan="4" class="debit">
151
      [% ELSE %]
152
        <td colspan="3" class="credit">
153
      [% END %]
154
>>>>>>> Bug 15136: Add homebranch of borrowed items to patron accounts tab
139
    [% END %]
155
    [% END %]
140
    <td></td>
156
    <td></td>
141
  </tr>
157
  </tr>
(-)a/members/boraccount.pl (-1 / +3 lines)
Lines 94-99 foreach my $accountline ( @{$accts}) { Link Here
94
        $accountline->{payment} = 1;
94
        $accountline->{payment} = 1;
95
        $reverse_col = 1;
95
        $reverse_col = 1;
96
    }
96
    }
97
    if ($accountline->{homebranch}) {
98
        $accountline->{homebranch} = C4::Branch::GetBranchName($accountline->{homebranch});
99
    }
97
}
100
}
98
101
99
$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
102
$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
100
- 

Return to bug 15136