Attachment #120483 for bug #27793

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

Lines 697-703 sub quote_item { Link Here

(-)a/Koha/EDI.pm (-2 / +4 lines)
697	quantity => $order_quantity,	697	quantity => $order_quantity,
698	quantityreceived => 0,	698	quantityreceived => 0,
699	order_vendornote => q{},	699	order_vendornote => q{},
700	order_internalnote => $order_note,	700	order_internalnote => q{},
701	replacementprice => $price,	701	replacementprice => $price,
702	rrp_tax_included => $price,	702	rrp_tax_included => $price,
703	rrp_tax_excluded => $price,	703	rrp_tax_excluded => $price,
Lines 736-742 sub quote_item { Link Here
736	$txt .= $si;	736	$txt .= $si;
737	++$occ;	737	++$occ;
738	}	738	}
739	$order_hash->{order_vendornote} = $txt;	739	}
		740	if ($order_note) {
		741	$order_hash->{order_vendornote} = $order_note;
740	}	742	}
741		743
742	if ( $item->internal_notes() ) {	744	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;
        chomp $ol_fields->{servicing_instruction};
    }

    my $item_fields = [];
    for my $item (@items) {


    # 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 $vendornote = $orderline->order_vendornote;
        chomp $vendornote;
        my $ftx = 'FTX+LIN+++';
        $ftx .= $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 408-417 sub order_line { Link Here

(-)a/Koha/Edifact/Order.pm (-7 / +10 lines)
408	}	408	}
409	my $budget = GetBudget( $orderline->budget_id );	409	my $budget = GetBudget( $orderline->budget_id );
410	my $ol_fields = { budget_code => $budget->{budget_code}, };	410	my $ol_fields = { budget_code => $budget->{budget_code}, };
411	if ( $orderline->order_vendornote ) {
412	$ol_fields->{servicing_instruction} = $orderline->order_vendornote;
413	chomp $ol_fields->{servicing_instruction};
414	}
415		411
416	my $item_fields = [];	412	my $item_fields = [];
417	for my $item (@items) {	413	for my $item (@items) {
Lines 434-441 sub order_line { Link Here
434		430
435	# TBD what if #items exceeds quantity	431	# TBD what if #items exceeds quantity
436		432
437	# FTX free text for current orderline TBD	433	# FTX free text for current orderline
438	# dont really have a special instructions field to encode here	434	# Pass vendor note in FTX free text segment
		435	if ( $orderline->order_vendornote ) {
		436	my $vendornote = $orderline->order_vendornote;
		437	chomp $vendornote;
		438	my $ftx = 'FTX+LIN+++';
		439	$ftx .= $vendornote;
		440	$ftx .= $seg_terminator;
		441	$self->add_seg($ftx);
		442	}
439	# Encode notes here	443	# Encode notes here
440	# PRI-CUX-DTM unit price on which order is placed : optional	444	# PRI-CUX-DTM unit price on which order is placed : optional
441	# Coutts read this as 0.00 if not present	445	# Coutts read this as 0.00 if not present
442	-