Revision 2400dcdc
SL/DATEV.pm | ||
---|---|---|
80 | 80 |
|
81 | 81 |
$obj; |
82 | 82 |
} |
83 |
sub transaction_type { |
|
84 |
my $self = shift; |
|
85 |
$self->{transaction_type} = $_[0] if @_; |
|
86 |
|
|
87 |
die "Invalid DATEV Transaction Type" |
|
88 |
unless $self->{transaction_type} =~ m/^(ar|ap|all)$/; |
|
89 |
|
|
90 |
return $self->{transaction_type}; |
|
91 |
} |
|
92 |
|
|
83 | 93 |
|
84 | 94 |
sub exporttype { |
85 | 95 |
my $self = shift; |
... | ... | |
530 | 540 |
|
531 | 541 |
my $filter = ''; # Useful for debugging purposes |
532 | 542 |
|
543 |
$filter .= ' AND ac.trans_id in (SELECT id from ar) ' if $self->transaction_type eq 'ar'; |
|
544 |
$filter .= ' AND ac.trans_id in (SELECT id from ap) ' if $self->transaction_type eq 'ap'; |
|
545 |
|
|
533 | 546 |
my %all_taxchart_ids = selectall_as_map($form, $self->dbh, qq|SELECT DISTINCT chart_id, TRUE AS is_set FROM tax|, 'chart_id', 'is_set'); |
534 | 547 |
|
535 | 548 |
my $ar_accno = "c.accno"; |
bin/mozilla/datev.pl | ||
---|---|---|
103 | 103 |
$data{locked} = $::form->{locked}; |
104 | 104 |
$data{imported} = $::form->{imported}; |
105 | 105 |
$data{documents} = $::form->{documents}; |
106 |
$data{transaction_type} = $::form->{transaction_type}; |
|
106 | 107 |
|
107 | 108 |
if ($data{documents} && !SL::DATEV->new->check_all_bookings_have_documents(from => $data{from}, to => $data{to})) { |
108 | 109 |
$::form->error(t8("Cannot export with documents because some transactions don't have a PDF document attached.")); |
locale/de/all | ||
---|---|---|
4564 | 4564 |
'Transaction Date missing!' => 'Buchungsdatum fehlt!', |
4565 | 4565 |
'Transaction Details' => 'Transaktionsdetails', |
4566 | 4566 |
'Transaction ID missing.' => 'Die Buchungs-ID fehlt.', |
4567 |
'Transaction Type' => 'Buchungstyp', |
|
4567 | 4568 |
'Transaction Value' => 'Umsatz', |
4568 | 4569 |
'Transaction Value Currency Code' => 'WKZ Umsatz', |
4569 | 4570 |
'Transaction date' => 'Buchungsdatum', |
locale/en/all | ||
---|---|---|
4562 | 4562 |
'Transaction Date missing!' => '', |
4563 | 4563 |
'Transaction Details' => '', |
4564 | 4564 |
'Transaction ID missing.' => '', |
4565 |
'Transaction Type' => '', |
|
4565 | 4566 |
'Transaction Value' => '', |
4566 | 4567 |
'Transaction Value Currency Code' => '', |
4567 | 4568 |
'Transaction date' => '', |
templates/design40_webpages/datev/export_bewegungsdaten.html | ||
---|---|---|
1 | 1 |
[% USE T8 %] |
2 |
[% USE LxERP %] |
|
2 | 3 |
[% USE L %] |
3 | 4 |
|
4 | 5 |
<h1>[% 'DATEV - Export Assistent' | $T8 %]</h1> |
... | ... | |
60 | 61 |
</tr> |
61 | 62 |
</tbody> |
62 | 63 |
</table> |
63 |
|
|
64 |
<table class="tbl-horizontal"> |
|
65 |
<caption>[% 'Transaction Type' | $T8 %]</caption> |
|
66 |
<tbody> |
|
67 |
<tr> |
|
68 |
<td>[% 'Type' | $T8 %]</td> |
|
69 |
<td>[% L.select_tag("transaction_type", [ |
|
70 |
[ "all", LxERP.t8("All") ], |
|
71 |
[ "ar", LxERP.t8("AR Transactions") ], |
|
72 |
[ "ap", LxERP.t8("AP Transactions") ], |
|
73 |
], |
|
74 |
default=all, |
|
75 |
style=style) %]</td> |
|
76 |
</tr> |
|
77 |
</tbody> |
|
78 |
</table> |
|
64 | 79 |
[% IF ALL_DEPARTMENTS.as_list.size %] |
65 | 80 |
<table class="tbl-horizontal"> |
66 | 81 |
<caption>[% 'Department' | $T8 %]</caption> |
templates/webpages/datev/export_bewegungsdaten.html | ||
---|---|---|
1 | 1 |
[%- USE T8 %] |
2 |
[% USE LxERP %] |
|
2 | 3 |
[%- USE L %] |
3 | 4 |
<h1>[% 'DATEV - Export Assistent' | $T8 %]</h1> |
4 | 5 |
|
... | ... | |
65 | 66 |
<td align=left></td> |
66 | 67 |
<td>[% L.date_tag('gldatefrom') %]</td> |
67 | 68 |
</tr> |
69 |
<tr> |
|
70 |
<td>[% 'Transaction Type' | $T8 %]</td> |
|
71 |
<td align=left></td> |
|
72 |
<td>[% L.select_tag("transaction_type", [ |
|
73 |
[ "all", LxERP.t8("All") ], |
|
74 |
[ "ar", LxERP.t8("AR Transactions") ], |
|
75 |
[ "ap", LxERP.t8("AP Transactions") ], |
|
76 |
], |
|
77 |
default=all, |
|
78 |
style=style) %]</td> |
|
79 |
</tr> |
|
68 | 80 |
</table> |
69 | 81 |
</td> |
70 | 82 |
</tr> |
Auch abrufbar als: Unified diff
DATEV-Export: Filter nach Kreditoren- oder Debitorenbuchungen