Part Controller - id -> part.id

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 60b3c9af8777ddfa5c6262ec2ec8ab36407fc0d3..b2a707b4f8e754352fcd9289d4a741031856111e 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1535,18 +1535,18 @@ sub save_exchangerate {
 
   my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
 
 
   my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
 

-  my $dbh = $self->dbconnect($myconfig);
-
-  my ($buy, $sell);
-
-  $buy  = $rate if $fld eq 'buy';
-  $sell = $rate if $fld eq 'sell';
+  SL::DB->client->with_transaction(sub {
+    my $dbh = SL::DB->client->dbh;

 
 

+    my ($buy, $sell);

 
 

-  $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
+    $buy  = $rate if $fld eq 'buy';
+    $sell = $rate if $fld eq 'sell';

 
 
 
 

-  $dbh->disconnect;
+    $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
+    1;
+  }) or do { die SL::DB->client->error };

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -3180,16 +3180,13 @@ sub get_partsgroup {
   my @values;
 
   if ($p->{searchitems} eq 'part') {
   my @values;
 
   if ($p->{searchitems} eq 'part') {

-    $query .= qq|WHERE p.inventory_accno_id > 0|;
+    $query .= qq|WHERE p.part_type = 'part'|;

   }
   if ($p->{searchitems} eq 'service') {
   }
   if ($p->{searchitems} eq 'service') {

-    $query .= qq|WHERE p.inventory_accno_id IS NULL|;
+    $query .= qq|WHERE p.part_type = 'service'|;

   }
   if ($p->{searchitems} eq 'assembly') {
   }
   if ($p->{searchitems} eq 'assembly') {

-    $query .= qq|WHERE p.assembly = '1'|;
-  }
-  if ($p->{searchitems} eq 'labor') {
-    $query .= qq|WHERE (p.inventory_accno_id > 0) AND (p.income_accno_id IS NULL)|;
+    $query .= qq|WHERE p.part_type = 'assembly'|;

   }
 
   $query .= qq|ORDER BY partsgroup|;
   }
 
   $query .= qq|ORDER BY partsgroup|;