Belege: Filtern nach Ansprechpartner

[mfinanz.git] / bin / mozilla / oe.pl

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 1d3213884d8f6c79a4d4a85e629969e6d2248399..59b5c6206fa301423290671066c61110d829baec 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -564,7 +564,8 @@ sub form_footer {
 
   $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
-  my $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number;
+  my $tpca_reminder;
+  $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id;
   print $form->parse_html_template("oe/form_footer", {
      %TMPL_VAR,
      webdav          => $::instance_conf->get_webdav,
@@ -948,6 +949,7 @@ sub orders {
 
   push @options, $locale->text('Customer')                . " : $form->{customer}"                        if $form->{customer};
   push @options, $locale->text('Vendor')                  . " : $form->{vendor}"                          if $form->{vendor};
+  push @options, $locale->text('Contact Person')          . " : $form->{cp_name}"                         if $form->{cp_name};
   push @options, $locale->text('Department')              . " : $department"                              if $form->{department};
   push @options, $locale->text('Order Number')            . " : $form->{ordnumber}"                       if $form->{ordnumber};
   push @options, $locale->text('Customer Order Number')   . " : $form->{cusordnumber}"                    if $form->{cusordnumber};
@@ -2088,12 +2090,13 @@ sub check_transport_cost_reminder_article_number {
 
   check_oe_access();
 
-  my $transport_article = $::instance_conf->get_transport_cost_reminder_article_number;
+  my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id;
   for my $i (1 .. $form->{rowcount}) {
-    return undef if $form->{"partnumber_${i}"} eq $transport_article;
+    return if $form->{"id_${i}"} eq $transport_article_id;
   }
 
-  return $transport_article;
+  # simply return the name of the part
+  return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber;
 
   $main::lxdebug->leave_sub();
 }