s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-15 04:27:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into sendcloud

Browse Source 
# Conflicts:
#	www/pages/versandarten.php
This commit is contained in:
Andreas Palm 2023-03-27 15:27:10 +02:00
commit aa93070185
6 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
upgrade/data/db_schema.json
View File

@ -98705,7 +98705,7 @@
"Default": "", "Default": "",
"Extra": "auto_increment", "Extra": "auto_increment",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
}, },
{ {
"Field": "address_id", "Field": "address_id",
@ -98716,7 +98716,7 @@
"Default": "", "Default": "",
"Extra": "", "Extra": "",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
}, },
{ {
"Field": "document_type", "Field": "document_type",
@ -98727,7 +98727,7 @@
"Default": "", "Default": "",
"Extra": "", "Extra": "",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
}, },
{ {
"Field": "job_type", "Field": "job_type",
@ -98738,7 +98738,7 @@
"Default": "", "Default": "",
"Extra": "", "Extra": "",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
}, },
{ {
"Field": "printer_id", "Field": "printer_id",
@ -98749,7 +98749,7 @@
"Default": "", "Default": "",
"Extra": "", "Extra": "",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
}, },
{ {
"Field": "created_at", "Field": "created_at",
@ -98760,7 +98760,7 @@
"Default": "current_timestamp()", "Default": "current_timestamp()",
"Extra": "", "Extra": "",
"Privileges": "select,insert,update,references", "Privileges": "select,insert,update,references",
"Commant": "" "Comment": ""
} }
], ],
"keys": [ "keys": [

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

@ -7095,7 +7095,7 @@ title: 'Abschicken',
$navarray['menu']['admin'][$menu]['sec'][] = array('Arbeitsnachweis','arbeitsnachweis','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Arbeitsnachweis','arbeitsnachweis','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Gutschrift / '.$this->Firmendaten("bezeichnungstornorechnung"),'gutschrift','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Gutschrift / '.$this->Firmendaten("bezeichnungstornorechnung"),'gutschrift','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Proformarechnung','proformarechnung','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Proformarechnung','proformarechnung','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','rechnungslauf'); $navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Mahnwesen','mahnwesen','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Mahnwesen','mahnwesen','list');
$navarray['menu']['admin'][$menu]['sec'][] = array('Dokumenten Scanner','docscan','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Dokumenten Scanner','docscan','list');

7
www/lib/class.image.php
View File

@ -49,6 +49,7 @@ class image {
$manipulator = new ImageManipulator($str); $manipulator = new ImageManipulator($str);
$type = mime_content_type($path); $type = mime_content_type($path);
$manipulator->resample($newwidth, $newheight, true, $upscale); $manipulator->resample($newwidth, $newheight, true, $upscale);
/* /*
@ -200,7 +201,7 @@ class ImageManipulator
public function resample($width, $height, $constrainProportions = true, $upscale = false, $keepformat = false) public function resample($width, $height, $constrainProportions = true, $upscale = false, $keepformat = false)
{ {
if (!is_resource($this->image)) { if (!is_resource($this->image)) {
throw new RuntimeException('No image set'); // throw new RuntimeException('No image set');
} }
if($keepformat) if($keepformat)
{ {
@ -340,9 +341,9 @@ class ImageManipulator
*/ */
protected function _replace($res) protected function _replace($res)
{ {
if (!is_resource($res)) { /* if (!is_resource($res)) {
throw new UnexpectedValueException('Invalid resource'); throw new UnexpectedValueException('Invalid resource');
} }*/
if (is_resource($this->image)) { if (is_resource($this->image)) {
imagedestroy($this->image); imagedestroy($this->image);
} }

15
www/lib/dokumente/class.briefpapier.php
View File

@ -1797,12 +1797,19 @@ class Briefpapier extends SuperFPDF {
public function setStyleData($styleData){ public function setStyleData($styleData){
$this->styleData = $styleData; $this->styleData = $styleData;
} }
private function getStyleElement($key){ private function getStyleElement($key){
if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) return $this->styleData[$key]; $result = null;
if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) {
return $this->app->erp->Firmendaten($key); $result = $this->styleData[$key];
} else {
$result = $this->app->erp->Firmendaten($key);
}
if (empty($result)) {
$result = 0;
}
return($result);
} }
public function renderDocument() { public function renderDocument() {

14
www/pages/lager.php
View File

@ -451,7 +451,7 @@ class Lager extends GenLager {
FROM FROM
einkaufspreise minek einkaufspreise minek
WHERE WHERE
einkaufspreise.artikel = minek.artikel AND DATE( einkaufspreise.geloescht != 1 AND einkaufspreise.artikel = minek.artikel AND DATE(
REPLACE REPLACE
( (
COALESCE(gueltig_bis, '9999-12-31'), COALESCE(gueltig_bis, '9999-12-31'),
@ -482,7 +482,17 @@ class Lager extends GenLager {
) )
) >= DATE('".$datum."') ) >= DATE('".$datum."')
) )
) ) AND DATE(
REPLACE
(
COALESCE(
einkaufspreise.gueltig_bis,
'9999-12-31'
),
'0000-00-00',
'9999-12-31'
)
) >= DATE('".$datum."')
GROUP BY GROUP BY
artikel, artikel,
waehrung waehrung

8
www/pages/rechnungslauf.php
View File

@ -35,8 +35,8 @@ class Rechnungslauf {
$width = ['1%', '1%', '10%', '20%', '10%', '10%', '10%', '10%', '10%', '10%', '1%']; $width = ['1%', '1%', '10%', '20%', '10%', '10%', '10%', '10%', '10%', '10%', '1%'];
$findcols = [ $findcols = [
'', 'adr.kundennummer',
'', 'adr.kundennummer',
'adr.kundennummer', 'adr.kundennummer',
'adr.name', 'adr.name',
'adr.anschreiben', 'adr.anschreiben',
@ -209,7 +209,7 @@ class Rechnungslauf {
$this->app->ActionHandlerInit($this); $this->app->ActionHandlerInit($this);
// ab hier alle Action Handler definieren die das Modul hat // ab hier alle Action Handler definieren die das Modul hat
$this->app->ActionHandler('rechnungslauf', 'ActionList'); $this->app->ActionHandler('list', 'ActionList');
$this->app->ActionHandler('abos', 'ActionAbos'); $this->app->ActionHandler('abos', 'ActionAbos');
$this->app->ActionHandler('minidetail', 'ActionMinidetail'); $this->app->ActionHandler('minidetail', 'ActionMinidetail');
@ -218,7 +218,7 @@ class Rechnungslauf {
public function MenuList() { public function MenuList() {
$this->app->erp->Headlines("Abolauf"); $this->app->erp->Headlines("Abolauf");
$this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=rechnungslauf", "Übersicht"); $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=list", "Übersicht");
$this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=abos", "gebuchte Abos"); $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=abos", "gebuchte Abos");
$this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=einstellungen", "Einstellungen"); $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=einstellungen", "Einstellungen");
} }