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
789 789

  
790 790
  $form->{saveasnew} = 1;
791 791
  $form->{closed}    = 0;
792
  $form->{delivered} = 0;
792 793
  map { delete $form->{$_} } qw(printed emailed queued);
793 794

  
794 795
  # Let Lx-Office assign a new order number if the user hasn't changed the
......
939 940
  $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
940 941
                                     'bins'   => 'BINS' });
941 942

  
942
  redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed});
943
  redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered});
943 944

  
944 945
  get_basic_bin_wh_info($stock_info);
945 946

  
......
986 987

  
987 988
  my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
988 989

  
989
  if (!$form->{closed}) {
990
  if (!$form->{delivered}) {
990 991
    foreach my $row (@contents) {
991 992
      $row->{available_qty} = $form->format_amount_units('amount'      => $row->{qty} * 1,
992 993
                                                         'part_unit'   => $part_info->{unit},
......
1012 1013

  
1013 1014
  $form->header();
1014 1015
  print $form->parse_html_template('do/stock_out_form', { 'UNITS'      => $units_data,
1015
                                                          'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents,
1016
                                                          'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
1016 1017
                                                          'PART_INFO'  => $part_info, });
1017 1018

  
1018 1019
  $lxdebug->leave_sub();
......
1056 1057
  $lxdebug->leave_sub();
1057 1058
}
1058 1059

  
1059
sub transfer_in_and_close {
1060
sub transfer_in {
1060 1061
  $lxdebug->enter_sub();
1061 1062

  
1062 1063
  my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
......
1093 1094
    }
1094 1095

  
1095 1096
    if (@{ $form->{ERRORS} }) {
1096
      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
1097
      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
1097 1098

  
1098 1099
      update();
1099 1100
      $lxdebug->leave_sub();
......
1105 1106
  DO->transfer_in_out('direction' => 'in',
1106 1107
                      'requests'  => \@all_requests);
1107 1108

  
1108
  $form->{closed}    = 1;
1109 1109
  $form->{delivered} = 1;
1110 1110

  
1111 1111
  save();
......
1113 1113
  $lxdebug->leave_sub();
1114 1114
}
1115 1115

  
1116
sub transfer_out_and_close {
1116
sub transfer_out {
1117 1117
  $lxdebug->enter_sub();
1118 1118

  
1119 1119
  my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
......
1186 1186
    }
1187 1187

  
1188 1188
    if (@{ $form->{ERRORS} }) {
1189
      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
1189
      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
1190 1190

  
1191 1191
      update();
1192 1192
      $lxdebug->leave_sub();
......
1198 1198
  DO->transfer_in_out('direction' => 'out',
1199 1199
                      'requests'  => \@all_requests);
1200 1200

  
1201
  $form->{closed}    = 1;
1202 1201
  $form->{delivered} = 1;
1203 1202

  
1204 1203
  save();
js/stock_in_out.js
1 1
function open_stock_in_out_window(in_out, row) {
2
  var width    = 980;
3
  var height   = 600;
4
  var parm     = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
2
  var width     = 980;
3
  var height    = 600;
4
  var parm      = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
5 5

  
6
  var parts_id = document.getElementsByName("id_" + row)[0].value;
7
  var stock    = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
8
  var do_qty   = document.getElementsByName("qty_" + row)[0].value;
9
  var do_unit  = document.getElementsByName("unit_" + row)[0].value;
10
  var closed   = document.getElementsByName("closed")[0].value;
6
  var parts_id  = document.getElementsByName("id_" + row)[0].value;
7
  var stock     = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
8
  var do_qty    = document.getElementsByName("qty_" + row)[0].value;
9
  var do_unit   = document.getElementsByName("unit_" + row)[0].value;
10
  var closed    = document.getElementsByName("closed")[0].value;
11
  var delivered = document.getElementsByName("delivered")[0].value;
11 12

  
12 13
  url = "do.pl?" +
13 14
    "action=stock_in_out_form&" +
14
    "in_out="   + escape_more(in_out)   + "&" +
15
    "row="      + escape_more(row)      + "&" +
16
    "parts_id=" + escape_more(parts_id) + "&" +
17
    "do_qty="   + escape_more(do_qty)   + "&" +
18
    "do_unit="  + escape_more(do_unit)  + "&" +
19
    "stock="    + escape_more(stock)    + "&" +
20
    "closed="   + escape_more(closed)   + "&" +
15
    "in_out="    + escape_more(in_out)    + "&" +
16
    "row="       + escape_more(row)       + "&" +
17
    "parts_id="  + escape_more(parts_id)  + "&" +
18
    "do_qty="    + escape_more(do_qty)    + "&" +
19
    "do_unit="   + escape_more(do_unit)   + "&" +
20
    "stock="     + escape_more(stock)     + "&" +
21
    "closed="    + escape_more(closed)    + "&" +
22
    "delivered=" + escape_more(delivered) + "&" +
21 23
    "";
22 24
  //alert(url);
23 25
  window.open(url, "_new_generic", parm);
locale/de/all
1382 1382
  'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
1383 1383
  'The dataset name is missing.' => 'Der Datenbankname fehlt.',
1384 1384
  'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes hängt vom Variablentypen ab:',
1385
  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
1385
  '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.',
1386 1386
  'The description is missing.' => 'Die Beschreibung fehlt.',
1387 1387
  '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.',
1388 1388
  'The directory "%s" could not be created:\n%s' => 'Das Verzeichnis "%s" konnte nicht erstellt werden:\n%s',
......
1498 1498
  'Transfer Quantity'           => 'Umlagermenge',
1499 1499
  'Transfer To Stock'           => 'Lagereingang',
1500 1500
  'Transfer from warehouse'     => 'Quelllager',
1501
  'Transfer in and close'       => 'Einlagern und abschlie?en',
1502
  'Transfer out and close'      => 'Auslagern und abschlie?en',
1501
  'Transfer in'                 => 'Einlagern',
1502
  'Transfer out'                => 'Auslagern',
1503 1503
  'Transfer qty'                => 'Umlagermenge',
1504 1504
  'Translation (%s)'            => 'Übersetzung (%s)',
1505 1505
  'Trial Balance'               => 'Summen- u. Saldenliste',
......
1698 1698
  'no'                          => 'nein',
1699 1699
  'no chargenumber'             => 'keine Chargennummer',
1700 1700
  'none (pricegroup)'           => 'keine',
1701
  'not transferred in yet'      => 'noch nicht eingelagert',
1702
  'not transferred out yet'     => 'noch nicht ausgelagert',
1701 1703
  'number'                      => 'Nummer',
1702 1704
  'order'                       => 'Reihenfolge',
1703 1705
  'packing_list'                => 'Versandliste',
......
1748 1750
  'to (date)'                   => 'bis',
1749 1751
  'to (time)'                   => 'bis',
1750 1752
  'transfer'                    => 'Umlagerung',
1753
  'transferred in'              => 'eingelagert',
1754
  'transferred out'             => 'ausgelagert',
1751 1755
  'trial_balance'               => 'susa',
1752 1756
  'up'                          => 'hoch',
1753 1757
  'use program settings'        => 'benutze Programmeinstellungen',
locale/de/do
240 240
  'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
241 241
  'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
242 242
  'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
243
  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
243
  '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.',
244 244
  'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
245 245
  '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.',
246 246
  'To (email)'                  => 'An',
......
381 381
  'stock_in_form'               => 'stock_in_form',
382 382
  'stock_in_out_form'           => 'stock_in_out_form',
383 383
  'stock_out_form'              => 'stock_out_form',
384
  'transfer_in_and_close'       => 'transfer_in_and_close',
385
  'transfer_out_and_close'      => 'transfer_out_and_close',
384
  'transfer_in'                 => 'transfer_in',
385
  'transfer_out'                => 'transfer_out',
386 386
  'update'                      => 'update',
387 387
  'update_delivery_order'       => 'update_delivery_order',
388 388
  'update_stock_in'             => 'update_stock_in',
......
400 400
  'speichern'                   => 'save',
401 401
  'als_neu_speichern'           => 'save_as_new',
402 402
  'lieferadresse'               => 'ship_to',
403
  'einlagern_und_abschlie?en'   => 'transfer_in_and_close',
404
  'auslagern_und_abschlie?en'   => 'transfer_out_and_close',
403
  'einlagern'                   => 'transfer_in',
404
  'auslagern'                   => 'transfer_out',
405 405
  'erneuern'                    => 'update',
406 406
  'ja'                          => 'yes',
407 407
};
locale/de/login
304 304
  'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
305 305
  'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
306 306
  'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
307
  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
307
  '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.',
308 308
  'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
309 309
  'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
310 310
  'The session is invalid or has expired.' => 'Die Session ist ungültig oder abgelaufen.',
......
498 498
  'stock_out_form'              => 'stock_out_form',
499 499
  'todo_list_follow_ups'        => 'todo_list_follow_ups',
500 500
  'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
501
  'transfer_in_and_close'       => 'transfer_in_and_close',
502
  'transfer_out_and_close'      => 'transfer_out_and_close',
501
  'transfer_in'                 => 'transfer_in',
502
  'transfer_out'                => 'transfer_out',
503 503
  'update'                      => 'update',
504 504
  'update_delivery_order'       => 'update_delivery_order',
505 505
  'update_stock_in'             => 'update_stock_in',
......
527 527
  'speichern_und_schlie?en'     => 'save_and_close',
528 528
  'als_neu_speichern'           => 'save_as_new',
529 529
  'lieferadresse'               => 'ship_to',
530
  'einlagern_und_abschlie?en'   => 'transfer_in_and_close',
531
  'auslagern_und_abschlie?en'   => 'transfer_out_and_close',
530
  'einlagern'                   => 'transfer_in',
531
  'auslagern'                   => 'transfer_out',
532 532
  'erneuern'                    => 'update',
533 533
  'ja'                          => 'yes',
534 534
};
locale/de/oe
279 279
  'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
280 280
  'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
281 281
  'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
282
  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
282
  '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.',
283 283
  'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
284 284
  '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.',
285 285
  'To (email)'                  => 'An',
......
449 449
  'stock_in_form'               => 'stock_in_form',
450 450
  'stock_in_out_form'           => 'stock_in_out_form',
451 451
  'stock_out_form'              => 'stock_out_form',
452
  'transfer_in_and_close'       => 'transfer_in_and_close',
453
  'transfer_out_and_close'      => 'transfer_out_and_close',
452
  'transfer_in'                 => 'transfer_in',
453
  'transfer_out'                => 'transfer_out',
454 454
  'update'                      => 'update',
455 455
  'update_delivery_order'       => 'update_delivery_order',
456 456
  'update_stock_in'             => 'update_stock_in',
......
475 475
  'speichern_und_schlie?en'     => 'save_and_close',
476 476
  'als_neu_speichern'           => 'save_as_new',
477 477
  'lieferadresse'               => 'ship_to',
478
  'einlagern_und_abschlie?en'   => 'transfer_in_and_close',
479
  'auslagern_und_abschlie?en'   => 'transfer_out_and_close',
478
  'einlagern'                   => 'transfer_in',
479
  'auslagern'                   => 'transfer_out',
480 480
  'erneuern'                    => 'update',
481 481
  'ja'                          => 'yes',
482 482
};
locale/de/todo
301 301
  'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
302 302
  'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
303 303
  'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
304
  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
304
  '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.',
305 305
  'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
306 306
  'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
307 307
  'The subject is missing.'     => 'Der Betreff fehlt.',
......
486 486
  'stock_out_form'              => 'stock_out_form',
487 487
  'todo_list_follow_ups'        => 'todo_list_follow_ups',
488 488
  'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
489
  'transfer_in_and_close'       => 'transfer_in_and_close',
490
  'transfer_out_and_close'      => 'transfer_out_and_close',
489
  'transfer_in'                 => 'transfer_in',
490
  'transfer_out'                => 'transfer_out',
491 491
  'update'                      => 'update',
492 492
  'update_delivery_order'       => 'update_delivery_order',
493 493
  'update_stock_in'             => 'update_stock_in',
......
514 514
  'speichern_und_schlie?en'     => 'save_and_close',
515 515
  'als_neu_speichern'           => 'save_as_new',
516 516
  'lieferadresse'               => 'ship_to',
517
  'einlagern_und_abschlie?en'   => 'transfer_in_and_close',
518
  'auslagern_und_abschlie?en'   => 'transfer_out_and_close',
517
  'einlagern'                   => 'transfer_in',
518
  'auslagern'                   => 'transfer_out',
519 519
  'erneuern'                    => 'update',
520 520
  'ja'                          => 'yes',
521 521
};
templates/webpages/do/form_footer_de.html
3 3
<!--   <p> -->
4 4
<!--    <table> -->
5 5

  
6
 [%- IF closed %]
6
 [%- IF delivered %]
7 7
 [%- SET RO = ' readonly' %]
8 8
 [%- END %]
9 9

  
......
56 56
  <p>
57 57
   Lieferschein bearbeiten<br>
58 58
   <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
59
   [%- UNLESS closed %]
59
   [%- UNLESS delivered %]
60 60
   [%- IF vc == 'customer' %]
61 61
   <input class="submit" type="submit" name="action" value="Lieferadresse">
62 62
   [%- END %]
63 63
   [%- END %]
64 64
   <input class="submit" type="submit" name="action" value="Drucken">
65 65
   <input class="submit" type="submit" name="action" value="eMail">
66
   [%- UNLESS closed %]
66
   [%- UNLESS delivered %]
67 67
   <input class="submit" type="submit" name="action" value="Speichern">
68 68
   [%- IF vc == 'customer' %]
69
   <input class="submit" type="submit" name="action" value="Auslagern und abschlie?en">
69
   <input class="submit" type="submit" name="action" value="Auslagern">
70 70
   [%- ELSE %]
71
   <input class="submit" type="submit" name="action" value="Einlagern und abschlie?en">
71
   <input class="submit" type="submit" name="action" value="Einlagern">
72 72
   [%- END %]
73 73
   [%- END %]
74 74
   [%- IF id %]
......
80 80
  <p>
81 81
   Workflow Lieferschein<br>
82 82
   <input class="submit" type="submit" name="action" value="als neu speichern">
83
   [% UNLESS closed %]
83
   [% UNLESS delivered %]
84 84
   <input class="submit" type="submit" name="action" value="L?schen">
85 85
   [% END %]
86 86
   <input class="submit" type="submit" name="action" value="Rechnung">
templates/webpages/do/form_footer_master.html
3 3
<!--   <p> -->
4 4
<!--    <table> -->
5 5

  
6
 [%- IF closed %]
6
 [%- IF delivered %]
7 7
 [%- SET RO = ' readonly' %]
8 8
 [%- END %]
9 9

  
......
56 56
  <p>
57 57
   <translate>Edit the Delivery Order</translate><br>
58 58
   <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
59
   [%- UNLESS closed %]
59
   [%- UNLESS delivered %]
60 60
   [%- IF vc == 'customer' %]
61 61
   <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
62 62
   [%- END %]
63 63
   [%- END %]
64 64
   <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
65 65
   <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
66
   [%- UNLESS closed %]
66
   [%- UNLESS delivered %]
67 67
   <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
68 68
   [%- IF vc == 'customer' %]
69
   <input class="submit" type="submit" name="action" value="<translate>Transfer out and close</translate>">
69
   <input class="submit" type="submit" name="action" value="<translate>Transfer out</translate>">
70 70
   [%- ELSE %]
71
   <input class="submit" type="submit" name="action" value="<translate>Transfer in and close</translate>">
71
   <input class="submit" type="submit" name="action" value="<translate>Transfer in</translate>">
72 72
   [%- END %]
73 73
   [%- END %]
74 74
   [%- IF id %]
......
80 80
  <p>
81 81
   <translate>Workflow Delivery Order</translate><br>
82 82
   <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
83
   [% UNLESS closed %]
83
   [% UNLESS delivered %]
84 84
   <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
85 85
   [% END %]
86 86
   <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
templates/webpages/do/form_header_de.html
16 16
        setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
17 17
        setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
18 18

  
19
        [%- UNLESS closed %]
19
        [%- UNLESS delivered %]
20 20
        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
21 21
        [%- END %]
22 22
      }
......
42 42
 [%- SET the_oldvc = oldvendor %]
43 43
 [%- SET is_customer = '0' %]
44 44
 [%- END %]
45
 [%- IF closed %]
45
 [%- IF delivered %]
46 46
 [%- SET RO = ' readonly' %]
47 47
 [%- SET DISABLED = ' disabled' %]
48 48
 [%- END %]
......
101 101
        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
102 102
        <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
103 103
        <td>
104
         [%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
104
         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
105 105
         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
106 106
         [%- ELSE %]
107 107
         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
......
118 118
        <tr>
119 119
         <th align="right">Ansprechpartner</th>
120 120
         <td>
121
          [%- IF closed %]
121
          [%- IF delivered %]
122 122
          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
123 123
          [%- IF cp_id == row.cp_id %]
124 124
          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
......
141 141
        <tr>
142 142
         <th align="right">Lieferadresse</th>
143 143
         <td>
144
          [%- IF closed %]
144
          [%- IF delivered %]
145 145
          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
146 146
          [%- FOREACH row = ALL_SHIPTO %]
147 147
          [%- IF shipto_id == row.shipto_id %]
......
191 191
       <tr>
192 192
        <th align="right" nowrap>Abteilung</th>
193 193
        <td colspan="3">
194
         [%- IF closed %]
194
         [%- IF delivered %]
195 195
         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
196 196
         [%- FOREACH row = ALL_DEPARTMENTS %]
197 197
         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
......
229 229
     <td align="right">
230 230
      <table>
231 231

  
232
       [%- IF vc == 'customer' %]
233 232
       <tr>
234 233
        <td colspan="2" align="center">
235
         <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
236
         <label for="delivered">Geliefert</label>
234
         [%- IF delivered %]
235
          [%- IF is_customer %]
236
          ausgelagert
237
          [%- ELSE %]
238
          eingelagert
239
          [%- END %]
240
         [%- ELSE %]
241
          [%- IF is_customer %]
242
          noch nicht ausgelagert
243
          [%- ELSE %]
244
          noch nicht eingelagert
245
          [%- END %]
246
         [%- END %]
247
         ;
237 248
         [%- IF closed %]
238
         <input type="hidden" name="delivered" value="1">
249
          Geschlossen
250
         [%- ELSE %]
251
          Offen
239 252
         [%- END %]
240 253
        </td>
241 254
       </tr>
242
       [%- ELSE %]
255

  
243 256
       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
244
       [%- END %]
245 257

  
246 258
       <tr>
247 259
        <th align="right">Bearbeiter</th>
248 260
        <td>
249
         [%- IF closed %]
261
         [%- IF delivered %]
250 262
         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
251 263
         [%- FOREACH row = ALL_EMPLOYEES %]
252 264
         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
272 284
       <tr>
273 285
        <th align="right">Verk?ufer/in</th>
274 286
        <td>
275
         [%- IF closed %]
287
         [%- IF delivered %]
276 288
         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
277 289
         [%- FOREACH row = ALL_SALESMEN %]
278 290
         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
310 322
        <td nowrap>
311 323
         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
312 324
                onBlur="check_right_date_format(this)"[% RO %]>
313
         [% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
325
         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
314 326
        </td>
315 327
       </tr>
316 328

  
317 329
       <tr>
318 330
        <th width="70%" align="right" nowrap>Projektnummer</th>
319 331
        <td>
320
         [%- IF closed %]
332
         [%- IF delivered %]
321 333
         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
322 334
         [%- FOREACH row = ALL_PROJECTS %]
323 335
         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
templates/webpages/do/form_header_master.html
16 16
        setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
17 17
        setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
18 18

  
19
        [%- UNLESS closed %]
19
        [%- UNLESS delivered %]
20 20
        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
21 21
        [%- END %]
22 22
      }
......
42 42
 [%- SET the_oldvc = oldvendor %]
43 43
 [%- SET is_customer = '0' %]
44 44
 [%- END %]
45
 [%- IF closed %]
45
 [%- IF delivered %]
46 46
 [%- SET RO = ' readonly' %]
47 47
 [%- SET DISABLED = ' disabled' %]
48 48
 [%- END %]
......
101 101
        <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
102 102
        <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
103 103
        <td>
104
         [%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
104
         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
105 105
         <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
106 106
         [%- ELSE %]
107 107
         <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
......
118 118
        <tr>
119 119
         <th align="right"><translate>Contact Person</translate></th>
120 120
         <td>
121
          [%- IF closed %]
121
          [%- IF delivered %]
122 122
          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
123 123
          [%- IF cp_id == row.cp_id %]
124 124
          [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
......
141 141
        <tr>
142 142
         <th align="right"><translate>Shipping Address</translate></th>
143 143
         <td>
144
          [%- IF closed %]
144
          [%- IF delivered %]
145 145
          <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
146 146
          [%- FOREACH row = ALL_SHIPTO %]
147 147
          [%- IF shipto_id == row.shipto_id %]
......
191 191
       <tr>
192 192
        <th align="right" nowrap><translate>Department</translate></th>
193 193
        <td colspan="3">
194
         [%- IF closed %]
194
         [%- IF delivered %]
195 195
         <input type="hidden" name="department" value="[% HTML.escape(department) %]">
196 196
         [%- FOREACH row = ALL_DEPARTMENTS %]
197 197
         [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
......
229 229
     <td align="right">
230 230
      <table>
231 231

  
232
       [%- IF vc == 'customer' %]
233 232
       <tr>
234 233
        <td colspan="2" align="center">
235
         <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
236
         <label for="delivered"><translate>Delivered</translate></label>
234
         [%- IF delivered %]
235
          [%- IF is_customer %]
236
          <translate>transferred out</translate>
237
          [%- ELSE %]
238
          <translate>transferred in</translate>
239
          [%- END %]
240
         [%- ELSE %]
241
          [%- IF is_customer %]
242
          <translate>not transferred out yet</translate>
243
          [%- ELSE %]
244
          <translate>not transferred in yet</translate>
245
          [%- END %]
246
         [%- END %]
247
         ;
237 248
         [%- IF closed %]
238
         <input type="hidden" name="delivered" value="1">
249
          <translate>Closed</translate>
250
         [%- ELSE %]
251
          <translate>Open</translate>
239 252
         [%- END %]
240 253
        </td>
241 254
       </tr>
242
       [%- ELSE %]
255

  
243 256
       <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
244
       [%- END %]
245 257

  
246 258
       <tr>
247 259
        <th align="right"><translate>Employee</translate></th>
248 260
        <td>
249
         [%- IF closed %]
261
         [%- IF delivered %]
250 262
         <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
251 263
         [%- FOREACH row = ALL_EMPLOYEES %]
252 264
         [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
272 284
       <tr>
273 285
        <th align="right"><translate>Salesman</translate></th>
274 286
        <td>
275
         [%- IF closed %]
287
         [%- IF delivered %]
276 288
         <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
277 289
         [%- FOREACH row = ALL_SALESMEN %]
278 290
         [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
......
310 322
        <td nowrap>
311 323
         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
312 324
                onBlur="check_right_date_format(this)"[% RO %]>
313
         [% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
325
         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
314 326
        </td>
315 327
       </tr>
316 328

  
317 329
       <tr>
318 330
        <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
319 331
        <td>
320
         [%- IF closed %]
332
         [%- IF delivered %]
321 333
         <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
322 334
         [%- FOREACH row = ALL_PROJECTS %]
323 335
         [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
templates/webpages/do/stock_in_form_de.html
1
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
1
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
2 2

  
3
 [%- UNLESS closed %]
3
 [%- UNLESS delivered %]
4 4
 <script type="text/javascript">
5 5
  <!--
6 6
      warehouses = new Array();
......
100 100
    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
101 101
     <td>[% loop.count %]</td>
102 102

  
103
     [%- IF closed %]
103
     [%- IF delivered %]
104 104

  
105 105
     <td>[% HTML.escape(row.warehouse_description) %]</td>
106 106
     <td>[% HTML.escape(row.bin_description) %]</td>
......
140 140
  <hr size="3" noshade>
141 141

  
142 142
  <p>
143
   [%- IF closed %]
143
   [%- IF delivered %]
144 144
   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
145 145
   [%- ELSE %]
146 146
   <input class="submit" type="submit" name="action" value="Erneuern">
templates/webpages/do/stock_in_form_master.html
1
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
1
[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
2 2

  
3
 [%- UNLESS closed %]
3
 [%- UNLESS delivered %]
4 4
 <script type="text/javascript">
5 5
  <!--
6 6
      warehouses = new Array();
......
100 100
    <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
101 101
     <td>[% loop.count %]</td>
102 102

  
103
     [%- IF closed %]
103
     [%- IF delivered %]
104 104

  
105 105
     <td>[% HTML.escape(row.warehouse_description) %]</td>
106 106
     <td>[% HTML.escape(row.bin_description) %]</td>
......
140 140
  <hr size="3" noshade>
141 141

  
142 142
  <p>
143
   [%- IF closed %]
143
   [%- IF delivered %]
144 144
   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
145 145
   [%- ELSE %]
146 146
   <input class="submit" type="submit" name="action" value="<translate>Update</translate>">
templates/webpages/do/stock_out_form_de.html
1 1
[% USE HTML %][% USE LxERP %]<body>
2 2

  
3
 [%- IF closed %]
3
 [%- IF delivered %]
4 4
 [%- SET RO = ' readonly' %]
5 5
 [%- END %]
6 6

  
......
42 42

  
43 43
  [%- ELSE %]
44 44

  
45
  <input type="hidden" name="nextsub"  value="set_stock_out">
46
  <input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
47
  <input type="hidden" name="in_out"   value="out">
48
  <input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
49
  <input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
50
  <input type="hidden" name="do_qty"   value="[% HTML.escape(do_qty) %]">
51
  <input type="hidden" name="do_unit"  value="[% HTML.escape(do_unit) %]">
52
  <input type="hidden" name="row"      value="[% HTML.escape(row) %]">
53
  <input type="hidden" name="closed"   value="[% HTML.escape(closed) %]">
45
  <input type="hidden" name="nextsub"   value="set_stock_out">
46
  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
47
  <input type="hidden" name="in_out"    value="out">
48
  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
49
  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
50
  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
51
  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
52
  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
53
  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
54
  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
54 55

  
55 56
  <p>
56 57
   <table>
......
59 60
     <th class="listheading">Lager</th>
60 61
     <th class="listheading">Lagerplatz</th>
61 62
     <th class="listheading">Chargennummer</th>
62
     [%- UNLESS closed %]
63
     [%- UNLESS delivered %]
63 64
     <th align="right" class="listheading">Lagerbestand</th>
64 65
     [%- END %]
65 66
     <th align="right" class="listheading">Menge</th>
......
73 74
     <td>[% HTML.escape(row.bindescription) %]</td>
74 75
     <td>[% HTML.escape(row.chargenumber) %]</td>
75 76

  
76
     [%- IF closed %]
77
     [%- IF delivered %]
77 78

  
78 79
     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
79 80
     <td>[% HTML.escape(row.stock_unit) %]</td>
......
104 105
  <hr size="3" noshade>
105 106

  
106 107
  <p>
107
   [%- IF closed %]
108
   [%- IF delivered %]
108 109
   <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
109 110
   [%- ELSE %]
110 111
   <input class="submit" type="submit" name="action" value="Weiter">
templates/webpages/do/stock_out_form_master.html
1 1
[% USE HTML %][% USE LxERP %]<body>
2 2

  
3
 [%- IF closed %]
3
 [%- IF delivered %]
4 4
 [%- SET RO = ' readonly' %]
5 5
 [%- END %]
6 6

  
......
42 42

  
43 43
  [%- ELSE %]
44 44

  
45
  <input type="hidden" name="nextsub"  value="set_stock_out">
46
  <input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
47
  <input type="hidden" name="in_out"   value="out">
48
  <input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
49
  <input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
50
  <input type="hidden" name="do_qty"   value="[% HTML.escape(do_qty) %]">
51
  <input type="hidden" name="do_unit"  value="[% HTML.escape(do_unit) %]">
52
  <input type="hidden" name="row"      value="[% HTML.escape(row) %]">
53
  <input type="hidden" name="closed"   value="[% HTML.escape(closed) %]">
45
  <input type="hidden" name="nextsub"   value="set_stock_out">
46
  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
47
  <input type="hidden" name="in_out"    value="out">
48
  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
49
  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
50
  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
51
  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
52
  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
53
  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
54
  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
54 55

  
55 56
  <p>
56 57
   <table>
......
59 60
     <th class="listheading"><translate>Warehouse</translate></th>
60 61
     <th class="listheading"><translate>Bin</translate></th>
61 62
     <th class="listheading"><translate>Charge Number</translate></th>
62
     [%- UNLESS closed %]
63
     [%- UNLESS delivered %]
63 64
     <th align="right" class="listheading"><translate>Available qty</translate></th>
64 65
     [%- END %]
65 66
     <th align="right" class="listheading"><translate>Qty</translate></th>
......
73 74
     <td>[% HTML.escape(row.bindescription) %]</td>
74 75
     <td>[% HTML.escape(row.chargenumber) %]</td>
75 76

  
76
     [%- IF closed %]
77
     [%- IF delivered %]
77 78

  
78 79
     <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
79 80
     <td>[% HTML.escape(row.stock_unit) %]</td>
......
104 105
  <hr size="3" noshade>
105 106

  
106 107
  <p>
107
   [%- IF closed %]
108
   [%- IF delivered %]
108 109
   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
109 110
   [%- ELSE %]
110 111
   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">

Auch abrufbar als: Unified diff