"Vertreter" sind Kunden mit Kundentyp mit Vertreter-Flag, nicht die Kundentypen selber
[kivitendo-erp.git] / bin / mozilla / cp.pl
index 5ced174..5162433 100644 (file)
@@ -32,7 +32,6 @@
 #======================================================================
 
 use SL::CP;
-use SL::OP;
 use SL::IS;
 use SL::IR;
 
@@ -42,7 +41,7 @@ use strict ("vars", "subs");
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 
-our ($form, %myconfig, $lxdebug, $locale);
+our ($form, %myconfig, $lxdebug, $locale, $auth);
 
 1;
 
@@ -51,6 +50,8 @@ our ($form, %myconfig, $lxdebug, $locale);
 sub payment {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my (@curr);
 
   $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
@@ -72,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);
@@ -114,6 +115,8 @@ sub payment {
 sub form_header {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
   my ($jsscript, $button1, $button2, $onload);
 
@@ -141,17 +144,17 @@ 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>
 |;
     }
   }
@@ -178,16 +181,6 @@ 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} = 1;
   $jsscript = "";
   if ($form->{jsscript}) {
@@ -218,7 +211,7 @@ sub form_header {
   print qq|
 <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}>
@@ -241,82 +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('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="|
+              </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>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -330,6 +323,8 @@ $jsscript
 sub list_invoices {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my (@column_index, %column_data, $colspan, $invoice);
   my ($totalamount, $totaldue, $totalpaid);
 
@@ -344,9 +339,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} =
@@ -409,7 +404,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|
@@ -449,6 +444,8 @@ sub list_invoices {
 sub form_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($media, $format, $latex_templates);
 
   $form->{DF}{ $form->{format} } = "selected";
@@ -468,7 +465,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|
@@ -478,9 +475,6 @@ sub form_footer {
 </table>
 <input type=hidden name=rowcount value=$form->{rowcount}>
 
-<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|">
@@ -509,6 +503,8 @@ sub form_footer {
 sub update {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($new_name_selected) = @_;
 
   my ($buysell, $newvc, $updated, $exchangerate, $amount);
@@ -572,13 +568,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});
 
@@ -630,7 +621,7 @@ sub update {
       }
 
       # Modified by J.Zach, see abovev
-      $amount += $form->{"paid_$i"}; 
+      $amount += $form->{"paid_$i"};
 
     } else {
       $form->{"paid_$i"} = "";
@@ -644,7 +635,7 @@ sub update {
   }
 
   # Line added by J.Zach, see above
-  $form->{amount}=$amount; 
+  $form->{amount}=$amount;
 
   &form_header;
   &list_invoices;
@@ -656,6 +647,8 @@ sub update {
 sub post {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   &check_form;
 
   if ($form->{currency} ne $form->{defaultcurrency}) {
@@ -681,6 +674,8 @@ sub post {
 sub print {
   $lxdebug->enter_sub();
 
+  $auth->assert('cash');
+
   my ($whole, $check, %queued, $spool, $filename, $userspath);
 
   &check_form;
@@ -696,7 +691,11 @@ sub print {
   $check->init;
   $form->{text_amount} = $check->num2text($whole);
 
-  call_sub("$form->{vc}_details");
+  if ($form->{vc} eq 'customer') {
+    IS->customer_details(\%myconfig, $form);
+  } else {
+    IR->vendor_details(\%myconfig, $form);
+  }
 
   $form->{callback} = "";
 
@@ -739,8 +738,7 @@ sub print {
   $form->parse_template(\%myconfig, $userspath);
 
   if ($form->{media} ne 'screen') {
-    $form->{callback} =
-      "$form->{script}?action=payment&vc=$form->{vc}&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!'));
@@ -749,12 +747,11 @@ 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});
@@ -771,7 +768,7 @@ sub check_form {
   $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;