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

Bugfixes artikel

Browse Source
This commit is contained in:
Xenomporio 2022-05-26 21:51:59 +02:00
parent 071601fa35
commit cd647bd6ba
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpwf/plugins/class.yui.php
View File

@ -8541,7 +8541,10 @@ a.land as land, p.abkuerzung as projekt, a.zahlungsweise as zahlungsweise,
$more_data4 = $this->app->Secure->GetGET("more_data4");
if($more_data4=="1") $subwhere[] = " v.adresse = 0 AND v.gruppe=0 ";
for ($j = 0;$j < count($subwhere);$j++) $tmp.= " AND " . $subwhere[$j];
if (!is_null($subwhere))
{
for ($j = 0;$j < count($subwhere);$j++) $tmp.= " AND " . $subwhere[$j];
}
if ($more_data1 == 1)
$where = "v.artikel='$id' AND v.geloescht = 0 ".$tmp;

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

@ -29948,11 +29948,15 @@ function ChargenMHDAuslagern($artikel, $menge, $lagerplatztyp, $lpid,$typ,$wert,
function GetSelectEtiketten($art,$selected="")
{
$user = $this->app->DB->SelectArr("SELECT * FROM etiketten WHERE verwendenals='$art' ORDER by name");
for($i=0;$i<count($user);$i++)
{
if($user[$i]['id']==$selected) $mark="selected"; else $mark="";
$tpl .="<option value=\"{$user[$i]['id']}\" $mark>{$user[$i]['name']}</option>";
}
if (!is_null($user)) {
for($i=0;$i<count($user);$i++)
{
if($user[$i]['id']==$selected) $mark="selected"; else $mark="";
$tpl .="<option value=\"{$user[$i]['id']}\" $mark>{$user[$i]['name']}</option>";
}
}
return $tpl;
}

4
www/pages/artikel.php
View File

@ -81,12 +81,12 @@ class Artikel extends GenArtikel {
$menu = "";
$sqla[] = "(SELECT ew.id, e.name, ew.wert, ew.einheit, '' as eigenschafts, '' as werts, 'DE' as spraches, '' as shops, '' as artikelspezifisch, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"#\" onclick=\"editeigenschaft(',ew.id,')\"><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/edit.svg\" title=\"Bearbeiten\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=\"deleteeigenschaft(',ew.id,')\";><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/delete.svg\" title=\"L&ouml;schen\" border=\"0\"></a>&nbsp;',IF(e.typ='select' AND ew.vorlage>0,'',CONCAT('<a href=\"#\" onclick=\"copyeigenschaft(',ew.id,')\";><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/copy.svg\" title=\"Kopieren\" border=\"0\"></a></td></tr></table>'))) as menux, '' as menu
$sqla[] = "(SELECT ew.id, e.name, ew.wert, ew.einheit, '' as eigenschafts, '' as werts, 'DE' as spraches, '' as shops, '' as artikelspezifisch, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"#\" onclick=\"editeigenschaft(',ew.id,')\"><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/edit.svg\" title=\"Bearbeiten\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=\"deleteeigenschaft(',ew.id,')\";><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delete.svg\" title=\"L&ouml;schen\" border=\"0\"></a>&nbsp;',IF(e.typ='select' AND ew.vorlage>0,'',CONCAT('<a href=\"#\" onclick=\"copyeigenschaft(',ew.id,')\";><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/copy.svg\" title=\"Kopieren\" border=\"0\"></a></td></tr></table>'))) as menux, '' as menu
FROM artikeleigenschaften e
INNER JOIN artikeleigenschaftenwerte ew ON e.id = ew.artikeleigenschaften
WHERE ew.artikel = '$id')";
$sqla[] = "(SELECT ap.id, ae.name, aw.wert, aw.einheit, ap.property_to as eigenschafts, ap.property_value_to as werts, ap.language_to as spraches, s.bezeichnung as shops, IF(ap.article_id > 0, 'ja', '') as artikelspezifisch, IF(ap.article_id = 0, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"index.php?module=propertytranslation&action=list\"><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/forward.svg\" title=\"Eigenschaften &Uuml;bersetzung\" border=\"0\"></a>'), IF(ap.article_id != 0, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"#\" onclick=\"editUebersetzung(',ap.id,');\"><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/edit.svg\" title=\"Bearbeiten\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=\"deleteUebersetzung(',ap.id,');\"><img src=\"themes/{$this->app->Conf->WFconf[defaulttheme]}/images/delete.svg\" title=\"L&ouml;schen\" border=\"0\"></a>'), '')) as menux, '' as menu
$sqla[] = "(SELECT ap.id, ae.name, aw.wert, aw.einheit, ap.property_to as eigenschafts, ap.property_value_to as werts, ap.language_to as spraches, s.bezeichnung as shops, IF(ap.article_id > 0, 'ja', '') as artikelspezifisch, IF(ap.article_id = 0, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"index.php?module=propertytranslation&action=list\"><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/forward.svg\" title=\"Eigenschaften &Uuml;bersetzung\" border=\"0\"></a>'), IF(ap.article_id != 0, CONCAT('<table cellpadding=0 cellspacing=0><tr><td nowrap><a href=\"#\" onclick=\"editUebersetzung(',ap.id,');\"><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/edit.svg\" title=\"Bearbeiten\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=\"deleteUebersetzung(',ap.id,');\"><img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/delete.svg\" title=\"L&ouml;schen\" border=\"0\"></a>'), '')) as menux, '' as menu
FROM article_property_translation ap
LEFT JOIN shopexport s ON ap.shop_id = s.id
LEFT JOIN artikeleigenschaften ae ON ap.property_from = ae.name