/bin/mozilla/cp.pl - Annotieren - projekt kivitendo - wissen

| Zweig: | Markierung: | Revision:

kivitendo/bin/mozilla/cp.pl @ b68c23bf

-            d319704a
+#=====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
 # Web http://www.lx-office.org
+#
 #=====================================================================
 # SQL-Ledger Accounting
 # Copyright (c) 2002
+#
 #  Author: Dieter Simader
 #   Email: dsimader@sql-ledger.org
 #     Web: http://www.sql-ledger.org
+#
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #======================================================================
+#
 # Payment module
+#
 #======================================================================
 use SL::CP;
 use SL::IS;
 use SL::IR;
-d86fbb2
+use strict ("vars", "subs");
 #use warnings;
-            d629acd8
+require "bin/mozilla/arap.pl";
-            40782548
+require "bin/mozilla/common.pl";
-            d319704a
+            Moritz Bunkus
-c7e4493
+our ($form, %myconfig, $lxdebug, $locale, $auth);
-d86fbb2
+            Sven Schöling
-            d319704a
+;
 # end of main
 sub payment {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my (@curr);
-            d319704a
+  $form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
   $form->{arap} = lc $form->{ARAP};
   # setup customer/vendor selection for open invoices
   if ($form->{all_vc}) {
     $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
   } else {
     CP->get_openvc(\%myconfig, \%$form);
+  }
   $form->{"select$form->{vc}"} = "";
   if ($form->{"all_$form->{vc}"}) {
     $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id};
     map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" }
       @{ $form->{"all_$form->{vc}"} };
+  }
   # departments
-            e2b9e173
+  if (@{ $form->{all_departments} || [] }) {
-            d319704a
+    $form->{selectdepartment} = "<option>\n";
     $form->{department}       = "$form->{department}--$form->{department_id}";
     map {
       $form->{selectdepartment} .=
         "<option>$_->{description}--$_->{id}\n"
-            e2b9e173
+    } (@{ $form->{all_departments} || [] });
-            d319704a
+            Moritz Bunkus
   CP->paymentaccounts(\%myconfig, \%$form);
   $form->{selectaccount} = "";
   $form->{"select$form->{ARAP}"} = "";
   map { $form->{selectaccount} .= "<option>$_->{accno}--$_->{description}\n" }
     @{ $form->{PR}{"$form->{ARAP}_paid"} };
   map {
     $form->{"select$form->{ARAP}"} .=
       "<option>$_->{accno}--$_->{description}\n"
   } @{ $form->{PR}{ $form->{ARAP} } };
   # currencies
-e0
+  @curr = split(/:/, $form->{currencies});
-            d319704a
+  chomp $curr[0];
   $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
     $curr[0];
   $form->{selectcurrency} = "";
   map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
   $form->{media} = "screen";
   &form_header;
   &form_footer;
   $lxdebug->leave_sub();
+}
 sub form_header {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my ($vc, $vclabel, $allvc, $arap, $department, $exchangerate);
   my ($jsscript, $button1, $button2, $onload);
-            d319704a
+  $vclabel = ucfirst $form->{vc};
   $vclabel = $locale->text($vclabel);
   if ($form->{type} eq 'receipt') {
     $form->{title}     = $locale->text('Receipt');
     $form->{origtitle} = "Receipt";
+  }
   if ($form->{type} eq 'check') {
     $form->{title}     = $locale->text('Payment');
     $form->{origtitle} = "Payment";
+  }
   # $locale->text('Customer')
   # $locale->text('Vendor')
   if ($form->{ $form->{vc} } eq "") {
     map { $form->{"addr$_"} = "" } (1 .. 4);
+  }
   if ($form->{currency} ne $form->{defaultcurrency}) {
     $form->{exchangerate} =
       $form->format_amount(\%myconfig, $form->{exchangerate});
     if ($form->{forex}) {
       $exchangerate = qq|
-            b65a230d
+              <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>
-            d319704a
+|;
     } else {
       $exchangerate = qq|
-            b65a230d
+               <tr>
                 <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
                 <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
               </tr>
-            d319704a
+|;
+    }
+  }
-d86fbb2
+  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}, "department") {
-            d319704a
+    $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+  }
   $vc =
     ($form->{"select$form->{vc}"})
     ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}\n</select>|
     : qq|<input name=$form->{vc} size=35 value="$form->{$form->{vc}}">|;
   if ($form->{all_vc}) {
     $allvc = "checked";
     $form->{openinvoices} = "";
   } else {
     $allvc = "";
     $form->{openinvoices} = 1;
+  }
   # $locale->text('AR')
   # $locale->text('AP')
-            d7f06042
+  $form->{jsscript} = 1;
-            d319704a
+  $jsscript = "";
   if ($form->{jsscript}) {
     # with JavaScript Calendar
     $button1 = qq|
-            be4e11d3
+       <td><input name=datepaid id=datepaid size=11 title="$myconfig{dateformat}" value="$form->{datepaid}" onBlur=\"check_right_date_format(this)\">
-            d319704a
+       <input type=button name=datepaid id="trigger1" value=|
-a4f97
+      . $locale->text('button') . qq|></td>
-            d319704a
+       |;
     #write Trigger
     $jsscript =
-            cd5afcd8
+      Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1");
-            d319704a
+  } else {
     # without JavaScript Calendar
     $button1 = qq|
-            be4e11d3
+                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\"></td>|;
-            d319704a
+            Moritz Bunkus
-            be4e11d3
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
-            d319704a
+  $form->header;
   $arap = lc $form->{ARAP};
-            be4e11d3
+  $onload = qq|focus()|;
   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
-            d319704a
+  print qq|
-            be4e11d3
+<body onLoad="$onload">
-            d319704a
+            Moritz Bunkus
-c7e4493
+<form method=post action=cp.pl>
-            d319704a
+            Moritz Bunkus
 <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
 <input type=hidden name=closedto value=$form->{closedto}>
 <input type=hidden name=vc value=$form->{vc}>
 <input type=hidden name=type value=$form->{type}>
 <input type=hidden name=formname value=$form->{type}>
 <input type=hidden name=queued value="$form->{queued}">
 <input type=hidden name=arap value=$arap>
 <input type=hidden name=ARAP value=$form->{ARAP}>
 <input type=hidden name=openinvoices value=$form->{openinvoices}>
 <input type=hidden name=title value="$form->{title}">
 <input type=hidden name=origtitle value="$form->{origtitle}">
 <table width=100%>
   <tr>
     <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
       <table width=100%>
         <tr valign=top>
-adf6
+          <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>
-dbec9
+                <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|">
-adf6
+              </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>
-            d319704a
+                $button1
-adf6
+              </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="|
-ca0b0
+    . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|" onBlur=\"check_right_number_format(this)\"></td>
-adf6
+              </tr>
             </table>
           </td>
         </tr>
-            d319704a
+      </table>
     </td>
   </tr>
-            0576299f
+            Moritz Bunkus
-            d319704a
+$jsscript
 |;
   $lxdebug->leave_sub();
+}
 sub list_invoices {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my (@column_index, %column_data, $colspan, $invoice);
   my ($totalamount, $totaldue, $totalpaid);
-            d319704a
+  @column_index = qw(invnumber transdate amount due checked paid);
   $colspan = $#column_index + 1;
   $invoice = $locale->text('Invoices');
   print qq|
   <input type=hidden name=column_index value="id @column_index">
   <tr>
     <td>
       <table width=100%>
-            b65a230d
+        <tr>
           <th class=listheading colspan=$colspan>$invoice</th>
         </tr>
-            d319704a
+|;
   $column_data{invnumber} =
     qq|<th nowrap class=listheading>| . $locale->text('Invoice') . "</th>";
   $column_data{transdate} =
     qq|<th nowrap class=listheading>| . $locale->text('Date') . "</th>";
   $column_data{amount} =
     qq|<th nowrap class=listheading>| . $locale->text('Amount') . "</th>";
   $column_data{due} =
     qq|<th nowrap class=listheading>| . $locale->text('Due') . "</th>";
   $column_data{paid} =
     qq|<th nowrap class=listheading>| . $locale->text('Amount') . "</th>";
   $column_data{checked} =
     qq|<th nowrap class=listheading>| . $locale->text('Select') . "</th>";
   print qq|
         <tr>
 |;
   map { print "$column_data{$_}\n" } @column_index;
   print qq|
         </tr>
 |;
-d86fbb2
+  for my $i (1 .. $form->{rowcount}) {
     my $j = 0;
-            d319704a
+            Moritz Bunkus
     map {
-a4f97
+      $form->{"${_}_$i"} =
         $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-            d319704a
+    } qw(amount due paid);
     $totalamount += $form->{"amount_$i"};
     $totaldue    += $form->{"due_$i"};
     $totalpaid   += $form->{"paid_$i"};
     map {
       $form->{"${_}_$i"} =
         $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
     } qw(amount due paid);
     $column_data{invnumber} = qq|<td>$form->{"invnumber_$i"}</td>
       <input type=hidden name="invnumber_$i" value="$form->{"invnumber_$i"}">
       <input type=hidden name="id_$i" value=$form->{"id_$i"}>|;
     $column_data{transdate} = qq|<td width=15%>$form->{"transdate_$i"}</td>
       <input type=hidden name="transdate_$i" value=$form->{"transdate_$i"}>|;
     $column_data{amount} =
       qq|<td align=right width=15%>$form->{"amount_$i"}</td>
       <input type=hidden name="amount_$i" value=$form->{"amount_$i"}>|;
     $column_data{due} = qq|<td align=right width=15%>$form->{"due_$i"}</td>
       <input type=hidden name="due_$i" value=$form->{"due_$i"}>|;
     $column_data{paid} =
       qq|<td align=right width=15%><input name="paid_$i" size=10 value=$form->{"paid_$i"}></td>|;
     $form->{"checked_$i"} = ($form->{"checked_$i"}) ? "checked" : "";
     $column_data{checked} =
       qq|<td align=center width=10%><input name="checked_$i" type=checkbox style=checkbox $form->{"checked_$i"}></td>|;
     $j++;
     $j %= 2;
     print qq|
-            b65a230d
+        <tr class=listrow$j>
-            d319704a
+|;
     map { print "$column_data{$_}\n" } @column_index;
     print qq|
         </tr>
 |;
+  }
   map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
   $column_data{amount} =
       qq|<th class=listtotal align=right>|
     . $form->format_amount(\%myconfig, $totalamount, 2, "&nbsp;")
     . qq|</th>|;
   $column_data{due} =
       qq|<th class=listtotal align=right>|
     . $form->format_amount(\%myconfig, $totaldue, 2, "&nbsp;")
     . qq|</th>|;
   $column_data{paid} =
       qq|<th class=listtotal align=right>|
     . $form->format_amount(\%myconfig, $totalpaid, 2, "&nbsp;")
     . qq|</th>|;
   print qq|
         <tr class=listtotal>
 |;
   map { print "$column_data{$_}\n" } @column_index;
   print qq|
         </tr>
       </table>
     </td>
   </tr>
 |;
   $lxdebug->leave_sub();
+}
 sub form_footer {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my ($media, $format, $latex_templates);
-            d319704a
+  $form->{DF}{ $form->{format} } = "selected";
   $form->{OP}{ $form->{media} }  = "selected";
   $media = qq|
           <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-            d1c335e9
+  if ($myconfig{printer} && $latex_templates) {
-            d319704a
+    $media .= qq|
           <option value=printer $form->{OP}{printer}>|
       . $locale->text('Printer');
+  }
-            d1c335e9
+  if ($latex_templates) {
-            d319704a
+    $media .= qq|
           <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
     $format .= qq|
             <option value=postscript $form->{DF}{postscript}>|
       . $locale->text('Postscript') . qq|
-            b65a230d
+            <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
-            d319704a
+            Moritz Bunkus
   print qq|
   <tr>
     <td><hr size=3 noshade></td>
   </tr>
 </table>
 <input type=hidden name=rowcount value=$form->{rowcount}>
 <br>
 <input class=submit type=submit name=action value="|
     . $locale->text('Update') . qq|">
 <input class=submit type=submit name=action value="|
     . $locale->text('Post') . qq|">|;
-            d1c335e9
+  if ($latex_templates) {
-            d319704a
+    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>
 </body>
 </html>
 |;
   $lxdebug->leave_sub();
+}
 sub update {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-            d319704a
+  my ($new_name_selected) = @_;
-d86fbb2
+  my ($buysell, $newvc, $updated, $exchangerate, $amount);
-            d319704a
+  if ($form->{vc} eq 'customer') {
     $buysell = "buy";
   } else {
     $buysell = "sell";
+  }
   # if we switched to all_vc
   if ($form->{all_vc} ne $form->{oldall_vc}) {
     $form->{openinvoices} = ($form->{all_vc}) ? 0 : 1;
     $form->{"select$form->{vc}"} = "";
     if ($form->{all_vc}) {
       $form->all_vc(\%myconfig, $form->{vc}, $form->{ARAP});
       if ($form->{"all_$form->{vc}"}) {
         map {
           $form->{"select$form->{vc}"} .=
             "<option>$_->{name}--$_->{id}\n"
         } @{ $form->{"all_$form->{vc}"} };
+      }
     } else {
       CP->get_openvc(\%myconfig, \%$form);
       if ($form->{"all_$form->{vc}"}) {
         $newvc =
           qq|$form->{"all_$form->{vc}"}[0]->{name}--$form->{"all_$form->{vc}"}[0]->{id}|;
         map {
           $form->{"select$form->{vc}"} .=
             "<option>$_->{name}--$_->{id}\n"
         } @{ $form->{"all_$form->{vc}"} };
+      }
       # if the name is not the same
       if ($form->{"select$form->{vc}"} !~ /$form->{$form->{vc}}/) {
         $form->{ $form->{vc} } = $newvc;
+      }
+    }
+  }
   # get customer and invoices
   $updated = &check_name($form->{vc});
   if ($new_name_selected || $updated) {
     CP->get_openinvoices(\%myconfig, \%$form);
     ($newvc) = split /--/, $form->{ $form->{vc} };
     $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;
     $updated = 1;
+  }
   if ($form->{currency} ne $form->{oldcurrency}) {
     $form->{oldcurrency} = $form->{currency};
     if (!$updated) {
       CP->get_openinvoices(\%myconfig, \%$form);
       $updated = 1;
+    }
+  }
-            a53233e5
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
   $form->{exchangerate} = $form->{forex} if $form->{forex};
-            d319704a
+            Moritz Bunkus
   $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
   if ($updated) {
     $form->{rowcount} = 0;
     $form->{queued} = "";
-d86fbb2
+    my $i = 0;
     foreach my $ref (@{ $form->{PR} }) {
-            d319704a
+      $i++;
       $form->{"id_$i"}        = $ref->{id};
       $form->{"invnumber_$i"} = $ref->{invnumber};
       $form->{"transdate_$i"} = $ref->{transdate};
       $ref->{exchangerate} = 1 unless $ref->{exchangerate};
       $form->{"amount_$i"} = $ref->{amount} / $ref->{exchangerate};
       $form->{"due_$i"}    =
         ($ref->{amount} - $ref->{paid}) / $ref->{exchangerate};
       $form->{"checked_$i"} = "";
       $form->{"paid_$i"}    = "";
       # need to format
       map {
         $form->{"${_}_$i"} =
           $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
       } qw(amount due);
+    }
     $form->{rowcount} = $i;
+  }
   # recalculate
-            bb99760f
+            Moritz Bunkus
   # Modified from $amount = $form->{amount} by J.Zach to update amount to total
   # payment amount in Zahlungsausgang
   $amount = 0;
-d86fbb2
+  for my $i (1 .. $form->{rowcount}) {
-            d319704a
+            Moritz Bunkus
     map {
-a4f97
+      $form->{"${_}_$i"} =
         $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-            d319704a
+    } qw(amount due paid);
     if ($form->{"checked_$i"}) {
       # calculate paid_$i
       if (!$form->{"paid_$i"}) {
         $form->{"paid_$i"} = $form->{"due_$i"};
+      }
-            bb99760f
+      # Modified by J.Zach, see abovev
-adf6
+      $amount += $form->{"paid_$i"};
-            bb99760f
+            Moritz Bunkus
-            d319704a
+    } else {
       $form->{"paid_$i"} = "";
+    }
     map {
       $form->{"${_}_$i"} =
         $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2)
     } qw(amount due paid);
+  }
-            bb99760f
+  # Line added by J.Zach, see above
-adf6
+  $form->{amount}=$amount;
-            bb99760f
+            Moritz Bunkus
-            d319704a
+  &form_header;
   &list_invoices;
   &form_footer;
   $lxdebug->leave_sub();
+}
 sub post {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-            d319704a
+  &check_form;
   if ($form->{currency} ne $form->{defaultcurrency}) {
     $form->error($locale->text('Exchangerate missing!'))
       unless $form->{exchangerate};
+  }
-d86fbb2
+  my $msg1 = "$form->{origtitle} posted!";
   my $msg2 = "Cannot post $form->{origtitle}!";
-            d319704a
+            Moritz Bunkus
   # $locale->text('Payment posted!')
   # $locale->text('Receipt posted!')
   # $locale->text('Cannot post Payment!')
   # $locale->text('Cannot post Receipt!')
   $form->redirect($locale->text($msg1))
     if (CP->process_payment(\%myconfig, \%$form));
   $form->error($locale->text($msg2));
   $lxdebug->leave_sub();
+}
 sub print {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my ($whole, $check, %queued, $spool, $filename, $userspath);
-            d319704a
+  &check_form;
-e0
+  ($whole, $form->{decimal}) = split(/\./, $form->{amount});
-            d319704a
+            Moritz Bunkus
   $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2);
-ca0b0
+  #$form->{decimal} .= "00";
-            d319704a
+  $form->{decimal} = substr($form->{decimal}, 0, 2);
   $check = new CP $myconfig{countrycode};
   $check->init;
   $form->{text_amount} = $check->num2text($whole);
-c7e4493
+  if ($form->{vc} eq 'customer') {
     IS->customer_details(\%myconfig, $form);
   } else {
     IR->vendor_details(\%myconfig, $form);
+  }
-            d319704a
+            Moritz Bunkus
   $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;
+  }
-e69b
+  delete $form->{OUT};
-            d319704a
+  if ($form->{media} eq 'printer') {
     $form->{OUT} = "| $myconfig{printer}";
+  }
   if ($form->{media} eq 'queue') {
-e69b
+    %queued = map { s|.*/|| } split / /, $form->{queued};
-            d319704a
+            Moritz Bunkus
     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') {
-c7e4493
+    $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&all_vc=$form->{all_vc}";
-            d319704a
+            Moritz Bunkus
     $form->redirect if (CP->process_payment(\%myconfig, \%$form));
     $form->error($locale->text('Cannot post payment!'));
+  }
   $lxdebug->leave_sub();
+}
 sub check_form {
   $lxdebug->enter_sub();
-c7e4493
+  $auth->assert('cash');
-d86fbb2
+  my ($closedto, $datepaid, $amount);
-            d319704a
+  &check_name($form->{vc});
   if ($form->{currency} ne $form->{oldcurrency}) {
     &update;
     exit;
+  }
-a4937
+  $form->error($locale->text('Zero amount posting!')) if !$form->parse_amount(\%myconfig, $form->{amount});
-            d319704a
+  $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!'))
-eb1337
+    if ($form->date_closed($form->{"datepaid"}, \%myconfig));
-            d319704a
+            Moritz Bunkus
   $amount = $form->parse_amount(\%myconfig, $form->{amount});
   $form->{amount} = $amount;
-d86fbb2
+  for my $i (1 .. $form->{rowcount}) {
-a2f2e7
+    if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
-d86fbb2
+      $amount -= $form->parse_amount(\%myconfig, $form->{"paid_$i"});
-            d319704a
+            Moritz Bunkus
       push(@{ $form->{paid} },      $form->{"paid_$i"});
       push(@{ $form->{due} },       $form->{"due_$i"});
       push(@{ $form->{invnumber} }, $form->{"invnumber_$i"});
       push(@{ $form->{invdate} },   $form->{"transdate_$i"});
+    }
+  }
   if ($form->round_amount($amount, 2) != 0) {
     push(@{ $form->{paid} }, $form->format_amount(\%myconfig, $amount, 2));
     push(@{ $form->{due} }, $form->format_amount(\%myconfig, 0, "0"));
     push(@{ $form->{invnumber} },
          ($form->{ARAP} eq 'AR')
          ? $locale->text('Deposit')
          : $locale->text('Prepayment'));
     push(@{ $form->{invdate} }, $form->{datepaid});
+  }
   $lxdebug->leave_sub();
+}

Projekt

Allgemein

Profil

projekt kivitendo