Die Funktion Form::parse_html_template2() in Form::parse_html_template() umbenannt...

[kivitendo-erp.git] / bin / mozilla / ct.pl

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index e3b516b..a4171b8 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -80,7 +80,7 @@ sub search {
   $form->{fokus} = 'Form.name';
 
   $form->header();
-  print $form->parse_html_template2('ct/search');
+  print $form->parse_html_template('ct/search');
 
   $lxdebug->leave_sub();
 }
@@ -163,7 +163,7 @@ sub list_names {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   $report->set_options('top_info_text'         => join("\n", @options),
-                       'raw_bottom_info_text'  => $form->parse_html_template2('ct/list_names_bottom'),
+                       'raw_bottom_info_text'  => $form->parse_html_template('ct/list_names_bottom'),
                        'output_format'         => 'HTML',
                        'title'                 => $form->{title},
                        'attachment_basename'   => $attachment_basename . strftime('_%Y%m%d', localtime time),
@@ -382,7 +382,7 @@ sub form_header {
   if ($form->{db} eq 'vendor') {
     $customer = qq|
            <th align=right>| . $locale->text('Kundennummer') . qq|</th>
-           <td><input name=v_customer_id size=10 maxlength=35 value="$form->{v_customer_id}"></td>
+           <td><input name=v_customer_id size=10 value="$form->{v_customer_id}"></td>
 |;
   }
 
@@ -390,7 +390,7 @@ sub form_header {
 
     $customer = qq|
            <th align=right>| . $locale->text('KNr. beim Kunden') . qq|</th>
-           <td><input name=c_vendor_id size=10 maxlength=35 value="$form->{c_vendor_id}"></td>
+           <td><input name=c_vendor_id size=10 value="$form->{c_vendor_id}"></td>
 |;
   }
 
@@ -514,11 +514,11 @@ sub form_header {
        <tr height="5"></tr>
        <tr>
          <th align=right nowrap>| . $locale->text($label . ' Number') . qq|</th>
-         <td><input name="$form->{db}number" size=35 maxlength=35 value="$form->{"$form->{db}number"}"></td>
+         <td><input name="$form->{db}number" size=35 value="$form->{"$form->{db}number"}"></td>
        </tr>
         <tr>
           <th align=right nowrap>| . $locale->text('Greeting') . qq|</th>
-          <td><input id=greeting name=greeting size=30 maxlength=30 value="$form->{greeting}">&nbsp;
+          <td><input id=greeting name=greeting size=30 value="$form->{greeting}">&nbsp;
           $select_company_greeting</td>
         </tr>
        <tr>
@@ -585,9 +585,9 @@ sub form_header {
        </tr>
         <tr>
           <th align=right>| . $locale->text('Account Number') . qq|</th>
-          <td><input name=account_number size=10 value="$form->{account_number}"></td>
+          <td><input name="account_number" size="10" maxlength="15" value="$form->{account_number}"></td>
           <th align=right>| . $locale->text('Bank Code Number') . qq|</th>
-          <td><input name=bank_code size=10 value="$form->{bank_code}"></td>
+          <td><input name="bank_code" size="10" maxlength="10" value="$form->{bank_code}"></td>
           <th align=right>| . $locale->text('Bank') . qq|</th>
           <td><input name=bank size=30 value="$form->{bank}"></td>
         </tr>
@@ -648,12 +648,12 @@ $shipto
        <tr>
          <th align=right nowrap>|
     . $locale->text('Zipcode') . "/" . $locale->text('City') . qq|</th>
-         <td><input id=shiptozipcode name=shiptozipcode size=5 maxlength=10 value="$form->{shiptozipcode}">
+         <td><input id=shiptozipcode name=shiptozipcode size=5 maxlength=75 value="$form->{shiptozipcode}">
           <input id=shiptocity name=shiptocity size=30 maxlength=75 value="$form->{shiptocity}"></td>
        </tr>
        <tr>
          <th align=right nowrap>| . $locale->text('Country') . qq|</th>
-         <td><input id=shiptocountry name=shiptocountry size=35 maxlength=35 value="$form->{shiptocountry}"></td>
+         <td><input id=shiptocountry name=shiptocountry size=35 maxlength=75 value="$form->{shiptocountry}"></td>
        </tr>
        <tr>
           <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
@@ -693,75 +693,75 @@ $shipto
                 $ansprechpartner
                 <tr>
                  <th align=left nowrap>| . $locale->text('Greeting') . qq|</th>
-                  <td><input id=cp_greeting name=cp_greeting size=40 maxlength=40 value="$form->{cp_greeting}">&nbsp;
+                  <td><input id=cp_greeting name=cp_greeting size=40 maxlength=75 value="$form->{cp_greeting}">&nbsp;
                   $select_greeting</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Title') . qq|</th>
-                  <td><input id=cp_title name=cp_title size=40 maxlength=40 value="$form->{cp_title}">&nbsp;
+                  <td><input id=cp_title name=cp_title size=40 maxlength=75 value="$form->{cp_title}">&nbsp;
                   $select_title</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Department') . qq|</th>
-                  <td><input id=cp_abteilung name=cp_abteilung size=40 maxlength=40 value="$form->{cp_abteilung}">&nbsp;
+                  <td><input id=cp_abteilung name=cp_abteilung size=40 value="$form->{cp_abteilung}">&nbsp;
                   $select_department</td>
                 </tr>
                 <tr>
                   <th align=left nowrap>|
     . $locale->text('Given Name') . qq|</th>
-                  <td><input id=cp_givenname name=cp_givenname size=40 maxlength=40 value="$form->{cp_givenname}"></td>
+                  <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="$form->{cp_givenname}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Name') . qq|</th>
-                  <td><input id=cp_name name=cp_name size=40 maxlength=40 value="$form->{cp_name}"></td>
+                  <td><input id="cp_name" name="cp_name" size="40" maxlength="75" value="$form->{cp_name}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Phone1') . qq|</th>
-                  <td><input id=cp_phone1 name=cp_phone1 size=40 maxlength=40 value="$form->{cp_phone1}"></td>
+                  <td><input id="cp_phone1" name="cp_phone1" size="40" maxlength="75" value="$form->{cp_phone1}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Phone2') . qq|</th>
-                  <td><input id=cp_phone2 name=cp_phone2 size=40 maxlength=40 value="$form->{cp_phone2}"></td>
+                  <td><input id="cp_phone2" name="cp_phone2" size="40" maxlength="75" value="$form->{cp_phone2}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Fax') . qq|</th>
-                  <td><input id=cp_fax name=cp_fax size=40 maxlength=40 value="$form->{cp_fax}"></td>
+                  <td><input id=cp_fax name=cp_fax size=40 value="$form->{cp_fax}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Mobile1') . qq|</th>
-                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 maxlength=40 value="$form->{cp_mobile1}"></td>
+                  <td><input id=cp_mobile1 name=cp_mobile1 size=40 value="$form->{cp_mobile1}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Mobile2') . qq|</th>
-                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 maxlength=40 value="$form->{cp_mobile2}"></td>
+                  <td><input id=cp_mobile2 name=cp_mobile2 size=40 value="$form->{cp_mobile2}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Sat. Phone') . qq|</th>
-                  <td><input id=cp_satphone name=cp_satphone size=40 maxlength=40 value="$form->{cp_satphone}"></td>
+                  <td><input id=cp_satphone name=cp_satphone size=40 value="$form->{cp_satphone}"></td>
                 </tr>
                 <tr>
                   <th align=left nowrap>| . $locale->text('Sat. Fax') . qq|</th>
-                  <td><input id=cp_satfax name=cp_satfax size=40 maxlength=40 value="$form->{cp_satfax}"></td>
+                  <td><input id=cp_satfax name=cp_satfax size=40 value="$form->{cp_satfax}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Project') . qq|</th>
-                  <td><input id=cp_project name=cp_project size=40 maxlength=40 value="$form->{cp_project}"></td>
+                  <td><input id=cp_project name=cp_project size=40 value="$form->{cp_project}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('E-mail') . qq|</th>
-                  <td><input id=cp_email name=cp_email size=40 maxlength=40 value="$form->{cp_email}"></td>
+                  <td><input id=cp_email name=cp_email size=40 value="$form->{cp_email}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Private Phone') . qq|</th>
-                  <td><input id=cp_privatphone name=cp_privatphone size=40 maxlength=40 value="$form->{cp_privatphone}"></td>
+                  <td><input id=cp_privatphone name=cp_privatphone size=40 value="$form->{cp_privatphone}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Private E-mail') . qq|</th>
-                  <td><input id=cp_privatemail name=cp_privatemail size=40 maxlength=40 value="$form->{cp_privatemail}"></td>
+                  <td><input id=cp_privatemail name=cp_privatemail size=40 value="$form->{cp_privatemail}"></td>
                 </tr>
                 <tr>
                  <th align=left nowrap>| . $locale->text('Birthday') . qq|</th>
-                  <td><input id=cp_birthday name=cp_birthday size=40 maxlength=40 value="$form->{cp_birthday}"></td>
+                  <td><input id=cp_birthday name=cp_birthday size=40 value="$form->{cp_birthday}"></td>
                 </tr>
                 
           </table>
@@ -1153,7 +1153,8 @@ sub get_delivery {
                         transdate,
                         description,
                         qty,
-                        unit);
+                        unit,
+                        sellprice);
 
 
 
@@ -1171,6 +1172,8 @@ sub get_delivery {
     qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
   $column_header{unit} =
     qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;
+  $column_header{sellprice} =
+    qq|<th class=listheading>| . $locale->text('Sell Price') . qq|</th>|;
   $result .= qq|
 
 <table width=100%>
@@ -1195,7 +1198,7 @@ sub get_delivery {
     } else {
       map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
     }
-
+    $column_data{sellprice} = "<td>". $form->format_amount(\%myconfig,$ref->{sellprice},2)."&nbsp;</td>";
     $i++;
     $i %= 2;
     $result .= "