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.
<body onLoad="$onload">
<form method=post action=$form->{script}>
+|;
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=title value="$form->{title}">
-<input type=hidden name=vc value="vendor">
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=level value=$form->{level}>
-
-<input type=hidden name=creditlimit value=$form->{creditlimit}>
-<input type=hidden name=creditremaining value=$form->{creditremaining}>
-
-<input type=hidden name=closedto value=$form->{closedto}>
-<input type=hidden name=locked value=$form->{locked}>
+ $form->hide_form(qw(id title vc type level creditlimit creditremaining
+ closedto locked shippted storno storno_id
+ max_dunning_level dunning_amount));
-<input type=hidden name=shipped value=$form->{shipped}>
-<input type=hidden name=storno value=$form->{storno}>
-<input type=hidden name=storno_id value=$form->{storno_id}>
+ print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
-| . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
+ print qq|
<div class="listtop" width="100%">$form->{title}</div>
if ($form->{business}) {
$business = qq|
<tr>
- <th align="right">| . $locale->text('Business') . qq|</th>
- <td>$form->{business}</td>
- <th align="right">| . $locale->text('Trade Discount') . qq|</th>
- <td>|
+ <th align="right">| . $locale->text('Customer type') . qq|</th>
+ <td>$form->{business}; | . $locale->text('Trade Discount') . qq| |
. $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
. qq| %</td>
- </tr>
+ </tr>
|;
}
<form method="post" name="invoice" action="$form->{script}">
| ;
-map({print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});}
- qw(id action type media format queued printed emailed title vc discount
- creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id)) ;
-print ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") ;
-print qq|
+
+ $form->hide_form(qw(id action type media format queued printed emailed title vc discount
+ creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
+ max_dunning_level dunning_amount));
+ print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
+
+ print qq|
<input type="hidden" name="lizenzen" value="$lizenzen">
if ($form->{business}) {
$business = qq|
<tr>
- <th align=right>| . $locale->text('Business') . qq|</th>
- <td>$form->{business}</td>
- <th align=right>| . $locale->text('Trade Discount') . qq|</th>
- <td>|
+ <th align="right">| . ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type')) . qq|</th>
+ <td>$form->{business}; | . $locale->text('Trade Discount') . qq| |
. $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
. qq| %</td>
- </tr>
+ </tr>
|;
}
if ($form->{max_dunning_level}) {
$dunning = qq|
- <tr>
- <td colspan=4>
- <table>
- <tr>
- <th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
- <td><b>$form->{max_dunning_level}</b></td>
- <th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
- <td><b>|
- . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
- . qq|</b></td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
+ <td>
+ <b>$form->{max_dunning_level}</b>;
+ | . $locale->text('Dunning Amount') . qq|: <b>|
+ . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+ . qq|</b>
+ </td>
+ </tr>
|;
}
$n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
$creditremaining = qq|
- <tr>
- <td></td>
- <td colspan=3>
- <table>
- <tr>
- <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
- <td>$form->{creditlimit}</td>
- <td width=20%></td>
- <th nowrap>| . $locale->text('Remaining') . qq|</th>
- <td class="plus$n" nowrap>$form->{creditremaining}</td>
- </tr>
- </table>
- </td>
- $shipto
+ $shipto
+ <tr>
+ <td align="right">| . $locale->text('Credit Limit') . qq|</td>
+ <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
+ </tr>
</tr>
|;
} else {
<body onLoad="$onload">
<form method=post name=oe action=$form->{script}>
+
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
<script type="text/javascript" src="js/vendor_selection.js"></script>
<script type="text/javascript" src="js/calculate_qty.js"></script>
+|;
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=action value=$form->{action}>
-
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=formname value=$form->{formname}>
-<input type=hidden name=media value=$form->{media}>
-<input type=hidden name=format value=$form->{format}>
-<input type=hidden name=proforma value=$form->{proforma}>
-
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
-
-<input type=hidden name=vc value=$form->{vc}>
-
-<input type=hidden name=title value="$form->{title}">
-
-<input type=hidden name=discount value=$form->{discount}>
-<input type=hidden name=creditlimit value=$form->{creditlimit}>
-<input type=hidden name=creditremaining value=$form->{creditremaining}>
+ $form->hide_form(qw(id action type vc formname media format proforma queued printed emailed
+ title discount creditlimit creditremaining tradediscount business
+ max_dunning_level dunning_amount));
-<input type=hidden name=tradediscount value=$form->{tradediscount}>
-<input type=hidden name=business value=$form->{business}>
-<input type=hidden name=webdav value=$webdav>
+ print qq|
<table width=100%>
<tr class=listtop>
'Buchungsgruppen' => 'Buchungsgruppen',
'Buchungsjournal' => 'Buchungsjournal',
'Buchungsnummer' => 'Buchungsnummer',
- 'Business' => 'Firma',
'Business Number' => 'Firmennummer',
'Business Volume' => 'Geschäftsvolumen',
'Business deleted!' => 'Firma gelöscht.',
'Billing Address' => 'Rechnungsadresse',
'Bin' => 'Lagerplatz',
'Bin List' => 'Lagerliste',
- 'Business' => 'Firma',
'CANCELED' => 'Storniert',
'Cannot delete invoice!' => 'Rechnung kann nicht gelöscht werden!',
'Cannot post invoice for a closed period!' => 'Das Rechnungsdatum fällt in einen abgeschlossen Zeitraum!',
'Customer missing!' => 'Kundenname fehlt!',
'Customer not on file or locked!' => 'Dieser Kunde existiert nicht oder ist gesperrt.',
'Customer not on file!' => 'Kunde ist nicht in der Datenbank!',
+ 'Customer type' => 'Kundentyp',
'DELETED' => 'Gelöscht',
'DUNNING STARTED' => 'Mahnprozess gestartet',
'Dataset upgrade' => 'Datenbankaktualisierung',
'Bin' => 'Lagerplatz',
'Bin List' => 'Lagerliste',
'Bis' => 'bis',
- 'Business' => 'Firma',
'C' => 'G',
'CANCELED' => 'Storniert',
'Cannot delete order!' => 'Auftrag kann nicht gelöscht werden!',
'Customer missing!' => 'Kundenname fehlt!',
'Customer not on file or locked!' => 'Dieser Kunde existiert nicht oder ist gesperrt.',
'Customer not on file!' => 'Kunde ist nicht in der Datenbank!',
+ 'Customer type' => 'Kundentyp',
'DELETED' => 'Gelöscht',
'DUNNING STARTED' => 'Mahnprozess gestartet',
'Dataset upgrade' => 'Datenbankaktualisierung',
'Vendor missing!' => 'Lieferant fehlt!',
'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',
'Vendor not on file!' => 'Lieferant ist nicht in der Datenbank!',
+ 'Vendor type' => 'Lieferantentyp',
'What type of item is this?' => 'Was ist dieser Artikel?',
'Workflow purchase_order' => 'Workflow Lieferantenauftrag',
'Workflow request_quotation' => 'Workflow Preisanfrage',