X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fir.pl;h=440ee6e4064035e56fc3e861e193bd141c86a143;hb=b29783a3f0cff568b5d344d4fd34fe65840bea46;hp=59dfe659fc8df0296f8d131c2a159713214d789f;hpb=f83ca50608bd8cb2af24bef702c4d0fd9fea9324;p=kivitendo-erp.git

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 59dfe659f..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|<script type="text/javascript" src="js/show_form_details.js"></script>|;
@@ -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|<input class=submit type=submit name=action value="|
       . $locale->text('Post Payment') . 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|</form>
-
 </body>
 </html>
 |;
@@ -941,6 +940,9 @@ sub update {
         # override sellprice if there is one entered
         $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
+	# ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb
+        $form->{"discount_$i"} = $form->format_amount(\%myconfig, 
+						      $form->{vendor_discount} * 100 );
         map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
         map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
 
@@ -1135,7 +1137,7 @@ sub post {
 
   ($form->{AP})      = split /--/, $form->{AP};
   ($form->{AP_paid}) = split /--/, $form->{AP_paid};
-  $form->{storno}    = 0;
+  $form->{storno}  ||= 0;
 
   $form->{id} = 0 if $form->{postasnew};