X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frc.pl;h=0f01ac98a98feb04bbd8eccc90b60f62b7f56fa2;hb=19db5b9099df8a70daac82388e45c0aee17c9266;hp=4df612cc57ad353a70d0230d29fb5184402512d9;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl
index 4df612cc5..0f01ac98a 100644
--- a/bin/mozilla/rc.pl
+++ b/bin/mozilla/rc.pl
@@ -35,16 +35,24 @@ use SL::RC;
 
 require "bin/mozilla/common.pl";
 
+use strict;
+
 1;
 
 # end of main
 
 sub reconciliation {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('cash');
 
   RC->paymentaccounts(\%myconfig, \%$form);
 
-  $selection = "";
+  my $selection = "";
   map { $selection .= "<option>$_->{accno}--$_->{description}\n" }
     @{ $form->{PR} };
 
@@ -52,7 +60,7 @@ sub reconciliation {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->{"jsscript"} = 1;
   $form->header;
-  $onload = qq|focus()|;
+  my $onload = qq|focus()|;
   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
 
   print qq|
@@ -68,19 +76,19 @@ sub reconciliation {
   <tr>
     <td>
       <table>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Account') . qq|</th>
-	  <td colspan=3><select name=accno>$selection</select>
-	  </td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('From') . qq|</th>
-	  <td><input name=fromdate id=fromdate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-     <input type="button" name="fromdate" id="trigger_fromdate" value="?"></td>
-	  <th align=right>| . $locale->text('Until') . qq|</th>
-	  <td><input name=todate id=todate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-     <input type="button" name="todate" id="trigger_todate" value="?"></td>
-	</tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Account') . qq|</th>
+          <td colspan=3><select name=accno>$selection</select>
+          </td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td><input name=fromdate id=fromdate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="fromdate" id="trigger_fromdate" value="?"></td>
+          <th align=right>| . $locale->text('Until') . qq|</th>
+          <td><input name=todate id=todate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="todate" id="trigger_todate" value="?"></td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -96,9 +104,6 @@ sub reconciliation {
 <br>
 <input type=hidden name=nextsub value=get_payments>
 
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
 
@@ -108,13 +113,18 @@ sub reconciliation {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub continue { call_sub($form->{"nextsub"}); }
+sub continue { call_sub($main::form->{"nextsub"}); }
 
 sub get_payments {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('cash');
 
   ($form->{accno}, $form->{account}) = split /--/, $form->{accno};
 
@@ -122,14 +132,20 @@ sub get_payments {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub display_form {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  @column_index = qw(cleared transdate source name credit debit balance);
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
+  $main::auth->assert('cash');
+
+  my @column_index = qw(cleared transdate source name credit debit balance);
+  my %column_header;
   $column_header{cleared} = "<th>&nbsp;</th>";
   $column_header{source}  =
     "<th class=listheading>" . $locale->text('Source') . "</a></th>";
@@ -153,6 +169,7 @@ sub display_form {
   $column_header{balance} =
     "<th class=listheading>" . $locale->text('Balance') . "</a></th>";
 
+  my $option;
   if ($form->{fromdate}) {
     $option .= "\n<br>" if ($option);
     $option .=
@@ -186,7 +203,7 @@ sub display_form {
   <tr>
     <td>
       <table width=100%>
-	<tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "\n$column_header{$_}" } @column_index;
@@ -195,29 +212,36 @@ sub display_form {
         </tr>
 |;
 
-  $ml = ($form->{category} eq 'A') ? -1 : 1;
+  my $ml = ($form->{category} eq 'A') ? -1 : 1;
   $form->{beginningbalance} *= $ml;
-  $clearedbalance = $balance = $form->{beginningbalance};
-  $i              = 0;
-  $id             = 0;
+  my $balance        = $form->{beginningbalance};
+  my $clearedbalance = $balance;
+  my $i              = 0;
+  my $id             = 0;
 
+  my %column_data;
   map { $column_data{$_} = "<td>&nbsp;</td>" }
     qw(cleared transdate source name debit credit);
   $column_data{balance} =
     "<td align=right>"
     . $form->format_amount(\%myconfig, $balance, 2, 0) . "</td>";
-  $j = 0;
+  my $j = 0;
   print qq|
-	<tr class=listrow$j>
+        <tr class=listrow$j>
 |;
 
   map { print "\n$column_data{$_}" } @column_index;
 
   print qq|
-	</tr>
+        </tr>
 |;
 
-  foreach $ref (@{ $form->{PR} }) {
+  my $cleared;
+  my $totaldebits;
+  my $totalcredits;
+  my $fx_transaction;
+  my $fx;
+  foreach my $ref (@{ $form->{PR} }) {
 
     $balance += $ref->{amount} * $ml;
     $cleared += $ref->{amount} * $ml if $ref->{cleared};
@@ -268,13 +292,13 @@ sub display_form {
     $j++;
     $j %= 2;
     print qq|
-	<tr class=listrow$j>
+        <tr class=listrow$j>
 |;
 
     map { print "\n$column_data{$_}" } @column_index;
 
     print qq|
-	</tr>
+        </tr>
 |;
 
   }
@@ -290,14 +314,14 @@ sub display_form {
     . $form->format_amount(\%myconfig, $totalcredits, 2, "&nbsp;") . "</th>";
 
   print qq|
-	<tr class=listtotal>
+        <tr class=listtotal>
 |;
 
   map { print "\n$column_data{$_}" } @column_index;
 
   $form->{statementbalance} =
     $form->parse_amount(\%myconfig, $form->{statementbalance});
-  $difference =
+  my $difference =
     $form->format_amount(\%myconfig,
                         $form->{statementbalance} - $clearedbalance - $cleared,
                         2, 0);
@@ -307,18 +331,18 @@ sub display_form {
 
   $clearedbalance = $form->format_amount(\%myconfig, $clearedbalance, 2, 0);
 
+  my $exchdiff;
   if ($fx) {
     $fx       = $form->format_amount(\%myconfig, $fx, 2, 0);
     $exchdiff = qq|
-		<th align=right nowrap>|
-      . $locale->text('Exchangerate Difference') . qq|</th>
-		<td width=10%></td>
-		<td align=right>$fx</td>
+          <th align=right nowrap>| . $locale->text('Exchangerate Difference') . qq|</th>
+          <td width=10%></td>
+          <td align=right>$fx</td>
 |;
   }
 
   print qq|
-	</tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -326,34 +350,34 @@ sub display_form {
     <td>
       <table width=100%>
         <tr valign=top>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Cleared Balance') . qq|</th>
-		<td width=10%></td>
-		<td align=right>$clearedbalance</td>
-	      </tr>
-	      <tr>
-		$exchdiff
-	      </tr>
-	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Statement Balance') . qq|</th>
-		<td width=10%></td>
-		<td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Difference') . qq|</th>
-		<td width=10%></td>
-		<td align=right><input name=null size=11 value=$difference></td>
-		<input type=hidden name=difference value=$difference>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
+          <td>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Cleared Balance') . qq|</th>
+                <td width=10%></td>
+                <td align=right>$clearedbalance</td>
+              </tr>
+              <tr>
+                $exchdiff
+              </tr>
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Statement Balance') . qq|</th>
+                <td width=10%></td>
+                <td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Difference') . qq|</th>
+                <td width=10%></td>
+                <td align=right><input name=null size=11 value=$difference></td>
+                <input type=hidden name=difference value=$difference>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -369,9 +393,6 @@ sub display_form {
 <input type=hidden name=fromdate value=$form->{fromdate}>
 <input type=hidden name=todate value=$form->{todate}>
 
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Update') . qq|">
@@ -386,15 +407,21 @@ sub display_form {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub update {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('cash');
 
   RC->payment_transactions(\%myconfig, \%$form);
 
-  foreach $ref (@{ $form->{PR} }) {
+  my $i;
+  foreach my $ref (@{ $form->{PR} }) {
     if (!$ref->{fx_transaction}) {
       $i++;
       $ref->{cleared} = ($form->{"cleared_$i"}) ? "checked" : "";
@@ -403,11 +430,16 @@ sub update {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub select_all {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('cash');
 
   RC->payment_transactions(\%myconfig, \%$form);
 
@@ -416,20 +448,25 @@ sub select_all {
 
   &display_form;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub done {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('cash');
 
-  $form->{callback} =
-    "$form->{script}?action=reconciliation&login=$form->{login}&password=$form->{password}";
+  $form->{callback} = "$form->{script}?action=reconciliation";
 
   $form->error($locale->text('Out of balance!')) if ($form->{difference} *= 1);
 
   RC->reconcile(\%myconfig, \%$form);
   $form->redirect;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }