X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=402df0d289499d82cfa23d61273aece22cdb6490;hb=4b17bfa891c1dd495558090ef8f558a51222b7a3;hp=6971f9f480e5cc5ce174bee8fcb9a5164a90b0a0;hpb=02aab73f3ea8e0b8c87ecd5642b9366d7c0f1a50;p=kivitendo-erp.git diff --git a/SL/IS.pm b/SL/IS.pm index 6971f9f48..402df0d28 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -711,9 +711,8 @@ sub post_invoice { $sth->execute || $form->dberror($query); if ($sth->fetchrow_array) { - $form->update_balance($dbh, "parts", "onhand", - qq|id = $form->{"id_$i"}|, - $baseqty * -1) + $form->update_balance($dbh, "parts", "onhand", qq|id = ?|, + $baseqty * -1, $form->{"id_$i"}) unless $form->{shipped}; } $sth->finish; @@ -721,9 +720,8 @@ sub post_invoice { # record assembly item as allocated &process_assembly($dbh, $form, $form->{"id_$i"}, $baseqty); } else { - $form->update_balance($dbh, "parts", "onhand", - qq|id = $form->{"id_$i"}|, - $baseqty * -1) + $form->update_balance($dbh, "parts", "onhand", qq|id = ?|, + $baseqty * -1, $form->{"id_$i"}) unless $form->{shipped}; $allocated = &cogs($dbh, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i); @@ -1700,12 +1698,12 @@ sub get_customer { map { $form->{$_} = $ref->{$_} } keys %$ref; my $query = qq|SELECT sum(a.amount - a.paid) AS dunning_amount FROM ar a - WHERE a.paid < a.amount AND a.customer_id = ? AND a.dunning_id IS NOT NULL|; + WHERE a.paid < a.amount AND a.customer_id = ? AND a.dunning_config_id IS NOT NULL|; $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id}); map { $form->{$_} = $ref->{$_} } keys %$ref; my $query = qq|SELECT dnn.dunning_description AS max_dunning_level FROM dunning_config dnn - WHERE id in (SELECT dunning_id from ar WHERE paid < amount AND customer_id = ? AND dunning_id IS NOT NULL) + WHERE id in (SELECT dunning_config_id from ar WHERE paid < amount AND customer_id = ? AND dunning_config_id IS NOT NULL) ORDER BY dunning_level DESC LIMIT 1|; $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id}); map { $form->{$_} = $ref->{$_} } keys %$ref;