Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision da10bf75

Von Thomas Kasulke vor mehr als 17 Jahren hinzugefügt

  • ID da10bf753ae49b8322e79fc1bb9276a092403b9a
  • Vorgänger 6968d257
  • Nachfolger 20a08305

syntax in hidden tags w3c conform gestalltet (bug 272)

Unterschiede anzeigen:

bin/mozilla/io.pl
141 141
  # neue Optik im Rechnungsformular      #
142 142
########################################
143 143
  $column_data{runningnumber} =
144
      qq|<th align=left nowrap width=5 class=listheading>|
144
      qq|<th align="left" nowrap width="5" class="listheading">|
145 145
    . $locale->text('No.')
146 146
    . qq|</th>|;
147 147
  $column_data{partnumber} =
148
      qq|<th align=left nowrap width=12 class=listheading>|
148
      qq|<th align="left" nowrap width="12" class="listheading">|
149 149
    . $locale->text('Number')
150 150
    . qq|</th>|;
151 151
  $column_data{description} =
152
      qq|<th align=left nowrap width=30 class=listheading>|
152
      qq|<th align="left" nowrap width="30" class="listheading">|
153 153
    . $locale->text('Part Description')
154 154
    . qq|</th>|;
155 155
  if ($form->{"type"} eq "purchase_order") {
156 156
    $column_data{ship} =
157
      qq|<th align=left nowrap width=5 class=listheading>|
157
      qq|<th align="left" nowrap width="5" class="listheading">|
158 158
      . $locale->text('Ship rcvd')
159 159
      . qq|</th>|;
160 160
  } else {
161 161
    $column_data{ship} =
162
      qq|<th align=left nowrap width=5 class=listheading>|
162
      qq|<th align="left" nowrap width="5" class="listheading">|
163 163
      . $locale->text('Ship')
164 164
      . qq|</th>|;
165 165
  }
166 166
  $column_data{qty} =
167
      qq|<th align=left nowrap width=5 class=listheading>|
167
      qq|<th align="left" nowrap width="5" class="listheading">|
168 168
    . $locale->text('Qty')
169 169
    . qq|</th>|;
170 170
  $column_data{unit} =
171
      qq|<th align=left nowrap width=5 class=listheading>|
171
      qq|<th align="left" nowrap width="5" class="listheading">|
172 172
    . $locale->text('Unit')
173 173
    . qq|</th>|;
174 174
  $column_data{license} =
175
      qq|<th align=left nowrap width=10 class=listheading>|
175
      qq|<th align="left" nowrap width="10" class="listheading">|
176 176
    . $locale->text('License')
177 177
    . qq|</th>|;
178 178
  $column_data{serialnr} =
179
      qq|<th align=left nowrap width=10 class=listheading>|
179
      qq|<th align="left" nowrap width="10" class="listheading">|
180 180
    . $locale->text('Serial No.')
181 181
    . qq|</th>|;
182 182
  $column_data{projectnr} =
183
      qq|<th align=left nowrap width=10 class=listheading>|
183
      qq|<th align="left" nowrap width="10" class="listheading">|
184 184
    . $locale->text('Project')
185 185
    . qq|</th>|;
186 186
  $column_data{sellprice} =
187
      qq|<th align=left nowrap width=15 class=listheading>|
187
      qq|<th align="left" nowrap width="15" class="listheading">|
188 188
    . $locale->text('Price')
189 189
    . qq|</th>|;
190 190
  $column_data{sellprice_pg} =
191
      qq|<th align=left nowrap width=15 class=listheading>|
191
      qq|<th align="left" nowrap width="15" class="listheading">|
192 192
    . $locale->text('Pricegroup')
193 193
    . qq|</th>|;
194 194
  $column_data{discount} =
195
      qq|<th align=left class=listheading>|
195
      qq|<th align="left" class="listheading">|
196 196
    . $locale->text('Discount')
197 197
    . qq|</th>|;
198 198
  $column_data{linetotal} =
199
      qq|<th align=left nowrap width=10 class=listheading>|
199
      qq|<th align="left" nowrap width="10" class="listheading">|
200 200
    . $locale->text('Extended')
201 201
    . qq|</th>|;
202 202
  $column_data{bin} =
203
      qq|<th align=left nowrap width=10 class=listheading>|
203
      qq|<th align="left" nowrap width="10" class="listheading">|
204 204
    . $locale->text('Bin')
205 205
    . qq|</th>|;
206 206
############## ENDE Neueintrag ##################
......
215 215

  
216 216
  print qq|
217 217
  <tr>
218
    <td>
219
      <input type="hidden" name="show_details" value="$form->{show_details}">
218
    <td>| . $cgi->hidden("-name" => "show_details", "-value" => $form->{show_details}) . qq|
220 219
      <input type="checkbox" id="cb_show_details" onclick="show_form_details($show_details_new);" $show_details_checked>
221 220
      <label for="cb_show_details">| . $locale->text("Show details") . qq|</label><br>
222
      <table width=100%>
223
	<tr class=listheading>|;
221
      <table width="100%">
222
	<tr class="listheading">|;
224 223

  
225 224
  map { print "\n$column_data{$_}" } @column_index;
226 225

  
......
311 310
    # neue Optik im Rechnungsformular      #
312 311
########################################
313 312
    $column_data{runningnumber} =
314
      qq|<td><input name="runningnumber_$i" size=5 value=$i></td>|;    # HuT
313
      qq|<td><input name="runningnumber_$i" size="5" value="$i"></td>|;    # HuT
315 314
############## ENDE Neueintrag ##################
316 315

  
317 316
    $column_data{partnumber} =
......
319 318

  
320 319
    if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
321 320
      $column_data{description} =
322
        qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>| . H($form->{"description_$i"}) . qq|</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
321
        qq|<td><textarea name="description_$i" rows="$rows" cols="30" wrap="soft">| . H($form->{"description_$i"}) . qq|</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
323 322
    } else {
324 323
      $column_data{description} =
325
        qq|<td><input name="description_$i" size=30 value="| . $form->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
324
        qq|<td><input name="description_$i" size="30" value="| . $form->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
326 325
    }
327 326

  
328 327
    (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
329 328
    $qty_dec = length $qty_dec;
330 329

  
331 330
    $column_data{qty} =
332
        qq|<td align=right><input name="qty_$i" size=5 value=|
333
      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
331
        qq|<td align="right"><input name="qty_$i" size="5" value="|
332
      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|">|;
334 333
    if ($form->{"formel_$i"}) {
335
    $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>
336
          <input type=hidden name="formel_$i" value="$form->{"formel_$i"}"><input type=hidden name="alu_$i" value="$form->{"alu_$i"}"></td>|;
334
    $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>| .
335
          $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}). qq|</td>|;
337 336
    }
338 337
    $column_data{ship} =
339
        qq|<td align=right><input name="ship_$i" size=5 value=|
338
        qq|<td align="right"><input name="ship_$i" size=5 value="|
340 339
      . $form->format_amount(\%myconfig, $form->{"ship_$i"})
341
      . qq|></td>|;
340
      . qq|"></td>|;
342 341

  
343 342
    my $is_part     = $form->{"inventory_accno_$i"};
344 343
    my $is_assembly = $form->{"assembly_$i"};
......
369 368
      }
370 369

  
371 370
      $column_data{sellprice_pg} =
372
        qq|<td align=right><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
371
        qq|<td align="right"><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
373 372
      $column_data{sellprice} =
374
        qq|<td><input name="sellprice_$i" size=10 value=$price_tmp></td>|;
373
        qq|<td><input name="sellprice_$i" size="10" value="$price_tmp"></td>|;
375 374
    } else {
376 375

  
377 376
      # for last row and report
......
383 382
        $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
384 383

  
385 384
        $column_data{sellprice_pg} =
386
          qq|<td align=right><select name="sellprice_pg_$i">$prices</select></td>|;
385
          qq|<td align="right"><select name="sellprice_pg_$i">$prices</select></td>|;
387 386

  
388 387
      } else {
389 388

  
390 389
        # for last row
391
        $column_data{sellprice_pg} = qq|<td align=right>&nbsp;</td>|;
390
        $column_data{sellprice_pg} = qq|<td align="right">&nbsp;</td>|;
392 391
      }
393 392

  
394 393
      $column_data{sellprice} =
395
        qq|<td><input name="sellprice_$i" size=10 value=|
394
        qq|<td><input name="sellprice_$i" size="10" value="|
396 395
        . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
397 396
                               $decimalplaces)
398
        . qq|></td>|;
397
        . qq|"></td>|;
399 398
    }
400 399
    $column_data{discount} =
401
        qq|<td align=right><input name="discount_$i" size=3 value=|
400
        qq|<td align="right"><input name="discount_$i" size=3 value="|
402 401
      . $form->format_amount(\%myconfig, $form->{"discount_$i"})
403
      . qq|></td>|;
402
      . qq|"></td>|;
404 403
    $column_data{linetotal} =
405
        qq|<td align=right>|
404
        qq|<td align="right">|
406 405
      . $form->format_amount(\%myconfig, $linetotal, 2)
407 406
      . qq|</td>|;
408 407
    $column_data{bin} = qq|<td>$form->{"bin_$i"}</td>|;
......
424 423
    my $j = $i % 2;
425 424
    print qq|
426 425

  
427
        <tr valign=top class=listrow$j>|;
426
        <tr valign="top" class="listrow$j">|;
428 427

  
429 428
    map { print "\n$column_data{$_}" } @column_index;
430 429

  
431 430
    print qq|
432 431
        </tr>
433

  
434
<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
435
<input type=hidden name="bo_$i" value=$form->{"bo_$i"}>
436

  
437
<input type=hidden name="pricegroup_old_$i" value=$form->{"pricegroup_old_$i"}>
438
<input type=hidden name="price_old_$i" value=$form->{"price_old_$i"}>
439
<input type=hidden name="unit_old_$i" value="| . $form->quote($form->{"selected_unit_$i"}) . qq|">
440
<input type=hidden name="price_new_$i" value=|
441
      . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
442

  
443
<input type=hidden name="id_$i" value=$form->{"id_$i"}>
444
<input type=hidden name="inventory_accno_$i" value=$form->{"inventory_accno_$i"}>
445
<input type=hidden name="bin_$i" value="$form->{"bin_$i"}">
446
<input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
447
<input type=hidden name="partnotes_$i" value="| . $form->quote($form->{"partnotes_$i"}) . qq|">
448
<input type=hidden name="income_accno_$i" value=$form->{"income_accno_$i"}>
449
<input type=hidden name="expense_accno_$i" value=$form->{"expense_accno_$i"}>
450
<input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
451
<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
452
<input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
453
<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
454
<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
455
<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
456
<input type=hidden name="longdescription_$i" value="| . $form->quote($form->{"longdescription_$i"}) . qq|">
457
<input type=hidden name="basefactor_$i" value="$form->{"basefactor_$i"}">
458

  
432
|;
433
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
434
       ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i", "selected_unit_$i", "id_$i", "inventory_accno_$i", "bin_$i",
435
          "partsgroup_$i", "partnotes_$i", "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i", "taxaccounts_$i",
436
          "ordnumber_$i", "transdate_$i", "cusordnumber_$i", "longdescription_$i", "basefactor_$i"));
437
print qq|
438
<input type="hidden" name="price_new_$i" value="|
439
      . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|">
459 440
|;
460 441

  
461 442
########################################
......
468 449

  
469 450
    # print second row
470 451
    print qq|
471
        <tr  class=listrow$j $row_style_attr>
472
	  <td colspan=$colspan>
452
        <tr  class="listrow$j" $row_style_attr>
453
	  <td colspan="$colspan">
473 454
|;
474 455
    if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
475 456
      my $selected = $form->{"licensenumber_$i"};
......
480 461
      $lizenzen_quoted = $form->{"lizenzen_$i"};
481 462
      $lizenzen_quoted =~ s/\"/&quot;/g;
482 463
      print qq|
483
	<b>Lizenz\#</b>&nbsp;<select name="licensenumber_$i" size=1>
464
	<b>Lizenz\#</b>&nbsp;<select name="licensenumber_$i" size="1">
484 465
	$form->{"lizenzen_$i"}
485 466
        </select>
486
	<input type=hidden name="lizenzen_$i" value="${lizenzen_quoted}">
467
	<input type="hidden" name="lizenzen_$i" value="${lizenzen_quoted}">
487 468
|;
488 469
    }
489 470
    if ($form->{type} !~ /_quotation/) {
490 471
      print qq|
491
          <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}">|;
472
          <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">|;
492 473
    }
493 474

  
494 475
    print qq|<b>$projectnumber</b>&nbsp;| .
......
503 484
        ? 'deliverydate'
504 485
        : 'reqdate';    # invoice uses a different term for the same thing.
505 486
      print qq|
506
        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
487
        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size="11" value="$form->{"${reqdate_term}_$i"}">
507 488
|;
508 489
    }
509 490
    my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
......
584 565

  
585 566
  $column_data{ndx}        = qq|<th>&nbsp;</th>|;
586 567
  $column_data{partnumber} =
587
    qq|<th class=listheading>| . $locale->text('Number') . qq|</th>|;
568
    qq|<th class="listheading">| . $locale->text('Number') . qq|</th>|;
588 569
  $column_data{description} =
589
    qq|<th class=listheading>| . $locale->text('Part Description') . qq|</th>|;
570
    qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
590 571
  $column_data{sellprice} =
591
    qq|<th class=listheading>| . $locale->text('Price') . qq|</th>|;
572
    qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
592 573
  $column_data{onhand} =
593
    qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
574
    qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
594 575
  $column_data{unit} =
595
    qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;
576
    qq|<th class="listheading">| . $locale->text('Unit') . qq|</th>|;
596 577
  # list items with radio button on a form
597 578
  $form->header;
598 579

  
......
602 583
  print qq|
603 584
<body>
604 585

  
605
<form method=post action=$form->{script}>
586
<form method="post" action="$form->{script}">
606 587

  
607
<table width=100%>
588
<table width="100%">
608 589
  <tr>
609
    <th class=listtop colspan=$colspan>$title</th>
590
    <th class="listtop" colspan="$colspan">$title</th>
610 591
  </tr>
611 592
  <tr height="5"></tr>
612
  <tr class=listheading>|;
593
  <tr class="listheading">|;
613 594

  
614 595
  map { print "\n$column_data{$_}" } @column_index;
615 596

  
......
626 607
          $ref->{"lizenzen"} .=
627 608
            qq|<option value=\"$item->{"id"}\">$item->{"licensenumber"}</option>|;
628 609
        }
629
        $ref->{"lizenzen"} .= qq|<option value=-1>Neue Lizenz</option>|;
610
        $ref->{"lizenzen"} .= qq|<option value="-1">Neue Lizenz</option>|;
630 611
        $ref->{"lizenzen"} =~ s/\"/&quot;/g;
631 612
      }
632 613
    }
......
637 618
    $ref->{sellprice} =
638 619
      $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
639 620
    $column_data{ndx} =
640
      qq|<td><input name=ndx class=radio type=radio value=$i $checked></td>|;
621
      qq|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
641 622
    $column_data{partnumber} =
642
      qq|<td><input name="new_partnumber_$i" type=hidden value="$ref->{partnumber}">$ref->{partnumber}</td>|;
623
      qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
643 624
    $column_data{description} =
644
      qq|<td><input name="new_description_$i" type=hidden value="$ref->{description}">$ref->{description}</td>|;
625
      qq|<td><input name="new_description_$i" type="hidden" value=$ref->{description}>$ref->{description}</td>|;
645 626
    $column_data{sellprice} =
646
      qq|<td align=right><input name="new_sellprice_$i" type=hidden value=$ref->{sellprice}>|
627
      qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
647 628
      . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, "&nbsp;")
648 629
      . qq|</td>|;
649 630
    $column_data{onhand} =
650
      qq|<td align=right><input name="new_onhand_$i" type=hidden value=$ref->{onhand}>|
631
      qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
651 632
      . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
652 633
      . qq|</td>|;
653 634
    $column_data{unit} =
......
661 642

  
662 643
    print qq|
663 644
</tr>
664

  
665
<input name="new_bin_$i" type=hidden value="$ref->{bin}">
666
<input name="new_listprice_$i" type=hidden value=$ref->{listprice}>
667
<input name="new_inventory_accno_$i" type=hidden value=$ref->{inventory_accno}>
668
<input name="new_income_accno_$i" type=hidden value=$ref->{income_accno}>
669
<input name="new_expense_accno_$i" type=hidden value=$ref->{expense_accno}>
670
<input name="new_unit_$i" type=hidden value="$ref->{unit}">
671
<input name="new_weight_$i" type=hidden value="$ref->{weight}">
672
<input name="new_assembly_$i" type=hidden value="$ref->{assembly}">
673
<input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
674
<input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
675
<input name="new_formel_$i" type=hidden value="$ref->{formel}">
676
<input name="new_longdescription_$i" type=hidden value="| . Q($ref->{longdescription}) . qq|">
677
<input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
678
<input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
679
<input name="new_partnotes_$i" type="hidden" value="| . Q($ref->{"partnotes"}) . qq|">
680

  
681
<input name="new_id_$i" type=hidden value=$ref->{id}>
682

  
683 645
|;
684
    if ($lizenzen) {
646
map({ print($cgi->hidden("-name" => "new_$__$i", "-value" => $ref->{$_})); } 
647
        qw(bin listprice inventory_accno income_accno expense_accno unit weight assembly taxaccounts partsgroup 
648
           formel logdescription not_discountable part_payment_id partnodes id));
649
if ($lizenzen) {
685 650
      print qq|
686
<input name="new_lizenzen_$i" type=hidden value="$ref->{lizenzen}">
651
<input name="new_lizenzen_$i" type="hidden" value="$ref->{lizenzen}">
687 652
|;
688 653
    }
689 654

  
690 655
  }
691 656

  
692 657
  print qq|
693
<tr><td colspan=8><hr size=3 noshade></td></tr>
658
<tr><td colspan="8"><hr size="3" noshade></td></tr>
694 659
</table>
695 660

  
696
<input name=lastndx type=hidden value=$i>
661
<input name="lastndx" type="hidden" value="$i">
697 662

  
698 663
|;
699 664

  
......
703 668
  # save all other form variables
704 669
  foreach $key (keys %${form}) {
705 670
    $form->{$key} =~ s/\"/&quot;/g;
706
    print qq|<input name=$key type=hidden value="$form->{$key}">\n|;
671
    print qq|<input name="$key" type="hidden" value="$form->{$key}">\n|;
707 672
  }
708 673

  
709 674
  print qq|
710
<input type=hidden name=nextsub value=item_selected>
675
<input type="hidden" name="nextsub" value="item_selected">
711 676

  
712 677
<br>
713
<input class=submit type=submit name=action value="|
678
<input class="submit" type="submit" name="action" value="|
714 679
    . $locale->text('Continue') . qq|">
715 680
</form>
716 681

  
......
842 807
  print qq|
843 808
<body>
844 809

  
845
<h4 class=error>| . $locale->text('Item not on file!') . qq|
810
<h4 class="error">| . $locale->text('Item not on file!') . qq|
846 811

  
847 812
<p>
848 813
| . $locale->text('What type of item is this?') . qq|</h4>
849 814

  
850
<form method=post action=ic.pl>
815
<form method="post" action="ic.pl">
851 816

  
852 817
<p>
853 818

  
854
  <input class=radio type=radio name=item value=part checked>&nbsp;|
819
  <input class="radio" type="radio" name="item" value="part" checked>&nbsp;|
855 820
    . $locale->text('Part') . qq|<br>
856
  <input class=radio type=radio name=item value=service>&nbsp;|
857
    . $locale->text('Service')
858

  
859
    . qq|
860
<input type=hidden name=previousform value="$previousform">
861
<input type=hidden name=partnumber value="$form->{"partnumber_$i"}">
862
<input type=hidden name=description value="$form->{"description_$i"}">
863
<input type=hidden name=rowcount value=$form->{rowcount}>
864
<input type=hidden name=taxaccount2 value=$form->{taxaccounts}>
865
<input type=hidden name=vc value=$form->{vc}>
866

  
867
<input type=hidden name=path value=$form->{path}>
868
<input type=hidden name=login value=$form->{login}>
869
<input type=hidden name=password value=$form->{password}>
821
  <input class="radio" type="radio" name="item" value="service">&nbsp;|
822
    . $locale->text('Service');
823
print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
824
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
825
     ("partnumber_$i", "description_$i", "rowcount", "taxaccounts", "vc", "path", "login", "password"));
826

  
827
#<input type="hidden" name="partnumber" value="$form->{"partnumber_$i"}">
828
#<input type="hidden" name="description" value="$form->{"description_$i"}">
829
#<input type="hidden" name="rowcount" value="$form->{rowcount}">
830
#<input type="hidden" name="taxaccount2" value="$form->{taxaccounts}">
831
#<input type="hidden" name="vc" value="$form->{vc}">
832
#
833
#<input type="hidden" name="path" value="$form->{path}">
834
#<input type="hidden" name="login" value="$form->{login}">
835
#<input type="hidden" name="password" value="$form->{password}">
870 836

  
871
<input type=hidden name=nextsub value=add>
837
print qq|
838
<input type="hidden" name="nextsub" value="add">
872 839

  
873 840
<p>
874
<input class=submit type=submit name=action value="|
841
<input class="submit" type="submit" name="action" value="|
875 842
    . $locale->text('Continue') . qq|">
876 843
</form>
877 844

  
......
2079 2046
  print qq|
2080 2047
<body>
2081 2048

  
2082
<form method=post action=$form->{script}>
2049
<form method="post" action="$form->{script}">
2083 2050

  
2084
<table width=100%>
2051
<table width="100%">
2085 2052
  <tr>
2086 2053
    <td>
2087 2054
      <table>
2088
	<tr class=listheading>
2089
	  <th class=listheading colspan=2 width=50%>|
2055
	<tr class="listheading">
2056
	  <th class="listheading" colspan="2" width="50%">|
2090 2057
    . $locale->text('Billing Address') . qq|</th>
2091
	  <th class=listheading width=50%>|
2058
	  <th class="listheading" width="50%">|
2092 2059
    . $locale->text('Shipping Address') . qq|</th>
2093 2060
	</tr>
2094 2061
	<tr height="5"></tr>
2095 2062
	<tr>
2096
	  <th align=right nowrap>$number</th>
2063
	  <th align="right" nowrap>$number</th>
2097 2064
	  <td>$form->{"$form->{vc}number"}</td>
2098 2065
	</tr>
2099 2066
	<tr>
2100
	  <th align=right nowrap>| . $locale->text('Company Name') . qq|</th>
2067
	  <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
2101 2068
	  <td>$form->{name}</td>
2102
	  <td><input name=shiptoname size=35 value="$form->{shiptoname}"></td>
2069
	  <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
2103 2070
	</tr>
2104 2071
	<tr>
2105
	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
2072
	  <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
2106 2073
	  <td>$form->{department_1}</td>
2107
	  <td><input name=shiptodepartment_1 size=35 value="$form->{shiptodepartment_1}"></td>
2074
	  <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
2108 2075
	</tr>
2109 2076
	<tr>
2110
	  <th align=right nowrap>&nbsp;</th>
2077
	  <th align="right" nowrap>&nbsp;</th>
2111 2078
	  <td>$form->{department_2}</td>
2112
	  <td><input name=shiptodepartment_2 size=35 value="$form->{shiptodepartment_2}"></td>
2079
	  <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
2113 2080
	</tr>
2114 2081
	<tr>
2115
	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
2082
	  <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
2116 2083
	  <td>$form->{street}</td>
2117
	  <td><input name=shiptostreet size=35 value="$form->{shiptostreet}"></td>
2084
	  <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
2118 2085
	</tr>
2119 2086
	<tr>
2120
	  <th align=right nowrap>| . $locale->text('Zipcode') . qq|</th>
2087
	  <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
2121 2088
	  <td>$form->{zipcode}</td>
2122
	  <td><input name=shiptozipcode size=35 value="$form->{shiptozipcode}"></td>
2089
	  <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
2123 2090
	</tr>
2124 2091
	<tr>
2125
	  <th align=right nowrap>| . $locale->text('City') . qq|</th>
2092
	  <th align="right" nowrap>| . $locale->text('City') . qq|</th>
2126 2093
	  <td>$form->{city}</td>
2127
	  <td><input name=shiptocity size=35 value="$form->{shiptocity}"></td>
2094
	  <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
2128 2095
	</tr>
2129 2096
	<tr>
2130
	  <th align=right nowrap>| . $locale->text('Country') . qq|</th>
2097
	  <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
2131 2098
	  <td>$form->{country}</td>
2132
	  <td><input name=shiptocountry size=35 value="$form->{shiptocountry}"></td>
2099
	  <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
2133 2100
	</tr>
2134 2101
	<tr>
2135
	  <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
2102
	  <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
2136 2103
	  <td>$form->{contact}</td>
2137
	  <td><input name=shiptocontact size=35 value="$form->{shiptocontact}"></td>
2104
	  <td><input name="shiptocontac"t size="35" value="$form->{shiptocontact}"></td>
2138 2105
	</tr>
2139 2106
	<tr>
2140
	  <th align=right nowrap>| . $locale->text('Phone') . qq|</th>
2107
	  <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
2141 2108
	  <td>$form->{phone}</td>
2142
	  <td><input name=shiptophone size=20 value="$form->{shiptophone}"></td>
2109
	  <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
2143 2110
	</tr>
2144 2111
	<tr>
2145
	  <th align=right nowrap>| . $locale->text('Fax') . qq|</th>
2112
	  <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
2146 2113
	  <td>$form->{fax}</td>
2147
	  <td><input name=shiptofax size=20 value="$form->{shiptofax}"></td>
2114
	  <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
2148 2115
	</tr>
2149 2116
	<tr>
2150
	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
2117
	  <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
2151 2118
	  <td>$form->{email}</td>
2152
	  <td><input name=shiptoemail size=35 value="$form->{shiptoemail}"></td>
2119
	  <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
2153 2120
	</tr>
2154 2121
      </table>
2155 2122
    </td>
2156 2123
  </tr>
2157 2124
</table>
2125
| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub);
2126
;
2127

  
2158 2128

  
2159
<input type=hidden name=nextsub value=$nextsub>
2160
|;
2161 2129

  
2162 2130
  # delete shipto
2163 2131
  map({ delete $form->{$_} } (@shipto_vars, qw(header)));
......
2165 2133

  
2166 2134
  foreach $key (keys %$form) {
2167 2135
    $form->{$key} =~ s/\"/&quot;/g;
2168
    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
2136
    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
2169 2137
  }
2170 2138

  
2171 2139
  print qq|
2172 2140

  
2173
<hr size=3 noshade>
2141
<hr size="3" noshade>
2174 2142

  
2175 2143
<br>
2176
<input class=submit type=submit name=action value="|
2144
<input class="submit" type="submit" name="action" value="|
2177 2145
    . $locale->text('Continue') . qq|">
2178 2146
</form>
2179 2147

  
bin/mozilla/is.pl
349 349
  } else {
350 350
    $form->{selecttaxzone} =~ s/ selected//g;
351 351
    if ($form->{taxzone_id} ne "") {
352
      $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
352
      $form->{selecttaxzone} =~ s/value=\"$form->{taxzone_id}\"/value=\"$form->{taxzone_id}\" selected/;
353 353
    }
354 354
  }
355 355

  
356 356
  $taxzone = qq|
357 357
	      <tr>
358
		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
359
		<td><select name=taxzone_id>$form->{selecttaxzone}</select></td>
360
		<input type=hidden name=selecttaxzone value="$form->{selecttaxzone}">
358
		<th align="right">| . $locale->text('Steuersatz') . qq|</th>
359
		<td><select name="taxzone_id">$form->{selecttaxzone}</select></td>
360
		<input type="hidden" name="selecttaxzone" value="$form->{selecttaxzone}">
361 361
	      </tr>|;
362 362

  
363 363
  my @old_project_ids = ($form->{"globalproject_id"});
......
451 451
  if ($form->{currency} ne $form->{defaultcurrency}) {
452 452
    if ($form->{forex}) {
453 453
      $exchangerate .=
454
          qq|<th align=right>|
454
          qq|<th align="right">|
455 455
        . $locale->text('Exchangerate')
456
        . qq|</th><td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>|;
456
        . qq|</th><td>$form->{exchangerate}<input type="hidden" name="exchangerate" value="$form->{exchangerate}"></td>|;
457 457
    } else {
458 458
      $exchangerate .=
459
          qq|<th align=right>|
459
          qq|<th align="right">|
460 460
        . $locale->text('Exchangerate')
461
        . qq|</th><td><input name=exchangerate size=10 value=$form->{exchangerate}></td>|;
461
        . qq|</th><td><input name="exchangerate" size="10" value="$form->{exchangerate}"></td>|;
462 462
    }
463 463
  }
464 464
  $exchangerate .= qq|
465
<input type=hidden name=forex value=$form->{forex}>
465
<input type="hidden" name="forex" value="$form->{forex}">
466 466
|;
467 467

  
468 468
  $customer =
469 469
    ($form->{selectcustomer})
470
    ? qq|<select name=customer>$form->{selectcustomer}</select>\n<input type=hidden name="selectcustomer" value="$form->{selectcustomer}">|
471
    : qq|<input name=customer value="$form->{customer}" size=35>|;
470
    ? qq|<select name="customer">$form->{selectcustomer}</select>\n<input type="hidden" name="selectcustomer" value="$form->{selectcustomer}">|
471
    : qq|<input name="customer" value="$form->{customer}" size="35">|;
472 472

  
473 473
  $department = qq|
474 474
              <tr>
475 475
	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
476
		<td colspan=3><select name=department>$form->{selectdepartment}</select>
477
		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
476
		<td colspan="3"><select name="department">$form->{selectdepartment}</select>
477
		<input type="hidden" name="selectdepartment" value="$form->{selectdepartment}">
478 478
		</td>
479 479
	      </tr>
480 480
| if $form->{selectdepartment};
......
484 484
  if ($form->{business}) {
485 485
    $business = qq|
486 486
	      <tr>
487
		<th align=right>| . $locale->text('Business') . qq|</th>
487
		<th align="right">| . $locale->text('Business') . qq|</th>
488 488
		<td>$form->{business}</td>
489
		<th align=right>| . $locale->text('Trade Discount') . qq|</th>
489
		<th align="right">| . $locale->text('Trade Discount') . qq|</th>
490 490
		<td>|
491 491
      . $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
492 492
      . qq| %</td>
......
497 497
  if ($form->{max_dunning_level}) {
498 498
    $dunning = qq|
499 499
	      <tr>
500
                <td colspan=4>
500
                <td colspan="4">
501 501
                <table>
502 502
                  <tr>
503
		<th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
503
		<th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
504 504
		<td><b>$form->{max_dunning_level}</b></td>
505
		<th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
505
		<th align="right">| . $locale->text('Dunning Amount') . qq|:</th>
506 506
		<td><b>|
507 507
      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
508 508
      . qq|</b></td>
......
523 523
  
524 524
      # with JavaScript Calendar
525 525
      $button1 = qq|
526
        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
527
        <td><input type=button name=invdate id="trigger1" value=|
528
        . $locale->text('button') . qq|></td>
529
        |;
530
  
526
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}"></td>
527
        <td><input type="button" name="invdate" id="trigger1" value="|
528
        . $locale->text('button') . qq|"></td>|;
529
       
531 530
      #write Trigger
532 531
      $jsscript =
533 532
        Form->write_trigger(\%myconfig,     "1",
......
537 536
  
538 537
      # without JavaScript Calendar
539 538
      $button1 =
540
        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
539
        qq|<td><input name="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}"></td>|;
541 540
      $button2 =
542
        qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
541
        qq|<td width="13"><input name="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}"></td>|;
543 542
    }
544 543
  } else {
545 544
    if ($form->{jsscript}) {
546 545
  
547 546
      # with JavaScript Calendar
548 547
      $button1 = qq|
549
        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
550
        <td><input type=button name=invdate id="trigger1" value=|
551
        . $locale->text('button') . qq|></td>
548
        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}"></td>
549
        <td><input type="button" name="invdate" id="trigger1" value="|
550
        . $locale->text('button') . qq|"></td>
552 551
        |;
553 552
      $button2 = qq|
554
        <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
555
        <td width="4"><input type=button name=duedate id="trigger2" value=|
556
        . $locale->text('button') . qq|></td></td>
553
        <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}"></td>
554
        <td width="4"><input type="button" name="duedate" id="trigger2" value="|
555
        . $locale->text('button') . qq|"></td></td>
557 556
      |;
558 557
      $button3 = qq|
559
        <td width="13"><input name=deliverydate id=deliverydate size=11 title="$myconfig{dateformat}" value=$form->{deliverydate}></td>
560
        <td width="4"><input type=button name=deliverydate id="trigger3" value=|
561
        . $locale->text('button') . qq|></td></td>
558
        <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}"></td>
559
        <td width="4"><input type="button" name="deliverydate" id="trigger3" value="|
560
        . $locale->text('button') . qq|"></td></td>
562 561
      |;
563 562
  
564 563
      #write Trigger
......
573 572
  
574 573
      # without JavaScript Calendar
575 574
      $button1 =
576
        qq|<td><input name=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>|;
575
        qq|<td><input name="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}"></td>|;
577 576
      $button2 =
578 577
        qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
579 578
    }
......
610 609
<script type="text/javascript" src="js/vendor_selection.js"></script>
611 610
<script type="text/javascript" src="js/calculate_qty.js"></script>
612 611

  
613
<form method=post name="invoice" action=$form->{script}>
614

  
615

  
616
<input type=hidden name=id value=$form->{id}>
617
<input type=hidden name=action value=$form->{action}>
618

  
619
<input type=hidden name=type value=$form->{type}>
620
<input type=hidden name=media value=$form->{media}>
621
<input type=hidden name=format value=$form->{format}>
622

  
623
<input type=hidden name=queued value="$form->{queued}">
624
<input type=hidden name=printed value="$form->{printed}">
625
<input type=hidden name=emailed value="$form->{emailed}">
612
<form method="post" name="invoice" action="$form->{script}">
613
| ;
614
map({print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} 
615
     qw(id action type media format queued printed emailed title vc discount 
616
        creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id)) ;
617
print ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") ;
618
print qq|
626 619

  
627
<input type=hidden name=title value="$form->{title}">
628
<input type=hidden name=vc value=$form->{vc}>
620
<input type="hidden" name="lizenzen" value="$lizenzen">
629 621

  
630
<input type=hidden name=discount value=$form->{discount}>
631
<input type=hidden name=creditlimit value=$form->{creditlimit}>
632
<input type=hidden name=creditremaining value=$form->{creditremaining}>
633

  
634
<input type=hidden name=tradediscount value=$form->{tradediscount}>
635
<input type=hidden name=business value=$form->{business}>
636

  
637
<input type=hidden name=closedto value=$form->{closedto}>
638
<input type=hidden name=locked value=$form->{locked}>
639

  
640
<input type=hidden name=shipped value=$form->{shipped}>
641
<input type=hidden name=lizenzen value=$lizenzen>
642
<input type=hidden name=storno value=$form->{storno}>
643
<input type=hidden name=storno_id value=$form->{storno_id}>
644

  
645
| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
646

  
647
<table width=100%>
648
  <tr class=listtop>
649
    <th class=listtop>$form->{title}</th>
622
<table width="100%">
623
  <tr class="listtop">
624
    <th class="listtop">$form->{title}</th>
650 625
  </tr>
651 626
  <tr height="5"></tr>
652 627
  <tr>
653 628
    <td>
654
      <table width=100%>
655
	<tr valign=top>
629
      <table width="100%">
630
	<tr valign="top">
656 631
	  <td>
657 632
	    <table>
658 633
	      <tr>
659
		<th align=right nowrap>| . $locale->text('Customer') . qq|</th>
660
		<td colspan=3>$customer</td>
661
    <input type=hidden name=customer_klass value=$form->{customer_klass}>
662
		<input type=hidden name=customer_id value=$form->{customer_id}>
663
		<input type=hidden name=oldcustomer value="$form->{oldcustomer}">
664
                <th align=richt nowrap>|
634
		<th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
635
		<td colspan="3">$customer</td>
636
    <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
637
		<input type="hidden" name="customer_id" value="$form->{customer_id}">
638
		<input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
639
                <th align="right" nowrap>|
665 640
    . $locale->text('Contact Person') . qq|</th>
666
                <td colspan=3>$contact</td>
641
                <td colspan="3">$contact</td>
667 642
	      </tr>
668 643
	      <tr>
669 644
		<td></td>
670
		<td colspan=3>
645
		<td colspan="3">
671 646
		  <table>
672 647
		    <tr>
673 648
		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
674 649
		      <td>$form->{creditlimit}</td>
675
		      <td width=20%></td>
650
		      <td width="20%"></td>
676 651
		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
677 652
		      <td class="plus$n">$form->{creditremaining}</td>
678 653
		    </tr>
......
683 658
	      $business
684 659
              $dunning
685 660
	      <tr>
686
		<th align=right nowrap>| . $locale->text('Record in') . qq|</th>
687
		<td colspan=3><select name=AR style="width:280px;">$form->{selectAR}</select></td>
688
		<input type=hidden name=selectAR value="$form->{selectAR}">
661
		<th align="right" nowrap>| . $locale->text('Record in') . qq|</th>
662
		<td colspan="3"><select name="AR" style="width:280px;">$form->{selectAR}</select></td>
663
		<input type="hidden" name="selectAR" value="$form->{selectAR}">
689 664
	      </tr>
690 665
              $taxzone
691 666
	      $department
692 667
	      <tr>
693
		<th align=right nowrap>| . $locale->text('Currency') . qq|</th>
694
		<td><select name=currency>$form->{selectcurrency}</select></td>
695
		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
696
		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
697
		<input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
698
		<input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
668
		<th align="right" nowrap>| . $locale->text('Currency') . qq|</th>
669
		<td><select name="currency">$form->{selectcurrency}</select></td>
670
		<input type="hidden" name="selectcurrency" value="$form->{selectcurrency}">
671
		<input type="hidden" name="defaultcurrency" value="$form->{defaultcurrency}">
672
		<input type="hidden" name="fxgain_accno" value="$form->{fxgain_accno}">
673
		<input type="hidden" name="fxloss_accno" value="$form->{fxloss_accno}">
699 674
		$exchangerate
700 675
	      </tr>
701 676
	      <tr>
702
		<th align=right nowrap>| . $locale->text('Shipping Point') . qq|</th>
703
		<td colspan=3><input name=shippingpoint size=35 value="$form->{shippingpoint}"></td>
704
	      </tr>
677
		<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
678
		<td colspan="3"> | .
679
		$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
680
	  qq|</tr>
705 681
	      <tr>
706
		<th align=right nowrap>| . $locale->text('Ship via') . qq|</th>
707
		<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
682
		<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
683
		<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
708 684
	      </tr>|;
709 685
#               <tr>
710 686
#                 <td colspan=4>
......
728 704
#               </tr>
729 705
print qq|	    </table>
730 706
	  </td>
731
	  <td align=right>
707
	  <td align="right">
732 708
	    <table>
733 709
	      <tr>
734
	        <th align=right nowrap>| . $locale->text('Employee') . qq|</th>
735
		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
736
		<input type=hidden name=selectemployee value="$form->{selectemployee}">
710
	        <th align="right" nowrap>| . $locale->text('Employee') . qq|</th>
711
		<td colspan="2"><select name="employee">$form->{selectemployee}</select></td>
712
		<input type="hidden" name="selectemployee" value="$form->{selectemployee}">
737 713
                <td></td>
738 714
	      </tr>
739 715
        $salesman
740 716
|;
741 717
if ($form->{type} eq "credit_note") {
742 718
print qq|     <tr>
743
		<th align=right nowrap>| . $locale->text('Credit Note Number') . qq|</th>
744
		<td><input name=invnumber size=11 value="$form->{invnumber}"></td>
719
		<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
720
		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
745 721
	      </tr>
746 722
	      <tr>
747
		<th align=right>| . $locale->text('Credit Note Date') . qq|</th>
723
		<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
748 724
                $button1
749 725
	      </tr>|;
750 726
} else {
751 727
print qq|     <tr>
752
		<th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
753
		<td><input name=invnumber size=11 value="$form->{invnumber}"></td>
728
		<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
729
		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
754 730
	      </tr>
755 731
	      <tr>
756
		<th align=right>| . $locale->text('Invoice Date') . qq|</th>
732
		<th align="right">| . $locale->text('Invoice Date') . qq|</th>
757 733
                $button1
758 734
	      </tr>
759 735
	      <tr>
760
		<th align=right>| . $locale->text('Due Date') . qq|</th>
736
		<th align="right">| . $locale->text('Due Date') . qq|</th>
761 737
                $button2
762 738
	      </tr>
763 739
	      <tr>
764
		<th align=right>| . $locale->text('Delivery Date') . qq|</th>
740
		<th align="right">| . $locale->text('Delivery Date') . qq|</th>
765 741
                $button3
766 742
	      </tr>|;
767 743
}
768 744
print qq|     <tr>
769
		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
770
		<td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
745
		<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
746
		<td><input name="ordnumber" size="11" value="$form->{ordnumber}"></td>
771 747
	      </tr>
772 748
        <tr>
773 749
          <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
......
775 751
          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
776 752
        </tr>
777 753
	      <tr>
778
		<th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
779
		<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
754
		<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
755
		<td><input name="quonumber" size="11" value="$form->{quonumber}"></td>
780 756
	      </tr>
781 757
        <tr>
782 758
          <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
......
784 760
          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
785 761
        </tr>
786 762
	      <tr>
787
		<th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
788
		<td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
763
		<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
764
		<td><input name="cusordnumber" size="11" value="$form->{cusordnumber}"></td>
789 765
	      </tr>
790 766
	      <tr>
791 767
          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
......
801 777
    <td>
802 778
    </td>
803 779
  </tr>
804

  
780
| . 
805 781
$jsscript
806

  
782
. qq|
807 783
<!-- shipto are in hidden variables -->
808

  
809
<input type=hidden name=shiptoname value="$form->{shiptoname}">
810
<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
811
<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
812
<input type=hidden name=shiptocity value="$form->{shiptocity}">
813
<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
814
<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
815
<input type=hidden name=shiptophone value="$form->{shiptophone}">
816
<input type=hidden name=shiptofax value="$form->{shiptofax}">
817
<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
818

  
819
<!-- email variables -->
820
<input type=hidden name=message value="$form->{message}">
821
<input type=hidden name=email value="$form->{email}">
822
<input type=hidden name=subject value="$form->{subject}">
823
<input type=hidden name=cc value="$form->{cc}">
824
<input type=hidden name=bcc value="$form->{bcc}">
825
<input type=hidden name=webdav value=$webdav>
826
<input type=hidden name=taxaccounts value="$form->{taxaccounts}">
827
|;
828

  
829
  foreach $item (split / /, $form->{taxaccounts}) {
830
    print qq|
831
<input type=hidden name="${item}_rate" value="$form->{"${item}_rate"}">
832
<input type=hidden name="${item}_description" value="$form->{"${item}_description"}">
833
<input type=hidden name="${item}_taxnumber" value="$form->{"${item}_taxnumber"}">
834
|;
784
| ;
785
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
786
       qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry 
787
          shiptocontact shiptophone shiptofax shiptoemail));
788
print qq|<!-- email variables --> |;
789
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
790
    qw(message email subject cc bcc taxaccounts));
791
print qq|<input type="hidden" name="webdav" value="| . $webdav . qq|">|;
792

  
793
  foreach $item (split(/ /, $form->{taxaccounts})) {
794
    map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
795
    ("${item}_rate", "${item}_description", "${item}_taxnumber"));
835 796
  }
836 797
  $lxdebug->leave_sub();
837 798
}
......
849 810
  }
850 811
  $rows = ($rows > $introws) ? $rows : $introws;
851 812
  $notes =
852
    qq|<textarea name=notes rows=$rows cols=26 wrap=soft>$form->{notes}</textarea>|;
813
    qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
853 814
  $intnotes =
854
    qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|;
815
    qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
855 816

  
856 817
  $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
857 818

  
858 819
  $taxincluded = "";
859 820
  if ($form->{taxaccounts}) {
860 821
    $taxincluded = qq|
861
	        <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
822
	        <input name="taxincluded" class="checkbox" type="checkbox" value=$form->{taxincluded}> <b>|
862 823
      . $locale->text('Tax Included') . qq|</b><br><br>|;
863 824
  }
864 825

  
......
876 837

  
877 838
        $tax .= qq|
878 839
	      <tr>
879
                <th align=right>$form->{"${item}_description"}&nbsp;|
840
                <th align="right">$form->{"${item}_description"}&nbsp;|
880 841
                                    . $form->{"${item}_rate"} * 100 .qq|%</th>
881
		<td align=right>$form->{"${item}_total"}</td>
842
		<td align="right">$form->{"${item}_total"}</td>
882 843
	      </tr>
883 844
|;
884 845
      }
......
889 850

  
890 851
    $subtotal = qq|
891 852
	      <tr>
892
		<th align=right>| . $locale->text('Subtotal') . qq|</th>
893
		<td align=right>$form->{invsubtotal}</td>
853
		<th align="right">| . $locale->text('Subtotal') . qq|</th>
854
		<td align="right">$form->{invsubtotal}</td>
894 855
	      </tr>
895 856
|;
896 857

  
......
916 877

  
917 878
        $tax .= qq|
918 879
	      <tr>
919
		<th align=right>Enthaltene $form->{"${item}_description"}&nbsp;|
880
		<th align="right">Enthaltene $form->{"${item}_description"}&nbsp;|
920 881
		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
921
		<td align=right>$form->{"${item}_total"}</td>
882
		<td align="right">$form->{"${item}_total"}</td>
922 883
	      </tr>
923 884
	      <tr>
924
	        <th align=right>Nettobetrag</th>
925
		<td align=right>$form->{"${item}_netto"}</td>
885
	        <th align="right">Nettobetrag</th>
886
		<td align="right">$form->{"${item}_netto"}</td>
926 887
	      </tr>
927 888
|;
928 889
      }
......
937 898
  print qq|
938 899
  <tr>
939 900
    <td>
940
      <table width=100%>
941
	<tr valign=bottom>
901
      <table width="100%">
902
	<tr valign="bottom">
942 903
	  <td>
943 904
	    <table>
944 905
	      <tr>
945
		<th align=left>| . $locale->text('Notes') . qq|</th>
946
		<th align=left>| . $locale->text('Internal Notes') . qq|</th>
947
                <th align=right>| . $locale->text('Payment Terms') . qq|</th>
906
		<th align="left">| . $locale->text('Notes') . qq|</th>
907
		<th align="left">| . $locale->text('Internal Notes') . qq|</th>
908
                <th align="right">| . $locale->text('Payment Terms') . qq|</th>
948 909
	      </tr>
949
	      <tr valign=top>
910
	      <tr valign="top">
950 911
		<td>$notes</td>
951 912
		<td>$intnotes</td>
952
                <td><select name=payment_id onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
913
                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
953 914
                </select></td>
954 915
	      </tr>
955 916
	    </table>
956 917
	  </td>
957
	  <td align=right width=100%>
918
	  <td align="right" width="100%">
958 919
	    $taxincluded
959
	    <table width=100%>
920
	    <table width="100%">
960 921
	      $subtotal
961 922
	      $tax
962 923
	      <tr>
963
		<th align=right>| . $locale->text('Total') . qq|</th>
964
		<td align=right>$form->{invtotal}</td>
924
		<th align="right">| . $locale->text('Total') . qq|</th>
925
		<td align="right">$form->{invtotal}</td>
965 926
	      </tr>
966 927
	    </table>
967 928
	  </td>
......
973 934
  if ($webdav) {
974 935
    $webdav_list = qq|
975 936
  <tr>
976
    <td><hr size=3 noshade></td>
937
    <td><hr size="3" noshade></td>
977 938
  </tr>
978 939
  <tr>
979
    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
940
    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
980 941
  </tr>
981
    <table width=100%>
982
      <td align=left width=30%><b>Dateiname</b></td>
983
      <td align=left width=70%><b>Webdavlink</b></td>
942
    <table width="100%">
943
      <td align="left" width="30%"><b>Dateiname</b></td>
944
      <td align="left" width="70%"><b>Webdavlink</b></td>
984 945
|;
985 946
    foreach $file (keys %{ $form->{WEBDAV} }) {
986 947
      $webdav_list .= qq|
987 948
      <tr>
988
        <td align=left>$file</td>
989
        <td align=left><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
949
        <td align="left">$file</td>
950
        <td align="left"><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
990 951
      </tr>
991 952
|;
992 953
    }
......
1001 962
  print qq|
1002 963
  <tr>
1003 964
    <td>
1004
      <table width=100%>
1005
	<tr class=listheading>
1006
	  <th colspan=6 class=listheading>|
965
      <table width="100%">
966
	<tr class="listheading">
967
	  <th colspan="6" class="listheading">|
1007 968
    . $locale->text('Payments') . qq|</th>
1008 969
	</tr>
1009 970
|;
......
1011 972
  print qq|
1012 973
  <tr>
1013 974
    <td>
1014
      <table width=100%>
1015
	<tr class=listheading>
1016
	  <th colspan=6 class=listheading>|
975
      <table width="100%">
976
	<tr class="listheading">
977
	  <th colspan="6" class="listheading">|
1017 978
    . $locale->text('Incoming Payments') . qq|</th>
1018 979
	</tr>
1019 980
|;
......
1064 1025
    $exchangerate = qq|&nbsp;|;
1065 1026
    if ($form->{currency} ne $form->{defaultcurrency}) {
1066 1027
      if ($form->{"forex_$i"}) {
1067
        $exchangerate =
1068
          qq|<input type=hidden name="exchangerate_$i" value=$form->{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
1028
        $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
1069 1029
      } else {
1070
        $exchangerate =
1071
          qq|<input name="exchangerate_$i" size=10 value=$form->{"exchangerate_$i"}>|;
1030
        $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
1072 1031
      }
1073 1032
    }
1074 1033

  
1075
    $exchangerate .= qq|
1076
<input type=hidden name="forex_$i" value=$form->{"forex_$i"}>
1077
|;
1034
    $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
1078 1035

  
1079 1036
    $column_data{"paid_$i"} =
1080
      qq|<td align=center><input name="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
1081
    $column_data{"exchangerate_$i"} = qq|<td align=center>$exchangerate</td>|;
1037
      qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}"></td>|;
1038
    $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
1082 1039
    $column_data{"AR_paid_$i"}      =
1083
      qq|<td align=center><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
1040
      qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
1084 1041
    $column_data{"datepaid_$i"} =
1085
      qq|<td align=center><input id="datepaid_$i" name="datepaid_$i"  size=11 title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}>
1042
      qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i"  size="11" title="$myconfig{dateformat}" value=$form->{"datepaid_$i"}>
1086 1043
         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
1087 1044
    $column_data{"source_$i"} =
1088
      qq|<td align=center><input name="source_$i" size=11 value="$form->{"source_$i"}"></td>|;
1045
      qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
1089 1046
    $column_data{"memo_$i"} =
1090
      qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></td>|;
1047
      qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
1091 1048

  
1092 1049
    map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
1093 1050
    print "
......
1095 1052
    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
1096 1053
  }
1097 1054

  
1098
  print qq|
1099
<input type=hidden name=paidaccounts value=$form->{paidaccounts}>
1100
<input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
1101
<input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
1102
<input type=hidden name=oldtotalpaid value=$totalpaid>
1055
  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); 
1056
  print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
1103 1057
    </table>
1104 1058
    </td>
1105 1059
  </tr>
1106 1060
  <tr>
1107
    <td><hr size=3 noshade></td>
1061
    <td><hr size="3" noshade></td>
1108 1062
  </tr>
1109 1063
  <tr>
1110 1064
    <td>
......
1125 1079
    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
1126 1080

  
1127 1081
    print qq|
1128
    <input class=submit type=submit accesskey="u" name=action id=update_button value="|
1082
    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
1129 1083
      . $locale->text('Update') . qq|">
1130
    <input class=submit type=submit name=action value="|
1084
    <input class="submit" type="submit" name="action" value="|
1131 1085
      . $locale->text('Ship to') . qq|">
1132
    <input class=submit type=submit name=action value="|
1086
    <input class="submit" type="submit" name="action" value="|
1133 1087
      . $locale->text('Print') . qq|">
1134
    <input class=submit type=submit name=action value="|
1088
    <input class="submit" type="submit" name="action" value="|
1135 1089
      . $locale->text('E-mail') . qq|"> |;
1136
    print qq|<input class=submit type=submit name=action value="|
1090
    print qq|<input class="submit" type="submit" name="action" value="|
1137 1091
      . $locale->text('Storno') . qq|"> | if ($show_storno);
1138
    print qq|<input class=submit type=submit name=action value="|
1092
    print qq|<input class="submit" type="submit" name="action" value="|
1139 1093
      . $locale->text('Post Payment') . qq|">
1140 1094
|;
1141
    print qq|<input class=submit type=submit name=action value="|
1095
    print qq|<input class="submit" type="submit" name="action" value="|
1142 1096
      . $locale->text('Use As Template') . qq|">
1143 1097
|;
1144 1098
  if ($form->{id} && !($form->{type} eq "credit_note")) {
1145 1099
    print qq|
1146
    <input class=submit type=submit name=action value="|
1100
    <input class="submit" type="submit" name="action" value="|
1147 1101
      . $locale->text('Credit Note') . qq|">
1148 1102
|;
1149 1103
  }
1150 1104
    if ($form->{radier}) {
1151 1105
    print qq|
1152
    <input class=submit type=submit name=action value="|
1106
    <input class="submit" type="submit" name="action" value="|
1153 1107
      . $locale->text('Delete') . qq|">
1154 1108
|;
1155 1109
  }
......
1157 1111

  
1158 1112
    if ($invdate > $closedto) {
1159 1113
      print qq|
1160
      <input class=submit type=submit name=action value="|
1114
      <input class="submit" type="submit" name="action" value="|
1161 1115
        . $locale->text('Order') . qq|">
1162 1116
|;
1163 1117
    }
1164 1118

  
1165 1119
  } else {
1166 1120
    if ($invdate > $closedto) {
1167
      print qq|<input class=submit type=submit name=action id=update_button value="|
1121
      print qq|<input class="submit" type="submit" name="action" id="update_button" value="|
1168 1122
        . $locale->text('Update') . qq|">
1169
      <input class=submit type=submit name=action value="|
1123
      <input class="submit" type="submit" name="action" value="|
1170 1124
        . $locale->text('Ship to') . qq|">
1171
      <input class=submit type=submit name=action value="|
1125
      <input class="submit" type="submit" name="action" value="|
1172 1126
        . $locale->text('Preview') . qq|">
1173
      <input class=submit type=submit name=action value="|
1127
      <input class="submit" type="submit" name="action" value="|
1174 1128
        . $locale->text('E-mail') . qq|">
1175
      <input class=submit type=submit name=action value="|
1129
      <input class="submit" type="submit" name="action" value="|
1176 1130
        . $locale->text('Print and Post') . qq|">
1177
      <input class=submit type=submit name=action value="|
1131
      <input class="submit" type="submit" name="action" value="|
1178 1132
        . $locale->text('Post') . qq|"> | .
1179 1133
        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
1180 1134
                         '-class' => 'submit'));
......
1196 1150
  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
1197 1151
    qq|
1198 1152

  
1199
<input type=hidden name=rowcount value=$form->{rowcount}>
1200

  
1201
<input name=callback type=hidden value="$form->{callback}">
1202
|
1153
<input type="hidden" name="rowcount" value="$form->{rowcount}">
1154
| .
1155
$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) 
1203 1156
. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
1204
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
1205
. qq|
1206
<input type=hidden name=path value=$form->{path}>
1207
<input type=hidden name=login value=$form->{login}>
1208
<input type=hidden name=password value=$form->{password}>
1209

  
1157
. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]);
1158
map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(path login password));
1159
print qq|
1210 1160
</form>
1211 1161

  
1212 1162
</body>
......
1566 1516
  print qq|
1567 1517
<body>
1568 1518

  
1569
<form method=post action=$form->{script}>
1519
<form method="post" action="$form->{script}">
1570 1520
|;
1571 1521

  
1572 1522
  # delete action variable
......
1574 1524

  
1575 1525
  foreach $key (keys %$form) {
1576 1526
    $form->{$key} =~ s/\"/&quot;/g;
1577
    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
1527
    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
1578 1528
  }
1579 1529

  
1580 1530
  print qq|
1581
<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
1531
<h2 class="confirm">| . $locale->text('Confirm!') . qq|</h2>
1582 1532

  
1583 1533
<h4>|
1584 1534
    . $locale->text('Are you sure you want to delete Invoice Number')
......
1586 1536
</h4>
1587 1537

  
1588 1538
<p>
1589
<input name=action class=submit type=submit value="|
1539
<input name="action" class="submit" type="submit" value="|
1590 1540
    . $locale->text('Yes') . qq|">
1591 1541
</form>
1592 1542
|;

Auch abrufbar als: Unified diff