Die Steuersätze richten sich nach dem Ertrags- bzw. dem Aufwands- und nicht nach...

diff --git a/SL/IR.pm b/SL/IR.pm
index 702c9f5e96b50abf85457dedd3ea88a627411c6e..025c65f2eefa138c35fff2601af2455c6b6f3b8c 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -925,21 +925,9 @@ sub retrieve_invoice {
         $stw->finish;
       }
 
         $stw->finish;
       }
 

-
-
-      #set expense_accno=inventory_accno if they are different => bilanz
-      $vendor_accno =
-        ($ref->{expense_accno} != $ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-      $vendor_accno =
-        ($ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-

       # get tax rates and description
       $accno_id =
       # get tax rates and description
       $accno_id =

-        ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
+        ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};

       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT join chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT join chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')


@@ -1190,19 +1178,9 @@ sub retrieve_item {
     }
     delete($ref->{inventory_accno_id});
 
     }
     delete($ref->{inventory_accno_id});
 

-    #set expense_accno=inventory_accno if they are different => bilanz
-    $vendor_accno =
-      ($ref->{expense_accno} != $ref->{inventory_accno})
-      ? $ref->{inventory_accno}
-      : $ref->{expense_accno};
-    $vendor_accno =
-      ($ref->{inventory_accno})
-      ? $ref->{inventory_accno}
-      : $ref->{expense_accno};
-

     # get tax rates and description
     $accno_id =
     # get tax rates and description
     $accno_id =

-      ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
+      ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};

     $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
              FROM tax t LEFT JOIN chart c ON (c.id=t.chart_id)
              WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
     $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
              FROM tax t LEFT JOIN chart c ON (c.id=t.chart_id)
              WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')

diff --git a/SL/IS.pm b/SL/IS.pm
index 67a1fe5e21b02aa9674ad69c8aef54f99e5f6cc0..f9b95ec8b0348d74c99085581a01f98cfb9b45f1 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1570,9 +1570,6 @@ sub retrieve_invoice {
       }
       delete($ref->{"part_inventory_accno_id"});
 
       }
       delete($ref->{"part_inventory_accno_id"});
 

-      #set expense_accno=inventory_accno if they are different => bilanz
-
-

     while ($ref->{inventory_new_chart} && ($ref->{inventory_valid} >=0)) {
       my $query = qq| SELECT accno AS inventory_accno, new_chart_id AS inventory_new_chart, date($transdate) - valid_from AS inventory_valid FROM chart WHERE id = $ref->{inventory_new_chart}|;
       my $stw = $dbh->prepare($query);
     while ($ref->{inventory_new_chart} && ($ref->{inventory_valid} >=0)) {
       my $query = qq| SELECT accno AS inventory_accno, new_chart_id AS inventory_new_chart, date($transdate) - valid_from AS inventory_valid FROM chart WHERE id = $ref->{inventory_new_chart}|;
       my $stw = $dbh->prepare($query);


@@ -1597,14 +1594,9 @@ sub retrieve_invoice {
       $stw->finish;
     }
 
       $stw->finish;
     }
 

-      $vendor_accno =
-        ($ref->{expense_accno} != $ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-

       # get tax rates and description
       $accno_id =
       # get tax rates and description
       $accno_id =

-        ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
+        ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};

       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT join chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT join chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')


@@ -1961,15 +1953,9 @@ sub retrieve_item {
       }
     }
 
       }
     }
 

-
-    $vendor_accno =
-      ($ref->{expense_accno} != $ref->{inventory_accno})
-      ? $ref->{inventory_accno}
-      : $ref->{expense_accno};
-

     # get tax rates and description
     $accno_id =
     # get tax rates and description
     $accno_id =

-      ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
+      ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};

     $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
              FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
              WHERE t.taxkey in (SELECT c2.taxkey_id from chart c2 where c2.accno = '$accno_id')
     $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
              FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
              WHERE t.taxkey in (SELECT c2.taxkey_id from chart c2 where c2.accno = '$accno_id')

diff --git a/SL/OE.pm b/SL/OE.pm
index 888f422bea062ce8a3efa55c97906b2d6268c861..18e48bdd666a1691ae58f9e4a5a8955f4b06a839 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -869,15 +869,9 @@ sub retrieve {
       # delete orderitems_id in collective orders, so that they get cloned no matter what
       delete $ref->{orderitems_id} if (@ids);
 
       # delete orderitems_id in collective orders, so that they get cloned no matter what
       delete $ref->{orderitems_id} if (@ids);
 

-      #set expense_accno=inventory_accno if they are different => bilanz
-      $vendor_accno =
-        ($ref->{expense_accno} != $ref->{inventory_accno})
-        ? $ref->{inventory_accno}
-        : $ref->{expense_accno};
-

       # get tax rates and description
       $accno_id =
       # get tax rates and description
       $accno_id =

-        ($form->{vc} eq "customer") ? $ref->{income_accno} : $vendor_accno;
+        ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};

       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT JOIN chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')
       $query = qq|SELECT c.accno, t.taxdescription, t.rate, t.taxnumber
                 FROM tax t LEFT JOIN chart c ON (c.id=t.chart_id)
                 WHERE t.taxkey in (SELECT taxkey_id from chart where accno = '$accno_id')