From 663d5a4972216c3de035ab51e4e3388a54cde252 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Wed, 24 Jul 2024 18:14:29 +0200 Subject: [PATCH 1/4] projekt eigene Nummernkreise --- www/widgets/widget.projekt.php | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/www/widgets/widget.projekt.php b/www/widgets/widget.projekt.php index 9732dcde..47863744 100644 --- a/www/widgets/widget.projekt.php +++ b/www/widgets/widget.projekt.php @@ -193,64 +193,62 @@ class WidgetProjekt extends WidgetGenProjekt $field->AddOptionsAsocSimpleArray($drucker); $this->form->NewField($field); - - $field = new HTMLInput("next_angebot","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_auftrag","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_lieferschein","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_retoure","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_rechnung","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_gutschrift","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_bestellung","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_arbeitsnachweis","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_reisekosten","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_produktion","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_anfrage","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_proformarechnung","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_verbindlichkeit","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_lieferantengutschrift","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_kundennummer","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_lieferantennummer","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_mitarbeiternummer","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput("next_artikelnummer","text","",40); - $field->readonly="readonly"; +// $field->readonly="readonly"; $this->form->NewField($field); $field = new HTMLInput('next_goodspostingdocument','text','',40); - $field->readonly='readonly'; +// $field->readonly="readonly"; $this->form->NewField($field); if(!$this->app->erp->ModulVorhanden('kommissionierlauf')) From 3301e1ed55cac79a6a6ae8605da9f9b85b6f879f Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Thu, 25 Jul 2024 10:46:54 +0200 Subject: [PATCH 2/4] verbindlichkeit add position with price 10 decimal places --- www/pages/verbindlichkeit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/pages/verbindlichkeit.php b/www/pages/verbindlichkeit.php index 374db9cb..45a559e0 100644 --- a/www/pages/verbindlichkeit.php +++ b/www/pages/verbindlichkeit.php @@ -250,7 +250,7 @@ class Verbindlichkeit { ); $preise = array ( - '' From 4ea174e2b8a5150a0d3af57f64e02e919b377f4b Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Thu, 25 Jul 2024 11:48:47 +0200 Subject: [PATCH 3/4] wareneingang show verbindlichkeit, added warning color class placeholder_warning --- www/pages/content/wareneingang_paketinhalt.tpl | 2 +- www/pages/wareneingang.php | 14 ++++++++++---- www/themes/new/css/styles.css | 10 ++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/www/pages/content/wareneingang_paketinhalt.tpl b/www/pages/content/wareneingang_paketinhalt.tpl index e52fab52..2a7dbce1 100644 --- a/www/pages/content/wareneingang_paketinhalt.tpl +++ b/www/pages/content/wareneingang_paketinhalt.tpl @@ -164,7 +164,7 @@ - + diff --git a/www/pages/wareneingang.php b/www/pages/wareneingang.php index dc2f034a..17153829 100644 --- a/www/pages/wareneingang.php +++ b/www/pages/wareneingang.php @@ -1251,7 +1251,6 @@ class Wareneingang { ['sql' => 'artikel.nummer'], '', ); - $sql = "SELECT SQL_CALC_FOUND_ROWS p.pos, @@ -1322,7 +1321,7 @@ class Wareneingang { break; case "paketannahme_list": $allowed['paketannahme_list'] = array('list'); - $heading = array('', 'Paket-Nr.', 'Datum', 'Status', 'Name', 'Kunde', 'Lieferant', 'Bestellung', 'LS-Nr.', 'RE-Nr.', 'Bearbeiter', 'Bemerkung', 'Menü'); + $heading = array('', 'Paket-Nr.', 'Datum', 'Status', 'Name', 'Kunde', 'Lieferant', 'Bestellung', 'LS-Nr.', 'RE-Nr.','Verbindlichkeit', 'Bearbeiter', 'Bemerkung', 'Menü'); $width = array('1%', '5%', '10%', '10%', '10%', '10%', '10%', '10%', '10%', '10%', '10%'); // Fill out manually later $drop = "'' AS `open`"; @@ -1338,6 +1337,7 @@ class Wareneingang { 'bestellung.belegnr', 'paketannahme.lsnr', 'paketannahme.renr', + 'verbindlichkeit.belegnr', 'paketannahme.bearbeiter', 'paketannahme.datum', 'paketannahme.bemerkung', @@ -1352,6 +1352,7 @@ class Wareneingang { 'bestellung.belegnr', 'paketannahme.lsnr', 'paketannahme.renr', + 'verbindlichkeit.belegnr', 'paketannahme.bearbeiter', 'paketannahme.bemerkung'); @@ -1371,7 +1372,8 @@ class Wareneingang { adresse.lieferantennummer, GROUP_CONCAT(DISTINCT bestellung.belegnr), paketannahme.lsnr, - paketannahme.renr, + paketannahme.renr, + GROUP_CONCAT(DISTINCT verbindlichkeit.belegnr), paketannahme.bearbeiter, paketannahme.bemerkung, paketannahme.id @@ -1383,7 +1385,11 @@ class Wareneingang { LEFT JOIN bestellung_position ON paketdistribution.bestellung_position = bestellung_position.id LEFT JOIN bestellung - ON bestellung.id = bestellung_position.bestellung"; + ON bestellung.id = bestellung_position.bestellung + LEFT JOIN verbindlichkeit_position + ON verbindlichkeit_position.paketdistribution = paketdistribution.id + LEFT JOIN verbindlichkeit ON verbindlichkeit.id = verbindlichkeit_position.verbindlichkeit + "; $where = "1"; diff --git a/www/themes/new/css/styles.css b/www/themes/new/css/styles.css index 0f5709b5..b2c77376 100644 --- a/www/themes/new/css/styles.css +++ b/www/themes/new/css/styles.css @@ -1809,10 +1809,11 @@ a.startpage { ::-ms-input-placeholder { /* Microsoft Edge */ color: #BBB; } -::placeholder { /* Modern Browser */ - color: #BBB; +:placeholder { /* Modern Browser */ + color: #F00; opacity: 1; /* Firefox */ } + input.ui-autocomplete-input::-webkit-input-placeholder { color: #999; opacity: 1; @@ -4875,3 +4876,8 @@ tilegrid padding: 0; margin: 0; } + +input:placeholder-shown.placeholder_warning { + background-color: var(--warning); +} + From d5120a924675dfc76031971619d5c4e96133e47f Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Thu, 25 Jul 2024 12:31:29 +0200 Subject: [PATCH 4/4] produktion ziellager placeholder_warning --- www/pages/content/produktion_edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/pages/content/produktion_edit.tpl b/www/pages/content/produktion_edit.tpl index 15f3254d..c4032fa8 100644 --- a/www/pages/content/produktion_edit.tpl +++ b/www/pages/content/produktion_edit.tpl @@ -192,7 +192,7 @@ {|Ziellager|}: - +