Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5dd59bec

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID 5dd59becc5c8a9adb9457754c0ebe564aa94e029
  • Vorgänger b0fb67c5
  • Nachfolger a851fde7

Einkaufs- und Verkaufsrechnungen: Beim Erstellen der Einträge in acc_trans keine leeren Felder für taxkey erzeugen.

Unterschiede anzeigen:

SL/IS.pm
920 920
  
921 921
        if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
922 922
          $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
923
                      transdate, project_id)
923
                      transdate, taxkey, project_id)
924 924
                      VALUES ($form->{id}, (SELECT c.id FROM chart c
925
                                          WHERE c.accno = '$form->{AR}'),
926
                      $amount, '$form->{"datepaid_$i"}', ?)|;
927
          do_query($form, $dbh, $query, $project_id);
925
                                          WHERE c.accno = ?),
926
                      $amount, '$form->{"datepaid_$i"}',
927
                      (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
928
          do_query($form, $dbh, $query, $form->{AR}, $form->{AR}, $project_id);
928 929
        }
929 930
  
930 931
        # record payment
931 932
        $form->{"paid_$i"} *= -1;
932 933
  
933 934
        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
934
                    source, memo, project_id)
935
                    source, memo, taxkey, project_id)
935 936
                    VALUES ($form->{id}, (SELECT c.id FROM chart c
936
                                        WHERE c.accno = '$accno'),
937
                                        WHERE c.accno = ?),
937 938
                    $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
938
                    '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
939
        do_query($form, $dbh, $query, $project_id);
939
                    '$form->{"source_$i"}', '$form->{"memo_$i"}',
940
                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
941
        do_query($form, $dbh, $query, $accno, $accno, $project_id);
940 942
  
941 943
        # exchangerate difference
942 944
        $form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
......
976 978
        ) {
977 979

  
978 980
        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
979
	            transdate, cleared, fx_transaction, project_id)
981
	            transdate, cleared, fx_transaction, taxkey, project_id)
980 982
		    VALUES ($form->{id},
981 983
		           (SELECT c.id FROM chart c
982
		            WHERE c.accno = '$accno'),
983
		    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
984
        do_query($form, $dbh, $query, $project_id);
984
		            WHERE c.accno = ?),
985
		    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
986
                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
987
        do_query($form, $dbh, $query, $accno, $accno, $project_id);
985 988
      }
986 989
    }
987 990
  }

Auch abrufbar als: Unified diff