X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=c2bfd97d4f8c1ab12052dd1d2fd36b1700e086fa;hb=a751b16cead5e56b62e18ee616e04323919f5fe1;hp=9c11c3400b653f42f6f18e364f48a8b266e4af6f;hpb=213317d3ebd9073e68ac4d0cc789b94c377f575e;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 9c11c3400..c2bfd97d4 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -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|
|;
@@ -1450,38 +1452,19 @@ sub post {
}
relink_accounts();
- if ($print_post) {
- if (!(IS->post_invoice(\%myconfig, \%$form))) {
- $form->error($locale->text('Cannot post invoice!'));
- }
- remove_draft() if $form->{remove_draft};
- # saving the history
- if(!exists $form->{addition}) {
- $form->{addition} = "PRINTED AND POSTED";
- $form->save_history($form->dbconnect(\%myconfig));
- }
- # /saving the history
-
- } else {
- if (IS->post_invoice(\%myconfig, \%$form)){
- remove_draft() if $form->{remove_draft};
- # saving the history
- if(!exists $form->{addition}) {
- if($form->{storno}) {
- $form->{addition} = "STORNO";
- }
- else {
- $form->{addition} = "POSTED";
- }
- $form->save_history($form->dbconnect(\%myconfig));
- }
- # /saving the history
-
- $form->redirect(
- $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
- }
- $form->error($locale->text('Cannot post invoice!'));
+ $form->error($locale->text('Cannot post invoice!'))
+ unless IS->post_invoice(\%myconfig, \%$form);
+ remove_draft() if $form->{remove_draft};
+
+ if(!exists $form->{addition}) {
+ $form->{addition} = $print_post ? "PRINTED AND POSTED" :
+ $form->{storno} ? "STORNO" :
+ "POSTED";
+ $form->save_history($form->dbconnect(\%myconfig));
}
+
+ $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
+ unless $print_post;
$lxdebug->leave_sub();
}
@@ -1518,10 +1501,18 @@ sub storno {
$form->error($locale->text('Cannot storno storno invoice!'));
}
- if (IC->has_storno(\%myconfig, $form)) {
+ 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} = "";
@@ -1652,3 +1643,18 @@ sub yes {
$lxdebug->leave_sub();
}
+
+sub e_mail {
+ $lxdebug->enter_sub();
+
+ $form->{postasnew} = 1;
+ $print_post = 1;
+
+ map { delete $form->{$_} } qw(printed emailed queued);
+
+ &post;
+
+ &edit_e_mail;
+
+ $lxdebug->leave_sub();
+}