Integry/PVM
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Follies_CatalogoModa_UpdateGrafico

Browse Source
This commit is contained in:
Claudio Rinaldi
2024-05-30 13:18:24 +02:00
parent a00bcd14cf 48b868dc7c
commit 124e54ad94
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public_html/classes/Report.class.php
View File

@@ -123,11 +123,19 @@ class Report {
private function load_queryInfo() {
$Ret = new Ret;
$xml = $this->getJrxml();
if (!is_null($xml)) {
$jrxml = simplexml_load_string($xml);
$this->queryString = strtolower(str_replace("\t", " ", str_replace("\n", " ", trim((string)$jrxml->queryString))));
$this->queryLang = strtolower(trim((string)$jrxml->queryString->attributes()->language));
$jrxml = @simplexml_load_string($xml);
if ($jrxml) {
$this->queryString = strtolower(str_replace("\t", " ", str_replace("\n", " ", trim((string)$jrxml->queryString))));
$this->queryLang = strtolower(trim((string)$jrxml->queryString->attributes()->language));
} else {
$this->queryString = null;
$this->queryLang = null;
}
}
return $Ret;
}
@@ -171,7 +179,7 @@ class Report {
private function load_parameters() {
$this->Parameters = array();
$jrxml = simplexml_load_string($this->getJrxml());
$jrxml = @simplexml_load_string($this->getJrxml());
$Query = new \Query(self::get_sql_listParameters());
$Query->setVar("report_id", $this->id);
$Ret = $Query->anonymousAuth()->toRet()->execute();

BIN
public_html/config_aziende/IME_BA/images/LOGO_IMEBA.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 43 KiB

21
public_html/gest-lib/viaggi_ordini/classes/ViaggiOrdini.class.php
View File

@@ -308,26 +308,27 @@ class ViaggiOrdini {
}
public static function deleteViaggio($data) {
$Query = new Query;
$Query->select("gestione", "data_ord", "num_ord", "riga_ord", "NULL AS id_viaggio")
$query = new Query;
$query->select("gestione", "data_ord", "num_ord", "riga_ord", "NULL AS id_viaggio")
->from("dtb_ordr")
->where("id_viaggio", $data["id_viaggio"]);
$Ret = $Query->toRet()->execute();
if ($Ret->is_OK()) {
$EntityList = new EntityList;
$ret = $query->toRet()->execute();
foreach (self::extractEntitiesOrdini($Ret->get_data()) as $DtbOrdt) {
$EntityList->push($DtbOrdt);
if ($ret->is_OK()) {
$entityList = new EntityList;
foreach (self::extractEntitiesOrdini($ret->get_data()) as $dtbOrdt) {
$entityList->push($dtbOrdt);
}
$VtbViaggi = new EntityItem("vtb_viaggi");
$VtbViaggi->delete()->set("idViaggio", $data["id_viaggio"]);
$EntityList->push($VtbViaggi);
$entityList->push($VtbViaggi);
$Ret = $EntityList->send();
$ret = $entityList->send();
}
return $Ret;
return $ret;
}
}