diff options
| -rw-r--r-- | LedgerSMB/OE.pm | 38 | ||||
| -rw-r--r-- | dists/source/build.sh | 2 | ||||
| -rw-r--r-- | scripts/menu.pl | 33 |
3 files changed, 17 insertions, 56 deletions
diff --git a/LedgerSMB/OE.pm b/LedgerSMB/OE.pm index f3838c13..a2959d4b 100644 --- a/LedgerSMB/OE.pm +++ b/LedgerSMB/OE.pm @@ -2515,8 +2515,12 @@ sub consolidate_orders { $form->{entity_id} = $vc_id; $amount = 0; $netamount = 0; + my @orderids; + my $orderid_str = ""; foreach $id ( @{ $oe{orders}{$curr}{$vc_id} } ) { + push(@orderids, $id); + $orderid_str .= "?, "; # header $ref = $oe{oe}{$curr}{$id}; @@ -2584,34 +2588,24 @@ sub consolidate_orders { $sth = $dbh->prepare($query); $sth->execute() || $form->dberror($query); + $orderid_str =~ s/, $//; + # add items - foreach $item (@orderitems) { - for ( - qw( - qty sellprice discount project_id ship) - ) - { - $item->{$_} *= 1; - } - $query = qq| + $query = qq| INSERT INTO orderitems (trans_id, parts_id, description, qty, sellprice, discount, unit, reqdate, project_id, ship, serialnumber, notes) - VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; - - $sth = $dbh->prepare($query); - $sth->execute( - $id, $item->{parts_id}, - $item->{description}, $item->{qty}, - $item->{sellprice}, $item->{discount}, - $item->{unit}, $form->{reqdate}, - $item->{project_id}, $item->{ship}, - $item->{serialnumber}, $item->{notes} - ) || $form->dberror($query); + SELECT ?, parts_id, description, + qty, sellprice, discount, unit, reqdate, + project_id, ship, serialnumber, notes + FROM orderitems + WHERE trans_id IN ($orderid_str)|; - } + $sth = $dbh->prepare($query); + $sth->execute($id, @orderids) || $form->dberror($query); + + } } diff --git a/dists/source/build.sh b/dists/source/build.sh index e33c5b38..dde5dc15 100644 --- a/dists/source/build.sh +++ b/dists/source/build.sh @@ -2,7 +2,7 @@ # Simple script to prepare for release -version="1.2.0b2"; +version="1.3.0_milestone_1"; build_d="../release"; if test -d blib; then diff --git a/scripts/menu.pl b/scripts/menu.pl index 3b2748a1..4f5cbb80 100644 --- a/scripts/menu.pl +++ b/scripts/menu.pl @@ -43,41 +43,8 @@ sub expanding_menu { template => 'menu_expand', format => 'HTML', ); - $request->{subs} = []; - $menu->debug({file => '/tmp/debug-menu'}); - $request->debug({file => '/tmp/debug'}); $template->render($menu); } -sub _attach_references { - no strict qw(refs); - my ($args) = @_; - my ($source, $dest, $path) - = ($args->{source}, $args->{dest}, $args->{path}); - my %hash; - if ($path and $source->{id}){ - for (sort keys %$source){ - next if $_ eq 'subs'; - $hash{$_} = $source->{$_}; - } - $hash{path} = $path; - push @{$dest}, \%hash; - foreach (sort keys %{$source->{subs}}) { - _attach_references({ - source => $source->{subs}->{$_}, - dest => $dest, - path => "$path--$_", - }); - } - } else { - foreach (sort keys %$source){ - _attach_references({ - source => $source->{$_}, - dest => $dest, - path => "$_", - }); - } - } -} 1; |