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

(-)a/C4/Accounts.pm (-1 / +3 lines)
Lines 266-272 should be the empty string. Link Here
266
#
266
#
267
267
268
sub manualinvoice {
268
sub manualinvoice {
269
    my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_;
269
    my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note, $barcode, $skip_notify ) = @_;
270
    my $manager_id = 0;
270
    my $manager_id = 0;
271
    $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
271
    $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
272
    my $dbh      = C4::Context->dbh;
272
    my $dbh      = C4::Context->dbh;
Lines 281-286 sub manualinvoice { Link Here
281
            date              => \'NOW()',
281
            date              => \'NOW()',
282
            amount            => $amount,
282
            amount            => $amount,
283
            description       => $desc,
283
            description       => $desc,
284
            barcode           => $barcode,
284
            accounttype       => $type,
285
            accounttype       => $type,
285
            amountoutstanding => $amountleft,
286
            amountoutstanding => $amountleft,
286
            itemnumber        => $itemnum || undef,
287
            itemnumber        => $itemnum || undef,
Lines 304-309 sub manualinvoice { Link Here
304
            accountno         => $accountno,
305
            accountno         => $accountno,
305
            amount            => $amount,
306
            amount            => $amount,
306
            description       => $desc,
307
            description       => $desc,
308
            barcode           => $barcode,
307
            accounttype       => $type,
309
            accounttype       => $type,
308
            amountoutstanding => $amountleft,
310
            amountoutstanding => $amountleft,
309
            note              => $note,
311
            note              => $note,
(-)a/installer/data/mysql/atomicupdate/bug_18889_added_barcode_field_to_accountlines.sql (+1 lines)
Line 0 Link Here
1
ALTER TABLE accountlines add barcode varchar(20) DEFAULT NULL;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (+2 lines)
Lines 41-46 Link Here
41
    <th>&nbsp;</th>
41
    <th>&nbsp;</th>
42
    <th>Fines &amp; charges</th>
42
    <th>Fines &amp; charges</th>
43
    <th>Description</th>
43
    <th>Description</th>
44
    <th>Barcode</th>
44
    <th>Payment note</th>
45
    <th>Payment note</th>
45
    <th>Account type</th>
46
    <th>Account type</th>
46
    <th>Amount</th>
47
    <th>Amount</th>
Lines 101-106 Link Here
101
        [%- IF line.description %], [% line.description %][% END %]
102
        [%- IF line.description %], [% line.description %][% END %]
102
        [% IF line.title %]([% line.title %])[% END %]
103
        [% IF line.title %]([% line.title %])[% END %]
103
    </td>
104
    </td>
105
    <td>[%- IF line.barcode %] [% line.barcode %][% END %]</td>
104
    <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td>
106
    <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td>
105
    <td>[% line.accounttype %]</td>
107
    <td>[% line.accounttype %]</td>
106
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
108
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
(-)a/members/maninvoice.pl (-1 / +1 lines)
Lines 61-67 if ($add){ Link Here
61
        my $amount=$input->param('amount');
61
        my $amount=$input->param('amount');
62
        my $type=$input->param('type');
62
        my $type=$input->param('type');
63
        my $note    = $input->param('note');
63
        my $note    = $input->param('note');
64
        my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
64
        my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note, $barcode );
65
        if ($error) {
65
        if ($error) {
66
            my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
66
            my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
67
                {   template_name   => "members/maninvoice.tt",
67
                {   template_name   => "members/maninvoice.tt",
(-)a/members/pay.pl (-1 / +1 lines)
Lines 178-183 sub redirect_to_paycollect { Link Here
178
    $redirect .=
178
    $redirect .=
179
      get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
179
      get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
180
    $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
180
    $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
181
    $redirect .= get_for_redirect( 'barcode', "description$line_no", 0 );
181
    $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
182
    $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
182
    $redirect .= get_for_redirect( 'itemnumber',   "itemnumber$line_no",   0 );
183
    $redirect .= get_for_redirect( 'itemnumber',   "itemnumber$line_no",   0 );
183
    $redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );
184
    $redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );
184
- 

Return to bug 18889