X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/26456e6e241a4487e5b52c70e36d275eb073db5b..72ad92fd:/bin/mozilla/cp.pl

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index f4a9efb20..d54137e72 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -34,7 +34,6 @@
 use SL::CP;
 use SL::IS;
 use SL::IR;
-
 use strict ("vars", "subs");
 #use warnings;
 
@@ -59,6 +58,8 @@ sub payment {
 
   # setup customer/vendor selection for open invoices
   if ($form->{all_vc}) {
+    # Dieser Zweig funktioniert derzeit NIE. Ggf. ganz raus oder
+    # alle offenen Zahlungen wieder korrekt anzeigen. jb 12.10.2010
     $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
   } else {
     CP->get_openvc(\%myconfig, \%$form);
@@ -67,22 +68,12 @@ sub payment {
   $form->{"select$form->{vc}"} = "";
 
   if ($form->{"all_$form->{vc}"}) {
+    # s.o. jb 12.10.2010
     $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
     map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" }
       @{ $form->{"all_$form->{vc}"} };
   }
 
-  # 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} || [] });
-  }
-
   CP->paymentaccounts(\%myconfig, \%$form);
 
   $form->{selectaccount} = "";
@@ -96,6 +87,13 @@ sub payment {
   } @{ $form->{PR}{ $form->{ARAP} } };
 
   # currencies
+  # oldcurrency ist zwar noch hier als fragment enthalten, wird aber bei
+  # der aktualisierung der form auch nicht mitübernommen. das konzept
+  # old_$FOO habe ich auch noch nicht verstanden ...
+  # Ok. Wenn currency übernommen werden, dann in callback-string über-
+  # geben und hier reinparsen, oder besser multibox oder html auslagern?
+  # Antwort: form->currency wird mit oldcurrency oder curr[0] überschrieben
+  # Wofür macht das Sinn?
   @curr = split(/:/, $form->{currencies});
   chomp $curr[0];
   $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
@@ -104,7 +102,6 @@ sub payment {
   $form->{selectcurrency} = "";
   map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
 
-  $form->{media} = "screen";
 
   &form_header;
   &form_footer;
@@ -117,7 +114,7 @@ sub form_header {
 
   $auth->assert('cash');
 
-  my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
+  my ($vc, $vclabel, $allvc, $arap, $exchangerate);
   my ($jsscript, $button1, $button2, $onload);
 
   $vclabel = ucfirst $form->{vc};
@@ -158,8 +155,7 @@ sub form_header {
 |;
     }
   }
-
-  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
+  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -236,12 +232,6 @@ sub form_header {
         <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>
@@ -280,7 +270,6 @@ sub form_header {
           </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>
@@ -304,8 +293,7 @@ sub form_header {
               </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>
+                <td colspan="3">| .  $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|</td>
               </tr>
             </table>
           </td>
@@ -459,28 +447,6 @@ sub form_footer {
 
   $auth->assert('cash');
 
-  my ($media, $format, $latex_templates);
-
-  $form->{DF}{ $form->{format} } = "selected";
-  $form->{OP}{ $form->{media} }  = "selected";
-
-  $media = qq|
-          <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-
-  if ($myconfig{printer} && $latex_templates) {
-    $media .= qq|
-          <option value=printer $form->{OP}{printer}>|
-      . $locale->text('Printer');
-  }
-  if ($latex_templates) {
-    $media .= qq|
-          <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
-    $format .= qq|
-            <option value=postscript $form->{DF}{postscript}>|
-      . $locale->text('Postscript') . qq|
-            <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
-  }
-
   print qq|
   <tr>
     <td><hr size=3 noshade></td>
@@ -492,19 +458,8 @@ sub form_footer {
 <input class=submit type=submit name=action value="|
     . $locale->text('Update') . qq|">
 <input class=submit type=submit name=action value="|
-    . $locale->text('Post') . qq|">|;
-
-  if ($latex_templates) {
-    print qq|
-<input class=submit type=submit name=action value="|
-      . $locale->text('Print') . qq|">|;
-  }
-
-  print qq|
-<select name=format>$format</select>
-<select name=media>$media</select>
-
-  </form>
+    . $locale->text('Post') . qq|">
+ </form>
 
 </body>
 </html>
@@ -529,6 +484,7 @@ sub update {
   }
 
   # if we switched to all_vc
+  # funktioniert derzeit nicht 12.10.2010 jb
   if ($form->{all_vc} ne $form->{oldall_vc}) {
 
     $form->{openinvoices} = ($form->{all_vc}) ? 0 : 1;
@@ -544,7 +500,7 @@ sub update {
             "<option>$_->{name}--$_->{id}\n"
         } @{ $form->{"all_$form->{vc}"} };
       }
-    } else {
+    } else {  # ab hier wieder ausgeführter code (s.o.):
       CP->get_openvc(\%myconfig, \%$form);
 
       if ($form->{"all_$form->{vc}"}) {
@@ -669,6 +625,9 @@ sub post {
       unless $form->{exchangerate};
   }
 
+  # Beim Aktualisieren wird das Konto übernommen
+  $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}&$form->{currency}";
+
   my $msg1 = "$form->{origtitle} posted!";
   my $msg2 = "Cannot post $form->{origtitle}!";
 
@@ -676,7 +635,8 @@ sub post {
   # $locale->text('Receipt posted!')
   # $locale->text('Cannot post Payment!')
   # $locale->text('Cannot post Receipt!')
-
+  # Die Nachrichten (Receipt posted!) werden nicht angezeigt.
+  # Entweder wieder aktivieren oder komplett rausnehmen
   $form->redirect($locale->text($msg1))
     if (CP->process_payment(\%myconfig, \%$form));
   $form->error($locale->text($msg2));
@@ -684,82 +644,6 @@ sub post {
   $lxdebug->leave_sub();
 }
 
-sub print {
-  $lxdebug->enter_sub();
-
-  $auth->assert('cash');
-
-  my ($whole, $check, %queued, $spool, $filename, $userspath);
-
-  &check_form;
-
-  ($whole, $form->{decimal}) = split(/\./, $form->{amount});
-
-  $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
-
-  #$form->{decimal} .= "00";
-  $form->{decimal} = substr($form->{decimal}, 0, 2);
-
-  $check = new CP $myconfig{countrycode};
-  $check->init;
-  $form->{text_amount} = $check->num2text($whole);
-
-  if ($form->{vc} eq 'customer') {
-    IS->customer_details(\%myconfig, $form);
-  } else {
-    IR->vendor_details(\%myconfig, $form);
-  }
-
-  $form->{callback} = "";
-
-  $form->{templates} = "$myconfig{templates}";
-  $form->{IN}        = "$form->{formname}.tex";
-
-  if ($form->{format} eq 'postscript') {
-    $form->{postscript} = 1;
-  }
-  if ($form->{format} eq 'pdf') {
-    $form->{pdf} = 1;
-  }
-
-  delete $form->{OUT};
-
-  if ($form->{media} eq 'printer') {
-    $form->{OUT} = "| $myconfig{printer}";
-  }
-  if ($form->{media} eq 'queue') {
-    %queued = map { s|.*/|| } split / /, $form->{queued};
-
-    if ($filename = $queued{ $form->{formname} }) {
-      unlink "$spool/$filename";
-      $filename =~ s/\..*$//g;
-    } else {
-      $filename = time;
-      $filename .= $$;
-    }
-    $filename .= ($form->{postscript}) ? '.ps' : '.pdf';
-    $form->{queued} = "$form->{formname} $filename";
-    $form->{OUT}    = ">$spool/$filename";
-
-    $form->update_status(\%myconfig);
-
-  }
-
-  $form->{company} = $myconfig{company};
-  $form->{address} = $myconfig{address};
-
-  $form->parse_template(\%myconfig, $userspath);
-
-  if ($form->{media} ne 'screen') {
-    $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!'));
-  }
-
-  $lxdebug->leave_sub();
-}
-
 sub check_form {
   $lxdebug->enter_sub();
 
@@ -771,11 +655,21 @@ sub check_form {
 
   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};
+  my $selected_check = 1; 
+  for my $i (1 .. $form->{rowcount}) {
+    if ($form->{"checked_$i"}) {
+      if ($form->parse_amount(\%myconfig, $form->{"paid_$i"}, 2) <= 0) { # negativen Betrag eingegeben
+          $form->error($locale->text('Amount has to be greater then zero! Wrong row number: ') . $i);
+      }
+        undef($selected_check);
+        # last; # ich muss doch über alle buchungen laufen, da ich noch
+        # die freitext-eingabe der werte prüfen will 
+    }
+  }
+  $form->error($locale->text('No transaction selected!')) if $selected_check;
 
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
   $datepaid = $form->datetonum($form->{datepaid}, \%myconfig);