projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
S:C:Letter: toten Code entfernt
[kivitendo-erp.git]
/
SL
/
DATEV.pm
diff --git
a/SL/DATEV.pm
b/SL/DATEV.pm
index
c6ce5b2
..
2aff208
100644
(file)
--- a/
SL/DATEV.pm
+++ b/
SL/DATEV.pm
@@
-461,6
+461,14
@@
sub locked {
}
return $self->{locked};
}
}
return $self->{locked};
}
+sub imported {
+ my $self = shift;
+
+ if (@_) {
+ $self->{imported} = $_[0];
+ }
+ return $self->{imported};
+}
sub generate_datev_data {
$main::lxdebug->enter_sub();
sub generate_datev_data {
$main::lxdebug->enter_sub();
@@
-514,6
+522,10
@@
sub generate_datev_data {
$ar_accno = "CASE WHEN ac.chart_link = 'AR' THEN ct.customernumber ELSE c.accno END as accno";
$ap_accno = "CASE WHEN ac.chart_link = 'AP' THEN ct.vendornumber ELSE c.accno END as accno";
}
$ar_accno = "CASE WHEN ac.chart_link = 'AR' THEN ct.customernumber ELSE c.accno END as accno";
$ap_accno = "CASE WHEN ac.chart_link = 'AP' THEN ct.vendornumber ELSE c.accno END as accno";
}
+ my $gl_imported;
+ if ( !$self->imported ) {
+ $gl_imported = " AND NOT imported";
+ }
my $query =
qq|SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo,
my $query =
qq|SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo,
@@
-597,6
+609,7
@@
sub generate_datev_data {
$trans_id_filter
$gl_itime_filter
$gl_department_id_filter
$trans_id_filter
$gl_itime_filter
$gl_department_id_filter
+ $gl_imported
$filter
ORDER BY trans_id, acc_trans_id|;
$filter
ORDER BY trans_id, acc_trans_id|;