CsvImport: Report-Begrenzung: "Alles" anzeigen als Voreinstellung.

[mfinanz.git] / SL / IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index a2a0a86a8b7b77fad4edcc8865c1725778ba9234..0983e2a8a7adc1d044404781e9328072144af6cf 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -526,6 +526,22 @@ sub all_parts {
     push @bind_vars, @cvar_values;
   }
 
     push @bind_vars, @cvar_values;
   }
 

+  # simple search for assemblies by items used in assemblies
+  if ($form->{bom} eq '2' && $form->{l_assembly}) {
+    # nuke where clause and bind vars
+    $where_clause = ' 1=1 AND p.id in (SELECT id from assembly where parts_id IN ' .
+                    ' (select id from parts where 1=1 AND ';
+    @bind_vars    = ();
+    # use only like filter for items used in assemblies
+    foreach (@like_filters) {
+      next unless $form->{$_};
+      $form->{"l_$_"} = '1'; # show the column
+      $where_clause .= " $_ ILIKE ? ";
+      push @bind_vars,    like($form->{$_});
+    }
+    $where_clause .='))';
+  }
+

   my $query = <<"  SQL";
     SELECT DISTINCT $select_clause
     FROM parts p
   my $query = <<"  SQL";
     SELECT DISTINCT $select_clause
     FROM parts p


@@ -790,7 +806,8 @@ sub retrieve_accounts {
 SQL
 
   my $query_tax = <<SQL;
 SQL
 
   my $query_tax = <<SQL;

-    SELECT c.accno, t.taxdescription AS description, t.rate, t.taxnumber
+    SELECT c.accno, t.taxdescription AS description, t.rate,
+           c.accno as taxnumber

     FROM tax t
     LEFT JOIN chart c ON c.id = t.chart_id
     WHERE t.id IN
     FROM tax t
     LEFT JOIN chart c ON c.id = t.chart_id
     WHERE t.id IN


@@ -905,6 +922,25 @@ sub prepare_parts_for_printing {
 
   $sth->finish();
 
 
   $sth->finish();
 

+  $query           = qq|SELECT
+                        cp.parts_id,
+                        cp.customer_partnumber AS customer_model,
+                        c.name                 AS customer_make
+                        FROM part_customer_prices cp
+                        LEFT JOIN customer c ON (cp.customer_id = c.id)
+                        WHERE cp.parts_id IN ($placeholders)|;
+
+  my %customermodel = ();
+
+  $sth              = prepare_execute_query($form, $dbh, $query, @part_ids);
+
+  while (my $ref = $sth->fetchrow_hashref()) {
+    $customermodel{$ref->{parts_id}} ||= [];
+    push @{ $customermodel{$ref->{parts_id}} }, $ref;
+  }
+
+  $sth->finish();
+

   my @columns = qw(ean image microfiche drawing);
 
   $query      = qq|SELECT id, | . join(', ', @columns) . qq|
   my @columns = qw(ean image microfiche drawing);
 
   $query      = qq|SELECT id, | . join(', ', @columns) . qq|


@@ -914,7 +950,7 @@ sub prepare_parts_for_printing {
   my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
 
   my %template_arrays;
   my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
 
   my %template_arrays;

-  map { $template_arrays{$_} = [] } (qw(make model), @columns);
+  map { $template_arrays{$_} = [] } (qw(make model customer_make customer_model), @columns);

 
   foreach my $i (1 .. $rowcount) {
     my $id = $form->{"${prefix}${i}"};
 
   foreach my $i (1 .. $rowcount) {
     my $id = $form->{"${prefix}${i}"};


@@ -928,11 +964,21 @@ sub prepare_parts_for_printing {
     push @{ $template_arrays{make} },  [];
     push @{ $template_arrays{model} }, [];
 
     push @{ $template_arrays{make} },  [];
     push @{ $template_arrays{model} }, [];
 

-    next if (!$makemodel{$id});
+    if ($makemodel{$id}) {
+      foreach my $ref (@{ $makemodel{$id} }) {
+        map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);
+      }
+    }
+
+    push @{ $template_arrays{customer_make} },  [];
+    push @{ $template_arrays{customer_model} }, [];

 
 

-    foreach my $ref (@{ $makemodel{$id} }) {
-      map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);
+    if ($customermodel{$id}) {
+      foreach my $ref (@{ $customermodel{$id} }) {
+        push @{ $template_arrays{$_}->[-1] }, $ref->{$_} for qw(customer_make customer_model);
+      }

     }
     }

+

   }
 
   my $parts = SL::DB::Manager::Part->get_all(query => [ id => \@part_ids ]);
   }
 
   my $parts = SL::DB::Manager::Part->get_all(query => [ id => \@part_ids ]);