DATEV-Export: Filter nach Kreditoren- oder Debitorenbuchungen

kivitendo · Jan 17, 2025 · 2400dcd · 2400dcd
1 parent 1d26f22
commit 2400dcd
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 1 deletion.
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
@@ -80,6 +80,16 @@ sub new {
 
   $obj;
 }
+sub transaction_type {
+  my $self = shift;
+  $self->{transaction_type} = $_[0] if @_;
+
+  die "Invalid DATEV Transaction Type"
+    unless $self->{transaction_type} =~ m/^(ar|ap|all)$/;
+
+  return $self->{transaction_type};
+}
+
 
 sub exporttype {
   my $self = shift;
@@ -530,6 +540,9 @@ sub generate_datev_data {
 
   my $filter   = '';            # Useful for debugging purposes
 
+  $filter .= ' AND ac.trans_id in (SELECT id from ar) ' if $self->transaction_type eq 'ar';
+  $filter .= ' AND ac.trans_id in (SELECT id from ap) ' if $self->transaction_type eq 'ap';
+
   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');
 
   my $ar_accno = "c.accno";

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
@@ -103,6 +103,7 @@ sub export3 {
   $data{locked}    = $::form->{locked};
   $data{imported}  = $::form->{imported};
   $data{documents} = $::form->{documents};
+  $data{transaction_type} = $::form->{transaction_type};
 
   if ($data{documents} && !SL::DATEV->new->check_all_bookings_have_documents(from => $data{from}, to => $data{to})) {
     $::form->error(t8("Cannot export with documents because some transactions don't have a PDF document attached."));

diff --git a/locale/de/all b/locale/de/all
@@ -4564,6 +4564,7 @@ $ ./scripts/installation_check.pl',
   'Transaction Date missing!'   => 'Buchungsdatum fehlt!',
   'Transaction Details'         => 'Transaktionsdetails',
   'Transaction ID missing.'     => 'Die Buchungs-ID fehlt.',
+  'Transaction Type'            => 'Buchungstyp',
   'Transaction Value'           => 'Umsatz',
   'Transaction Value Currency Code' => 'WKZ Umsatz',
   'Transaction date'            => 'Buchungsdatum',

diff --git a/locale/en/all b/locale/en/all
@@ -4562,6 +4562,7 @@ $self->{texts} = {
   'Transaction Date missing!'   => '',
   'Transaction Details'         => '',
   'Transaction ID missing.'     => '',
+  'Transaction Type'            => '',
   'Transaction Value'           => '',
   'Transaction Value Currency Code' => '',
   'Transaction date'            => '',

diff --git a/templates/design40_webpages/datev/export_bewegungsdaten.html b/templates/design40_webpages/datev/export_bewegungsdaten.html
@@ -1,4 +1,5 @@
 [% USE T8 %]
+[% USE LxERP %]
 [% USE L %]
 
 <h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
@@ -60,7 +61,21 @@ <h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
       </tr>
     </tbody>
   </table>
-
+  <table class="tbl-horizontal">
+    <caption>[% 'Transaction Type' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <td>[% 'Type' | $T8 %]</td>
+        <td>[% L.select_tag("transaction_type", [
+                [ "all", LxERP.t8("All") ],
+                [ "ar",  LxERP.t8("AR Transactions") ],
+                [ "ap",  LxERP.t8("AP Transactions") ],
+              ],
+              default=all,
+              style=style) %]</td>
+      </tr>
+    </tbody>
+  </table>
   [% IF ALL_DEPARTMENTS.as_list.size %]
     <table class="tbl-horizontal">
       <caption>[% 'Department' | $T8 %]</caption>

diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
+[% USE LxERP %]
 [%- USE L %]
 <h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
 
@@ -65,6 +66,17 @@ <h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
            <td align=left></td>
            <td>[% L.date_tag('gldatefrom') %]</td>
          </tr>
+        <tr>
+          <td>[% 'Transaction Type' | $T8 %]</td>
+          <td align=left></td>
+          <td>[% L.select_tag("transaction_type", [
+                [ "all", LxERP.t8("All") ],
+                [ "ar",  LxERP.t8("AR Transactions") ],
+                [ "ap",  LxERP.t8("AP Transactions") ],
+              ],
+              default=all,
+              style=style) %]</td>
+        </tr>
         </table>
      </td>
    </tr>