diff --git a/upgrade/data/db_schema.json b/upgrade/data/db_schema.json
index ba830e9c..8fc821b2 100644
--- a/upgrade/data/db_schema.json
+++ b/upgrade/data/db_schema.json
@@ -3660,6 +3660,28 @@
                     "Extra": "",
                     "Privileges": "select,insert,update,references",
                     "Comment": ""
+                },
+                {
+                    "Field": "etikettautodruck",
+                    "Type": "int(1)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
+                },
+                {
+                    "Field": "etikett",
+                    "Type": "int(11)",
+                    "Collation": null,
+                    "Null": "NO",
+                    "Key": "",
+                    "Default": "0",
+                    "Extra": "",
+                    "Privileges": "select,insert,update,references",
+                    "Comment": ""
                 }
             ],
             "keys": [
diff --git a/www/objectapi/mysql/_gen/object.gen.adresse.php b/www/objectapi/mysql/_gen/object.gen.adresse.php
index 086afcd3..5b064bfd 100644
--- a/www/objectapi/mysql/_gen/object.gen.adresse.php
+++ b/www/objectapi/mysql/_gen/object.gen.adresse.php
@@ -187,6 +187,8 @@ class ObjGenAdresse
   private  $freifeld9;
   private  $freifeld10;
   private  $rechnung_papier;
+  private  $etikettautodruck;
+  private  $etikett;
   private  $angebot_cc;
   private  $auftrag_cc;
   private  $rechnung_cc;
@@ -440,6 +442,8 @@ $result = $result[0];
     $this->freifeld9=$result['freifeld9'];
     $this->freifeld10=$result['freifeld10'];
     $this->rechnung_papier=$result['rechnung_papier'];
+    $this->etikettautodruck=$result['etikettautodruck'];
+    $this->etikett=$result['etikett'];
     $this->angebot_cc=$result['angebot_cc'];
     $this->auftrag_cc=$result['auftrag_cc'];
     $this->rechnung_cc=$result['rechnung_cc'];
@@ -693,6 +697,8 @@ $result = $result[0];
       `freifeld9`='{$this->freifeld9}',
       `freifeld10`='{$this->freifeld10}',
       `rechnung_papier`='{$this->rechnung_papier}',
+      `etikettautodruck`='{$this->etikettautodruck}',
+      `etikett`='{$this->etikett}',
       `angebot_cc`='{$this->angebot_cc}',
       `auftrag_cc`='{$this->auftrag_cc}',
       `rechnung_cc`='{$this->rechnung_cc}',
@@ -946,6 +952,8 @@ $result = $result[0];
     $this->freifeld9='';
     $this->freifeld10='';
     $this->rechnung_papier='';
+    $this->etikettautodruck='';
+    $this->etikett='';
     $this->angebot_cc='';
     $this->auftrag_cc='';
     $this->rechnung_cc='';
@@ -1392,6 +1400,10 @@ $result = $result[0];
   public function GetFreifeld10() { return $this->freifeld10; }
   public function SetRechnung_Papier($value) { $this->rechnung_papier=$value; }
   public function GetRechnung_Papier() { return $this->rechnung_papier; }
+  public function SetEtikettautodruck($value) { $this->etikettautodruck=$value; }
+  public function GetEtikettautodruck() { return $this->etikettautodruck; }
+  public function SetEtikett($value) { $this->etikett=$value; }
+  public function GetEtikett() { return $this->etikett; }
   public function SetAngebot_Cc($value) { $this->angebot_cc=$value; }
   public function GetAngebot_Cc() { return $this->angebot_cc; }
   public function SetAuftrag_Cc($value) { $this->auftrag_cc=$value; }
diff --git a/www/widgets/_gen/widget.gen.adresse.php b/www/widgets/_gen/widget.gen.adresse.php
index f058afec..8e9da36c 100644
--- a/www/widgets/_gen/widget.gen.adresse.php
+++ b/www/widgets/_gen/widget.gen.adresse.php
@@ -667,6 +667,13 @@ class WidgetGenadresse
     $field = new HTMLInput("kennung","text","","30","","","","","","","","0","","");
     $this->form->NewField($field);
 
+    $field = new HTMLCheckbox("etikettautodruck","","","1","0","0");
+    $this->form->NewField($field);
+
+    $field = new HTMLInput("etikett","text","","30","","","","","","","","0","","");
+    $this->form->NewField($field);
+
+
   }
 
 }
diff --git a/www/widgets/templates/_gen/adresse.tpl b/www/widgets/templates/_gen/adresse.tpl
index 538843aa..87238e64 100644
--- a/www/widgets/templates/_gen/adresse.tpl
+++ b/www/widgets/templates/_gen/adresse.tpl
@@ -771,6 +771,27 @@ function abweichend(cmd) {
 				</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>{|Etiketten|}</legend>
+							<table width="100%" class="mkTableFormular">
+								<tr>
+									<td width="210">{|Autodruck|}:</td>
+									<td>[ETIKETTAUTODRUCK][MSGETIKETTAUTODRUCK]&nbsp;<i>Bei der Kommissionierung werden Etiketten gedruckt</i></td>
+								</tr>
+								<tr>
+									<td width="210">{|Etikett|}:</td>
+									<td>[ETIKETT][MSGETIKETT]</td>
+								</tr>
+							</table>
+						</fieldset>
+					</div>
+				</div>
+			</div>
+		</div>
 		<div class="row">
 			<div class="row-height">
 				<div class="col-xs-12 col-md-6 col-md-height">
diff --git a/www/widgets/widget.adresse.php b/www/widgets/widget.adresse.php
index b65ab7c1..fa00fbfe 100644
--- a/www/widgets/widget.adresse.php
+++ b/www/widgets/widget.adresse.php
@@ -438,6 +438,11 @@ class WidgetAdresse extends WidgetGenAdresse
       $this->app->Tpl->Set('NACHBUNDESSTAAT','-->');
     }
 
+    $etikettenart = $this->app->erp->GetEtiketten();
+    $field = new HTMLSelect("etikett",0);
+    $field->AddOptionsAsocSimpleArray($etikettenart);
+    $this->form->NewField($field);
+
   }
 
   function ReplaceDecimal($db,$value,$fromform)
diff --git a/www/widgets/widget.projekt.php b/www/widgets/widget.projekt.php
index 8488f348..9732dcde 100644
--- a/www/widgets/widget.projekt.php
+++ b/www/widgets/widget.projekt.php
@@ -152,7 +152,6 @@ class WidgetProjekt extends WidgetGenProjekt
     $field->AddOptionsAsocSimpleArray($drucker);
     $this->form->NewField($field);
 
-
     $drucker = $this->app->erp->GetDrucker();
     $field = new HTMLSelect("kasse_drucker",0);
     $field->AddOptionsAsocSimpleArray($drucker);