From a6f742ccc01d6c50c09e202fb7c558a76bda881a Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Tue, 5 Dec 2023 11:32:53 +0100 Subject: [PATCH] lieferschein bugfix standardlager --- www/widgets/_gen/widget.gen.lieferschein.php | 418 +++++++++---------- www/widgets/templates/_gen/lieferschein.tpl | 1 + www/widgets/widget.lieferschein.php | 6 +- 3 files changed, 214 insertions(+), 211 deletions(-) diff --git a/www/widgets/_gen/widget.gen.lieferschein.php b/www/widgets/_gen/widget.gen.lieferschein.php index 29807111..d13c7736 100644 --- a/www/widgets/_gen/widget.gen.lieferschein.php +++ b/www/widgets/_gen/widget.gen.lieferschein.php @@ -1,212 +1,212 @@ -app = $app; - $this->parsetarget = $parsetarget; - $this->Form(); - } - - public function lieferscheinDelete() - { - - $this->form->Execute("lieferschein","delete"); - - $this->lieferscheinList(); - } - - function Edit() - { - $this->form->Edit(); - } - - function Copy() - { - $this->form->Copy(); - } - - public function Create() - { - $this->form->Create(); - } - - public function Search() - { - $this->app->Tpl->Set($this->parsetarget,"SUUUCHEEE"); - } - - public function Summary() - { - $this->app->Tpl->Set($this->parsetarget,"grosse Tabelle"); - } - - function Form() - { - $this->form = $this->app->FormHandler->CreateNew("lieferschein"); - $this->form->UseTable("lieferschein"); - $this->form->UseTemplate("lieferschein.tpl",$this->parsetarget); - - $field = new HTMLInput("lieferid","hidden","","","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("ansprechpartnerid","hidden","","","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("adresse","text","","20","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("lieferant","text","","20","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLCheckbox("lieferantenretoure","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLInput("projekt","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("auftragid","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("ihrebestellnummer","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("internebezeichnung","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("datum","text","","","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("standardlager","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("kommissionskonsignationslager","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLCheckbox("schreibschutz","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLCheckbox("abweichendebezeichnung","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLSelect("typ",0,"typ","","","0"); - $field->AddOption('Firma','firma'); - $field->AddOption('Herr','herr'); - $field->AddOption('Frau','frau'); - $this->form->NewField($field); - - $field = new HTMLInput("name","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - $this->form->AddMandatory("name","notempty","Pflichfeld!","MSGNAME"); - - $field = new HTMLInput("titel","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("ansprechpartner","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("abteilung","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("unterabteilung","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("adresszusatz","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("strasse","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("plz","text","","5","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("ort","text","","19","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("telefon","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("telefax","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("email","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("anschreiben","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLTextarea("freitext",5,110,"","","","","0"); - $this->form->NewField($field); - - $field = new HTMLTextarea("bodyzusatz",5,110,"","","","","0"); - $this->form->NewField($field); - - $field = new HTMLSelect("versandart",0,"versandart","","","0"); - $this->form->NewField($field); - - $field = new HTMLInput("lieferbedingung","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("vertrieb","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("bearbeiter","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLCheckbox("keinerechnung","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLCheckbox("ohne_briefpapier","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLCheckbox("ohne_artikeltext","","","1","0","0"); - $this->form->NewField($field); - - $field = new HTMLInput("gln","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLTextarea("internebemerkung",2,110,"","","","","0"); - $this->form->NewField($field); - - $field = new HTMLInput("ustid","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLSelect("ust_befreit",0,"ust_befreit","","","0"); - $field->AddOption('Inland','0'); - $field->AddOption('EU-Lieferung','1'); - $field->AddOption('Export','2'); - $field->AddOption('Steuerfrei Inland','3'); - $this->form->NewField($field); - - $field = new HTMLInput("sprache","text","","30","","","","","","","","0","",""); - $this->form->NewField($field); - - $field = new HTMLInput("kostenstelle","text","","15","","","","","","","","0","",""); - $this->form->NewField($field); - - - } - -} - -?> \ No newline at end of file +app = $app; + $this->parsetarget = $parsetarget; + $this->Form(); + } + + public function lieferscheinDelete() + { + + $this->form->Execute("lieferschein","delete"); + + $this->lieferscheinList(); + } + + function Edit() + { + $this->form->Edit(); + } + + function Copy() + { + $this->form->Copy(); + } + + public function Create() + { + $this->form->Create(); + } + + public function Search() + { + $this->app->Tpl->Set($this->parsetarget,"SUUUCHEEE"); + } + + public function Summary() + { + $this->app->Tpl->Set($this->parsetarget,"grosse Tabelle"); + } + + function Form() + { + $this->form = $this->app->FormHandler->CreateNew("lieferschein"); + $this->form->UseTable("lieferschein"); + $this->form->UseTemplate("lieferschein.tpl",$this->parsetarget); + + $field = new HTMLInput("lieferid","hidden","","","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("ansprechpartnerid","hidden","","","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("adresse","text","","20","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("lieferant","text","","20","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLCheckbox("lieferantenretoure","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLInput("projekt","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("auftragid","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("ihrebestellnummer","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("internebezeichnung","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("datum","text","","","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("standardlager","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("kommissionskonsignationslager","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLCheckbox("schreibschutz","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLCheckbox("abweichendebezeichnung","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLSelect("typ",0,"typ","","","0"); + $field->AddOption('Firma','firma'); + $field->AddOption('Herr','herr'); + $field->AddOption('Frau','frau'); + $this->form->NewField($field); + + $field = new HTMLInput("name","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + $this->form->AddMandatory("name","notempty","Pflichfeld!","MSGNAME"); + + $field = new HTMLInput("titel","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("ansprechpartner","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("abteilung","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("unterabteilung","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("adresszusatz","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("strasse","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("plz","text","","5","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("ort","text","","19","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("telefon","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("telefax","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("email","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("anschreiben","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLTextarea("freitext",5,110,"","","","","0"); + $this->form->NewField($field); + + $field = new HTMLTextarea("bodyzusatz",5,110,"","","","","0"); + $this->form->NewField($field); + + $field = new HTMLSelect("versandart",0,"versandart","","","0"); + $this->form->NewField($field); + + $field = new HTMLInput("lieferbedingung","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("vertrieb","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("bearbeiter","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLCheckbox("keinerechnung","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLCheckbox("ohne_briefpapier","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLCheckbox("ohne_artikeltext","","","1","0","0"); + $this->form->NewField($field); + + $field = new HTMLInput("gln","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLTextarea("internebemerkung",2,110,"","","","","0"); + $this->form->NewField($field); + + $field = new HTMLInput("ustid","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLSelect("ust_befreit",0,"ust_befreit","","","0"); + $field->AddOption('Inland','0'); + $field->AddOption('EU-Lieferung','1'); + $field->AddOption('Export','2'); + $field->AddOption('Steuerfrei Inland','3'); + $this->form->NewField($field); + + $field = new HTMLInput("sprache","text","","30","","","","","","","","0","",""); + $this->form->NewField($field); + + $field = new HTMLInput("kostenstelle","text","","15","","","","","","","","0","",""); + $this->form->NewField($field); + + + } + +} + +?> diff --git a/www/widgets/templates/_gen/lieferschein.tpl b/www/widgets/templates/_gen/lieferschein.tpl index 4f0cbf01..8f368f20 100644 --- a/www/widgets/templates/_gen/lieferschein.tpl +++ b/www/widgets/templates/_gen/lieferschein.tpl @@ -75,6 +75,7 @@ $(document).ready(function(){ {|Ihre Bestellnummer|}:[IHREBESTELLNUMMER][MSGIHREBESTELLNUMMER] {|Interne Bezeichnung|}:[INTERNEBEZEICHNUNG][MSGINTERNEBEZEICHNUNG] {|Datum|}:[DATUM][MSGDATUM] + {|Standardlagerplatz|}:[STANDARDLAGER][MSGSTANDARDLAGER] [VORWUNSCHLAGER]Bevorzugtes Lager:[NACHWUNSCHLAGER]
[VORWUNSCHLAGER][STANDARDLAGER][MSGSTANDARDLAGER][NACHWUNSCHLAGER] [VORKOMMISSIONSKONSIGNATIONSLAGER][KOMMISSIONIERLAGER]:
[KOMMISSIONSKONSIGNATIONSLAGER][MSGKOMMISSIONSKONSIGNATIONSLAGER][NACHKOMMISSIONSKONSIGNATIONSLAGER] Schreibschutz:[SCHREIBSCHUTZ][MSGSCHREIBSCHUTZ]  diff --git a/www/widgets/widget.lieferschein.php b/www/widgets/widget.lieferschein.php index 8f6b99f6..1a121dfe 100644 --- a/www/widgets/widget.lieferschein.php +++ b/www/widgets/widget.lieferschein.php @@ -15,6 +15,7 @@ class WidgetLieferschein extends WidgetGenlieferschein function ExtendsForm() { $id = $this->app->Secure->GetGET("id"); + if($this->app->Secure->GetPOST("speichern")!="") { $deliveryNote = $this->app->DB->SelectRow("SELECT `projekt`, `schreibschutz` FROM `lieferschein` WHERE `id` = {$id}"); @@ -36,6 +37,7 @@ class WidgetLieferschein extends WidgetGenlieferschein } } } + if($this->app->Secure->GetGET("action")=="edit") { $this->app->Tpl->Add('FURTHERTABS','
  • Protokoll
    • '); @@ -49,7 +51,7 @@ class WidgetLieferschein extends WidgetGenlieferschein $this->app->YUI->AutoComplete("projekt","projektname",1); $this->app->YUI->AutoComplete("auftragid","auftrag",1); $this->app->YUI->AutoComplete("aktion","aktionscode",1); - $this->app->YUI->AutoComplete("standardlager","lager"); + $this->app->YUI->AutoComplete("standardlager","lagerplatz"); $this->app->YUI->AutoComplete("lieferbedingung","lieferbedingungen"); @@ -62,7 +64,7 @@ class WidgetLieferschein extends WidgetGenlieferschein $this->form->ReplaceFunction("adresse",$this,"ReplaceKunde"); $this->form->ReplaceFunction("lieferant",$this,"ReplaceLieferant"); $this->form->ReplaceFunction("auftragid",$this,"ReplaceAuftrag"); - $this->form->ReplaceFunction("standardlager",$this,"ReplaceLager"); + $this->form->ReplaceFunction("standardlager",$this,"ReplaceLagerPlatz"); if($this->app->erp->ModulVorhanden('kommissionskonsignationslager')) {