X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FIC.pm;h=c710af9fc6651df2198fab18d4e5afaf30fc0f9a;hb=bb55aa5910a0faa71d6cfc0a215a352dcc115f76;hp=d654d008b0f2ebd05bbc1322ea80fa194e1505e0;hpb=66b4e9c9cc79d6efa331d08d7c4cf95c0e3245d7;p=kivitendo-erp.git

diff --git a/SL/IC.pm b/SL/IC.pm
index d654d008b..c710af9fc 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -412,6 +412,7 @@ sub save {
          ve = ?,
          gv = ?,
          ean = ?,
+         has_sernumber = ?,
          not_discountable = ?,
          microfiche = ?,
          partsgroup_id = ?,
@@ -441,6 +442,7 @@ sub save {
              conv_i($form->{ve}),
              conv_i($form->{gv}),
              $form->{ean},
+             $form->{has_sernumber} ? 't' : 'f',
              $form->{not_discountable} ? 't' : 'f',
              $form->{microfiche},
              conv_i($partsgroup_id),
@@ -820,6 +822,8 @@ sub all_parts {
      description  => 'p.',
      qty          => 'ioi.',
      serialnumber => 'ioi.',
+     quotation    => 'apoe.',
+     cv           => 'cv.',
   );
 
   # if the join condition in these blocks are met, the column
@@ -829,8 +833,8 @@ sub all_parts {
     #  column name,   prefix,  joins_needed
     [ 'description',  'ioi.',  'invoice_oi'  ],
     [ 'deliverydate', 'ioi.',  'invoice_oi'  ],
-    [ 'transdate' ,   'apoe.', 'apoe'  ],
-    [ 'unit' ,        'ioi.',  'invoice_oi'  ],
+    [ 'transdate',    'apoe.', 'apoe'        ],
+    [ 'unit',         'ioi.',  'invoice_oi'  ],
   );
 
   # careful with renames. these are HARD, and any filters done on the original column will break
@@ -846,22 +850,19 @@ sub all_parts {
   my $make_token_builder = sub {
     my $joins_needed = shift;
     sub {
-      my ($col, $group) = @_;
-      $renamed_columns{$col} ||= $col;
-
+      my ($col, $alias) = @_;
       my @coalesce_tokens =
-        map { ($_->[1] || 'p.') . $_->[0] }
+        map  { ($_->[1] || 'p.') . $_->[0] }
         grep { !$_->[2] || $joins_needed->{$_->[2]} }
-        grep { $_->[0] eq $col }
-        @column_override,
-        [ $col, $table_prefix{$col} ];
+        grep {  $_->[0] eq $col }
+        @column_override, [ $col, $table_prefix{$col} ];
 
-      my $coalesce   = scalar @coalesce_tokens > 1;
+      my $coalesce = scalar @coalesce_tokens > 1;
       return ($coalesce
         ? sprintf 'COALESCE(%s)', join ', ', @coalesce_tokens
         : shift                              @coalesce_tokens)
-        . ($group && $coalesce
-        ?  " AS $renamed_columns{$col}"
+        . ($alias && ($coalesce || $renamed_columns{$col})
+        ?  " AS " . ($renamed_columns{$col} || $col)
         : '');
     }
   };
@@ -936,7 +937,7 @@ sub all_parts {
   my $bsooqr        = any { $form->{$_} } @oe_flags;
   my @bsooqr_tokens = ();
 
-  push @select_tokens, @qsooqr_flags                                          if $bsooqr;
+  push @select_tokens, @qsooqr_flags, 'quotation', 'cv'                       if $bsooqr;
   push @select_tokens, @deliverydate_flags                                    if $bsooqr && $form->{l_deliverydate};
   push @select_tokens, $q_assembly_lastcost                                   if ($form->{searchitems} eq 'assembly') && $form->{l_lastcost};
   push @bsooqr_tokens, q|module = 'ir' AND NOT ioi.assemblyitem|              if $form->{bought};
@@ -947,9 +948,6 @@ sub all_parts {
   push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'vendor'|   if $form->{rfq};
   push @where_tokens, join ' OR ', map { "($_)" } @bsooqr_tokens              if $bsooqr;
 
-  $renamed_columns{onhand} = 'onhand_before_bsooqr';
-  $renamed_columns{qty}    = 'onhand';
-
   $joins_needed{partsgroup}  = 1;
   $joins_needed{pfac}        = 1;
   $joins_needed{makemodel}   = 1 if grep { $form->{$_} || $form->{"l_$_"} } @makemodel_filters;
@@ -957,6 +955,12 @@ sub all_parts {
   $joins_needed{apoe}        = 1 if $joins_needed{cv}   || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters;
   $joins_needed{invoice_oi}  = 1 if $joins_needed{apoe} || grep { $form->{$_} || $form->{"l_$_"} } @invoice_oi_filters;
 
+  # in bsoorq, use qtys instead of onhand
+  if ($joins_needed{invoice_oi}) {
+    $renamed_columns{onhand} = 'onhand_before_bsooqr';
+    $renamed_columns{qty}    = 'onhand';
+  }
+
   # special case for description search.
   # up in the simple filter section the description filter got interpreted as something like: WHERE description ILIKE '%$form->{description}%'
   # now we'd like to search also for the masked description entered in orderitems and invoice, so...
@@ -1559,7 +1563,7 @@ sub get_basic_part_info {
 
   my $dbh      = $form->get_standard_dbh($myconfig);
 
-  my $query    = qq|SELECT id, partnumber, description, unit FROM parts WHERE id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)|;
+  my $query    = qq|SELECT * FROM parts WHERE id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)|;
 
   my $info     = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);