ri-st/startup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors in EUR and recurring bills.

Browse Source
This commit is contained in:
Christian Steinle
2024-11-18 07:47:55 +01:00
parent 611c1c479f
commit e7ea6e34b0
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inhalte/eur_ein_ist.php
View File

@@ -57,21 +57,21 @@ else
{ {
echo " <legend>bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "</legend>\n"; echo " <legend>bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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']) elseif ("q" == $_POST['Suche'])
{ {
echo " <legend>bezahlte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "</legend>\n"; echo " <legend>bezahlte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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']) elseif ("j" == $_POST['Suche'])
{ {
echo " <legend>bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "</legend>\n"; echo " <legend>bezahlte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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); $result = $db->query($sql);

6
inhalte/eur_ein_soll.php
View File

@@ -57,21 +57,21 @@ else
{ {
echo " <legend>erstellte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "</legend>\n"; echo " <legend>erstellte Eingangsrechnungen / Gutschriften " . $_POST['Monat'] . "/" . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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']) elseif ("q" == $_POST['Suche'])
{ {
echo " <legend>erstellte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "</legend>\n"; echo " <legend>erstellte Eingangsrechnungen / Gutschriften Q" . $_POST['Quartal'] . "/" . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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']) elseif ("j" == $_POST['Suche'])
{ {
echo " <legend>erstellte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "</legend>\n"; echo " <legend>erstellte Eingangsrechnungen / Gutschriften " . $_POST['Jahr'] . "</legend>\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;"; $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;"; $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); $result = $db->query($sql);

2
inhalte/turnus_add.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if ("2" == $_POST['step']) if ("2" == $_POST['step'])
{ {
$sql = 'INSERT INTO ' . PREFIX . '_Reminder (Jahr, ID, Kontakt_ID, KfZ_ID, Admin_ID, MwSt, Datum) VALUES (YEAR(CURDATE()), NULL, NULL, "' . $_POST['Kontakt_ID'] . '", "' . $_POST['Admin_ID'] . '", "' . $_POST['MwSt'] . '", CURDATE())'; $sql = 'INSERT INTO ' . PREFIX . '_Reminder (Jahr, ID, KfZ_ID, Kontakt_ID, Admin_ID, MwSt, Datum) VALUES (YEAR(CURDATE()), NULL, 0, "' . $_POST['Kontakt_ID'] . '", "' . $_POST['Admin_ID'] . '", "' . $_POST['MwSt'] . '", CURDATE())';
$stmt = $db->prepare($sql); $stmt = $db->prepare($sql);
if (!$stmt) if (!$stmt)
{ {

2
inhalte/turnus_create.php
View File

@@ -60,7 +60,7 @@ else
{ {
die ('Datensatz konnte nicht gespeichert werden: ' . $stmt->error); 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); $stmt = $db->prepare($sql);
if (!$stmt) if (!$stmt)
{ {

10
inhalte/turnus_edit.php
View File

@@ -56,13 +56,13 @@ if ("settings" == $_POST['action'])
{ {
if ($temp) if ($temp)
{ {
if (!isset($_POST['KfZ_ID'])) { $_POST['KfZ_ID'] = null; }
$sql = 'UPDATE ' . PREFIX . '_Reminder SET $sql = 'UPDATE ' . PREFIX . '_Reminder SET
Kontakt_ID = "' . $_POST['Kontakt_ID'] . '", Kontakt_ID = "' . $_POST['Kontakt_ID'] . '",
Admin_ID = "' . $_POST['Admin_ID'] . '", Admin_ID = "' . $_POST['Admin_ID'] . '",';
KfZ_ID = "' . $_POST['KfZ_ID'] . '", if (isset($_POST['KfZ_ID'])) {
Preis = "' . $_POST['Preis'] . '", $sql .= 'KfZ_ID = "' . $_POST['KfZ_ID'] . '",';
MwSt = "' . $_POST['MwSt'] . '", }
$sql .= 'MwSt = "' . $_POST['MwSt'] . '",
Rabatt = "' . $_POST['Rabatt'] . '", Rabatt = "' . $_POST['Rabatt'] . '",
Skonto = "' . $_POST['Skonto'] . '", Skonto = "' . $_POST['Skonto'] . '",
Datum = "' . $Datum . '" Datum = "' . $Datum . '"