Skip to content

Commit

Permalink
Erzeugnis fertigen: Auswahlmaske: eigene Tabellen für eindeutige und …
Browse files Browse the repository at this point in the history 
…nicht …

… eindeutige Bestandteile.
  • Loading branch information
@bblessmann
bblessmann committed Feb 19, 2024
1 parent 33ebb41 commit 7ec3a4d
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 26 deletions.
3 changes: 2 additions & 1 deletion locale/de/all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3720,7 +3720,6 @@ $ ./scripts/installation_check.pl',
'Sold order items' => 'Verkaufte Auftragsartikel',
'Soldtotal does not make sense without any bsooqr options' => 'Option "Menge in gewählten Belegen" ohne gewählte Belege wird ignoriert.',
'Solution' => 'Lösung',
'Some of the following assembly items are ambigious. Please check the selection.' => 'Einige der folgenden Erzeugnisbestandteile sind nicht eindeutig. Bitte überprüfen Sie die Auswahl.',
'Sorry, I am too stupid to figure out the default warehouse/bin and the sold qty. I drop the default warehouse/bin option.' => 'Entschuldigung, ich bin nicht in der Lage Standard-Lager und die Menge in gewählten Belegen gleichzeitig anzuzeigen. Ich lass die Standard-Lager weg.',
'Sort' => 'Sortieren',
'Sort By' => 'Sortiert nach',
Expand Down Expand Up @@ -4088,6 +4087,8 @@ $ ./scripts/installation_check.pl',
'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' => 'Der erste Grund war ein Fehler in kivitendo, der dazu führte, dass bei einer Transaktion, bei der zwei Buchungen mit unterschiedlichen Steuerschlüsseln auf dasselbe Konto durchgeführt wurden, die falschen Steuerschlüssel gespeichert wurden.',
'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
'The following Shop Orders: ' => 'Die folgenden Shop-Aufträge: ',
'The following assembly items are ambigious. Please check the selection.' => 'Die folgenden Erzeugnisbestandteile sind nicht eindeutig. Bitte überprüfen Sie die Auswahl.',
'The following assembly items are unambigious and will be used for production.' => 'Die folgenden Erzeugnisbestandteile sind eindeutig und werden für die Fertigung verwendet.',
'The following currencies have been used, but they are not defined:' => 'Die folgenden Währungen wurden benutzt, sind aber nicht ordnungsgemäß in der Datenbank eingetragen:',
'The following delivery orders could not be processed because they are already closed: #1' => 'Die folgenden Lieferscheine konnten nicht verarbeitet werden, da sie bereits geschlossen sind: #1',
'The following drafts have been saved and can be loaded.' => 'Die folgenden Entwürfe wurden gespeichert und können geladen werden.',
Expand Down
3 changes: 2 additions & 1 deletion locale/en/all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3719,7 +3719,6 @@ $self->{texts} = {
'Sold order items' => '',
'Soldtotal does not make sense without any bsooqr options' => '',
'Solution' => '',
'Some of the following assembly items are ambigious. Please check the selection.' => '',
'Sorry, I am too stupid to figure out the default warehouse/bin and the sold qty. I drop the default warehouse/bin option.' => '',
'Sort' => '',
'Sort By' => '',
Expand Down Expand Up @@ -4086,6 +4085,8 @@ $self->{texts} = {
'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' => '',
'The follow-up date is missing.' => '',
'The following Shop Orders: ' => '',
'The following assembly items are ambigious. Please check the selection.' => '',
'The following assembly items are unambigious and will be used for production.' => '',
'The following currencies have been used, but they are not defined:' => '',
'The following delivery orders could not be processed because they are already closed: #1' => '',
'The following drafts have been saved and can be loaded.' => '',
Expand Down
70 changes: 58 additions & 12 deletions templates/design40_webpages/wh/create_assembly_chargenumbers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ <h1>[% HTML.escape(title) %]</h1>

[%- INCLUDE 'common/flash.html' %]

<p>
[% 'Some of the following assembly items are ambigious. Please check the selection.' | $T8 %]
</p>

<form name="Form" method="post" action="wh.pl" id="form">
[%
FOREACH key = hidden_vars.keys;
Expand All @@ -20,6 +16,9 @@ <h1>[% HTML.escape(title) %]</h1>

<div class="wrapper">
<table class="tbl-list">
<caption>
[% 'The following assembly items are ambigious. Please check the selection.' | $T8 %]
</caption>
<thead>
<tr class="listheading">
<th>[% 'Partnumber' | $T8%]</th>
Expand All @@ -34,6 +33,7 @@ <h1>[% HTML.escape(title) %]</h1>
</thead>
<tbody>
[% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
[% NEXT UNLESS stocked_by_parts_id.$part_id.size > 1 %]
<tr class="listheading">
<td colspan="6">[% 'needed qty' | $T8 %]</td>
<td class="numeric">[% LxERP.format_amount(needed_by_parts_id.$part_id, -2) %]</td>
Expand All @@ -60,15 +60,60 @@ <h1>[% HTML.escape(title) %]</h1>
<td>[% part.warehouse.description | html %]</td>
<td>[% part.bin.description | html %]</td>
<td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
<td>[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, class="wi-verysmall") %]</td>
<td>[% part.part.unit | html %]</td>
</tr>
[% END %]
<tr><td colspan="8"></td></tr>
[% END %]
</tbody>
</table>
</div>

<div class="wrapper">
<table class="tbl-list">
<caption>
[% 'The following assembly items are unambigious and will be used for production.' | $T8 %]
</caption>
<thead>
<tr class="listheading">
<th>[% 'Partnumber' | $T8%]</th>
<th>[% 'Description' | $T8%]</th>
<th>[% 'Chargenumber' | $T8%]</th>
<th>[% 'Warehouse' | $T8%]</th>
<th>[% 'Bin' | $T8%]</th>
<th>[% 'Onhand' | $T8%]</th>
<th>[% 'Qty' | $T8%]</th>
<th>[% 'Unit' | $T8%]</th>
</tr>
</thead>
<tbody>
[% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
[% NEXT UNLESS stocked_by_parts_id.$part_id.size <= 1 %]
[% FOREACH part = stocked_by_parts_id.$part_id -%]
<tr class="listrow">
[% SET alloc_qty = '';
FOREACH alloc = allocated_by_parts_id.$part_id;
IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
SET alloc_qty = alloc.qty;
END;
END
-%]
<td>
[% SET readonly = 0 -%]
[% IF stocked_by_parts_id.$part_id.size == 1 -%]
[% SET readonly = 1 -%]
[% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
<span class="wi-verysmall numeric data">[% LxERP.format_amount(alloc_qty, -2) %]</span>
[% ELSE -%]
[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, class="wi-verysmall") %]
[% END -%]
[% P.hidden_tag('allocations[+].parts_id', part_id )%]
[% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
[% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
[% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
[% part.part.partnumber | html %]
</td>
<td>[% part.part.description | html %]</td>
<td>[% part.chargenumber | html %]</td>
<td>[% part.warehouse.description | html %]</td>
<td>[% part.bin.description | html %]</td>
<td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
<td class="numeric">
[% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
[% LxERP.format_amount(alloc_qty, -2) %]
</td>
<td>[% part.part.unit | html %]</td>
</tr>
Expand All @@ -78,4 +123,5 @@ <h1>[% HTML.escape(title) %]</h1>
</tbody>
</table>
</div>

</form>
70 changes: 58 additions & 12 deletions templates/webpages/wh/create_assembly_chargenumbers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ <h1>[% HTML.escape(title) %]</h1>

[%- INCLUDE 'common/flash.html' %]

<p>
[% 'Some of the following assembly items are ambigious. Please check the selection.' | $T8 %]
</p>

<form name="Form" method="post" action="wh.pl" id="form">
[%
FOREACH key = hidden_vars.keys;
P.hidden_tag(key, HTML.escape(hidden_vars.$key));
END
%]

<p>
[% 'The following assembly items are ambigious. Please check the selection.' | $T8 %]
</p>

<table>
<thead>
<tr class="listheading">
Expand All @@ -33,6 +33,7 @@ <h1>[% HTML.escape(title) %]</h1>
</thead>
<tbody>
[% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
[% NEXT UNLESS stocked_by_parts_id.$part_id.size > 1 %]
<tr class="listheading">
<td colspan="6">[% 'needed qty' | $T8 %]</td>
<td class="numeric">[% LxERP.format_amount(needed_by_parts_id.$part_id, -2) %]</td>
Expand All @@ -59,14 +60,7 @@ <h1>[% HTML.escape(title) %]</h1>
<td>[% part.warehouse.description | html %]</td>
<td>[% part.bin.description | html %]</td>
<td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
<td>
[% SET readonly = 0 -%]
[% IF stocked_by_parts_id.$part_id.size == 1 -%]
[% SET readonly = 1 -%]
[% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
[% END -%]
[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, size => 8, disabled => readonly) %]
</td>
<td>[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, size => 8) %]</td>
<td>[% part.part.unit | html %]</td>
</tr>
[% END %]
Expand All @@ -76,4 +70,56 @@ <h1>[% HTML.escape(title) %]</h1>
</tbody>
</table>

<p>
[% 'The following assembly items are unambigious and will be used for production.' | $T8 %]
</p>

<table>
<thead>
<tr class="listheading">
<th>[% 'Partnumber' | $T8%]</th>
<th>[% 'Description' | $T8%]</th>
<th>[% 'Chargenumber' | $T8%]</th>
<th>[% 'Warehouse' | $T8%]</th>
<th>[% 'Bin' | $T8%]</th>
<th>[% 'Onhand' | $T8%]</th>
<th>[% 'Qty' | $T8%]</th>
<th>[% 'Unit' | $T8%]</th>
</tr>
</thead>
<tbody>
[% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
[% NEXT UNLESS stocked_by_parts_id.$part_id.size <= 1 %]
[% FOREACH part = stocked_by_parts_id.$part_id -%]
<tr class="listrow">
[% SET alloc_qty = '';
FOREACH alloc = allocated_by_parts_id.$part_id;
IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
SET alloc_qty = alloc.qty;
END;
END
-%]
<td>
[% P.hidden_tag('allocations[+].parts_id', part_id )%]
[% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
[% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
[% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
[% part.part.partnumber | html %]
</td>
<td>[% part.part.description | html %]</td>
<td>[% part.chargenumber | html %]</td>
<td>[% part.warehouse.description | html %]</td>
<td>[% part.bin.description | html %]</td>
<td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
<td class="numeric">
[% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
[% LxERP.format_amount(alloc_qty, -2) %]
</td>
<td>[% part.part.unit | html %]</td>
</tr>
[% END %]
[% END %]
</tbody>
</table>

</form>

0 comments on commit 7ec3a4d

Please sign in to comment.