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

lieferschein bugfix standardlager

Browse Source
This commit is contained in:
OpenXE 2023-12-05 11:32:53 +01:00
parent 2129627a5b
commit a6f742ccc0
3 changed files with 214 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

418
www/widgets/_gen/widget.gen.lieferschein.php
View File

@ -1,212 +1,212 @@
<?php <?php
/* /*
**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE **** **** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
* *
* Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019 * Xentral (c) Xentral ERP Sorftware GmbH, Fuggerstrasse 11, D-86150 Augsburg, * Germany 2019
* *
* This file is licensed under the Embedded Projects General Public License *Version 3.1. * This file is licensed under the Embedded Projects General Public License *Version 3.1.
* *
* You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis * You should have received a copy of this license from your vendor and/or *along with this file; If not, please visit www.wawision.de/Lizenzhinweis
* to obtain the text of the corresponding license version. * to obtain the text of the corresponding license version.
* *
**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE **** **** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
*/ */
?> ?>
<?php <?php
class WidgetGenlieferschein class WidgetGenlieferschein
{ {
private $app; //application object private $app; //application object
public $form; //store form object public $form; //store form object
protected $parsetarget; //target for content protected $parsetarget; //target for content
public function __construct($app,$parsetarget) public function __construct($app,$parsetarget)
{ {
$this->app = $app; $this->app = $app;
$this->parsetarget = $parsetarget; $this->parsetarget = $parsetarget;
$this->Form(); $this->Form();
} }
public function lieferscheinDelete() public function lieferscheinDelete()
{ {
$this->form->Execute("lieferschein","delete"); $this->form->Execute("lieferschein","delete");
$this->lieferscheinList(); $this->lieferscheinList();
} }
function Edit() function Edit()
{ {
$this->form->Edit(); $this->form->Edit();
} }
function Copy() function Copy()
{ {
$this->form->Copy(); $this->form->Copy();
} }
public function Create() public function Create()
{ {
$this->form->Create(); $this->form->Create();
} }
public function Search() public function Search()
{ {
$this->app->Tpl->Set($this->parsetarget,"SUUUCHEEE"); $this->app->Tpl->Set($this->parsetarget,"SUUUCHEEE");
} }
public function Summary() public function Summary()
{ {
$this->app->Tpl->Set($this->parsetarget,"grosse Tabelle"); $this->app->Tpl->Set($this->parsetarget,"grosse Tabelle");
} }
function Form() function Form()
{ {
$this->form = $this->app->FormHandler->CreateNew("lieferschein"); $this->form = $this->app->FormHandler->CreateNew("lieferschein");
$this->form->UseTable("lieferschein"); $this->form->UseTable("lieferschein");
$this->form->UseTemplate("lieferschein.tpl",$this->parsetarget); $this->form->UseTemplate("lieferschein.tpl",$this->parsetarget);
$field = new HTMLInput("lieferid","hidden","","","","","","","","","","0","",""); $field = new HTMLInput("lieferid","hidden","","","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("ansprechpartnerid","hidden","","","","","","","","","","0","",""); $field = new HTMLInput("ansprechpartnerid","hidden","","","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("adresse","text","","20","","","","","","","","0","",""); $field = new HTMLInput("adresse","text","","20","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("lieferant","text","","20","","","","","","","","0","",""); $field = new HTMLInput("lieferant","text","","20","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("lieferantenretoure","","","1","0","0"); $field = new HTMLCheckbox("lieferantenretoure","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("projekt","text","","30","","","","","","","","0","",""); $field = new HTMLInput("projekt","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("auftragid","text","","30","","","","","","","","0","",""); $field = new HTMLInput("auftragid","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("ihrebestellnummer","text","","30","","","","","","","","0","",""); $field = new HTMLInput("ihrebestellnummer","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("internebezeichnung","text","","30","","","","","","","","0","",""); $field = new HTMLInput("internebezeichnung","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("datum","text","","","","","","","","","","0","",""); $field = new HTMLInput("datum","text","","","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("standardlager","text","","30","","","","","","","","0","",""); $field = new HTMLInput("standardlager","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("kommissionskonsignationslager","text","","30","","","","","","","","0","",""); $field = new HTMLInput("kommissionskonsignationslager","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("schreibschutz","","","1","0","0"); $field = new HTMLCheckbox("schreibschutz","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("abweichendebezeichnung","","","1","0","0"); $field = new HTMLCheckbox("abweichendebezeichnung","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLSelect("typ",0,"typ","","","0"); $field = new HTMLSelect("typ",0,"typ","","","0");
$field->AddOption('Firma','firma'); $field->AddOption('Firma','firma');
$field->AddOption('Herr','herr'); $field->AddOption('Herr','herr');
$field->AddOption('Frau','frau'); $field->AddOption('Frau','frau');
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("name","text","","30","","","","","","","","0","",""); $field = new HTMLInput("name","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$this->form->AddMandatory("name","notempty","Pflichfeld!","MSGNAME"); $this->form->AddMandatory("name","notempty","Pflichfeld!","MSGNAME");
$field = new HTMLInput("titel","text","","30","","","","","","","","0","",""); $field = new HTMLInput("titel","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("ansprechpartner","text","","30","","","","","","","","0","",""); $field = new HTMLInput("ansprechpartner","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("abteilung","text","","30","","","","","","","","0","",""); $field = new HTMLInput("abteilung","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("unterabteilung","text","","30","","","","","","","","0","",""); $field = new HTMLInput("unterabteilung","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("adresszusatz","text","","30","","","","","","","","0","",""); $field = new HTMLInput("adresszusatz","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("strasse","text","","30","","","","","","","","0","",""); $field = new HTMLInput("strasse","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("plz","text","","5","","","","","","","","0","",""); $field = new HTMLInput("plz","text","","5","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("ort","text","","19","","","","","","","","0","",""); $field = new HTMLInput("ort","text","","19","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("telefon","text","","30","","","","","","","","0","",""); $field = new HTMLInput("telefon","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("telefax","text","","30","","","","","","","","0","",""); $field = new HTMLInput("telefax","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("email","text","","30","","","","","","","","0","",""); $field = new HTMLInput("email","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("anschreiben","text","","30","","","","","","","","0","",""); $field = new HTMLInput("anschreiben","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLTextarea("freitext",5,110,"","","","","0"); $field = new HTMLTextarea("freitext",5,110,"","","","","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLTextarea("bodyzusatz",5,110,"","","","","0"); $field = new HTMLTextarea("bodyzusatz",5,110,"","","","","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLSelect("versandart",0,"versandart","","","0"); $field = new HTMLSelect("versandart",0,"versandart","","","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("lieferbedingung","text","","30","","","","","","","","0","",""); $field = new HTMLInput("lieferbedingung","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("vertrieb","text","","30","","","","","","","","0","",""); $field = new HTMLInput("vertrieb","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("bearbeiter","text","","30","","","","","","","","0","",""); $field = new HTMLInput("bearbeiter","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("keinerechnung","","","1","0","0"); $field = new HTMLCheckbox("keinerechnung","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("ohne_briefpapier","","","1","0","0"); $field = new HTMLCheckbox("ohne_briefpapier","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLCheckbox("ohne_artikeltext","","","1","0","0"); $field = new HTMLCheckbox("ohne_artikeltext","","","1","0","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("gln","text","","30","","","","","","","","0","",""); $field = new HTMLInput("gln","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLTextarea("internebemerkung",2,110,"","","","","0"); $field = new HTMLTextarea("internebemerkung",2,110,"","","","","0");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("ustid","text","","30","","","","","","","","0","",""); $field = new HTMLInput("ustid","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLSelect("ust_befreit",0,"ust_befreit","","","0"); $field = new HTMLSelect("ust_befreit",0,"ust_befreit","","","0");
$field->AddOption('Inland','0'); $field->AddOption('Inland','0');
$field->AddOption('EU-Lieferung','1'); $field->AddOption('EU-Lieferung','1');
$field->AddOption('Export','2'); $field->AddOption('Export','2');
$field->AddOption('Steuerfrei Inland','3'); $field->AddOption('Steuerfrei Inland','3');
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("sprache","text","","30","","","","","","","","0","",""); $field = new HTMLInput("sprache","text","","30","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
$field = new HTMLInput("kostenstelle","text","","15","","","","","","","","0","",""); $field = new HTMLInput("kostenstelle","text","","15","","","","","","","","0","","");
$this->form->NewField($field); $this->form->NewField($field);
} }
} }
?> ?>

1
www/widgets/templates/_gen/lieferschein.tpl
View File

@ -75,6 +75,7 @@ $(document).ready(function(){
<tr><td>{|Ihre Bestellnummer|}:</td><td>[IHREBESTELLNUMMER][MSGIHREBESTELLNUMMER]</td></tr> <tr><td>{|Ihre Bestellnummer|}:</td><td>[IHREBESTELLNUMMER][MSGIHREBESTELLNUMMER]</td></tr>
<tr><td>{|Interne Bezeichnung|}:</td><td>[INTERNEBEZEICHNUNG][MSGINTERNEBEZEICHNUNG]</td></tr> <tr><td>{|Interne Bezeichnung|}:</td><td>[INTERNEBEZEICHNUNG][MSGINTERNEBEZEICHNUNG]</td></tr>
<tr><td>{|Datum|}:</td><td>[DATUM][MSGDATUM]</td></tr> <tr><td>{|Datum|}:</td><td>[DATUM][MSGDATUM]</td></tr>
<tr><td>{|Standardlagerplatz|}:</td><td>[STANDARDLAGER][MSGSTANDARDLAGER]</td></tr>
<tr><td>[VORWUNSCHLAGER]Bevorzugtes Lager:[NACHWUNSCHLAGER]<br></td><td>[VORWUNSCHLAGER][STANDARDLAGER][MSGSTANDARDLAGER][NACHWUNSCHLAGER]</td></tr> <tr><td>[VORWUNSCHLAGER]Bevorzugtes Lager:[NACHWUNSCHLAGER]<br></td><td>[VORWUNSCHLAGER][STANDARDLAGER][MSGSTANDARDLAGER][NACHWUNSCHLAGER]</td></tr>
[VORKOMMISSIONSKONSIGNATIONSLAGER]<tr><td>[KOMMISSIONIERLAGER]:<br></td><td>[KOMMISSIONSKONSIGNATIONSLAGER][MSGKOMMISSIONSKONSIGNATIONSLAGER]</td></tr>[NACHKOMMISSIONSKONSIGNATIONSLAGER] [VORKOMMISSIONSKONSIGNATIONSLAGER]<tr><td>[KOMMISSIONIERLAGER]:<br></td><td>[KOMMISSIONSKONSIGNATIONSLAGER][MSGKOMMISSIONSKONSIGNATIONSLAGER]</td></tr>[NACHKOMMISSIONSKONSIGNATIONSLAGER]
<tr><td>Schreibschutz:</td><td>[SCHREIBSCHUTZ][MSGSCHREIBSCHUTZ]&nbsp;</td></tr> <tr><td>Schreibschutz:</td><td>[SCHREIBSCHUTZ][MSGSCHREIBSCHUTZ]&nbsp;</td></tr>

6
www/widgets/widget.lieferschein.php
View File

@ -15,6 +15,7 @@ class WidgetLieferschein extends WidgetGenlieferschein
function ExtendsForm() function ExtendsForm()
{ {
$id = $this->app->Secure->GetGET("id"); $id = $this->app->Secure->GetGET("id");
if($this->app->Secure->GetPOST("speichern")!="") if($this->app->Secure->GetPOST("speichern")!="")
{ {
$deliveryNote = $this->app->DB->SelectRow("SELECT `projekt`, `schreibschutz` FROM `lieferschein` WHERE `id` = {$id}"); $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") if($this->app->Secure->GetGET("action")=="edit")
{ {
$this->app->Tpl->Add('FURTHERTABS','<li><a href="index.php?module=lieferschein&action=minidetail&id=[ID]&frame=true#tabs-4">Protokoll</a></li>'); $this->app->Tpl->Add('FURTHERTABS','<li><a href="index.php?module=lieferschein&action=minidetail&id=[ID]&frame=true#tabs-4">Protokoll</a></li>');
@ -49,7 +51,7 @@ class WidgetLieferschein extends WidgetGenlieferschein
$this->app->YUI->AutoComplete("projekt","projektname",1); $this->app->YUI->AutoComplete("projekt","projektname",1);
$this->app->YUI->AutoComplete("auftragid","auftrag",1); $this->app->YUI->AutoComplete("auftragid","auftrag",1);
$this->app->YUI->AutoComplete("aktion","aktionscode",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"); $this->app->YUI->AutoComplete("lieferbedingung","lieferbedingungen");
@ -62,7 +64,7 @@ class WidgetLieferschein extends WidgetGenlieferschein
$this->form->ReplaceFunction("adresse",$this,"ReplaceKunde"); $this->form->ReplaceFunction("adresse",$this,"ReplaceKunde");
$this->form->ReplaceFunction("lieferant",$this,"ReplaceLieferant"); $this->form->ReplaceFunction("lieferant",$this,"ReplaceLieferant");
$this->form->ReplaceFunction("auftragid",$this,"ReplaceAuftrag"); $this->form->ReplaceFunction("auftragid",$this,"ReplaceAuftrag");
$this->form->ReplaceFunction("standardlager",$this,"ReplaceLager"); $this->form->ReplaceFunction("standardlager",$this,"ReplaceLagerPlatz");
if($this->app->erp->ModulVorhanden('kommissionskonsignationslager')) if($this->app->erp->ModulVorhanden('kommissionskonsignationslager'))
{ {