s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix kursusd and kurschf = NULL

Browse Source
This commit is contained in:
Xenomporio 2022-06-14 15:22:02 +02:00
parent d8a9da0546
commit cbdbb586a9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/pages/artikel.php
View File

@ -4700,6 +4700,13 @@ class Artikel extends GenArtikel {
$preis_min_ek = $this->getCalcPriceByMinBasePrice($id);
$preis_max_ek =$this->getCalcPriceByMaxBasePrice($id);
if (empty($kursusd)) {
$kursusd = 0;
}
if (empty($kurschf)) {
$kurschf = 0;
}
$this->app->Tpl->Set('TAB5KALKULATION','<div class="info">Dies ist nur ein grober Richtpreis aus dem kleinsten und größten Einkaufspreis.</div>');
$kalkulationstabelle = "<table class='mkTable'>";
@ -4714,7 +4721,7 @@ class Artikel extends GenArtikel {
$kalkulationstabelle .= "<td><b>Kalkulierter EK</b></td>";
$kalkulationstabelle .= "</tr>";
$artikelkalkulation = $this->app->DB->SelectArr("SELECT a.id as artikelid, a.name_de as artikelname, a.nummer, trim(s.menge)+0 as menge,
$sql_query = "SELECT a.id as artikelid, a.name_de as artikelname, a.nummer, trim(s.menge)+0 as menge,
(SELECT l2.name FROM einkaufspreise e LEFT JOIN adresse l2 ON l2.id=e.adresse WHERE e.artikel=a.id AND (e.objekt='Standard' OR e.objekt='') AND (e.gueltig_bis='0000-00-00' OR e.gueltig_bis >= curdate()) AND e.geloescht!=1 ORDER by e.preis ASC LIMIT 1) as lieferant,
(SELECT e.bestellnummer FROM einkaufspreise e WHERE e.artikel=a.id AND (e.objekt='Standard' OR e.objekt='') AND (e.gueltig_bis='0000-00-00' OR e.gueltig_bis >= curdate()) AND e.geloescht!=1 ORDER by e.preis ASC LIMIT 1) as bestellnummer,
@ -4763,8 +4770,9 @@ class Artikel extends GenArtikel {
FROM stueckliste s
LEFT JOIN artikel a ON a.id=s.artikel
LEFT JOIN adresse l ON l.id=a.adresse
WHERE s.stuecklistevonartikel='$id' ORDER by s.sort");
WHERE s.stuecklistevonartikel='$id' ORDER by s.sort";
$artikelkalkulation = $this->app->DB->SelectArr($sql_query);
$calculatedPurchasePriceService = $this->app->Container->get('PurchasePriceService');