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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
OpenXE 2022-12-02 13:25:22 +00:00
commit b70676f4a0
6 changed files with 9145 additions and 9116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Core/LegacyConfig/MultiDbArrayHydrator.php
View File

@ -48,7 +48,11 @@ final class MultiDbArrayHydrator
$description = !empty($item['description']) ? $item['description'] : $defaultConfig->WFdbname; $description = !empty($item['description']) ? $item['description'] : $defaultConfig->WFdbname;
// Cronjobs nur aktivieren, wenn Einstellung vorhanden und gesetzt (Default `false`). // Cronjobs nur aktivieren, wenn Einstellung vorhanden und gesetzt (Default `false`).
$cronjobsActive = (int)$item['cronjob'] === 1; if (array_key_exists('cronjob',$item)) {
$cronjobsActive = (int)$item['cronjob'] === 1;
} else {
$cronjobsActive = false;
}
if(!empty($item['dbname']) && $defaultConfig->WFdbname === $item['dbname']) { if(!empty($item['dbname']) && $defaultConfig->WFdbname === $item['dbname']) {
$item = []; $item = [];

8781
tools/database_compare/db_schema.json
View File

File diff suppressed because it is too large Load Diff

2
www/lib/class.erpapi.php
View File

@ -35713,7 +35713,7 @@ function Firmendaten($field,$projekt="")
} }
$orderBy = ''; $orderBy = '';
if($projekt > 0) { if($projekt > 0) {
$orderBy = sprintf(' ORDER BY %d DESC ', (int)$projekt); $orderBy = ' ORDER BY projekt DESC';
} }
return (int)$this->app->DB->Select( return (int)$this->app->DB->Select(
sprintf( sprintf(

2
www/pages/layoutvorlagen.php
View File

@ -426,7 +426,7 @@ class Layoutvorlagen {
$schriftartenTpl .= '<option value="' . $schriftartKey . '">' . $schriftart . '</option>'; $schriftartenTpl .= '<option value="' . $schriftartKey . '">' . $schriftart . '</option>';
} }
} }
$this->app->Tpl->Add(SCHRIFTARTEN, $schriftartenTpl); $this->app->Tpl->Add('SCHRIFTARTEN', $schriftartenTpl);
$rahmenbreiten = array( $rahmenbreiten = array(
'0' => 'Kein Rahmen', '0' => 'Kein Rahmen',

2
www/pages/shopimporter_shopware6.php
View File

@ -3017,7 +3017,7 @@ class Shopimporter_Shopware6 extends ShopimporterBase
$ordersToProcess = $this->getOrdersToProcess($this->getOrderSearchLimit()); $ordersToProcess = $this->getOrdersToProcess($this->getOrderSearchLimit());
return count($ordersToProcess['data']); return (!empty(count($ordersToProcess['data'])?count($ordersToProcess['data']):0);
} }
/** /**

14
www/widgets/templates/_gen/projekt.tpl
View File

@ -43,6 +43,20 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="row-height">
<div class="col-xs-12 col-md-12 col-md-height">
<div class="inside inside-full-height">
<fieldset><legend>{|Briefpapier|}</legend>
<table border="0" width="100%">
<tr><td width="300">{|Eigenes Briefpapier f&uuml;r Projekt|}:</td><td>[SPEZIALLIEFERSCHEIN][MSGSPEZIALLIEFERSCHEIN]</td></tr>
<tr><td>{|Beschriftung|}:</td><td>[SPEZIALLIEFERSCHEINBESCHRIFTUNG][MSGSPEZIALLIEFERSCHEINBESCHRIFTUNG]</td></tr>
</table>
</fieldset>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="row-height"> <div class="row-height">
<div class="col-xs-12 col-md-12 col-md-height"> <div class="col-xs-12 col-md-12 col-md-height">