X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=9bc225e884bb596231ed4b64ad7441710820be02;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=f39ff1368d6150f486b3272dc81220654fd88266;hpb=b2f45e7ebfee8fd1cf79632baccad61d6814fd8c;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f39ff1368..9bc225e88 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -529,7 +529,7 @@ sub form_header {
if ($form->{type} eq "credit_note") {
$button1 = qq|
- | |;
#write Trigger
@@ -540,17 +540,17 @@ sub form_header {
} else {
$button1 = qq|
- |
|;
$button2 = qq|
- |
|;
$button3 = qq|
- |
|;
@@ -565,7 +565,7 @@ sub form_header {
$credittext = $locale->text('Credit Limit exceeded!!!');
my $follow_up_vc = $form->{customer};
- $follow_up_vc =~ s/--.*?//;
+ $follow_up_vc =~ s/--\d*\s*$//;
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
$onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
@@ -911,7 +911,7 @@ sub form_footer {
$notes |
$intnotes |
- |
$follow_ups_block
@@ -1113,7 +1113,7 @@ if ($form->{type} eq "credit_note") {
$closedto = $form->datetonum($form->{closedto}, \%myconfig);
if ($form->{id}) {
- my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+ my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
print qq|
hidden("-name" => "callback", "-value" => $form->{callback})
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
. qq|
@@ -1267,7 +1268,7 @@ sub update {
$rows = scalar @{ $form->{item_list} };
- $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
+ $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
if ($rows) {
$form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;