Attachment #117556 for bug #27793

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

Lines 685-691 sub quote_item { Link Here

(-)a/Koha/EDI.pm (-2 / +4 lines)
685	quantity => $order_quantity,	685	quantity => $order_quantity,
686	quantityreceived => 0,	686	quantityreceived => 0,
687	order_vendornote => q{},	687	order_vendornote => q{},
688	order_internalnote => $order_note,	688	order_internalnote => q{},
689	replacementprice => $price,	689	replacementprice => $price,
690	rrp_tax_included => $price,	690	rrp_tax_included => $price,
691	rrp_tax_excluded => $price,	691	rrp_tax_excluded => $price,
Lines 724-730 sub quote_item { Link Here
724	$txt .= $si;	724	$txt .= $si;
725	++$occ;	725	++$occ;
726	}	726	}
727	$order_hash->{order_vendornote} = $txt;	727	}
		728	if ($order_note) {
		729	$order_hash->{order_vendornote} = $order_note;
728	}	730	}
729		731
730	if ( $item->internal_notes() ) {	732	if ( $item->internal_notes() ) {




    }
    my $budget = GetBudget( $orderline->budget_id );
    my $ol_fields = { budget_code => $budget->{budget_code}, };
    if ( $orderline->order_vendornote ) {
        $ol_fields->{servicing_instruction} = $orderline->order_vendornote;
    }
    my $item_fields = [];
    for my $item (@items) {
        push @{$item_fields},


    # TBD what if #items exceeds quantity

    # FTX free text for current orderline
    #    Pass vendor note in FTX free text segment
    if ( $orderline->order_vendornote ) {
        my $ftx = 'FTX+LIN+++';
        $ftx .= $orderline->order_vendornote;
        $ftx .= $seg_terminator;
        $self->add_seg($ftx);
    }
    # Encode notes here
    # PRI-CUX-DTM unit price on which order is placed : optional
    # Coutts read this as 0.00 if not present
- 

Return to bug 27793

Lines 404-412 sub order_line { Link Here

(-)a/Koha/Edifact/Order.pm (-6 / +8 lines)
404	}	404	}
405	my $budget = GetBudget( $orderline->budget_id );	405	my $budget = GetBudget( $orderline->budget_id );
406	my $ol_fields = { budget_code => $budget->{budget_code}, };	406	my $ol_fields = { budget_code => $budget->{budget_code}, };
407	if ( $orderline->order_vendornote ) {
408	$ol_fields->{servicing_instruction} = $orderline->order_vendornote;
409	}
410	my $item_fields = [];	407	my $item_fields = [];
411	for my $item (@items) {	408	for my $item (@items) {
412	push @{$item_fields},	409	push @{$item_fields},
Lines 428-435 sub order_line { Link Here
428		425
429	# TBD what if #items exceeds quantity	426	# TBD what if #items exceeds quantity
430		427
431	# FTX free text for current orderline TBD	428	# FTX free text for current orderline
432	# dont really have a special instructions field to encode here	429	# Pass vendor note in FTX free text segment
		430	if ( $orderline->order_vendornote ) {
		431	my $ftx = 'FTX+LIN+++';
		432	$ftx .= $orderline->order_vendornote;
		433	$ftx .= $seg_terminator;
		434	$self->add_seg($ftx);
		435	}
433	# Encode notes here	436	# Encode notes here
434	# PRI-CUX-DTM unit price on which order is placed : optional	437	# PRI-CUX-DTM unit price on which order is placed : optional
435	# Coutts read this as 0.00 if not present	438	# Coutts read this as 0.00 if not present
436	-