projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filterkriterium "Kunden-/Lieferantenname" in Berichten auch beim Umsortieren beibehal...
[kivitendo-erp.git]
/
bin
/
mozilla
/
ir.pl
diff --git
a/bin/mozilla/ir.pl
b/bin/mozilla/ir.pl
index
284b2fe
..
e5b698d
100644
(file)
--- a/
bin/mozilla/ir.pl
+++ b/
bin/mozilla/ir.pl
@@
-223,7
+223,7
@@
sub form_header {
$lxdebug->enter_sub();
# set option selected
$lxdebug->enter_sub();
# set option selected
- foreach $item (qw(AP vendor currency department
employee
)) {
+ foreach $item (qw(AP vendor currency department)) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@
-330,7
+330,7
@@
sub form_header {
<tr>
<th align="right">| . $locale->text('Employee') . qq|</th>
<td>| .
<tr>
<th align="right">| . $locale->text('Employee') . qq|</th>
<td>| .
- NTI($cgi->popup_menu('-name' => 'employee
', '-default' => $form->{"employee
"},
+ NTI($cgi->popup_menu('-name' => 'employee
_id', '-default' => $form->{"employee_id
"},
'-values' => \@values, '-labels' => \%labels)) . qq|
</td>
</tr>|;
'-values' => \@values, '-labels' => \%labels)) . qq|
</td>
</tr>|;
@@
-1013,9
+1013,14
@@
sub storno {
$form->error($locale->text("Invoice has already been storno'd!"));
}
$form->error($locale->text("Invoice has already been storno'd!"));
}
+ my $employee_id = $form->{employee_id};
invoice_links();
prepare_invoice();
relink_accounts();
invoice_links();
prepare_invoice();
relink_accounts();
+
+ # Payments must not be recorded for the new storno invoice.
+ $form->{paidaccounts} = 0;
+ map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
# saving the history
if(!exists $form->{addition} && $form->{id} ne "") {
@@
-1030,7
+1035,8
@@
sub storno {
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
$form->{rowcount}++;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
$form->{rowcount}++;
- &post();
+ $form->{employee_id} = $employee_id;
+ post();
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-1093,6
+1099,9
@@
sub post {
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("vendor", $locale->text('Vendor missing!'));
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
$form->isblank("vendor", $locale->text('Vendor missing!'));
+ $form->{invnumber} =~ s/^\s*//g;
+ $form->{invnumber} =~ s/\s*$//g;
+
# if the vendor changed get new values
if (&check_name(vendor)) {
&update;
# if the vendor changed get new values
if (&check_name(vendor)) {
&update;