X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9b6da27c60bf5c538ee6ffdbf6ca0f4ccdf40ee0;hb=9fd46de37d7906b7c104c17112b34bae7d534d67;hp=f4556cf2cfbfc29baa774c3fb8ea4bf605317ffe;hpb=cfc6a60d53597f6a879b28af37f84b4b5fa4cc6b;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index f4556cf2c..9b6da27c6 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');
@@ -77,7 +80,10 @@ sub add {
sub edit {
$lxdebug->enter_sub();
-
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
+
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
{
$form->error("Access Denied");
@@ -574,7 +580,9 @@ sub form_header {
$form->write_trigger(\%myconfig, 2,
"orddate", "BL", "trigger_orddate",
"quodate", "BL", "trigger_quodate");
-
+ # show history button js
+ $form->{javascript} .= qq||;
+ #/show history button js
$form->header;
print qq|
@@ -616,7 +624,7 @@ sub form_header {
{storno}>
{storno_id}>
-
+| . ($form->{saved_message} ? qq|
$form->{saved_message}
| : "") . qq|
@@ -848,7 +856,8 @@ sub form_footer {
$tax .= qq|
- $form->{"${item}_description"} |
+ $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
|;
@@ -887,7 +896,8 @@ sub form_footer {
$tax .= qq|
- Enthaltene $form->{"${item}_description"} |
+ Enthaltene $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
@@ -1100,9 +1110,9 @@ if ($form->{type} eq "credit_note") {
|;
+ . $locale->text('E-mail') . qq|"> |;
print qq|| unless ($form->{storno});
+ . $locale->text('Storno') . qq|"> | unless ($form->{storno});
print qq|
|;
@@ -1143,17 +1153,34 @@ 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|
+ |;
+ }
+ # /button for saving history
+
+
print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
qq|
{rowcount}>
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
{path}>
{login}>
{password}>
@@ -1331,6 +1358,7 @@ sub update {
}
$lxdebug->leave_sub();
}
+
sub post_payment {
$lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
@@ -1425,10 +1453,32 @@ sub 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 {
- $form->redirect(
- $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
- if (IS->post_invoice(\%myconfig, \%$form));
+ 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!'));
}
@@ -1584,9 +1634,15 @@ sub credit_note {
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Invoice deleted!'))
- if (IS->delete_invoice(\%myconfig, \%$form, $spool));
+ if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ $form->redirect($locale->text('Invoice deleted!'));
+ }
$form->error($locale->text('Cannot delete invoice!'));
$lxdebug->leave_sub();