Attachment #70578 for bug #16486

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

Lines 65-71 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-1 / +3 lines)
65	<table id="table_account_fines">	65	<table id="table_account_fines">
66	<thead>	66	<thead>
67	<tr>	67	<tr>
68	<th class="title-string">Date</th>	68	<th class="title-string">Original date</th>
		69	<th class="title-string">Updated</th>
69	<th>Description of charges</th>	70	<th>Description of charges</th>
70	<th>Note</th>	71	<th>Note</th>
71	<th>Amount</th>	72	<th>Amount</th>
Lines 82-87 $(document).ready(function() { Link Here
82	[% FOREACH account IN accounts %]	83	[% FOREACH account IN accounts %]
83		84
84	<tr>	85	<tr>
		86	<td><span title="[% account.date %]">[% account.date \| $KohaDates %]</span></td>
85	<td><span title="[% account.timestamp %]">[% account.timestamp \| $KohaDates with_hours => 1 %]</span></td>	87	<td><span title="[% account.timestamp %]">[% account.timestamp \| $KohaDates with_hours => 1 %]</span></td>
86	<td>	88	<td>
87	[% SWITCH account.accounttype %]	89	[% SWITCH account.accounttype %]

Lines 35-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-1 / +3 lines)
35	</th>	35	</th>
36	</tr>	36	</tr>
37	<tr>	37	<tr>
38	<th>Date</th>	38	<th>Original date</th>
		39	<th>Updated</th>
39	<th>Description of charges</th>	40	<th>Description of charges</th>
40	<th>Note</th>	41	<th>Note</th>
41	<th>Amount</th>	42	<th>Amount</th>
Lines 43-48 Link Here
43		44
44	[% FOREACH account IN accounts %]	45	[% FOREACH account IN accounts %]
45	<tr class="highlight">	46	<tr class="highlight">
		47	<td>[% account.date \| $KohaDates %]</td>
46	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>	48	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>
47	<td>	49	<td>
48	[% SWITCH account.accounttype %]	50	[% SWITCH account.accounttype %]




	</th>
  </tr>
  <tr>
    <th>Original date</th>
    <th>Updated</th>
    <th>Description of charges</th>
    <th>Note</th>
    <th style="text-align:right;">Amount</th>


  [% FOREACH account IN accounts %]
<tr class="highlight">
    <td>[% account.date | $KohaDates %]</td>
    <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
    <td>
        [% SWITCH account.accounttype %]
          [% CASE 'Pay' %]Payment, thanks
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)




                            <thead>
                                <tr>
                                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
                                    <th class="title-string">Original date</th>
                                    <th class="title-string">Updated</th>
                                    <th>Description</th>
                                    <th>Fine amount</th>
                                    <th>Amount outstanding</th>

                                                [% END %]
                                            </td>
                                        [% END %]
                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
                                        <td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
                                        <td>
                                            [% SWITCH ACCOUNT_LINE.accounttype %]
                                            [% CASE 'Pay' %]Payment, thanks

Lines 97-103 for (my $i=0;$i<$numaccts;$i++){ Link Here

(-)a/members/printfeercpt.pl (-1 / +2 lines)
97	$accts->[$i]{'amountoutstandingcredit'} = 1;	97	$accts->[$i]{'amountoutstandingcredit'} = 1;
98	}	98	}
99		99
100	my %row = ( 'timestamp' => $accts->[$i]{'timestamp'},	100	my %row = ( 'date' => dt_from_string( $accts->[$i]{'date'} ),
		101	'timestamp' => $accts->[$i]{'timestamp'},
101	'amountcredit' => $accts->[$i]{'amountcredit'},	102	'amountcredit' => $accts->[$i]{'amountcredit'},
102	'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},	103	'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
103	'toggle' => $accts->[$i]{'toggle'},	104	'toggle' => $accts->[$i]{'toggle'},

Lines 97-102 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here

(-)a/members/printinvoice.pl (-1 / +1 lines)
97	}	97	}
98		98
99	my %row = (	99	my %row = (
		100	'date' => dt_from_string( $accts->[$i]{'date'} ),
100	'timestamp' => $accts->[$i]{'timestamp'},	101	'timestamp' => $accts->[$i]{'timestamp'},
101	'amountcredit' => $accts->[$i]{'amountcredit'},	102	'amountcredit' => $accts->[$i]{'amountcredit'},
102	'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},	103	'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
103	-

Return to bug 16486

Lines 71-77 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-2 / +4 lines)
71	<thead>	71	<thead>
72	<tr>	72	<tr>
73	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]	73	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
74	<th class="title-string">Date</th>	74	<th class="title-string">Original date</th>
		75	<th class="title-string">Updated</th>
75	<th>Description</th>	76	<th>Description</th>
76	<th>Fine amount</th>	77	<th>Fine amount</th>
77	<th>Amount outstanding</th>	78	<th>Amount outstanding</th>
Lines 102-108 Link Here
102	[% END %]	103	[% END %]
103	</td>	104	</td>
104	[% END %]	105	[% END %]
105	<td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.timestamp \| $KohaDates with_hours => 1 %]</td>	106	<td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date \| $KohaDates %]</td>
		107	<td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp \| $KohaDates with_hours => 1 %]</td>
106	<td>	108	<td>
107	[% SWITCH ACCOUNT_LINE.accounttype %]	109	[% SWITCH ACCOUNT_LINE.accounttype %]
108	[% CASE 'Pay' %]Payment, thanks	110	[% CASE 'Pay' %]Payment, thanks