Neuanfang in unstable mit Release 2.2.0: Kopie des Releasestandes.

diff --git a/SL/AP.pm b/SL/AP.pm
index 2a486c8..e909890 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -442,7 +442,7 @@ sub ap_transactions {
   push @a, "employee" if $self->{l_employee};
   my $sortorder = join ', ', $form->sort_columns(@a);
   $sortorder = $form->{sort} if $form->{sort};
-  
+
   $query .= "WHERE $where
              ORDER by $sortorder";
 

diff --git a/SL/AR.pm b/SL/AR.pm
index 76cea55..42f8c1c 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -83,9 +83,10 @@ sub post_transaction {
 
   $form->{amount} = $form->{netamount};
 
-  $form->{tax} = 0;
+  $form->{tax}       = 0;
   $form->{netamount} = 0;
   $form->{total_tax} = 0;
+
   # taxincluded doesn't make sense if there is no amount
 
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
@@ -114,7 +115,8 @@ sub post_transaction {
         $form->{netamount} += $form->{"amount_$i"};
       } else {
         $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
-        $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
+        $form->{"tax_$i"} =
+          $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
         $form->{netamount} += $form->{"amount_$i"};
       }
     }

diff --git a/SL/CA.pm b/SL/CA.pm
index 3517a34..4453a9f 100644 (file)
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -164,7 +164,7 @@ sub all_transactions {
     $where .= $fromto;
     $AR_PAID = "";
     $AP_PAID = "";
-    $glwhere = ""; # note! gl will be aliased as "a" later...
+    $glwhere = "";    # note! gl will be aliased as "a" later...
   }
   my $sortorder = join ', ',
     $form->sort_columns(qw(transdate reference description));
@@ -323,14 +323,14 @@ sub all_transactions {
 
   foreach my $id (@id) {
 
-      # NOTE: 
-      #  Postgres is really picky about the order of implicit CROSS JOINs with ','
-      #  if you alias the  tables and want to use the alias later in another JOIN.
-      #  the alias you want to use has to be the most recent in the list, otherwise
-      #  Postgres will overwrite the alias internally and complain.
-      #  For this reason, in the next 3 SELECTs, the 'a' alias is last in the list.
-      #  Don't change this, and if you do, substitute the ',' with CROSS JOIN
-      #  ... that also works.
+    # NOTE:
+    #  Postgres is really picky about the order of implicit CROSS JOINs with ','
+    #  if you alias the  tables and want to use the alias later in another JOIN.
+    #  the alias you want to use has to be the most recent in the list, otherwise
+    #  Postgres will overwrite the alias internally and complain.
+    #  For this reason, in the next 3 SELECTs, the 'a' alias is last in the list.
+    #  Don't change this, and if you do, substitute the ',' with CROSS JOIN
+    #  ... that also works.
 
     # get all transactions
     $query .= qq|$union

diff --git a/SL/CT.pm b/SL/CT.pm
index 308a36e..ab5d70e 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -232,7 +232,8 @@ sub save_customer {
       $form->{"cp_${_}"} = $form->{"selected_cp_${_}"}
         if ($form->{"selected_cp_${_}"});
   } qw(title greeting));
-#
+
+  #
   # escape '
   map { $form->{$_} =~ s/\'/\'\'/g }
     qw(customernumber name street zipcode city country homepage contact notes cp_title cp_greeting language pricegroup);
@@ -318,7 +319,7 @@ sub save_customer {
               ustid = '$form->{ustid}',
               username = '$form->{username}',
               salesman_id = '$form->{salesman_id}',
-              user_password = | . $dbh->quote($form->{user_password}) .qq|,
+              user_password = | . $dbh->quote($form->{user_password}) . qq|,
               c_vendor_id = '$form->{c_vendor_id}',
               klass = '$form->{klass}'
              WHERE id = $form->{id}|;

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 36fe80d..9c617db 100644 (file)
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -588,7 +588,7 @@ sub kne_buchungsexport {
   my $evfile      = "EV01";
   my @ed_versionsets;
   my $fileno = 0;
-  
+
   $form->header;
   print qq|
   <html>
@@ -616,8 +616,8 @@ sub kne_buchungsexport {
     $remaining_bytes -= length($header);
 
     while (scalar(@{ $form->{DATEV} }) > 0) {
-      $transaction    = shift @{ $form->{DATEV} };
-      $trans_lines    = scalar(@{$transaction});
+      $transaction = shift @{ $form->{DATEV} };
+      $trans_lines = scalar(@{$transaction});
       $counter++;
       if (($counter % 500) == 0) {
         print("$counter ");
@@ -829,7 +829,7 @@ sub kne_buchungsexport {
     print(EV $ed_versionset[$file]);
   }
   close(EV);
-print qq|<br>Done. <br></body>
+  print qq|<br>Done. <br></body>
 </html>
 |;
   ###
@@ -865,8 +865,7 @@ sub kne_stammdatenexport {
     qq|SELECT c.accno, c.description FROM chart c WHERE c.accno >=|
     . $dbh->quote($form->{accnofrom}) . qq|
            AND c.accno <= |
-    . $dbh->quote($form->{accnoto})
-    . qq| ORDER BY c.accno|;
+    . $dbh->quote($form->{accnoto}) . qq| ORDER BY c.accno|;
 
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);

diff --git a/SL/Form.pm b/SL/Form.pm
index f82a70f..8670d60 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -140,8 +140,8 @@ sub new {
   $self->{action} = lc $self->{action};
   $self->{action} =~ s/( |-|,|#)/_/g;
 
-  $self->{version}   = "2.1.2";
-  $self->{dbversion} = "2.1.2";
+  $self->{version}   = "2.2.0";
+  $self->{dbversion} = "2.2.0";
 
   $main::lxdebug->leave_sub();
 
@@ -195,7 +195,7 @@ sub unescape {
 sub quote {
   my ($self, $str) = @_;
 
-  if ($str && ! ref($str)) {
+  if ($str && !ref($str)) {
     $str =~ s/"/"/g;
   }
 
@@ -203,11 +203,10 @@ sub quote {
 
 }
 
-
 sub unquote {
   my ($self, $str) = @_;
 
-  if ($str && ! ref($str)) {
+  if ($str && !ref($str)) {
     $str =~ s/"/"/g;
   }
 
@@ -215,17 +214,24 @@ sub unquote {
 
 }
 
- 
 sub hide_form {
   my $self = shift;
 
   if (@_) {
-    for (@_) { print qq|<input type=hidden name="$_" value="|.$self->quote($self->{$_}).qq|">\n| }
+    for (@_) {
+      print qq|<input type=hidden name="$_" value="|
+        . $self->quote($self->{$_})
+        . qq|">\n|;
+    }
   } else {
     delete $self->{header};
-    for (sort keys %$self) { print qq|<input type=hidden name="$_" value="|.$self->quote($self->{$_}).qq|">\n| }
+    for (sort keys %$self) {
+      print qq|<input type=hidden name="$_" value="|
+        . $self->quote($self->{$_})
+        . qq|">\n|;
+    }
   }
-  
+
 }
 
 sub error {
@@ -452,17 +458,17 @@ sub write_trigger {
     push @triggers, qq|
        Calendar.setup(
       {
-      inputField : "|.(shift).qq|",
+      inputField : "| . (shift) . qq|",
       ifFormat :"$ifFormat",
-      align : "|.(shift).qq|", 
-      button : "|.(shift).qq|"
+      align : "| .  (shift) . qq|", 
+      button : "| . (shift) . qq|"
       }
       );
        |;
   }
   $jsscript = qq|
        <script type="text/javascript">
-       <!--|.join("", @triggers).qq|//-->
+       <!--| . join("", @triggers) . qq|//-->
         </script>
         |;
 
@@ -505,12 +511,12 @@ sub format_amount {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $amount, $places, $dash) = @_;
-  
+
   #Workaround for $format_amount calls without $places
-  if (!defined $places){
-  (my $dec) = ($amount =~ /\.(\d+)/);
-  $places           = length $dec;
-  }                    
+  if (!defined $places) {
+    (my $dec) = ($amount =~ /\.(\d+)/);
+    $places = length $dec;
+  }
 
   if ($places =~ /\d/) {
     $amount = $self->round_amount($amount, $places);
@@ -518,7 +524,7 @@ sub format_amount {
 
   # is the amount negative
   my $negative = ($amount < 0);
-  my $fillup = "";
+  my $fillup   = "";
 
   if ($amount != 0) {
     if ($myconfig->{numberformat} && ($myconfig->{numberformat} ne '1000.00'))
@@ -532,19 +538,19 @@ sub format_amount {
         $amount =~ s/\d{3,}?/$&,/g;
         $amount =~ s/,$//;
         $amount = join '', reverse split //, $amount;
-        $amount .= "\.$dec".$fillup if ($places ne '' && $places*1 != 0);
+        $amount .= "\.$dec" . $fillup if ($places ne '' && $places * 1 != 0);
       }
 
       if ($myconfig->{numberformat} eq '1.000,00') {
         $amount =~ s/\d{3,}?/$&./g;
         $amount =~ s/\.$//;
         $amount = join '', reverse split //, $amount;
-        $amount .= ",$dec".$fillup if ($places ne '' && $places*1 != 0);
+        $amount .= ",$dec" . $fillup if ($places ne '' && $places * 1 != 0);
       }
 
       if ($myconfig->{numberformat} eq '1000,00') {
         $amount = "$whole";
-        $amount .= ",$dec" .$fillup if ($places ne '' && $places*1 != 0);
+        $amount .= ",$dec" . $fillup if ($places ne '' && $places * 1 != 0);
       }
 
       if ($dash =~ /-/) {
@@ -576,29 +582,39 @@ sub parse_amount {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $amount) = @_;
-  $main::lxdebug->message(LXDebug::DEBUG2, "Start amount: $amount");  
- 
-  if ($myconfig->{in_numberformat} == 1){
+  $main::lxdebug->message(LXDebug::DEBUG2, "Start amount: $amount");
+
+  if ($myconfig->{in_numberformat} == 1) {
+
     # Extra input number format 1000.00 or 1000,00
-    $main::lxdebug->message(LXDebug::DEBUG2, "in_numberformat: " . $main::locale->text('1000,00 or 1000.00'));
+    $main::lxdebug->message(LXDebug::DEBUG2,
+              "in_numberformat: " . $main::locale->text('1000,00 or 1000.00'));
     $amount =~ s/,/\./g;
+
     #$main::lxdebug->message(LXDebug::DEBUG2, "1.Parsed Number: $amount") if ($amount);
     $amount = scalar reverse $amount;
+
     #$main::lxdebug->message(LXDebug::DEBUG2, "2.Parsed Number: $amount") if ($amount);
     $amount =~ s/\./DOT/;
+
     #$main::lxdebug->message(LXDebug::DEBUG2, "3.Parsed Number: $amount") if ($amount);
     $amount =~ s/\.//g;
+
     #$main::lxdebug->message(LXDebug::DEBUG2, "4.Parsed Number: $amount") if ($amount);
     $amount =~ s/DOT/\./;
+
     #$main::lxdebug->message(LXDebug::DEBUG2, "5.Parsed Number:" . $amount) if ($amount);
-    $amount = scalar reverse $amount ;
-    $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount . "\n");
+    $amount = scalar reverse $amount;
+    $main::lxdebug->message(LXDebug::DEBUG2,
+                            "Parsed amount:" . $amount . "\n");
 
     return ($amount * 1);
 
   }
-  $main::lxdebug->message(LXDebug::DEBUG2, "in_numberformat: " . $main::locale->text('equal Outputformat'));
-  $main::lxdebug->message(LXDebug::DEBUG2, " = numberformat: $myconfig->{numberformat}");
+  $main::lxdebug->message(LXDebug::DEBUG2,
+              "in_numberformat: " . $main::locale->text('equal Outputformat'));
+  $main::lxdebug->message(LXDebug::DEBUG2,
+                          " = numberformat: $myconfig->{numberformat}");
   if (   ($myconfig->{numberformat} eq '1.000,00')
       || ($myconfig->{numberformat} eq '1000,00')) {
     $amount =~ s/\.//g;
@@ -606,14 +622,15 @@ sub parse_amount {
   }
 
   if ($myconfig->{numberformat} eq "1'000.00") {
-      $amount =~ s/'//g;
+    $amount =~ s/'//g;
   }
 
   $amount =~ s/,//g;
-  
-  $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount. "\n") if ($amount);
+
+  $main::lxdebug->message(LXDebug::DEBUG2, "Parsed amount:" . $amount . "\n")
+    if ($amount);
   $main::lxdebug->leave_sub();
-  
+
   return ($amount * 1);
 }
 
@@ -625,20 +642,18 @@ sub round_amount {
 
   # Rounding like "Kaufmannsrunden"
   # Descr. http://de.wikipedia.org/wiki/Rundung
-  # Inspired by 
+  # Inspired by
   # http://www.perl.com/doc/FAQs/FAQ/oldfaq-html/Q4.13.html
   # Solves Bug: 189
   # Udo Spallek
-  $amount       = $amount * (10 ** ($places));
-  $round_amount = int($amount + .5 * ($amount <=> 0))/(10**($places));
+  $amount = $amount * (10**($places));
+  $round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places));
 
   $main::lxdebug->leave_sub();
 
   return $round_amount;
-  
-}
-
 
+}
 
 sub parse_template {
   $main::lxdebug->enter_sub();
@@ -754,8 +769,11 @@ sub parse_template {
           }
 
           # Yes we need a manual page break -- or the user has forced one
-          if ((($current_line + $lines) > $lpp) ||
-              ($self->{"_forced_pagebreaks"} && grep(/^${current_row}$/, @{$self->{"_forced_pagebreaks"}}))) {
+          if (
+             (($current_line + $lines) > $lpp)
+             || ($self->{"_forced_pagebreaks"}
+               && grep(/^${current_row}$/, @{ $self->{"_forced_pagebreaks"} }))
+            ) {
             my $pb = $pagebreak;
 
             # replace the special variables <%sumcarriedforward%>
@@ -1042,7 +1060,7 @@ sub format_string {
   my %unique_fields;
 
   %unique_fields = map({ $_ => 1 } @fields);
-  @fields = keys(%unique_fields);
+  @fields        = keys(%unique_fields);
 
   foreach my $field (@fields) {
     next unless ($self->{$field} =~ /\<pagebreak\>/);
@@ -1295,7 +1313,7 @@ sub get_exchangerate {
   $main::lxdebug->enter_sub();
 
   my ($self, $dbh, $curr, $transdate, $fld) = @_;
-  
+
   unless ($transdate) {
     $main::lxdebug->leave_sub();
     return "";
@@ -1348,8 +1366,9 @@ sub add_shipto {
   my ($self, $dbh, $id) = @_;
 ##LINET
   my $shipto;
-  foreach
-    my $item (qw(name department_1 department_2 street zipcode city country contact phone fax email)) {
+  foreach my $item (
+    qw(name department_1 department_2 street zipcode city country contact phone fax email)
+    ) {
     if ($self->{"shipto$item"}) {
       $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
     }
@@ -1357,7 +1376,8 @@ sub add_shipto {
   }
 
   if ($shipto) {
-    my $query = qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
+    my $query =
+      qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet,
                    shiptozipcode, shiptocity, shiptocountry, shiptocontact,
                   shiptophone, shiptofax, shiptoemail) VALUES ($id,
                   '$self->{shiptoname}', '$self->{shiptodepartment_1}', '$self->{shiptodepartment_2}', '$self->{shiptostreet}',
@@ -1616,8 +1636,7 @@ sub create_links {
   my %xkeyref = ();
 
   # now get the account numbers
-  $query =
-    qq|SELECT c.accno, c.description, c.link, c.taxkey_id
+  $query = qq|SELECT c.accno, c.description, c.link, c.taxkey_id
               FROM chart c
              WHERE c.link LIKE '%$module%'
              ORDER BY c.accno|;
@@ -1700,14 +1719,14 @@ sub create_links {
     $self->{exchangerate} =
       $self->get_exchangerate($dbh, $self->{currency}, $self->{transdate},
                               $fld);
-    my $index=0;
+    my $index = 0;
 
     # store amounts in {acc_trans}{$key} for multiple accounts
     while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
       $ref->{exchangerate} =
         $self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate},
                                 $fld);
-      if ( !($xkeyref{ $ref->{accno} } =~ /tax/)) {
+      if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
         $index++;
       }
       $ref->{index} = $index;
@@ -2143,7 +2162,6 @@ sub get_partsgroup {
   $main::lxdebug->leave_sub();
 }
 
-
 sub get_pricegroup {
   $main::lxdebug->enter_sub();
 
@@ -2175,92 +2193,95 @@ sub get_pricegroup {
   $main::lxdebug->leave_sub();
 }
 
-
 sub audittrail {
   my ($self, $dbh, $myconfig, $audittrail) = @_;
-  
-# table, $reference, $formname, $action, $id, $transdate) = @_;
+
+  # table, $reference, $formname, $action, $id, $transdate) = @_;
 
   my $query;
   my $rv;
   my $disconnect;
 
-  if (! $dbh) {
-    $dbh = $self->dbconnect($myconfig);
+  if (!$dbh) {
+    $dbh        = $self->dbconnect($myconfig);
     $disconnect = 1;
   }
-    
+
   # if we have an id add audittrail, otherwise get a new timestamp
-  
+
   if ($audittrail->{id}) {
-    
+
     $query = qq|SELECT audittrail FROM defaults|;
-    
+
     if ($dbh->selectrow_array($query)) {
       my ($null, $employee_id) = $self->get_employee($dbh);
 
       if ($self->{audittrail} && !$myconfig) {
-       chop $self->{audittrail};
-       
-       my @a = split /\|/, $self->{audittrail};
-       my %newtrail = ();
-       my $key;
-       my $i;
-       my @flds = qw(tablename reference formname action transdate);
-
-       # put into hash and remove dups
-       while (@a) {
-         $key = "$a[2]$a[3]";
-         $i = 0;
-         $newtrail{$key} = { map { $_ => $a[$i++] } @flds };
-         splice @a, 0, 5;
-       }
-       
-       $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        chop $self->{audittrail};
+
+        my @a = split /\|/, $self->{audittrail};
+        my %newtrail = ();
+        my $key;
+        my $i;
+        my @flds = qw(tablename reference formname action transdate);
+
+        # put into hash and remove dups
+        while (@a) {
+          $key = "$a[2]$a[3]";
+          $i   = 0;
+          $newtrail{$key} = { map { $_ => $a[$i++] } @flds };
+          splice @a, 0, 5;
+        }
+
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
                    formname, action, employee_id, transdate)
                    VALUES ($audittrail->{id}, ?, ?,
                    ?, ?, $employee_id, ?)|;
-       my $sth = $dbh->prepare($query) || $self->dberror($query);
-
-       foreach $key (sort { $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate} } keys %newtrail) {
-         $i = 1;
-         for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) }
-
-         $sth->execute || $self->dberror;
-         $sth->finish;
-       }
+        my $sth = $dbh->prepare($query) || $self->dberror($query);
+
+        foreach $key (
+          sort {
+            $newtrail{$a}{transdate} cmp $newtrail{$b}{transdate}
+          } keys %newtrail
+          ) {
+          $i = 1;
+          for (@flds) { $sth->bind_param($i++, $newtrail{$key}{$_}) }
+
+          $sth->execute || $self->dberror;
+          $sth->finish;
+        }
       }
 
-     
       if ($audittrail->{transdate}) {
-       $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
                    formname, action, employee_id, transdate) VALUES (
                    $audittrail->{id}, '$audittrail->{tablename}', |
-                   .$dbh->quote($audittrail->{reference}).qq|,
+          . $dbh->quote($audittrail->{reference}) . qq|,
                    '$audittrail->{formname}', '$audittrail->{action}',
                    $employee_id, '$audittrail->{transdate}')|;
       } else {
-       $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
+        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
                    formname, action, employee_id) VALUES ($audittrail->{id},
                    '$audittrail->{tablename}', |
-                   .$dbh->quote($audittrail->{reference}).qq|,
+          . $dbh->quote($audittrail->{reference}) . qq|,
                    '$audittrail->{formname}', '$audittrail->{action}',
                    $employee_id)|;
       }
       $dbh->do($query);
     }
   } else {
-    
+
     $query = qq|SELECT current_timestamp FROM defaults|;
     my ($timestamp) = $dbh->selectrow_array($query);
 
-    $rv = "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|";
+    $rv =
+      "$audittrail->{tablename}|$audittrail->{reference}|$audittrail->{formname}|$audittrail->{action}|$timestamp|";
   }
 
   $dbh->disconnect if $disconnect;
-  
+
   $rv;
-  
+
 }
 
 package Locale;

diff --git a/SL/GL.pm b/SL/GL.pm
index 1cc3d34..d6723d3 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -283,9 +283,12 @@ sub all_transactions {
     $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
   }
   if ($form->{category} ne 'X') {
-    $glwhere .= " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
-    $arwhere .= " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
-    $apwhere .= " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $glwhere .=
+      " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $arwhere .=
+      " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $apwhere .=
+      " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
   }
 
   if ($form->{accno}) {
@@ -344,19 +347,20 @@ sub all_transactions {
 
   my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
 
-     my $sortorder = join ', ', $form->sort_columns(qw(transdate reference source description accno));
-     my %ordinal = ( transdate => 6,
-                     reference => 4,
-                     source => 7,
-                 description => 5 );
-     map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
-   
-     if ($form->{sort}) {
-         $sortorder = $form->{sort} . ",";
-     } else {
-        $sortorder = "";
-      }
-  
+  my $sortorder = join ', ',
+    $form->sort_columns(qw(transdate reference source description accno));
+  my %ordinal = (transdate   => 6,
+                 reference   => 4,
+                 source      => 7,
+                 description => 5);
+  map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
+
+  if ($form->{sort}) {
+    $sortorder = $form->{sort} . ",";
+  } else {
+    $sortorder = "";
+  }
+
   my $query =
     qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
                  g.description, ac.transdate, ac.source, ac.trans_id,
@@ -389,7 +393,7 @@ sub all_transactions {
                 ORDER BY $sortorder transdate, trans_id, taxkey DESC, sorttax DESC,oid|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
-  my $trans_id = "";
+  my $trans_id  = "";
   my $trans_id2 = "";
   while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
     $trans_id = $ref0->{id};
@@ -398,13 +402,14 @@ sub all_transactions {
         push @{ $form->{GL} }, $ref;
         $balance = 0;
       }
-      $ref = $ref0;
+      $ref       = $ref0;
       $trans_id2 = $ref->{id};
-      
+
       # gl
       if ($ref->{type} eq "gl") {
         $ref->{module} = "gl";
       }
+
       # ap
       if ($ref->{type} eq "ap") {
         if ($ref->{invoice}) {
@@ -413,7 +418,7 @@ sub all_transactions {
           $ref->{module} = "ap";
         }
       }
-  
+
       # ar
       if ($ref->{type} eq "ar") {
         if ($ref->{invoice}) {
@@ -447,55 +452,56 @@ sub all_transactions {
         }
       }
     } else {
-      $ref2 = $ref0;
+      $ref2      = $ref0;
       $trans_id2 = $ref2->{id};
-#      if ($form->{accno} eq ''){ # flo & udo: if general report,
-                                  # then check balance
-#         while (abs($balance) >= 0.015) {
-#           my $ref2 = $sth->fetchrow_hashref(NAME_lc)
-#             || $form->error("Unbalanced ledger!");
-#     
-          $balance =
-            (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
-          if ($ref2->{amount} < 0) {
-            if ($ref2->{chart_id} > 0) {
-              if ($ref->{debit_tax_accno}{$i} ne "") {
-                $i++;
-              }
-              $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
-              $ref->{debit_tax_accno}{$i} = $ref2->{accno};
-            } else {
-              if ($ref->{debit_accno}{$k} ne "") {
-                $k++;
-              }
-              $ref->{debit}{$k}        = $ref2->{amount} * -1;
-              $ref->{debit_accno}{$k}  = $ref2->{accno};
-              $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
-            }
-          } else {
-            if ($ref2->{chart_id} > 0) {
-              if ($ref->{credit_tax_accno}{$j} ne "") {
-                $j++;
-              }
-              $ref->{credit_tax}{$j}       = $ref2->{amount};
-              $ref->{credit_tax_accno}{$j} = $ref2->{accno};
-            } else {
-              if ($ref->{credit_accno}{$l} ne "") {
-                $l++;
-              }
-              $ref->{credit}{$l}        = $ref2->{amount};
-              $ref->{credit_accno}{$l}  = $ref2->{accno};
-              $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
-            }
+
+      #      if ($form->{accno} eq ''){ # flo & udo: if general report,
+      # then check balance
+      #         while (abs($balance) >= 0.015) {
+      #           my $ref2 = $sth->fetchrow_hashref(NAME_lc)
+      #             || $form->error("Unbalanced ledger!");
+      #
+      $balance =
+        (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
+      if ($ref2->{amount} < 0) {
+        if ($ref2->{chart_id} > 0) {
+          if ($ref->{debit_tax_accno}{$i} ne "") {
+            $i++;
           }
-#         }
-#       } else {
-#         # if account-report, then calculate the Balance?!
-#         # ToDo: Calculate the Balance
-#         1;
-#       }
+          $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
+          $ref->{debit_tax_accno}{$i} = $ref2->{accno};
+        } else {
+          if ($ref->{debit_accno}{$k} ne "") {
+            $k++;
+          }
+          $ref->{debit}{$k}        = $ref2->{amount} * -1;
+          $ref->{debit_accno}{$k}  = $ref2->{accno};
+          $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
+        }
+      } else {
+        if ($ref2->{chart_id} > 0) {
+          if ($ref->{credit_tax_accno}{$j} ne "") {
+            $j++;
+          }
+          $ref->{credit_tax}{$j}       = $ref2->{amount};
+          $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+        } else {
+          if ($ref->{credit_accno}{$l} ne "") {
+            $l++;
+          }
+          $ref->{credit}{$l}        = $ref2->{amount};
+          $ref->{credit_accno}{$l}  = $ref2->{accno};
+          $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
+        }
+      }
+
+      #         }
+      #       } else {
+      #         # if account-report, then calculate the Balance?!
+      #         # ToDo: Calculate the Balance
+      #         1;
+      #       }
     }
-       
 
   }
   push @{ $form->{GL} }, $ref;

diff --git a/SL/IC.pm b/SL/IC.pm
index fd8a230..eaa5e88 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -34,6 +34,7 @@
 
 package IC;
 use Data::Dumper;
+
 sub get_part {
   $main::lxdebug->enter_sub();
 
@@ -235,8 +236,8 @@ sub get_pricegroups {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
-  my $dbh = $form->dbconnect($myconfig);
-  my $i = 1;
+  my $dbh                  = $form->dbconnect($myconfig);
+  my $i                    = 1;
   my @pricegroups_not_used = ();
 
   # get pricegroups
@@ -276,7 +277,6 @@ sub get_pricegroups {
   $main::lxdebug->leave_sub();
 }
 
-
 sub save {
   $main::lxdebug->enter_sub();
 
@@ -456,11 +456,14 @@ sub save {
   # insert price records only if different to sellprice
   for my $i (1 .. $form->{price_rows}) {
     if ($form->{"price_$i"} eq "0") {
-       $form->{"price_$i"} = $form->{sellprice};
+      $form->{"price_$i"} = $form->{sellprice};
     }
-    if ((   $form->{"price_$i"} 
-        || $form->{"klass_$i"}
-        || $form->{"pricegroup_id_$i"}) and $form->{"price_$i"} != $form->{sellprice}) {
+    if (
+        (   $form->{"price_$i"}
+         || $form->{"klass_$i"}
+         || $form->{"pricegroup_id_$i"})
+        and $form->{"price_$i"} != $form->{sellprice}
+      ) {
       $klass = $form->parse_amount($myconfig, $form->{"klass_$i"});
       $price = $form->parse_amount($myconfig, $form->{"price_$i"});
       $pricegroup_id =
@@ -1041,7 +1044,8 @@ sub all_parts {
         $ordwhere .= " AND lower(oi.description) LIKE '$var'";
       }
 
-      $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
+      $flds =
+        qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                  oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
                 p.listprice, p.lastcost, p.rop, p.weight,
                 p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1067,7 +1071,8 @@ sub all_parts {
       }
 
       if ($form->{onorder}) {
-        $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
+        $flds =
+          qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                    oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
                   p.listprice, p.lastcost, p.rop, p.weight,
                   p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1104,7 +1109,8 @@ sub all_parts {
         $quowhere .= " AND lower(oi.description) LIKE '$var'";
       }
 
-      $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
+      $flds =
+        qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                  oi.qty AS onhand, oi.unit, p.bin, oi.sellprice,
                 p.listprice, p.lastcost, p.rop, p.weight,
                 p.priceupdate, p.image, p.drawing, p.microfiche,
@@ -1130,7 +1136,8 @@ sub all_parts {
       }
 
       if ($form->{rfq}) {
-        $flds = qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
+        $flds =
+          qq|p.id, p.partnumber, oi.description, oi.serialnumber AS serialnumber,
                    oi.qty * -1 AS onhand, oi.unit, p.bin, oi.sellprice,
                   p.listprice, p.lastcost, p.rop, p.weight,
                   p.priceupdate, p.image, p.drawing, p.microfiche,

diff --git a/SL/IS.pm b/SL/IS.pm
index 04144ff..d4d8c6f 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -106,10 +106,10 @@ sub invoice_details {
       push(@{ $form->{description} },   qq|$form->{"description_$i"}|);
       push(@{ $form->{qty} },
            $form->format_amount($myconfig, $form->{"qty_$i"}));
-      push(@{ $form->{unit} },         qq|$form->{"unit_$i"}|);
+      push(@{ $form->{unit} },            qq|$form->{"unit_$i"}|);
       push(@{ $form->{deliverydate_oe} }, qq|$form->{"deliverydate_$i"}|);
 
-      push(@{ $form->{sellprice} }, $form->{"sellprice_$i"});
+      push(@{ $form->{sellprice} },    $form->{"sellprice_$i"});
       push(@{ $form->{ordnumber_oe} }, qq|$form->{"ordnumber_$i"}|);
       push(@{ $form->{transdate_oe} }, qq|$form->{"transdate_$i"}|);
 
@@ -139,10 +139,14 @@ sub invoice_details {
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      my $i_discount = $form->round_amount($sellprice * 
-                                           $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100, $decimalplaces);
+      my $i_discount =
+        $form->round_amount(
+                            $sellprice * $form->parse_amount($myconfig,
+                                                 $form->{"discount_$i"}) / 100,
+                            $decimalplaces);
 
-      my $discount = $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
+      my $discount =
+        $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
 
       # keep a netprice as well, (sellprice - discount)
       $form->{"netprice_$i"} = $sellprice - $i_discount;
@@ -164,7 +168,7 @@ sub invoice_details {
         : " ";
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
 
-      push(@{ $form->{discount} }, $discount);
+      push(@{ $form->{discount} },   $discount);
       push(@{ $form->{p_discount} }, $form->{"discount_$i"});
 
       $form->{total} += $linetotal;
@@ -803,9 +807,10 @@ sub post_invoice {
   # set values which could be empty to 0
   $form->{terms}       *= 1;
   $form->{taxincluded} *= 1;
-  my $datepaid     = ($form->{paid})         ? qq|'$form->{datepaid}'| : "NULL";
-  my $duedate      = ($form->{duedate})      ? qq|'$form->{duedate}'|  : "NULL";
-  my $deliverydate = ($form->{deliverydate}) ? qq|'$form->{deliverydate}'| : "NULL";
+  my $datepaid = ($form->{paid})    ? qq|'$form->{datepaid}'| : "NULL";
+  my $duedate  = ($form->{duedate}) ? qq|'$form->{duedate}'|  : "NULL";
+  my $deliverydate =
+    ($form->{deliverydate}) ? qq|'$form->{deliverydate}'| : "NULL";
 
   # fill in subject if there is none
   $form->{subject} = qq|$form->{label} $form->{invnumber}|

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index c3a5a64..8a9619c 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,7 +1,7 @@
 package LXDebug;
 
-use constant NONE => 0;
-use constant INFO => 1;
+use constant NONE   => 0;
+use constant INFO   => 1;
 use constant DEBUG1 => 2;
 use constant DEBUG2 => 3;
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 093e770..fb7153c 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -182,7 +182,6 @@ sub save {
     $query = qq|DELETE FROM shipto
                 WHERE trans_id = $form->{id}|;
     $dbh->do($query) || $form->dberror($query);
-    $delete_oe_id = 0;
 
   } else {
 
@@ -200,7 +199,6 @@ sub save {
                 WHERE o.ordnumber = '$uid'|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
-    $delete_oe_id = 1;
 
     ($form->{id}) = $sth->fetchrow_array;
     $sth->finish;
@@ -225,11 +223,9 @@ sub save {
   for my $i (1 .. $form->{rowcount}) {
 
     map {
-      $form->{"${_}_$i"} = $form->parse_amount($myconfig, $form->{"${_}_$i"})
+      $form->{"${_}_$i"} =
+        $form->parse_amount($myconfig, $form->{"${_}_$i"})
     } qw(qty ship);
-    if ($delete_oe_id) {
-      $form->{"orderitems_id_$i"} = "";
-    }
 
     if ($form->{"qty_$i"}) {
 
@@ -465,18 +461,19 @@ Message: $form->{message}\r| if $form->{message};
   return $rc;
 }
 
-# this function closes multiple orders given in $form->{ordnumber_#}. 
+# this function closes multiple orders given in $form->{ordnumber_#}.
 # use this for multiple orders that don't have to be saved back
 # single orders should use OE::save instead.
 sub close_orders {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig ,$form) = @_;
+  my ($self, $myconfig, $form) = @_;
 
   for my $i (1 .. $form->{rowcount}) {
 
     map {
-      $form->{"${_}_$i"} = $form->parse_amount($myconfig, $form->{"${_}_$i"})
+      $form->{"${_}_$i"} =
+        $form->parse_amount($myconfig, $form->{"${_}_$i"})
     } qw(qty ship);
     if ($delete_oe_id) {
       $form->{"orderitems_id_$i"} = "";
@@ -492,13 +489,16 @@ sub close_orders {
         $form->parse_amount($myconfig, $form->{"sellprice_$i"});
     }
   }
+
   # get ids from $form
-  map { push @ids, $form->{"ordnumber_$_"} if $form->{"ordnumber_$_"} } (1 .. $form->{rowcount});
-  
+  map { push @ids, $form->{"ordnumber_$_"} if $form->{"ordnumber_$_"} }
+    (1 .. $form->{rowcount});
+
   my $dbh = $form->dbconnect($myconfig);
   $query = qq|UPDATE oe SET
               closed = TRUE
-              WHERE ordnumber IN (|.join(', ', map{ $dbh->quote($_) }@ids).qq|)|;
+              WHERE ordnumber IN (|
+    . join(', ', map { $dbh->quote($_) } @ids) . qq|)|;
   $dbh->do($query) || $form->dberror($query);
   $dbh->disconnect;
 
@@ -586,9 +586,12 @@ sub retrieve {
   my $query, @ids;
 
   # translate the ids (given by id_# and trans_id_#) into one array of ids, so we can join them later
-  map { push @ids, $form->{"trans_id_$_"} if ($form->{"id_$_"} and $form->{"trans_id_$_"}) } (1 .. $form->{"rowcount"});
+  map {
+    push @ids, $form->{"trans_id_$_"}
+      if ($form->{"id_$_"} and $form->{"trans_id_$_"})
+  } (1 .. $form->{"rowcount"});
 
-  # if called in multi id mode, and still only got one id, switch back to single id 
+  # if called in multi id mode, and still only got one id, switch back to single id
   if ($form->{"rowcount"} and $#ids == 0) {
     $form->{"id"} = $ids[0];
     undef @ids;
@@ -633,15 +636,17 @@ sub retrieve {
 
   ($form->{currency}) = split /:/, $form->{currencies};
 
-  # set reqdate if this is an invoice->order conversion. If someone knows a better check to ensure 
+  # set reqdate if this is an invoice->order conversion. If someone knows a better check to ensure
   # we come from invoices, feel free.
-  $form->{reqdate} = $form->{deliverydate} if ($form->{deliverydate} and $form->{callback} =~ /action=ar_transactions/);
+  $form->{reqdate} = $form->{deliverydate}
+    if (    $form->{deliverydate}
+        and $form->{callback} =~ /action=ar_transactions/);
 
   if ($form->{id} or @ids) {
 
     # retrieve order for single id
     # NOTE: this query is intended to fetch all information only ONCE.
-    # so if any of these infos is important (or even different) for any item, 
+    # so if any of these infos is important (or even different) for any item,
     # it will be killed out and then has to be fetched from the item scope query further down
     $query = qq|SELECT o.cp_id, o.ordnumber, o.transdate, o.reqdate,
                 o.taxincluded, o.shippingpoint, o.shipvia, o.notes, o.intnotes,
@@ -653,12 +658,12 @@ sub retrieve {
                JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
                LEFT JOIN employee e ON (o.employee_id = e.id)
                LEFT JOIN department d ON (o.department_id = d.id)
-               |. ($form->{id} 
-                  ? qq|WHERE o.id = $form->{id}| 
-                   : qq|WHERE o.id IN (|.join(', ', @ids).qq|)|
-                  );
+               |
+      . ($form->{id}
+         ? qq|WHERE o.id = $form->{id}|
+         : qq|WHERE o.id IN (| . join(', ', @ids) . qq|)|);
 
-#$main::lxdebug->message(0, $query);
+    #$main::lxdebug->message(0, $query);
 
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
@@ -672,11 +677,12 @@ sub retrieve {
     }
 
     # if not given, fill transdate with current_date
-    $form->{transdate} = $form->current_date($myconfig) unless $form->{transdate};
+    $form->{transdate} = $form->current_date($myconfig)
+      unless $form->{transdate};
 
     $sth->finish;
 
-    # shipto and pinted/mailed/queued status makes only sense for single id retrieve 
+    # shipto and pinted/mailed/queued status makes only sense for single id retrieve
     if (!@ids) {
       $query = qq|SELECT s.* FROM shipto s
                   WHERE s.trans_id = $form->{id}|;
@@ -697,11 +703,12 @@ sub retrieve {
       while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
         $form->{printed} .= "$ref->{formname} " if $ref->{printed};
         $form->{emailed} .= "$ref->{formname} " if $ref->{emailed};
-        $form->{queued} .= "$ref->{formname} $ref->{spoolfile} " if $ref->{spoolfile};
+        $form->{queued} .= "$ref->{formname} $ref->{spoolfile} "
+          if $ref->{spoolfile};
       }
       $sth->finish;
       map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
-    } # if !@ids
+    }    # if !@ids
 
     my %oid = ('Pg'     => 'oid',
                'Oracle' => 'rowid');
@@ -728,24 +735,25 @@ sub retrieve {
                LEFT JOIN chart c3 ON (p.expense_accno_id = c3.id)
                LEFT JOIN project pr ON (o.project_id = pr.id)
                LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-               |. ($form->{id} 
-                  ? qq|WHERE o.trans_id = $form->{id}| 
-                  : qq|WHERE o.trans_id IN (|.join(", ", @ids).qq|)| 
-                  ).qq|
+               |
+      . ($form->{id}
+         ? qq|WHERE o.trans_id = $form->{id}|
+         : qq|WHERE o.trans_id IN (| . join(", ", @ids) . qq|)|)
+      . qq|
                 ORDER BY o.$oid{$myconfig->{dbdriver}}|;
-    
+
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
     while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-     
+
       # in collective order, copy global ordnumber, transdate, cusordnumber into item scope
-      #   unless already present there 
+      #   unless already present there
       # remove _oe entries afterwards
       map { $ref->{$_} = $ref->{"${_}_oe"} if ($ref->{$_} eq '') }
-        qw|ordnumber transdate cusordnumber| if (@ids);
-      map{ delete $ref->{$_} } 
-        qw|ordnumber_oe transdate_oe cusordnumber_oe|;
+        qw|ordnumber transdate cusordnumber|
+        if (@ids);
+      map { delete $ref->{$_} } qw|ordnumber_oe transdate_oe cusordnumber_oe|;
 
       #set expense_accno=inventory_accno if they are different => bilanz
       $vendor_accno =
@@ -896,10 +904,14 @@ sub order_details {
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 
-      my $i_discount = $form->round_amount($sellprice *
-                                           $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100, $decimalplaces);
+      my $i_discount =
+        $form->round_amount(
+                            $sellprice * $form->parse_amount($myconfig,
+                                                 $form->{"discount_$i"}) / 100,
+                            $decimalplaces);
 
-      my $discount = $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
+      my $discount =
+        $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);
 
       # keep a netprice as well, (sellprice - discount)
       #$form->{"netprice_$i"} = $sellprice - $discount;
@@ -922,7 +934,7 @@ sub order_details {
         : " ";
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
 
-      push(@{ $form->{discount} }, $discount);
+      push(@{ $form->{discount} },   $discount);
       push(@{ $form->{p_discount} }, $form->{"discount_$i"});
 
       $form->{ordtotal} += $linetotal;
@@ -954,7 +966,7 @@ sub order_details {
         }
       }
 
-      $tax_rate = $taxrate*100;
+      $tax_rate = $taxrate * 100;
       push(@{ $form->{tax_rate} }, qq|$tax_rate|);
 
       if ($form->{"assembly_$i"}) {

diff --git a/SL/RP.pm b/SL/RP.pm
index 4ccabce..89e8135 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -34,7 +34,6 @@
 
 package RP;
 
-
 sub balance_sheet {
   $main::lxdebug->enter_sub();
 
@@ -1134,6 +1133,7 @@ sub get_accounts_g {
   my @accno;
   my $accno;
   my $ref;
+
   #print $query;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
@@ -2045,8 +2045,8 @@ sub payments {
 
   my $sortorder = join ', ',
     $form->sort_columns(qw(name invnumber ordnumber transdate source));
-    $sortorder = $form->{sort} if $form->{sort};
-    
+  $sortorder = $form->{sort} if $form->{sort};
+
   # cycle through each id
   foreach my $accno (split(/ /, $form->{paymentaccounts})) {
 
@@ -2143,14 +2143,15 @@ sub bwa {
     $form->{ "$key" . "gesamtleistung" } = 0;
     $form->{ "$key" . "gesamtkosten" }   = 0;
 
-
     foreach $category (@categories) {
 
       if (defined($form->{$category}{$key})) {
         $form->{"$key$category"} =
           $form->format_amount($myconfig,
                                $form->round_amount($form->{$category}{$key}, 2
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
       }
     }
     foreach $item (@gesamtleistung) {
@@ -2173,7 +2174,7 @@ sub bwa {
     $form->{ "$key" . "ergebnisvorsteuern" } =
       $form->{ "$key" . "betriebsergebnis" } -
       $form->{ "$key" . "neutraleraufwand" } +
-       $form->{ "$key" . "neutralertrag" };
+      $form->{ "$key" . "neutralertrag" };
     $form->{ "$key" . "ergebnis" } =
       $form->{ "$key" . "ergebnisvorsteuern" } + $form->{35}{$key};
 
@@ -2188,7 +2189,9 @@ sub bwa {
                                     $form->{ "$key" . "gesamtleistung" } * 100
                                  ),
                                  $form->{decimalplaces}
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
         }
       }
       foreach $item (@ergebnisse) {
@@ -2199,7 +2202,9 @@ sub bwa {
                                      $form->{ "$key" . "gesamtleistung" } * 100
                                  ),
                                  $form->{decimalplaces}
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
       }
     }
 
@@ -2213,7 +2218,9 @@ sub bwa {
                                       $form->{ "$key" . "gesamtkosten" } * 100
                                    ),
                                    $form->{decimalplaces}
-                                 ), $form->{decimalplaces}, '0');
+                                 ),
+                                 $form->{decimalplaces},
+                                 '0');
         }
       }
       foreach $item (@ergebnisse) {
@@ -2224,7 +2231,9 @@ sub bwa {
                                       $form->{ "$key" . "gesamtkosten" } * 100
                                    ),
                                    $form->{decimalplaces}
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
       }
     }
 
@@ -2233,11 +2242,13 @@ sub bwa {
         if (defined($form->{$category}{$key})) {
           $form->{ "$key" . "pk" . "$category" } =
             $form->format_amount(
-                      $myconfig,
-                      $form->round_amount(
-                        ($form->{$category}{$key} / $form->{10}{$key} * 100), 
-                        $form->{decimalplaces}
-                      ), $form->{decimalplaces}, '0');
+                        $myconfig,
+                        $form->round_amount(
+                          ($form->{$category}{$key} / $form->{10}{$key} * 100),
+                          $form->{decimalplaces}
+                        ),
+                        $form->{decimalplaces},
+                        '0');
         }
       }
       foreach $item (@ergebnisse) {
@@ -2248,7 +2259,9 @@ sub bwa {
                                                    $form->{10}{$key} * 100
                                                 ),
                                                 $form->{decimalplaces}
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
       }
     }
 
@@ -2257,11 +2270,13 @@ sub bwa {
         if (defined($form->{$category}{$key})) {
           $form->{ "$key" . "auf" . "$category" } =
             $form->format_amount(
-                       $myconfig,
-                       $form->round_amount(
-                         ($form->{$category}{$key} / $form->{4}{$key} * 100), 
-                         $form->{decimalplaces}
-                       ), $form->{decimalplaces}, '0');
+                         $myconfig,
+                         $form->round_amount(
+                           ($form->{$category}{$key} / $form->{4}{$key} * 100),
+                           $form->{decimalplaces}
+                         ),
+                         $form->{decimalplaces},
+                         '0');
         }
       }
       foreach $item (@ergebnisse) {
@@ -2272,16 +2287,20 @@ sub bwa {
                                                    $form->{4}{$key} * 100
                                                 ),
                                                 $form->{decimalplaces}
-                               ), $form->{decimalplaces}, '0');
+                               ),
+                               $form->{decimalplaces},
+                               '0');
       }
     }
 
     foreach $item (@ergebnisse) {
       $form->{ "$key" . "$item" } =
         $form->format_amount($myconfig,
-                             $form->round_amount($form->{ "$key" . "$item" }, 
-                             $form->{decimalplaces}
-                             ), $form->{decimalplaces}, '0');
+                             $form->round_amount($form->{ "$key" . "$item" },
+                                                 $form->{decimalplaces}
+                             ),
+                             $form->{decimalplaces},
+                             '0');
     }
 
   }
@@ -2301,7 +2320,7 @@ sub ustva {
   my $last_period     = 0;
   my $category        = "pos_ustva";
   my @categories_cent = qw(51r 511 86r 861 97r 971 93r 931
-                           96 66 43 45 53 62 65 67);
+    96 66 43 45 53 62 65 67);
   my @categories_euro = qw(48 51 86 91 97 93 94);
   $form->{decimalplaces} *= 1;
 
@@ -2339,7 +2358,7 @@ sub ustva {
   #   }
   #
   #    }
-  
+
   #
   # Berechnung der USTVA Formularfelder
   #
@@ -2347,8 +2366,9 @@ sub ustva {
   $form->{"86r"} = $form->{"861"};
   $form->{"97r"} = $form->{"971"};
   $form->{"93r"} = $form->{"931"};
+
   #$form->{"96"}  = $form->{"94"} * 0.16;
-  $form->{"43"}  =
+  $form->{"43"} =
     $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} +
     $form->{"96"};
   $form->{"45"} = $form->{"43"};
@@ -2359,12 +2379,14 @@ sub ustva {
 
   foreach $item (@categories_cent) {
     $form->{$item} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), 2, '0');
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),
+                           2, '0');
   }
 
   foreach $item (@categories_euro) {
     $form->{$item} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), 0, '0');
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0),
+                           0, '0');
   }
 
   $dbh->disconnect;

diff --git a/SL/USTVA.pm b/SL/USTVA.pm
index 28fc571..84dc4f3 100644 (file)
--- a/SL/USTVA.pm
+++ b/SL/USTVA.pm
@@ -215,7 +215,8 @@ sub fa_auswahl {
       $elster_land_fa{$FFFF} = $elster_init->{$elster_land}->{$FFFF}->[0];
     }
     foreach $ffff (sort { $elster_land_fa{$a} cmp $elster_land_fa{$b} }
-                   keys(%elster_land_fa)) {
+                   keys(%elster_land_fa)
+      ) {
       print qq|
                    elsterFAAuswahl.options[$j] = new Option("$elster_land_fa{$ffff} ($ffff)","$ffff");|;
       $j++;
@@ -268,7 +269,8 @@ sub fa_auswahl {
     print qq|<option value="Auswahl" $checked>hier auswählen...</option>|;
   } else {
     foreach $ffff (sort { $elster_land_fa{$a} cmp $elster_land_fa{$b} }
-                   keys(%elster_land_fa)) {
+                   keys(%elster_land_fa)
+      ) {
 
       print qq|
                         <option value="$ffff"|;
@@ -556,7 +558,6 @@ sub process_query {
   $main::lxdebug->leave_sub();
 }
 
-
 sub ustva {
   $main::lxdebug->enter_sub();
 
@@ -567,12 +568,12 @@ sub ustva {
 
   my $last_period     = 0;
   my $category        = "pos_ustva";
-  my @categories_cent = qw(511 861 36 80 971 931 98 96 53 74 
-                           85 65 66 61 62 67 63 64 59 69 39 83 
-                           Z43 Z45 Z53 Z62 Z65 Z67);
-                           
-  my @categories_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93 
-                           95 94 42 60 45 52 73 84);
+  my @categories_cent = qw(511 861 36 80 971 931 98 96 53 74
+    85 65 66 61 62 67 63 64 59 69 39 83
+    Z43 Z45 Z53 Z62 Z65 Z67);
+
+  my @categories_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93
+    95 94 42 60 45 52 73 84);
 
   $form->{decimalplaces} *= 1;
 
@@ -583,10 +584,8 @@ sub ustva {
     $form->{"$item"} = 0;
   }
 
-
   &get_accounts_ustva($dbh, $last_period, $form->{fromdate}, $form->{todate},
-                  $form, $category);
-
+                      $form, $category);
 
   #
   # Berechnung der USTVA Formularfelder
@@ -595,27 +594,27 @@ sub ustva {
   $form->{"86r"} = $form->{"861"};
   $form->{"97r"} = $form->{"971"};
   $form->{"93r"} = $form->{"931"};
-  $form->{"Z43"} = $form->{"511"}+ $form->{"861"} + 
-                   $form->{"36"} + $form->{"80"}  +
-                   $form->{"971"}+ $form->{"931"} + 
-                   $form->{"96"} + $form->{"98"};
+  $form->{"Z43"} =
+    $form->{"511"} + $form->{"861"} + $form->{"36"} + $form->{"80"} +
+    $form->{"971"} + $form->{"931"} + $form->{"96"} + $form->{"98"};
   $form->{"Z45"} = $form->{"Z43"};
   $form->{"Z53"} = $form->{"Z43"};
-  $form->{"Z62"} = $form->{"Z43"}- $form->{"66"} -
-                   $form->{"61"} - $form->{"62"} -
-                   $form->{"63"} - $form->{"64"} -
-                   $form->{"59"};
-  $form->{"Z65"} = $form->{"Z62"}- $form->{"69"};
-  $form->{"83"}  = $form->{"Z65"}- $form->{"39"};
-  
+  $form->{"Z62"} =
+    $form->{"Z43"} - $form->{"66"} - $form->{"61"} - $form->{"62"} -
+    $form->{"63"} - $form->{"64"} - $form->{"59"};
+  $form->{"Z65"} = $form->{"Z62"} - $form->{"69"};
+  $form->{"83"}  = $form->{"Z65"} - $form->{"39"};
+
   foreach $item (@categories_cent) {
     $form->{$item} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), 2, '0');
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2),
+                           2, '0');
   }
 
   foreach $item (@categories_euro) {
     $form->{$item} =
-      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), 0, '0');
+      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0),
+                           0, '0');
   }
 
   $dbh->disconnect;
@@ -637,8 +636,8 @@ sub get_accounts_ustva {
   my $where    = "1 = 1";
   my $glwhere  = "";
   my $subwhere = "";
-  my $ARwhere = "";
-  my $arwhere = "";
+  my $ARwhere  = "";
+  my $arwhere  = "";
   my $item;
 
   if ($fromdate) {
@@ -652,7 +651,7 @@ sub get_accounts_ustva {
 
   if ($todate) {
     $where    .= " AND ac.transdate <= '$todate'";
-    $ARwhere    .= " AND acc.transdate <= '$todate'";
+    $ARwhere  .= " AND acc.transdate <= '$todate'";
     $subwhere .= " AND transdate <= '$todate'";
   }
 
@@ -861,6 +860,7 @@ sub get_accounts_ustva {
   my @accno;
   my $accno;
   my $ref;
+
   #print $query;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
@@ -884,5 +884,4 @@ sub get_accounts_ustva {
   $main::lxdebug->leave_sub();
 }
 
-
 1;

diff --git a/VERSION b/VERSION
index 7ec1d6d..ccbccc3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2.0

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 95cb353..e0ae42f 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -111,7 +111,7 @@ sub account_header {
              </tr>|;
 
   $form->{selectustva} = "<option>\n";
-  
+
   %ustva = (35  => $locale->text('UStVA-Nr. 35'),
             36  => $locale->text('UStVA-Nr. 36'),
             39  => $locale->text('UStVA-Nr. 39'),
@@ -144,17 +144,17 @@ sub account_header {
             84  => $locale->text('UStVA-Nr. 84'),
             85  => $locale->text('UStVA-Nr. 85'),
             86  => $locale->text('UStVA-Nr. 86 left'),
-            861 => $locale->text('UStVA-Nr. 86 right'),            
+            861 => $locale->text('UStVA-Nr. 86 right'),
             91  => $locale->text('UStVA-Nr. 91'),
             93  => $locale->text('UStVA-Nr. 93 left'),
-            931 => $locale->text('UStVA-Nr. 93 right'),            
+            931 => $locale->text('UStVA-Nr. 93 right'),
             94  => $locale->text('UStVA-Nr. 94'),
             95  => $locale->text('UStVA-Nr. 95'),
             96  => $locale->text('UStVA-Nr. 96'),
             97  => $locale->text('UStVA-Nr. 97 links'),
             971 => $locale->text('UStVA-Nr. 97 rechts'),
             98  => $locale->text('UStVA-Nr. 98'));
-            
+
   foreach $item (sort({ $a cmp $b } keys %ustva)) {
     if ($item == $form->{pos_ustva}) {
       $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
@@ -1611,7 +1611,7 @@ sub config {
       ? "<option selected>$item\n"
       : "<option>$item\n";
   }
-  
+
   foreach $item (qw(name company address signature)) {
     $myconfig{$item} =~ s/\"/&quot;/g;
   }
@@ -1631,22 +1631,20 @@ sub config {
       : "<option value=$key>$countrycodes{$key}\n";
   }
   $countrycodes = "<option>American English\n$countrycodes";
-  
+
   # use an other input number format than output numberformat
   # look at Form.pm, sub parse_amount
-  my $ in_numberformat = '';
+  my $in_numberformat = '';
   $text1 = qq|value="0">| . $locale->text('equal Outputformat');
   $text2 = qq|value="1">| . $locale->text('1000,00 or 1000.00');
   @in_nf = ($text1, $text2);
-  foreach $item ( @in_nf ) {
+  foreach $item (@in_nf) {
     $in_numberformat .=
-      ( substr($item, 7, 1) eq $myconfig{in_numberformat})
+      (substr($item, 7, 1) eq $myconfig{in_numberformat})
       ? "<option selected $item\n"
       : "<option $item\n";
   }
 
-
-  
   foreach $key (keys %{ $form->{IC} }) {
     foreach $accno (sort keys %{ $form->{IC}{$key} }) {
       $myconfig{$key} .=

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index ffb4b1f..4e494cd 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -569,7 +569,7 @@ $jsscript
     $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
     $tax =
       qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px">$tax</select></td>|;
-    $korrektur_checked = ($form->{"korrektur_$i"}?'checked':'');
+    $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
 
     print qq|
        <tr>

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 9378901..a39cdd1 100644 (file)
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -160,14 +160,12 @@ sub search {
     $button1 = qq|
        <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
        <input type=button name=transdatefrom id="trigger1" value=|
-      . $locale->text('button')
-      . qq|></td>
+      . $locale->text('button') . qq|></td>
       |;
     $button2 = qq|
        <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
        <input type=button name=transdateto name=transdateto id="trigger2" value=|
-      . $locale->text('button')
-      . qq|></td>
+      . $locale->text('button') . qq|></td>
      |;
 
     #write Trigger
@@ -281,7 +279,8 @@ sub remove {
 <h2 class=confirm>$form->{title}</h2>
 
 <h4>|
-    . $locale->text('Are you sure you want to remove the marked entries from the queue?')
+    . $locale->text(
+          'Are you sure you want to remove the marked entries from the queue?')
     . qq|</h4>
 
 <input name=action class=submit type=submit value="|

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 56ae608..de36049 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -235,8 +235,7 @@ sub list {
          <th align=right>| . $locale->text('Include in Report') . qq|</th>
          <td colspan=3>
          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Subtotal')
-    . qq|</td>
+    . $locale->text('Subtotal') . qq|</td>
        </tr>
       </table>
     </td>

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 6cde7f8..7836eb2 100644 (file)
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -185,8 +185,7 @@ sub form_header {
     $button1 = qq|
        <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
        <input type=button name=datepaid id="trigger1" value=|
-      . $locale->text('button')
-      . qq|></td>
+      . $locale->text('button') . qq|></td>
        |;
 
     #write Trigger
@@ -306,8 +305,7 @@ sub form_header {
              <tr>
                <th align=right nowrap>| . $locale->text('Amount') . qq|</th>
                <td colspan=3><input name=amount size=10 value=|
-    . $form->format_amount(\%myconfig, $form->{amount}, 2)
-    . qq|></td>
+    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|></td>
              </tr>
            </table>
          </td>
@@ -365,7 +363,8 @@ sub list_invoices {
   for $i (1 .. $form->{rowcount}) {
 
     map {
-      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+      $form->{"${_}_$i"} =
+        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
     } qw(amount due paid);
 
     $totalamount += $form->{"amount_$i"};
@@ -608,7 +607,8 @@ sub update {
   for $i (1 .. $form->{rowcount}) {
 
     map {
-      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+      $form->{"${_}_$i"} =
+        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
     } qw(amount due paid);
 
     if ($form->{"checked_$i"}) {

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 09068dc..aa8459d 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -585,35 +585,37 @@ sub form_header {
 ## /LINET
 
   if ($form->{db} eq 'customer') {
-  #get pricegroup and form it
-  $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  $form->{pricegroup}    = "$form->{klass}";
-  $form->{pricegroup_id} = "$form->{klass}";
+    #get pricegroup and form it
+    $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  if (@{ $form->{all_pricegroup} }) {
+    $form->{pricegroup}    = "$form->{klass}";
+    $form->{pricegroup_id} = "$form->{klass}";
 
-    $form->{selectpricegroup} = qq|<option>\n|;
-    map {
-      $form->{selectpricegroup} .=
-        qq|<option value="$_->{id}">$_->{pricegroup}\n|
-    } @{ $form->{all_pricegroup} };
-  }
+    if (@{ $form->{all_pricegroup} }) {
+
+      $form->{selectpricegroup} = qq|<option>\n|;
+      map {
+        $form->{selectpricegroup} .=
+          qq|<option value="$_->{id}">$_->{pricegroup}\n|
+      } @{ $form->{all_pricegroup} };
+    }
 
-  if ($form->{selectpricegroup}) {
-    $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
+    if ($form->{selectpricegroup}) {
+      $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
 
-    $pricegroup =
-      qq|<input type=hidden name=selectpricegroup value="|
-      . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
+      $pricegroup =
+        qq|<input type=hidden name=selectpricegroup value="|
+        . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
 
-    $form->{selectpricegroup} =~
-      s/(<option value="\Q$form->{klass}\E")/$1 selected/;
+      $form->{selectpricegroup} =~
+        s/(<option value="\Q$form->{klass}\E")/$1 selected/;
 
-    $pricegroup .= qq|<select name=klass>$form->{selectpricegroup}</select>|;
+      $pricegroup .= qq|<select name=klass>$form->{selectpricegroup}</select>|;
 
+    }
   }
- }
+
   # $locale->text('Customer Number')
   # $locale->text('Vendor Number')
   $form->{fokus} = "ct.name";
@@ -780,12 +782,13 @@ sub form_header {
          <th align=right>| . $locale->text('Language') . qq|</th>
          <td><select name=language tabindex=23>$lang
                           </select></td>|;
-if ($form->{db} eq 'customer'){
 
-print qq|
+  if ($form->{db} eq 'customer') {
+
+    print qq|
           <th align=right>| . $locale->text('Preisklasse') . qq|</th>
           <td>$pricegroup</td>|;
-}
+  }
   print qq|        </tr>
         <tr>
           <td align=right>| . $locale->text('Obsolete') . qq|</td>

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 01c519d..62a1cf0 100644 (file)
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -81,8 +81,7 @@ sub export {
        </tr>
        <tr>
          <td><input checked name=kne type=checkbox class=checkbox value=1> |
-    . $locale->text("Kontonummernerweiterung (KNE)")
-    . qq|</td>
+    . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
           <td></td>
 
          <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
@@ -90,13 +89,11 @@ sub export {
        </tr>
         <tr>
           <td><input name=exporttype type=radio class=radio value=0 checked> |
-    . $locale->text("Export Buchungsdaten")
-    . qq|</td>
+    . $locale->text("Export Buchungsdaten") . qq|</td>
           <td></td>
 
          <td><input name=exporttype type=radio class=radio value=1> |
-    . $locale->text("Export Stammdaten")
-    . qq|</td>
+    . $locale->text("Export Stammdaten") . qq|</td>
           <td></td>
        </td>
       </table>
@@ -145,38 +142,27 @@ sub export_bewegungsdaten {
     . $locale->text('January')
     . qq|</option>
                          <option value=2>|
-    . $locale->text('February')
-    . qq|</option>
+    . $locale->text('February') . qq|</option>
                          <option value=3>|
-    . $locale->text('March')
-    . qq|</option>
+    . $locale->text('March') . qq|</option>
                          <option value=4>|
-    . $locale->text('April')
-    . qq|</option>
+    . $locale->text('April') . qq|</option>
                          <option value=5>|
-    . $locale->text('May')
-    . qq|</option>
+    . $locale->text('May') . qq|</option>
                          <option value=6>|
-    . $locale->text('June')
-    . qq|</option>
+    . $locale->text('June') . qq|</option>
                          <option value=7>|
-    . $locale->text('July')
-    . qq|</option>
+    . $locale->text('July') . qq|</option>
                          <option value=8>|
-    . $locale->text('August')
-    . qq|</option>
+    . $locale->text('August') . qq|</option>
                          <option value=9>|
-    . $locale->text('September')
-    . qq|</option>
+    . $locale->text('September') . qq|</option>
                          <option value=10>|
-    . $locale->text('October')
-    . qq|</option>
+    . $locale->text('October') . qq|</option>
                          <option value=11>|
-    . $locale->text('November')
-    . qq|</option>
+    . $locale->text('November') . qq|</option>
                          <option value=12>|
-    . $locale->text('December')
-    . qq|</option>|;
+    . $locale->text('December') . qq|</option>|;
 
   $form->{allequartale} =
       qq|<option selected value=1>|
@@ -184,11 +170,9 @@ sub export_bewegungsdaten {
     . qq|</option>
                          <option value=2>| . $locale->text('II') . qq|</option>
                          <option value=3>|
-    . $locale->text('III')
-    . qq|</option>
+    . $locale->text('III') . qq|</option>
                          <option value=4>|
-    . $locale->text('IV')
-    . qq|</option>|;
+    . $locale->text('IV') . qq|</option>|;
   $form->header;
 
   print qq|
@@ -210,24 +194,21 @@ sub export_bewegungsdaten {
       <table>
        <tr>
           <td align=left><input checked name=zeitraum class=radio type=radio value=monat>&nbsp;</td><td align=left>|
-    . $locale->text('Monat')
-    . qq|</td>
+    . $locale->text('Monat') . qq|</td>
           <td align=left></td>
          <td align=left></td>
           <td align=left><select name=monat>$form->{allemonate}</select></td>
         </tr>
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=quartal>&nbsp;</td><td align=left>|
-    . $locale->text('Quartal')
-    . qq|</td>
+    . $locale->text('Quartal') . qq|</td>
          <td align=left></td>
           <td align=left></td>
           <td align=left><select name=quartal>$form->{allequartale}</select></td>
         </tr>
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=zeit>&nbsp;</td><td align=left>|
-    . $locale->text('Datum von')
-    . qq|</td>
+    . $locale->text('Datum von') . qq|</td>
           <td align=left><input name=transdatefrom size=8></td>
          <td align=left>| . $locale->text('bis') . qq|</td>
           <td align=left><input name=transdateto size=8></td>

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 9e84029..b2b7885 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -620,15 +620,17 @@ sub generate_report {
         </tr>
 |;
   }
-   $form->{balance} *= $ml;
+  $form->{balance} *= $ml;
   foreach $ref (@{ $form->{GL} }) {
     $form->{balance} *= $ml;
+
     # if item ne sort print subtotal
     if ($form->{l_subtotal} eq 'Y') {
       if ($sameitem ne $ref->{ $form->{sort} }) {
         &gl_subtotal;
       }
     }
+
     #foreach $key (sort keys(%{ $ref->{amount} })) {
     #  $form->{balance} += $ref->{amount}{$key};
     #}
@@ -656,7 +658,7 @@ sub generate_report {
         $credit .= "<br>"
           . $form->format_amount(\%myconfig, $ref->{credit}{$key}, 2, 0);
       }
-      $form->{balance} = abs($form->{balance}) - abs( $ref->{credit}{$key});
+      $form->{balance} = abs($form->{balance}) - abs($ref->{credit}{$key});
     }
 
     $debittax = "";
@@ -698,9 +700,10 @@ sub generate_report {
         $debitaccno .=
           "<br><a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
       }
-#       if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
-#         $ref->{debit_tax_accno}{$key} = $taxaccno;
-#       }
+
+      #       if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+      #         $ref->{debit_tax_accno}{$key} = $taxaccno;
+      #       }
       $taxaccno    = $ref->{debit_tax_accno}{$key};
       $debittaxkey = $ref->{debit_taxkey}{$key};
     }
@@ -716,9 +719,10 @@ sub generate_report {
         $creditaccno .=
           "<br><a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
       }
-#       if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
-#         $ref->{credit_tax_accno}{$key} = $taxaccno;
-#       }
+
+      #       if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+      #         $ref->{credit_tax_accno}{$key} = $taxaccno;
+      #       }
       $taxaccno     = $ref->{credit_tax_accno}{$key};
       $credittaxkey = $ref->{credit_taxkey}{$key};
     }
@@ -776,9 +780,8 @@ sub generate_report {
     $column_data{gifi_accno}       =
       "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
     $column_data{balance} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0)
-      . "</td>";
+      "<td align=right>"
+      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";
 
     $i++;
     $i %= 2;
@@ -1052,13 +1055,14 @@ sub display_rows {
       <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:200px" tabindex=|
         . ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;
       $tax =
-          qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|
+        qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px" tabindex=|
         . ($i + 10 + (($i - 1) * 8))
         . qq|>$form->{taxchart}</select></td>|;
-#       if ($form->{selectprojectnumber}) {
-#         $project = qq|
-#     <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-#       }
+
+      #       if ($form->{selectprojectnumber}) {
+      #         $project = qq|
+      #     <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+      #       }
       $korrektur =
         qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
         . ($i + 9 + (($i - 1) * 8))
@@ -1107,14 +1111,14 @@ sub display_rows {
           . ($i + 10 + (($i - 1) * 8))
           . qq|>$tax</select></td>|;
 
-#         if ($form->{selectprojectnumber}) {
-#           $form->{"projectnumber_$i"} = ""
-#             if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
-# 
-#           $project = $form->{"projectnumber_$i"};
-#           $project =~ s/--.*//;
-#           $project = qq|<td>$project</td>|;
-#         }
+        #         if ($form->{selectprojectnumber}) {
+        #           $form->{"projectnumber_$i"} = ""
+        #             if $form->{selectprojectnumber} !~ /$form->{"projectnumber_$i"}/;
+        #
+        #           $project = $form->{"projectnumber_$i"};
+        #           $project =~ s/--.*//;
+        #           $project = qq|<td>$project</td>|;
+        #         }
 
         if ($form->{transfer}) {
           $checked = ($form->{"fx_transaction_$i"}) ? "1" : "";
@@ -1138,10 +1142,11 @@ sub display_rows {
         $tax = qq|
       <td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
           . ($i + 10 + (($i - 1) * 8)) . qq|>$taxchart</select></td>|;
-#         if ($form->{selectprojectnumber}) {
-#           $project = qq|
-#       <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
-#         }
+
+        #         if ($form->{selectprojectnumber}) {
+        #           $project = qq|
+        #       <td><select name="projectnumber_$i">$form->{selectprojectnumber}</select></td>|;
+        #         }
         $korrektur =
           qq|<td><input type="checkbox" name="korrektur_$i" value="1" tabindex=|
           . ($i + 9 + (($i - 1) * 8))
@@ -1182,9 +1187,10 @@ sub display_rows {
   }
 
   $form->hide_form(qw(rowcount selectaccno));
-#   print qq|
-# <input type=hidden name=selectprojectnumber value="|
-#     . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
+
+  #   print qq|
+  # <input type=hidden name=selectprojectnumber value="|
+  #     . $form->escape($form->{selectprojectnumber}, 1) . qq|">|;
   $lxdebug->leave_sub();
 
 }
@@ -1546,9 +1552,9 @@ sub post {
       unless (($form->{"debit_$i"} eq "") && ($form->{"credit_$i"} eq "")) {
         if ($form->{"debit_$i"} ne "") {
           $form->{"credit_$i"} = $form->{"debit_$i"};
-          $form->{"debit_$i"} = "";
+          $form->{"debit_$i"}  = "";
         } elsif ($form->{"credit_$i"} ne "") {
-          $form->{"debit_$i"} = $form->{"credit_$i"};
+          $form->{"debit_$i"}  = $form->{"credit_$i"};
           $form->{"credit_$i"} = "";
         }
       }

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index f6134db..bcd1405 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -33,6 +33,7 @@
 #$locale->text('ea');
 
 use SL::IC;
+
 #use SL::PE;
 
 require "$form->{path}/io.pl";
@@ -1934,7 +1935,7 @@ sub form_header {
   $lxdebug->enter_sub();
 
   my $dec = '';
-  
+
   #decimalplaces for listprice
   ($dec) = ($form->{listprice} =~ /\.(\d+)/);
   $dec = length $dec;
@@ -2718,7 +2719,8 @@ sub save {
   # $locale->text('Assembly Number missing!')
 
   # save part
-  $lxdebug->message(LXDebug::DEBUG1, "ic.pl: sellprice in save = $form->{sellprice}\n");
+  $lxdebug->message(LXDebug::DEBUG1,
+                    "ic.pl: sellprice in save = $form->{sellprice}\n");
   $rc = IC->save(\%myconfig, \%$form);
   if ($rc == 3) {
     $form->error($locale->text('Partnumber not unique!'));
@@ -2776,7 +2778,9 @@ sub save {
       if ($form->{exchangerate} != 0) {
         $form->{"sellprice_$i"} /= $form->{exchangerate};
       }
-      $lxdebug->message(LXDebug::DEBUG1, qq|sellprice_$i in previousform 2 = |.$form->{"sellprice_$i"}.qq|\n|);
+      $lxdebug->message(LXDebug::DEBUG1,
+                        qq|sellprice_$i in previousform 2 = |
+                          . $form->{"sellprice_$i"} . qq|\n|);
       map { $form->{"taxaccounts_$i"} .= "$_ " } split / /,
         $newform{taxaccount};
       chop $form->{"taxaccounts_$i"};
@@ -2797,10 +2801,12 @@ sub save {
 
       $form->{creditremaining} -= $amount;
 
-    # redo number formatting, because invoice parse them!
-    $i = $form->{rowcount};
-    map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) }
-    qw(weight listprice sellprice rop);
+      # redo number formatting, because invoice parse them!
+      $i = $form->{rowcount};
+      map {
+        $form->{"${_}_$i"} =
+          $form->format_amount(\%myconfig, $form->{"${_}_$i"})
+      } qw(weight listprice sellprice rop);
     }
 
     $form->{"id_$i"} = $parts_id;
@@ -2822,7 +2828,10 @@ sub save {
     }
     $form->{callback} = $callback;
   }
-  $lxdebug->message(LXDebug::DEBUG1, qq|ic.pl: sellprice_$i nach sub save = |.$form->{"sellprice_$i"}.qq|\n|);
+  $lxdebug->message(LXDebug::DEBUG1,
+                    qq|ic.pl: sellprice_$i nach sub save = |
+                      . $form->{"sellprice_$i"} . qq|\n|);
+
   # redirect
   $form->redirect;
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 03fd32a..4291cf5 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -399,7 +399,10 @@ sub display_row {
                  <input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
 |;
     if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
-      my $reqdate_term = ($form->{type} eq 'invoice')?'deliverydate':'reqdate'; # invoice uses a different term for the same thing.
+      my $reqdate_term =
+        ($form->{type} eq 'invoice')
+        ? 'deliverydate'
+        : 'reqdate';    # invoice uses a different term for the same thing.
       print qq|
         <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
 |;
@@ -441,9 +444,10 @@ sub set_pricegroup {
       $prices = '';
       $price  = 0;
       foreach $item (@{ $form->{PRICES}{$j} }) {
+
         #$price = $form->round_amount($myconfig,  $item->{price}, 5);
         #$price = $form->format_amount($myconfig, $item->{price}, 2);
-        $price = $item->{price};
+        $price         = $item->{price};
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
 
@@ -452,10 +456,11 @@ sub set_pricegroup {
           qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 
         $len += 1;
-#        map {
-#               $form->{"${_}_$j"} =
-#               $form->format_amount(\%myconfig, $form->{"${_}_$j"})
-#              } qw(sellprice price_new price_old);
+
+        #        map {
+        #               $form->{"${_}_$j"} =
+        #               $form->format_amount(\%myconfig, $form->{"${_}_$j"})
+        #              } qw(sellprice price_new price_old);
 
         # set new selectedpricegroup_id and prices for "Preis"
         if ($item->{selected} && ($pricegroup_id != 0)) {
@@ -771,39 +776,40 @@ sub display_form {
     &{"$form->{display_form}"};
     exit;
   }
-#   if (   $form->{print_and_post}
-#       && $form->{second_run}
-#       && ($form->{action} eq "display_form")) {
-#     for (keys %$form) { $old_form->{$_} = $form->{$_} }
-#     $old_form->{rowcount}++;
-# 
-#     #$form->{rowcount}--;
-#     #$form->{rowcount}--;
-# 
-#     $form->{print_and_post} = 0;
-# 
-#     &print_form($old_form);
-#     exit;
-#   }
-# 
-#   $form->{action}   = "";
-#   $form->{resubmit} = 0;
-# 
-#   if ($form->{print_and_post} && !$form->{second_run}) {
-#     $form->{second_run} = 1;
-#     $form->{action}     = "display_form";
-#     $form->{rowcount}--;
-#     my $rowcount = $form->{rowcount};
-# 
-#     # get pricegroups for parts
-#     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-# 
-#     # build up html code for prices_$i
-#     set_pricegroup($rowcount);
-# 
-#     $form->{resubmit} = 1;
-# 
-#   }
+
+  #   if (   $form->{print_and_post}
+  #       && $form->{second_run}
+  #       && ($form->{action} eq "display_form")) {
+  #     for (keys %$form) { $old_form->{$_} = $form->{$_} }
+  #     $old_form->{rowcount}++;
+  #
+  #     #$form->{rowcount}--;
+  #     #$form->{rowcount}--;
+  #
+  #     $form->{print_and_post} = 0;
+  #
+  #     &print_form($old_form);
+  #     exit;
+  #   }
+  #
+  #   $form->{action}   = "";
+  #   $form->{resubmit} = 0;
+  #
+  #   if ($form->{print_and_post} && !$form->{second_run}) {
+  #     $form->{second_run} = 1;
+  #     $form->{action}     = "display_form";
+  #     $form->{rowcount}--;
+  #     my $rowcount = $form->{rowcount};
+  #
+  #     # get pricegroups for parts
+  #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+  #
+  #     # build up html code for prices_$i
+  #     set_pricegroup($rowcount);
+  #
+  #     $form->{resubmit} = 1;
+  #
+  #   }
   &form_header;
 
   $numrows    = ++$form->{rowcount};
@@ -1264,7 +1270,7 @@ sub print_options {
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
   $form->{SM}{ $form->{sendmode} } = "selected";
-  
+
   if ($form->{type} eq 'purchase_order') {
     $type = qq|<select name=formname>
            <option value=purchase_order $form->{PD}{purchase_order}>|
@@ -1414,7 +1420,6 @@ sub print_options {
 sub print {
   $lxdebug->enter_sub();
 
-
   # if this goes to the printer pass through
   if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
     $form->error($locale->text('Select postscript or PDF!'))
@@ -1585,15 +1590,15 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  # format global dates 
+  # format global dates
   map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
     ("${inv}date", "${due}date", "shippingdate", "deliverydate");
 
   # format item dates
   for my $field (qw(transdate_oe deliverydate_oe)) {
-    map { 
-      $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1); 
-    } 0..$#{$form->{$field}};
+    map {
+      $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1);
+    } 0 .. $#{ $form->{$field} };
   }
 
   @a = qw(name street zipcode city country);

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 3e77049..7bbcc12 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -59,7 +59,7 @@ sub add {
   }
   &invoice_links;
   &prepare_invoice;
-  $form->{format} ="pdf";
+  $form->{format} = "pdf";
 
   &display_form;
 
@@ -76,7 +76,7 @@ sub edit {
     $form->error("Access Denied");
   }
   if ($form->{print_and_post}) {
-    $form->{action}     = "print";
+    $form->{action}   = "print";
     $form->{resubmit} = 1;
   }
   &invoice_links;
@@ -342,9 +342,12 @@ sub form_header {
 
     #write Trigger
     $jsscript =
-      Form->write_trigger(\%myconfig, "3", "invdate",      "BL", "trigger1",
-                                           "duedate",      "BL", "trigger2",
-                                           "deliverydate", "BL", "trigger3");
+      Form->write_trigger(\%myconfig,     "3",
+                          "invdate",      "BL",
+                          "trigger1",     "duedate",
+                          "BL",           "trigger2",
+                          "deliverydate", "BL",
+                          "trigger3");
   } else {
 
     # without JavaScript Calendar
@@ -354,8 +357,9 @@ sub form_header {
       qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
   }
   if ($form->{resubmit} && ($form->{format} eq "html")) {
-    $onload = qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
-  } elsif($form->{resubmit}) {
+    $onload =
+      qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
+  } elsif ($form->{resubmit}) {
     $onload = qq|document.invoice.submit()|;
   } else {
     $onload = "fokus()";
@@ -1083,7 +1087,7 @@ sub post {
 
   # get new invnumber in sequence if no invnumber is given or if posasnew was requested
   if (!$form->{invnumber} || $form->{postasnew}) {
-    $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
+    $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
   }
   if ($print_post) {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {

diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl
index fab414c..23dfa2a 100644 (file)
--- a/bin/mozilla/kopf.pl
+++ b/bin/mozilla/kopf.pl
@@ -107,9 +107,7 @@ print qq|
 <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
        <tr>
                <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>|
-  . $login
-  . $datum
-  . qq| <script>writeclock()</script>&nbsp;
+  . $login . $datum . qq| <script>writeclock()</script>&nbsp;
                </td>
        </tr>
 </table>

diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl
index 300673a..52e5e4f 100644 (file)
--- a/bin/mozilla/licenses.pl
+++ b/bin/mozilla/licenses.pl
@@ -87,8 +87,7 @@ sub print_part_selection {
 <table width=100%>
   <tr>
     <th class=listtop colspan=5>|
-      . $locale->text('Select from one of the items below')
-      . qq|</th>
+      . $locale->text('Select from one of the items below') . qq|</th>
   </tr>
   <tr height="5"></tr>
   <tr class=listheading>
@@ -111,13 +110,9 @@ sub print_part_selection {
       qq|<tr class=listrow$j>
       <td><input name=ndx class=radio type=radio value=$i $checked></td>
       <td><input name=\"new_partnumber_$i\" type=hidden value=\"|
-        . $p{"partnumber"} . qq|\">|
-        . $p{"partnumber"}
-        . qq|</td>
+        . $p{"partnumber"} . qq|\">| . $p{"partnumber"} . qq|</td>
       <td><input name=\"new_description_$i\" type=hidden value=\"|
-        . $p{"description"} . qq|\">|
-        . $p{"description"}
-        . qq|</td>
+        . $p{"description"} . qq|\">| . $p{"description"} . qq|</td>
       <input name=\"new_parts_id_$i\" type=hidden value=\"| . $p{"id"} . qq|\">
     </tr>|);
 
@@ -145,8 +140,7 @@ sub print_customer_selection {
 <table width=100%>
   <tr>
     <th class=listtop colspan=5>|
-      . $locale->text('Select from one of the names below')
-      . qq|</th>
+      . $locale->text('Select from one of the names below') . qq|</th>
   </tr>
   <tr height="5"></tr>
   <tr class=listheading>
@@ -174,11 +168,9 @@ sub print_customer_selection {
       qq|<tr class=listrow$j>
           <td><input name=ndx class=radio type=radio value=$i $checked></td>
           <td><input name=\"new_customer_id_$i\" type=hidden value=\"|
-        . $c{"id"}
-        . qq|\">$c{"customernumber"}</td>
+        . $c{"id"} . qq|\">$c{"customernumber"}</td>
           <td><input name=\"new_customer_name_$i\" type=hidden value=\"|
-        . $c{"name"}
-        . qq|\">$c{"name"}</td>
+        . $c{"name"} . qq|\">$c{"name"}</td>
           <td>$c{"street"}</td>
           <td>$c{"zipcode"}</td>
           <td>$c{"city"}</td>
@@ -211,14 +203,12 @@ sub print_license_form {
       <tr>
         <th align=right>| . $locale->text('Part Number') . qq|</th>
         <td><input name=partnumber value=\"|
-      . quot($form->{"partnumber"})
-      . qq|\"></td>
+      . quot($form->{"partnumber"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('Description') . qq|</th>
         <td><input name=description value=\"|
-      . quot($form->{"description"})
-      . qq|\"></td>
+      . quot($form->{"description"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('Company Name') . qq|</th>|);
@@ -242,26 +232,22 @@ sub print_license_form {
       <tr>
         <th align=right>| . $locale->text('Comment') . qq|</th>
         <td><input name=comment value=\"|
-      . quot($form->{"comment"})
-      . qq|\"></td>
+      . quot($form->{"comment"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('Valid until') . qq|</th>
         <td><input name=validuntil value=\"|
-      . quot($form->{"validuntil"})
-      . qq|\"></td>
+      . quot($form->{"validuntil"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('Quantity') . qq|</th>
         <td><input name=quantity value=\"|
-      . quot($form->{"quantity"})
-      . qq|\"></td>
+      . quot($form->{"quantity"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('License key') . qq|</th>
         <td><input name=licensenumber value=\"|
-      . quot($form->{"licensenumber"})
-      . qq|\"></td>
+      . quot($form->{"licensenumber"}) . qq|\"></td>
       </tr>
       <tr>
         <th align=right>| . $locale->text('Own Product') . qq|</th>
@@ -276,8 +262,7 @@ sub print_license_form {
     print(
       qq|&nbsp;
           <input type=submit name=action value=\"|
-        . $locale->text('Save')
-        . qq|\">\n|);
+        . $locale->text('Save') . qq|\">\n|);
   }
   print(
     qq|
@@ -291,7 +276,8 @@ sub add {
   $lxdebug->enter_sub();
   if (!$lizenzen) {
     $form->error(
-                 $locale->text('The licensing module has been deactivated in lx-erp.conf.')
+                 $locale->text(
+                   'The licensing module has been deactivated in lx-erp.conf.')
     );
   }
 
@@ -487,8 +473,7 @@ sub search {
       . $locale->text('Expiring in x month(s)')
       . qq|&nbsp;<input size=4 name=expiring_in value="1"><br>
         <input type=checkbox name=show_expired value=1>|
-      . $locale->text('Expired licenses')
-      . qq|</td>
+      . $locale->text('Expired licenses') . qq|</td>
       </tr>
     </table>
   </tr>
@@ -542,7 +527,8 @@ sub do_search {
         |);
   if (scalar(@{ $form->{"licenses"} }) == 0) {
     print(qq|</table>|
-            . $locale->text("No licenses were found that match the search criteria.")
+            . $locale->text(
+                      "No licenses were found that match the search criteria.")
             . qq|</body></html>|);
     exit(0);
   }
@@ -561,9 +547,7 @@ sub do_search {
       . $locale->text('Description')
       . qq|</a></th>
         <th class=listtop><a class=listheading href=\"|
-      . $columns{"name"} . "\">"
-      . $locale->text('Company Name')
-      . qq|</a></th>
+      . $columns{"name"} . "\">" . $locale->text('Company Name') . qq|</a></th>
         <th class=listtop><a class=listheading href=\"|
       . $columns{"validuntil"} . "\">"
       . $locale->text('Valid until')

diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index 64a1f58..57b2e02 100644 (file)
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -152,9 +152,7 @@ function clockon() {
 <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
        <tr>
                <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>|
-    . $login
-    . $datum
-    . qq| <script>writeclock()</script>&nbsp;
+    . $login . $datum . qq| <script>writeclock()</script>&nbsp;
                </td>
        </tr>
 </table>

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d05745b..baa041f 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -79,8 +79,9 @@ sub edit {
 
   # editing without stuff to edit? try adding it first
   if ($form->{rowcount}) {
-    map {$id++ if $form->{"id_$_"}} (1 .. $form->{rowcount});
+    map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount});
     if (!$id) {
+
       # reset rowcount
       undef $form->{rowcount};
       &add;
@@ -131,18 +132,24 @@ sub order_links {
   # retrieve order/quotation
   $form->{webdav} = $webdav;
 
-
   # set jscalendar
   $form->{jscalendar} = $jscalendar;
 
   OE->retrieve(\%myconfig, \%$form);
 
   # if multiple rowcounts (== collective order) then check if the
-  # there were more than one customer (in that case OE::retrieve removes 
+  # there were more than one customer (in that case OE::retrieve removes
   # the content from the field)
-  if ($form->{rowcount} && $form->{type} eq 'sales_order' && defined $form->{customer} && $form->{customer} eq '') {
-#    $main::lxdebug->message(0, "Detected Edit order with concurrent customers");
-    $form->error($locale->text('Collective Orders only work for orders from one customer!'));
+  if (   $form->{rowcount}
+      && $form->{type} eq 'sales_order'
+      && defined $form->{customer}
+      && $form->{customer} eq '') {
+
+    #    $main::lxdebug->message(0, "Detected Edit order with concurrent customers");
+    $form->error(
+                 $locale->text(
+                   'Collective Orders only work for orders from one customer!')
+    );
   }
 
   $taxincluded = $form->{taxincluded};
@@ -221,40 +228,42 @@ sub prepare_order {
   $form->{media}    = "screen";
   $form->{formname} = $form->{type};
 
-    map { $form->{$_} =~ s/\"/"/g }
-      qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
+  map { $form->{$_} =~ s/\"/"/g }
+    qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact);
 
-    foreach $ref (@{ $form->{form_details} }) {
-      $form->{rowcount} = ++$i;
+  foreach $ref (@{ $form->{form_details} }) {
+    $form->{rowcount} = ++$i;
 
-      map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
-    }
-    for my $i (1 .. $form->{rowcount}) {
-      if ($form->{id}) {
-        $form->{"discount_$i"} =
-          $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
-      } else {
-        $form->{"discount_$i"} =
-          $form->format_amount(\%myconfig, $form->{"discount_$i"});
-      }
-      ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);    
-      $dec           = length $dec;
-      $decimalplaces = ($dec > 2) ? $dec : 2;
-
-      # copy reqdate from deliverydate for invoice -> order conversion
-      $form->{"reqdate_$i"} = $form->{"deliverydate_$i"} unless $form->{"reqdate_$i"};
-
-      $form->{"sellprice_$i"} =
-        $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
-                            $decimalplaces);
-      
-      (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
-      $dec_qty      = length $dec_qty;
-      $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-
-      map { $form->{"${_}_$i"} =~ s/\"/"/g }
-        qw(partnumber description unit);
+    map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
+  }
+  for my $i (1 .. $form->{rowcount}) {
+    if ($form->{id}) {
+      $form->{"discount_$i"} =
+        $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
+    } else {
+      $form->{"discount_$i"} =
+        $form->format_amount(\%myconfig, $form->{"discount_$i"});
     }
+    ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+    $dec           = length $dec;
+    $decimalplaces = ($dec > 2) ? $dec : 2;
+
+    # copy reqdate from deliverydate for invoice -> order conversion
+    $form->{"reqdate_$i"} = $form->{"deliverydate_$i"}
+      unless $form->{"reqdate_$i"};
+
+    $form->{"sellprice_$i"} =
+      $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
+                           $decimalplaces);
+
+    (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+    $dec_qty = length $dec_qty;
+    $form->{"qty_$i"} =
+      $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
+
+    map { $form->{"${_}_$i"} =~ s/\"/"/g }
+      qw(partnumber description unit);
+  }
 
   $lxdebug->leave_sub();
 }
@@ -883,7 +892,6 @@ Bearbeiten des $form->{heading}<br>
       . $locale->text('Invoice') . qq|">
 |;
   }
-  
 
   if ($form->{menubar}) {
     require "$form->{path}/menu.pl";
@@ -983,6 +991,7 @@ sub update {
         } else {
 
           $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
+
           # if there is an exchange rate adjust sellprice
           $form->{"sellprice_$i"} /= $exchangerate;
         }
@@ -1036,7 +1045,6 @@ sub update {
     }
   }
 
-
   $lxdebug->leave_sub();
 }
 
@@ -1515,7 +1523,8 @@ sub orders {
     $subtotalnetamount += $oe->{netamount};
     $subtotalamount    += $oe->{amount};
 
-    $column_data{ids}    = qq|<td><input name="id_$j" class=checkbox type=checkbox><input type="hidden" name="trans_id_$j" value="$oe->{id}"></td>|;
+    $column_data{ids} =
+      qq|<td><input name="id_$j" class=checkbox type=checkbox><input type="hidden" name="trans_id_$j" value="$oe->{id}"></td>|;
     $column_data{id}        = "<td>$oe->{id}</td>";
     $column_data{transdate} = "<td>$oe->{transdate}&nbsp;</td>";
     $column_data{reqdate}   = "<td>$oe->{reqdate}&nbsp;</td>";
@@ -1581,13 +1590,13 @@ sub orders {
   </tr>
 </table>|;
 
-# multiple invoice edit button only if gotten there via sales_order form.
+  # multiple invoice edit button only if gotten there via sales_order form.
 
-if ($form->{type} =~ /sales_order/) {
-print qq|
+  if ($form->{type} =~ /sales_order/) {
+    print qq|
   <input type="hidden" name="path" value="$form->{path}">
   <input class"submit" type="submit" name="action" value="|
-. $locale->text('Continue') .qq|">
+      . $locale->text('Continue') . qq|">
   <input type="hidden" name="nextsub" value="edit">
   <input type="hidden" name="type" value="$form->{type}">
   <input type="hidden" name="warehouse" value="$warehouse">
@@ -1596,9 +1605,9 @@ print qq|
   <input type="hidden" name="password" value="$form->{password}">
   <input type="hidden" name="callback" value="$callback">
   <input type="hidden" name="rowcount" value="$form->{rowcount}">|;
-}
+  }
 
-print qq|
+  print qq|
 </form>
 
 <br>
@@ -1804,10 +1813,15 @@ sub invoice {
   $lxdebug->enter_sub();
 
   if ($form->{type} =~ /_order$/) {
+
     # these checks only apply if the items don't bring their own ordnumbers/transdates.
     # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields.
-    $form->isblank("ordnumber", $locale->text('Order Number missing!')) if ( +{ map { $form->{"ordnumber_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} );
-    $form->isblank("transdate", $locale->text('Order Date missing!'))   if ( +{ map { $form->{"transdate_$_"}, 1 } ( 1 .. $form->{rowcount}-1 ) }->{''} );
+    $form->isblank("ordnumber", $locale->text('Order Number missing!'))
+      if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
+          ->{''});
+    $form->isblank("transdate", $locale->text('Order Date missing!'))
+      if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
+          ->{''});
 
     # also copy deliverydate from the order
     $form->{deliverydate} = $form->{reqdate} if $form->{reqdate};
@@ -1846,7 +1860,7 @@ sub invoice {
   # close orders/quotations
   $form->{closed} = 1;
 
-  # save order if one ordnumber has been given 
+  # save order if one ordnumber has been given
   # if not it's most likely a collective order, which can't be saved back
   # so they just have to be closed
   if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
@@ -1927,15 +1941,17 @@ sub invoice {
     $decimalplaces = ($dec > 2) ? $dec : 2;
 
     # copy delivery date from reqdate for order -> invoice conversion
-    $form->{"deliverydate_$i"} = $form->{"reqdate_$i"} unless $form->{"deliverydate_$i"};
+    $form->{"deliverydate_$i"} = $form->{"reqdate_$i"}
+      unless $form->{"deliverydate_$i"};
 
     $form->{"sellprice_$i"} =
       $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
                            $decimalplaces);
-    
+
     (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
-      $dec_qty      = length $dec_qty;
-    $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
+    $dec_qty = length $dec_qty;
+    $form->{"qty_$i"} =
+      $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
 
     map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
       qw(partnumber description unit);

diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl
index 9dfb1e1..2a17429 100644 (file)
--- a/bin/mozilla/rc.pl
+++ b/bin/mozilla/rc.pl
@@ -298,11 +298,10 @@ sub display_form {
   $clearedbalance = $form->format_amount(\%myconfig, $clearedbalance, 2, 0);
 
   if ($fx) {
-    $fx = $form->format_amount(\%myconfig, $fx, 2, 0);
+    $fx       = $form->format_amount(\%myconfig, $fx, 2, 0);
     $exchdiff = qq|
                <th align=right nowrap>|
-      . $locale->text('Exchangerate Difference')
-      . qq|</th>
+      . $locale->text('Exchangerate Difference') . qq|</th>
                <td width=10%></td>
                <td align=right>$fx</td>
 |;

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 32ec6ef..34b1284 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -269,8 +269,7 @@ sub report {
          <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;|
       . $locale->text('Heading') . qq|
          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Subtotal')
-      . qq|</td>
+      . $locale->text('Subtotal') . qq|</td>
        </tr>
 
 $jsscript
@@ -288,14 +287,12 @@ $jsscript
 <table>
        <tr>
          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Customized Report')
-      . qq|</th>
+      . $locale->text('Customized Report') . qq|</th>
        </tr>
        <tr>
          <th colspan=1>| . $locale->text('Year') . qq|</th>
          <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
        </tr>
 |;
 
@@ -310,70 +307,54 @@ $jsscript
                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 "checked"></td>
                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "";
     print qq|
                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
        </tr>
        <tr>
                <td align= right>&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
        </tr>
        <tr>
@@ -381,8 +362,7 @@ $jsscript
        </tr>
        <tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period')
-      . qq|</th>
+      . $locale->text('Free report period') . qq|</th>
          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
              $button1
               $button1_2&nbsp;
@@ -399,8 +379,7 @@ $jsscript
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
 
 $jsscript
@@ -418,14 +397,12 @@ $jsscript
 <table>
        <tr>
          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Customized Report')
-      . qq|</th>
+      . $locale->text('Customized Report') . qq|</th>
        </tr>
        <tr>
          <th colspan=1>| . $locale->text('Year') . qq|</th>
          <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
        </tr>
 |;
 
@@ -440,70 +417,54 @@ $jsscript
                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
        </tr>
        <tr>
                <td align= right>&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
        </tr>
        <tr>
@@ -511,8 +472,7 @@ $checked></td>
        </tr>
        <tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period')
-      . qq|</th>
+      . $locale->text('Free report period') . qq|</th>
          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
              $button1
               $button1_2&nbsp;
@@ -529,11 +489,12 @@ $checked></td>
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
         <tr>
-         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
+         <th align=right colspan=4>|
+      . $locale->text('Decimalplaces')
+      . qq|</th>
              <td><input name=decimalplaces size=3></td>
          </tr>
                                     
@@ -551,14 +512,12 @@ $jsscript
 <table>
        <tr>
          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Zeitraum')
-      . qq|</th>
+      . $locale->text('Zeitraum') . qq|</th>
        </tr>
        <tr>
          <th colspan=1>| . $locale->text('Year') . qq|</th>
          <td><input name=year size=11 title="|
-      . $locale->text('YYYY')
-      . qq|" value="$year"></td>
+      . $locale->text('YYYY') . qq|" value="$year"></td>
        </tr>
 |;
 
@@ -573,70 +532,54 @@ $jsscript
                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January')
-      . qq|</td>
+      . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May')
-      . qq|</td>
+      . $locale->text('May') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September')
-      . qq|</td>
+      . $locale->text('September') . qq|</td>
 
        </tr>
        <tr>
                <td align= right>&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February')
-      . qq|</td>
+      . $locale->text('February') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June')
-      . qq|</td>
+      . $locale->text('June') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October')
-      . qq|</td>
+      . $locale->text('October') . qq|</td>
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter')
-      . qq|</td>
+      . $locale->text('Quarter') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March')
-      . qq|</td>
+      . $locale->text('March') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July')
-      . qq|</td>
+      . $locale->text('July') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November')
-      . qq|</td>
+      . $locale->text('November') . qq|</td>
 
        </tr>
        <tr>
                <td> &nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter')
-      . qq|&nbsp;</td>
+      . $locale->text('Quarter') . qq|&nbsp;</td>
                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April')
-      . qq|</td>
+      . $locale->text('April') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August')
-      . qq|</td>
+      . $locale->text('August') . qq|</td>
                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December')
-      . qq|</td>
+      . $locale->text('December') . qq|</td>
 
        </tr>
        <tr>
@@ -647,8 +590,7 @@ $checked></td>
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
        <tr>
          <th colspan=4>|;
@@ -691,8 +633,7 @@ $checked></td>
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
 
        <tr>
@@ -702,8 +643,7 @@ $checked></td>
          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
       . $locale->text('Subtotal') . qq|
          <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Account Number')
-      . qq|</td>
+      . $locale->text('Account Number') . qq|</td>
        </tr>
 
 $jsscript
@@ -739,8 +679,7 @@ $jsscript
          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
       . $locale->text('Subtotal') . qq|
          <input name=all_accounts class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('All Accounts')
-      . qq|</td>
+      . $locale->text('All Accounts') . qq|</td>
        </tr>
 
 $jsscript
@@ -817,8 +756,7 @@ $jsscript
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
       </table>
     </td>
@@ -891,8 +829,7 @@ $jsscript
          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR')
-      . qq|</td>
+      . $locale->text('EUR') . qq|</td>
        </tr>
         <tr>
          <th align=right>| . $locale->text('Include in Report') . qq|</th>
@@ -1034,8 +971,7 @@ $jsscript
         <tr>
          <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
          <th align=left colspan=3>|
-      . $locale->text('Include Exchangerate Difference')
-      . qq|</td>
+      . $locale->text('Include Exchangerate Difference') . qq|</td>
        </tr>
 
 $jsscript

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 2e42f18..4ee7638 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -76,7 +76,11 @@ sub report {
   $form->{title} = $locale->text('UStVA');
   $form->{kz10}  = '';                       #Berichtigte Anmeldung? Ja =1
 
-  my $year = substr($form->datetonum($form->current_date(\%myconfig), \%myconfig),0,4);
+  my $year = substr(
+                    $form->datetonum($form->current_date(\%myconfig),
+                                     \%myconfig
+                    ),
+                    0, 4);
 
   my $department = '';
   local $hide = '';
@@ -103,7 +107,7 @@ sub report {
   # Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
   # Einlesen der Finanzamtdaten
   &get_config($userspath, 'finanzamt.ini');
-  
+
   # Hier Einlesen der user-config
   # steuernummer entfernt für prerelease
   my @a = qw(signature name company address businessnumber tel fax email
@@ -134,7 +138,7 @@ sub report {
            | . $locale->text('Kein Firmenname hinterlegt!') . qq|</a><br>
     |;
   }
-  
+
   # Anpassungen der Variablennamen auf pre 2.1.1 Namen
   # klären, ob $form->{company_street|_address} gesetzt sind
   #
@@ -145,24 +149,24 @@ sub report {
     ($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
   }
 
-  if (    $form->{co_street} ne ''
-      and ($form->{co_zip} ne ''
-      or $form->{co_city} ne '') ) {
+  if ($form->{co_street} ne ''
+      and (   $form->{co_zip} ne ''
+           or $form->{co_city} ne '')
+    ) {
     print qq|
     $form->{co_street}<br>
     $form->{co_street1}<br>
     $form->{co_zip} $form->{co_city}|;
-      } else {
+    } else {
     print qq|
          <a href=am.pl?path=$form->{path}&action=config&level=Programm--Preferences&login=$form->{login}&password=$form->{password}>
          | . $locale->text('Keine Firmenadresse hinterlegt!') . qq|</a>\n|;
   }
-  $form->{co_email}=$form->{email} unless $form->{co_email};
-  $form->{co_tel}=$form->{tel} unless $form->{co_tel};
-  $form->{co_fax}=$form->{fax} unless $form->{co_fax};
-  $form->{co_url}=$form->{urlx} unless $form->{co_url};
-  
-  
+  $form->{co_email} = $form->{email} unless $form->{co_email};
+  $form->{co_tel}   = $form->{tel}   unless $form->{co_tel};
+  $form->{co_fax}   = $form->{fax}   unless $form->{co_fax};
+  $form->{co_url}   = $form->{urlx}  unless $form->{co_url};
+
   print qq|
          <br>
          <br>
@@ -227,7 +231,7 @@ sub report {
 
     # accounting years if SQL-Ledger Version < 2.4.1
     #    $year = $form->{year} * 1;
-    @years = sort { $b <=> $a } (2003 .. ($year+1));
+    @years = sort { $b <=> $a } (2003 .. ($year + 1));
     $form->{all_years} = \@years;
   }
   map { $form->{selectaccountingyear} .= qq|<option>$_\n| }
@@ -415,7 +419,9 @@ sub report {
      <legend>
      <b>| . $locale->text('Hinweise') . qq|</b>
      </legend>
-      <h2 class="confirm">| . $locale->text('Missing Preferences: Outputroutine disabled') . qq|</h2>
+      <h2 class="confirm">|
+      . $locale->text('Missing Preferences: Outputroutine disabled')
+      . qq|</h2>
       <h3>| . $locale->text('Help:') . qq|</h3>
       <ul>
       <li>| . $locale->text('Hint-Missing-Preferences') . qq|</li>
@@ -482,6 +488,7 @@ sub report {
 
 sub help {
   $lxdebug->enter_sub();
+
   # parse help documents under doc
   my $tmp = $form->{templates};
   $form->{templates} = 'doc';
@@ -496,6 +503,7 @@ sub help {
 
 sub show {
   $lxdebug->enter_sub();
+
   #&generate_ustva();
   no strict 'refs';
   $lxdebug->leave_sub();
@@ -505,6 +513,7 @@ sub show {
 
 sub ustva_vorauswahl {
   $lxdebug->enter_sub();
+
   #Aktuelles Datum zerlegen:
   my $date = $form->datetonum($form->current_date(\%myconfig), \%myconfig);
 
@@ -517,7 +526,7 @@ sub ustva_vorauswahl {
     Actual year from Database: $form->{year}\n
     Actual day from Database: $form->{day}\n
     Actual month from Database: $form->{month}\n|);
-  
+
   my $sel    = '';
   my $yymmdd = '';
 
@@ -552,15 +561,14 @@ sub ustva_vorauswahl {
                  '10' => 'October',
                  '11' => 'November',
                  '12' => 'December',
-                 '13' => 'Yearly',
-                );
-       
+                 '13' => 'Yearly',);
+
     my $yy = $form->{year} * 10000;
     $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
     $yymmdd = 20060121;
     $sel    = '';
-    my $dfv = '0';    
-    
+    my $dfv = '0';
+
     # Offset für Dauerfristverlängerung
     $dfv = '100' if ($form->{FA_dauerfrist} eq '1');
 
@@ -626,8 +634,7 @@ sub ustva_vorauswahl {
       $selected = 'selected' if ($sel eq $key);
       print qq|
          <option value="$key" $selected>|
-        . $locale->text("$liste{$key}")
-        . qq|</option>
+        . $locale->text("$liste{$key}") . qq|</option>
          
    |;
     }
@@ -636,12 +643,11 @@ sub ustva_vorauswahl {
   } elsif ($form->{FA_voranmeld} eq 'quarter') {
 
     # Vorauswahl bei quartalsweisem Voranmeldungszeitraum
-    my %liste = ( 'A' => $locale->text('1. Quarter'),
-                  'B' => $locale->text('2. Quarter'),
-                  'C' => $locale->text('3. Quarter'),
-                  'D' => $locale->text('4. Quarter'),
-                 '13' => $locale->text('Yearly'),
-                 );
+    my %liste = ('A'  => $locale->text('1. Quarter'),
+                 'B'  => $locale->text('2. Quarter'),
+                 'C'  => $locale->text('3. Quarter'),
+                 'D'  => $locale->text('4. Quarter'),
+                 '13' => $locale->text('Yearly'),);
 
     my $yy = $form->{year} * 10000;
     $yymmdd = "$form->{year}$form->{month}$form->{day}" * 1;
@@ -708,19 +714,20 @@ sub ustva_vorauswahl {
                   '10' => 'October',
                   '11' => 'November',
                   '12' => 'December',
-                  '13' => 'Yearly',
-                  );
+                  '13' => 'Yearly',);
     my $key = '';
     foreach $key (sort keys %listea) {
       print qq|
-         <option value="$key">| . $locale->text("$listea{$key}"). 
-         qq|</option>\n|;
+         <option value="$key">|
+        . $locale->text("$listea{$key}")
+        . qq|</option>\n|;
     }
 
     foreach $key (sort keys %listeb) {
       print qq|
-         <option value="$key">| . $locale->text("$listeb{$key}"). 
-         qq|</option>\n|;
+         <option value="$key">|
+        . $locale->text("$listeb{$key}")
+        . qq|</option>\n|;
     }
     print qq|</select>|;
   }
@@ -773,8 +780,7 @@ sub show_options {
     $type
     $media
     <select name=format title = "|
-    . $locale->text('Ausgabeformat auswählen...')
-    . qq|">$format</select>
+    . $locale->text('Ausgabeformat auswählen...') . qq|">$format</select>
   |;
   $lxdebug->leave_sub();
 }
@@ -798,8 +804,13 @@ sub generate_ustva {
 
     #forgotten the year --> thisyear
     if ($form->{year} !~ m/^\d\d\d\d$/) {
-      $form->{year} = substr($form->datetonum($form->current_date(\%myconfig), \%myconfig),0,4);
-      $lxdebug->message(LXDebug::DEBUG1, qq|Actual year from Database: $form->{year}\n|);
+      $form->{year} = substr(
+                             $form->datetonum(
+                                    $form->current_date(\%myconfig), \%myconfig
+                             ),
+                             0, 4);
+      $lxdebug->message(LXDebug::DEBUG1,
+                        qq|Actual year from Database: $form->{year}\n|);
     }
 
     #yearly report
@@ -912,17 +923,16 @@ sub generate_ustva {
 
   # using dates in ISO-8601 format: yyyymmmdd  for Postgres...
   USTVA->ustva(\%myconfig, \%$form);
-  
+
   # reformat Dates to dateformat
-  $form->{fromdate}= $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
-  
+  $form->{fromdate} = $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
+
   $form->{todate} = $form->current_date($myconfig) unless $form->{todate};
-  $form->{todate}= $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
+  $form->{todate} = $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
 
   $form->{period} =
     $locale->date(\%myconfig, $form->current_date(\%myconfig), 1, 0, 0);
 
-
   # if there are any dates construct a where
   if ($form->{fromdate} || $form->{todate}) {
 
@@ -989,27 +999,28 @@ sub generate_ustva {
     $form->{endbold} = "}";
     $form->{br}      = '\\\\';
 
-    
     my @numbers = qw(511 861 36 80 971 931 98 96 53 74
-                     85 65 66 61 62 Z67 63 64 59 69 39 83
-                     Z43 Z45 Z53 Z62 Z65);
-      
+      85 65 66 61 62 Z67 63 64 59 69 39 83
+      Z43 Z45 Z53 Z62 Z65);
+
     my $number = '';
+
     # Zahlenformatierung für Latex USTVA Formulare
-    if ($myconfig{numberformat} eq '1.000,00' or 
-         $myconfig{numberformat} eq '1000,00') {
+    if (   $myconfig{numberformat} eq '1.000,00'
+        or $myconfig{numberformat} eq '1000,00') {
       foreach $number (@numbers) {
         $form->{$number} =~ s/,/~~/g;
       }
-    }  
-    if ($myconfig{numberformat} eq '1000.00' or 
-         $myconfig{numberformat} eq '1,000.00') {
+    }
+    if (   $myconfig{numberformat} eq '1000.00'
+        or $myconfig{numberformat} eq '1,000.00') {
       foreach $number (@numbers) {
         $form->{$number} =~ s/\./~~/g;
       }
     }
-  # Formatierungen für HTML Ausgabe
-  } elsif ($form->{format} eq 'html') {
+
+    # Formatierungen für HTML Ausgabe
+      } elsif ($form->{format} eq 'html') {
     $form->{padding} = "&nbsp;&nbsp;";
     $form->{bold}    = "<b>";
     $form->{endbold} = "</b>";
@@ -1019,9 +1030,12 @@ sub generate_ustva {
   }
 
   if ($form->{format} eq 'elster') {
-    if ($form->{duetyp} eq '13'){
+    if ($form->{duetyp} eq '13') {
       $form->header;
-      USTVA::info($locale->text('Impossible to create yearly Tax Report via Winston.<br \> Not yet implemented!'));
+      USTVA::info(
+        $locale->text(
+          'Impossible to create yearly Tax Report via Winston.<br \> Not yet implemented!'
+        ));
     } else {
       &create_winston();
     }
@@ -1031,14 +1045,18 @@ sub generate_ustva {
 
     $form->{IN} = "$form->{type}";
     $form->{IN} = "$form->{help}" if ($form->{type} eq 'help');
-    $form->{IN} = 'USTE' if ($form->{duetyp} eq '13' && 
-                             $form->{format} ne 'html');
-    
-    if ($form->{IN} eq 'USTE'){
+    $form->{IN} = 'USTE'
+      if (   $form->{duetyp} eq '13'
+          && $form->{format} ne 'html');
+
+    if ($form->{IN} eq 'USTE') {
       $form->header;
-      USTVA::info($locale->text('Impossible to create yearly Tax Report as PDF or PS.<br \> Not yet implemented!'));
+      USTVA::info(
+        $locale->text(
+          'Impossible to create yearly Tax Report as PDF or PS.<br \> Not yet implemented!'
+        ));
     }
-    
+
     $form->{IN} .= "-$form->{year}"
       if (   $form->{format} eq 'pdf'
           or $form->{format} eq 'postscript');
@@ -1058,6 +1076,7 @@ sub generate_ustva {
 
 sub edit {
   $lxdebug->enter_sub();
+
   # edit all taxauthority prefs
 
   $form->header;
@@ -1080,16 +1099,14 @@ sub edit {
      <table width=100%>
        <tr>
          <th class="listtop">|
-    . $locale->text('Finanzamt - Einstellungen')
-    . qq|</th>
+    . $locale->text('Finanzamt - Einstellungen') . qq|</th>
        </tr>
         <tr>
          <td>
            <br>
            <fieldset>
            <legend><b>|
-    . $locale->text('Angaben zum Finanzamt')
-    . qq|</b></legend>
+    . $locale->text('Angaben zum Finanzamt') . qq|</b></legend>
   |;
 
   #print qq|$form->{terminal}|;
@@ -1139,8 +1156,7 @@ sub edit {
   print qq|
            <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1" $checked>
            <label for="">|
-    . $locale->text('Dauerfristverlängerung')
-    . qq|</label>
+    . $locale->text('Dauerfristverlängerung') . qq|</label>
            
            </fieldset>
            <br>
@@ -1193,8 +1209,7 @@ sub edit {
            <br>
            <hr>
            <!--<input type=submit class=submit name=action value="|
-    . $locale->text('debug')
-    . qq|">-->
+    . $locale->text('debug') . qq|">-->
            |;
   print qq|
            <input type="button" name="Verweis" value="|
@@ -1263,22 +1278,19 @@ sub edit_form {
     if ($form->{saved} eq $locale->text('saved'));
 
   # Auf Übergabefehler checken
-  USTVA::info(
-    $locale->text('Missing Tax Authoritys Preferences') . "\n" . 
-    $locale->text('USTVA-Hint: Tax Authoritys'))
+  USTVA::info(  $locale->text('Missing Tax Authoritys Preferences') . "\n"
+              . $locale->text('USTVA-Hint: Tax Authoritys'))
     if (   $form->{elsterFFFF_new} eq 'Auswahl'
         || $form->{elsterland_new} eq 'Auswahl');
-  USTVA::info(
-    $locale->text('Missing Method!') . "\n" . 
-    $locale->text('USTVA-Hint: Method'))
+  USTVA::info(  $locale->text('Missing Method!') . "\n"
+              . $locale->text('USTVA-Hint: Method'))
     if ($form->{method} eq '');
 
   # Klären, ob Variablen bereits befüllt sind UND ob veräderungen auf
   # der vorherigen Maske stattfanden: $change = 1(in der edit sub,
   # mittels get_config)
 
-  my $change =
-       $form->{elsterland} eq $form->{elsterland_new}
+  my $change = $form->{elsterland} eq $form->{elsterland_new}
     && $form->{elsterFFFF} eq $form->{elsterFFFF_new} ? '0' : '1';
   $change = '0' if ($form->{saved} eq $locale->text('saved'));
   my $elster_init = &elster_hash();
@@ -1339,8 +1351,7 @@ sub edit_form {
    <table width="100%">
        <tr>
         <th colspan="2" class="listtop">|
-    . $locale->text('Finanzamt - Einstellungen')
-    . qq|</th>
+    . $locale->text('Finanzamt - Einstellungen') . qq|</th>
        </tr>
        <tr>
          <td colspan=2>
@@ -1579,8 +1590,7 @@ sub show_fa_daten {
                <fieldset>
                <legend>
                <font size="+1">|
-    . $locale->text('Finanzamt')
-    . qq| $form->{FA_Name}</font>
+    . $locale->text('Finanzamt') . qq| $form->{FA_Name}</font>
                </legend>
   |;
 
@@ -1942,6 +1952,7 @@ Content-Disposition: attachment; filename="$elsterfile"\n\n|;
 
 sub continue {
   $lxdebug->enter_sub();
+
   # allow Symbolic references just here:
   no strict 'refs';
   &{ $form->{nextsub} };
@@ -1949,9 +1960,9 @@ sub continue {
   $lxdebug->leave_sub();
 }
 
-sub back { 
+sub back {
   $lxdebug->enter_sub();
-  &{ $form->{lastsub} }; 
+  &{ $form->{lastsub} };
   $lxdebug->leave_sub();
 }
 

diff --git a/doc/changelog b/doc/changelog
index cac71c5..2fe0646 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -3,7 +3,7 @@
 ####################################\r
 \r
 \r
-2006-01-xy - Version 2.2.0 - Revision testing (542 - 839)\r
+2006-02-03 - Version 2.2.0 - Revision testing (542 - 855)\r
 \r
   - Neues Menü - horizontal Anordnung \r
   - Splitbuchungen für Kreditoren-, Debitoren- und Dialogbuchungen\r
@@ -63,9 +63,12 @@
     Bug#258:  Abschneiden der Nachkommastelle nach Drucken und Buchen\r
     Bug#259:  Steuerkonten wurden nicht angezeigt, wenn Rechnung und Zahlung vom gleichen Tag\r
     Bug#260:  Debitorenbuchungen mit doppeltem Betrag\r
+    Bug#262:  Falsche Berechnung der MwSt\r
+    Bug#264:  Swiss-German-chart.sql mit fehlenden korekten Einträgen für MwSt\r
     Bug#266:  Lieferdatum in Rechnungen\r
     Bug#267:  Bei Bilanz waren Stichtag und Vergleichsstichtag vertauscht\r
     Bug#270:  Rabattfehler beim Umwandeln eines Angebotes in einen Auftrag\r
+    Bug#275:  Es werden alle Umsätze bis zum gewählten Quartal berechnet!\r
 \r
 \r
 2005-02-08 - Version 2.1.1\r

diff --git a/locale/de/admin b/locale/de/admin
index 730e7ed..487cc57 100644 (file)
--- a/locale/de/admin
+++ b/locale/de/admin
@@ -72,7 +72,8 @@ $self{texts} = {
   'The following Datasets are not in use and can be deleted' => 'Die folgenden Datenbanken sind nicht in Verwendung und können gelöscht werden',
   'The following Datasets need to be updated' => 'Folgende Datenbanken müssen aktualisiert werden',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine Änderungen vorgenommen!',
-  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'Um einer Gruppe einen neuen Benutzer hinzuzufügen, ändern und speichern Sie am einfachsten einen bestehenden Zugriffsnamen. Unter dem neuen Namen wird dann ein Benutzer mit denselben Einstellungen angelegt.',
+  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'Um einer Gruppe einen neuen Benutzer hinzuzufügen, ändern und speichern Sie am einfachsten einen bestehen
+  den Zugriffsnamen. Unter dem neuen Namen wird dann ein Benutzer mit denselben Einstellungen angelegt.',
   'Unlock System'               => 'System entsperren',
   'Update Dataset'              => 'Datenbank aktualisieren',
   'Use Templates'               => 'benutze Vorlagen',
@@ -82,7 +83,8 @@ $self{texts} = {
   'Ust-IDNr'                    => 'USt-IdNr.',
   'Version'                     => 'Version',
   'WEBDAV-Zugriff'              => 'WEBDAV-Zugriff',
-  'You must enter a host and port for local and remote connections!' => '"Rechner" und "Port" müssen für lokale und externe Verbindungen eingetragen werden!',
+  'You must enter a host and port for local and remote connections!' => '"Rechner" und "Port" müssen für lokale und externe Verbindu
+  ngen eingetragen werden!',
   'does not exist'              => 'existiert nicht',
   'is already a member!'        => 'ist bereits ein Mitglied!',
   'localhost'                   => 'lokaler Rechner',

diff --git a/locale/de/all b/locale/de/all
index 10e8394..0d58917 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -721,7 +721,8 @@ sind wegen unzureichender Voreinstellungen deaktiviert!',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine Änderungen vorgenommen!',
   'Title'                       => 'Titel',
   'To'                          => 'An',
-  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'Um einer Gruppe einen neuen Benutzer hinzuzufügen, ändern und speichern Sie am einfachsten einen bestehenden Zugriffsnamen. Unter dem neuen Namen wird dann ein Benutzer mit denselben Einstellungen angelegt.',
+  'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.' => 'Um einer Gruppe einen neuen Benutzer hinzuzufügen, ändern und speichern Sie am einfachsten einen bestehen
+  den Zugriffsnamen. Unter dem neuen Namen wird dann ein Benutzer mit denselben Einstellungen angelegt.',
   'Top 100'                     => 'Top 100',
   'Top 100 hinzufuegen'         => 'Top 100 hinzufügen',
   'Top Level'                   => 'Hauptartikelbezeichnung',
@@ -836,7 +837,8 @@ sind wegen unzureichender Voreinstellungen deaktiviert!',
   'Yes'                         => 'Ja',
   'You are logged out!'         => 'Auf Wiedersehen!',
   'You did not enter a name!'   => 'Sie haben keinen Namen eingegeben!',
-  'You must enter a host and port for local and remote connections!' => '"Rechner" und "Port" müssen für lokale und externe Verbindungen eingetragen werden!',
+  'You must enter a host and port for local and remote connections!' => '"Rechner" und "Port" müssen für lokale und externe Verbindu
+  ngen eingetragen werden!',
   'Zeitraum'                    => 'Zeitraum',
   'Zipcode'                     => 'PLZ',
   'accrual'                     => 'Bilanzierung (Soll-Versteuerung)',

diff --git a/sql/Germany-DATEV-SKR04EU-chart.sql b/sql/Germany-DATEV-SKR04EU-chart.sql
deleted file mode 100755 (executable)
index 9a5eeb2..0000000
--- a/sql/Germany-DATEV-SKR04EU-chart.sql
+++ /dev/null
@@ -1,378 +0,0 @@
--- DATEV SKR04
--- IT Systems Service http://www.itsystemsservice.de
---
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0135', 'EDV-Software', 'A', 'A', 'AP_amount', '0135', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0150', 'Geschäfts- oder Firmenwert', 'A', 'A', 'AP_amount', '0135', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0240', 'Geschäftsbauten', 'A', 'A', 'AP_amount', '0240', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0400', 'Techn. Anlagen und Maschinen', 'A', 'A', 'AP_amount', '0400', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0440', 'Maschinen', 'A', 'A', 'AP_amount', '0440', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0500', 'Betriebs- und Geschäftsausstattung', 'A', 'A', 'AP_amount', '0500', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0510', 'Andere Anlagen', 'A', 'A', 'AP_amount', '0510', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0520', 'PKW', 'A', 'A', 'AP_amount', '0440', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0560', 'Sonst. Transportmittel', 'A', 'A', 'AP_amount', '0560', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0650', 'Büroeinrichtung', 'A', 'A', 'AP_amount', '0650', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0640', 'Ladeneinrichtung', 'A', 'A', 'AP_amount', '0640', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0620', 'Werkzeuge', 'A', 'A', 'AP_amount', '0620', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0670', 'Geringwertige Wirtschaftsg.b.410EUR', 'A', 'A', 'AP_amount', '0670', 9, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1000', 'Roh,-Hilfs,-und Betriebsstoffe', 'A', 'E', 'IC', '1000', 9, NULL, 4, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1140', 'Waren', 'A', 'E', 'IC', '1140', 9, NULL, 4, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1200', 'Ford. aus Lieferungen und Leistungen', 'A', 'A', 'AR', '1200', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1215', 'Ford.a.LuL z.allg.USt-Satz', 'A', 'A', 'AR', '1215', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1216', 'Ford.a.LuL z.erm.USt.-Satz (EÜR)', 'A', 'A', 'AR', '1216', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1217', 'Ford.a.steuerfr.od.nicht steuerb.LuL (EÜR)', 'A', 'A', 'AR', '1217', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1218', 'Ford.a.LuL gem.§24UStG(EÜR)', 'A', 'A', 'AR', '1218', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1219', 'Gegenkto. bei Aufteil.d.Ford.n.Steuers.(EÜR)', 'A', 'A', '', '1219', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1220', 'Ford.n.§11(1)2EStG f.§4/3 EStG', 'A', 'A', 'AR', '1220', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1248', 'Pauschalwertbe.z.Ford.bis1J.', 'A', 'E', '', '1248', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1249', 'Pauschalwertbe.z.Ford.ueb1J.', 'A', 'E', '', '1249', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1370', 'Durchlaufende Posten', 'A', 'A', '', '1370', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1374', 'Fremdgeld', 'A', 'A', '', '1374', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1401', 'Abziebare Vorsteuer 7%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1401', 0, 66, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1402', 'Abziehbare Vorsteuer aus EG-Erwerb 7%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1402', 0, 61, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1403', 'Abziehbare Vorsteuer aus EG-Erwerb 16%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice', '1403', 0, 61, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1405', 'Abziehbare Vorsteuer 16%', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1405', 0, 66, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1407', 'Abziehb.Vorst.n.allgem.Durchschnittssätzen UStVA Kz.63', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1407', 0, NULL, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1408', 'Abziehbare Vorsteuer n.§13b', 'A', 'E', 'AP_tax:IC_taxpart:IC_taxservice:CT_tax', '1408', 0, NULL, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1433', 'Bezahlte Einfuhrumsatzsteuer', 'A', 'E', '', '1433', 0, 62, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1460', 'Geldtransit', 'A', 'A', '', '1460', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1480', 'Gegenkonto Vorsteuer §4/3 EStG', 'A', 'A', '', '1480', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1481', 'Auflösung Vorst.a.Vorjahr §4/3 EStG', 'A', 'A', '', '1481', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1482', 'Vorst.aus Investitionen §4/3 EStG', 'A', 'E', '', '1482', 0, NULL, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1484', 'abziehb.VorSt EU-Erwerb Neufzg.b.Lief. o. USt.Ident.Nr', 'A', 'E', 'AR_tax', '1483', 0, NULL, NULL, NULL, 27, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1600', 'Kasse', 'A', 'A', 'AR_paid:AP_paid', '1600', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1800', 'Bank', 'A', 'A', 'AR_paid:AP_paid', '1800', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2100', 'Privatentnahme allgemein', 'A', 'Q', '', '2100', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2150', 'Privatsteuern', 'A', 'Q', '', '2150', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2180', 'Privateinlagen', 'A', 'Q', '', '2180', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2200', 'Sonderausgaben beschränkt abzugsfähig', 'A', 'Q', '', '2200', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2230', 'Sonderausgaben unbeschr. abzugsfähig', 'A', 'Q', '', '2230', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2250', 'Zuwendungen, Spenden', 'A', 'Q', '', '2250', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('2953', 'Satzungsm.Rücklagen 0% Vorbelast.EK02', 'A', 'Q', '', '2953', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3151', 'Vblk.geg.Kreditinst.- Restlaufzeit b.1 Jahr', 'A', 'A', '', '3151', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3160', 'Vblk.geg.Kreditinst.- Restlaufzeit 1 bis 5 Jahre', 'A', 'A', '', '3160', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3170', 'Vblk.geg.Kreditinst.- Restlaufzeit grösser als 5 Jahre', 'A', 'A', '', '3170', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3300', 'Verbindlichkeiten aus Lief.u.Leist.', 'A', 'L', 'AP', '3300', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3305', 'Vblk.a.LuL z.allg.Umsatzsteuersatz (EÜR)', 'A', 'L', 'AP', '3305', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3306', 'Vblk.a.LuL zum erm.Umsatzsteuersatz (EÜR)', 'A', 'L', 'AP', '3306', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3307', 'Vblk.a.LuL ohne Vorsteuer (EÜR)', 'A', 'L', 'AP', '3307', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3309', 'Gegenkonto 1605-1607 b.Aufteilung d.Vblk.n.Steuers.(EÜR)', 'A', 'L', '', '3309', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3801', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '3801', 0, NULL, NULL, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3802', 'Umsatzsteuer aus EG-Erwerb 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '3802', 0, NULL, NULL, NULL, 6, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3803', 'Umsatzsteuer aus EG-Erwerb 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice', '3803', 0, NULL, NULL, NULL, 28, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3805', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '3805', 0, NULL, NULL, NULL, 6, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3817', 'Umsatzsteuer a.i.anderen EG-Land stpfl.Lieferungen', 'A', ' ', '', '3817', 10, NULL, 0, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3820', 'Umsatzsteuer-Vorauszahlungen', 'A', 'E', '', '3820', 0, NULL, NULL, NULL, 28, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3830', 'Umsatzsteuer-Vorauszahlungen 1/11', 'A', 'E', '', '3830', 0, NULL, NULL, NULL, 28, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3833', 'Umsatzsteuer n.§13b UStG', 'A', 'I', '', '3833', 0, NULL, 33, NULL, 7, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3841', 'Umsatzsteuer Vorjahr', 'A', 'E', '', '3841', 0, NULL, NULL, NULL, 28, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('3845', 'Umsatzsteuer frühere Jahre', 'A', 'E', '', '3845', 0, NULL, NULL, NULL, 28, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4110', 'Sonstige steuerfreie Umsätze Inland', 'A', 'I', 'AR_amount', '4110', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4120', 'Steuerfreie Umsätze §4Nr.1a UstG', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4120', 0, 48, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4125', 'Steuerfrei innergem. Lieferungen §41bUStG', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4125', 0, 41, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4130', 'Liefe.d.1.Abnehm.bei innergem.Dreiecksg §25b2UStG', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4130', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4135', 'Steuerfr.innergem.Lief.v.Neufahrz.an Abn.o.USt-Ident-Nr.', 'A', 'I', 'AR_amount:IC_sale', '4135', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4150', 'Sonstige steuerfreie Umsätze §42-7UStG', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4150', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4180', 'Erlöse,die mit den Durchschnittssätzen d.§24UStG vers.werd.', 'A', 'I', 'AR_amount', '4180', NULL, NULL, NULL, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4185', 'Erlöse als Kleinunternehmer i.S.d.§19(1)UStG', 'A', 'I', 'AR_amount', '4185', NULL, NULL, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4200', 'Erlöse', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4200', 0, NULL, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4300', 'Erlöse 7%USt', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4300', 2, 86, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4310', 'Erlöse Inland stpfl. EG-Lieferung7%', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4310', 12, 86, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4315', 'Erlös Inland stpfl.EG-Lieferung 16%', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4315', 13, 51, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4320', 'Erlöse aus im and.EG-Land steuerpfl.Lieferungen', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4320', 10, NULL, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4400', 'Erlöse 16% USt.', 'A', 'I', 'AR_amount:IC_sale:IC_income', '4400', 3, 51, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4500', 'Provisionserlöse', 'A', 'I', 'AR_amount:IC_income', '4500', 3, 51, 5, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4504', 'Steuerfreie Umsätze §4Nr.8ff UstG', 'A', 'I', 'AR_amount', '4504', 0, 0, 1, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4506', 'Provisionserlöse 7% USt.', 'A', 'I', 'AR_amount:IC_income', '4506', 2, 86, NULL, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4508', 'Provisionserlöse 16% USt.', 'A', 'I', 'AR_amount:IC_income', '4508', 3, 51, NULL, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4510', 'Erlöse Abfallverwertung', 'A', 'I', 'AR_amount:IC_sale', '4510', 3, NULL, NULL, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4520', 'Erlös Leergut', 'A', 'I', 'AR_amount:IC_sale', '4520', 3, 51, 5, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4580', 'Erlöse zum allg.Umsatzsteuersatz (EÜR)', 'A', 'I', '', '4580', 0, 0, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4581', 'Erlöse zum ermä.Umsatzsteuersatz (EÜR)', 'A', 'I', '', '4581', 0, 0, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4582', 'Erlöse steuerfrei u.nicht steuerbar (EÜR)', 'A', 'I', '', '4582', 0, 0, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4589', 'Gegenkonto 8580-8582 b.Aufteilung d.Erlöse n.Steuersätzen(EÜR)', 'A', 'C', '', '4589', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4600', 'Unentgeldliche Wertabgaben', 'A', 'I', 'AR_amount', '4600', 0, NULL, NULL, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4605', 'Entnahme v. Gegenst.o.USt.', 'A', 'I', '', '4605', 0, NULL, 5, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4610', 'Entnah.d.Untern.f.Zwecke ausserh.d.Untern.7%USt', 'A', 'I', 'AR_amount', '4610', 2, 86, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4619', 'Entnahme durch den Untern.f.Zwecke außerhalb d.Untern.(Waren)o.USt', 'A', 'I', '', '4619', 0, NULL, 5, NULL, 3, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4620', 'Entnahme des Untern.f.Zwecke ausserh.d.Untern 16%(Waren)', 'A', 'I', 'AR_amount', '4620', 3, 51, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4630', 'Verwendung v.Gegenst.f.Zwecke außerhalb d.Unternehmens 7% USt.', 'A', 'I', 'AR_amount', '4630', 2, 86, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4639', 'Verwendung v.Gegenständen f.Zwecke außerhalb d.Untern.o.USt.', 'A', 'I', '', '4639', 0, NULL, NULL, NULL, 3, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4640', 'Verw.v.Gegens.f.Zwecke ausserh.d.Untern.16%USt.', 'A', 'I', '', '4640', 3, 51, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4645', 'Verwend.v.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Kfz-Nutzung)', 'A', 'I', '', '4645', 0, 0, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4646', 'Verwend.f.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Telefonnutzung)', 'A', 'I', '', '4646', 0, 0, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4660', 'Unentgeldl.Erbring.sons.Leis.16%USt', 'A', 'I', 'AR_amount', '4660', 3, 51, NULL, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4670', 'Unentgeltl.Zuw.von Waren 7% Ust', 'A', 'I', '', '4670', 2, 86, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4679', 'Unentgeltl.Zuwendung v.Waren o.USt.', 'A', 'I', '', '4679', 0, NULL, 5, NULL, 3, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4680', 'Unentgeltl.Zuw.v Waren 16% Ust', 'A', 'I', '', '4680', 3, 51, 5, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4686', 'Unentgeltl.Zuwend.v.Gegens. 16% Ust', 'A', 'I', 'AR_amount', '4686', 3, 51, NULL, NULL, 3, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4689', 'Unentgeldl.Zuw.v.Gegens.ohne Ust', 'A', 'I', '', '4689', 0, NULL, 5, NULL, 3, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4690', 'Nicht steuerbare Umsätze', 'A', 'I', '', '4690', 0, NULL, 5, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4695', 'Umsatzsteuervergütungen', 'A', 'I', '', '4695', 0, NULL, NULL, NULL, 7, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4700', 'Erlösschmälerungen', 'A', 'I', '', '4700', 0, NULL, 32, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4710', 'Erlösschmälerung 7% USt.', 'A', 'I', '', '4710', 2, 86, 32, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4720', 'Erlösschmälerung 16% USt.', 'A', 'I', '', '4720', 3, 51, 32, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4725', 'Erlösschmä.Inl.stpfl.EG-Lief. 7%USt', 'A', 'I', '', '4725', 12, 86, 32, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4726', 'Erlösschmä.Inl.stpfl.EG-Lief.16%USt', 'A', 'I', '', '4726', 13, 51, 32, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4727', 'Erlösschmä.and.EG Land stpfl.Liefer', 'A', 'I', '', '4727', 0, NULL, 32, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4731', 'Gewährte Skonti 7% USt', 'A', 'E', 'AR_paid', '4731', 2, 86, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4735', 'Gewährte Skonti 16% USt.', 'A', 'E', 'AR_paid', '4735', 3, 51, 1, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4750', 'Gewährte Boni 7% USt.', 'A', 'E', 'AR_paid', '4750', 2, 86, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4760', 'Gewährte Boni 16% USt.', 'A', 'E', 'AR_paid', '4760', 3, 51, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4780', 'Gewährte Rabatte 7% USt.', 'A', 'E', 'AR_paid', '4780', 2, 86, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4790', 'Gewährte Rabatte 16% Ust.', 'A', 'E', 'AR_paid', '4790', 3, 51, 1, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4800', 'Bestandsveränd.fert..Leist.', 'A', 'E', '', '4800', 0, 0, 2, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4810', 'Bestandsveränderung unf.Erz.', 'A', 'E', '', '4810', 0, 0, 2, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4815', 'Bestandsveränd.unf.Leist.', 'A', 'E', '', '4815', 0, 0, 2, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4820', 'And.aktiv.Eigenleistungen', 'A', 'E', '', '4820', 0, 0, 3, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4830', 'Sonstige Erträge', 'A', 'I', '', '4830', 3, 51, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4840', 'Erträge aus Kursdifferenzen', 'A', 'I', '', '4840', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4835', 'Sonstige Erlöse betriebl.u.regelmäß', 'A', 'I', 'AR_amount', '4835', 3, 51, 5, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4837', 'Betriebsfremde Erträge nichtaußerorden', 'A', 'I', '', '4837', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4844', 'Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1aUStG(b.Buchverlust)', 'A', 'E', '', '4844', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4845', 'Erlöse aus Verk.Sachanlagevermögen16% USt (bei Buchverlust)', 'A', 'E', '', '4845', 0, NULL, NULL, NULL, 2, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4848', 'Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1bUStG(b.Buchverlust)', 'A', 'E', '', '4848', 0, NULL, NULL, NULL, 1, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4849', 'Erlöse aus Anlagenverkäufen', 'A', 'I', 'AR_amount', '4849', 3, 51, NULL, NULL, 1, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4860', 'Grundstückserträge', 'A', 'I', '', '4860', 3, 51, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4900', 'Erträge aus Abgang von AV-Gegenständen', 'A', 'I', '', '4900', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4905', 'Ertr.a.d.Abg.v.Gegenst.d.Umlaufverm', 'A', 'I', '', '4905', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4910', 'Ertrag a.d.Zuschreib.d.Anlagevermög', 'A', 'I', '', '4910', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4915', 'Ertr.a.Zuschreib.d.Umlaufvermögens', 'A', 'I', '', '4915', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4920', 'Ertr.a.Herabsetzung d.PWB zu Forderungen', 'A', 'I', '', '4920', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4925', 'Ertr. aus abgeschriebenen Forderung', 'A', 'I', '', '4925', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4930', 'Ertr.a.d.Auflösung v.Rückstellungen', 'A', 'I', '', '4930', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4934', 'Erträge a.d.Auflösung v.SoPo m.Rücklageant.(Exitenzgründungszusch.)', 'A', 'I', '', '4934', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4939', 'Erträge Aufl. Sopo m.R.(Ansparafa)', 'A', 'I', '', '4939', 0, NULL, 5, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4941', 'Sachbezüge 7% Ust (Waren)', 'A', 'I', 'AR_amount', '4941', 2, 86, 5, NULL, 2, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4945', 'Sachbezüge 16% Ust (Waren)', 'A', 'I', 'AR_amount', '4945', 3, 51, 5, NULL, 2, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4946', 'Verrechnete sons. Sachbezüge keine Waren', 'A', 'I', 'AR_amount', '4946', 0, 0, 5, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4960', 'Periodenfremde Erträge nicht außero', 'A', 'I', '', '4960', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4970', 'Versicherungsentschädigungen', 'A', 'I', '', '4970', 0, NULL, 33, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4981', 'Steuerfr.Erträge a.d.Auflös.v.SoPo m.Rücklageanteil', 'A', 'I', '', '4981', 0, NULL, NULL, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4982', 'Sonst.steuerfreie Betriebseinnahmen', 'A', 'I', '', '4982', 0, NULL, NULL, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5190', 'Energiestoffe (Fert.).', 'A', 'E', 'IC', '5190', 9, 0, 4, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5200', 'Wareneingang 0% Vorsteuer', 'A', 'E', 'AP_amount:IC_cogs', '5200', 0, NULL, 4, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5300', 'Wareneingang 7% Vorsteuer', 'A', 'E', 'AP_amount:IC_cogs', '5300', 8, NULL, 4, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5400', 'Wareneingang 16% Vorsteuer', 'A', 'E', 'AP_amount:IC_cogs', '5400', 9, NULL, 4, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5420', 'Innergemein.Erwerb 7% VorSt u. Ust', 'A', 'E', 'AP_amount:IC_cogs', '5420', 0, 93, 4, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5425', 'Innergem.Erwerb 16% VorSt u. Ust', 'A', 'E', 'AP_amount:IC_cogs', '5425', 0, 97, 4, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5440', 'Innergem.Erwerb v.Neufahrz.v.Lief.o.USt.Identnr.16%VSt.u.16%USt.', 'A', 'E', 'AP_amount:IC_cogs', '5440', 19, 94, NULL, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5550', 'Steuerfreier innergem.Erwerb', 'A', 'E', 'AP_amount:IC_cogs', '5550', 0, 91, NULL, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5559', 'Steuerfreie Einfuhren', 'A', 'E', '', '5559', 0, NULL, NULL, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5580', 'Wareneinkauf z.allg.Umsatzsteuersatz (EÜR)', 'A', 'E', '', '5580', 0, 0, 4, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5581', 'Wareneinkauf z.erm.Umsatzsteuersatz(EÜR)', 'A', 'E', '', '5581', 0, 0, 4, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5582', 'Wareneinkauf ohne Vorsteuerabzug(EÜR)', 'A', 'E', '', '5582', 0, 0, 4, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5589', 'Gegenkto.3580-3582 b.Aufteilung d.WE n.Steuersätzen(EüR)', 'A', 'E', '', '5589', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5600', 'Nicht abziehbare Vorsteuer', 'A', 'E', '', '5600', 0, NULL, 5, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5610', 'Nicht abziehb.Vorsteuer 7%', 'A', 'E', '', '5610', 0, NULL, 5, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5650', 'Nicht abziehb.Vorsteuer 16%', 'A', 'E', '', '5650', 0, NULL, 5, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5731', 'Erhaltene Skonti 7% Vorsteuer', 'A', 'I', 'AP_paid', '5731', 8, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5735', 'Erhaltene Skonti 16% Vorsteuer', 'A', 'I', 'AP_paid', '5735', 9, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5750', 'Erhaltene Boni 7% Vorsteuer', 'A', 'I', 'AP_paid', '5750', 8, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5760', 'Erhaltene Boni 16% Vorsteuer', 'A', 'I', 'AP_paid', '5760', 9, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5780', 'Erhaltene Rabatte 7% Vorsteuer', 'A', 'I', 'AP_paid', '5780', 8, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5790', 'Erhaltene Rabatte 16% Vorsteuer', 'A', 'I', 'AP_paid', '5790', 9, NULL, 4, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5800', 'Bezugsnebenkosten', 'A', 'E', 'AP_amount:IC_cogs:IC_expense', '5800', 0, NULL, 4, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5820', 'Leergut', 'A', 'E', 'AP_amount:IC_cogs', '5820', 0, NULL, 4, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5840', 'Zölle und Einfuhrabgaben', 'A', 'E', 'AP_amount:IC_cogs', '5840', 0, NULL, 4, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5860', 'Verrechnete Stoffkosten', 'A', 'E', 'IC_cogs', '5860', 0, NULL, 4, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5880', 'Bestandsver.Roh-,Hilfs-.Betriebs.sow.bez.Waren', 'A', 'E', '', '5880', 0, NULL, 2, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5900', 'Fremdleistungen', 'A', 'E', 'AP_amount', '5900', 9, NULL, 5, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5901', 'Fremdleistungen 0% Vorsteuer', 'A', 'E', 'AP_amount', '5900', 0, NULL, 5, NULL, 8, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5915', 'Leist.v.ausländ.Untern. 7% VSt.u.7%USt.', 'A', 'E', 'AP_amount', '5915', 8, NULL, 5, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('5925', 'Leist.v.ausländ.Untern. 16% VSt.u.16%USt.', 'A', 'E', 'AP_amount', '5925', 9, NULL, 5, NULL, 8, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6010', 'Löhne', 'A', 'E', '', '6010', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6020', 'Gehälter', 'A', 'E', '', '6020', 0, NULL, 10, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6026', 'Tantiemen', 'A', 'E', '', '6026', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6027', 'Geschäftsführergehälter', 'A', 'E', '', '6027', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6030', 'Aushilfslöhne', 'A', 'E', '', '6030', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6040', 'Lohnsteuer für Aushilfe', 'A', 'E', '', '6040', 0, NULL, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6045', 'Bedienungsgelder', 'A', 'E', '', '6045', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6050', 'Ehegattengehalt', 'A', 'E', '', '6050', 0, NULL, 10, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6060', 'Freiwillige sozi.Aufw.lohnsteuerpflichtig.', 'A', 'E', '', '6060', 0, NULL, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6069', 'Pauschale Lohnsteuera.sons.Bezüge (z.B.Fahrtkostenzu)', 'A', 'E', '', '6069', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6070', 'Krankengeldzuschüsse', 'A', 'E', '', '6070', 0, NULL, 10, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6080', 'Vermögenswirksame Leistungen', 'A', 'E', '', '6080', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6090', 'Fahrtkostenerst.Wohnung/Arbeitsstät', 'A', 'E', '', '6090', 0, NULL, 10, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6110', 'Gesetzlich soziale Aufwendungen', 'A', 'E', '', '6110', 0, 0, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6120', 'Beiträge zur Berufsgenossenschaft', 'A', 'E', '', '6120', 0, NULL, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6130', 'Freiwillig soziale Aufwendungen lohnsteuerfrei', 'A', 'E', '', '6130', 0, NULL, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6147', 'Pauschale Lohnsteuer auf sonst.Bezüge(z.B.Direktversicherung', 'A', 'E', '', '6147', 0, NULL, 10, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6200', 'Abschreibungen a.immat.Vermögensgeg', 'A', 'E', '', '6200', 17, NULL, NULL, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6205', 'Abschreibung a.d.Geschäft-o.Firmenw', 'A', 'E', '', '6205', 17, NULL, NULL, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6210', 'Außerplan.AfA a.immat.Vermögensgeg.', 'A', 'E', '', '6210', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6221', 'Abschreibung auf Gebäude', 'A', 'E', '', '6221', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6220', 'Abschreibungen auf Sachanlagen (o.Kfz u.Geb.)', 'A', 'E', '', '6220', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6222', 'Abschreibungen auf Kfz', 'A', 'E', '', '6222', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6230', 'Außerplanmäßig Abschr.a.Sachanlagen', 'A', 'E', '', '6230', 17, NULL, NULL, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6231', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA bei Gebäuden', 'A', 'E', '', '6231', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6232', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA des Kfz', 'A', 'E', '', '6232', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6233', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA sonst.WG', 'A', 'E', '', '6233', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6240', 'Abschr.a.Sachanl.aufgr.steuerl.Sondervorschriften', 'A', 'E', '', '6240', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6241', 'Sonderabschreibung nach §7g(1)u.(2)EStG (ohne Kfz)', 'A', 'E', '', '6241', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6242', 'Sonderabschreibung n.§7g(1)u.(2)EStG (für Kfz)', 'A', 'E', '', '6242', 0, NULL, 17, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6250', 'Kaufleasing', 'A', 'E', 'AP_amount', '6250', 0, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6260', 'Sofortabschreibung GWG', 'A', 'E', 'AP_amount', '6260', 17, NULL, NULL, NULL, 26, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6262', 'Abschreibungen auf aktivierte GWG', 'A', 'E', '', '6262', 17, NULL, NULL, NULL, 25, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6270', 'Abschreibungen auf Finanzanlagen', 'A', 'E', '', '6270', NULL, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6275', 'Abschr.a.Wertp.d.Umlaufvermögens', 'A', 'E', '', '6275', 0, NULL, 17, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6280', 'Forderungsverlust-übliche Höhe', 'A', 'E', '', '6280', 0, NULL, 20, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6281', 'Forderungsverluste 7% USt.(übliche Höhe', 'A', 'E', '', '6281', 2, 86, 20, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6285', 'Forderungsverluste 16% USt.(übliche Höhe', 'A', 'E', '', '6285', 3, 51, 20, NULL, NULL, TRUE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6300', 'Sonstige betriebliche Aufwendungen', 'A', 'E', 'AP_amount', '6300', 9, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6303', 'Fremdleistungen', 'A', 'E', 'AP_amount', '6303', 0, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6304', 'Sons.Aufw.betriebl. und regelmäßig', 'A', 'E', 'AP_amount', '6304', 9, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6305', 'Raumkosten', 'A', 'E', 'AP_amount', '6305', 9, NULL, 11, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6310', 'Miete', 'A', 'E', 'AP_amount', '6310', 9, NULL, 11, NULL, 11, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6315', 'Pacht', 'A', 'E', 'AP_amount', '6315', 0, NULL, NULL, NULL, 11, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6320', 'Heizung', 'A', 'E', 'AP_amount', '6320', 9, NULL, 11, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6325', 'Gas,Strom, Wasser', 'A', 'E', 'AP_amount', '6325', 9, NULL, 11, NULL, 12, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6330', 'Reinigung', 'A', 'E', 'AP_amount', '6330', 9, NULL, NULL, 11, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6335', 'Instandhaltung betrieb.Räume', 'A', 'E', 'AP_amount', '6335', 9, NULL, 11, NULL, 13, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6338', 'Instandhlt.betriebl.Räume in Geb.die nicht z.BV gehören', 'A', 'E', '', '6338', 0, NULL, NULL, NULL, 11, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6343', 'Abgaben f.betriebl.genutzten Grundbesitz,d.nicht z.BV gehört', 'A', 'E', '', '6343', 0, NULL, NULL, NULL, 11, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6345', 'Sonstige Raumkosten', 'A', 'E', 'AP_amount', '6345', 9, NULL, 11, NULL, 13, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6348', 'Aufwend.f.ein häusliches Arbeitszimmer(abziehb.Anteil)', 'A', 'E', '', '6348', 0, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6349', 'Aufwend.f.ein häusliches Arbeitszimmer(nicht abziehb.Anteil)', 'A', 'E', '', '6349', 0, 0, 11, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6350', 'Grundstücksaufwendungen', 'A', 'E', '', '6350', 9, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6358', 'Gründstücksaufwend.f.Gebäude,die nicht z.Betriebsverm.gehören', 'A', 'E', '', '6358', 0, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6390', 'Zuwend.,Spenden,steuerlich n.abziehbar', 'A', 'E', '', '6390', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6405', 'Versicherungen f.Gebäude,die zum BV gehören', 'A', 'E', '', '6405', 0, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6420', 'Beiträge', 'A', 'E', 'AP_amount', '6420', 0, NULL, NULL, NULL, 14, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6400', 'Versicherungen', 'A', 'E', 'AP_amount', '6400', 0, NULL, 13, NULL, 14, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6430', 'Sonstige Abgaben', 'A', 'E', 'AP_amount', '6430', 0, NULL, NULL, NULL, 14, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6436', 'Steuerl.abzugs.Verspätungszuschl.u.Zwangsgelder', 'A', 'E', '', '6436', 0, NULL, NULL, NULL, 31, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6437', 'Steuerl.n.abzugsf.Verspätungszuschläge u.Zwangsgelder', 'A', 'E', '', '6437', 0, NULL, NULL, NULL, 31, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6440', 'Ausgleichsabgabe i.S.d.Schwerbehinterdengesetzes', 'A', 'E', '', '6440', 0, NULL, 10, NULL, 10, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6460', 'Rep.u.Instandhaltungen v.techn.Anlagen u.Maschinen', 'A', 'E', 'AP_amount', '6460', 9, NULL, 18, NULL, 19, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6470', 'Rep.u.Instandhalt.v.and.Anlagen u.Betriebs-u.Geschäftsausst.', 'A', 'E', 'AP_amount', '6470', 9, NULL, 18, NULL, 19, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6495', 'Wartungskosten für Hard-u.Software', 'A', 'E', 'AP_amount:IC_expense', '6495', 9, NULL, 18, NULL, 19, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6490', 'Sonstige Reparaturen u.Instandhalt.', 'A', 'E', 'AP_amount', '6490', 9, NULL, NULL, NULL, 19, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6498', 'Mietleasing', 'A', 'E', 'AP_amount', '6498', 0, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6499', 'Gewerbest.zu berücksicht.Mietleasing §8 GewStG', 'A', 'E', '', '6499', 0, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6500', 'Fahrzugkosten', 'A', 'E', 'AP_amount', '6500', 0, NULL, NULL, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6520', 'Kfz-Versicherungen', 'A', 'E', 'AP_amount', '6520', 0, NULL, 14, NULL, 16, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6530', 'Laufende Kfz-Betriebskosten', 'A', 'E', 'AP_amount', '6530', 9, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6540', 'Kfz-Reparaturen', 'A', 'E', 'AP_amount', '6540', 9, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6550', 'Garagenmiete', 'A', 'E', 'AP_amount', '6550', 0, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6560', 'Leasingfahrzeugkosten', 'A', 'E', 'AP_amount', '6560', 0, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6570', 'Sonstige Kfz-Kosten', 'A', 'E', 'AP_amount', '6570', 9, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6580', 'Mautgebühren', 'A', 'E', '', '6580', 0, 0, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6590', 'Fahrzeugkosten f.Kfz,die nicht zum BV gehören', 'A', 'E', '', '6590', 0, NULL, NULL, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6595', 'Fremdfahrzeuge', 'A', 'E', 'AP_amount', '6595', 0, NULL, 14, NULL, 17, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6600', 'Werbekosten', 'A', 'E', 'AP_amount', '6600', 9, NULL, NULL, 15, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6610', 'Geschenke bis 35 EUR abzugsfähig', 'A', 'E', 'AP_amount', '6610', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6620', 'Geschenke über 35EUR nicht abzugsf.', 'A', 'E', 'AP_amount', '6620', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6625', 'Geschenke ausschließl.betrieb.genut', 'A', 'E', 'AP_amount', '6625', 9, NULL, NULL, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6630', 'Repräsentationskosten', 'A', 'E', 'AP_amount', '6630', 9, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6640', 'Bewirtungskosten', 'A', 'E', 'AP_amount', '6640', 9, NULL, 20, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6643', 'Aufmerksamkeiten', 'A', 'E', 'AP_amount', '6643', 9, NULL, NULL, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6644', 'Nicht abzugsfähige Bewirtungskosten', 'A', 'E', 'AP_amount', '6644', 0, NULL, NULL, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6645', 'Nicht abzugsf.Betriebsausg.a.Werbe-Repräsentatisonk.etc.', 'A', 'E', 'AP_amount', '6645', 9, NULL, 15, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6650', 'Reisekosten Arbeitnehmer', 'A', 'E', 'AP_amount', '6650', 9, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6663', 'Reisekosten Arbeitn.m.Vorsteuerabzu f.öffentl.Verkehrsm.', 'A', 'E', 'AP_amount', '6663', 8, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6664', 'Reisekosten Arbeitn.Verpflegungmehr', 'A', 'E', 'AP_amount', '6664', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6660', 'Reisekosten Arbeitn.Übernachtungsaufwand', 'A', 'E', 'AP_amount', '6660', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6668', 'Kilometerentgelderstattung Arbeitnehmer', 'A', 'E', 'AP_amount', '6668', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6670', 'Reisekosten Unternehmer', 'A', 'E', 'AP_amount', '6670', 9, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6673', 'Reisek.Untern.m.Vorsteuerabzug (öffentl.Verkehrsm.', 'A', 'E', 'AP_amount', '6673', 8, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6674', 'Reisekosten Untern.Verpflegungsmehr', 'A', 'E', 'AP_amount', '6674', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6680', 'Reisekosten Untern.Übernachtungsauf', 'A', 'E', 'AP_amount', '6680', 0, NULL, 15, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6688', 'Fahrten zw.Wohn.und Arbeitsstätte (nicht abziehb.Teil)', 'A', 'E', '', '6688', 0, NULL, NULL, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6689', 'Fahrten zw.Wohn.-und Arbeitsstätte (Haben)', 'A', 'E', '', '6689', 0, NULL, NULL, NULL, 18, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6700', 'Kosten der Warenabgabe', 'A', 'E', 'AP_amount:IC_cogs', '6700', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6710', 'Verpackungsmaterial', 'A', 'E', 'AP_amount:IC_cogs', '6710', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6740', 'Ausgangsfracht', 'A', 'E', 'AP_amount:IC_cogs', '6740', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6760', 'Transportversicherung', 'A', 'E', 'AP_amount:IC_cogs:IC_expense', '6760', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6770', 'Verkaufsprovision', 'A', 'E', 'AP_amount:IC_expense', '6770', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6780', 'Fremdarbeiten', 'A', 'E', 'AP_amount:IC_expense', '6780', 16, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6790', 'Aufwand für Gewährleistungen', 'A', 'E', 'AP_amount:IC_expense', '6790', 0, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6800', 'Porto', 'A', 'E', 'AP_amount', '6800', 0, NULL, 20, NULL, 23, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6805', 'Telefon', 'A', 'E', 'AP_amount', '6805', 9, NULL, 20, NULL, 23, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6810', 'Telefax', 'A', 'E', 'AP_amount', '6810', 9, NULL, 20, NULL, 23, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6815', 'Bürobedarf', 'A', 'E', 'AP_amount', '6815', 9, NULL, 20, NULL, 23, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6820', 'Zeitschriften, Bücher', 'A', 'E', 'AP_amount', '6820', 8, NULL, 20, NULL, 20, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6821', 'Fortbildungskosten', 'A', 'E', 'AP_amount', '6821', 9, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6822', 'Freiwillige Sozialleistungen', 'A', 'E', 'AP_amount', '6822', 0, NULL, NULL, NULL, 9, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6825', 'Rechts- und Beratungskosten', 'A', 'E', 'AP_amount', '6825', 9, NULL, 20, NULL, 22, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6827', 'Abschluß- und Prüfungskosten', 'A', 'E', 'AP_amount', '6827', 9, NULL, 20, NULL, 22, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6830', 'Buchführungskosten', 'A', 'E', 'AP_amount', '6830', 9, NULL, NULL, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6835', 'Mieten für Einrichtungen', 'A', 'E', 'AP_amount', '6835', 9, NULL, 20, NULL, 21, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6840', 'Mietleasing', 'A', 'E', 'AP_amount', '6840', 9, NULL, 20, NULL, 21, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6845', 'Werkzeuge und Kleingeräte', 'A', 'E', 'AP_amount', '6845', 9, NULL, NULL, NULL, 19, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6850', 'Betriebsbedarf', 'A', 'E', 'AP_amount', '6850', 9, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6855', 'Nebenkosten des Geldverkehrs', 'A', 'E', '', '6855', 0, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6859', 'Aufwend.f.Abraum-u.Abfallbeseitigung', 'A', 'E', 'AP_amount', '6859', 9, NULL, 20, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6865', 'Nicht abziehbare Vorsteuer 7%', 'A', 'E', 'AP_paid', '6865', 0, NULL, 20, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6870', 'Nicht abziehbare Vorsteuer 16%', 'A', 'E', 'AP_paid', '6870', 0, NULL, 20, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6860', 'Nicht abziehbare Vorsteuer', 'A', 'E', '', '6860', 0, NULL, 31, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6880', 'Aufwendungen aus Kursdifferenzen', 'A', 'E', '', '6880', 0, NULL, 31, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6895', 'Abgänge Sachanlagen Restbuchwert', 'A', 'E', '', '6895', 0, NULL, 31, NULL, 2, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6900', 'Verluste aus Anlagenabgang', 'A', 'E', '', '6900', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6926', 'Einstellungen in SoPo m.Rücklageanteil (Ansparabschreibung)', 'A', 'E', '', '6926', 0, NULL, 20, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6928', 'Einst.in SoPo m.Rücklageanteil (Existenzgründungsrücklage)', 'A', 'E', '', '6928', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6960', 'Periodenfremde Aufwend.(soweit n.außerordentlich', 'A', 'E', '', '6960', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6967', 'Betriebsfremde Aufwendungen soweit n.außerord.', 'A', 'E', '', '6967', 0, NULL, 31, NULL, 24, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6970', 'Kalkulatorischer Unternehmerlohn', 'A', 'E', '', '6970', 0, NULL, 34, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6974', 'Kalkulatorische Zinsen', 'A', 'E', '', '6974', 0, NULL, 34, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6976', 'Kalkulatorische Aschreibungen', 'A', 'E', '', '6976', 0, NULL, 34, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6978', 'Kalkulatorische Wagnisse', 'A', 'E', '', '6978', 0, NULL, 34, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('6979', 'Kalkulatorischer Lohn f.unentgeltl.Mitarbeiter', 'A', 'E', '', '6979', 0, NULL, 34, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7000', 'Erträge aus Beteiligungen', 'A', 'I', '', '7000', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7100', 'Sonstige Zinsen und änliche Erträge', 'A', 'I', '', '7100', 0, NULL, 32, NULL, 4, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7120', 'Zinsähnliche Erträge', 'A', 'I', '', '7120', 0, NULL, 32, NULL, 4, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7130', 'Diskonterträge', 'A', 'I', '', '7130', 0, NULL, 32, NULL, 4, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7300', 'Zinsen und ähnl.Aufwendungen', 'A', 'E', '', '7300', 0, NULL, 30, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7305', 'Zinsaufwendung-betriebliche Steuern §223aAO', 'A', 'E', '', '7305', 0, NULL, 30, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7310', 'Zinsaufwendung f. kurzf.Verbindlichk', 'A', 'E', '', '7310', 0, NULL, 30, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7320', 'Zinsaufwendung f. langf.Verbindlichk', 'A', 'E', '', '7320', 0, NULL, 30, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7325', 'Zinsaufwend.f.Gebäude,die z.Betriebsvermögen gehören', 'A', 'E', '', '7325', 0, NULL, NULL, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7326', 'Zinsen zur Finanzierung Anlagevermögen', 'A', 'E', '', '7326', 0, NULL, NULL, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7330', 'Zinsähnliche Aufwendungen', 'A', 'E', '', '7330', 0, NULL, 30, NULL, 29, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7340', 'Diskontaufwendung', 'A', 'E', '', '7340', 0, NULL, 30, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7400', 'Außerordentliche Erträge', 'A', 'I', '', '7400', 0, NULL, 33, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7401', 'Ausserordentliche Erträge finanzwirksam', 'A', 'I', '', '7401', 0, NULL, NULL, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7450', 'Ausserordentliche Erträge nicht finanzwirksam', 'A', 'I', '', '7450', 0, NULL, NULL, NULL, 5, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7500', 'Außerordentliche Aufwendung', 'A', 'E', '', '7500', 0, NULL, 31, NULL, 30, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7600', 'Körperschaftssteuer', 'A', 'E', '', '7600', 0, NULL, 35, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7608', 'Solidaritätszuschlag', 'A', 'E', '', '7608', 0, NULL, 35, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7609', 'Solidaritätszuschlag für Vorjahr', 'A', 'E', '', '7609', 0, NULL, 19, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7610', 'Gewerbesteuer', 'A', 'E', '', '7610', 0, NULL, 12, NULL, 31, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7632', 'Kapitalertragssteuer 20%', 'A', 'E', '', '7632', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7634', 'Anrechenb.Soli auf Kapitalertragssteuer 20%', 'A', 'E', '', '7634', 0, NULL, 35, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7635', 'Zinsabschlagsteuer', 'A', 'E', '', '7635', 0, NULL, 35, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7638', 'Anrechb.Solidari.zuschlag a.Zinsabschlagst.', 'A', 'E', '', '7638', 0, NULL, 35, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7640', 'Stnachzahl.Vorj.v.Einkomm u.Ertrag', 'A', 'E', '', '7640', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7642', 'Sterstat.Vorj.Steuer v.Eink.u.Ertrag', 'A', 'I', '', '7642', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7644', 'Ertr.a.d.Aufl.v.Rücks.f.St.v.Ein.Er', 'A', 'I', '', '7644', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7650', 'Sonstige Betriebssteuern', 'A', 'E', '', '7650', 0, NULL, 12, NULL, 31, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7675', 'Verbrauchssteuer', 'A', 'E', '', '7675', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7678', 'Ökosteuer', 'A', 'E', '', '7678', 0, NULL, 12, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7685', 'Kfz-Steuer', 'A', 'E', 'AP_amount', '7685', 0, NULL, 19, NULL, 15, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7680', 'Grundsteuer', 'A', 'E', '', '7680', 0, NULL, 19, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7684', 'Grundsteuer f.Gebäude,die nicht z.Betriebsvermögen geh.', 'A', 'E', '', '7684', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7690', 'Steuernachzahlung Vorj.f.sons.Steue', 'A', 'E', '', '7690', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7692', 'Steuererstattung Vorj.f.sons.Steuer', 'A', 'I', '', '7692', 0, NULL, 33, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7694', 'Erträge a.d.Aufl.v. Rück.f.sons.Ste', 'A', 'E', '', '7694', 0, NULL, 31, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('7745', 'Entnahmen a.satzungsmäßigen Rücklagen', 'A', 'E', '', '7745', 0, NULL, NULL, NULL, NULL, FALSE);
-
-
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('9000', 'Saldenverträge,Sachkonten', 'A', 'A', '', '9000', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('9008', 'Saldenverträge,Debitoren', 'A', 'A', '', '9008', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('9009', 'Saldenverträge,Kreditoren', 'A', 'L', '', '9009', 0, NULL, NULL, NULL, NULL, FALSE);
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('9090', 'Summenvortragskonto', 'A', 'A', '', '9090', 0, NULL, NULL, NULL, NULL, FALSE);
-
-
-
-
-INSERT INTO tax (rate, taxkey, taxdescription) values ('0','0','Keine Steuer');
-INSERT INTO tax (rate, taxkey, taxdescription) values ('0','1','Umsatzsteuerfrei');
-insert into tax VALUES ((select id from chart where accno = '3801'),'0.07','3801','2','Umsatzsteuer 7%');
-INSERT INTO tax VALUES ((select id from chart where accno = '3805'),'0.16','3805','3','Umsatzsteuer 16%');
-INSERT INTO tax VALUES ((select id from chart where accno = '1401'),'0.07','1401','8','Vorsteuer 7%');
-insert into tax VALUES ((select id from chart where accno = '1405'),'0.16','1405','9','Vorsteuer 16%');
-insert into tax (taxkey, taxdescription) values ('10','Im anderen EG-Staat steuerpfl. Lieferung');
-insert into tax (taxkey, taxdescription) values ('11','Steuerfreie EG-Lief. an Abn. mit UStIdNr');
-insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '3802'),'0.07','3802','12','Steuerpflicht. EG-Lieferungen 7%');
-insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '3802'),'0.16','3803','13','Steuerpflicht. EG-Lieferungen 16%');
-insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1402'),'0.07','1402','18','Steuerpflicht. EG-Erwerb 7%');
-insert into tax (chart_id,rate,taxnumber, taxkey, taxdescription) values ((select id from chart where accno = '1402'),'0.16','1403','19','Steuerpflicht. EG-Erwerb 16%');
\ No newline at end of file

diff --git a/sql/Germany-DATEV-SKR04EU-gifi.sql b/sql/Germany-DATEV-SKR04EU-gifi.sql
deleted file mode 100755 (executable)
index 44502a0..0000000
--- a/sql/Germany-DATEV-SKR04EU-gifi.sql
+++ /dev/null
@@ -1,369 +0,0 @@
--- DATEV SKR04
--- IT Systems Service http://www.itsystemsservice.de
---
-INSERT INTO gifi (accno,description) VALUES ('0135', 'EDV-Software');
-INSERT INTO gifi (accno,description) VALUES ('0150', 'Geschäfts- oder Firmenwert');
-INSERT INTO gifi (accno,description) VALUES ('0240', 'Geschäftsbauten');
-INSERT INTO gifi (accno,description) VALUES ('0400', 'Techn.Anlagen und Maschinen');
-INSERT INTO gifi (accno,description) VALUES ('0440', 'Maschinen');
-INSERT INTO gifi (accno,description) VALUES ('0500', 'Betriebs- und Geschäftsausstattung');
-INSERT INTO gifi (accno,description) VALUES ('0510', 'Andere Anlagen');
-INSERT INTO gifi (accno,description) VALUES ('0520', 'PKW');
-INSERT INTO gifi (accno,description) VALUES ('0560', 'Sonst.Transportmittel');
-INSERT INTO gifi (accno,description) VALUES ('0620', 'Werkzeuge');
-INSERT INTO gifi (accno,description) VALUES ('0640', 'Ladeneinrichtung');
-INSERT INTO gifi (accno,description) VALUES ('0650', 'Büroeinrichtung');
-INSERT INTO gifi (accno,description) VALUES ('0670', 'Geringwertige Wirtschaftsg. b. 410 Euro');
-INSERT INTO gifi (accno,description) VALUES ('1000', 'Roh,-Hilfs,-und Betriebsstoffe');
-INSERT INTO gifi (accno,description) VALUES ('1140', 'Waren');
-INSERT INTO gifi (accno,description) VALUES ('1200', 'Ford. aus Lieferungen und Leistungen');
-INSERT INTO gifi (accno,description) VALUES ('1215', 'Ford.a.LuL z.allg.USt-Satz');
-INSERT INTO gifi (accno,description) VALUES ('1216', 'Ford.a.LuL z.erm.USt.-Satz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('1217', 'Ford.a.steuerfr.od.nicht steuerb.LuL (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('1218', 'Ford.a.LuL gem.§24UStG(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('1219', 'Gegenkto. bei Aufteil.d.Ford.n.Steuers.(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('1220', 'Ford.n.§11(1)2EStG f.§4/3 EStG');
-INSERT INTO gifi (accno,description) VALUES ('1248', 'Pauschalwertbe.z.Ford.bis1J.');
-INSERT INTO gifi (accno,description) VALUES ('1249', 'Pauschalwertbe.z.Ford.ueb1J.');
-INSERT INTO gifi (accno,description) VALUES ('1370', 'Durchlaufende Posten');
-INSERT INTO gifi (accno,description) VALUES ('1374', 'Fremdgeld');
-INSERT INTO gifi (accno,description) VALUES ('1400', 'Abziehbare Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('1401', 'Abziebare Vorsteuer 7%');
-INSERT INTO gifi (accno,description) VALUES ('1402', 'Abziehbare Vorsteuer aus EG-Erwerb');
-INSERT INTO gifi (accno,description) VALUES ('1403', 'Abziehbare Vorsteuer aus EG-Erwerb 16%');
-INSERT INTO gifi (accno,description) VALUES ('1405', 'Abziehbare Vorsteuer 16%');
-INSERT INTO gifi (accno,description) VALUES ('1407', 'Abziehb.Vorst.n.allgem.Durchschnittssätzen UStVA Kz.63');
-INSERT INTO gifi (accno,description) VALUES ('1408', 'Abziehbare Vorsteuer n.§13b UStG');
-INSERT INTO gifi (accno,description) VALUES ('1409', 'Abziehbare Vorsteuer n.§13b UStG 16%');
-INSERT INTO gifi (accno,description) VALUES ('1433', 'Bezahlte Einfuhrumsatzsteuer');
-INSERT INTO gifi (accno,description) VALUES ('1460', 'Geldtransit');
-INSERT INTO gifi (accno,description) VALUES ('1480', 'Gegenkonto Vorsteuer §4/3 EStG');
-INSERT INTO gifi (accno,description) VALUES ('1481', 'Auflösung Vorst.a.Vorjahr §4/3 EStG');
-INSERT INTO gifi (accno,description) VALUES ('1482', 'Vorst.aus Investitionen §4/3 EStG');
-INSERT INTO gifi (accno,description) VALUES ('1484', 'abziehb.VorSt EU-Erwerb Neufzg.b.Lief. o. USt.Ident.Nr');
-INSERT INTO gifi (accno,description) VALUES ('1600', 'Kasse');
-INSERT INTO gifi (accno,description) VALUES ('1800', 'Bank');
-INSERT INTO gifi (accno,description) VALUES ('2100', 'Privatentnahmen allgemein');
-INSERT INTO gifi (accno,description) VALUES ('2150', 'Privatsteuern');
-INSERT INTO gifi (accno,description) VALUES ('2180', 'Privateinlagen');
-INSERT INTO gifi (accno,description) VALUES ('2200', 'Sonderausgaben beschränkt abzugsfähig');
-INSERT INTO gifi (accno,description) VALUES ('2230', 'Sonderausgaben unbeschr. abzugsfähig');
-INSERT INTO gifi (accno,description) VALUES ('2250', 'Zuwendungen, Spenden');
-INSERT INTO gifi (accno,description) VALUES ('2953', 'Satzungsm.Rücklagen 0% Vorbelast.EK02');
-INSERT INTO gifi (accno,description) VALUES ('3150', 'Verbindl.gegenüber Kreditinstituten');
-INSERT INTO gifi (accno,description) VALUES ('3151', '- Restlaufzeit b.1 Jahr');
-INSERT INTO gifi (accno,description) VALUES ('3160', '- Restlaufzeit 1 bis 5 Jahre');
-INSERT INTO gifi (accno,description) VALUES ('3170', '- Restlaufzeit grösser als 5 Jahre');
-INSERT INTO gifi (accno,description) VALUES ('3300', 'Verbindlichkeiten aus Lief.u.Leist.');
-INSERT INTO gifi (accno,description) VALUES ('3305', 'Vblk.a.LuL z.allg.Umsatzsteuersatz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('3306', 'Vblk.a.LuL zum erm.Umsatzsteuersatz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('3307', 'Vblk.a.LuL ohne Vorsteuer (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('3309', 'Gegenkonto 1605-1607 b.Aufteilung d.Vblk.n.Steuers.(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('3800', 'Umsatzsteuer');
-INSERT INTO gifi (accno,description) VALUES ('3801', 'Umsatzsteuer 7%');
-INSERT INTO gifi (accno,description) VALUES ('3802', 'Umsatzsteuer aus EG-Erwerb');
-INSERT INTO gifi (accno,description) VALUES ('3803', 'Umsatzsteuer aus EG-Erwerb 16%');
-INSERT INTO gifi (accno,description) VALUES ('3805', 'Umsatzsteuer 16%');
-INSERT INTO gifi (accno,description) VALUES ('3817', 'Umsatzsteuer a.i.anderen EG-Land stpfl.Lieferungen');
-INSERT INTO gifi (accno,description) VALUES ('3820', 'Umsatzsteuer-Vorauszahlungen');
-INSERT INTO gifi (accno,description) VALUES ('3830', 'Umsatzsteuer-Vorauszahlungen 1/11');
-INSERT INTO gifi (accno,description) VALUES ('3833', 'Umsatzsteuer n.§13b UStG');
-INSERT INTO gifi (accno,description) VALUES ('3841', 'Umsatzsteuer Vorjahr');
-INSERT INTO gifi (accno,description) VALUES ('3845', 'Umsatzsteuer frühere Jahre');
-INSERT INTO gifi (accno,description) VALUES ('4110', 'Sonstige steuerfreie Umsätze Inland');
-INSERT INTO gifi (accno,description) VALUES ('4120', 'Steuerfreie Umsätze §4Nr.1a UstG');
-INSERT INTO gifi (accno,description) VALUES ('4125', 'Steuerfrei innergem. Lieferungen §41bUStG');
-INSERT INTO gifi (accno,description) VALUES ('4130', 'Liefe.d.1.Abnehm.bei innergem.Dreiecksg §25b2UStG');
-INSERT INTO gifi (accno,description) VALUES ('4135', 'Steuerfr.innergem.Lief.v.Neufahrz.an Abn.o.USt-Ident-Nr.');
-INSERT INTO gifi (accno,description) VALUES ('4140', 'Steuerfreie Umsätze Offshore usw.');
-INSERT INTO gifi (accno,description) VALUES ('4150', 'Sonstige steuerfreie Umsätze §42-7UStG');
-INSERT INTO gifi (accno,description) VALUES ('4180', 'Erlöse,die mit den Durchschnittssätzen d.§24UStG vers.werd.');
-INSERT INTO gifi (accno,description) VALUES ('4185', 'Erlöse als Kleinunternehmer i.S.d.§19(1)UStG');
-INSERT INTO gifi (accno,description) VALUES ('4200', 'Erlöse');
-INSERT INTO gifi (accno,description) VALUES ('4300', 'Erlöse 7%USt');
-INSERT INTO gifi (accno,description) VALUES ('4310', 'Erlöse Inland stpfl. EG-Lieferung7%');
-INSERT INTO gifi (accno,description) VALUES ('4315', 'Erlös Inland stpfl.EG-Lieferung 16%');
-INSERT INTO gifi (accno,description) VALUES ('4320', 'Erlöse aus im and.EG-Land steuerpfl.Lieferungen');
-INSERT INTO gifi (accno,description) VALUES ('4400', 'Erlöse 16% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4500', 'Provisionserlöse');
-INSERT INTO gifi (accno,description) VALUES ('4504', 'Provisionserlöse,steuerfrei (§4Nr.8ff.UStG)');
-INSERT INTO gifi (accno,description) VALUES ('4505', 'Provisionserlöse,steuerfrei (§4Nr.5UStG)');
-INSERT INTO gifi (accno,description) VALUES ('4506', 'Provisionserlöse 7% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4508', 'Provisionserlöse 16% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4510', 'Erlöse Abfallverwertung');
-INSERT INTO gifi (accno,description) VALUES ('4520', 'Erlös Leergut');
-INSERT INTO gifi (accno,description) VALUES ('4580', 'Erlöse zum allg.Umsatzsteuersatz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('4581', 'Erlöse zum ermä.Umsatzsteuersatz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('4582', 'Erlöse steuerfrei u.nicht steuerbar (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('4589', 'Gegenkonto 8580-8582 b.Aufteilung d.Erlöse n.Steuersätzen(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('4600', 'Unentgeldliche Wertabgaben');
-INSERT INTO gifi (accno,description) VALUES ('4605', 'Entnahme v. Gegenst.o.USt.');
-INSERT INTO gifi (accno,description) VALUES ('4610', 'Entnah.d.Untern.f.Zwecke ausserh.d.Untern.7%USt');
-INSERT INTO gifi (accno,description) VALUES ('4619', 'Entnahme durch den Untern.f.Zwecke außerhalb d.Untern.(Waren)o.USt');
-INSERT INTO gifi (accno,description) VALUES ('4620', 'Entnahme des Untern.f.Zwecke ausserh.d.Untern 16%(Waren)');
-INSERT INTO gifi (accno,description) VALUES ('4630', 'Verwendung v.Gegenst.f.Zwecke außerhalb d.Unternehmens 7% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4639', 'Verwendung v.Gegenständen f.Zwecke außerhalb d.Untern.o.USt.');
-INSERT INTO gifi (accno,description) VALUES ('4640', 'Verw.v.Gegens.f.Zwecke ausserh.d.Untern.16%USt.');
-INSERT INTO gifi (accno,description) VALUES ('4645', 'Verwend.v.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Kfz-Nutzung)');
-INSERT INTO gifi (accno,description) VALUES ('4646', 'Verwend.f.Gegenst.f.Zwecke außerh.d.Untern.16%USt(Telefonnutzung)');
-INSERT INTO gifi (accno,description) VALUES ('4660', 'Unentgeldl.Erbring.sons.Leis.16%USt');
-INSERT INTO gifi (accno,description) VALUES ('4670', 'Unentgeltl.Zuw.v Waren 7% Ust');
-INSERT INTO gifi (accno,description) VALUES ('4679', 'Unentgeltl.Zuwendung v.Waren o.USt.');
-INSERT INTO gifi (accno,description) VALUES ('4680', 'Unentgeltl.Zuw.von Waren 16% Ust');
-INSERT INTO gifi (accno,description) VALUES ('4686', 'Unentgeltl.Zuwend.v.Gegens. 16% Ust');
-INSERT INTO gifi (accno,description) VALUES ('4689', 'Unentgeldl.Zuw.v.Gegens.ohne Ust');
-INSERT INTO gifi (accno,description) VALUES ('4690', 'Nicht steuerbare Umsätze');
-INSERT INTO gifi (accno,description) VALUES ('4695', 'Umsatzsteuervergütungen');
-INSERT INTO gifi (accno,description) VALUES ('4700', 'Erlösschmälerungen');
-INSERT INTO gifi (accno,description) VALUES ('4705', 'Erlösschmälerungen aus steuerfr.Umsätzen §4 Nr.1a UStG');
-INSERT INTO gifi (accno,description) VALUES ('4710', 'Erlösschmälerung 7% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4720', 'Erlösschmälerung 16% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4724', 'Erlösschmäler.a.stfrei.IG Lieferung');
-INSERT INTO gifi (accno,description) VALUES ('4725', 'Erlösschmä.Inl.stpfl.EG-Lief. 7%USt');
-INSERT INTO gifi (accno,description) VALUES ('4726', 'Erlösschmä.Inl.stpfl.EG-Lief.16%USt');
-INSERT INTO gifi (accno,description) VALUES ('4727', 'Erlösschmä.and.EG Land stpfl.Liefer');
-INSERT INTO gifi (accno,description) VALUES ('4729', 'Erlösschmälerungen aus im Inland steuerpfl.EG-Lief.15% USt');
-INSERT INTO gifi (accno,description) VALUES ('4731', 'Gewährte Skonti 7% USt');
-INSERT INTO gifi (accno,description) VALUES ('4735', 'Gewährte Skonti 16% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4750', 'Gewährte Boni 7% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4760', 'Gewährte Boni 16% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4780', 'Gewährte Rabatte 7% USt.');
-INSERT INTO gifi (accno,description) VALUES ('4790', 'Gewährte Rabatte 16% Ust.');
-INSERT INTO gifi (accno,description) VALUES ('4800', 'Bestandsverä.fertige Erzeugnisse');
-INSERT INTO gifi (accno,description) VALUES ('4810', 'Bestandsveränderung-unfertige Erzeu');
-INSERT INTO gifi (accno,description) VALUES ('4815', 'Bestandsveränderung-unfertige Leist');
-INSERT INTO gifi (accno,description) VALUES ('4820', 'Andere aktivierte Eigenleistungen');
-INSERT INTO gifi (accno,description) VALUES ('4830', 'Sonstige Erträge');
-INSERT INTO gifi (accno,description) VALUES ('4835', 'Sonstige Erlöse betriebl.u.regelmäß');
-INSERT INTO gifi (accno,description) VALUES ('4837', 'Betriebsfremde Erträge nichtaußerorden');
-INSERT INTO gifi (accno,description) VALUES ('4840', 'Erträge aus Kursdifferenzen');
-INSERT INTO gifi (accno,description) VALUES ('4844', 'Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1aUStG(b.Buchverlust)');
-INSERT INTO gifi (accno,description) VALUES ('4845', 'Erlöse aus Verk.Sachanlagevermögen16% USt (bei Buchverlust)');
-INSERT INTO gifi (accno,description) VALUES ('4848', 'Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1bUStG(b.Buchverlust)');
-INSERT INTO gifi (accno,description) VALUES ('4849', 'Erlöse aus Anlagenverkäufen');
-INSERT INTO gifi (accno,description) VALUES ('4860', 'Grundstückserträge');
-INSERT INTO gifi (accno,description) VALUES ('4900', 'Erträge aus Abgang von AV-Gegenständen');
-INSERT INTO gifi (accno,description) VALUES ('4905', 'Ertr.a.d.Abg.v.Gegenst.d.Umlaufverm');
-INSERT INTO gifi (accno,description) VALUES ('4910', 'Ertrag a.d.Zuschreib.d.Anlagevermög');
-INSERT INTO gifi (accno,description) VALUES ('4915', 'Ertr.a.Zuschreib.d.Umlaufvermögens');
-INSERT INTO gifi (accno,description) VALUES ('4920', 'Ertr.a.Herabsetzung d.PWB zu Forderungen');
-INSERT INTO gifi (accno,description) VALUES ('4925', 'Ertr. aus abgeschriebenen Forderung');
-INSERT INTO gifi (accno,description) VALUES ('4930', 'Ertr.a.d.Auflösung v.Rückstellungen');
-INSERT INTO gifi (accno,description) VALUES ('4934', 'Erträge a.d.Auflösung v.SoPo m.Rücklageant.(Exitenzgründungszusch.');
-INSERT INTO gifi (accno,description) VALUES ('4939', 'Erträge Aufl. Sopo m.R.(Ansparafa)');
-INSERT INTO gifi (accno,description) VALUES ('4941', 'Sachbezüge 7% Ust (Waren)');
-INSERT INTO gifi (accno,description) VALUES ('4945', 'Sachbezüge 16% Ust (Waren)');
-INSERT INTO gifi (accno,description) VALUES ('4946', 'Verrechnete sons. Sachbezüge keine Waren');
-INSERT INTO gifi (accno,description) VALUES ('4960', 'Periodenfremde Erträge nicht außero');
-INSERT INTO gifi (accno,description) VALUES ('4970', 'Versicherungsentschädigungen');
-INSERT INTO gifi (accno,description) VALUES ('4981', 'Steuerfr.Erträge a.d.Auflös.v.SoPo m.Rücklageanteil');
-INSERT INTO gifi (accno,description) VALUES ('4982', 'Sonst.steuerfreie Betriebseinnahmen');
-INSERT INTO gifi (accno,description) VALUES ('5190', 'Energiestoffe (Fertigung)');
-INSERT INTO gifi (accno,description) VALUES ('5200', 'Wareneingang 0% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5300', 'Wareneingang 7% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5400', 'Wareneingang 16% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5420', 'Innergemein.Erwerb 7% VorSt u. Ust');
-INSERT INTO gifi (accno,description) VALUES ('5425', 'Innergem.Erwerb 16% VorSt u. Ust');
-INSERT INTO gifi (accno,description) VALUES ('5440', 'Innergem.Erwerb v.Neufahrz.v.Lief.o.USt.Identnr.16%VSt.u.16%USt.');
-INSERT INTO gifi (accno,description) VALUES ('5550', 'Steuerfreier innergem.Erwerb');
-INSERT INTO gifi (accno,description) VALUES ('5559', 'Steuerfreie Einfuhren');
-INSERT INTO gifi (accno,description) VALUES ('5580', 'Wareneinkauf z.allg.Umsatzsteuersatz (EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('5581', 'Wareneinkauf z.erm.Umsatzsteuersatz(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('5582', 'Wareneinkauf ohne Vorsteuerabzug(EÜR)');
-INSERT INTO gifi (accno,description) VALUES ('5589', 'Gegenkto.3580-3582 b.Aufteilung d.WE n.Steuersätzen(EüR)');
-INSERT INTO gifi (accno,description) VALUES ('5600', 'Nicht abziehbare Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5610', 'Nicht abziehb.Vorsteuer 7%');
-INSERT INTO gifi (accno,description) VALUES ('5650', 'Nicht abziehb.Vorsteuer 16%');
-INSERT INTO gifi (accno,description) VALUES ('5731', 'Erhaltene Skonti 7% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5735', 'Erhaltene Skonti 16% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5750', 'Erhaltene Boni 7% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5760', 'Erhaltene Boni 16% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5780', 'Erhaltene Rabatte 7% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5790', 'Erhaltene Rabatte 16% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5800', 'Bezugsnebenkosten');
-INSERT INTO gifi (accno,description) VALUES ('5820', 'Leergut');
-INSERT INTO gifi (accno,description) VALUES ('5840', 'Zölle und Einfuhrabgaben');
-INSERT INTO gifi (accno,description) VALUES ('5860', 'Verrechnete Stoffkosten');
-INSERT INTO gifi (accno,description) VALUES ('5880', 'Bestandsver.Roh-,Hilfs-.Betriebs.sow.bez.Waren');
-INSERT INTO gifi (accno,description) VALUES ('5900', 'Fremdleistungen');
-INSERT INTO gifi (accno,description) VALUES ('5901', 'Fremdleistungen 0% Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('5915', 'Leist.v.ausländ.Untern. 7% VSt.u.7%USt.');
-INSERT INTO gifi (accno,description) VALUES ('5925', 'Leist.v.ausländ.Untern. 16% VSt.u.16%USt.');
-INSERT INTO gifi (accno,description) VALUES ('6010', 'Löhne');
-INSERT INTO gifi (accno,description) VALUES ('6020', 'Gehälter');
-INSERT INTO gifi (accno,description) VALUES ('6026', 'Tantiemen');
-INSERT INTO gifi (accno,description) VALUES ('6027', 'Geschäftsführergehälter');
-INSERT INTO gifi (accno,description) VALUES ('6030', 'Aushilfslöhne');
-INSERT INTO gifi (accno,description) VALUES ('6040', 'Lohnsteuer für Aushilfe');
-INSERT INTO gifi (accno,description) VALUES ('6045', 'Bedienungsgelder');
-INSERT INTO gifi (accno,description) VALUES ('6050', 'Ehegattengehalt');
-INSERT INTO gifi (accno,description) VALUES ('6060', 'Freiwillige sozi.Aufw.lohnsteuerpflichtig.');
-INSERT INTO gifi (accno,description) VALUES ('6069', 'Pauschale Lohnsteuera.sons.Bezüge (z.B.Fahrtkostenzu)');
-INSERT INTO gifi (accno,description) VALUES ('6070', 'Krankengeldzuschüsse');
-INSERT INTO gifi (accno,description) VALUES ('6080', 'Vermögenswirksame Leistungen');
-INSERT INTO gifi (accno,description) VALUES ('6090', 'Fahrtkostenerst.Wohnung/Arbeitsstät');
-INSERT INTO gifi (accno,description) VALUES ('6110', 'Gesetzlich soziale Aufwendungen');
-INSERT INTO gifi (accno,description) VALUES ('6120', 'Beiträge zur Berufsgenossenschaftr');
-INSERT INTO gifi (accno,description) VALUES ('6130', 'Freiwillig soziale Aufwendungen lohnsteuerfrei');
-INSERT INTO gifi (accno,description) VALUES ('6147', 'Pauschale Lohnsteuer auf sonst.Bezüge(z.B.Direktversicherung');
-INSERT INTO gifi (accno,description) VALUES ('6200', 'Abschreibungen a.immat.Vermögensgeg');
-INSERT INTO gifi (accno,description) VALUES ('6205', 'Abschreibung a.d.Geschäft-o.Firmenw');
-INSERT INTO gifi (accno,description) VALUES ('6210', 'Außerplan.AfA a.immat.Vermögensgeg.');
-INSERT INTO gifi (accno,description) VALUES ('6220', 'Abschreibungen auf Sachanlagen');
-INSERT INTO gifi (accno,description) VALUES ('6221', 'Abschreibung auf Gebäude');
-INSERT INTO gifi (accno,description) VALUES ('6222', 'Abschreibungen auf Kfz');
-INSERT INTO gifi (accno,description) VALUES ('6230', 'Außerplanmäßig Abschr.a.Sachanlagen');
-INSERT INTO gifi (accno,description) VALUES ('6231', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA bei Gebäuden');
-INSERT INTO gifi (accno,description) VALUES ('6232', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA des Kfz');
-INSERT INTO gifi (accno,description) VALUES ('6233', 'Absetzung f.außergew.techn.u.wirtschaftl.AfA sonst.WG');
-INSERT INTO gifi (accno,description) VALUES ('6240', 'Abschr.a.Sachanl.aufgr.steuerl.Sondervorschriften');
-INSERT INTO gifi (accno,description) VALUES ('6241', 'Sonderabschreibung nach §7g(1)u.(2)EStG (ohne Kfz)');
-INSERT INTO gifi (accno,description) VALUES ('6242', 'Sonderabschreibung n.§7g(1)u.(2)EStG (für Kfz)');
-INSERT INTO gifi (accno,description) VALUES ('6250', 'Kaufleasing');
-INSERT INTO gifi (accno,description) VALUES ('6260', 'Sofortabschreibung GWG');
-INSERT INTO gifi (accno,description) VALUES ('6262', 'Abschreibungen auf aktivierte GWG');
-INSERT INTO gifi (accno,description) VALUES ('6270', 'Abschreibungen auf Finanzanlagen');
-INSERT INTO gifi (accno,description) VALUES ('6275', 'Abschr.a.Wertp.d.Umlaufvermögens');
-INSERT INTO gifi (accno,description) VALUES ('6280', 'Forderungsverlust-übliche Höhe');
-INSERT INTO gifi (accno,description) VALUES ('6281', 'Forderungsverluste 7% USt.(übliche Höhe');
-INSERT INTO gifi (accno,description) VALUES ('6285', 'Forderungsverluste 16% USt.(übliche Höhe');
-INSERT INTO gifi (accno,description) VALUES ('6300', 'Sonstige betriebliche Aufwendungen');
-INSERT INTO gifi (accno,description) VALUES ('6303', 'Fremdleistungen');
-INSERT INTO gifi (accno,description) VALUES ('6304', 'Sons.Aufw.betriebl. und regelmäßig');
-INSERT INTO gifi (accno,description) VALUES ('6305', 'Raumkosten');
-INSERT INTO gifi (accno,description) VALUES ('6310', 'Miete');
-INSERT INTO gifi (accno,description) VALUES ('6315', 'Pacht');
-INSERT INTO gifi (accno,description) VALUES ('6320', 'Heizung');
-INSERT INTO gifi (accno,description) VALUES ('6325', 'Gas,Strom, Wasser');
-INSERT INTO gifi (accno,description) VALUES ('6330', 'Reinigung');
-INSERT INTO gifi (accno,description) VALUES ('6335', 'Instandhaltung betrieb.Räume');
-INSERT INTO gifi (accno,description) VALUES ('6338', 'Instandhaltung betrieb.Räume nicht Betriebsverm.');
-INSERT INTO gifi (accno,description) VALUES ('6343', 'Abgaben f.betrieb.genutz.Grundbesitz nicht Betriebsverm.');
-INSERT INTO gifi (accno,description) VALUES ('6345', 'Sonstige Raumkosten');
-INSERT INTO gifi (accno,description) VALUES ('6348', 'Aufwend.f.ein häusliches Arbeitszimmer(abziehb.Anteil)');
-INSERT INTO gifi (accno,description) VALUES ('6349', 'Aufwend.f.ein häusliches Arbeitszimmer(nicht abziehb.Anteil)');
-INSERT INTO gifi (accno,description) VALUES ('6350', 'Grundstücksaufwendungen');
-INSERT INTO gifi (accno,description) VALUES ('6390', 'Zuwend.,Spenden,steuerlich n.abziehbar');
-INSERT INTO gifi (accno,description) VALUES ('6358', 'Gründstücksaufwend.f.Gebäude,die nicht z.Betriebsverm.gehören');
-INSERT INTO gifi (accno,description) VALUES ('6400', 'Versicherungen');
-INSERT INTO gifi (accno,description) VALUES ('6405', 'Versicherungen f.Gebäude,die zum BV gehören');
-INSERT INTO gifi (accno,description) VALUES ('6420', 'Beiträge');
-INSERT INTO gifi (accno,description) VALUES ('6430', 'Sonstige Abgaben');
-INSERT INTO gifi (accno,description) VALUES ('6436', 'Steuerl.abzugs.Verspätungszuschl.u.Zwangsgelder');
-INSERT INTO gifi (accno,description) VALUES ('6437', 'Steuerl.n.abzugsf.Verspätungszuschläge u.Zwangsgelder');
-INSERT INTO gifi (accno,description) VALUES ('6440', 'Ausgleichsabgabe i.S.d.Schwerbehinterdengesetzes');
-INSERT INTO gifi (accno,description) VALUES ('6460', 'Rep.u.Instandhaltungen v.techn.Anlagen u.Maschinen');
-INSERT INTO gifi (accno,description) VALUES ('6470', 'Rep.u.Instandhaltungen v.and.Anlagen u.Betriebs-u.Geschäftsausst.');
-INSERT INTO gifi (accno,description) VALUES ('6490', 'Sonstige Reparaturen u.Instandhalt.');
-INSERT INTO gifi (accno,description) VALUES ('6495', 'Wartungskosten für Hard-u.Software');
-INSERT INTO gifi (accno,description) VALUES ('6498', 'Mietleasing');
-INSERT INTO gifi (accno,description) VALUES ('6499', 'Gewerbest.zu berücksicht.Mietleasing §8 GewStG');
-INSERT INTO gifi (accno,description) VALUES ('6500', 'Fahrzugkosten');
-INSERT INTO gifi (accno,description) VALUES ('6520', 'Kfz-Versicherungen');
-INSERT INTO gifi (accno,description) VALUES ('6530', 'Laufende Kfz-Betriebskosten');
-INSERT INTO gifi (accno,description) VALUES ('6540', 'Kfz-Reparaturen');
-INSERT INTO gifi (accno,description) VALUES ('6550', 'Garagenmiete');
-INSERT INTO gifi (accno,description) VALUES ('6560', 'Fremdfahrzeuge');
-INSERT INTO gifi (accno,description) VALUES ('6595', 'Fremdfahrzeugkosten');
-INSERT INTO gifi (accno,description) VALUES ('6570', 'Sonstige Kfz-Kosten');
-INSERT INTO gifi (accno,description) VALUES ('6580', 'Mautgebühren');
-INSERT INTO gifi (accno,description) VALUES ('6590', 'Fahrzeugkosten f.Kfz,die nicht zum BV gehören');
-INSERT INTO gifi (accno,description) VALUES ('6600', 'Werbekosten');
-INSERT INTO gifi (accno,description) VALUES ('6610', 'Geschenke abzugsf.');
-INSERT INTO gifi (accno,description) VALUES ('6620', 'Geschenke nicht abzugsf.');
-INSERT INTO gifi (accno,description) VALUES ('6625', 'Geschenke ausschließl.betrieb.genut');
-INSERT INTO gifi (accno,description) VALUES ('6630', 'Repräsentationskosten');
-INSERT INTO gifi (accno,description) VALUES ('6640', 'Bewirtungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6643', 'Aufmerksamkeiten');
-INSERT INTO gifi (accno,description) VALUES ('6644', 'Nicht abzugsfähige Bewirtungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6645', 'Nicht abzugsfähige Betriebsausgaben');
-INSERT INTO gifi (accno,description) VALUES ('6650', 'Reisekosten Arbeitnehmer');
-INSERT INTO gifi (accno,description) VALUES ('6660', 'Reisekosten Arbeitn.Übernachtungsaufwand');
-INSERT INTO gifi (accno,description) VALUES ('6663', 'Reisekosten Arbeitn.m.Vorsteuerabzu f.öffentl.Verkehrsm.');
-INSERT INTO gifi (accno,description) VALUES ('6664', 'Reisekosten Arbeitn.Verpflegungmehr');
-INSERT INTO gifi (accno,description) VALUES ('6668', 'Kilometerentgelderstattung Arbeitnehmer');
-INSERT INTO gifi (accno,description) VALUES ('6670', 'Reisekosten Unternehmer');
-INSERT INTO gifi (accno,description) VALUES ('6673', 'Reisek.Untern.m.Vorsteuerabzug (f.öffentl.Verkehrsm.');
-INSERT INTO gifi (accno,description) VALUES ('6674', 'Reisekosten Untern.Verpflegungsmehr');
-INSERT INTO gifi (accno,description) VALUES ('6680', 'Reisekosten Untern.Übernachtungsauf');
-INSERT INTO gifi (accno,description) VALUES ('6688', 'Fahrten zw.Wohn.und Arbeitsstätte (nicht abziehb.Teil)');
-INSERT INTO gifi (accno,description) VALUES ('6689', 'Fahrten zw.Wohn.-und Arbeitsstätte (Haben)');
-INSERT INTO gifi (accno,description) VALUES ('6700', 'Kosten der Warenabgabe');
-INSERT INTO gifi (accno,description) VALUES ('6710', 'Verpackungsmaterial');
-INSERT INTO gifi (accno,description) VALUES ('6740', 'Ausgangsfracht');
-INSERT INTO gifi (accno,description) VALUES ('6760', 'Transportversicherung');
-INSERT INTO gifi (accno,description) VALUES ('6770', 'Verkaufsprovision');
-INSERT INTO gifi (accno,description) VALUES ('6780', 'Fremdarbeiten');
-INSERT INTO gifi (accno,description) VALUES ('6790', 'Aufwand für Gewährleistungen');
-INSERT INTO gifi (accno,description) VALUES ('6800', 'Porto');
-INSERT INTO gifi (accno,description) VALUES ('6805', 'Telefon');
-INSERT INTO gifi (accno,description) VALUES ('6810', 'Telefax');
-INSERT INTO gifi (accno,description) VALUES ('6815', 'Bürobedarf');
-INSERT INTO gifi (accno,description) VALUES ('6820', 'Zeitschriften, Bücher');
-INSERT INTO gifi (accno,description) VALUES ('6821', 'Fortbildungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6822', 'Freiwillige Sozialleistungen');
-INSERT INTO gifi (accno,description) VALUES ('6825', 'Rechts- und Beratungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6827', 'Abschluß- und Prüfungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6830', 'Buchführungskosten');
-INSERT INTO gifi (accno,description) VALUES ('6835', 'Mieten für Einrichtungen');
-INSERT INTO gifi (accno,description) VALUES ('6840', 'Mieten für Einrichtungen');
-INSERT INTO gifi (accno,description) VALUES ('6845', 'Werkzeuge und Kleingeräte');
-INSERT INTO gifi (accno,description) VALUES ('6850', 'Betriebsbedarf');
-INSERT INTO gifi (accno,description) VALUES ('6855', 'Nebenkosten des Geldverkehrs');
-INSERT INTO gifi (accno,description) VALUES ('6859', 'Aufwend.f.Abraum-u.Abfallbeseitigung');
-INSERT INTO gifi (accno,description) VALUES ('6860', 'Nicht abziehbare Vorsteuer');
-INSERT INTO gifi (accno,description) VALUES ('6865', 'Nicht abziehbare Vorsteuer 7%');
-INSERT INTO gifi (accno,description) VALUES ('6870', 'Nicht abziehbare Vorsteuer 16%');
-INSERT INTO gifi (accno,description) VALUES ('6880', 'Aufwendungen aus Kursdifferenzen');
-INSERT INTO gifi (accno,description) VALUES ('6895', 'Abgänge Sachanlagen Restbuchwert');
-INSERT INTO gifi (accno,description) VALUES ('6900', 'Verluste aus Anlagenabgang');
-INSERT INTO gifi (accno,description) VALUES ('6926', 'Einstellungen in SoPo m.Rücklageanteil (Ansparabschreibung');
-INSERT INTO gifi (accno,description) VALUES ('6928', 'Einstellungen in SoPo m.Rücklageanteil (Existenzgründungsrücklage');
-INSERT INTO gifi (accno,description) VALUES ('6960', 'Periodenfremde Aufwend.(soweit n.außerordentlich');
-INSERT INTO gifi (accno,description) VALUES ('6967', 'Betriebsfremde Aufwendungen soweit n.außerord.');
-INSERT INTO gifi (accno,description) VALUES ('6970', 'Kalkulatorischer Unternehmerlohn');
-INSERT INTO gifi (accno,description) VALUES ('6974', 'Kalkulatorische Zinsen');
-INSERT INTO gifi (accno,description) VALUES ('6976', 'Kalkulatorische Aschreibungen');
-INSERT INTO gifi (accno,description) VALUES ('6978', 'Kalkulatorische Wagnisse');
-INSERT INTO gifi (accno,description) VALUES ('6979', 'Kalkulatorischer Lohn f.unentgeltl.Mitarbeiter');
-INSERT INTO gifi (accno,description) VALUES ('7000', 'Erträge aus Beteiligungen');
-INSERT INTO gifi (accno,description) VALUES ('7100', 'Sonstige Zinsen und ähnliche Erträge');
-INSERT INTO gifi (accno,description) VALUES ('7120', 'Zinsähnliche Erträge');
-INSERT INTO gifi (accno,description) VALUES ('7130', 'Diskonterträge');
-INSERT INTO gifi (accno,description) VALUES ('7300', 'Zinsen und ähnl.Aufwendungen');
-INSERT INTO gifi (accno,description) VALUES ('7305', 'Zinsaufwendung-betriebliche Steuern §223aAO');
-INSERT INTO gifi (accno,description) VALUES ('7310', 'Zinsaufwendung f.kurzf.Verbindlichk');
-INSERT INTO gifi (accno,description) VALUES ('7320', 'Zinsaufwendung f.langf.Verbindlichk');
-INSERT INTO gifi (accno,description) VALUES ('7325', 'Zinsaufwend.f.Gebäude,die z.Betriebsvermögen gehören');
-INSERT INTO gifi (accno,description) VALUES ('7326', 'Zinsen zur Finanzierung Anlagevermögen');
-INSERT INTO gifi (accno,description) VALUES ('7330', 'Zinsähnliche Aufwendungen');
-INSERT INTO gifi (accno,description) VALUES ('7340', 'Diskontaufwendung');
-INSERT INTO gifi (accno,description) VALUES ('7400', 'Außerordentliche Erträge');
-INSERT INTO gifi (accno,description) VALUES ('7401', 'Außerordentliche Erträge finanzwirksam');
-INSERT INTO gifi (accno,description) VALUES ('7450', 'Außerordentliche Erträge nicht finanzwirksam');
-INSERT INTO gifi (accno,description) VALUES ('7500', 'Außerordentliche Aufwendung');
-INSERT INTO gifi (accno,description) VALUES ('7600', 'Körperschaftssteuer');
-INSERT INTO gifi (accno,description) VALUES ('7608', 'Solidaritätszuschlag');
-INSERT INTO gifi (accno,description) VALUES ('7609', 'Solidaritätszuschlag für Vorjahr');
-INSERT INTO gifi (accno,description) VALUES ('7610', 'Gewerbesteuer');
-INSERT INTO gifi (accno,description) VALUES ('7632', 'Kapitalertragssteuer 20%');
-INSERT INTO gifi (accno,description) VALUES ('7634', 'Anrechenb.Soli auf Kapitalertragssteuer 20%');
-INSERT INTO gifi (accno,description) VALUES ('7635', 'Zinsabschlagsteuer');
-INSERT INTO gifi (accno,description) VALUES ('7638', 'Anrechb.Solidari.zuschlag a.Zinsabschlagst.');
-INSERT INTO gifi (accno,description) VALUES ('7640', 'Stnachzahl.Vorj.v.Einkomm u.Ertrag');
-INSERT INTO gifi (accno,description) VALUES ('7642', 'Sterstat.Vorj.Steuer v.Eink.u.Ertrag');
-INSERT INTO gifi (accno,description) VALUES ('7644', 'Ertr.a.d.Aufl.v.Rücks.f.St.v.Ein.Er');
-INSERT INTO gifi (accno,description) VALUES ('7650', 'Sonstige Betriebssteuern');
-INSERT INTO gifi (accno,description) VALUES ('7675', 'Verbrauchssteuer');
-INSERT INTO gifi (accno,description) VALUES ('7678', 'Ökosteuer');
-INSERT INTO gifi (accno,description) VALUES ('7680', 'Grundsteuer');
-INSERT INTO gifi (accno,description) VALUES ('7684', 'Grundsteuer f.Gebäude,die nicht z.Betriebsvermögen geh');
-INSERT INTO gifi (accno,description) VALUES ('7685', 'Kfz-Steuer');
-INSERT INTO gifi (accno,description) VALUES ('7690', 'Steuernachzahlung Vorj.f.sons.Steue');
-INSERT INTO gifi (accno,description) VALUES ('7692', 'Steuererstattung Vorj.f.sons.Steuer');
-INSERT INTO gifi (accno,description) VALUES ('7694', 'Erträge a.d.Aufl.v. Rück.f.sons.Ste');
-INSERT INTO gifi (accno,description) VALUES ('7745', 'Entnahmen a.satzungsmäßigen Rücklagen');
-INSERT INTO gifi (accno,description) VALUES ('9000', 'Saldenverträge,Sachkonten');
-INSERT INTO gifi (accno,description) VALUES ('9008', 'Saldenverträge,Debitoren');
-INSERT INTO gifi (accno,description) VALUES ('9009', 'Saldenverträge,Kreditoren');
-INSERT INTO gifi (accno,description) VALUES ('9090', 'Summenvortragskonto');

diff --git a/sql/Pg-upgrade-2.1.1-2.1.2.sql b/sql/Pg-upgrade-2.1.1-2.1.2.sql
deleted file mode 100644 (file)
index 7cf0355..0000000
--- a/sql/Pg-upgrade-2.1.1-2.1.2.sql
+++ /dev/null
@@ -1,328 +0,0 @@
-
---Update der Numeric-Spalten von 5 auf 10 Vorkommastellen
---
---TABLE ap
-alter table ap rename column paid to paidold;
-alter table ap add column paid numeric(15,5);
-update ap set paid=paidold;
-alter table ap drop column paidold;
---
-alter table ap rename column netamount to netamountold;
-alter table ap add column netamount numeric(15,5);
-update ap set netamount=netamountold;
-alter table ap drop column netamountold;
---
-alter table ap rename column amount to amountold;
-alter table ap add column amount numeric(15,5);
-update ap set amount=amountold;
-alter table ap drop column amountold;
---
---TABLE acc_trans
-alter table acc_trans rename column amount to amountold;
-alter table acc_trans add column amount numeric(15,5);
-update acc_trans set amount=amountold;
-alter table acc_trans drop column amountold;
---
---TABLE ar
-alter table ar rename column amount to amountold;
-alter table ar add column amount numeric(15,5);
-update ar set amount=amountold;
-alter table ar drop column amountold;
---
-alter table ar rename column netamount to netamountold;
-alter table ar add column netamount numeric(15,5);
-update ar set netamount=netamountold;
-alter table ar drop column netamountold;
---
-alter table ar rename column paid to paidold;
-alter table ar add column paid numeric(15,5);
-update ar set paid=paidold;
-alter table ar drop column paidold;
---
---TABLE customer
-alter table customer rename column creditlimit to creditlimitold;
-alter table customer add column creditlimit numeric(15,5);
-update customer set creditlimit=creditlimitold;
-alter table customer drop column creditlimitold;
---
---TABLE exchangerate
-alter table exchangerate rename column buy to buyold;
-alter table exchangerate add column buy numeric(15,5);
-update exchangerate set buy=buyold;
-alter table exchangerate drop column buyold;
---
-alter table exchangerate rename column sell to sellold;
-alter table exchangerate add column sell numeric(15,5);
-update exchangerate set sell=sellold;
-alter table exchangerate drop column sellold;
---
---TABLE invoice
-alter table invoice rename column sellprice to sellpriceold;
-alter table invoice add column sellprice numeric(15,5);
-update invoice set sellprice=sellpriceold;
-alter table invoice drop column sellpriceold;
---
-alter table invoice rename column fxsellprice to fxsellpriceold;
-alter table invoice add column fxsellprice numeric(15,5);
-update invoice set fxsellprice=fxsellpriceold;
-alter table invoice drop column fxsellpriceold;
---
---TABLE oe
-alter table oe rename column amount to amountold;
-alter table oe add column amount numeric(15,5);
-update oe set amount=amountold;
-alter table oe drop column amountold;
---
-alter table oe rename column netamount to netamountold;
-alter table oe add column netamount numeric(15,5);
-update oe set netamount=netamountold;
-alter table oe drop column netamountold;
---
---TABLE orderitems
-alter table orderitems rename column sellprice to sellpriceold;
-alter table orderitems add column sellprice numeric(15,5);
-update orderitems set sellprice=sellpriceold;
-alter table orderitems drop column sellpriceold;
---
---TABLE parts
-alter table parts rename column listprice to listpriceold;
-alter table parts add column listprice numeric(15,5);
-update parts set listprice=listpriceold;
-alter table parts drop column listpriceold;
---
-alter table parts rename column sellprice to sellpriceold;
-alter table parts add column sellprice numeric(15,5);
-update parts set sellprice=sellpriceold;
-alter table parts drop column sellpriceold;
---
-alter table parts rename column lastcost to lastcostold;
-alter table parts add column lastcost numeric(15,5);
-update parts set lastcost=lastcostold;
-alter table parts drop column lastcostold;
---
---TABLE tax
-alter table tax rename column rate to rateold;
-alter table tax add column rate numeric(15,5);
-update tax set rate=rateold;
-alter table tax drop column rateold;
---
---TABLE vendor
-alter table vendor rename column creditlimit to creditlimitold;
-alter table vendor add column creditlimit numeric(15,5);
-update vendor set creditlimit=creditlimitold;
-alter table vendor drop column creditlimitold;
---
-
---New Fields for customer and vendor
-alter table vendor add column obsolete boolean;
-alter table vendor alter column obsolete set default 'false';
-update table vendor set obsolete='false';
-alter table customer add column obsolete boolean;
-alter table customer alter column obsolete set default 'false';
-update table customer set obsolete='false';
-alter table customer add column ustid varchar(12);
-alter table vendor add column ustid varchar(12);
-
-alter table customer add column username varchar(50);
-alter table vendor add column username varchar(50);
-alter table customer add column user_password text;
-alter table vendor add column user_password text;
-alter table customer add column salesman_id integer;
-alter table vendor add column salesman_id integer;
-
--- Shipto
-alter table shipto add column shiptodepartment_1 varchar(75);
-alter table shipto add column shiptodepartment_2 varchar(75);
-
-
-
--- Addon for business
-alter table business add column salesman boolean;
-alter table business alter column salesman set default 'false';
-alter table business add column customernumberinit text;
-
-alter table parts add column ve integer;
-alter table parts add column gv numeric(15,5);
---
-
--- Add table contrains
-alter table customer alter name SET NOT NULL;
-alter table vendor alter name set NOT NULL;
-alter table chart alter accno set NOT NULL;
-alter table parts alter partnumber set NOT NULL;
-alter table ar alter invnumber set NOT NULL;
-alter table ap alter invnumber set NOT NULL;
-alter table oe alter ordnumber set NOT NULL;
-
-alter table gl alter id set NOT NULL;
-alter table chart alter id set NOT NULL;
-alter table parts alter id set NOT NULL;
-alter table invoice alter id set NOT NULL;
-alter table vendor alter id set NOT NULL;
-alter table customer alter id set NOT NULL;
-alter table contacts alter cp_id set NOT NULL;
-alter table ar alter id set NOT NULL;
-alter table ap alter id set NOT NULL;
-alter table oe alter id set NOT NULL;
-alter table employee alter id set NOT NULL;
-alter table warehouse alter id set NOT NULL;
-alter table business alter id set NOT NULL;
-alter table license alter id set NOT NULL;
-alter table orderitems alter id set NOT NULL;
-
-alter table gl add primary key (id);
-alter table chart add primary key (id);
-alter table parts add primary key (id);
-alter table invoice add primary key (id);
-alter table vendor add primary key (id);
-alter table customer add primary key (id);
-alter table contacts add primary key (cp_id);
-alter table ar add primary key (id);
-alter table ap add primary key (id);
-alter table oe add primary key (id);
-alter table employee add primary key (id);
-alter table warehouse add primary key (id);
-alter table business add primary key (id);
-alter table license add primary key (id);
-
-alter table acc_trans add foreign key (chart_id) references chart (id);
-alter table invoice add foreign key (parts_id) references parts (id);
-alter table ar add foreign key (customer_id) references customer (id);
-alter table ap add foreign key (vendor_id) references vendor (id);
-alter table orderitems add foreign key (parts_id) references parts (id);
-
---Modify the possible length of bank account numbers
-alter table customer add column temp_account_number character varying(15);
-update customer set temp_account_number=account_number;
-alter table customer drop column account_number;
-alter table customer rename temp_account_number to  account_number;
-
-alter table vendor add column temp_account_number character varying(15);
-update vendor set temp_account_number=account_number;
-alter table vendor drop column account_number;
-alter table vendor rename temp_account_number to  account_number;
-
--- audit
-alter table defaults add column audittrail bool;
-CREATE TABLE audittrail (
-  trans_id int,
-  tablename text,
-  reference text,
-  formname text,
-  action text,
-  transdate timestamp default current_timestamp,
-  employee_id int
-);
-
--- pricegroups
-
-CREATE TABLE "pricegroup" (
-  "id" integer DEFAULT nextval('id'::text),
-  "pricegroup" text not null,
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE "prices" (
-  "parts_id" integer REFERENCES parts(id),
-  "pricegroup_id" integer,
-  "price" numeric(15,5)
-);
-
-ALTER TABLE customer ADD column klass integer;
-ALTER TABLE customer ALTER column klass set default 0;
-
--- 
-ALTER TABLE invoice ADD column pricegroup_id integer;
-ALTER TABLE orderitems ADD column pricegroup_id integer;
-
-
--- USTVA Update solve Bug 49 conributed by Andre Schubert
-update chart set pos_ustva='861' where accno='1771';
-update chart set pos_ustva='511' where accno='1775';
--- update chart set pos_ustva='511' where pos_ustva='51r';
--- update chart set pos_ustva='861' where pos_ustva='86r';
--- update chart set pos_ustva='971' where pos_ustva='97r';
--- update chart set pos_ustva='931' where pos_ustva='93r';
-
--- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
-alter table orderitems add column ordnumber text;
-alter table orderitems add column transdate text;
-alter table orderitems add column cusordnumber text;
-alter table invoice add column ordnumber text;
-alter table invoice add column transdate text;
-alter table invoice add column cusordnumber text;
---
--- UStVA Link to SKR03/2006
--- Let this structure like it is, please.
--- This structure is based on the sequence of the USTVA 2006
--- Created by Udo Spallek
---
--- 1. Page UStVA
-UPDATE chart SET pos_ustva=41  WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828');
-UPDATE chart SET pos_ustva=44  WHERE accno IN ('8135');
-UPDATE chart SET pos_ustva=49  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=43  WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827');
-UPDATE chart SET pos_ustva=48  WHERE accno IN ('8100', '8110', '8504', '8609');
-UPDATE chart SET pos_ustva=51  WHERE accno IN ('1717', '2404', '2405', '2700', '2705', '2707', '2709', '8196', '8315', '8400', '8595', '8600', '8611', '8640', '8720', '8726', '8735', '8760', '8790', '8801', '8809', '8820', '8910', '8920', '8921', '8922', '8925', '8935', '8940');
-UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775');
-UPDATE chart SET pos_ustva=86  WHERE accno IN ('1711', '2401', '2403', '8300', '8310', '8506', '8591', '8630', '8710', '8725', '8731', '8750', '8780', '8915', '8930', '8932', '8945');
-UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771');
-UPDATE chart SET pos_ustva=35  WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794');
-UPDATE chart SET pos_ustva=36  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=77  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=76  WHERE accno IN ('8190');
-UPDATE chart SET pos_ustva=80  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=91  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=97  WHERE accno IN ('3425', '3725');
-UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773');
-UPDATE chart SET pos_ustva=93  WHERE accno IN ('3420', '3724');
-UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772');
-UPDATE chart SET pos_ustva=95  WHERE accno IN ('3727');
-UPDATE chart SET pos_ustva=98  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=94  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=96  WHERE accno IN ('1784');
-UPDATE chart SET pos_ustva=42  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=60  WHERE accno IN ('8337');
-UPDATE chart SET pos_ustva=45  WHERE accno IN ('8338', '8339', '8950');
--- 2. Page UStVA
-UPDATE chart SET pos_ustva=52  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=53  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=73  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=74  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=84  WHERE accno IN ('3110', '3115', '3120', '3125');
-UPDATE chart SET pos_ustva=85  WHERE accno IN ('1785', '1786');
-UPDATE chart SET pos_ustva=65  WHERE accno IN ('1782');
-UPDATE chart SET pos_ustva=66  WHERE accno IN ('1570', '1571', '1575', '1576');
-UPDATE chart SET pos_ustva=61  WHERE accno IN ('1572', '1573');
-UPDATE chart SET pos_ustva=62  WHERE accno IN ('1588');
-UPDATE chart SET pos_ustva=67  WHERE accno IN ('1578', '1579');
-UPDATE chart SET pos_ustva=63  WHERE accno IN ('1577');
-UPDATE chart SET pos_ustva=64  WHERE accno IN ('1556', '1557', '1558', '1559');
-UPDATE chart SET pos_ustva=59  WHERE accno IN ('');
-UPDATE chart SET pos_ustva=69  WHERE accno IN ('1783');
-UPDATE chart SET pos_ustva=39  WHERE accno IN ('1781');
---
--- clear table tax
-DELETE from tax;
--- insert actual values for SKR03
-INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','0','Keine Steuer');
-INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','1','Umsatzsteuerfrei (mit Vorsteuerabzug)');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1771'),'0.07','1771','2','Umsatzsteuer 7%');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1775'),'0.16','1775','3','Umsatzsteuer 16%');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1571'),'0.07','1571','8','Vorsteuer 7%');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1575'),'0.16','1575','9','Vorsteuer 16%');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1767'),'0.00','1767','10','Im anderen EG-Staat steuerpfl. Lieferung');
-INSERT INTO tax (taxkey, taxdescription) VALUES ('11','Steuerfreie EG-Lief. an Abn. mit UStIdNr');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1772'),'0.07','1772','12','Umsatzsteuer 7% innergem. Erwerb');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1773'),'0.16','1773','13','Umsatzsteuer 16% innergem. Erwerb');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.07','1572','18','Steuerpfl. EG-Erwerb 7%');
-INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.16','1573','19','Steuerpfl. EG-Erwerb 16%');
---
---
--- add unqiue constraint to project
-ALTER TABLE project ADD constraint project_projectnumber_key UNIQUE(projectnumber);
---
--- add column deliverydate to ar
-ALTER TABLE ar ADD COLUMN deliverydate date;
-
-update defaults set version = '2.1.2';

diff --git a/sql/Pg-upgrade-2.1.2-2.2.0.sql b/sql/Pg-upgrade-2.1.2-2.2.0.sql
new file mode 100644 (file)
index 0000000..e6928bc
--- /dev/null
+++ b/sql/Pg-upgrade-2.1.2-2.2.0.sql
@@ -0,0 +1,330 @@
+
+--Update der Numeric-Spalten von 5 auf 10 Vorkommastellen
+--
+--TABLE ap
+alter table ap rename column paid to paidold;
+alter table ap add column paid numeric(15,5);
+update ap set paid=paidold;
+alter table ap drop column paidold;
+--
+alter table ap rename column netamount to netamountold;
+alter table ap add column netamount numeric(15,5);
+update ap set netamount=netamountold;
+alter table ap drop column netamountold;
+--
+alter table ap rename column amount to amountold;
+alter table ap add column amount numeric(15,5);
+update ap set amount=amountold;
+alter table ap drop column amountold;
+--
+--TABLE acc_trans
+alter table acc_trans rename column amount to amountold;
+alter table acc_trans add column amount numeric(15,5);
+update acc_trans set amount=amountold;
+alter table acc_trans drop column amountold;
+--
+--TABLE ar
+alter table ar rename column amount to amountold;
+alter table ar add column amount numeric(15,5);
+update ar set amount=amountold;
+alter table ar drop column amountold;
+--
+alter table ar rename column netamount to netamountold;
+alter table ar add column netamount numeric(15,5);
+update ar set netamount=netamountold;
+alter table ar drop column netamountold;
+--
+alter table ar rename column paid to paidold;
+alter table ar add column paid numeric(15,5);
+update ar set paid=paidold;
+alter table ar drop column paidold;
+--
+--TABLE customer
+alter table customer rename column creditlimit to creditlimitold;
+alter table customer add column creditlimit numeric(15,5);
+update customer set creditlimit=creditlimitold;
+alter table customer drop column creditlimitold;
+--
+--TABLE exchangerate
+alter table exchangerate rename column buy to buyold;
+alter table exchangerate add column buy numeric(15,5);
+update exchangerate set buy=buyold;
+alter table exchangerate drop column buyold;
+--
+alter table exchangerate rename column sell to sellold;
+alter table exchangerate add column sell numeric(15,5);
+update exchangerate set sell=sellold;
+alter table exchangerate drop column sellold;
+--
+--TABLE invoice
+alter table invoice rename column sellprice to sellpriceold;
+alter table invoice add column sellprice numeric(15,5);
+update invoice set sellprice=sellpriceold;
+alter table invoice drop column sellpriceold;
+--
+alter table invoice rename column fxsellprice to fxsellpriceold;
+alter table invoice add column fxsellprice numeric(15,5);
+update invoice set fxsellprice=fxsellpriceold;
+alter table invoice drop column fxsellpriceold;
+--
+--TABLE oe
+alter table oe rename column amount to amountold;
+alter table oe add column amount numeric(15,5);
+update oe set amount=amountold;
+alter table oe drop column amountold;
+--
+alter table oe rename column netamount to netamountold;
+alter table oe add column netamount numeric(15,5);
+update oe set netamount=netamountold;
+alter table oe drop column netamountold;
+--
+--TABLE orderitems
+alter table orderitems rename column sellprice to sellpriceold;
+alter table orderitems add column sellprice numeric(15,5);
+update orderitems set sellprice=sellpriceold;
+alter table orderitems drop column sellpriceold;
+--
+--TABLE parts
+alter table parts rename column listprice to listpriceold;
+alter table parts add column listprice numeric(15,5);
+update parts set listprice=listpriceold;
+alter table parts drop column listpriceold;
+--
+alter table parts rename column sellprice to sellpriceold;
+alter table parts add column sellprice numeric(15,5);
+update parts set sellprice=sellpriceold;
+alter table parts drop column sellpriceold;
+--
+alter table parts rename column lastcost to lastcostold;
+alter table parts add column lastcost numeric(15,5);
+update parts set lastcost=lastcostold;
+alter table parts drop column lastcostold;
+--
+--TABLE tax
+alter table tax rename column rate to rateold;
+alter table tax add column rate numeric(15,5);
+update tax set rate=rateold;
+alter table tax drop column rateold;
+--
+--TABLE vendor
+alter table vendor rename column creditlimit to creditlimitold;
+alter table vendor add column creditlimit numeric(15,5);
+update vendor set creditlimit=creditlimitold;
+alter table vendor drop column creditlimitold;
+--
+
+--New Fields for customer and vendor
+alter table vendor add column obsolete boolean;
+alter table vendor alter column obsolete set default 'false';
+update table vendor set obsolete='false';
+alter table customer add column obsolete boolean;
+alter table customer alter column obsolete set default 'false';
+update table customer set obsolete='false';
+alter table customer add column ustid varchar(12);
+alter table vendor add column ustid varchar(12);
+
+alter table customer add column username varchar(50);
+alter table vendor add column username varchar(50);
+alter table customer add column user_password text;
+alter table vendor add column user_password text;
+alter table customer add column salesman_id integer;
+alter table vendor add column salesman_id integer;
+
+-- Shipto
+alter table shipto add column shiptodepartment_1 varchar(75);
+alter table shipto add column shiptodepartment_2 varchar(75);
+
+
+
+-- Addon for business
+alter table business add column salesman boolean;
+alter table business alter column salesman set default 'false';
+alter table business add column customernumberinit text;
+
+alter table parts add column ve integer;
+alter table parts add column gv numeric(15,5);
+--
+
+-- Add table contrains
+alter table customer alter name SET NOT NULL;
+alter table vendor alter name set NOT NULL;
+alter table chart alter accno set NOT NULL;
+alter table parts alter partnumber set NOT NULL;
+alter table ar alter invnumber set NOT NULL;
+alter table ap alter invnumber set NOT NULL;
+alter table oe alter ordnumber set NOT NULL;
+
+alter table gl alter id set NOT NULL;
+alter table chart alter id set NOT NULL;
+alter table parts alter id set NOT NULL;
+alter table invoice alter id set NOT NULL;
+alter table vendor alter id set NOT NULL;
+alter table customer alter id set NOT NULL;
+alter table contacts alter cp_id set NOT NULL;
+alter table ar alter id set NOT NULL;
+alter table ap alter id set NOT NULL;
+alter table oe alter id set NOT NULL;
+alter table employee alter id set NOT NULL;
+alter table warehouse alter id set NOT NULL;
+alter table business alter id set NOT NULL;
+alter table license alter id set NOT NULL;
+alter table orderitems alter id set NOT NULL;
+
+alter table gl add primary key (id);
+alter table chart add primary key (id);
+alter table parts add primary key (id);
+alter table invoice add primary key (id);
+alter table vendor add primary key (id);
+alter table customer add primary key (id);
+alter table contacts add primary key (cp_id);
+alter table ar add primary key (id);
+alter table ap add primary key (id);
+alter table oe add primary key (id);
+alter table employee add primary key (id);
+alter table warehouse add primary key (id);
+alter table business add primary key (id);
+alter table license add primary key (id);
+
+alter table acc_trans add foreign key (chart_id) references chart (id);
+alter table invoice add foreign key (parts_id) references parts (id);
+alter table ar add foreign key (customer_id) references customer (id);
+alter table ap add foreign key (vendor_id) references vendor (id);
+alter table orderitems add foreign key (parts_id) references parts (id);
+
+--Modify the possible length of bank account numbers
+alter table customer add column temp_account_number character varying(15);
+update customer set temp_account_number=account_number;
+alter table customer drop column account_number;
+alter table customer rename temp_account_number to  account_number;
+
+alter table vendor add column temp_account_number character varying(15);
+update vendor set temp_account_number=account_number;
+alter table vendor drop column account_number;
+alter table vendor rename temp_account_number to  account_number;
+
+-- audit
+alter table defaults add column audittrail bool;
+CREATE TABLE audittrail (
+  trans_id int,
+  tablename text,
+  reference text,
+  formname text,
+  action text,
+  transdate timestamp default current_timestamp,
+  employee_id int
+);
+
+-- pricegroups
+
+CREATE TABLE "pricegroup" (
+  "id" integer DEFAULT nextval('id'::text),
+  "pricegroup" text not null,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE "prices" (
+  "parts_id" integer REFERENCES parts(id),
+  "pricegroup_id" integer,
+  "price" numeric(15,5)
+);
+
+ALTER TABLE customer ADD column klass integer;
+ALTER TABLE customer ALTER column klass set default 0;
+
+-- 
+ALTER TABLE invoice ADD column pricegroup_id integer;
+ALTER TABLE orderitems ADD column pricegroup_id integer;
+
+
+-- USTVA Update solve Bug 49 conributed by Andre Schubert
+update chart set pos_ustva='861' where accno='1771';
+update chart set pos_ustva='511' where accno='1775';
+-- update chart set pos_ustva='511' where pos_ustva='51r';
+-- update chart set pos_ustva='861' where pos_ustva='86r';
+-- update chart set pos_ustva='971' where pos_ustva='97r';
+-- update chart set pos_ustva='931' where pos_ustva='93r';
+
+-- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
+alter table orderitems add column ordnumber text;
+alter table orderitems add column transdate text;
+alter table orderitems add column cusordnumber text;
+alter table invoice add column ordnumber text;
+alter table invoice add column transdate text;
+alter table invoice add column cusordnumber text;
+--
+-- UStVA Link to SKR03/2006
+-- Let this structure like it is, please.
+-- This structure is based on the sequence of the USTVA 2006
+-- Created by Udo Spallek
+--
+-- 1. Page UStVA
+UPDATE chart SET pos_ustva=41  WHERE accno IN ('8125', '8130', '8140', '8724', '8808', '8828');
+UPDATE chart SET pos_ustva=44  WHERE accno IN ('8135');
+UPDATE chart SET pos_ustva=49  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=43  WHERE accno IN ('2402', '8120', '8150', '8505', '8625', '8705', '8807', '8827');
+UPDATE chart SET pos_ustva=48  WHERE accno IN ('8100', '8110', '8504', '8609');
+UPDATE chart SET pos_ustva=51  WHERE accno IN ('1717', '2404', '2405', '2700', '2705', '2707', '2709', '8196', '8315', '8400', '8595', '8600', '8611', '8640', '8720', '8726', '8735', '8760', '8790', '8801', '8809', '8820', '8910', '8920', '8921', '8922', '8925', '8935', '8940');
+UPDATE chart SET pos_ustva=511 WHERE accno IN ('1775');
+UPDATE chart SET pos_ustva=86  WHERE accno IN ('1711', '2401', '2403', '8300', '8310', '8506', '8591', '8630', '8710', '8725', '8731', '8750', '8780', '8915', '8930', '8932', '8945');
+UPDATE chart SET pos_ustva=861 WHERE accno IN ('1771');
+UPDATE chart SET pos_ustva=35  WHERE accno IN ('2407', '2409', '8723', '8729', '8736', '8764', '8794');
+UPDATE chart SET pos_ustva=36  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=77  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=76  WHERE accno IN ('8190');
+UPDATE chart SET pos_ustva=80  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=91  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=97  WHERE accno IN ('3425', '3725');
+UPDATE chart SET pos_ustva=971 WHERE accno IN ('1773');
+UPDATE chart SET pos_ustva=93  WHERE accno IN ('3420', '3724');
+UPDATE chart SET pos_ustva=931 WHERE accno IN ('1772');
+UPDATE chart SET pos_ustva=95  WHERE accno IN ('3727');
+UPDATE chart SET pos_ustva=98  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=94  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=96  WHERE accno IN ('1784');
+UPDATE chart SET pos_ustva=42  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=60  WHERE accno IN ('8337');
+UPDATE chart SET pos_ustva=45  WHERE accno IN ('8338', '8339', '8950');
+-- 2. Page UStVA
+UPDATE chart SET pos_ustva=52  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=53  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=73  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=74  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=84  WHERE accno IN ('3110', '3115', '3120', '3125');
+UPDATE chart SET pos_ustva=85  WHERE accno IN ('1785', '1786');
+UPDATE chart SET pos_ustva=65  WHERE accno IN ('1782');
+UPDATE chart SET pos_ustva=66  WHERE accno IN ('1570', '1571', '1575', '1576');
+UPDATE chart SET pos_ustva=61  WHERE accno IN ('1572', '1573');
+UPDATE chart SET pos_ustva=62  WHERE accno IN ('1588');
+UPDATE chart SET pos_ustva=67  WHERE accno IN ('1578', '1579');
+UPDATE chart SET pos_ustva=63  WHERE accno IN ('1577');
+UPDATE chart SET pos_ustva=64  WHERE accno IN ('1556', '1557', '1558', '1559');
+UPDATE chart SET pos_ustva=59  WHERE accno IN ('');
+UPDATE chart SET pos_ustva=69  WHERE accno IN ('1783');
+UPDATE chart SET pos_ustva=39  WHERE accno IN ('1781');
+--
+-- clear table tax
+DELETE from tax;
+-- insert actual values for SKR03
+INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','0','Keine Steuer');
+INSERT INTO tax (rate, taxkey, taxdescription) VALUES ('0','1','Umsatzsteuerfrei (mit Vorsteuerabzug)');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1771'),'0.07','1771','2','Umsatzsteuer 7%');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1775'),'0.16','1775','3','Umsatzsteuer 16%');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1571'),'0.07','1571','8','Vorsteuer 7%');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1575'),'0.16','1575','9','Vorsteuer 16%');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1767'),'0.00','1767','10','Im anderen EG-Staat steuerpfl. Lieferung');
+INSERT INTO tax (taxkey, taxdescription) VALUES ('11','Steuerfreie EG-Lief. an Abn. mit UStIdNr');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1772'),'0.07','1772','12','Umsatzsteuer 7% innergem. Erwerb');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1773'),'0.16','1773','13','Umsatzsteuer 16% innergem. Erwerb');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.07','1572','18','Steuerpfl. EG-Erwerb 7%');
+INSERT INTO tax (chart_id, rate, taxnumber, taxkey, taxdescription) VALUES ((SELECT id FROM chart WHERE accno = '1572'),'0.16','1573','19','Steuerpfl. EG-Erwerb 16%');
+--
+--
+-- add unqiue constraint to project
+ALTER TABLE project ADD constraint project_projectnumber_key UNIQUE(projectnumber);
+--
+-- add column deliverydate to ar
+ALTER TABLE ar ADD COLUMN deliverydate date;
+
+update defaults set version = '2.2.0';
+
+

diff --git a/sql/lx-office.sql b/sql/lx-office.sql
index 9caa7bd..ffcf8ca 100644 (file)
--- a/sql/lx-office.sql
+++ b/sql/lx-office.sql
@@ -115,7 +115,7 @@ CREATE TABLE "defaults" (
         "itime" timestamp DEFAULT now(),
         "mtime" timestamp
 );
-INSERT INTO defaults (version,audittrail) VALUES ('2.1.2', 't');
+INSERT INTO defaults (version,audittrail) VALUES ('2.2.0', 't');
 
 CREATE TABLE audittrail (
         "trans_id" int,