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

(-)a/C4/Acquisition.pm (-1 lines)
Lines 923-929 sub NewOrder { Link Here
923
=cut
923
=cut
924
924
925
sub NewOrderItem {
925
sub NewOrderItem {
926
    #my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
927
    my ($itemnumber, $ordernumber)  = @_;
926
    my ($itemnumber, $ordernumber)  = @_;
928
    my $dbh = C4::Context->dbh;
927
    my $dbh = C4::Context->dbh;
929
    my $query = qq|
928
    my $query = qq|
(-)a/C4/Items.pm (-2 / +1 lines)
Lines 458-465 sub ModItemFromMarc { Link Here
458
458
459
=head2 ModItem
459
=head2 ModItem
460
460
461
  ModItem({ column => $newvalue }, $biblionumber, 
461
  ModItem({ column => $newvalue }, $biblionumber, $itemnumber);
462
                  $itemnumber[, $original_item_marc]);
463
462
464
Change one or more columns in an item record and update
463
Change one or more columns in an item record and update
465
the MARC representation of the item.
464
the MARC representation of the item.
(-)a/acqui/finishreceive.pl (-24 / +23 lines)
Lines 54-81 my $error_url_str; Link Here
54
my $ecost = $input->param('ecost');
54
my $ecost = $input->param('ecost');
55
my $note = $input->param("note");
55
my $note = $input->param("note");
56
56
57
my %tplorder = ( 'quantity'                  =>     $input->param('quantity') || '',
58
                             'quantityreceived'   =>     $input->param('quantityrec') || '',
59
                             'notes'                      =>      $input->param("note") || '',
60
                             'rrp'                          =>      $input->param('rrp') || '',
61
                             'ecost'                      =>      $input->param('ecost') || '',
62
                             'unitprice'                =>      $input->param('cost') || '',
63
                     );
64
my $order = GetOrder($ordernumber);
65
if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rrp ecost unitprice) ) {
66
    $order->{quantity} = $tplorder{quantity} if $tplorder{quantity};
67
    $order->{quantityreceived} = $tplorder{quantityreceived} if $tplorder{quantityreceived};
68
    $order->{notes} = $tplorder{notes} if $tplorder{notes};
69
    $order->{rrp} = $tplorder{rrp} if $tplorder{rrp};
70
    $order->{ecost} = $tplorder{ecost} if $tplorder{ecost};
71
    $order->{unitprice} = $tplorder{unitprice} if $tplorder{unitprice};
72
    ModOrder($order);
73
}
74
75
#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
57
#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
76
if ($quantityrec > $origquantityrec ) {
58
if ($quantityrec > $origquantityrec ) {
77
    # now, add items if applicable
59
    # now, add items if applicable
78
    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
60
    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
61
79
        my @tags         = $input->param('tag');
62
        my @tags         = $input->param('tag');
80
        my @subfields    = $input->param('subfield');
63
        my @subfields    = $input->param('subfield');
81
        my @field_values = $input->param('field_value');
64
        my @field_values = $input->param('field_value');
Lines 105-117 if ($quantityrec > $origquantityrec ) { Link Here
105
                                    $itemhash{$item}->{'ind_tag'},
88
                                    $itemhash{$item}->{'ind_tag'},
106
                                    $itemhash{$item}->{'indicator'},'ITEM');
89
                                    $itemhash{$item}->{'indicator'},'ITEM');
107
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
90
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
108
            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
91
            my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
92
            NewOrderItem($itemnumber, $ordernumber);
109
        }
93
        }
110
    }
94
    }
111
    
95
    
112
    # save the quantity received.
96
    # save the quantity received.
113
	if( $quantityrec > 0 ) {
97
   	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
114
    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
98
}
115
	}
99
100
update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
101
102
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
103
104
################################ End of script ################################
105
106
sub update_item {
107
    my ( $itemnumber ) = @_;
108
    warn "AAA $itemnumber";
109
110
    ModItem( {
111
        booksellerid         => $supplierid,
112
        dateaccessioned      => $datereceived,
113
        price                => $unitprice,
114
        replacementprice     => $replacement,
115
        replacementpricedate => $datereceived,
116
    }, $biblionumber, $itemnumber );
116
}
117
}
117
    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
118
- 

Return to bug 5473