Skip to content

Commit 68965e8

Browse files
author
Xenomporio
committed
Merge branch 'develop'
2 parents 70e3289 + 8967179 commit 68965e8

7 files changed

+3292
-3101
lines changed

‎www/lib/class.erpapi.php

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7018,12 +7018,28 @@ function Navigation()
70187018

70197019
$navarray['menu']['admin'][$menu]['sec'][] = array('Produktion','produktion','list');
70207020

7021-
$navarray['menu']['admin'][++$menu]['first'] = array('Wareneingang','wareneingang','paketannahme');
7022-
$navarray['menu']['admin'][$menu]['sec'][] = array('Paket Annahme','wareneingang','paketannahme');
7023-
7024-
if($this->Firmendaten("wareneingang_gross")=="1"){
7025-
$navarray['menu']['admin'][$menu]['sec'][] = array('Paket Distribution', 'wareneingang', 'distribution');
7021+
$navarray['menu']['admin'][++$menu]['first'] = array('Lager','lager','list');
7022+
$navarray['menu']['admin'][$menu]['sec'][] = array('Wareneingang','wareneingang','list');
7023+
$navarray['menu']['admin'][$menu]['sec'][] = array('Lieferschein','lieferschein','list');
7024+
$navarray['menu']['admin'][$menu]['sec'][] = array('Lagerverwaltung','lager','list');
7025+
if($this->ModulVorhanden('lagermobil')) {
7026+
$navarray['menu']['admin'][$menu]['sec'][] = array('Mobile Lagerverwaltung','lagermobil','list');
70267027
}
7028+
if($this->ModulVorhanden('multiorderpicking')) {
7029+
$navarray['menu']['admin'][$menu]['sec'][] = array('Multiorder-Picking','multiorderpicking','list');
7030+
}
7031+
$navarray['menu']['admin'][$menu]['sec'][] = array('Reservierungen','lager','reservierungen');
7032+
$navarray['menu']['admin'][$menu]['sec'][] = array('Inventur','inventur','list');
7033+
$navarray['menu']['admin'][$menu]['sec'][] = array('Versandzentrum','versanderzeugen','offene');
7034+
$navarray['menu']['admin'][$menu]['sec'][] = array('Produktionszentrum','produktionszentrum','list');
7035+
$navarray['menu']['admin'][$menu]['sec'][] = array('Kommissionieraufkleber','kommissionieraufkleber','list');
7036+
7037+
$navarray['menu']['admin'][$menu]['sec'][] = array('Mindesthaltbarkeit','mhdwarning','list');
7038+
7039+
$navarray['menu']['admin'][$menu]['sec'][] = array('Lagermindestmengen','lagermindestmengen','list');
7040+
$navarray['menu']['admin'][$menu]['sec'][] = array('Artikelkontingente','artikelkontingente','list');
7041+
$navarray['menu']['admin'][$menu]['sec'][] = array('Ein- und auslagern','lager','bucheneinlagern');
7042+
$navarray['menu']['admin'][$menu]['sec'][] = array('Zwischenlager','lager','buchenzwischenlager');
70277043

70287044
$navarray['menu']['admin'][++$menu]['first'] = array('Buchhaltung','rechnung','list');
70297045
$navarray['menu']['admin'][$menu]['sec'][] = array('Rechnungen','rechnung','list');
@@ -7085,28 +7101,6 @@ function Navigation()
70857101

70867102
$navarray['menu']['admin'][$menu]['sec'][] = array('Etikettendrucker','etikettendrucker','list');
70877103

7088-
$navarray['menu']['admin'][++$menu]['first'] = array('Lager','lager','list');
7089-
$navarray['menu']['admin'][$menu]['sec'][] = array('Lieferschein','lieferschein','list');
7090-
$navarray['menu']['admin'][$menu]['sec'][] = array('Lagerverwaltung','lager','list');
7091-
if($this->ModulVorhanden('lagermobil')) {
7092-
$navarray['menu']['admin'][$menu]['sec'][] = array('Mobile Lagerverwaltung','lagermobil','list');
7093-
}
7094-
if($this->ModulVorhanden('multiorderpicking')) {
7095-
$navarray['menu']['admin'][$menu]['sec'][] = array('Multiorder-Picking','multiorderpicking','list');
7096-
}
7097-
$navarray['menu']['admin'][$menu]['sec'][] = array('Reservierungen','lager','reservierungen');
7098-
$navarray['menu']['admin'][$menu]['sec'][] = array('Inventur','inventur','list');
7099-
$navarray['menu']['admin'][$menu]['sec'][] = array('Versandzentrum','versanderzeugen','offene');
7100-
$navarray['menu']['admin'][$menu]['sec'][] = array('Produktionszentrum','produktionszentrum','list');
7101-
$navarray['menu']['admin'][$menu]['sec'][] = array('Kommissionieraufkleber','kommissionieraufkleber','list');
7102-
7103-
$navarray['menu']['admin'][$menu]['sec'][] = array('Mindesthaltbarkeit','mhdwarning','list');
7104-
7105-
$navarray['menu']['admin'][$menu]['sec'][] = array('Lagermindestmengen','lagermindestmengen','list');
7106-
$navarray['menu']['admin'][$menu]['sec'][] = array('Artikelkontingente','artikelkontingente','list');
7107-
$navarray['menu']['admin'][$menu]['sec'][] = array('Ein- und auslagern','lager','bucheneinlagern');
7108-
$navarray['menu']['admin'][$menu]['sec'][] = array('Zwischenlager','lager','buchenzwischenlager');
7109-
71107104
$navarray['menu']['admin'][++$menu]['first'] = array('System','rechnung','list');
71117105
$navarray['menu']['admin'][$menu]['sec'][] = array('Einstellungen','einstellungen','list');
71127106
$navarray['menu']['admin'][$menu]['sec'][] = array('Online-Shops / Marktplätze','onlineshops','list');
@@ -18981,14 +18975,14 @@ function ReplaceSteuergruppe($db,$value,$fromform)
1898118975
$dbformat = 1;
1898218976
$id = $value;
1898318977
if($id > 0){
18984-
$abkuerzung = $this->app->DB->Select("SELECT bezeichnung FROM steuerregelngruppe WHERE id='$id' LIMIT 1");
18978+
// Removed, table does not exist $abkuerzung = $this->app->DB->Select("SELECT bezeichnung FROM steuerregelngruppe WHERE id='$id' LIMIT 1");
1898518979
}else{
1898618980
$abkuerzung = '';
1898718981
}
1898818982
} else {
1898918983
$dbformat = 0;
1899018984
$value = $this->app->DB->real_escape_string($value);
18991-
$id = $this->app->DB->Select("SELECT id FROM steuerregelngruppe WHERE bezeichnung = '$value' ORDER BY aktiv = 1 DESC LIMIT 1");
18985+
// Removed, table does not exist $id = $this->app->DB->Select("SELECT id FROM steuerregelngruppe WHERE bezeichnung = '$value' ORDER BY aktiv = 1 DESC LIMIT 1");
1899218986
if($id <=0) $id=0;
1899318987
}
1899418988

‎www/pages/content/wareneingangpaketdistribution_tab3_lager.tpl renamed to ‎www/pages/content/wareneingang_lager.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tr valign="top"><td><b>{|Nummer|}:</b></td><td>[NUMMER]</td></tr>
1616
[BILDERFASSENSTART]
1717
<tr valign="top"><td><br></td><td align="center"></td></tr>
18-
<tr valign="top"><td><b>{|Bild erfassen|}:</b></td><td> <input name="wareneingangartikelbild" type="file" /></td></tr>
18+
<tr valign="top"><td><b>{|Bild für Artikelstammdaten erfassen|}:</b></td><td> <input name="wareneingangartikelbild" type="file" /></td></tr>
1919
<tr valign="top"><td><b>{|Bildtyp|}:</b></td><td><select name="bildtyp">[BILDTYPEN]</select></td></tr>
2020
[BILDERFASSENENDE]
2121
<tr valign="top"><td><br></td><td align="center"></td></tr>

‎www/pages/content/wareneingang_list.tpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div id="tabs-1">
2+
[MESSAGE]
3+
[TAB1]
4+
[TAB1NEXT]
5+
</div>

‎www/pages/content/wareneingangpaketdistribution_tab3_mitarbeiter.tpl renamed to ‎www/pages/content/wareneingang_mitarbeiter.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<tr valign="top" colspan="3">
66
<td>
77

8-
<div class="info">Der Artikel ist f&uuml;r einen Mitarbeiter.</div>
8+
<div class="info">Dies ist kein Lagerartikel.</div>
99
[MESSAGE]
1010
<br><br>
1111
<table width="60%" style="background-color: #fff; border: solid 1px #000;" align="center">
@@ -15,12 +15,12 @@
1515

1616
<table height="200" border="0" width="450">
1717
<tr valign="top"><td><b>Artikel:</b></td><td><u>[NAME]</u></td></tr>
18-
<tr valign="top"><td>Lieferant:</td><td>[LIEFERANT]</td></tr>
18+
<!--<tr valign="top"><td>Lieferant:</td><td>[LIEFERANT]</td></tr> -->
1919
<tr valign="top"><td><br></td><td align="center"></td></tr>
2020
<tr valign="top"><td><b>Bemerkung:</b></td><td><textarea cols="35" rows="2" name="bemerkung">[BEMERKUNG]</textarea>
2121
</td></tr>
2222
<tr valign="top"><td><br></td><td align="center"></td></tr>
23-
<tr valign="top"><td nowrap><b>1. Schritt:</b></td><td>Artikel zu Mitarbeiter [MITARBEITER] bringen
23+
<tr valign="top"><td nowrap><b>Anmerkung:</b></td><td>Artikel zu Mitarbeiter [MITARBEITER] bringen
2424
[DISPLAY_WARENEINGANG_RMA_HOOK1]
2525
<tr valign="top"><td><br></td><td align="center"><input type="submit" name="submit" value="Speichern" />&nbsp;<input type="button" onclick="window.location.href='index.php?module=wareneingang&action=distriinhalt&id=[ID]'" value="Abbrechen" /></td></tr>
2626
</td></tr>

‎www/pages/content/wareneingangpaketannahme.tpl renamed to ‎www/pages/content/wareneingang_paketannahme.tpl

File renamed without changes.

‎www/pages/content/wareneingangpaketdistribution.tpl renamed to ‎www/pages/content/wareneingang_paketinhalt.tpl

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,60 @@
1515
[TAB1START]
1616

1717
[MESSAGE1]
18-
<div class="row">
19-
<div class="row-height">
20-
<div class="col-xs-12 col-md-10 col-md-height">
21-
<div class="inside-white inside-full-height">
22-
[TAB1]
18+
<form action="" method="post">
19+
<div class="row">
20+
<div class="row-height">
21+
<div class="col-xs-12 col-md-10 col-md-height">
22+
<div class="inside inside-full-height">
23+
<fieldset>
24+
<legend>{|[LEGENDE]|}</legend>
25+
<table>
26+
<tr><td>{|Lieferschein-Nr.|}:</td><td><input type=text size="40" name="lsnr" value=[LSNR]></td></tr>
27+
<tr><td>{|Rechnung-Nr.|}:</td><td><input type=text size="40" name="renr" value=[RENR]></td></tr>
28+
<tr><td>{|Bemerkung|}:</td><td><textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea></td></tr>
29+
<tr><td><input type="submit" name="speichern" class="btnGreenNew" value="Speichern"></td>
30+
</table>
31+
</fieldset>
32+
</div>
33+
</div>
34+
<div class="col-xs-12 col-md-2 col-md-height">
35+
<div class="inside inside-full-height">
36+
<fieldset>
37+
<legend>{|Aktionen|}</legend>
38+
[BUTTONS]
39+
[BEFOREFRM]
40+
[AFTERFRM]
41+
[DISTRIINHALTBUTTONS]
42+
<input type="submit" name="abschliessen" id="btnabschliessen" class="btnGreenNew" value="Paketinhalt ist erfasst">
43+
[BEFOREMANUELLERFASSEN]
44+
<input type="submit" name="manuellerfassen" class="btnBlueNew" value="Artikel manuell erfassen">
45+
[AFTERMANUELLERFASSEN]
46+
[BEFOREFRM]
47+
[AFTERFRM]
48+
</fieldset>
49+
</div>
2350
</div>
2451
</div>
25-
<div class="col-xs-12 col-md-2 col-md-height">
26-
<div class="inside inside-full-height">
27-
<fieldset>
28-
<legend>{|Aktionen|}</legend>
29-
[BUTTONS]
30-
[BEFOREFRM]
31-
<form action="" method="post">
32-
[AFTERFRM]
33-
[DISTRIINHALTBUTTONS]
34-
<input type="submit" name="abschliessen" id="btnabschliessen" class="btnGreenNew" value="Paketinhalt ist erfasst">
35-
[BEFOREMANUELLERFASSEN]
36-
<input type="submit" name="manuellerfassen" class="btnBlueNew" value="Artikel manuell erfassen">
37-
[AFTERMANUELLERFASSEN]
38-
[BEFOREFRM]
39-
</form>
40-
[AFTERFRM]
41-
</fieldset>
52+
</div>
53+
<div class="row">
54+
<div class="row-height">
55+
<div class="col-xs-12 col-md-10 col-md-height">
56+
<div class="inside-white inside-full-height">
57+
[TAB1]
58+
</div>
4259
</div>
4360
</div>
4461
</div>
45-
</div>
62+
<div class="row">
63+
<div class="row-height">
64+
<div class="col-xs-12 col-md-10 col-md-height">
65+
<div class="inside-white inside-full-height">
66+
[TAB1_SECOND]
67+
</div>
68+
</div>
69+
</div>
70+
</div>
71+
</form>
4672
[TAB1ENDE]
4773
</div>
4874
[AFTERTAB1]
@@ -108,4 +134,4 @@
108134
});
109135
}
110136
});
111-
</script>
137+
</script>

0 commit comments

Comments
 (0)