X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fir.pl;h=440ee6e4064035e56fc3e861e193bd141c86a143;hb=ab875da135e7c44abb05eae5a136f6df4e09078c;hp=6c9c8a87eb67e70ee1470326b3dc6fdbada67df1;hpb=dd88b40826189b57d3b816320d645f1517b020d2;p=kivitendo-erp.git
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 6c9c8a87e..440ee6e40 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -411,7 +411,7 @@ sub form_header {
"duedate", "BL", "trigger2");
my $follow_up_vc = $form->{vendor};
- $follow_up_vc =~ s/--.*?//;
+ $follow_up_vc =~ s/--\d*\s*$//;
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$form->{javascript} .= qq||;
@@ -826,7 +826,7 @@ sub form_footer {
|;
if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap");
+ my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && (($totalpaid == 0) || ($totalpaid eq ""));
print qq|
@@ -857,7 +857,7 @@ sub form_footer {
}
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers);
- $form->hide_form(qw(rowcount callback draft_id draft_description));
+ $form->hide_form(qw(rowcount callback draft_id draft_description vendor_discount));
# button for saving history
if($form->{id} ne "") {
@@ -876,7 +876,6 @@ sub form_footer {
}
# /mark_as_paid button
print qq|
-