Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fc490063

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID fc490063361896eb3b2aa0939fc0df716ae38262
  • Vorgänger fb4d2ffa
  • Nachfolger a8da2c89

Mehr Kosmetik:
1. In mehr Masken die Beschreibungsspalte gefüllt (wieder mit "höchstes Mahnlevel" und "Kundentyp"/"Lieferantentyp").
2. "Firma" in "Lieferantentyp" bzw. "Kundentyp" umbenannt.
3. Kunden-/Lieferantentyp und Rabatt nach links angeordnet.

Nicht Kosmetik sondern Funktion: Die Höchste Mahnstufe und die gemahnte Summe werden im Formular mitgeschleift, damit sie auch nach "Erneuern" noch angezeigt werden.

Unterschiede anzeigen:

bin/mozilla/oe.pl
598 598
  if ($form->{business}) {
599 599
    $business = qq|
600 600
	      <tr>
601
		<th align=right>| . $locale->text('Business') . qq|</th>
602
		<td>$form->{business}</td>
603
		<th align=right>| . $locale->text('Trade Discount') . qq|</th>
604
		<td>|
601
          <th align="right">| . ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type')) . qq|</th>
602
          <td>$form->{business}; | . $locale->text('Trade Discount') . qq| |
605 603
      . $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
606 604
      . qq| %</td>
607
	      </tr>
605
        </tr>
608 606
|;
609 607
  }
610 608

  
611 609
  if ($form->{max_dunning_level}) {
612 610
    $dunning = qq|
613
	      <tr>
614
                <td colspan=4>
615
                <table>
616
                  <tr>
617
		<th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
618
		<td><b>$form->{max_dunning_level}</b></td>
619
		<th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
620
		<td><b>|
621
      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
622
      . qq|</b></td>
623
	      </tr>
624
              </table>
625
             </td>
626
            </tr>
611
      <tr>
612
        <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
613
        <td>
614
          <b>$form->{max_dunning_level}</b>;
615
          | . $locale->text('Dunning Amount') . qq|: <b>|
616
        . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
617
        . qq|</b>
618
        </td>
619
      </tr>
627 620
|;
628 621
  }
629 622

  
......
657 650
    $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
658 651

  
659 652
    $creditremaining = qq|
660
	      <tr>
661
		<td></td>
662
		<td colspan=3>
663
		  <table>
664
		    <tr>
665
		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
666
		      <td>$form->{creditlimit}</td>
667
		      <td width=20%></td>
668
		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
669
		      <td class="plus$n" nowrap>$form->{creditremaining}</td>
670
		    </tr>
671
		  </table>
672
		</td>
673
                $shipto
653
        $shipto
654
        <tr>
655
          <td align="right">| . $locale->text('Credit Limit') . qq|</td>
656
          <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
657
        </tr>
674 658
	      </tr>
675 659
|;
676 660
  } else {
......
764 748
<body onLoad="$onload">
765 749

  
766 750
<form method=post name=oe action=$form->{script}>
751

  
767 752
 <script type="text/javascript" src="js/common.js"></script>
768 753
 <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
769 754
 <script type="text/javascript" src="js/vendor_selection.js"></script>
770 755
 <script type="text/javascript" src="js/calculate_qty.js"></script>
756
|;
771 757

  
772
<input type=hidden name=id value=$form->{id}>
773
<input type=hidden name=action value=$form->{action}>
774

  
775
<input type=hidden name=type value=$form->{type}>
776
<input type=hidden name=formname value=$form->{formname}>
777
<input type=hidden name=media value=$form->{media}>
778
<input type=hidden name=format value=$form->{format}>
779
<input type=hidden name=proforma value=$form->{proforma}>
780

  
781
<input type=hidden name=queued value="$form->{queued}">
782
<input type=hidden name=printed value="$form->{printed}">
783
<input type=hidden name=emailed value="$form->{emailed}">
784

  
785
<input type=hidden name=vc value=$form->{vc}>
786

  
787
<input type=hidden name=title value="$form->{title}">
788

  
789
<input type=hidden name=discount value=$form->{discount}>
790
<input type=hidden name=creditlimit value=$form->{creditlimit}>
791
<input type=hidden name=creditremaining value=$form->{creditremaining}>
758
  $form->hide_form(qw(id action type vc formname media format proforma queued printed emailed
759
                      title discount creditlimit creditremaining tradediscount business
760
                      max_dunning_level dunning_amount));
792 761

  
793
<input type=hidden name=tradediscount value=$form->{tradediscount}>
794
<input type=hidden name=business value=$form->{business}>
795
<input type=hidden name=webdav value=$webdav>
762
  print qq|
796 763

  
797 764
<table width=100%>
798 765
  <tr class=listtop>

Auch abrufbar als: Unified diff