Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 74c7135d

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 74c7135dd76391b581476daffe240f2829493744
  • Vorgänger e73b17d6
  • Nachfolger 4a9b86a5

------------------------------------------------------------------------
r7132 | mbunkus | 2008-06-20 10:12:27 +0200 (Fri, 20 Jun 2008) | 1 line

Lieferscheine: Die Entscheidung, ob ein Lieferschein bearbeitet werden darf, wird vom Flag "delivered" abhängig gemacht, nicht von "closed".
------------------------------------------------------------------------

Unterschiede anzeigen:

bin/mozilla/do.pl
$form->{saveasnew} = 1;
$form->{closed} = 0;
$form->{delivered} = 0;
map { delete $form->{$_} } qw(printed emailed queued);
# Let Lx-Office assign a new order number if the user hasn't changed the
......
$form->get_lists('warehouses' => { 'key' => 'WAREHOUSES',
'bins' => 'BINS' });
redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed});
redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered});
get_basic_bin_wh_info($stock_info);
......
my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
if (!$form->{closed}) {
if (!$form->{delivered}) {
foreach my $row (@contents) {
$row->{available_qty} = $form->format_amount_units('amount' => $row->{qty} * 1,
'part_unit' => $part_info->{unit},
......
$form->header();
print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data,
'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents,
'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
'PART_INFO' => $part_info, });
$lxdebug->leave_sub();
......
$lxdebug->leave_sub();
}
sub transfer_in_and_close {
sub transfer_in {
$lxdebug->enter_sub();
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
......
}
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
update();
$lxdebug->leave_sub();
......
DO->transfer_in_out('direction' => 'in',
'requests' => \@all_requests);
$form->{closed} = 1;
$form->{delivered} = 1;
save();
......
$lxdebug->leave_sub();
}
sub transfer_out_and_close {
sub transfer_out {
$lxdebug->enter_sub();
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
......
}
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
update();
$lxdebug->leave_sub();
......
DO->transfer_in_out('direction' => 'out',
'requests' => \@all_requests);
$form->{closed} = 1;
$form->{delivered} = 1;
save();
js/stock_in_out.js
function open_stock_in_out_window(in_out, row) {
var width = 980;
var height = 600;
var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
var width = 980;
var height = 600;
var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
var parts_id = document.getElementsByName("id_" + row)[0].value;
var stock = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
var do_qty = document.getElementsByName("qty_" + row)[0].value;
var do_unit = document.getElementsByName("unit_" + row)[0].value;
var closed = document.getElementsByName("closed")[0].value;
var parts_id = document.getElementsByName("id_" + row)[0].value;
var stock = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
var do_qty = document.getElementsByName("qty_" + row)[0].value;
var do_unit = document.getElementsByName("unit_" + row)[0].value;
var closed = document.getElementsByName("closed")[0].value;
var delivered = document.getElementsByName("delivered")[0].value;
url = "do.pl?" +
"action=stock_in_out_form&" +
"in_out=" + escape_more(in_out) + "&" +
"row=" + escape_more(row) + "&" +
"parts_id=" + escape_more(parts_id) + "&" +
"do_qty=" + escape_more(do_qty) + "&" +
"do_unit=" + escape_more(do_unit) + "&" +
"stock=" + escape_more(stock) + "&" +
"closed=" + escape_more(closed) + "&" +
"in_out=" + escape_more(in_out) + "&" +
"row=" + escape_more(row) + "&" +
"parts_id=" + escape_more(parts_id) + "&" +
"do_qty=" + escape_more(do_qty) + "&" +
"do_unit=" + escape_more(do_unit) + "&" +
"stock=" + escape_more(stock) + "&" +
"closed=" + escape_more(closed) + "&" +
"delivered=" + escape_more(delivered) + "&" +
"";
//alert(url);
window.open(url, "_new_generic", parm);
locale/de/all
'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
'The dataset name is missing.' => 'Der Datenbankname fehlt.',
'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes hängt vom Variablentypen ab:',
'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht ver?ndert.',
'The description is missing.' => 'Die Beschreibung fehlt.',
'The description is shown on the form. Chose something short and descriptive.' => 'Die Beschreibung wird in der jeweiligen Maske angezeigt. Sie sollte kurz und prägnant sein.',
'The directory "%s" could not be created:\n%s' => 'Das Verzeichnis "%s" konnte nicht erstellt werden:\n%s',
......
'Transfer Quantity' => 'Umlagermenge',
'Transfer To Stock' => 'Lagereingang',
'Transfer from warehouse' => 'Quelllager',
'Transfer in and close' => 'Einlagern und abschlie?en',
'Transfer out and close' => 'Auslagern und abschlie?en',
'Transfer in' => 'Einlagern',
'Transfer out' => 'Auslagern',
'Transfer qty' => 'Umlagermenge',
'Translation (%s)' => 'Übersetzung (%s)',
'Trial Balance' => 'Summen- u. Saldenliste',
......
'no' => 'nein',
'no chargenumber' => 'keine Chargennummer',
'none (pricegroup)' => 'keine',
'not transferred in yet' => 'noch nicht eingelagert',
'not transferred out yet' => 'noch nicht ausgelagert',
'number' => 'Nummer',
'order' => 'Reihenfolge',
'packing_list' => 'Versandliste',
......
'to (date)' => 'bis',
'to (time)' => 'bis',
'transfer' => 'Umlagerung',
'transferred in' => 'eingelagert',
'transferred out' => 'ausgelagert',
'trial_balance' => 'susa',
'up' => 'hoch',
'use program settings' => 'benutze Programmeinstellungen',
locale/de/do
'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht ver?ndert.',
'The list has been printed.' => 'Die Liste wurde ausgedruckt.',
'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
'To (email)' => 'An',
......
'stock_in_form' => 'stock_in_form',
'stock_in_out_form' => 'stock_in_out_form',
'stock_out_form' => 'stock_out_form',
'transfer_in_and_close' => 'transfer_in_and_close',
'transfer_out_and_close' => 'transfer_out_and_close',
'transfer_in' => 'transfer_in',
'transfer_out' => 'transfer_out',
'update' => 'update',
'update_delivery_order' => 'update_delivery_order',
'update_stock_in' => 'update_stock_in',
......
'speichern' => 'save',
'als_neu_speichern' => 'save_as_new',
'lieferadresse' => 'ship_to',
'einlagern_und_abschlie?en' => 'transfer_in_and_close',
'auslagern_und_abschlie?en' => 'transfer_out_and_close',
'einlagern' => 'transfer_in',
'auslagern' => 'transfer_out',
'erneuern' => 'update',
'ja' => 'yes',
};
locale/de/login
'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht ver?ndert.',
'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
'The list has been printed.' => 'Die Liste wurde ausgedruckt.',
'The session is invalid or has expired.' => 'Die Session ist ungültig oder abgelaufen.',
......
'stock_out_form' => 'stock_out_form',
'todo_list_follow_ups' => 'todo_list_follow_ups',
'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
'transfer_in_and_close' => 'transfer_in_and_close',
'transfer_out_and_close' => 'transfer_out_and_close',
'transfer_in' => 'transfer_in',
'transfer_out' => 'transfer_out',
'update' => 'update',
'update_delivery_order' => 'update_delivery_order',
'update_stock_in' => 'update_stock_in',
......
'speichern_und_schlie?en' => 'save_and_close',
'als_neu_speichern' => 'save_as_new',
'lieferadresse' => 'ship_to',
'einlagern_und_abschlie?en' => 'transfer_in_and_close',
'auslagern_und_abschlie?en' => 'transfer_out_and_close',
'einlagern' => 'transfer_in',
'auslagern' => 'transfer_out',
'erneuern' => 'update',
'ja' => 'yes',
};
locale/de/oe
'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht ver?ndert.',
'The list has been printed.' => 'Die Liste wurde ausgedruckt.',
'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
'To (email)' => 'An',
......
'stock_in_form' => 'stock_in_form',
'stock_in_out_form' => 'stock_in_out_form',
'stock_out_form' => 'stock_out_form',
'transfer_in_and_close' => 'transfer_in_and_close',
'transfer_out_and_close' => 'transfer_out_and_close',
'transfer_in' => 'transfer_in',
'transfer_out' => 'transfer_out',
'update' => 'update',
'update_delivery_order' => 'update_delivery_order',
'update_stock_in' => 'update_stock_in',
......
'speichern_und_schlie?en' => 'save_and_close',
'als_neu_speichern' => 'save_as_new',
'lieferadresse' => 'ship_to',
'einlagern_und_abschlie?en' => 'transfer_in_and_close',
'auslagern_und_abschlie?en' => 'transfer_out_and_close',
'einlagern' => 'transfer_in',
'auslagern' => 'transfer_out',
'erneuern' => 'update',
'ja' => 'yes',
};
locale/de/todo
'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht ver?ndert.',
'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
'The list has been printed.' => 'Die Liste wurde ausgedruckt.',
'The subject is missing.' => 'Der Betreff fehlt.',
......
'stock_out_form' => 'stock_out_form',
'todo_list_follow_ups' => 'todo_list_follow_ups',
'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
'transfer_in_and_close' => 'transfer_in_and_close',
'transfer_out_and_close' => 'transfer_out_and_close',
'transfer_in' => 'transfer_in',
'transfer_out' => 'transfer_out',
'update' => 'update',
'update_delivery_order' => 'update_delivery_order',
'update_stock_in' => 'update_stock_in',
......
'speichern_und_schlie?en' => 'save_and_close',
'als_neu_speichern' => 'save_as_new',
'lieferadresse' => 'ship_to',
'einlagern_und_abschlie?en' => 'transfer_in_and_close',
'auslagern_und_abschlie?en' => 'transfer_out_and_close',
'einlagern' => 'transfer_in',
'auslagern' => 'transfer_out',
'erneuern' => 'update',
'ja' => 'yes',
};
templates/webpages/do/form_footer_de.html
<!-- <p> -->
<!-- <table> -->
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- END %]
......
<p>
Lieferschein bearbeiten<br>
<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
[%- UNLESS closed %]
[%- UNLESS delivered %]
[%- IF vc == 'customer' %]
<input class="submit" type="submit" name="action" value="Lieferadresse">
[%- END %]
[%- END %]
<input class="submit" type="submit" name="action" value="Drucken">
<input class="submit" type="submit" name="action" value="eMail">
[%- UNLESS closed %]
[%- UNLESS delivered %]
<input class="submit" type="submit" name="action" value="Speichern">
[%- IF vc == 'customer' %]
<input class="submit" type="submit" name="action" value="Auslagern und abschlie?en">
<input class="submit" type="submit" name="action" value="Auslagern">
[%- ELSE %]
<input class="submit" type="submit" name="action" value="Einlagern und abschlie?en">
<input class="submit" type="submit" name="action" value="Einlagern">
[%- END %]
[%- END %]
[%- IF id %]
......
<p>
Workflow Lieferschein<br>
<input class="submit" type="submit" name="action" value="als neu speichern">
[% UNLESS closed %]
[% UNLESS delivered %]
<input class="submit" type="submit" name="action" value="L?schen">
[% END %]
<input class="submit" type="submit" name="action" value="Rechnung">
templates/webpages/do/form_footer_master.html
<!-- <p> -->
<!-- <table> -->
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- END %]
......
<p>
<translate>Edit the Delivery Order</translate><br>
<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
[%- UNLESS closed %]
[%- UNLESS delivered %]
[%- IF vc == 'customer' %]
<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
[%- END %]
[%- END %]
<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
[%- UNLESS closed %]
[%- UNLESS delivered %]
<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
[%- IF vc == 'customer' %]
<input class="submit" type="submit" name="action" value="<translate>Transfer out and close</translate>">
<input class="submit" type="submit" name="action" value="<translate>Transfer out</translate>">
[%- ELSE %]
<input class="submit" type="submit" name="action" value="<translate>Transfer in and close</translate>">
<input class="submit" type="submit" name="action" value="<translate>Transfer in</translate>">
[%- END %]
[%- END %]
[%- IF id %]
......
<p>
<translate>Workflow Delivery Order</translate><br>
<input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
[% UNLESS closed %]
[% UNLESS delivered %]
<input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
[% END %]
<input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
templates/webpages/do/form_header_de.html
setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
[%- UNLESS closed %]
[%- UNLESS delivered %]
Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
[%- END %]
}
......
[%- SET the_oldvc = oldvendor %]
[%- SET is_customer = '0' %]
[%- END %]
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- SET DISABLED = ' disabled' %]
[%- END %]
......
<input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
<th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
<td>
[%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
[%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
<input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
[%- ELSE %]
<select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
......
<tr>
<th align="right">Ansprechpartner</th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
[%- IF cp_id == row.cp_id %]
[%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
......
<tr>
<th align="right">Lieferadresse</th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
[%- FOREACH row = ALL_SHIPTO %]
[%- IF shipto_id == row.shipto_id %]
......
<tr>
<th align="right" nowrap>Abteilung</th>
<td colspan="3">
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="department" value="[% HTML.escape(department) %]">
[%- FOREACH row = ALL_DEPARTMENTS %]
[% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
......
<td align="right">
<table>
[%- IF vc == 'customer' %]
<tr>
<td colspan="2" align="center">
<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
<label for="delivered">Geliefert</label>
[%- IF delivered %]
[%- IF is_customer %]
ausgelagert
[%- ELSE %]
eingelagert
[%- END %]
[%- ELSE %]
[%- IF is_customer %]
noch nicht ausgelagert
[%- ELSE %]
noch nicht eingelagert
[%- END %]
[%- END %]
;
[%- IF closed %]
<input type="hidden" name="delivered" value="1">
Geschlossen
[%- ELSE %]
Offen
[%- END %]
</td>
</tr>
[%- ELSE %]
<input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
[%- END %]
<tr>
<th align="right">Bearbeiter</th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
[%- FOREACH row = ALL_EMPLOYEES %]
[% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
<tr>
<th align="right">Verk?ufer/in</th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
[%- FOREACH row = ALL_SALESMEN %]
[% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
<td nowrap>
<input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
onBlur="check_right_date_format(this)"[% RO %]>
[% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
[% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
</td>
</tr>
<tr>
<th width="70%" align="right" nowrap>Projektnummer</th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
[%- FOREACH row = ALL_PROJECTS %]
[% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
templates/webpages/do/form_header_master.html
setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
[%- UNLESS closed %]
[%- UNLESS delivered %]
Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
[%- END %]
}
......
[%- SET the_oldvc = oldvendor %]
[%- SET is_customer = '0' %]
[%- END %]
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- SET DISABLED = ' disabled' %]
[%- END %]
......
<input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
<th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
<td>
[%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
[%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
<input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
[%- ELSE %]
<select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
......
<tr>
<th align="right"><translate>Contact Person</translate></th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
[%- IF cp_id == row.cp_id %]
[%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
......
<tr>
<th align="right"><translate>Shipping Address</translate></th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
[%- FOREACH row = ALL_SHIPTO %]
[%- IF shipto_id == row.shipto_id %]
......
<tr>
<th align="right" nowrap><translate>Department</translate></th>
<td colspan="3">
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="department" value="[% HTML.escape(department) %]">
[%- FOREACH row = ALL_DEPARTMENTS %]
[% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
......
<td align="right">
<table>
[%- IF vc == 'customer' %]
<tr>
<td colspan="2" align="center">
<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
<label for="delivered"><translate>Delivered</translate></label>
[%- IF delivered %]
[%- IF is_customer %]
<translate>transferred out</translate>
[%- ELSE %]
<translate>transferred in</translate>
[%- END %]
[%- ELSE %]
[%- IF is_customer %]
<translate>not transferred out yet</translate>
[%- ELSE %]
<translate>not transferred in yet</translate>
[%- END %]
[%- END %]
;
[%- IF closed %]
<input type="hidden" name="delivered" value="1">
<translate>Closed</translate>
[%- ELSE %]
<translate>Open</translate>
[%- END %]
</td>
</tr>
[%- ELSE %]
<input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
[%- END %]
<tr>
<th align="right"><translate>Employee</translate></th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
[%- FOREACH row = ALL_EMPLOYEES %]
[% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
<tr>
<th align="right"><translate>Salesman</translate></th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
[%- FOREACH row = ALL_SALESMEN %]
[% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
<td nowrap>
<input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
onBlur="check_right_date_format(this)"[% RO %]>
[% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
[% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
</td>
</tr>
<tr>
<th width="70%" align="right" nowrap><translate>Project Number</translate></th>
<td>
[%- IF closed %]
[%- IF delivered %]
<input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
[%- FOREACH row = ALL_PROJECTS %]
[% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
templates/webpages/do/stock_in_form_de.html
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
[%- UNLESS closed %]
[%- UNLESS delivered %]
<script type="text/javascript">
<!--
warehouses = new Array();
......
<tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
<td>[% loop.count %]</td>
[%- IF closed %]
[%- IF delivered %]
<td>[% HTML.escape(row.warehouse_description) %]</td>
<td>[% HTML.escape(row.bin_description) %]</td>
......
<hr size="3" noshade>
<p>
[%- IF closed %]
[%- IF delivered %]
<button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
[%- ELSE %]
<input class="submit" type="submit" name="action" value="Erneuern">
templates/webpages/do/stock_in_form_master.html
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
[%- UNLESS closed %]
[%- UNLESS delivered %]
<script type="text/javascript">
<!--
warehouses = new Array();
......
<tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
<td>[% loop.count %]</td>
[%- IF closed %]
[%- IF delivered %]
<td>[% HTML.escape(row.warehouse_description) %]</td>
<td>[% HTML.escape(row.bin_description) %]</td>
......
<hr size="3" noshade>
<p>
[%- IF closed %]
[%- IF delivered %]
<button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
[%- ELSE %]
<input class="submit" type="submit" name="action" value="<translate>Update</translate>">
templates/webpages/do/stock_out_form_de.html
[% USE HTML %][% USE LxERP %]<body>
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- END %]
......
[%- ELSE %]
<input type="hidden" name="nextsub" value="set_stock_out">
<input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
<input type="hidden" name="in_out" value="out">
<input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
<input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
<input type="hidden" name="do_qty" value="[% HTML.escape(do_qty) %]">
<input type="hidden" name="do_unit" value="[% HTML.escape(do_unit) %]">
<input type="hidden" name="row" value="[% HTML.escape(row) %]">
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
<input type="hidden" name="nextsub" value="set_stock_out">
<input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
<input type="hidden" name="in_out" value="out">
<input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
<input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
<input type="hidden" name="do_qty" value="[% HTML.escape(do_qty) %]">
<input type="hidden" name="do_unit" value="[% HTML.escape(do_unit) %]">
<input type="hidden" name="row" value="[% HTML.escape(row) %]">
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
<input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
<p>
<table>
......
<th class="listheading">Lager</th>
<th class="listheading">Lagerplatz</th>
<th class="listheading">Chargennummer</th>
[%- UNLESS closed %]
[%- UNLESS delivered %]
<th align="right" class="listheading">Lagerbestand</th>
[%- END %]
<th align="right" class="listheading">Menge</th>
......
<td>[% HTML.escape(row.bindescription) %]</td>
<td>[% HTML.escape(row.chargenumber) %]</td>
[%- IF closed %]
[%- IF delivered %]
<td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
<td>[% HTML.escape(row.stock_unit) %]</td>
......
<hr size="3" noshade>
<p>
[%- IF closed %]
[%- IF delivered %]
<button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
[%- ELSE %]
<input class="submit" type="submit" name="action" value="Weiter">
templates/webpages/do/stock_out_form_master.html
[% USE HTML %][% USE LxERP %]<body>
[%- IF closed %]
[%- IF delivered %]
[%- SET RO = ' readonly' %]
[%- END %]
......
[%- ELSE %]
<input type="hidden" name="nextsub" value="set_stock_out">
<input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
<input type="hidden" name="in_out" value="out">
<input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
<input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
<input type="hidden" name="do_qty" value="[% HTML.escape(do_qty) %]">
<input type="hidden" name="do_unit" value="[% HTML.escape(do_unit) %]">
<input type="hidden" name="row" value="[% HTML.escape(row) %]">
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
<input type="hidden" name="nextsub" value="set_stock_out">
<input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
<input type="hidden" name="in_out" value="out">
<input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
<input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
<input type="hidden" name="do_qty" value="[% HTML.escape(do_qty) %]">
<input type="hidden" name="do_unit" value="[% HTML.escape(do_unit) %]">
<input type="hidden" name="row" value="[% HTML.escape(row) %]">
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
<input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
<p>
<table>
......
<th class="listheading"><translate>Warehouse</translate></th>
<th class="listheading"><translate>Bin</translate></th>
<th class="listheading"><translate>Charge Number</translate></th>
[%- UNLESS closed %]
[%- UNLESS delivered %]
<th align="right" class="listheading"><translate>Available qty</translate></th>
[%- END %]
<th align="right" class="listheading"><translate>Qty</translate></th>
......
<td>[% HTML.escape(row.bindescription) %]</td>
<td>[% HTML.escape(row.chargenumber) %]</td>
[%- IF closed %]
[%- IF delivered %]
<td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
<td>[% HTML.escape(row.stock_unit) %]</td>
......
<hr size="3" noshade>
<p>
[%- IF closed %]
[%- IF delivered %]
<button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
[%- ELSE %]
<input class="submit" type="submit" name="action" value="<translate>Continue</translate>">

Auch abrufbar als: Unified diff