X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2FSL%2FOE.pm;h=dfa424c31422b4ace1bd7d385efd41dd204760b2;hp=a742ca7a2f4ed5c678f991a1c66ffdef0d2df668;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/SL/OE.pm b/sql-ledger/SL/OE.pm
index a742ca7a2..dfa424c31 100644
--- a/sql-ledger/SL/OE.pm
+++ b/sql-ledger/SL/OE.pm
@@ -23,6 +23,7 @@
 #======================================================================
 #
 # Order entry module
+# Quotation
 #
 #======================================================================
 
@@ -36,46 +37,133 @@ sub transactions {
   my $dbh = $form->dbconnect($myconfig);
  
   my $query;
+  my $ordnumber = 'ordnumber';
+  my $quotation = '0';
+  my ($null, $department_id) = split /--/, $form->{department};
 
+  my $department = " AND o.department_id = $department_id" if $department_id;
+  
   my $rate = ($form->{vc} eq 'customer') ? 'buy' : 'sell';
+
+  ($form->{transdatefrom}, $form->{transdateto}) = $form->from_to($form->{year}, $form->{month}, $form->{interval}) if $form->{year} && $form->{month};
+
+  if ($form->{type} =~ /_quotation$/) {
+    $quotation = '1';
+    $ordnumber = 'quonumber';
+  }
   
+  my $number = $form->like(lc $form->{$ordnumber});
+  my $name = $form->like(lc $form->{$form->{vc}});
+ 
   my $query = qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate,
                  o.amount, ct.name, o.netamount, o.$form->{vc}_id,
-		 (SELECT $rate FROM exchangerate ex
-		  WHERE ex.curr = o.curr
-		  AND ex.transdate = o.transdate) AS exchangerate,
-		 o.closed
-	         FROM oe o, $form->{vc} ct
-	         WHERE o.$form->{vc}_id = ct.id|;
-	      
-  my $ordnumber = $form->like(lc $form->{ordnumber});
+		 ex.$rate AS exchangerate,
+		 o.closed, o.quonumber, o.shippingpoint, o.shipvia,
+		 e.name AS employee, m.name AS manager, o.curr
+	         FROM oe o
+	         JOIN $form->{vc} ct ON (o.$form->{vc}_id = ct.id)
+	         LEFT JOIN employee e ON (o.employee_id = e.id)
+		 LEFT JOIN employee m ON (e.managerid = m.id)
+	         LEFT JOIN exchangerate ex ON (ex.curr = o.curr
+		                               AND ex.transdate = o.transdate)
+	         WHERE o.quotation = '$quotation'
+		 $department|;
+
+  my %ordinal = ( 'id' => 1,
+                  'ordnumber' => 2,
+                  'transdate' => 3,
+		  'reqdate' => 4,
+		  'name' => 6,
+		  'quonumber' => 11,
+		  'shipvia' => 13,
+		  'employee' => 14,
+		  'manager' => 15
+		);
+
+  my @a = (transdate, $ordnumber, name);
+  push @a, "employee" if $form->{l_employee};
+  if ($form->{type} !~ /(ship|receive)_order/) {
+    push @a, "manager" if $form->{l_manager};
+  }
+  my $sortorder = $form->sort_order(\@a, \%ordinal);
+  
   
+  # build query if type eq (ship|receive)_order
+  if ($form->{type} =~ /(ship|receive)_order/) {
+    
+    my ($warehouse, $warehouse_id) = split /--/, $form->{warehouse};
+
+    $query =  qq|SELECT DISTINCT o.id, o.ordnumber, o.transdate,
+                 o.reqdate, o.amount, ct.name, o.netamount, o.$form->{vc}_id,
+		 ex.$rate AS exchangerate,
+		 o.closed, o.quonumber, o.shippingpoint, o.shipvia,
+		 e.name AS employee, o.curr
+	         FROM oe o
+	         JOIN $form->{vc} ct ON (o.$form->{vc}_id = ct.id)
+		 JOIN orderitems oi ON (oi.trans_id = o.id)
+		 JOIN parts p ON (p.id = oi.parts_id)|;
+
+      if ($warehouse_id && $form->{type} eq 'ship_order') {
+	$query .= qq|
+	         JOIN inventory i ON (oi.parts_id = i.parts_id)
+		 |;
+      }
+
+    $query .= qq|
+	         LEFT JOIN employee e ON (o.employee_id = e.id)
+	         LEFT JOIN exchangerate ex ON (ex.curr = o.curr
+		                               AND ex.transdate = o.transdate)
+	         WHERE o.quotation = '0'
+		 AND (p.inventory_accno_id > 0 OR p.assembly = '1')
+		 AND oi.qty != oi.ship
+		 $department|;
+		 
+    if ($warehouse_id && $form->{type} eq 'ship_order') {
+      $query .= qq|
+                 AND i.warehouse_id = $warehouse_id
+		 AND i.qty >= (oi.qty - oi.ship)
+		 |;
+    }
+
+  }
+ 
   if ($form->{"$form->{vc}_id"}) {
     $query .= qq| AND o.$form->{vc}_id = $form->{"$form->{vc}_id"}|;
   } else {
     if ($form->{$form->{vc}}) {
-      my $name = $form->like(lc $form->{$form->{vc}});
-      $query .= " AND lower(name) LIKE '$name'";
+      $query .= " AND lower(ct.name) LIKE '$name'";
     }
   }
-  unless ($form->{open} && $form->{closed}) {
+  if (!$form->{open} && !$form->{closed}) {
+    $query .= " AND o.id = 0";
+  } elsif (!($form->{open} && $form->{closed})) {
     $query .= ($form->{open}) ? " AND o.closed = '0'" : " AND o.closed = '1'";
   }
 
-  my $sortorder = join ', ', $form->sort_columns(qw(transdate ordnumber name));
-  $sortorder = $form->{sort} unless $sortorder;
-  
-  $query .= " AND lower(ordnumber) LIKE '$ordnumber'" if $form->{ordnumber};
-  $query .= " AND transdate >= '$form->{transdatefrom}'" if $form->{transdatefrom};
-  $query .= " AND transdate <= '$form->{transdateto}'" if $form->{transdateto};
+  if ($form->{$ordnumber}) {
+    $query .= " AND lower($ordnumber) LIKE '$number'";
+  }
+  if ($form->{shipvia}) {
+    $var = $form->like(lc $form->{shipvia});
+    $query .= " AND lower(o.shipvia) LIKE '$var'";
+  }
+  if ($form->{transdatefrom}) {
+    $query .= " AND o.transdate >= '$form->{transdatefrom}'";
+  }
+  if ($form->{transdateto}) {
+    $query .= " AND o.transdate <= '$form->{transdateto}'";
+  }
+
   $query .= " ORDER by $sortorder";
 
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  while (my $oe = $sth->fetchrow_hashref(NAME_lc)) {
-    $oe->{exchangerate} = 1 unless $oe->{exchangerate};
-    push @{ $form->{OE} }, $oe;
+  my %id = ();
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    $ref->{exchangerate} = 1 unless $ref->{exchangerate};
+    push @{ $form->{OE} }, $ref if $ref->{id} != $id{$ref->{id}};
+    $id{$ref->{id}} = $ref->{id};
   }
 
   $sth->finish;
@@ -84,17 +172,29 @@ sub transactions {
 }
 
 
-sub save_order {
+sub save {
   my ($self, $myconfig, $form) = @_;
   
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my ($query, $sth);
+  my $query;
+  my $sth;
+  my $null;
   my $exchangerate = 0;
 
+  ($null, $form->{employee_id}) = split /--/, $form->{employee};
+  unless ($form->{employee_id}) {
+    ($form->{employee}, $form->{employee_id}) = $form->get_employee($dbh);
+    $form->{employee} = "$form->{employee}--$form->{employee_id}";
+  }
+  
+  my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
+  
   if ($form->{id}) {
-
+    
+    &adj_onhand($dbh, $form, $ml) if $form->{type} =~ /_order$/;
+    
     $query = qq|DELETE FROM orderitems
                 WHERE trans_id = $form->{id}|;
     $dbh->do($query) || $form->dberror($query);
@@ -108,8 +208,7 @@ sub save_order {
     $uid .= $form->{login};
     
     $query = qq|INSERT INTO oe (ordnumber, employee_id)
-                VALUES ('$uid', (SELECT id FROM employee
-		                 WHERE login = '$form->{login}') )|;
+		VALUES ('$uid', $form->{employee_id})|;
     $dbh->do($query) || $form->dberror($query);
    
     $query = qq|SELECT id FROM oe
@@ -119,28 +218,30 @@ sub save_order {
 
     ($form->{id}) = $sth->fetchrow_array;
     $sth->finish;
+    
   }
 
-  map { $form->{$_} =~ s/'/''/g } qw(ordnumber shippingpoint notes message);
-  
-  my ($amount, $linetotal, $discount, $project_id, $reqdate);
-  my ($taxrate, $taxamount, $fxsellprice);
-  my %taxbase = ();
-  my %taxaccounts = ();
-  my ($netamount, $tax) = (0, 0);
+  my $amount;
+  my $linetotal;
+  my $discount;
+  my $project_id;
+  my $taxrate;
+  my $taxamount;
+  my $fxsellprice;
+  my %taxbase;
+  my @taxaccounts;
+  my %taxaccounts;
+  my $netamount = 0;
 
   for my $i (1 .. $form->{rowcount}) {
-    
-    $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
-    
-    if ($form->{"qty_$i"} != 0) {
-      
-      map { $form->{"${_}_$i"} =~ s/'/''/g } qw(partnumber description unit);
-      
-      # set values to 0 if nothing entered
-      $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
 
-      $form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+    map { $form->{"${_}_$i"} = $form->parse_amount($myconfig, $form->{"${_}_$i"}) } qw(qty ship);
+     
+    $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
+    $form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
+ 
+    if ($form->{"qty_$i"}) {
+
       $fxsellprice = $form->{"sellprice_$i"};
 
       my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
@@ -150,9 +251,16 @@ sub save_order {
       $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"}, $decimalplaces);
       $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
       
+      $form->{"inventory_accno_$i"} *= 1;
+      $form->{"expense_accno_$i"} *= 1;
+      
       $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      
+      @taxaccounts = split / /, $form->{"taxaccounts_$i"};
       $taxrate = 0;
-      map { $taxrate += $form->{"${_}_rate"} } split / /, $form->{"taxaccounts_$i"};
+      $taxdiff = 0;
+      
+      map { $taxrate += $form->{"${_}_rate"} } @taxaccounts;
 
       if ($form->{taxincluded}) {
 	$taxamount = $linetotal * $taxrate / (1 + $taxrate);
@@ -164,28 +272,54 @@ sub save_order {
 	$taxbase = $linetotal;
       }
 
-      if ($taxamount != 0) {
-	foreach my $item (split / /, $form->{"taxaccounts_$i"}) {
+      if (@taxaccounts && $form->round_amount($taxamount, 2) == 0) {
+	if ($form->{taxincluded}) {
+	  foreach $item (@taxaccounts) {
+	    $taxamount = $form->round_amount($linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"})), 2);
+
+	    $taxaccounts{$item} += $taxamount;
+	    $taxdiff += $taxamount; 
+
+	    $taxbase{$item} += $taxbase;
+	  }
+	  $taxaccounts{$taxaccounts[0]} += $taxdiff;
+	} else {
+	  foreach $item (@taxaccounts) {
+	    $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
+	    $taxbase{$item} += $taxbase;
+	  }
+	}
+      } else {
+	foreach $item (@taxaccounts) {
 	  $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate;
 	  $taxbase{$item} += $taxbase;
 	}
       }
-      
+
+
       $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"};
       
       $project_id = 'NULL';
-      if ($form->{"project_id_$i"}) {
-	$project_id = $form->{"project_id_$i"};
+      if ($form->{"projectnumber_$i"}) {
+	($null, $project_id) = split /--/, $form->{"projectnumber_$i"};
+	$project_id *= 1;
       }
-      $reqdate = ($form->{"reqdate_$i"}) ? qq|'$form->{"reqdate_$i"}'| : "NULL";
       
       # save detail record in orderitems table
-      $query = qq|INSERT INTO orderitems
-		 (trans_id, parts_id, description, qty, sellprice, discount,
-		  unit, reqdate, project_id) VALUES (
-		  $form->{id}, $form->{"id_$i"}, '$form->{"description_$i"}',
-		  $form->{"qty_$i"}, $fxsellprice, $form->{"discount_$i"},
-		  '$form->{"unit_$i"}', $reqdate, $project_id)|;
+      $query = qq|INSERT INTO orderitems (|;
+      $query .= "id, " if $form->{"orderitems_id_$i"};
+      $query .= qq|trans_id, parts_id, description, qty, sellprice, discount,
+		   unit, reqdate, project_id, serialnumber, ship)
+                   VALUES (|;
+      $query .= qq|$form->{"orderitems_id_$i"},| if $form->{"orderitems_id_$i"};
+      $query .= qq|$form->{id}, $form->{"id_$i"}, |
+		   .$dbh->quote($form->{"description_$i"}).qq|,
+		   $form->{"qty_$i"}, $fxsellprice, $form->{"discount_$i"}, |
+		   .$dbh->quote($form->{"unit_$i"}).qq|, |
+		   .$form->dbquote($form->{"reqdate_$i"}, SQL_DATE).qq|, 
+		   $project_id, |
+		   .$dbh->quote($form->{"serialnumber_$i"}).qq|,
+		   $form->{"ship_$i"})|;
       $dbh->do($query) || $form->dberror($query);
 
       $form->{"sellprice_$i"} = $fxsellprice;
@@ -195,15 +329,11 @@ sub save_order {
 
 
   # set values which could be empty
-  map { $form->{$_} *= 1 } qw(vendor_id customer_id taxincluded closed);
+  map { $form->{$_} *= 1 } qw(vendor_id customer_id taxincluded closed quotation);
 
-  $reqdate = ($form->{reqdate}) ? qq|'$form->{reqdate}'| : "NULL";
-  
   # add up the tax
-  foreach my $item (sort keys %taxaccounts) {
-    $taxamount = $form->round_amount($taxaccounts{$item}, 2);
-    $tax += $taxamount;
-  }
+  my $tax = 0;
+  map { $tax += $form->round_amount($taxaccounts{$_}, 2) } keys %taxaccounts;
   
   $amount = $form->round_amount($netamount + $tax, 2);
   $netamount = $form->round_amount($netamount, 2);
@@ -216,33 +346,32 @@ sub save_order {
   
   $form->{exchangerate} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{exchangerate});
   
-  # fill in subject if there is none
-  $form->{subject} = qq|$form->{label} $form->{ordnumber}| unless $form->{subject};
-  # if there is a message stuff it into the notes
-  my $cc = "Cc: $form->{cc}\\r\n" if $form->{cc};
-  my $bcc = "Bcc: $form->{bcc}\\r\n" if $form->{bcc};
-  $form->{notes} .= qq|\r
-\r
-[email]\r
-To: $form->{email}\r
-$cc${bcc}Subject: $form->{subject}\r
-\r
-Message: $form->{message}\r| if $form->{message};
+  my $quotation = ($form->{type} =~ /_order$/) ? '0' : '1';
+  
+  ($null, $form->{department_id}) = split(/--/, $form->{department});
+  $form->{department_id} *= 1;
   
   # save OE record
   $query = qq|UPDATE oe set
-	      ordnumber = '$form->{ordnumber}',
-              transdate = '$form->{orddate}',
+	      ordnumber = |.$dbh->quote($form->{ordnumber}).qq|,
+	      quonumber = |.$dbh->quote($form->{quonumber}).qq|,
+              transdate = '$form->{transdate}',
               vendor_id = $form->{vendor_id},
 	      customer_id = $form->{customer_id},
               amount = $amount,
               netamount = $netamount,
-	      reqdate = $reqdate,
+	      reqdate = |.$form->dbquote($form->{reqdate}, SQL_DATE).qq|,
 	      taxincluded = '$form->{taxincluded}',
-	      shippingpoint = '$form->{shippingpoint}',
-	      notes = '$form->{notes}',
+	      shippingpoint = |.$dbh->quote($form->{shippingpoint}).qq|,
+	      shipvia = |.$dbh->quote($form->{shipvia}).qq|,
+	      notes = |.$dbh->quote($form->{notes}).qq|,
+	      intnotes = |.$dbh->quote($form->{intnotes}).qq|,
 	      curr = '$form->{currency}',
-	      closed = '$form->{closed}'
+	      closed = '$form->{closed}',
+	      quotation = '$quotation',
+	      department_id = $form->{department_id},
+	      employee_id = $form->{employee_id},
+	      language_code = '$form->{language_code}'
               WHERE id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
 
@@ -252,16 +381,34 @@ Message: $form->{message}\r| if $form->{message};
   $form->{name} = $form->{$form->{vc}};
   $form->{name} =~ s/--$form->{"$form->{vc}_id"}//;
   $form->add_shipto($dbh, $form->{id});
-  
+
+  # save printed, emailed, queued
+  $form->save_status($dbh); 
+    
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     if ($form->{vc} eq 'customer') {
-      $form->update_exchangerate($dbh, $form->{currency}, $form->{orddate}, $form->{exchangerate}, 0);
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
     }
     if ($form->{vc} eq 'vendor') {
-      $form->update_exchangerate($dbh, $form->{currency}, $form->{orddate}, 0, $form->{exchangerate});
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0, $form->{exchangerate});
     }
   }
   
+
+  if ($form->{type} =~ /_order$/) {
+    # adjust onhand
+    &adj_onhand($dbh, $form, $ml * -1);
+    &adj_inventory($dbh, $myconfig, $form);
+  }
+
+  my %audittrail = ( tablename	=> 'oe',
+                     reference	=> ($form->{type} =~ /_order$/) ? $form->{ordnumber} : $form->{quonumber},
+		     formname	=> $form->{type},
+		     action	=> 'saved',
+		     id		=> $form->{id} );
+
+  $form->audittrail($dbh, "", \%audittrail);
+  
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -271,38 +418,56 @@ Message: $form->{message}\r| if $form->{message};
 
 
 
-sub delete_order {
-  my ($self, $myconfig, $form) = @_;
+sub delete {
+  my ($self, $myconfig, $form, $spool) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my $query;
+  # delete spool files
+  my $query = qq|SELECT spoolfile FROM status
+                 WHERE trans_id = $form->{id}
+		 AND spoolfile IS NOT NULL|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
 
-  # can't use $form->delete_exchangerate
-  if ($form->{currency} ne $form->{defaultcurrency}) {
-       $query = qq|SELECT transdate FROM acc_trans
-		   WHERE ar.id = trans_id
-		   AND ar.curr = '$form->{currency}'
-		   AND transdate = '$form->{orddate}'
-	   UNION SELECT transdate FROM acc_trans
-		   WHERE ap.id = trans_id
-		   AND ap.curr = '$form->{currency}'
-		   AND transdate = '$form->{orddate}'|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-    
-    my ($transdate) = $sth->fetchrow_array;
-    $sth->finish;
+  my $spoolfile;
+  my @spoolfiles = ();
+
+  while (($spoolfile) = $sth->fetchrow_array) {
+    push @spoolfiles, $spoolfile;
+  }
+  $sth->finish;
+
+
+  $query = qq|SELECT o.parts_id, o.ship, p.inventory_accno_id
+              FROM orderitems o
+	      JOIN parts p ON (p.id = o.parts_id)
+              WHERE trans_id = $form->{id}|;
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
 
-    if (!$transdate) {
-      $query = qq|DELETE FROM exchangerate
-		  WHERE curr = '$form->{currency}'
-		  AND transdate = '$form->{orddate}'|;
-      $dbh->do($query) || $self->dberror($query);
+  if ($form->{type} =~ /_order$/) {
+    $ml = ($form->{type} eq 'purchase_order') ? -1 : 1;
+    while (my ($id, $ship, $inv) = $sth->fetchrow_array) {
+      $form->update_balance($dbh,
+			    "parts",
+			    "onhand",
+			    qq|id = $id|,
+			    $ship * $ml) if $inv;
     }
   }
-	      
+  $sth->finish;
+
+  # delete inventory
+  $query = qq|DELETE FROM inventory
+              WHERE oe_id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
+  
+  # delete status entries
+  $query = qq|DELETE FROM status
+              WHERE trans_id = $form->{id}|;
+  $dbh->do($query) || $form->dberror($query);
   
   # delete OE record
   $query = qq|DELETE FROM oe
@@ -318,22 +483,37 @@ sub delete_order {
               WHERE trans_id = $form->{id}|;
   $dbh->do($query) || $form->dberror($query);
   
+  my %audittrail = ( tablename	=> 'oe',
+                     reference	=> ($form->{type} =~ /_order$/) ? $form->{ordnumber} : $form->{quonumber},
+		     formname	=> $form->{type},
+		     action	=> 'deleted',
+		     id		=> $form->{id} );
+
+  $form->audittrail($dbh, "", \%audittrail);
+  
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
+  if ($rc) {
+    foreach $spoolfile (@spoolfiles) {
+      unlink "$spool/$spoolfile" if $spoolfile;
+    }
+  }
+  
   $rc;
   
 }
 
 
 
-sub retrieve_order {
+sub retrieve {
   my ($self, $myconfig, $form) = @_;
   
   # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $dbh = $form->dbconnect($myconfig);
 
   my $query;
+  my $var;
 
   if ($form->{id}) {
     # get default accounts and last order number
@@ -350,7 +530,6 @@ sub retrieve_order {
                 d.curr AS currencies
 	 	FROM defaults d|;
   } else {
-    my $ordnumber = ($form->{vc} eq 'customer') ? 'sonumber' : 'ponumber';
     $query = qq|SELECT (SELECT c.accno FROM chart c
                         WHERE d.inventory_accno_id = c.id) AS inventory_accno,
                        (SELECT c.accno FROM chart c
@@ -361,8 +540,8 @@ sub retrieve_order {
 		        WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
                        (SELECT c.accno FROM chart c
 		        WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
-                $ordnumber AS ordnumber, d.curr AS currencies,
-		current_date AS orddate, current_date AS reqdate
+                d.curr AS currencies,
+		current_date AS transdate
 	 	FROM defaults d|;
   }
   my $sth = $dbh->prepare($query);
@@ -372,20 +551,21 @@ sub retrieve_order {
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
 
-  ($form->{currency}) = split /:/, $form->{currencies};
   
   if ($form->{id}) {
     
     # retrieve order
-    $query = qq|SELECT o.ordnumber, o.transdate AS orddate, o.reqdate,
-                o.taxincluded, o.shippingpoint, o.notes, o.curr AS currency,
-		(SELECT name FROM employee e
-		 WHERE e.id = o.employee_id) AS employee,
+    $query = qq|SELECT o.ordnumber, o.transdate, o.reqdate,
+                o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
+		o.curr AS currency, e.name AS employee, o.employee_id,
 		o.$form->{vc}_id, cv.name AS $form->{vc}, o.amount AS invtotal,
-		o.closed, o.reqdate
-		FROM oe o, $form->{vc} cv
-		WHERE o.$form->{vc}_id = cv.id
-		AND o.id = $form->{id}|;
+		o.closed, o.reqdate, o.quonumber, o.department_id,
+		d.description AS department, o.language_code
+		FROM oe o
+	        JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
+	        LEFT JOIN employee e ON (o.employee_id = e.id)
+	        LEFT JOIN department d ON (o.department_id = d.id)
+		WHERE o.id = $form->{id}|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
@@ -402,20 +582,41 @@ sub retrieve_order {
     $ref = $sth->fetchrow_hashref(NAME_lc);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     $sth->finish;
-    
+
+    # get printed, emailed and queued
+    $query = qq|SELECT s.printed, s.emailed, s.spoolfile, s.formname
+                FROM status s
+		WHERE s.trans_id = $form->{id}|;
+    $sth = $dbh->prepare($query);
+    $sth->execute || $form->dberror($query);
+
+    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+      $form->{printed} .= "$ref->{formname} " if $ref->{printed};
+      $form->{emailed} .= "$ref->{formname} " if $ref->{emailed};
+      $form->{queued} .= "$ref->{formname} $ref->{spoolfile} " if $ref->{spoolfile};
+    }
+    $sth->finish;
+    map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
+
+
     my %oid = ( 'Pg'		=> 'oid',
+                'PgPP'		=> 'oid',
                 'Oracle'	=> 'rowid',
-                'DB2'		=> '' );
+		'DB2'		=> '1=1'
+	      );
 
     # retrieve individual items
-    $query = qq|SELECT c1.accno AS inventory_accno,
-                       c2.accno AS income_accno,
-		       c3.accno AS expense_accno,
+    $query = qq|SELECT o.id AS orderitems_id,
+                c1.accno AS inventory_accno,
+                c2.accno AS income_accno,
+		c3.accno AS expense_accno,
                 p.partnumber, p.assembly, o.description, o.qty,
 		o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin,
-                o.reqdate, o.project_id,
+                o.reqdate, o.project_id, o.serialnumber, o.ship,
 		pr.projectnumber,
-		pg.partsgroup
+		pg.partsgroup, p.partsgroup_id, p.partnumber AS sku,
+		p.listprice, p.lastcost, p.weight,
+		t.description AS partsgrouptranslation
 		FROM orderitems o
 		JOIN parts p ON (o.parts_id = p.id)
 		LEFT JOIN chart c1 ON (p.inventory_accno_id = c1.id)
@@ -423,116 +624,401 @@ sub retrieve_order {
 		LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
 		LEFT JOIN project pr ON (o.project_id = pr.id)
 		LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-		WHERE trans_id = $form->{id}
+		LEFT JOIN translation t ON (t.trans_id = p.partsgroup_id AND t.language_code = '$form->{language_code}')
+		WHERE o.trans_id = $form->{id}
                 ORDER BY o.$oid{$myconfig->{dbdriver}}|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
+    # foreign exchange rates
+    &exchangerate_defaults($dbh, $form);
+
+    # query for price matrix
+    my $pmh = &price_matrix_query($dbh, $form);
+    
+    # taxes
+    $query = qq|SELECT c.accno
+		FROM chart c
+		JOIN partstax pt ON (pt.chart_id = c.id)
+		WHERE pt.parts_id = ?|;
+    my $tth = $dbh->prepare($query) || $form->dberror($query);
+   
+    my $taxrate;
+    my $ptref;
+    my $sellprice;
+    my $listprice;
+    
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
 
-      # get tax rates for part
-      $query = qq|SELECT c.accno
-                  FROM chart c, partstax pt
-	          WHERE pt.chart_id = c.id
-	          AND pt.parts_id = $ref->{id}|;
-      my $pth = $dbh->prepare($query);
-      $pth->execute || $form->dberror($query);
+      ($decimalplaces) = ($ref->{sellprice} =~ /\.(\d+)/);
+      $decimalplaces = length $decimalplaces;
+      $decimalplaces = 2 unless $decimalplaces;
 
+      $tth->execute($ref->{id});
       $ref->{taxaccounts} = "";
-      my $taxrate = 0;
+      $taxrate = 0;
       
-      while (my $ptref = $pth->fetchrow_hashref(NAME_lc)) {
+      while ($ptref = $tth->fetchrow_hashref(NAME_lc)) {
         $ref->{taxaccounts} .= "$ptref->{accno} ";
         $taxrate += $form->{"$ptref->{accno}_rate"};
       }
-      $pth->finish;
+      $tth->finish;
       chop $ref->{taxaccounts};
 
-      push @{ $form->{order_details} }, $ref;
+      # preserve prices
+      $sellprice = $ref->{sellprice};
+      $listprice = $ref->{listprice};
+      
+      # multiply by exchangerate
+      $ref->{sellprice} = $form->round_amount($ref->{sellprice} * $form->{$form->{currency}}, $decimalplaces);
+      $ref->{listprice} = $form->round_amount($ref->{listprice} * $form->{$form->{currency}}, $decimalplaces);
+      
+      # partnumber and price matrix
+      &price_matrix($pmh, $ref, $form->{transdate}, $decimalplaces, $form, $myconfig, 1);
+
+      $ref->{sellprice} = $sellprice;
+      $ref->{listprice} = $listprice;
+
+      $ref->{partsgroup} = $ref->{partsgrouptranslation} if $ref->{partsgrouptranslation};
+      
+      push @{ $form->{form_details} }, $ref;
       
     }
     $sth->finish;
 
   } else {
 
-    my $ordnumber = ($form->{vc} eq 'customer') ? 'sonumber' : 'ponumber';
-    # up order number by 1
-    $form->{ordnumber}++;
-
-    # save the new number
-    $query = qq|UPDATE defaults
-                SET $ordnumber = '$form->{ordnumber}'|;
-    $dbh->do($query) || $form->dberror($query);
-
-    $form->get_employee($dbh);
-    
     # get last name used
     $form->lastname_used($dbh, $myconfig, $form->{vc}) unless $form->{"$form->{vc}_id"};
+    delete $form->{notes};
 
   }
+
+  $dbh->disconnect;
+
+}
+
+
+sub price_matrix_query {
+  my ($dbh, $form) = @_;
+
+  my $query;
+  my $sth;
+
+  if ($form->{customer_id}) {
+    $query = qq|SELECT p.*, g.pricegroup
+             FROM partscustomer p
+	     LEFT JOIN pricegroup g ON (g.id = p.pricegroup_id)
+	     WHERE p.parts_id = ?
+	     AND p.customer_id = $form->{customer_id}
+
+	     UNION
+
+	     SELECT p.*, g.pricegroup
+	     FROM partscustomer p
+	     LEFT JOIN pricegroup g ON (g.id = p.pricegroup_id)
+	     JOIN customer c ON (c.pricegroup_id = g.id)
+	     WHERE p.parts_id = ?
+	     AND c.id = $form->{customer_id}
+
+	     UNION
+
+	     SELECT p.*, '' AS pricegroup
+	     FROM partscustomer p
+	     WHERE p.customer_id = 0
+	     AND p.pricegroup_id = 0
+	     AND p.parts_id = ?
+
+	     ORDER BY customer_id DESC, pricegroup_id DESC, pricebreak
+	     |;
+    $sth = $dbh->prepare($query) || $form->dberror($query);
+  }
   
-  $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{orddate}, ($form->{vc} eq 'customer') ? "buy" : "sell");
+  if ($form->{vendor_id}) {
+    # price matrix and vendor's partnumber
+    $query = qq|SELECT partnumber
+		FROM partsvendor
+		WHERE parts_id = ?
+		AND vendor_id = $form->{vendor_id}|;
+    $sth = $dbh->prepare($query) || $form->dberror($query);
+  }
   
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  $sth;
 
-  $rc;
+}
+
+
+sub price_matrix {
+  my ($pmh, $ref, $transdate, $decimalplaces, $form, $myconfig, $init) = @_;
+
+  $ref->{pricematrix} = "";
+  my $customerprice = 0;
+  my $pricegroup = 0;
+  my $sellprice;
+  my $mref;
   
+  # depends if this is a customer or vendor
+  if ($form->{customer_id}) {
+    $pmh->execute($ref->{id}, $ref->{id}, $ref->{id});
+
+    while ($mref = $pmh->fetchrow_hashref(NAME_lc)) {
+
+      # check date
+      if ($mref->{validfrom}) {
+	next if $transdate < $form->datetonum($mref->{validfrom}, $myconfig);
+      }
+      if ($mref->{validto}) {
+	next if $transdate > $form->datetonum($mref->{validto}, $myconfig);
+      }
+
+      # convert price
+      $sellprice = $form->round_amount($mref->{sellprice} * $form->{$mref->{curr}}, $decimalplaces);
+      
+      if ($mref->{customer_id}) {
+	$ref->{sellprice} = $sellprice unless $mref->{pricebreak};
+	$ref->{pricematrix} .= "$mref->{pricebreak}:$sellprice ";
+	$customerprice = 1;
+      }
+
+      if ($mref->{pricegroup_id}) {
+	if (! $customerprice) {
+	  $ref->{sellprice} = $sellprice unless $mref->{pricebreak};
+	  $ref->{pricematrix} .= "$mref->{pricebreak}:$sellprice ";
+	  $pricegroup = 1;
+	}
+      }
+
+      if (! $customerprice && ! $pricegroup) {
+	$ref->{sellprice} = $sellprice unless $mref->{pricebreak};
+	$ref->{pricematrix} .= "$mref->{pricebreak}:$sellprice ";
+      }
+
+    }
+    $pmh->finish;
+
+    if ($ref->{pricematrix} !~ /^0:/) {
+      if ($init) {
+	$sellprice = $form->round_amount($ref->{sellprice}, $decimalplaces);
+      } else {
+	$sellprice = $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), $decimalplaces);
+      }
+      $ref->{pricematrix} = "0:$sellprice ".$ref->{pricematrix};
+    }
+    chop $ref->{pricematrix};
+
+  }
+
+
+  if ($form->{vendor_id}) {
+    $pmh->execute($ref->{id});
+    
+    $mref = $pmh->fetchrow_hashref(NAME_lc);
+
+    if ($mref->{partnumber}) {
+      $ref->{partnumber} = $mref->{partnumber};
+    }
+
+    if ($mref->{lastcost}) {
+      # do a conversion
+      $ref->{sellprice} = $form->round_amount($mref->{lastcost} * $form->{$mref->{curr}}, $decimalplaces);
+    }
+    $pmh->finish;
+
+    $ref->{sellprice} *= 1;
+
+    # add 0:price to matrix
+    $ref->{pricematrix} = "0:$ref->{sellprice}";
+
+  }
+
 }
 
 
+sub exchangerate_defaults {
+  my ($dbh, $form) = @_;
+
+  my $var;
+  my $buysell = ($form->{vc} eq "customer") ? "buy" : "sell";
+  
+  # get default currencies
+  my $query = qq|SELECT substr(curr,1,3), curr FROM defaults|;
+  my $eth = $dbh->prepare($query) || $form->dberror($query);
+  $eth->execute;
+  ($form->{defaultcurrency}, $form->{currencies}) = $eth->fetchrow_array;
+  $eth->finish;
+
+  $query = qq|SELECT $buysell
+              FROM exchangerate
+	      WHERE curr = ?
+	      AND transdate = ?|;
+  my $eth1 = $dbh->prepare($query) || $form->dberror($query);
+  $query = qq~SELECT max(transdate || ' ' || $buysell || ' ' || curr)
+              FROM exchangerate
+	      WHERE curr = ?~;
+  my $eth2 = $dbh->prepare($query) || $form->dberror($query);
+
+  # get exchange rates for transdate or max
+  foreach $var (split /:/, substr($form->{currencies},4)) {
+    $eth1->execute($var, $form->{transdate});
+    ($form->{$var}) = $eth1->fetchrow_array;
+    if (! $form->{$var} ) {
+      $eth2->execute($var);
+      
+      ($form->{$var}) = $eth2->fetchrow_array;
+      ($null, $form->{$var}) = split / /, $form->{$var};
+      $form->{$var} = 1 unless $form->{$var};
+      $eth2->finish;
+    }
+    $eth1->finish;
+  }
+
+  $form->{$form->{defaultcurrency}} = 1;
+      
+}
+
 
 sub order_details {
   my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
+  my $query;
+  my $sth;
     
-  my $tax = 0;
   my $item;
   my $i;
-  my @partsgroup = ();
+  my @sortlist = ();
+  my $projectnumber;
+  my $projectnumber_id;
+  my $translation;
   my $partsgroup;
-  my %oid = ( 'Pg' => 'oid',
-	      'Oracle' => 'rowid' );
 
-  # sort items by partsgroup
+  my %oid = ( 'Pg'	=> 'oid',
+              'PgPP'	=> 'oid',
+              'Oracle'	=> 'rowid',
+	      'DB2'	=> '1=1'
+	    );
+  
+  # sort items by project and partsgroup
   for $i (1 .. $form->{rowcount}) {
+    $projectnumber = "";
     $partsgroup = "";
-    if ($form->{"partsgroup_$i"} && $form->{groupitems}) {
-      $form->format_string("partsgroup_$i");
-      $partsgroup = $form->{"partsgroup_$i"};
+    $projectnumber_id = 0;
+    if ($form->{"projectnumber_$i"} && $form->{groupprojectnumber}) {
+      ($projectnumber, $projectnumber_id) = split /--/, $form->{"projectnumber_$i"};
+    }
+    if ($form->{"partsgroup_$i"} && $form->{grouppartsgroup}) {
+      ($partsgroup) = split /--/, $form->{"partsgroup_$i"};
     }
-    push @partsgroup, [ $i, $partsgroup ];
+    push @sortlist, [ $i, "$projectnumber$partsgroup", $projectnumber, $projectnumber_id, $partsgroup ];
+
+    # sort the whole thing by project and group
+    @sortlist = sort { $a->[1] cmp $b->[1] } @sortlist;
+
   }
-  
+
+  # if there is a warehouse limit picking
+  if ($form->{warehouse_id} && $form->{formname} =~ /(pick|packing)_list/) {
+    # run query to check for inventory
+    $query = qq|SELECT sum(qty) AS qty
+                FROM inventory
+		WHERE parts_id = ?
+		AND warehouse_id = ?|;
+    $sth = $dbh->prepare($query) || $form->dberror($query);
+
+    for $i (1 .. $form->{rowcount}) {
+      $sth->execute($form->{"id_$i"}, $form->{warehouse_id}) || $form->dberror;
+
+      ($qty) = $sth->fetchrow_array;
+      $sth->finish;
+
+      $form->{"qty_$i"} = 0 if $qty == 0;
+      
+      if ($form->parse_amount($myconfig, $form->{"ship_$i"}) > $qty) {
+	$form->{"ship_$i"} = $form->format_amount($myconfig, $qty);
+      }
+    }
+  }
+    
+  my @taxaccounts;
+  my %taxaccounts;
+  my $taxrate;
+  my $taxamount;
+  my $taxbase;
+  my $taxdiff;
+ 
+  $query = qq|SELECT p.description, t.description
+              FROM project p
+	      LEFT JOIN translation t ON (t.trans_id = p.id AND t.language_code = '$form->{language_code}')
+	      WHERE id = ?|;
+  my $prh = $dbh->prepare($query) || $form->dberror($query);
+
+  my $runningnumber = 1;
   my $sameitem = "";
-  foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
+  my $subtotal;
+  my $k = scalar @sortlist;
+  my $j = 0;
+  
+  foreach $item (@sortlist) {
     $i = $item->[0];
+    $j++;
+
+    if ($form->{groupprojectnumber} || $form->{grouppartsgroup}) {
+      if ($item->[1] ne $sameitem) {
 
-    if ($item->[1] ne $sameitem) {
-      push(@{ $form->{description} }, qq|$item->[1]|);
-      $sameitem = $item->[1];
+        $projectnumber = "";
+	if ($form->{groupprojectnumber} && $item->[2]) {
+	  # get project description
+	  $prh->execute($item->[3]) || $form->dberror($query);
+
+	  ($projectnumber, $translation) = $prh->fetchrow_array;
+	  $prh->finish;
+
+	  $projectnumber = ($translation) ? "$item->[2], $translation" : "$item->[2], $projectnumber";
+	}
+	  
+	if ($form->{grouppartsgroup} && $item->[4]) {
+	  $projectnumber .= " / " if $projectnumber;
+	  $projectnumber .= $item->[4];
+	}
+	
+	$form->{projectnumber} = $projectnumber;
+	$form->format_string(projectnumber);
+	
+	push(@{ $form->{description} }, qq|$form->{projectnumber}|);
+	$sameitem = $item->[1];
 
-      map { push(@{ $form->{$_} }, "") } qw(runningnumber number bin qty unit reqdate sellprice listprice netprice discount linetotal);
+	map { push(@{ $form->{$_} }, "") } qw(runningnumber number sku qty ship unit bin serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate linetotal weight);
+      }
     }
 
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
     
     if ($form->{"qty_$i"} != 0) {
 
+      $form->{totalqty} += $form->{"qty_$i"};
+      $form->{totalship} += $form->{"ship_$i"};
+      $form->{totalweight} += ($form->{"weight_$i"} * $form->{"qty_$i"});
+
       # add number, description and qty to $form->{number}, ....
-      push(@{ $form->{runningnumber} }, $i);
+      push(@{ $form->{runningnumber} }, $runningnumber++);
       push(@{ $form->{number} }, qq|$form->{"partnumber_$i"}|);
+      push(@{ $form->{sku} }, qq|$form->{"sku_$i"}|);
       push(@{ $form->{description} }, qq|$form->{"description_$i"}|);
       push(@{ $form->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"}));
+      push(@{ $form->{ship} }, $form->format_amount($myconfig, $form->{"ship_$i"}));
       push(@{ $form->{unit} }, qq|$form->{"unit_$i"}|);
+      push(@{ $form->{bin} }, qq|$form->{"bin_$i"}|);
+      push(@{ $form->{serialnumber} }, qq|$form->{"serialnumber_$i"}|);
       push(@{ $form->{reqdate} }, qq|$form->{"reqdate_$i"}|);
+      push(@{ $form->{projectnumber} }, qq|$form->{"projectnumber_$i"}|);
       
       push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
-      
+ 
       push(@{ $form->{listprice} }, $form->{"listprice_$i"});
       
+      push(@{ $form->{weight} }, $form->{"weight_$i"});
+
       my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
       my ($dec) = ($sellprice =~ /\.(\d+)/);
       $dec = length $dec;
@@ -551,13 +1037,16 @@ sub order_details {
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
 
       push(@{ $form->{discount} }, $discount);
+      push(@{ $form->{discountrate} }, $form->format_amount($myconfig, $form->{"discount_$i"}));
       
       $form->{ordtotal} += $linetotal;
 
+      # this is for the subtotals for grouping
+      $subtotal += $linetotal;
+
       push(@{ $form->{linetotal} }, $form->format_amount($myconfig, $linetotal, 2));
       
-      my ($taxamount, $taxbase);
-      my $taxrate = 0;
+      $taxrate = 0;
       
       map { $taxrate += $form->{"${_}_rate"} } split / /, $form->{"taxaccounts_$i"};
 
@@ -571,7 +1060,7 @@ sub order_details {
       }
 
 
-      if ($taxamount != 0) {
+      if ($form->round_amount($taxamount, 2) != 0) {
 	foreach my $item (split / /, $form->{"taxaccounts_$i"}) {
 	  $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate;
 	  $taxbase{$item} += $taxbase;
@@ -579,55 +1068,54 @@ sub order_details {
       }
 
       if ($form->{"assembly_$i"}) {
-        $sameitem = "";
-	
-        # get parts and push them onto the stack
-	my $sortorder = "";
-	if ($form->{groupitems}) {
-	  $sortorder = qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
-	} else {
-	  $sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
-	}
-	
-	$query = qq|SELECT p.partnumber, p.description, p.unit, a.qty,
-	            pg.partsgroup
-	            FROM assembly a
-		    JOIN parts p ON (a.parts_id = p.id)
-		    LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-		    WHERE a.bom = '1'
-		    AND a.id = '$form->{"id_$i"}'
-		    $sortorder|;
-        $sth = $dbh->prepare($query);
-        $sth->execute || $form->dberror($query);
-
-	while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-	  if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
-	    map { push(@{ $form->{$_} }, "") } qw(runningnumber number unit bin qty sellprice listprice netprice discount linetotal);
-	    $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
-	    push(@{ $form->{description} }, $sameitem);
+	$form->{stagger} = -1;
+	&assembly_details($dbh, $form, $form->{"id_$i"}, $oid{$myconfig->{dbdriver}}, $form->{"qty_$i"});
+      }
+
+    }
+
+    # add subtotal
+    if ($form->{groupprojectnumber} || $form->{grouppartsgroup}) {
+      if ($subtotal) {
+	if ($j < $k) {
+	  # look at next item
+	  if ($sortlist[$j]->[1] ne $sameitem) {
+
+	    map { push(@{ $form->{$_} }, "") } qw(runningnumber number sku qty ship unit bin serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate weight);
+
+	    push(@{ $form->{description} }, $form->{groupsubtotaldescription});
+
+            if (exists $form->{groupsubtotaldescription}) {
+	      push(@{ $form->{linetotal} }, $form->format_amount($myconfig, $subtotal, 2));
+	    } else {
+	      push(@{ $form->{linetotal} }, "");
+	    }
+
+	    $subtotal = 0;
 	  }
+
+	} else {
+
+	  # got last item
+          if (exists $form->{groupsubtotaldescription}) {
 	    
-	  push(@{ $form->{number} }, qq|$ref->{partnumber}|);
-	  push(@{ $form->{description} }, qq|$ref->{description}|);
-	  push(@{ $form->{unit} }, qq|$ref->{unit}|);
-	  push(@{ $form->{qty} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}));
+	    map { push(@{ $form->{$_} }, "") } qw(runningnumber number sku qty ship unit bin serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate weight);
 
-          map { push(@{ $form->{$_} }, "") } qw(runningnumber bin sellprice listprice netprice discount linetotal);
-	  
+	    push(@{ $form->{description} }, $form->{groupsubtotaldescription});
+	    push(@{ $form->{linetotal} }, $form->format_amount($myconfig, $subtotal, 2));
+	  }
 	}
-	$sth->finish;
       }
-
     }
   }
 
 
+  my $tax = 0;
   foreach $item (sort keys %taxaccounts) {
     if ($form->round_amount($taxaccounts{$item}, 2) != 0) {
       push(@{ $form->{taxbase} }, $form->format_amount($myconfig, $taxbase{$item}, 2));
       
-      $taxamount = $form->round_amount($taxaccounts{$item}, 2);
-      $tax += $taxamount;
+      $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
       
       push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
       push(@{ $form->{taxdescription} }, $form->{"${item}_description"});
@@ -636,36 +1124,455 @@ sub order_details {
     }
   }
 
-
+  map { $form->{$_} = $form->format_amount($myconfig, $form->{$_}) } qw(totalqty totalship totalweight);
   $form->{subtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
   $form->{ordtotal} = ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;
+
+  use SL::CP;
+  my $c;
+  if ($form->{language_code}) {
+    $c = new CP $form->{language_code};
+  } else {
+    $c = new CP $myconfig->{countrycode};
+  }
+  $c->init;
+  my $whole;
+  ($whole, $form->{decimal}) = split /\./, $form->{ordtotal};
+  $form->{decimal} .= "00";
+  $form->{decimal} = substr($form->{decimal}, 0, 2);
+  $form->{text_amount} = $c->num2text($whole);
   
   # format amounts
-  $form->{ordtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
-
-  # myconfig variables
-  map { $form->{$_} = $myconfig->{$_} } (qw(company address tel fax signature businessnumber));
-  $form->{username} = $myconfig->{name};
+  $form->{quototal} = $form->{ordtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);
 
   $dbh->disconnect;
 
 }
 
 
+sub assembly_details {
+  my ($dbh, $form, $id, $oid, $qty) = @_;
+
+  my $sm = "";
+  my $spacer;
+
+  $form->{stagger}++;
+  if ($form->{format} eq 'html') {
+    $spacer = "&nbsp;" x (3 * ($form->{stagger} - 1)) if $form->{stagger} > 1;
+  }
+  if ($form->{format} =~ /(postscript|pdf)/) {
+    if ($form->{stagger} > 1) {
+      $spacer = ($form->{stagger} - 1) * 3;
+      $spacer = '\rule{'.$spacer.'mm}{0mm}';
+    }
+  }
+
+  # get parts and push them onto the stack
+  my $sortorder = "";
+  
+  if ($form->{grouppartsgroup}) {
+    $sortorder = qq|ORDER BY pg.partsgroup, a.$oid|;
+  } else {
+    $sortorder = qq|ORDER BY a.$oid|;
+  }
+  
+  my $where = ($form->{formname} eq 'work_order') ? "1 = 1" : "a.bom = '1'";
+  
+  my $query = qq|SELECT p.partnumber, p.description, p.unit, a.qty,
+	         pg.partsgroup, p.partnumber AS sku, p.assembly, p.id, p.bin
+	         FROM assembly a
+	         JOIN parts p ON (a.parts_id = p.id)
+	         LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+	         WHERE $where
+	         AND a.id = '$id'
+	         $sortorder|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+   
+    if ($form->{grouppartsgroup} && $ref->{partsgroup} ne $sm) {
+      map { push(@{ $form->{$_} }, "") } qw(number sku unit qty runningnumber ship bin serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate linetotal);
+      $sm = ($ref->{partsgroup}) ? $ref->{partsgroup} : "";
+      push(@{ $form->{description} }, "$spacer$sm");
+    }
+    
+    if ($form->{stagger}) {
+      push(@{ $form->{description} }, qq|$spacer$ref->{sku}, $ref->{description}|);
+      map { push(@{ $form->{$_} }, "") } qw(number sku runningnumber ship serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate linetotal);
+    } else {
+      push(@{ $form->{description} }, qq|$ref->{description}|);
+      push(@{ $form->{sku} }, $ref->{partnumber});
+      push(@{ $form->{number} }, $ref->{partnumber});
+      
+      map { push(@{ $form->{$_} }, "") } qw(runningnumber ship serialnumber reqdate projectnumber sellprice listprice netprice discount discountrate linetotal);
+    }
+      
+    push(@{ $form->{qty} }, $form->format_amount($myconfig, $ref->{qty} * $qty));
+    map { push(@{ $form->{$_} }, $ref->{$_}) } qw(unit bin);
+
+    
+    if ($ref->{assembly} && $form->{formname} eq 'work_order') {
+      &assembly_details($dbh, $form, $ref->{id}, $oid, $ref->{qty} * $qty);
+    }
+    
+  }
+  $sth->finish;
+
+  $form->{stagger}--;
+  
+}
+
+
 sub project_description {
   my ($self, $dbh, $id) = @_;
 
   my $query = qq|SELECT description
                  FROM project
 		 WHERE id = $id|;
+  ($_) = $dbh->selectrow_array;
+  
+  $_;
+
+}
+
+
+sub get_warehouses {
+  my ($self, $myconfig, $form) = @_;
+  
+  my $dbh = $form->dbconnect($myconfig);
+  # setup warehouses
+  my $query = qq|SELECT id, description
+                 FROM warehouse
+		 ORDER BY 2|;
+
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  ($_) = $sth->fetchrow_array;
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $form->{all_warehouses} }, $ref;
+  }
+  $sth->finish;
+
+  $dbh->disconnect;
+
+}
+
+
+sub save_inventory {
+  my ($self, $myconfig, $form) = @_;
+  
+  my ($null, $warehouse_id) = split /--/, $form->{warehouse};
+  $warehouse_id *= 1;
+
+  my $ml = ($form->{type} eq 'ship_order') ? -1 : 1;
+  
+  my $dbh = $form->dbconnect_noauto($myconfig);
+  my $sth;
+  my $wth;
+  my $serialnumber;
+  my $ship;
+  
+  my $employee_id;
+  ($null, $employee_id) = split /--/, $form->{employee};
+  ($null, $employee_id) = $form->get_employee($dbh) if ! $employee_id;
+ 
+  $query = qq|SELECT serialnumber, ship
+              FROM orderitems
+              WHERE trans_id = ?
+	      AND id = ?
+	      FOR UPDATE|;
+  $sth = $dbh->prepare($query) || $form->dberror($query);
+
+  $query = qq|SELECT sum(qty)
+              FROM inventory
+	      WHERE parts_id = ?
+	      AND warehouse_id = ?|;
+  $wth = $dbh->prepare($query) || $form->dberror($query);
+  
+
+  for my $i (1 .. $form->{rowcount}) {
+
+    $ship = (abs($form->{"ship_$i"}) > abs($form->{"qty_$i"})) ? $form->{"qty_$i"} : $form->{"ship_$i"};
+    
+    if ($warehouse_id && $form->{type} eq 'ship_order') {
+
+      $wth->execute($form->{"id_$i"}, $warehouse_id) || $form->dberror;
+
+      ($qty) = $wth->fetchrow_array;
+      $wth->finish;
+
+      if ($ship > $qty) {
+	$ship = $qty;
+      }
+    }
+
+    
+    if ($ship != 0) {
+
+      $ship *= $ml;
+      $query = qq|INSERT INTO inventory (parts_id, warehouse_id,
+                  qty, oe_id, orderitems_id, shippingdate, employee_id)
+                  VALUES ($form->{"id_$i"}, $warehouse_id,
+		  $ship, $form->{"id"},
+		  $form->{"orderitems_id_$i"}, '$form->{shippingdate}',
+		  $employee_id)|;
+      $dbh->do($query) || $form->dberror($query);
+     
+      # add serialnumber, ship to orderitems
+      $sth->execute($form->{id}, $form->{"orderitems_id_$i"}) || $form->dberror;
+      ($serialnumber, $ship) = $sth->fetchrow_array;
+      $sth->finish;
+
+      $serialnumber .= " " if $serialnumber;
+      $serialnumber .= qq|$form->{"serialnumber_$i"}|;
+      $ship += $form->{"ship_$i"};
+
+      $query = qq|UPDATE orderitems SET
+                  serialnumber = '$serialnumber',
+		  ship = $ship,
+		  reqdate = '$form->{shippingdate}'
+		  WHERE trans_id = $form->{id}
+		  AND id = $form->{"orderitems_id_$i"}|;
+      $dbh->do($query) || $form->dberror($query);
+      
+      
+      # update order with ship via
+      $query = qq|UPDATE oe SET
+                  shippingpoint = '$form->{shippingpoint}',
+                  shipvia = '$form->{shipvia}'
+		  WHERE id = $form->{id}|;
+      $dbh->do($query) || $form->dberror($query);
+      
+		  
+      # update onhand for parts
+      $form->update_balance($dbh,
+                            "parts",
+                            "onhand",
+                            qq|id = $form->{"id_$i"}|,
+                            $form->{"ship_$i"} * $ml);
+
+    }
+  }
+
+  my $rc = $dbh->commit;
+  $dbh->disconnect;
+
+  $rc;
+
+}
+
+
+sub adj_onhand {
+  my ($dbh, $form, $ml) = @_;
+
+  my $query = qq|SELECT oi.parts_id, oi.ship, p.inventory_accno_id, p.assembly
+                 FROM orderitems oi
+		 JOIN parts p ON (p.id = oi.parts_id)
+                 WHERE oi.trans_id = $form->{id}|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  $query = qq|SELECT sum(p.inventory_accno_id)
+	      FROM parts p
+	      JOIN assembly a ON (a.parts_id = p.id)
+	      WHERE a.id = ?|;
+  my $ath = $dbh->prepare($query) || $form->dberror($query);
+
+  my $ispa;
+  my $ref;
+  
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+
+    if ($ref->{inventory_accno_id} || $ref->{assembly}) {
+
+      # do not update if assembly consists of all services
+      if ($ref->{assembly}) {
+	$ath->execute($ref->{parts_id}) || $form->dberror($query);
+
+        ($ispa) = $ath->fetchrow_array;
+	$ath->finish;
+
+	next unless $ispa;
+	
+      }
+
+      # adjust onhand in parts table
+      $form->update_balance($dbh,
+			    "parts",
+			    "onhand",
+			    qq|id = $ref->{parts_id}|,
+			    $ref->{ship} * $ml);
+    }
+  }
   
   $sth->finish;
 
-  $_;
+}
+
+
+sub adj_inventory {
+  my ($dbh, $myconfig, $form) = @_;
+
+  my %oid = ( 'Pg'	=> 'oid',
+              'PgPP'	=> 'oid',
+              'Oracle'	=> 'rowid',
+	      'DB2'	=> '1=1'
+	    );
+  
+  # increase/reduce qty in inventory table
+  my $query = qq|SELECT oi.id, oi.parts_id, oi.ship
+                 FROM orderitems oi
+                 WHERE oi.trans_id = $form->{id}|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+  $query = qq|SELECT $oid{$myconfig->{dbdriver}} AS oid, qty,
+                     (SELECT SUM(qty) FROM inventory
+                      WHERE oe_id = $form->{id}
+		      AND orderitems_id = ?) AS total
+	      FROM inventory
+              WHERE oe_id = $form->{id}
+	      AND orderitems_id = ?|;
+  my $ith = $dbh->prepare($query) || $form->dberror($query);
+  
+  my $qty;
+  my $ml = ($form->{type} =~ /(ship|sales)_order/) ? -1 : 1;
+  
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+
+    $ith->execute($ref->{id}, $ref->{id}) || $form->dberror($query);
+
+    while (my $inv = $ith->fetchrow_hashref(NAME_lc)) {
+
+      if (($qty = (($inv->{total} * $ml) - $ref->{ship})) >= 0) {
+	$qty = $inv->{qty} if ($qty > ($inv->{qty} * $ml));
+	
+	$form->update_balance($dbh,
+                              "inventory",
+                              "qty",
+                              qq|$oid{$myconfig->{dbdriver}} = $inv->{oid}|,
+                              $qty * -1 * $ml);
+      }
+    }
+    $ith->finish;
+
+  }
+  $sth->finish;
+
+  # delete inventory entries if qty = 0
+  $query = qq|DELETE FROM inventory
+              WHERE oe_id = $form->{id}
+	      AND qty = 0|;
+  $dbh->do($query) || $form->dberror($query);
+
+}
+
+
+sub get_inventory {
+  my ($self, $myconfig, $form) = @_;
+  
+  my ($null, $warehouse_id) = split /--/, $form->{warehouse};
+  $warehouse_id *= 1;
+
+  my $dbh = $form->dbconnect($myconfig);
+  
+  my $query = qq|SELECT p.id, p.partnumber, p.description, p.onhand,
+                 pg.partsgroup
+                 FROM parts p
+		 LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+	         WHERE p.onhand > 0|;
+
+  if ($form->{partnumber}) {
+    $var = $form->like(lc $form->{partnumber});
+    $query .= "
+                 AND lower(p.partnumber) LIKE '$var'";
+  }
+  if ($form->{description}) {
+    $var = $form->like(lc $form->{description});
+    $query .= "
+                 AND lower(p.description) LIKE '$var'";
+  }
+  if ($form->{partsgroup}) {
+    $var = $form->like(lc $form->{partsgroup});
+    $query .= "
+                 AND lower(pg.partsgroup) LIKE '$var'";
+  }
+  
+  $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+  
+
+  $query = qq|SELECT sum(i.qty), w.description, w.id
+              FROM inventory i
+	      LEFT JOIN warehouse w ON (w.id = i.warehouse_id)
+	      WHERE i.parts_id = ?
+	      AND i.warehouse_id != $warehouse_id
+	      GROUP BY w.description, w.id|;
+  $wth = $dbh->prepare($query) || $form->dberror($query);
+
+  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    
+    $wth->execute($ref->{id}) || $form->dberror;
+    
+    while (($qty, $warehouse, $warehouse_id) = $wth->fetchrow_array) {
+      push @{ $form->{all_inventory} }, {'id' => $ref->{id},
+                                         'partnumber' => $ref->{partnumber},
+                                         'description' => $ref->{description},
+					 'partsgroup' => $ref->{partsgroup},
+					 'qty' => $qty,
+					 'warehouse_id' => $warehouse_id,
+                                         'warehouse' => $warehouse} if $qty > 0;
+    }
+    $wth->finish;
+  }
+  $sth->finish;
+
+  $dbh->disconnect;
+
+  # sort inventory
+  @{ $form->{all_inventory} } = sort { $a->{$form->{sort}} cmp $b->{$form->{sort}} } @{ $form->{all_inventory} };
+
+}
+
+
+sub transfer {
+  my ($self, $myconfig, $form) = @_;
+  
+  my $dbh = $form->dbconnect_noauto($myconfig);
+  
+  my $query = qq|INSERT INTO inventory
+                 (warehouse_id, parts_id, qty, shippingdate, employee_id)
+		 VALUES (?, ?, ?, ?, ?)|;
+  $sth = $dbh->prepare($query) || $form->dberror($query);
+
+  ($form->{employee}, $form->{employee_id}) = $form->get_employee($dbh);
+
+  my @a = localtime; $a[5] += 1900; $a[4]++;
+  $shippingdate = "$a[5]-$a[4]-$a[3]";
+
+  for my $i (1 .. $form->{rowcount}) {
+    $qty = $form->parse_amount($myconfig, $form->{"transfer_$i"});
+
+    $qty = $form->{"qty_$i"} if ($qty > $form->{"qty_$i"});
+    
+    if ($qty) {
+      # to warehouse
+      $sth->execute($form->{warehouse_id}, $form->{"id_$i"}, $qty, $shippingdate, $form->{employee_id}) || $form->dberror;
+
+      $sth->finish;
+      
+      # from warehouse
+      $sth->execute($form->{"warehouse_id_$i"}, $form->{"id_$i"}, $qty * -1, $shippingdate, $form->{employee_id}) || $form->dberror;
+
+      $sth->finish;
+    }
+  }
+
+  my $rc = $dbh->commit;
+  $dbh->disconnect;
+
+  $rc;
 
 }