Einkaufs- und Verkaufsrechnungen: Beim Erstellen der Einträge in acc_trans keine...

diff --git a/SL/IR.pm b/SL/IR.pm
index 9ddc48634359e536403cac7a5da491fafa87e3bd..5ea2404ede3956cd4e40cc9024aeb36c5b7b9995 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -276,9 +276,9 @@ sub post_invoice {
             # add entry for inventory, this one is for the sold item
             if ($linetotal != 0) {
               $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
             # add entry for inventory, this one is for the sold item
             if ($linetotal != 0) {
               $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                         transdate)
+                         transdate, taxkey)

                          VALUES ($ref->{trans_id}, $ref->{inventory_accno_id},
                          VALUES ($ref->{trans_id}, $ref->{inventory_accno_id},

-                         $linetotal, '$ref->{transdate}')|;
+                         $linetotal, '$ref->{transdate}', (SELECT taxkey_id FROM chart WHERE id = $ref->{inventory_accno_id}))|;

               $dbh->do($query) || $form->dberror($query);
 
               # add expense
               $dbh->do($query) || $form->dberror($query);
 
               # add expense


@@ -522,22 +522,24 @@ sub post_invoice {
 
       if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
 
       if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                   transdate, project_id)
+                   transdate, taxkey, project_id)

                    VALUES ($form->{id}, (SELECT c.id FROM chart c
                    VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                       WHERE c.accno = '$form->{AP}'),
-                   $amount, '$form->{"datepaid_$i"}', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                                       WHERE c.accno = ?),
+                   $amount, '$form->{"datepaid_$i"}',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $form->{AP}, $form->{AP}, $project_id);

       }
 
       # record payment
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
       }
 
       # record payment
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,

-                  source, memo, project_id)
+                  source, memo, taxkey, project_id)

                   VALUES ($form->{id}, (SELECT c.id FROM chart c
                   VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                     WHERE c.accno = '$accno'),
+                                     WHERE c.accno = ?),

                   $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
                   $form->{"paid_$i"}, '$form->{"datepaid_$i"}',

-                 '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                 '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $accno, $accno, $project_id);

 
       $exchangerate = 0;
 
 
       $exchangerate = 0;
 


@@ -591,10 +593,10 @@ sub post_invoice {
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                   transdate, cleared, fx_transaction, project_id)
+                   transdate, cleared, fx_transaction, taxkey, project_id)

                    VALUES ($form->{id}, (SELECT c.id FROM chart c
                                        WHERE c.accno = '$accno'),
                    VALUES ($form->{id}, (SELECT c.id FROM chart c
                                        WHERE c.accno = '$accno'),

-                    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
+                    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', 0, ?)|;

         do_query($form, $dbh, $query, $project_id);
       }
     }
         do_query($form, $dbh, $query, $project_id);
       }
     }


@@ -1355,11 +1357,12 @@ sub post_payment {
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                  transdate, project_id)
+                  transdate, taxkey, project_id)

                   VALUES ($form->{id}, (SELECT c.id FROM chart c
                   VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                      WHERE c.accno = '$form->{AP}'),
-                  $amount, '$form->{"datepaid_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                                      WHERE c.accno = ?),
+                  $amount, '$form->{"datepaid_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $form->{AP}, $form->{AP}, $project_id);

 
 
 
 
 
 


@@ -1368,12 +1371,13 @@ sub post_payment {
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,

-                  source, memo, project_id)
+                  source, memo, taxkey, project_id)

                   VALUES ($form->{id}, (SELECT c.id FROM chart c
                   VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                     WHERE c.accno = '$accno'),
+                                     WHERE c.accno = ?),

                  $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
                  $form->{"paid_$i"}, '$form->{"datepaid_$i"}',

-                 '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                 '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $accno, $accno, $project_id);

 
 
       # gain/loss
 
 
       # gain/loss


@@ -1411,12 +1415,13 @@ sub post_payment {
                                         WHERE c.accno = '$accno') AND amount=$form->{fx}{$accno}{$transdate} AND transdate='$transdate' AND cleared='0' AND fx_transaction='1'|;
         $dbh->do($query) || $form->dberror($query);
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
                                         WHERE c.accno = '$accno') AND amount=$form->{fx}{$accno}{$transdate} AND transdate='$transdate' AND cleared='0' AND fx_transaction='1'|;
         $dbh->do($query) || $form->dberror($query);
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                   transdate, cleared, fx_transaction, project_id)
+                   transdate, cleared, fx_transaction, taxkey, project_id)

                    VALUES ($form->{id},
                           (SELECT c.id FROM chart c
                    VALUES ($form->{id},
                           (SELECT c.id FROM chart c

-                           WHERE c.accno = '$accno'),
-                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                           WHERE c.accno = ?),
+                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);

       }
     }
   }
       }
     }
   }

diff --git a/SL/IS.pm b/SL/IS.pm
index 4a151d8f20fdad56ad5a5aa01a17609a3bc2bfc1..cd860ae31491d277f03cf9cb91e29877fa4526c8 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -920,23 +920,25 @@ sub post_invoice {
   
         if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
           $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
   
         if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
           $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                      transdate, project_id)
+                      transdate, taxkey, project_id)

                       VALUES ($form->{id}, (SELECT c.id FROM chart c
                       VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                          WHERE c.accno = '$form->{AR}'),
-                      $amount, '$form->{"datepaid_$i"}', ?)|;
-          do_query($form, $dbh, $query, $project_id);
+                                          WHERE c.accno = ?),
+                      $amount, '$form->{"datepaid_$i"}',
+                      (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+          do_query($form, $dbh, $query, $form->{AR}, $form->{AR}, $project_id);

         }
   
         # record payment
         $form->{"paid_$i"} *= -1;
   
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
         }
   
         # record payment
         $form->{"paid_$i"} *= -1;
   
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,

-                    source, memo, project_id)
+                    source, memo, taxkey, project_id)

                     VALUES ($form->{id}, (SELECT c.id FROM chart c
                     VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                        WHERE c.accno = '$accno'),
+                                        WHERE c.accno = ?),

                     $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
                     $form->{"paid_$i"}, '$form->{"datepaid_$i"}',

-                    '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                    '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);

   
         # exchangerate difference
         $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
   
         # exchangerate difference
         $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=


@@ -976,12 +978,13 @@ sub post_invoice {
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,

-                   transdate, cleared, fx_transaction, project_id)
+                   transdate, cleared, fx_transaction, taxkey, project_id)

                    VALUES ($form->{id},
                           (SELECT c.id FROM chart c
                    VALUES ($form->{id},
                           (SELECT c.id FROM chart c

-                           WHERE c.accno = '$accno'),
-                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                           WHERE c.accno = ?),
+                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);

       }
     }
   }
       }
     }
   }