Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

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

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 9862f30..b083102 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -265,14 +265,14 @@ sub report {
 
 <input type=hidden name=title value="$form->{title}">
 
-<table width=100%>
+<table width=100% border="0">
   <tr>
     <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
-      <table>
+      <table border="0">
       $department
 |;
 
@@ -805,6 +805,18 @@ $jsscript
           <th align=right>| . $locale->text($label) . qq|</th>
           <td>$vc</td>
         </tr>
+        <tr>
+          <td>| . $locale->text('Review of Aging list') . qq|</td>
+          <td><select name="review_of_aging_list">
+              <option></option>
+              <option>0-30</option>
+              <option>30-60</option>
+              <option>60-90</option>
+              <option>90-120</option>
+              <option>> 120</option>
+              </select>
+          </td>
+        </tr>
         <tr>
           <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
               $button1
@@ -1356,6 +1368,7 @@ sub generate_trial_balance {
                        'pdf_template'         => 'rp/html_report_susa',
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   # add sort and escape callback, this one we use for the add sub
   $form->{callback} = $href .= "&sort=$form->{sort}";
@@ -1507,6 +1520,7 @@ sub list_accounts {
                        'std_column_visibility' => 1,
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
@@ -1707,6 +1721,8 @@ sub aging {
                        'title'                => $form->{title},
                        'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
     );
+  $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $previous_ctid = 0;
   my $row_idx       = 0;
@@ -1763,8 +1779,6 @@ sub aging {
                          'raw_bottom_info_text' => $raw_bottom_info_text);
   }
 
-  $report->set_options_from_form();
-
   $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();
@@ -2421,6 +2435,8 @@ sub list_payments {
     );
   $report->set_options_from_form();
 
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
+
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);