GoBD: experimentelle Spaltung von Betrag und Steuer in Soll und Haben

diff --git a/SL/GoBD.pm b/SL/GoBD.pm
index af2fe38f34731de3ed701174e8ae4622e073e876..40998a2ded66f8156c75a89a891a6ee5013795b6 100644 (file)
--- a/SL/GoBD.pm
+++ b/SL/GoBD.pm
@@ -71,8 +71,12 @@ my %datev_column_defs = (
   amount            => { type => 'Rose::DB::Object::Metadata::Column::Numeric', text => t8('Amount'), },
   credit_accname    => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Credit Account Name'), },
   credit_accno      => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Credit Account'), },
   amount            => { type => 'Rose::DB::Object::Metadata::Column::Numeric', text => t8('Amount'), },
   credit_accname    => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Credit Account Name'), },
   credit_accno      => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Credit Account'), },

+  credit_amount     => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Credit Amount'), },
+  credit_tax        => { type => 'Rose::DB::Object::Metadata::Column::Numeric', text => t8('Credit Tax (lit)'), },

   debit_accname     => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Debit Account Name'), },
   debit_accno       => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Debit Account'), },
   debit_accname     => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Debit Account Name'), },
   debit_accno       => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Debit Account'), },

+  debit_amount      => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Debit Amount'), },
+  debit_tax         => { type => 'Rose::DB::Object::Metadata::Column::Numeric', text => t8('Debit Tax (lit)'), },

   invnumber         => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Reference'), },
   name              => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Name'), },
   notes             => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Notes'), },
   invnumber         => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Reference'), },
   name              => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Name'), },
   notes             => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Notes'), },


@@ -93,8 +97,8 @@ my @datev_columns = qw(
   customer_id vendor_id
   name           vcnumber
   transdate    invnumber      amount
   customer_id vendor_id
   name           vcnumber
   transdate    invnumber      amount

-  debit_accno  debit_accname
-  credit_accno credit_accname
+  debit_accno  debit_accname debit_amount debit_tax
+  credit_accno credit_accname credit_amount credit_tax

   taxdescription tax
   tax_accno    tax_accname    taxkey
   notes itime
   taxdescription tax
   tax_accno    tax_accname    taxkey
   notes itime


@@ -444,18 +448,33 @@ sub do_datev_csv_export {
     $haben->{notes}  //= '';
     $haben->{notes}    =  SL::HTML::Util->strip($haben->{notes});
 
     $haben->{notes}  //= '';
     $haben->{notes}    =  SL::HTML::Util->strip($haben->{notes});
 

+    my $net_amount = defined $amount->{net_amount}
+                   ? $::form->format_amount($myconfig, abs($amount->{net_amount}), 5)
+                   : 0;
+    my $tax_amount = defined $amount->{net_amount}
+                   ? $::form->format_amount($myconfig, abs($amount->{amount}) - abs($amount->{net_amount}), 5)
+                   : 0;
+

     my %row            = (
       amount           => $::form->format_amount($myconfig, abs($amount->{amount}),5),
       debit_accno      => $soll->{accno},
       debit_accname    => $soll->{accname},
     my %row            = (
       amount           => $::form->format_amount($myconfig, abs($amount->{amount}),5),
       debit_accno      => $soll->{accno},
       debit_accname    => $soll->{accname},

+      debit_amount     => -$soll->{amount},
+      debit_tax        => $soll->{tax_accno} ? $tax_amount : 0,

       credit_accno     => $haben->{accno},
       credit_accname   => $haben->{accname},
       credit_accno     => $haben->{accno},
       credit_accname   => $haben->{accname},

-      tax              => defined $amount->{net_amount} ? $::form->format_amount($myconfig, abs($amount->{amount}) - abs($amount->{net_amount}), 5) : 0,
+      credit_amount    => $haben->{amount},
+      credit_tax       => $haben->{tax_accno} ? $tax_amount : 0,
+      tax              => $tax_amount,

       notes            => $haben->{notes},
       (map { ($_ => $tax->{$_})                    } qw(taxkey tax_accname tax_accno taxdescription)),
       (map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(trans_id invnumber name vcnumber transdate itime customer_id vendor_id)),
     );
 
       notes            => $haben->{notes},
       (map { ($_ => $tax->{$_})                    } qw(taxkey tax_accname tax_accno taxdescription)),
       (map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(trans_id invnumber name vcnumber transdate itime customer_id vendor_id)),
     );
 

+#     if ($row{debit_amount} + $row{debit_tax} - ($row{credit_amount} + $row{credit_tax}) > 0.005) {
+#       $::lxdebug->dump(0,  "broken taxes", [ $transaction, \%row,  $row{debit_amount} + $row{debit_tax}, $row{credit_amount} + $row{credit_tax} ]);
+#     }
+

     _normalize_cell($_) for values %row; # see CAVEATS
 
     $csv->print($fh, [ map { $row{$_} } @datev_columns ]);
     _normalize_cell($_) for values %row; # see CAVEATS
 
     $csv->print($fh, [ map { $row{$_} } @datev_columns ]);

diff --git a/locale/de/all b/locale/de/all
index cde50c7f8006610dc476d1e8176c12f79dfdecb5..82715cf9076ef615854aa24790eb883268efb41a 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -718,6 +718,7 @@ $self->{texts} = {
   'Credit (one letter abbreviation)' => 'H',
   'Credit Account'              => 'Habenkonto',
   'Credit Account Name'         => 'Haben-Kontoname',
   'Credit (one letter abbreviation)' => 'H',
   'Credit Account'              => 'Habenkonto',
   'Credit Account Name'         => 'Haben-Kontoname',

+  'Credit Amount'               => 'Habenbetrag',

   'Credit Limit'                => 'Kreditlimit',
   'Credit Limit exceeded!!!'    => 'Kreditlimit überschritten!',
   'Credit Note'                 => 'Gutschrift',
   'Credit Limit'                => 'Kreditlimit',
   'Credit Limit exceeded!!!'    => 'Kreditlimit überschritten!',
   'Credit Note'                 => 'Gutschrift',


@@ -725,6 +726,7 @@ $self->{texts} = {
   'Credit Note Number'          => 'Gutschriftnummer',
   'Credit Starting Balance'     => 'EB Aktiva',
   'Credit Tax'                  => 'Umsatzsteuer',
   'Credit Note Number'          => 'Gutschriftnummer',
   'Credit Starting Balance'     => 'EB Aktiva',
   'Credit Tax'                  => 'Umsatzsteuer',

+  'Credit Tax (lit)'            => 'Habensteuer',

   'Credit Tax Account'          => 'Umsatzsteuerkonto',
   'Credit note (one letter abbreviation)' => 'G',
   'Cumulated or averaged values' => 'Kumulierte oder gemittelte Werte',
   'Credit Tax Account'          => 'Umsatzsteuerkonto',
   'Credit note (one letter abbreviation)' => 'G',
   'Cumulated or averaged values' => 'Kumulierte oder gemittelte Werte',


@@ -834,8 +836,10 @@ $self->{texts} = {
   'Debit (one letter abbreviation)' => 'S',
   'Debit Account'               => 'Sollkonto',
   'Debit Account Name'          => 'Soll-Kontoname',
   'Debit (one letter abbreviation)' => 'S',
   'Debit Account'               => 'Sollkonto',
   'Debit Account Name'          => 'Soll-Kontoname',

+  'Debit Amount'                => 'Sollbetrag',

   'Debit Starting Balance'      => 'EB Passiva',
   'Debit Tax'                   => 'Vorsteuer',
   'Debit Starting Balance'      => 'EB Passiva',
   'Debit Tax'                   => 'Vorsteuer',

+  'Debit Tax (lit)'             => 'Sollsteuer',

   'Debit Tax Account'           => 'Vorsteuerkonto',
   'Debit and credit out of balance!' => 'Soll und Haben müssen gleich sein.',
   'Dec'                         => 'Dez',
   'Debit Tax Account'           => 'Vorsteuerkonto',
   'Debit and credit out of balance!' => 'Soll und Haben müssen gleich sein.',
   'Dec'                         => 'Dez',