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

(-)a/Koha/EDI.pm (-5 / +7 lines)
Lines 414-421 sub process_invoice { Link Here
414
                            unitprice_tax_excluded => $price_excl_tax,
414
                            unitprice_tax_excluded => $price_excl_tax,
415
                            invoiceid              => $invoiceid,
415
                            invoiceid              => $invoiceid,
416
                            datereceived           => $msg_date,
416
                            datereceived           => $msg_date,
417
                            tax_rate_on_receiving  => $tax_rate->{rate},
417
                            tax_rate_on_receiving  => $tax_rate ? $tax_rate->{rate} : 0,
418
                            tax_value_on_receiving => $quantity * $price_excl_tax * $tax_rate->{rate},
418
                            tax_value_on_receiving => $quantity *
419
                                $price_excl_tax *
420
                                ( $tax_rate ? $tax_rate->{rate} : 0 ),
419
                        }
421
                        }
420
                    );
422
                    );
421
                    transfer_items( $schema, $line, $order, $received_order, $quantity );
423
                    transfer_items( $schema, $line, $order, $received_order, $quantity );
Lines 430-437 sub process_invoice { Link Here
430
                    $order->unitprice($price);
432
                    $order->unitprice($price);
431
                    $order->unitprice_tax_excluded($price_excl_tax);
433
                    $order->unitprice_tax_excluded($price_excl_tax);
432
                    $order->unitprice_tax_included($price);
434
                    $order->unitprice_tax_included($price);
433
                    $order->tax_rate_on_receiving( $tax_rate->{rate} );
435
                    $order->tax_rate_on_receiving( $tax_rate ? $tax_rate->{rate} : 0 );
434
                    $order->tax_value_on_receiving( $quantity * $price_excl_tax * $tax_rate->{rate} );
436
                    $order->tax_value_on_receiving(
437
                        $quantity * $price_excl_tax * ( $tax_rate ? $tax_rate->{rate} : 0 ) );
435
                    $order->orderstatus('complete');
438
                    $order->orderstatus('complete');
436
                    $order->update;
439
                    $order->update;
437
                    receipt_items( $schema, $line, $ordernumber, $quantity, $invoice_message );
440
                    receipt_items( $schema, $line, $ordernumber, $quantity, $invoice_message );
438
- 

Return to bug 40387