X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=c2bfd97d4f8c1ab12052dd1d2fd36b1700e086fa;hb=a751b16cead5e56b62e18ee616e04323919f5fe1;hp=f210457284dd8968db733bbc791aea3e5d22cf2a;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f21045728..c2bfd97d4 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -37,6 +37,7 @@ use Data::Dumper;
require "$form->{path}/io.pl";
require "$form->{path}/arap.pl";
+require "bin/mozilla/drafts.pl";
1;
@@ -44,7 +45,9 @@ require "$form->{path}/arap.pl";
sub add {
$lxdebug->enter_sub();
-
+
+ return $lxdebug->leave_sub() if (load_draft_maybe());
+
if ($form->{type} eq "credit_note") {
$form->{title} = $locale->text('Add Credit Note');
@@ -621,7 +624,7 @@ sub form_header {
{storno}>
{storno_id}>
-
+| . ($form->{saved_message} ? qq|
$form->{saved_message}
| : "") . qq|
@@ -853,7 +856,8 @@ sub form_footer {
$tax .= qq|
- $form->{"${item}_description"} |
+ $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
|;
@@ -892,7 +896,8 @@ sub form_footer {
$tax .= qq|
- Enthaltene $form->{"${item}_description"} |
+ Enthaltene $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
@@ -1097,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|
@@ -1105,9 +1112,9 @@ if ($form->{type} eq "credit_note") {
|;
+ . $locale->text('E-mail') . qq|"> |;
print qq|| unless ($form->{storno});
+ . $locale->text('Storno') . qq|"> | if ($show_storno);
print qq|
|;
@@ -1148,18 +1155,20 @@ if ($form->{type} eq "credit_note") {
|;
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
}
# button for saving history
if($form->{id} ne "") {
print qq|
- {id}
- . qq|); name=history id=history value=|
- . $locale->text('history')
- . qq|>|;
+ |;
}
# /button for saving history
@@ -1170,7 +1179,10 @@ if ($form->{type} eq "credit_note") {
{rowcount}>
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
{path}>
{login}>
{password}>
@@ -1431,44 +1443,28 @@ 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!'));
- }
- # 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)){
- # 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();
}
@@ -1505,6 +1501,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} = "";
@@ -1635,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();
+}