/SL/AP.pm - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision d1408ca1

Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt

ID d1408ca13458a782cbde2b768cdd7abdbdcb9348
Vorgänger 2d881637
Nachfolger 3af5e2e0

chart_link in acc_trans

Erstellt ein neues Pflichtfeld chart_link in der Tabelle acc_trans.
Wird bisher nur beschrieben und noch an keiner Stelle ausgelesen.

Conflicts:

SL/AP.pm
        SL/AR.pm
        SL/IR.pm
        SL/IS.pm

             # insert detail records in acc_trans
             $query =
               qq|INSERT INTO acc_trans | .
               qq|  (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id)| .
               qq|  (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link)| .
               qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
               qq|  ?, ?, ?, ?, ?)|;
               qq|  ?, ?, ?, ?, ?| .
               qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
             @values = ($form->{id}, $form->{AP_amounts}{"amount_$i"},
                        $form->{"amount_$i"}, conv_date($form->{transdate}),
                        $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}));
                        $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
                        $form->{AP_amounts}{"amount_$i"});
             do_query($form, $dbh, $query, @values);
             if ($form->{"tax_$i"} != 0) {
               # insert detail records in acc_trans
               $query =
                 qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
                 qq|  project_id, taxkey, tax_id) | .
                 qq|  project_id, taxkey, tax_id, chart_link) | .
                 qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
                 qq|  ?, ?, ?, ?, ?)|;
                 qq|  ?, ?, ?, ?, ?)| .
                 qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
               @values = ($form->{id}, $form->{AP_amounts}{"tax_$i"},
                          $form->{"tax_$i"}, conv_date($form->{transdate}),
                          $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}));
                          $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
                          $form->{AP_amounts}{"tax_$i"});
               do_query($form, $dbh, $query, @values);
+            }
-...
         # add payables
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id) | .
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) | .
           qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | .
           qq|        (SELECT taxkey_id FROM chart WHERE accno = ?),| .
           qq|        (SELECT tax_id| .
-...
           qq|                          FROM chart| .
           qq|                          WHERE accno = ?)| .
           qq|         AND startdate <= ?| .
           qq|         ORDER BY startdate DESC LIMIT 1))|;
           qq|         ORDER BY startdate DESC LIMIT 1),| .
           qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
         @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
                    conv_date($form->{transdate}), $form->{AP_amounts}{payables}, $form->{AP_amounts}{payables}, conv_date($form->{transdate}));
                    conv_date($form->{transdate}), $form->{AP_amounts}{payables}, $form->{AP_amounts}{payables}, conv_date($form->{transdate}),
                    $form->{AP_amounts}{payables});
         do_query($form, $dbh, $query, @values);
+      }
-...
 );
           if ($form->{payables}) {
             $query =
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id) | .
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link) | .
               qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
               qq|        (SELECT taxkey_id FROM chart WHERE accno = ?),| .
               qq|        (SELECT tax_id| .
-...
               qq|                          FROM chart| .
               qq|                          WHERE accno = ?)| .
               qq|         AND startdate <= ?| .
               qq|         ORDER BY startdate DESC LIMIT 1))|;
               qq|         ORDER BY startdate DESC LIMIT 1),| .
               qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
             @values = ($form->{id}, $form->{AP_payables}, $amount,
                        conv_date($form->{"datepaid_$i"}), $project_id,
                        $form->{AP_payables}, $form->{AP_payables}, conv_date($form->{"datepaid_$i"}));
                        $form->{AP_payables}, $form->{AP_payables}, conv_date($form->{"datepaid_$i"}),
                        $form->{AP_payables});
             do_query($form, $dbh, $query, @values);
+          }
           $form->{payables} = $amount;
-...
           # add payment
           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, project_id, taxkey, tax_id) | .
             qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey, tax_id, chart_link) | .
             qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | .
             qq|        (SELECT taxkey_id FROM chart WHERE accno = ?), | .
             qq|        (SELECT tax_id| .
-...
             qq|                          FROM chart| .
             qq|                          WHERE accno = ?)| .
             qq|         AND startdate <= ?| .
             qq|         ORDER BY startdate DESC LIMIT 1))|;
             qq|         ORDER BY startdate DESC LIMIT 1),| .
             qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
           @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
                      conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"},
                      $form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"},
                      $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}));
                      $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}),
                      $form->{"AP_paid_account_$i"});
           do_query($form, $dbh, $query, @values);
           # add exchange rate difference
-...
                                 ($form->{"exchangerate_$i"} - 1), 2);
           if ($amount != 0) {
             $query =
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id) | .
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | .
               qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
               qq|        (SELECT taxkey_id FROM chart WHERE accno = ?), | .
               qq|        (SELECT tax_id| .
-...
               qq|                          FROM chart| .
               qq|                          WHERE accno = ?)| .
               qq|         AND startdate <= ?| .
               qq|         ORDER BY startdate DESC LIMIT 1))|;
               qq|         ORDER BY startdate DESC LIMIT 1),| .
               qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
             @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $amount,
                        conv_date($form->{"datepaid_$i"}), $project_id,
                        $form->{"AP_paid_account_$i"},
                        $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}));
                        $form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}),
                        $form->{"AP_paid_account_$i"});
             do_query($form, $dbh, $query, @values);
+          }
-...
           if ($amount != 0) {
             $query =
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id) | .
               qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | .
               qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
               qq|        (SELECT taxkey_id FROM chart WHERE accno = ?)| .
               qq|        (SELECT tax_id| .
-...
               qq|                          FROM chart| .
               qq|                          WHERE accno = ?)| .
               qq|         AND startdate <= ?| .
               qq|         ORDER BY startdate DESC LIMIT 1))|;
             @values = ($form->{id}, ($amount > 0) ?
                        $form->{fxgain_accno} : $form->{fxloss_accno},
               qq|         ORDER BY startdate DESC LIMIT 1),| .
               qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
             @values = ($form->{id},
                        ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
                        $amount, conv_date($form->{"datepaid_$i"}), $project_id,
                        ($amount > 0) ?
                        $form->{fxgain_accno} : $form->{fxloss_accno},
                        ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}, conv_date($form->{"datepaid_$i"}));
                        ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
                        ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}, conv_date($form->{"datepaid_$i"}),
                        ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno});
             do_query($form, $dbh, $query, @values);
+          }

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision d1408ca1

Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt