Entfernt dpt_trans

[mfinanz.git] / SL / IR.pm

diff --git a/SL/IR.pm b/SL/IR.pm
index bd8bd591d2f44602c6448a1ce6dbb6ea87901d1f..48c5134fa6e3c84dacf9229a5a460a187b896b38 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -269,27 +269,37 @@ sub post_invoice {
 
             # allocated >= 0
             # add entry for inventory, this one is for the sold item
 
             # allocated >= 0
             # add entry for inventory, this one is for the sold item

-            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?, (SELECT taxkey_id FROM chart WHERE id = ?),
-                                (SELECT tax_id 
+            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?,
+                               (SELECT taxkey_id 
+                                FROM taxkeys 
+                                WHERE chart_id= ?
+                                AND startdate <= ?
+                                ORDER BY startdate DESC LIMIT 1),
+                               (SELECT tax_id 

                                 FROM taxkeys 
                                 FROM taxkeys 

-                                WHERE chart_id= (SELECT id  
-                                                 FROM chart 
-                                                 WHERE accno = ?) 
+                                WHERE chart_id= ?

                                 AND startdate <= ?
                                 AND startdate <= ?

-                                ORDER BY startdate DESC LIMIT 1))|;
-            @values = ($ref->{trans_id},  $ref->{inventory_accno_id}, $linetotal, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{inventory_accno_id}, $ref->{transdate});
+                                ORDER BY startdate DESC LIMIT 1),
+                               (SELECT chart_link FROM chart WHERE id = ?))|;
+            @values = ($ref->{trans_id},  $ref->{inventory_accno_id}, $linetotal, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{transdate}, $ref->{inventory_accno_id}, $ref->{transdate}, 
+                       $ref->{inventory_accno_id});

             do_query($form, $dbh, $query, @values);
 
 # add expense
             do_query($form, $dbh, $query, @values);
 
 # add expense

-            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?, (SELECT taxkey from tax WHERE chart_id = ?),
+            $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) VALUES (?, ?, ?, ?,
+                                (SELECT taxkey_id 
+                                 FROM taxkeys 
+                                 WHERE chart_id= ?
+                                 AND startdate <= ? 
+                                 ORDER BY startdate DESC LIMIT 1),

                                 (SELECT tax_id 
                                  FROM taxkeys 
                                 (SELECT tax_id 
                                  FROM taxkeys 

-                                 WHERE chart_id= (SELECT id  
-                                                  FROM chart 
-                                                  WHERE accno = ?) 
+                                 WHERE chart_id= ?

                                  AND startdate <= ? 
                                  AND startdate <= ? 

-                                 ORDER BY startdate DESC LIMIT 1))|;
-            @values = ($ref->{trans_id},  $ref->{expense_accno_id}, ($linetotal * -1), $ref->{transdate}, $ref->{expense_accno_id}, $ref->{expense_accno_id}, $ref->{transdate});
+                                 ORDER BY startdate DESC LIMIT 1),
+                                (SELECT chart_link FROM chart WHERE id = ?))|;
+            @values = ($ref->{trans_id},  $ref->{expense_accno_id}, ($linetotal * -1), $ref->{transdate}, $ref->{expense_accno_id}, $ref->{transdate}, $ref->{expense_accno_id}, $ref->{transdate},
+                       $ref->{expense_accno_id});

             do_query($form, $dbh, $query, @values);
           }
         };
             do_query($form, $dbh, $query, @values);
           }
         };


@@ -492,18 +502,26 @@ sub post_invoice {
 
       next if $payments_only || !$form->{amount}{$trans_id}{$accno};
 
 
       next if $payments_only || !$form->{amount}{$trans_id}{$accno};
 

-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id)
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id, chart_link)

                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,

-                  (SELECT taxkey_id  FROM chart WHERE accno = ?), ?,
+                  (SELECT taxkey_id 
+                   FROM taxkeys 
+                   WHERE chart_id= (SELECT id  
+                                    FROM chart 
+                                    WHERE accno = ?) 
+                   AND startdate <= ? 
+                   ORDER BY startdate DESC LIMIT 1),
+                  ?,

                   (SELECT tax_id 
                    FROM taxkeys 
                    WHERE chart_id= (SELECT id  
                                     FROM chart 
                                     WHERE accno = ?) 
                    AND startdate <= ? 
                   (SELECT tax_id 
                    FROM taxkeys 
                    WHERE chart_id= (SELECT id  
                                     FROM chart 
                                     WHERE accno = ?) 
                    AND startdate <= ? 

-                   ORDER BY startdate DESC LIMIT 1))|;
+                   ORDER BY startdate DESC LIMIT 1),
+                  (SELECT link FROM chart WHERE accno = ?))|;

       @values = ($trans_id, $accno, $form->{amount}{$trans_id}{$accno},
       @values = ($trans_id, $accno, $form->{amount}{$trans_id}{$accno},

-                 conv_date($form->{invdate}), $accno, $project_id, $accno, conv_date($form->{invdate}));
+                 conv_date($form->{invdate}), $accno, conv_date($form->{invdate}), $project_id, $accno, conv_date($form->{invdate}), $accno);

       do_query($form, $dbh, $query, @values);
     }
   }
       do_query($form, $dbh, $query, @values);
     }
   }


@@ -538,18 +556,26 @@ sub post_invoice {
 
     # record AP
     if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
 
     # record AP
     if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {

-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id)
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id, chart_link)

                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,

-                          (SELECT taxkey_id FROM chart WHERE accno = ?), ?,
+                          (SELECT taxkey_id 
+                           FROM taxkeys 
+                           WHERE chart_id= (SELECT id  
+                                            FROM chart 
+                                            WHERE accno = ?) 
+                           AND startdate <= ? 
+                           ORDER BY startdate DESC LIMIT 1),
+                          ?,

                           (SELECT tax_id 
                            FROM taxkeys 
                            WHERE chart_id= (SELECT id  
                                             FROM chart 
                                             WHERE accno = ?) 
                            AND startdate <= ? 
                           (SELECT tax_id 
                            FROM taxkeys 
                            WHERE chart_id= (SELECT id  
                                             FROM chart 
                                             WHERE accno = ?) 
                            AND startdate <= ? 

-                           ORDER BY startdate DESC LIMIT 1))|;
+                           ORDER BY startdate DESC LIMIT 1),
+                          (SELECT link FROM chart WHERE accno = ?))|;

       @values = (conv_i($form->{id}), $form->{AP}, $amount,
       @values = (conv_i($form->{id}), $form->{AP}, $amount,

-                 $form->{"datepaid_$i"}, $form->{AP}, $project_id, $form->{AP}, conv_date($form->{"datepaid_$i"}));
+                 $form->{"datepaid_$i"}, $form->{AP}, conv_date($form->{"datepaid_$i"}), $project_id, $form->{AP}, conv_date($form->{"datepaid_$i"}), $form->{AP});

       do_query($form, $dbh, $query, @values);
     }
 
       do_query($form, $dbh, $query, @values);
     }
 


@@ -557,17 +583,24 @@ sub post_invoice {
     my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
 
     $query =
     my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
 
     $query =

-      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, taxkey, project_id, tax_id)
+      qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, taxkey, project_id, tax_id, chart_link)

                 VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,
                 VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?,

-                (SELECT taxkey_id FROM chart WHERE accno = ?), ?,
+                (SELECT taxkey_id 
+                 FROM taxkeys 
+                 WHERE chart_id= (SELECT id  
+                                  FROM chart WHERE accno = ?) 
+                 AND startdate <= ? 
+                 ORDER BY startdate DESC LIMIT 1),
+                ?,

                 (SELECT tax_id 
                  FROM taxkeys 
                  WHERE chart_id= (SELECT id  
                                   FROM chart WHERE accno = ?) 
                  AND startdate <= ? 
                 (SELECT tax_id 
                  FROM taxkeys 
                  WHERE chart_id= (SELECT id  
                                   FROM chart WHERE accno = ?) 
                  AND startdate <= ? 

-                 ORDER BY startdate DESC LIMIT 1))|;
+                 ORDER BY startdate DESC LIMIT 1),
+                (SELECT link FROM chart WHERE accno = ?))|;

     @values = (conv_i($form->{id}), $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"},
     @values = (conv_i($form->{id}), $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"},

-               $gldate, $form->{"source_$i"}, $form->{"memo_$i"}, $accno, $project_id, $accno, conv_date($form->{"datepaid_$i"}));
+               $gldate, $form->{"source_$i"}, $form->{"memo_$i"}, $accno, conv_date($form->{"datepaid_$i"}), $project_id, $accno, conv_date($form->{"datepaid_$i"}), $accno);

     do_query($form, $dbh, $query, @values);
 
     $exchangerate = 0;
     do_query($form, $dbh, $query, @values);
 
     $exchangerate = 0;


@@ -605,16 +638,11 @@ sub post_invoice {
       $form->{fx}{$accno}{$transdate} = $form->round_amount($form->{fx}{$accno}{$transdate}, 2);
       next if ($form->{fx}{$accno}{$transdate} == 0);
 
       $form->{fx}{$accno}{$transdate} = $form->round_amount($form->{fx}{$accno}{$transdate}, 2);
       next if ($form->{fx}{$accno}{$transdate} == 0);
 

-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, taxkey, project_id, tax_id)
+      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, taxkey, project_id, tax_id, chart_link)

                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, '0', '1', 0, ?,
                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, '0', '1', 0, ?,

-                  (SELECT tax_id 
-                   FROM taxkeys 
-                   WHERE chart_id= (SELECT id  
-                                   FROM chart 
-                                   WHERE accno = ?) 
-                   AND startdate <= ? 
-                   ORDER BY startdate DESC LIMIT 1))|;
-      @values = (conv_i($form->{id}), $accno, $form->{fx}{$accno}{$transdate}, conv_date($transdate), $project_id, $accno, $form->{fx}{$accno}{$transdate});
+                  (SELECT id FROM tax WHERE taxkey=0 LIMIT 1),
+                  (SELECT link FROM chart WHERE accno = ?))|;
+      @values = (conv_i($form->{id}), $accno, $form->{fx}{$accno}{$transdate}, conv_date($transdate), $project_id, $accno);

       do_query($form, $dbh, $query, @values);
     }
   }
       do_query($form, $dbh, $query, @values);
     }
   }