X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/54e4131e091831e00a861fe2c4f53e344b87ddca..9fc09e82e0029be8a42c67d6414e33daf2a3eba8:/bin/mozilla/cp.pl

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index a80e8e176..a62a9ebff 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -32,11 +32,16 @@
 #======================================================================
 
 use SL::CP;
-use SL::OP;
 use SL::IS;
 use SL::IR;
 
-require "$form->{path}/arap.pl";
+use strict ("vars", "subs");
+#use warnings;
+
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/common.pl";
+
+our ($form, %myconfig, $lxdebug, $locale, $auth);
 
 1;
 
@@ -45,6 +50,10 @@ require "$form->{path}/arap.pl";
 sub payment {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my (@curr);
+
   $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
   $form->{arap} = lc $form->{ARAP};
 
@@ -64,14 +73,14 @@ sub payment {
   }
 
   # departments
-  if (@{ $form->{all_departments} }) {
+  if (@{ $form->{all_departments} || [] }) {
     $form->{selectdepartment} = "<option>\n";
     $form->{department}       = "$form->{department}--$form->{department_id}";
 
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+    } (@{ $form->{all_departments} || [] });
   }
 
   CP->paymentaccounts(\%myconfig, \%$form);
@@ -87,7 +96,7 @@ sub payment {
   } @{ $form->{PR}{ $form->{ARAP} } };
 
   # currencies
-  @curr = split /:/, $form->{currencies};
+  @curr = split(/:/, $form->{currencies});
   chomp $curr[0];
   $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
     $curr[0];
@@ -106,6 +115,11 @@ sub payment {
 sub form_header {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
+  my ($jsscript, $button1, $button2, $onload);
+
   $vclabel = ucfirst $form->{vc};
   $vclabel = $locale->text($vclabel);
 
@@ -130,22 +144,22 @@ sub form_header {
       $form->format_amount(\%myconfig, $form->{exchangerate});
     if ($form->{forex}) {
       $exchangerate = qq|
- 	      <tr>
-		<th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
-		<td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td>
-	      </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
+                <td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td>
+              </tr>
 |;
     } else {
       $exchangerate = qq|
- 	      <tr>
-		<th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
-		<td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
-	      </tr>
+               <tr>
+                <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
+                <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
+              </tr>
 |;
     }
   }
 
-  foreach $item ($form->{vc}, account, currency, $form->{ARAP}, department) {
+  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -167,23 +181,13 @@ sub form_header {
   # $locale->text('AR')
   # $locale->text('AP')
 
-  $department = qq|
-              <tr>
-	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-		<td><select name=department>$form->{selectdepartment}</select>
-		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-
-	      </td>
-	    </tr>
-| if $form->{selectdepartment};
-
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
   if ($form->{jsscript}) {
 
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}">
+       <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}" onBlur=\"check_right_date_format(this)\">
        <input type=button name=datepaid id="trigger1" value=|
       . $locale->text('button') . qq|></td>
        |;
@@ -195,17 +199,19 @@ sub form_header {
 
     # without JavaScript Calendar
     $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
+                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
   }
-
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->header;
 
   $arap = lc $form->{ARAP};
-
+  $onload = qq|focus()|;
+  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
   print qq|
-<body>
+<body onLoad="$onload">
 
-<form method=post action=$form->{script}>
+<form method=post action=cp.pl>
 
 <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
 <input type=hidden name=closedto value=$form->{closedto}>
@@ -228,88 +234,82 @@ sub form_header {
     <td>
       <table width=100%>
         <tr valign=top>
-	  <td>
-	    <table>
-	      <tr>
-	        <td align=right>
-		<input name=all_vc type=checkbox style=checkbox value=Y $allvc>
-		<input type=hidden name="oldall_vc" value="$form->{all_vc}"></td>
-		<th align=left>| . $locale->text('All') . qq|</th>
-	      </tr>
-	      <tr>
-		<th align=right>$vclabel</th>
-		<td>$vc</td>
-                <input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}">
-                <input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
-		<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
-	      </tr>
-	      <tr valign=top>
-		<th align=right nowrap>| . $locale->text('Address') . qq|</th>
-		<td colspan=2>
-		  <table>
-		    <tr>
-		      <td>$form->{street}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{zipcode}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{city}</td>
-		    </tr>
-		    <tr>
-		      <td>$form->{country}</td>
-		    </tr>
-		  </table>
-		</td>
-		<input type=hidden name=street value="$form->{street}">
-		<input type=hidden name=zipcode value="$form->{zipcode}">
-		<input type=hidden name=city value="$form->{city}">
-		<input type=hidden name=country value="$form->{country}">
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Memo') . qq|</th>
-		<td colspan=2><input name="memo" size=30 value="$form->{memo}"></td>
-	      </tr>
-	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      $department
-	      <tr>
-	        <th align=right nowrap>| . $locale->text($form->{ARAP}) . qq|</th>
-		<td colspan=3><select name=$form->{ARAP}>$form->{"select$form->{ARAP}"}</select>
-		</td>
-		<input type=hidden name="select$form->{ARAP}" value="$form->{"select$form->{ARAP}"}">
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Account') . qq|</th>
-		<td colspan=3><select name=account>$form->{selectaccount}</select>
-		<input type=hidden name=selectaccount value="$form->{selectaccount}">
-		</td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Date') . qq|</th>
+          <td>
+            <table>
+              <tr>
+                <td align=right>
+                <input name=all_vc type=checkbox style=checkbox value=Y $allvc>
+                <input type=hidden name="oldall_vc" value="$form->{all_vc}"></td>
+                <th align=left>| . $locale->text('All') . qq|</th>
+              </tr>
+              <tr>
+                <th align=right>$vclabel</th>
+                <td>$vc</td>
+                <input type=hidden name="select$form->{vc}" value="| . H($form->{"select$form->{vc}"}) . qq|">
+                <input type=hidden name="$form->{vc}_id" value="|    . H($form->{"$form->{vc}_id"}) . qq|">
+                <input type=hidden name="old$form->{vc}" value="|    . H($form->{"old$form->{vc}"}) . qq|">
+              </tr>
+              <tr valign=top>
+                <th align=right nowrap>| . $locale->text('Address') . qq|</th>
+                <td colspan=2>
+                  <table>
+                    <tr>
+                      <td>$form->{street}</td>
+                    </tr>
+                    <tr>
+                      <td>$form->{zipcode}</td>
+                    </tr>
+                    <tr>
+                      <td>$form->{city}</td>
+                    </tr>
+                    <tr>
+                      <td>$form->{country}</td>
+                    </tr>
+                  </table>
+                </td>
+                <input type=hidden name=street value="$form->{street}">
+                <input type=hidden name=zipcode value="$form->{zipcode}">
+                <input type=hidden name=city value="$form->{city}">
+                <input type=hidden name=country value="$form->{country}">
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Memo') . qq|</th>
+                <td colspan=2><input name="memo" size=30 value="$form->{memo}"></td>
+              </tr>
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              $department
+              <tr>
+                <th align=right nowrap>| . $locale->text('Account') . qq|</th>
+                <td colspan=3><select name=account>$form->{selectaccount}</select>
+                <input type=hidden name=selectaccount value="$form->{selectaccount}">
+                </td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Currency') . qq|</th>
-		<td><select name=currency>$form->{selectcurrency}</select></td>
-		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-		<input type=hidden name=oldcurrency value=$form->{oldcurrency}>
-	      </tr>
-	      $exchangerate
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Source') . qq|</th>
-		<td colspan=3><input name=source value="$form->{source}" size=10></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Amount') . qq|</th>
-		<td colspan=3><input name=amount size=10 value=|
-    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Currency') . qq|</th>
+                <td><select name=currency>$form->{selectcurrency}</select></td>
+                <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
+                <input type=hidden name=oldcurrency value=$form->{oldcurrency}>
+              </tr>
+              $exchangerate
+              <tr>
+                <th align=right nowrap>| . $locale->text('Source') . qq|</th>
+                <td colspan=3><input name=source value="$form->{source}" size=10></td>
+              </tr>
+              <tr>
+                <th align="right" nowrap>| . $locale->text('Amount') . qq|</th>
+                <td colspan="3"><input name="amount" size="10" value="|
+    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|" onBlur=\"check_right_number_format(this)\"></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -317,12 +317,30 @@ sub form_header {
 $jsscript
 |;
 
+  if ($form->{openinvoices_other_currencies}) {
+    my $warning = $form->{vc} eq 'customer' ? $::locale->text('There are #1 more open invoices for this customer with other currencies.', $form->{openinvoices_other_currencies})
+                :                             $::locale->text('There are #1 more open invoices from this vendor with other currencies.',  $form->{openinvoices_other_currencies});
+
+    print qq|
+
+  <input type="hidden" name="openinvoices_other_currencies" value="| . H($form->{openinvoices_other_currencies}) . qq|">
+  <tr>
+   <td><b>| . $::locale->text('Note') . qq|: $warning</b></td>
+  </tr>
+|;
+  }
+
   $lxdebug->leave_sub();
 }
 
 sub list_invoices {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my (@column_index, %column_data, $colspan, $invoice);
+  my ($totalamount, $totaldue, $totalpaid);
+
   @column_index = qw(invnumber transdate amount due checked paid);
 
   $colspan = $#column_index + 1;
@@ -334,9 +352,9 @@ sub list_invoices {
   <tr>
     <td>
       <table width=100%>
-	<tr>
-	  <th class=listheading colspan=$colspan>$invoice</th>
-	</tr>
+        <tr>
+          <th class=listheading colspan=$colspan>$invoice</th>
+        </tr>
 |;
 
   $column_data{invnumber} =
@@ -360,7 +378,9 @@ sub list_invoices {
         </tr>
 |;
 
-  for $i (1 .. $form->{rowcount}) {
+  for my $i (1 .. $form->{rowcount}) {
+
+    my $j = 0;
 
     map {
       $form->{"${_}_$i"} =
@@ -397,7 +417,7 @@ sub list_invoices {
     $j++;
     $j %= 2;
     print qq|
-	<tr class=listrow$j>
+        <tr class=listrow$j>
 |;
     map { print "$column_data{$_}\n" } @column_index;
     print qq|
@@ -437,6 +457,10 @@ sub list_invoices {
 sub form_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my ($media, $format, $latex_templates);
+
   $form->{DF}{ $form->{format} } = "selected";
   $form->{OP}{ $form->{media} }  = "selected";
 
@@ -454,7 +478,7 @@ sub form_footer {
     $format .= qq|
             <option value=postscript $form->{DF}{postscript}>|
       . $locale->text('Postscript') . qq|
-	    <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
+            <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
   }
 
   print qq|
@@ -464,10 +488,6 @@ sub form_footer {
 </table>
 <input type=hidden name=rowcount value=$form->{rowcount}>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <br>
 <input class=submit type=submit name=action value="|
     . $locale->text('Update') . qq|">
@@ -483,14 +503,7 @@ sub form_footer {
   print qq|
 <select name=format>$format</select>
 <select name=media>$media</select>
-|;
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
   </form>
 
 </body>
@@ -503,8 +516,12 @@ sub form_footer {
 sub update {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($new_name_selected) = @_;
 
+  my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
   if ($form->{vc} eq 'customer') {
     $buysell = "buy";
   } else {
@@ -564,13 +581,8 @@ sub update {
     }
   }
 
-  $form->{exchangerate} = $exchangerate
-    if (
-        $form->{forex} = (
-                   $exchangerate =
-                     $form->check_exchangerate(
-                     \%myconfig, $form->{currency}, $form->{datepaid}, $buysell
-                     )));
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
 
@@ -579,8 +591,8 @@ sub update {
 
     $form->{queued} = "";
 
-    $i = 0;
-    foreach $ref (@{ $form->{PR} }) {
+    my $i = 0;
+    foreach my $ref (@{ $form->{PR} }) {
       $i++;
       $form->{"id_$i"}        = $ref->{id};
       $form->{"invnumber_$i"} = $ref->{invnumber};
@@ -603,8 +615,11 @@ sub update {
   }
 
   # recalculate
-  $amount = $form->{amount};
-  for $i (1 .. $form->{rowcount}) {
+
+  # Modified from $amount = $form->{amount} by J.Zach to update amount to total
+  # payment amount in Zahlungsausgang
+  $amount = 0;
+  for my $i (1 .. $form->{rowcount}) {
 
     map {
       $form->{"${_}_$i"} =
@@ -618,7 +633,9 @@ sub update {
         $form->{"paid_$i"} = $form->{"due_$i"};
       }
 
-      $amount -= $form->{"paid_$i"};
+      # Modified by J.Zach, see abovev
+      $amount += $form->{"paid_$i"};
+
     } else {
       $form->{"paid_$i"} = "";
     }
@@ -630,6 +647,9 @@ sub update {
 
   }
 
+  # Line added by J.Zach, see above
+  $form->{amount}=$amount;
+
   &form_header;
   &list_invoices;
   &form_footer;
@@ -640,6 +660,8 @@ sub update {
 sub post {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   &check_form;
 
   if ($form->{currency} ne $form->{defaultcurrency}) {
@@ -647,8 +669,8 @@ sub post {
       unless $form->{exchangerate};
   }
 
-  $msg1 = "$form->{origtitle} posted!";
-  $msg2 = "Cannot post $form->{origtitle}!";
+  my $msg1 = "$form->{origtitle} posted!";
+  my $msg2 = "Cannot post $form->{origtitle}!";
 
   # $locale->text('Payment posted!')
   # $locale->text('Receipt posted!')
@@ -665,20 +687,28 @@ sub post {
 sub print {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my ($whole, $check, %queued, $spool, $filename, $userspath);
+
   &check_form;
 
-  ($whole, $form->{decimal}) = split /\./, $form->{amount};
+  ($whole, $form->{decimal}) = split(/\./, $form->{amount});
 
   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
 
-  $form->{decimal} .= "00";
+  #$form->{decimal} .= "00";
   $form->{decimal} = substr($form->{decimal}, 0, 2);
 
   $check = new CP $myconfig{countrycode};
   $check->init;
   $form->{text_amount} = $check->num2text($whole);
 
-  &{"$form->{vc}_details"};
+  if ($form->{vc} eq 'customer') {
+    IS->customer_details(\%myconfig, $form);
+  } else {
+    IR->vendor_details(\%myconfig, $form);
+  }
 
   $form->{callback} = "";
 
@@ -692,11 +722,13 @@ sub print {
     $form->{pdf} = 1;
   }
 
+  delete $form->{OUT};
+
   if ($form->{media} eq 'printer') {
     $form->{OUT} = "| $myconfig{printer}";
   }
   if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
+    %queued = map { s|.*/|| } split / /, $form->{queued};
 
     if ($filename = $queued{ $form->{formname} }) {
       unlink "$spool/$filename";
@@ -719,8 +751,7 @@ sub print {
   $form->parse_template(\%myconfig, $userspath);
 
   if ($form->{media} ne 'screen') {
-    $form->{callback} =
-      "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
+    $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&all_vc=$form->{all_vc}";
 
     $form->redirect if (CP->process_payment(\%myconfig, \%$form));
     $form->error($locale->text('Cannot post payment!'));
@@ -729,33 +760,35 @@ sub print {
   $lxdebug->leave_sub();
 }
 
-sub customer_details { IS->customer_details(\%myconfig, \%$form) }
-sub vendor_details { IR->vendor_details(\%myconfig, \%$form) }
-
 sub check_form {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
+  my ($closedto, $datepaid, $amount);
+
   &check_name($form->{vc});
 
   if ($form->{currency} ne $form->{oldcurrency}) {
     &update;
-    exit;
+    ::end_of_request();
   }
 
+  $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
   $form->error($locale->text('Date missing!')) unless $form->{datepaid};
 
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
   $datepaid = $form->datetonum($form->{datepaid}, \%myconfig);
 
   $form->error($locale->text('Cannot process payment for a closed period!'))
-    if ($datepaid <= $closedto);
+    if ($form->date_closed($form->{"datepaid"}, \%myconfig));
 
   $amount = $form->parse_amount(\%myconfig, $form->{amount});
   $form->{amount} = $amount;
 
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"paid_$i"}) {
-      $amount -= $form->parse_amount($myconfig, $form->{"paid_$i"});
+  for my $i (1 .. $form->{rowcount}) {
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
+      $amount -= $form->parse_amount(\%myconfig, $form->{"paid_$i"});
 
       push(@{ $form->{paid} },      $form->{"paid_$i"});
       push(@{ $form->{due} },       $form->{"due_$i"});