Bug #862 behoben, Funktionen fuer die Buttons unter den Listen (Rechnungen und Buchun...

[kivitendo-erp.git] / bin / mozilla / cp.pl
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl

index 5ced174..d341ffd 100644 (file)
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -42,7 +42,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 +51,8 @@ our ($form, %myconfig, $lxdebug, $locale);
  sub payment {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my (@curr);
  
    $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
@@ -114,6 +116,8 @@ sub payment {
  sub form_header {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
    my ($jsscript, $button1, $button2, $onload);
  
@@ -218,7 +222,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}>
@@ -330,6 +334,8 @@ $jsscript
  sub list_invoices {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my (@column_index, %column_data, $colspan, $invoice);
    my ($totalamount, $totaldue, $totalpaid);
  
@@ -449,6 +455,8 @@ sub list_invoices {
  sub form_footer {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my ($media, $format, $latex_templates);
  
    $form->{DF}{ $form->{format} } = "selected";
@@ -478,9 +486,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 +514,8 @@ sub form_footer {
  sub update {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my ($new_name_selected) = @_;
  
    my ($buysell, $newvc, $updated, $exchangerate, $amount);
@@ -572,13 +579,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});
  
@@ -656,6 +658,8 @@ sub update {
  sub post {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    &check_form;
  
    if ($form->{currency} ne $form->{defaultcurrency}) {
@@ -681,6 +685,8 @@ sub post {
  sub print {
    $lxdebug->enter_sub();
  
+  $auth->assert('cash');
+
    my ($whole, $check, %queued, $spool, $filename, $userspath);
  
    &check_form;
@@ -696,7 +702,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 +749,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 +758,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 +779,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;