From e7ea6e34b0dea9e6d0314d30e3a87ad2752cafe5 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 18 Nov 2024 07:47:55 +0100 Subject: [PATCH] Fix errors in EUR and recurring bills. --- inhalte/eur_ein_ist.php | 6 +++--- inhalte/eur_ein_soll.php | 6 +++--- inhalte/turnus_add.php | 2 +- inhalte/turnus_create.php | 2 +- inhalte/turnus_edit.php | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/inhalte/eur_ein_ist.php b/inhalte/eur_ein_ist.php index eaad517..bedc752 100644 --- a/inhalte/eur_ein_ist.php +++ b/inhalte/eur_ein_ist.php @@ -57,21 +57,21 @@ else { echo " bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE (YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND MONTH(Bezahlt_am) = \"" . $_POST['Monat'] . "\") ORDER BY Bezahlt_am ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND MONTH(Bezahlt_am) = \"" . $_POST['Monat'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND MONTH(Bezahlt_am) = \"" . $_POST['Monat'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND MONTH(Bezahlt_am) = \"" . $_POST['Monat'] . "\") ORDER BY Bezahlt_am ASC;"; } elseif ("q" == $_POST['Suche']) { echo " bezahlte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE (YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Bezahlt_am) = \"" . $_POST['Quartal'] . "\") ORDER BY Bezahlt_am ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Bezahlt_am) = \"" . $_POST['Quartal'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Bezahlt_am) = \"" . $_POST['Quartal'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Bezahlt_am) = \"" . $_POST['Quartal'] . "\") ORDER BY Bezahlt_am ASC;"; } elseif ("j" == $_POST['Suche']) { echo " bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" ORDER BY Bezahlt_am ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Bezahlt_am) = \"" . $_POST['Jahr'] . "\") ORDER BY Bezahlt_am ASC;"; } $result = $db->query($sql); diff --git a/inhalte/eur_ein_soll.php b/inhalte/eur_ein_soll.php index a5d9a52..2e2cabf 100644 --- a/inhalte/eur_ein_soll.php +++ b/inhalte/eur_ein_soll.php @@ -57,21 +57,21 @@ else { echo " erstellte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE (YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND MONTH(Re_Datum) = \"" . $_POST['Monat'] . "\") ORDER BY Re_Datum ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND MONTH(Re_Datum) = \"" . $_POST['Monat'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND MONTH(Re_Datum) = \"" . $_POST['Monat'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND MONTH(Re_Datum) = \"" . $_POST['Monat'] . "\") ORDER BY Re_Datum ASC;"; } elseif ("q" == $_POST['Suche']) { echo " erstellte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE (YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Re_Datum) = \"" . $_POST['Quartal'] . "\") ORDER BY Re_Datum ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Re_Datum) = \"" . $_POST['Quartal'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Re_Datum) = \"" . $_POST['Quartal'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" AND QUARTER(Re_Datum) = \"" . $_POST['Quartal'] . "\") ORDER BY Re_Datum ASC;"; } elseif ("j" == $_POST['Suche']) { echo " erstellte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "\n"; $sql = "SELECT *, DATE_FORMAT(Re_Datum, '%d.%m.%Y') AS Datum, DATE_FORMAT(Bezahlt_am, '%d.%m.%Y') AS Bezahlt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" ORDER BY Re_Datum ASC;"; - $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" GROUP BY MwSt DESC;"; + $sqlust = "SELECT SUM(Preis) AS Preis, MwSt FROM " . PREFIX . "_Eingang WHERE YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\" GROUP BY MwSt;"; $sqlsum = "SELECT SUM(Preis) AS Preis, SUM(Preis * MwSt / 100) AS MwSt, SUM(Preis * (1 + MwSt / 100)) AS Gesamt FROM " . PREFIX . "_Eingang WHERE (YEAR(Re_Datum) = \"" . $_POST['Jahr'] . "\") ORDER BY Re_Datum ASC;"; } $result = $db->query($sql); diff --git a/inhalte/turnus_add.php b/inhalte/turnus_add.php index 4663463..c627b67 100644 --- a/inhalte/turnus_add.php +++ b/inhalte/turnus_add.php @@ -1,7 +1,7 @@ prepare($sql); if (!$stmt) { diff --git a/inhalte/turnus_create.php b/inhalte/turnus_create.php index 30b21c1..4502c90 100644 --- a/inhalte/turnus_create.php +++ b/inhalte/turnus_create.php @@ -60,7 +60,7 @@ else { die ('Datensatz konnte nicht gespeichert werden: ' . $stmt->error); } - $sql = 'INSERT INTO ' . PREFIX . '_Rechnungen (Jahr, ID, Kontakt_ID, Admin_ID, Schluss_Rechnung, Preis, MwSt, Rabatt, Skonto, Text, Datum) VALUES (YEAR(CURDATE()), NULL, "' . $nt['Kontakt_ID'] . '", "' . $nt['Admin_ID'] . '", "1", "' . $nt['Preis'] . '", "' . $nt['MwSt'] . '", "' . $nt['Rabatt'] . '", "' . $nt['Skonto'] . '", "' . addslashes(stripslashes($nt['Text'])) . '", CURDATE())'; + $sql = 'INSERT INTO ' . PREFIX . '_Rechnungen (Jahr, ID, KfZ_ID, Kontakt_ID, Admin_ID, Schluss_Rechnung, Preis, MwSt, Rabatt, Skonto, Text, Datum) VALUES (YEAR(CURDATE()), NULL, 0, "' . $nt['Kontakt_ID'] . '", "' . $nt['Admin_ID'] . '", "1", "' . $nt['Preis'] . '", "' . $nt['MwSt'] . '", "' . $nt['Rabatt'] . '", "' . $nt['Skonto'] . '", "' . addslashes(stripslashes($nt['Text'])) . '", CURDATE())'; $stmt = $db->prepare($sql); if (!$stmt) { diff --git a/inhalte/turnus_edit.php b/inhalte/turnus_edit.php index ca99a51..395e511 100644 --- a/inhalte/turnus_edit.php +++ b/inhalte/turnus_edit.php @@ -56,20 +56,20 @@ if ("settings" == $_POST['action']) { if ($temp) { - if (!isset($_POST['KfZ_ID'])) { $_POST['KfZ_ID'] = null; } $sql = 'UPDATE ' . PREFIX . '_Reminder SET Kontakt_ID = "' . $_POST['Kontakt_ID'] . '", - Admin_ID = "' . $_POST['Admin_ID'] . '", - KfZ_ID = "' . $_POST['KfZ_ID'] . '", - Preis = "' . $_POST['Preis'] . '", - MwSt = "' . $_POST['MwSt'] . '", + Admin_ID = "' . $_POST['Admin_ID'] . '",'; + if (isset($_POST['KfZ_ID'])) { + $sql .= 'KfZ_ID = "' . $_POST['KfZ_ID'] . '",'; + } + $sql .= 'MwSt = "' . $_POST['MwSt'] . '", Rabatt = "' . $_POST['Rabatt'] . '", Skonto = "' . $_POST['Skonto'] . '", Datum = "' . $Datum . '" WHERE - (Jahr = "' . $Jahr . '" - AND - ID = "' . $ID . '");'; + (Jahr = "' . $Jahr . '" + AND + ID = "' . $ID . '");'; $stmt = $db->prepare($sql); if (!$stmt) {