s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-24 13:40:29 +01:00
Code Issues Projects Releases Wiki Activity

adresse etikettautodruck mask

Browse Source
This commit is contained in:
OpenXE 2024-06-05 12:36:35 +02:00
parent d7aa58190e
commit 5774385cac
6 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
upgrade/data/db_schema.json
View File

@ -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": [

12
www/objectapi/mysql/_gen/object.gen.adresse.php
View File

@ -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; }

7
www/widgets/_gen/widget.gen.adresse.php
View File

@ -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);
}
}

21
www/widgets/templates/_gen/adresse.tpl
View File

@ -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">

5
www/widgets/widget.adresse.php
View File

@ -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)

1
www/widgets/widget.projekt.php
View File

@ -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);