X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Frp.pl;h=b0831022cba4fd2678079abe4b85bfe33462e4f3;hb=6a8787147ad643549eb26cb4f9a373b5b354b8b9;hp=f618c5b69226570dab2c760f5fdc6bcc74271205;hpb=93c6ec51f6bb239eb52c3e0b0d1adf87f57796ee;p=kivitendo-erp.git

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index f618c5b69..b0831022c 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -85,6 +85,8 @@ use strict;
 # $locale->text('Trial Balance')
 # $locale->text('AR Aging')
 # $locale->text('AP Aging')
+# $locale->text('Search AR Aging')
+# $locale->text('Search AP Aging')
 # $locale->text('Tax collected')
 # $locale->text('Tax paid')
 # $locale->text('Receipts')
@@ -92,6 +94,7 @@ use strict;
 # $locale->text('Project Transactions')
 # $locale->text('Non-taxable Sales')
 # $locale->text('Non-taxable Purchases')
+# $locale->text('Business evaluation')
 
 # $form->parse_html_template('rp/html_report_susa')
 
@@ -107,10 +110,6 @@ my $rp_access_map = {
   'balance_sheet'    => 'report',
 };
 
-# subs use these pretty freely, so declare them here
-our (%column_data, @column_index);
-our ($subtotalnetamount, $subtotaltax, $subtotal);
-
 sub check_rp_access {
   my $form     = $main::form;
 
@@ -133,8 +132,8 @@ sub report {
             'balance_sheet'        => 'Balance Sheet',
             'income_statement'     => 'Income Statement',
             'trial_balance'        => 'Trial Balance',
-            'ar_aging'             => 'AR Aging',
-            'ap_aging'             => 'Offene Verbindlichkeiten',
+            'ar_aging'             => 'Search AR Aging',
+            'ap_aging'             => 'Search AP Aging',
             'tax_collected'        => 'Tax collected',
             'tax_paid'             => 'Tax paid',
             'nontaxable_sales'     => 'Non-taxable Sales',
@@ -142,7 +141,7 @@ sub report {
             'receipts'             => 'Receipts',
             'payments'             => 'Payments',
             'projects'             => 'Project Transactions',
-            'bwa'                  => 'Betriebswirtschaftliche Auswertung',
+            'bwa'                  => 'Business evaluation',
   );
 
   $form->{title} = $locale->text($title{ $form->{report} });
@@ -266,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
 |;
 
@@ -806,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
@@ -1357,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}";
@@ -1508,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);
@@ -1660,8 +1673,8 @@ sub aging {
     'invnumber' => { 'text' => $locale->text('Invoice'), },
     'transdate' => { 'text' => $locale->text('Date'), },
     'duedate'   => { 'text' => $locale->text('Due'), },
-    'amount'        => { 'text' => $locale->text('Amount'), },
-    'open'       => { 'text' => $locale->text('Open'), },
+    'amount'    => { 'text' => $locale->text('Amount'), },
+    'open'      => { 'text' => $locale->text('Open'), },
   );
 
   my %column_alignment = ('statement' => 'center',
@@ -1708,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;
@@ -1764,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();
@@ -2066,7 +2079,7 @@ sub print_form {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
     $form->{addition} = "PRINTED";
     $form->{what_done} = $form->{type};
-    $form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history;
   }
   # /saving the history
   $main::lxdebug->leave_sub();
@@ -2115,19 +2128,19 @@ sub generate_tax_report {
   my $descvar     = "$form->{accno}_description";
   my $description = $form->escape($form->{$descvar});
   my $ratevar     = "$form->{accno}_rate";
-  our $taxrate; # most likely error
+  my ($subtotalnetamount, $subtotaltax, $subtotal) = (0, 0, 0);
 
   my $department = $form->escape($form->{department});
 
   # construct href
   my $href =
-    "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&report=$form->{report}";
 
   # construct callback
   $description = $form->escape($form->{$descvar},   1);
   $department  = $form->escape($form->{department}, 1);
   my $callback    =
-    "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
+    "$form->{script}?&action=generate_tax_report&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&report=$form->{report}";
 
   my $title = $form->escape($form->{title});
   $href .= "&title=$title";
@@ -2138,6 +2151,7 @@ sub generate_tax_report {
 
   my @columns =
     $form->sort_columns(qw(id transdate invnumber name netamount tax amount));
+  my @column_index;
 
   foreach my $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
@@ -2242,7 +2256,7 @@ sub generate_tax_report {
 
     if ($form->{l_subtotal} eq 'Y') {
       if ($sameitem ne $ref->{ $form->{sort} }) {
-        &tax_subtotal;
+        tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
         $sameitem = $ref->{ $form->{sort} };
       }
     }
@@ -2258,6 +2272,7 @@ sub generate_tax_report {
       $ref->{$_} = $form->format_amount(\%myconfig, $ref->{$_}, 2, "&nbsp;");
     } qw(netamount tax amount);
 
+    my %column_data;
     $column_data{id}        = qq|<td>$ref->{id}</td>|;
     $column_data{invnumber} =
       qq|<td><a href=$module?action=edit&id=$ref->{id}&callback=$callback>$ref->{invnumber}</a></td>|;
@@ -2282,9 +2297,10 @@ sub generate_tax_report {
   }
 
   if ($form->{l_subtotal} eq 'Y') {
-    &tax_subtotal;
+    tax_subtotal(\@column_index, \$subtotalnetamount, \$subtotaltax, \$subtotal);
   }
 
+  my %column_data;
   map { $column_data{$_} = qq|<th>&nbsp;</th>| } @column_index;
 
   print qq|
@@ -2322,27 +2338,30 @@ sub generate_tax_report {
 sub tax_subtotal {
   $main::lxdebug->enter_sub();
 
+  my ($column_index, $subtotalnetamount, $subtotaltax, $subtotal) = @_;
+
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+  my %column_data;
+  map { $column_data{$_} = "<td>&nbsp;</td>" } @{ $column_index };
 
-  $subtotalnetamount = $form->format_amount(\%myconfig, $subtotalnetamount, 2, "&nbsp;");
-  $subtotaltax       = $form->format_amount(\%myconfig, $subtotaltax, 2, "&nbsp;");
-  $subtotal          = $form->format_amount(\%myconfig, $subtotalnetamount + $subtotaltax, 2, "&nbsp;");
+  $$subtotalnetamount = $form->format_amount(\%myconfig, $$subtotalnetamount, 2, "&nbsp;");
+  $$subtotaltax       = $form->format_amount(\%myconfig, $$subtotaltax, 2, "&nbsp;");
+  $$subtotal          = $form->format_amount(\%myconfig, $$subtotalnetamount + $$subtotaltax, 2, "&nbsp;");
 
-  $column_data{netamount} = "<th class=listsubtotal align=right>$subtotalnetamount</th>";
-  $column_data{tax}       = "<th class=listsubtotal align=right>$subtotaltax</th>";
-  $column_data{amount}    = "<th class=listsubtotal align=right>$subtotal</th>";
+  $column_data{netamount} = "<th class=listsubtotal align=right>$$subtotalnetamount</th>";
+  $column_data{tax}       = "<th class=listsubtotal align=right>$$subtotaltax</th>";
+  $column_data{amount}    = "<th class=listsubtotal align=right>$$subtotal</th>";
 
-  $subtotalnetamount = 0;
-  $subtotaltax       = 0;
+  $$subtotalnetamount = 0;
+  $$subtotaltax       = 0;
 
   print qq|
         <tr class=listsubtotal>
 |;
-  map { print "\n$column_data{$_}" } @column_index;
+  map { print "\n$column_data{$_}" } @{ $column_index };
 
   print qq|
         </tr>
@@ -2416,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);