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

(-)a/Koha/EDI.pm (-6 / +6 lines)
Lines 173-179 sub process_ordrsp { Link Here
173
    $response_message->status('processing');
173
    $response_message->status('processing');
174
    $response_message->update;
174
    $response_message->update;
175
    my $schema = Koha::Database->new()->schema();
175
    my $schema = Koha::Database->new()->schema();
176
    my $logger = Koha::Logger->get({ interface => 'edi' });
176
    my $logger = Koha::Logger->get( { interface => 'edi' } );
177
    my $vendor_acct;
177
    my $vendor_acct;
178
    my $edi =
178
    my $edi =
179
      Koha::Edifact->new( { transmission => $response_message->raw_msg, } );
179
      Koha::Edifact->new( { transmission => $response_message->raw_msg, } );
Lines 227-233 sub process_invoice { Link Here
227
    $invoice_message->status('processing');
227
    $invoice_message->status('processing');
228
    $invoice_message->update;
228
    $invoice_message->update;
229
    my $schema = Koha::Database->new()->schema();
229
    my $schema = Koha::Database->new()->schema();
230
    my $logger = Koha::Logger->get({ interface => 'edi' });
230
    my $logger = Koha::Logger->get( { interface => 'edi' } );
231
    my $vendor_acct;
231
    my $vendor_acct;
232
232
233
    my $plugin_class = $invoice_message->edi_acct()->plugin();
233
    my $plugin_class = $invoice_message->edi_acct()->plugin();
Lines 442-448 sub _get_invoiced_price { Link Here
442
442
443
sub receipt_items {
443
sub receipt_items {
444
    my ( $schema, $inv_line, $ordernumber, $quantity ) = @_;
444
    my ( $schema, $inv_line, $ordernumber, $quantity ) = @_;
445
    my $logger   = Koha::Logger->get({ interface => 'edi' });
445
    my $logger   = Koha::Logger->get( { interface => 'edi' } );
446
446
447
    # itemnumber is not a foreign key ??? makes this a bit cumbersome
447
    # itemnumber is not a foreign key ??? makes this a bit cumbersome
448
    my @item_links = $schema->resultset('AqordersItem')->search(
448
    my @item_links = $schema->resultset('AqordersItem')->search(
Lines 542-548 sub transfer_items { Link Here
542
        }
542
        }
543
        ++$gocc;
543
        ++$gocc;
544
    }
544
    }
545
    my $logger = Koha::Logger->get({ interface => 'edi' });
545
    my $logger = Koha::Logger->get( { interface => 'edi' } );
546
    my $o1     = $order_from->ordernumber;
546
    my $o1     = $order_from->ordernumber;
547
    my $o2     = $order_to->ordernumber;
547
    my $o2     = $order_to->ordernumber;
548
    $logger->warn("transferring $quantity copies from order $o1 to order $o2");
548
    $logger->warn("transferring $quantity copies from order $o1 to order $o2");
Lines 586-592 sub process_quote { Link Here
586
586
587
    my $messages       = $edi->message_array();
587
    my $messages       = $edi->message_array();
588
    my $process_errors = 0;
588
    my $process_errors = 0;
589
    my $logger         = Koha::Logger->get({ interface => 'edi' });
589
    my $logger         = Koha::Logger->get( { interface => 'edi' } );
590
    my $schema         = Koha::Database->new()->schema();
590
    my $schema         = Koha::Database->new()->schema();
591
    my $message_count  = 0;
591
    my $message_count  = 0;
592
    my @added_baskets;    # if auto & multiple baskets need to order all
592
    my @added_baskets;    # if auto & multiple baskets need to order all
Lines 671-677 sub quote_item { Link Here
671
    my ( $item, $quote, $basketno ) = @_;
671
    my ( $item, $quote, $basketno ) = @_;
672
672
673
    my $schema = Koha::Database->new()->schema();
673
    my $schema = Koha::Database->new()->schema();
674
    my $logger = Koha::Logger->get({ interface => 'edi' });
674
    my $logger = Koha::Logger->get( { interface => 'edi' } );
675
675
676
    # $basketno is the return from AddBasket in the calling routine
676
    # $basketno is the return from AddBasket in the calling routine
677
    # So this call should not fail unless that has
677
    # So this call should not fail unless that has
(-)a/misc/cronjobs/edi_cron.pl (-5 / +4 lines)
Lines 41-46 use Fcntl qw( LOCK_EX O_CREAT O_RDWR SEEK_SET ); Link Here
41
die "Syspref 'EDIFACT' is disabled" unless C4::Context->preference('EDIFACT');
41
die "Syspref 'EDIFACT' is disabled" unless C4::Context->preference('EDIFACT');
42
42
43
# we dont have a lock dir in context so use the logdir
43
# we dont have a lock dir in context so use the logdir
44
my $logdir  = C4::Context->config('logdir');
44
my $pidfile = "$logdir/edicron.pid";
45
my $pidfile = "$logdir/edicron.pid";
45
46
46
my $pid_handle = check_pidfile();
47
my $pid_handle = check_pidfile();
Lines 49-55 my $schema = Koha::Database->new()->schema(); Link Here
49
50
50
my @edi_accts = $schema->resultset('VendorEdiAccount')->all();
51
my @edi_accts = $schema->resultset('VendorEdiAccount')->all();
51
52
52
my $logger = Koha::Logger->get({ interface => 'edi', prefix => 0 });
53
my $logger = Koha::Logger->get( { interface => 'edi', prefix => 0 } );
53
54
54
for my $acct (@edi_accts) {
55
for my $acct (@edi_accts) {
55
    if ( $acct->quotes_enabled ) {
56
    if ( $acct->quotes_enabled ) {
Lines 144-151 foreach my $response (@downloaded_responses) { Link Here
144
if ( close $pid_handle ) {
145
if ( close $pid_handle ) {
145
    unlink $pidfile;
146
    unlink $pidfile;
146
    exit 0;
147
    exit 0;
147
}
148
} else {
148
else {
149
    $logger->error("Error on pidfile close: $!");
149
    $logger->error("Error on pidfile close: $!");
150
    exit 1;
150
    exit 1;
151
}
151
}
Lines 154-160 sub check_pidfile { Link Here
154
154
155
    # sysopen my $fh, $pidfile, O_EXCL | O_RDWR or log_exit "$0 already running"
155
    # sysopen my $fh, $pidfile, O_EXCL | O_RDWR or log_exit "$0 already running"
156
    sysopen my $fh, $pidfile, O_RDWR | O_CREAT
156
    sysopen my $fh, $pidfile, O_RDWR | O_CREAT
157
      or log_exit("$0: open $pidfile: $!");
157
        or log_exit("$0: open $pidfile: $!");
158
    flock $fh => LOCK_EX or log_exit("$0: flock $pidfile: $!");
158
    flock $fh => LOCK_EX or log_exit("$0: flock $pidfile: $!");
159
159
160
    sysseek $fh, 0, SEEK_SET or log_exit("$0: sysseek $pidfile: $!");
160
    sysseek $fh, 0, SEEK_SET or log_exit("$0: sysseek $pidfile: $!");
161
- 

Return to bug 22415