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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-2 / +2 lines)
Lines 69-81 Link Here
69
69
70
                            <td>
70
                            <td>
71
                                [% IF ( accountline.issue_id ) %]
71
                                [% IF ( accountline.issue_id ) %]
72
                                    [% accountline.issue.date_due | $KohaDates with_hours => 1 | html %]
72
                                    [% accountline.issue.date_due | $KohaDates as_due_date => 1 %]
73
                                [% END %]
73
                                [% END %]
74
                            </td>
74
                            </td>
75
75
76
                            <td>
76
                            <td>
77
                                [% IF ( accountline.issue_id ) %]
77
                                [% IF ( accountline.issue_id ) %]
78
                                    [% accountline.issue.returndate | $KohaDates with_hours => 1 | html %]
78
                                    [% accountline.issue.returndate | $KohaDates with_hours => 1 %]
79
                                [% END %]
79
                                [% END %]
80
                            </td>
80
                            </td>
81
81
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-2 / +2 lines)
Lines 68-75 Link Here
68
        [%- IF account.description %], [% account.description | html %][% END %]
68
        [%- IF account.description %], [% account.description | html %][% END %]
69
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
69
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
70
      <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
70
      <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
71
      <td>[% IF ( account.issue_id ) %][% account.issue.date_due | $KohaDates with_hours => 1 | html %][% END %]</td>
71
      <td>[% IF ( account.issue_id ) %][% account.issue.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
72
      <td>[% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 | html %][% END %]</td>
72
      <td>[% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 %][% END %]</td>
73
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
73
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
74
      <td>[% account.note | html_line_break %]</td>
74
      <td>[% account.note | html_line_break %]</td>
75
      [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
75
      [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +2 lines)
Lines 119-130 Link Here
119
    </td>
119
    </td>
120
    <td>
120
    <td>
121
        [% IF line.issue_id %]
121
        [% IF line.issue_id %]
122
            [% line.issue.date_due | $KohaDates with_hours => 1 | html %]
122
            [% line.issue.date_due | $KohaDates as_due_date => 1 %]
123
        [% END %]
123
        [% END %]
124
    </td>
124
    </td>
125
    <td>
125
    <td>
126
        [% IF line.issue_id %]
126
        [% IF line.issue_id %]
127
            [% line.issue.returndate | $KohaDates with_hours => 1 | html %]
127
            [% line.issue.returndate | $KohaDates with_hours => 1 %]
128
        [% END %]
128
        [% END %]
129
    </td>
129
    </td>
130
    <td><input type="text" name="payment_note_[% line.accountlines_id | html %]" /></td>
130
    <td><input type="text" name="payment_note_[% line.accountlines_id | html %]" /></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-2 / +2 lines)
Lines 61-68 Link Here
61
        [%- IF account.description %], [% account.description | html %][% END %]
61
        [%- IF account.description %], [% account.description | html %][% END %]
62
      </td>
62
      </td>
63
      <td>[% account.item.barcode | html %]</td>
63
      <td>[% account.item.barcode | html %]</td>
64
      <td>[% account.issue.date_due | $KohaDates with_hours => 1 | html %]</td>
64
      <td>[% account.issue.date_due | $KohaDates as_due_date => 1 %]</td>
65
      <td>[% account.issue.returndate | $KohaDates with_hours => 1 | html %]</td>
65
      <td>[% account.issue.returndate | $KohaDates with_hours => 1 %]</td>
66
      <td>[% account.note | html %]</td>
66
      <td>[% account.note | html %]</td>
67
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
67
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
68
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
68
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
(-)a/members/printinvoice.pl (-3 lines)
Lines 59-66 my $accountline_object = Koha::Account::Lines->find($accountlines_id); Link Here
59
my $accountline = $accountline_object->unblessed;
59
my $accountline = $accountline_object->unblessed;
60
$accountline->{item} = $accountline_object->item || "" ;
60
$accountline->{item} = $accountline_object->item || "" ;
61
$accountline->{issue} = $accountline_object->issue || "";
61
$accountline->{issue} = $accountline_object->issue || "";
62
#$accountline->{'item'} = $accountline->{itemnumber} ? $accountline_object->item : "" ;
63
#$accountline->{'issue'} = $accountline->{issue_id} ? $accountline_object->issue : "" ;
64
62
65
my $totalcredit;
63
my $totalcredit;
66
if ( $total <= 0 ) {
64
if ( $total <= 0 ) {
67
- 

Return to bug 19489