Attachment #121004 for bug #22435

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




    return Koha::Patron->_new_from_dbic( $rs );
}

=head3 manager

Return the manager linked to this account line

=cut

sub manager {
    my ( $self ) = @_;
    my $rs = $self->_result->manager;
    return unless $rs;
    return Koha::Patron->_new_from_dbic( $rs );
}

=head3 item

Return the item linked to this account line if exists




                    <thead>
                        <tr>
                            <th>Date</th>
                            <th>Change</th>
                            <th>Action</th>
                            <th>Relation</th>
                            <th>Transacting librarian</th>
                            <th>Note</th>
                            <th>&nbsp;</th>
                        </tr>
                    </thead>


                                        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
                                        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
                                        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
                                        [%- CASE 'VOID'   -%]<span>Voided</span>
                                        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
                                        [%- CASE 'APPLY'   -%]<span>Applied</span>
                                        [%- CASE 'CREATE'   -%]<span>Created</span>

                                    <td>[% ao.created_on | $KohaDates with_hours => 1%]</td>
                                    <td>[% ao.amount | $Price %]</td>
                                    <td>
                                        [% PROCESS ao_description ao=ao %]
                                            [% PROCESS account_type_description account=offset_accountline %] ([% PROCESS ao_description ao=ao %])
                                        [%- ELSE -%]
                                            [% PROCESS ao_description ao=ao %]
                                        [%- END -%]
                                    </td>
                                    <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
                                    <td>[% offset_accountline.note | html %]</td>
                                    <td>
                                        [%- IF offset_accountline -%]
                                        [% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]">[% offset_accountline.id | html %]</a>)
                                        [%- END -%]
                                    </td>
                                    <td>
                                        [% IF offset_accountline.manager_id %]
                                        <a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">
                                            [% IF offset_accountline.manager.firstname %]
                                                [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %]
                                            [% ELSE %]
                                                [% offset_accountline.manager.surname | html %]
                                            [% END %]
                                        </a>
                                        [% END %]
                                    </td>
                                    <td>[% offset_accountline.note | html %]</td>
                                </tr>
                        [% END %]
                    </tbody>
- 

Return to bug 22435

Lines 58-63 sub patron { Link Here

(-)a/Koha/Account/Line.pm (+13 lines)
58	return Koha::Patron->_new_from_dbic( $rs );	58	return Koha::Patron->_new_from_dbic( $rs );
59	}	59	}
60		60
		61	=head3 manager
		62
		63	Return the manager linked to this account line
		64
		65	=cut
		66
		67	sub manager {
		68	my ( $self ) = @_;
		69	my $rs = $self->_result->manager;
		70	return unless $rs;
		71	return Koha::Patron->_new_from_dbic( $rs );
		72	}
		73
61	=head3 item	74	=head3 item
62		75
63	Return the item linked to this account line if exists	76	Return the item linked to this account line if exists

Lines 139-149 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-13 / +18 lines)
139	<thead>	139	<thead>
140	<tr>	140	<tr>
141	<th>Date</th>	141	<th>Date</th>
142	<th>Change amount</th>	142	<th>Change</th>
143	<th>Change type</th>	143	<th>Action</th>
		144	<th>Relation</th>
144	<th>Transacting librarian</th>	145	<th>Transacting librarian</th>
145	<th>Note</th>	146	<th>Note</th>
146	<th> </th>
147	</tr>	147	</tr>
148	</thead>	148	</thead>
149		149
Lines 163-169 Link Here
163	[%- CASE 'Manual Debit' -%]<span>Manual invoice</span>	163	[%- CASE 'Manual Debit' -%]<span>Manual invoice</span>
164	[%- CASE 'Lost Item' -%]<span>Lost item returned</span>	164	[%- CASE 'Lost Item' -%]<span>Lost item returned</span>
165	[%- CASE 'Writeoff' -%]<span>Writeoff</span>	165	[%- CASE 'Writeoff' -%]<span>Writeoff</span>
166	[%- CASE 'Void Payment' -%]<span>Void payment</span>	166	[%- CASE 'VOID' -%]<span>Voided</span>
167	[%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span>	167	[%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span>
168	[%- CASE 'APPLY' -%]<span>Applied</span>	168	[%- CASE 'APPLY' -%]<span>Applied</span>
169	[%- CASE 'CREATE' -%]<span>Created</span>	169	[%- CASE 'CREATE' -%]<span>Created</span>
Lines 175-193 Link Here
175	<td>[% ao.created_on \| $KohaDates with_hours => 1%]</td>	175	<td>[% ao.created_on \| $KohaDates with_hours => 1%]</td>
176	<td>[% ao.amount \| $Price %]</td>	176	<td>[% ao.amount \| $Price %]</td>
177	<td>	177	<td>
178	[%- IF offset_accountline -%]	178	[% PROCESS ao_description ao=ao %]
179	[% PROCESS account_type_description account=offset_accountline %] ([% PROCESS ao_description ao=ao %])
180	[%- ELSE -%]
181	[% PROCESS ao_description ao=ao %]
182	[%- END -%]
183	</td>	179	</td>
184	<td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id \| uri %]">[% offset_accountline.manager_id \| html %]</a>[% END %]</td>
185	<td>[% offset_accountline.note \| html %]</td>
186	<td>	180	<td>
187	[%- IF offset_accountline -%]	181	[%- IF offset_accountline -%]
188	<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>	182	[% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id \| uri %]">[% offset_accountline.id \| html %]</a>)
189	[%- END -%]	183	[%- END -%]
190	</td>	184	</td>
		185	<td>
		186	[% IF offset_accountline.manager_id %]
		187	<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id \| uri %]">
		188	[% IF offset_accountline.manager.firstname %]
		189	[% offset_accountline.manager.firstname \| html %] [% offest_accountline.manager.surname \| html %]
		190	[% ELSE %]
		191	[% offset_accountline.manager.surname \| html %]
		192	[% END %]
		193	</a>
		194	[% END %]
		195	</td>
		196	<td>[% offset_accountline.note \| html %]</td>
191	</tr>	197	</tr>
192	[% END %]	198	[% END %]
193	</tbody>	199	</tbody>
194	-