projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rechnungs- und Gutschriftsnummern werden nun direkt innerhalb der Backend-Routinen...
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
b1258f8
..
33a049f
100644
(file)
--- 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 "$form->{path}/io.pl";
require "$form->{path}/arap.pl";
+require "bin/mozilla/drafts.pl";
1;
1;
@@
-44,7
+45,9
@@
require "$form->{path}/arap.pl";
sub add {
$lxdebug->enter_sub();
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');
if ($form->{type} eq "credit_note") {
$form->{title} = $locale->text('Add Credit Note');
@@
-621,7
+624,7
@@
sub form_header {
<input type=hidden name=storno value=$form->{storno}>
<input type=hidden name=storno_id value=$form->{storno_id}>
<input type=hidden name=storno value=$form->{storno}>
<input type=hidden name=storno_id value=$form->{storno_id}>
-
+| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
<table width=100%>
<tr class=listtop>
<table width=100%>
<tr class=listtop>
@@
-853,8
+856,8
@@
sub form_footer {
$tax .= qq|
<tr>
$tax .= qq|
<tr>
- <th align=right>$form->{"${item}_description"} |
- . $form->{"${item}_rate"} * 100 .qq|%</th>
+
<th align=right>$form->{"${item}_description"} |
+
. $form->{"${item}_rate"} * 100 .qq|%</th>
<td align=right>$form->{"${item}_total"}</td>
</tr>
|;
<td align=right>$form->{"${item}_total"}</td>
</tr>
|;
@@
-894,7
+897,7
@@
sub form_footer {
$tax .= qq|
<tr>
<th align=right>Enthaltene $form->{"${item}_description"} |
$tax .= qq|
<tr>
<th align=right>Enthaltene $form->{"${item}_description"} |
- . $form->{"${item}_rate"} * 100 .qq|%</th>
+
. $form->{"${item}_rate"} * 100 .qq|%</th>
<td align=right>$form->{"${item}_total"}</td>
</tr>
<tr>
<td align=right>$form->{"${item}_total"}</td>
</tr>
<tr>
@@
-1150,7
+1153,9
@@
if ($form->{type} eq "credit_note") {
<input class=submit type=submit name=action value="|
. $locale->text('Print and Post') . qq|">
<input class=submit type=submit name=action value="|
<input class=submit type=submit name=action value="|
. $locale->text('Print and Post') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('Post') . qq|">|;
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
}
}
}
@@
-1172,7
+1177,10
@@
if ($form->{type} eq "credit_note") {
<input type=hidden name=rowcount value=$form->{rowcount}>
<input name=callback type=hidden value="$form->{callback}">
<input type=hidden name=rowcount value=$form->{rowcount}>
<input name=callback type=hidden value="$form->{callback}">
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-1433,18
+1441,20
@@
sub post {
$form->{id} = 0 if $form->{postasnew};
# get new invnumber in sequence if no invnumber is given or if posasnew was requested
$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") {
if ($form->{type} eq "credit_note") {
-
$form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber"
);
+
undef($form->{cnnumber}
);
} else {
} 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!'));
}
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";
# saving the history
if(!exists $form->{addition}) {
$form->{addition} = "PRINTED AND POSTED";
@@
-1453,9
+1463,10
@@
sub post {
# /saving the history
} else {
# /saving the history
} else {
- if (IS->post_invoice(\%myconfig, \%$form)){
+ if (IS->post_invoice(\%myconfig, \%$form)){
+ remove_draft() if $form->{remove_draft};
# saving the history
# saving the history
-
if(!exists $form->{addition}) {
+ if(!exists $form->{addition}) {
if($form->{storno}) {
$form->{addition} = "STORNO";
}
if($form->{storno}) {
$form->{addition} = "STORNO";
}