projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Locale: Bei parase_date_string undef sofort undef zurückgeben.
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
692967f
..
81be410
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-302,8
+302,6
@@
sub post_transaction {
exporttype => DATEV_ET_BUCHUNGEN,
format => DATEV_FORMAT_KNE,
dbh => $dbh,
exporttype => DATEV_ET_BUCHUNGEN,
format => DATEV_FORMAT_KNE,
dbh => $dbh,
- from => $transdate,
- to => $transdate,
trans_id => $form->{id},
);
trans_id => $form->{id},
);
@@
-561,7
+559,7
@@
sub ar_transactions {
if (!$main::auth->assert('sales_all_edit', 1)) {
# only show own invoices
$where .= " AND a.employee_id = (select id from employee where login= ?)";
if (!$main::auth->assert('sales_all_edit', 1)) {
# only show own invoices
$where .= " AND a.employee_id = (select id from employee where login= ?)";
- push (@values, $
form->
{login});
+ push (@values, $
::myconfig
{login});
} else {
if ($form->{employee_id}) {
$where .= " AND a.employee_id = ?";
} else {
if ($form->{employee_id}) {
$where .= " AND a.employee_id = ?";
@@
-573,6
+571,15
@@
sub ar_transactions {
}
};
}
};
+ my ($cvar_where, @cvar_values) = CVar->build_filter_query('module' => 'CT',
+ 'trans_id_field' => 'c.id',
+ 'filter' => $form,
+ );
+ if ($cvar_where) {
+ $where .= qq| AND ($cvar_where)|;
+ push @values, @cvar_values;
+ }
+
my @a = qw(transdate invnumber name);
push @a, "employee" if $form->{l_employee};
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my @a = qw(transdate invnumber name);
push @a, "employee" if $form->{l_employee};
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';