projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ein Bug rausgeholt, einen neuen wieder reingesetzt. Zusatz zu: r3473, der Else-Zweig...
[kivitendo-erp.git]
/
SL
/
CA.pm
diff --git
a/SL/CA.pm
b/SL/CA.pm
index
a208e2e
..
9eeb905
100644
(file)
--- a/
SL/CA.pm
+++ b/
SL/CA.pm
@@
-76,11
+76,11
@@
sub all_accounts {
c.pos_eur,
c.valid_from,
c.datevautomatik,
c.pos_eur,
c.valid_from,
c.datevautomatik,
- comma(tk.startdate) AS startdate,
- comma(tk.taxkey_id) AS taxkey,
+ comma(tk.startdate
::text
) AS startdate,
+ comma(tk.taxkey_id
::text
) AS taxkey,
comma(tx.taxdescription || to_char (tx.rate, '99V99' ) || '%') AS taxdescription,
comma(tx.taxdescription || to_char (tx.rate, '99V99' ) || '%') AS taxdescription,
- comma(tx.taxnumber) AS taxaccount,
- comma(tk.pos_ustva) AS tk_ustva,
+ comma(tx.taxnumber
::text
) AS taxaccount,
+ comma(tk.pos_ustva
::text
) AS tk_ustva,
( SELECT accno
FROM chart c2
WHERE c2.id = c.id
( SELECT accno
FROM chart c2
WHERE c2.id = c.id
@@
-405,7
+405,7
@@
sub all_transactions {
}
$ca->{index} = join "--", map { $ca->{$_} } qw(id reference description transdate);
}
$ca->{index} = join "--", map { $ca->{$_} } qw(id reference description transdate);
-
+# $ca->{index} = $ca->{$form->{sort}};
push(@{ $form->{CA} }, $ca);
}
push(@{ $form->{CA} }, $ca);
}