X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fis.pl;h=86328055584a07927d1a63c133413e7a38b4c8f7;hb=98662ad2b031a81c88ce6da0babf6f9d0b37059a;hp=b05c8fddd5343343f87cb62a43e16e14c339c3a3;hpb=bde667c235b2347bdd1322f118b032a2f0d93367;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b05c8fddd..863280555 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -856,8 +856,8 @@ sub form_footer {
$tax .= qq|
- $form->{"${item}_description"} |
- . $form->{"${item}_rate"} * 100 .qq|% |
+ $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
|;
@@ -897,7 +897,7 @@ sub form_footer {
$tax .= qq|
Enthaltene $form->{"${item}_description"} |
- . $form->{"${item}_rate"} * 100 .qq|% |
+ . $form->{"${item}_rate"} * 100 .qq|%
$form->{"${item}_total"} |
@@ -1102,6 +1102,8 @@ 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");
+
print qq|
@@ -1112,7 +1114,7 @@ if ($form->{type} eq "credit_note") {
|;
print qq| | unless ($form->{storno});
+ . $locale->text('Storno') . qq|"> | if ($show_storno);
print qq|
|;
@@ -1441,19 +1443,20 @@ sub post {
$form->{id} = 0 if $form->{postasnew};
# get new invnumber in sequence if no invnumber is given or if posasnew was requested
- if (!$form->{invnumber} || $form->{postasnew}) {
+ if ($form->{postasnew}) {
if ($form->{type} eq "credit_note") {
- $form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber");
+ undef($form->{cnnumber});
} else {
- $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+ undef($form->{invnumber});
}
}
+
relink_accounts();
if ($print_post) {
if (!(IS->post_invoice(\%myconfig, \%$form))) {
$form->error($locale->text('Cannot post invoice!'));
}
- remove_draft();
+ remove_draft() if $form->{remove_draft};
# saving the history
if(!exists $form->{addition}) {
$form->{addition} = "PRINTED AND POSTED";
@@ -1463,7 +1466,7 @@ sub post {
} else {
if (IS->post_invoice(\%myconfig, \%$form)){
- remove_draft();
+ remove_draft() if $form->{remove_draft};
# saving the history
if(!exists $form->{addition}) {
if($form->{storno}) {
@@ -1517,6 +1520,18 @@ sub storno {
$form->error($locale->text('Cannot storno storno invoice!'));
}
+ if (IS->has_storno(\%myconfig, $form, "ar")) {
+ $form->error($locale->text("Invoice has already been storno'd!"));
+ }
+
+ map({ my $key = $_; delete($form->{$key})
+ unless (grep({ $key eq $_ } qw(path login password id type))); }
+ keys(%{ $form }));
+
+ &invoice_links;
+ &prepare_invoice;
+ relink_accounts();
+
$form->{storno_id} = $form->{id};
$form->{storno} = 1;
$form->{id} = "";