s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into tmp2711221817

Browse Source
This commit is contained in:
OpenXE 2024-07-28 13:45:03 +02:00
commit 5dbfe742b1
6 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/pages/content/produktion_edit.tpl
View File

@ -192,7 +192,7 @@
</tr>
<tr [AKTION_PRODUZIEREN_VISIBLE]>
<td>{|Ziellager|}:</td>
<td><input type="text" name="ziellager" id="ziellager" value="[ZIELLAGER]" size="20"></td>
<td><input type="text" name="ziellager" id="ziellager" value="[ZIELLAGER]" placeholder="Standardlager" class="placeholder_warning" size="20"></td>
</tr>
</table>
</fieldset>

2
www/pages/content/wareneingang_paketinhalt.tpl
View File

@ -164,7 +164,7 @@
</tr>
<tr [BUCHENHIDDEN]>
<td>
<input type=text name="ziellager" id="ziellager" value="[LAGER]" style="width:98%;">
<input type=text name="ziellager" id="ziellager" value="[LAGER]" placeholder="Standardlager" class="placeholder_warning" style="width:98%;">
</td>
</tr>
<tr [ABSCHLIESSENHIDDEN]>

2
www/pages/verbindlichkeit.php
View File

@ -250,7 +250,7 @@ class Verbindlichkeit {
);
$preise = array (
'<input type="number" name="preise[]" step="0.00001" value="',
'<input type="number" name="preise[]" step="0.0000000001" value="',
['sql' => "TRIM(COALESCE(bp.preis,0))+0"],
'" min="0"',
'/>'

14
www/pages/wareneingang.php
View File

@ -1251,7 +1251,6 @@ class Wareneingang {
['sql' => 'artikel.nummer'],
'</a>',
);
$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&uuml;');
$heading = array('', 'Paket-Nr.', 'Datum', 'Status', 'Name', 'Kunde', 'Lieferant', 'Bestellung', 'LS-Nr.', 'RE-Nr.','Verbindlichkeit', 'Bearbeiter', 'Bemerkung', 'Men&uuml;');
$width = array('1%', '5%', '10%', '10%', '10%', '10%', '10%', '10%', '10%', '10%', '10%'); // Fill out manually later
$drop = "'<img src=./themes/new/images/details_open.png class=details>' 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";

10
www/themes/new/css/styles.css
View File

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

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

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