IC::all_parts: cv und quotation müssen für externe Prüfung mit nach aussen gebracht...

Fix für Bug 1147.

diff --git a/SL/IC.pm b/SL/IC.pm
index eaa932c..e3879a4 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -820,6 +820,8 @@ sub all_parts {
      description  => 'p.',
      qty          => 'ioi.',
      serialnumber => 'ioi.',
      description  => 'p.',
      qty          => 'ioi.',
      serialnumber => 'ioi.',

+     quotation    => 'apoe.',
+     cv           => 'cv.',

   );
 
   # if the join condition in these blocks are met, the column
   );
 
   # if the join condition in these blocks are met, the column


@@ -933,7 +935,7 @@ sub all_parts {
   my $bsooqr        = any { $form->{$_} } @oe_flags;
   my @bsooqr_tokens = ();
 
   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};
   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};

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 1cd8ce5..faaa702 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1294,7 +1294,7 @@ sub generate_report {
 
     # set module stuff
     if ($ref->{module} eq 'oe') {
 
     # set module stuff
     if ($ref->{module} eq 'oe') {

-      my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback');
+      my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback');

       $row->{ordnumber}{link} = $edit_oe_link;
       $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
 
       $row->{ordnumber}{link} = $edit_oe_link;
       $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});