From: G. Richardson Date: Wed, 13 Jul 2011 13:14:30 +0000 (+0200) Subject: myconfig bei cogs und process_assembly übergeben X-Git-Tag: release-2.7.0beta1~353^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=306fad809f1e36204c095faaf1c179d24aeb60e1;p=kivitendo-erp.git myconfig bei cogs und process_assembly übergeben --- diff --git a/SL/IS.pm b/SL/IS.pm index 165ae1aee..f324ee48d 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -687,10 +687,10 @@ sub post_invoice { if ($form->{"assembly_$i"}) { # record assembly item as allocated - &process_assembly($dbh, $form, $form->{"id_$i"}, $baseqty); + &process_assembly($dbh, $myconfig, $form, $form->{"id_$i"}, $baseqty); } else { - $allocated = &cogs($dbh, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i); + $allocated = &cogs($dbh, $myconfig, $form, $form->{"id_$i"}, $baseqty, $basefactor, $i); } } @@ -1185,7 +1185,7 @@ sub post_payment { sub process_assembly { $main::lxdebug->enter_sub(); - my ($dbh, $form, $id, $totalqty) = @_; + my ($dbh, $myconfig, $form, $id, $totalqty) = @_; my $query = qq|SELECT a.parts_id, a.qty, p.assembly, p.partnumber, p.description, p.unit, @@ -1206,11 +1206,11 @@ sub process_assembly { $ref->{qty} *= $totalqty; if ($ref->{assembly}) { - &process_assembly($dbh, $form, $ref->{parts_id}, $ref->{qty}); + &process_assembly($dbh, $myconfig, $form, $ref->{parts_id}, $ref->{qty}); next; } else { if ($ref->{inventory_accno_id}) { - $allocated = &cogs($dbh, $form, $ref->{parts_id}, $ref->{qty}); + $allocated = &cogs($dbh, $myconfig, $form, $ref->{parts_id}, $ref->{qty}); } } @@ -1231,7 +1231,10 @@ sub process_assembly { sub cogs { $main::lxdebug->enter_sub(); - my ($dbh, $form, $id, $totalqty, $basefactor, $row) = @_; + # adjust allocated in table invoice according to FIFO princicple + # for a certain part with part_id $id + + my ($dbh, $myconfig, $form, $id, $totalqty, $basefactor, $row) = @_; $basefactor ||= 1;