X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=17dac992e529617cb37beeb279f52212b372cb4c;hb=6156d51ea0360382df95007e10a874f24f4dd81a;hp=3bc458a8d642dec18af65e2427685d1a9fd9fbb5;hpb=9257ca9ac3305509e73b05db383a9539282dd878;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index 3bc458a8d..17dac992e 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -92,7 +92,7 @@ sub select_part { "nextsub" => "select_part_internal", "callback_sub" => $callback_sub, "has_charge" => $has_charge, - "has_ean" => $has_ean, + "has_ean" => $has_ean, "remap_parts_id" => $remap_parts_id, "remap_partnumber" => $remap_partnumber }); @@ -477,27 +477,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 +531,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 +550,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 +586,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"));