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