X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9257ca9ac3305509e73b05db383a9539282dd878..c8c6d6d:/bin/mozilla/common.pl

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 3bc458a8d..defa5f1b0 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -76,6 +76,11 @@ sub select_part {
     $has_charge = 1;
     map { $_->{has_charge} = 1; } @parts;
   }
+  my $has_bestbefore = 0;
+  if (defined($parts[0]->{bestbefore})) {
+    $has_bestbefore = 1;
+    map { $_->{has_bestbefore} = 1; } @parts;
+  }
   my $has_ean = 0;
   if (defined($parts[0]->{ean})) {
     $has_ean = 1;
@@ -92,7 +97,8 @@ sub select_part {
                                      "nextsub"          => "select_part_internal",
                                      "callback_sub"     => $callback_sub,
                                      "has_charge"       => $has_charge,
-                                     "has_ean"       	=> $has_ean,
+                                     "has_bestbefore"   => $has_bestbefore,
+                                     "has_ean"          => $has_ean,
                                      "remap_parts_id"   => $remap_parts_id,
                                      "remap_partnumber" => $remap_partnumber });
 
@@ -477,27 +483,27 @@ sub reformat_numbers {
 # -------------------------------------------------------------------------
 
 sub show_history {
-	$main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-	my $dbh = $form->dbconnect(\%myconfig);
-	my ($sort, $sortby) = split(/\-\-/, $form->{order});
+  my $dbh = $form->dbconnect(\%myconfig);
+  my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)/$1/;
 
-	$form->{title} = $locale->text("History");
-    $form->header();
-    print $form->parse_html_template( "common/show_history", {
-    	"DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
-    	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
-      uc($sort) => 1,
-      uc($sort)."BY" => $sortby
-    	} );
-
-	$dbh->disconnect();
-	$main::lxdebug->leave_sub();
+  $form->{title} = $locale->text("History");
+  $form->header();
+  print $form->parse_html_template( "common/show_history", {
+    "DATEN"        => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+    "SUCCESS"      => ($form->get_history($dbh,$form->{input_name}) ne "0"),
+    uc($sort)      => 1,
+    uc($sort)."BY" => $sortby
+  } );
+
+  $dbh->disconnect();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
@@ -531,7 +537,7 @@ sub call_sub {
 # -------------------------------------------------------------------------
 
 sub show_vc_details {
-	$main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
@@ -550,7 +556,7 @@ sub show_vc_details {
   $form->header();
   print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" });
 
-	$main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
@@ -586,7 +592,7 @@ sub mark_as_paid_common {
 
   if($form->{mark_as_paid}) {
     my $dbh ||= $form->get_standard_dbh($myconfig);
-    my $query = qq|UPDATE $db_name SET paid = amount WHERE id = ?|;
+    my $query = qq|UPDATE $db_name SET paid = amount, datepaid = current_date WHERE id = ?|;
     do_query($form, $dbh, $query, $form->{id});
     $dbh->commit();
     $form->redirect($locale->text("Marked as paid"));