projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Datenbank anlegen: ISO8859-1 als default eingestellt.
[kivitendo-erp.git]
/
SL
/
IS.pm
diff --git
a/SL/IS.pm
b/SL/IS.pm
index
cc8027b
..
57d4a6c
100644
(file)
--- a/
SL/IS.pm
+++ b/
SL/IS.pm
@@
-103,7
+103,7
@@
sub invoice_details {
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
- if ($form->{"
qty
_$i"} != 0) {
+ if ($form->{"
id
_$i"} != 0) {
# add number, description and qty to $form->{number},
if ($form->{"subtotal_$i"} && !$subtotal_header) {
# add number, description and qty to $form->{number},
if ($form->{"subtotal_$i"} && !$subtotal_header) {
@@
-355,11
+355,11
@@
sub invoice_details {
$form->{invtotal} =
($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
$form->{invtotal} =
($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
+ $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
+ $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
$form->{total} =
$form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
$form->{total} =
$form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
- $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
$form->set_payment_options($myconfig, $form->{invdate});
$form->set_payment_options($myconfig, $form->{invdate});
- $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
$form->{username} = $myconfig->{name};
$form->{username} = $myconfig->{name};
@@
-417,6
+417,7
@@
sub customer_details {
# remove id and taxincluded before copy back
delete @$ref{qw(id taxincluded)};
# remove id and taxincluded before copy back
delete @$ref{qw(id taxincluded)};
+ @wanted_vars = grep({ $_ } @wanted_vars);
if (scalar(@wanted_vars) > 0) {
my %h_wanted_vars;
map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
if (scalar(@wanted_vars) > 0) {
my %h_wanted_vars;
map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
@@
-550,7
+551,7
@@
sub post_invoice {
$form->{"qty_$i"} *= -1;
}
$form->{"qty_$i"} *= -1;
}
- if ($form->{"
qty_$i"} != 0
) {
+ if ($form->{"
id_$i"}
) {
# get item baseunit
$query = qq|SELECT p.unit
# get item baseunit
$query = qq|SELECT p.unit