mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2025-03-05 22:49:48 +01:00
Bugfix seriennummern beleg
This commit is contained in:
parent
41db396c12
commit
5eff91e637
@ -302,10 +302,9 @@ class Briefpapier extends SuperFPDF {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OpenXE Seriennummern
|
||||||
public function GetChargeMHDSNString($type,$doctype,$doctypeid,$posid, $returnSimpleString = false)
|
public function GetChargeMHDSNString($type,$doctype,$doctypeid,$posid, $returnSimpleString = false)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case 'sn':
|
case 'sn':
|
||||||
$sql = "SELECT
|
$sql = "SELECT
|
||||||
@ -313,7 +312,9 @@ class Briefpapier extends SuperFPDF {
|
|||||||
FROM
|
FROM
|
||||||
seriennummern s
|
seriennummern s
|
||||||
INNER JOIN
|
INNER JOIN
|
||||||
seriennummern_beleg_position slp ON slp.beleg_typ = 'lieferschein' AND slp.seriennummer = s.id
|
seriennummern_beleg_position slp ON slp.beleg_typ = '".$doctype."' AND slp.seriennummer = s.id
|
||||||
|
INNER JOIN ".$doctype."_position dp ON dp.id = slp.beleg_position
|
||||||
|
INNER JOIN ".$doctype." d ON d.id = dp.".$doctype."
|
||||||
WHERE
|
WHERE
|
||||||
slp.beleg_position = $posid
|
slp.beleg_position = $posid
|
||||||
";
|
";
|
||||||
@ -3333,10 +3334,6 @@ class Briefpapier extends SuperFPDF {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// OpenXE Seriennummern
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(!empty($this->doctype) && !empty($this->id) && strpos($item['desc'], '{') !== false) {
|
if(!empty($this->doctype) && !empty($this->id) && strpos($item['desc'], '{') !== false) {
|
||||||
$item['desc'] = $this->app->erp->ParseUserVars($this->doctype, $this->id ,$item['desc']);
|
$item['desc'] = $this->app->erp->ParseUserVars($this->doctype, $this->id ,$item['desc']);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user