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, $skip_notify ) = @_;
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 292-297 sub manualinvoice { Link Here
292
            date              => \'NOW()',
292
            date              => \'NOW()',
293
            amount            => $amount,
293
            amount            => $amount,
294
            description       => $desc,
294
            description       => $desc,
295
            barcode           => $barcode,
295
            accounttype       => $type,
296
            accounttype       => $type,
296
            amountoutstanding => $amountleft,
297
            amountoutstanding => $amountleft,
297
            itemnumber        => $itemnum || undef,
298
            itemnumber        => $itemnum || undef,
Lines 316-321 sub manualinvoice { Link Here
316
            accountno         => $accountno,
317
            accountno         => $accountno,
317
            amount            => $amount,
318
            amount            => $amount,
318
            description       => $desc,
319
            description       => $desc,
320
            barcode           => $barcode,
319
            accounttype       => $type,
321
            accounttype       => $type,
320
            amountoutstanding => $amountleft,
322
            amountoutstanding => $amountleft,
321
            notify_id         => $notifyid,
323
            notify_id         => $notifyid,
(-)a/installer/data/mysql/atomicupdate/bug_18889_added_barcode_field_to_accountlines.sql (+2 lines)
Line 0 Link Here
1
ALTER TABLE accountlines add barcode varchar(20) DEFAULT NULL;
2
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (+2 lines)
Lines 77-82 function enableCheckboxActions(){ Link Here
77
    <th>&nbsp;</th>
77
    <th>&nbsp;</th>
78
    <th>Fines &amp; charges</th>
78
    <th>Fines &amp; charges</th>
79
    <th>Description</th>
79
    <th>Description</th>
80
    <th>Barcode</th>
80
    <th>Payment note</th>
81
    <th>Payment note</th>
81
    <th>Account type</th>
82
    <th>Account type</th>
82
    <th>Notify id</th>
83
    <th>Notify id</th>
Lines 143-148 function enableCheckboxActions(){ Link Here
143
        [%- IF line.description %], [% line.description %][% END %]
144
        [%- IF line.description %], [% line.description %][% END %]
144
        [% IF line.title %]([% line.title %])[% END %]
145
        [% IF line.title %]([% line.title %])[% END %]
145
    </td>
146
    </td>
147
    <td>[%- IF line.barcode %] [% line.barcode %][% END %]</td>
146
    <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td>
148
    <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td>
147
    <td>[% line.accounttype %]</td>
149
    <td>[% line.accounttype %]</td>
148
    <td>[% line.notify_id %]</td>
150
    <td>[% line.notify_id %]</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 194-199 sub redirect_to_paycollect { Link Here
194
    $redirect .=
194
    $redirect .=
195
      get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
195
      get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
196
    $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
196
    $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
197
    $redirect .= get_for_redirect( 'barcode', "description$line_no", 0 );
197
    $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
198
    $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
198
    $redirect .= get_for_redirect( 'itemnumber',   "itemnumber$line_no",   0 );
199
    $redirect .= get_for_redirect( 'itemnumber',   "itemnumber$line_no",   0 );
199
    $redirect .= get_for_redirect( 'notify_id',    "notify_id$line_no",    0 );
200
    $redirect .= get_for_redirect( 'notify_id',    "notify_id$line_no",    0 );
200
- 

Return to bug 18889