X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcp.pl;h=86a5890bd5153c9c50689497fd486e99e73d9f60;hb=061105807cbfb5b86b804e71db9509c996c93912;hp=b3efdec57d25e0cac2dcd1763300ddb455a32f17;hpb=a111d6e8e4071fd81d7406e7f3849d6ad28726fd;p=kivitendo-erp.git

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index b3efdec57..86a5890bd 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -36,7 +36,7 @@ use SL::IS;
 use SL::IR;
 use SL::AR;
 use SL::AP;
-use strict ("vars", "subs");
+use strict;
 #use warnings;
 
 require "bin/mozilla/arap.pl";
@@ -78,15 +78,21 @@ sub payment {
 
   CP->paymentaccounts(\%myconfig, \%$form);
 
+  # Standard Konto für Umlaufvermögen
+  my $accno_arap = IS->get_standard_accno_current_assets(\%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} } };
+  map { $form->{selectaccount} .= "<option>$_->{accno}--$_->{description}\n";
+        $form->{account}        = "$_->{accno}--$_->{description}" if ($_->{accno} eq $accno_arap) } @{ $form->{PR}{"$form->{ARAP}_paid"} };
+
+  # Braucht man das hier überhaupt? Erstmal auskommentieren .. jan 18.12.2010
+  #  map {
+  #    $form->{"select$form->{ARAP}"} .=
+  #      "<option>$_->{accno}--$_->{description}\n"
+  #  } @{ $form->{PR}{ $form->{ARAP} } };
+  # ENDE LOESCHMICH in 2012
 
   # currencies
   # oldcurrency ist zwar noch hier als fragment enthalten, wird aber bei
@@ -112,55 +118,20 @@ sub payment {
 }
 
 sub form_header {
-  $lxdebug->enter_sub();
+  $lxdebug->enter_sub;
 
   $auth->assert('cash');
 
-  my ($vc, $vclabel, $allvc, $arap, $exchangerate);
-  my ($jsscript, $button1, $button2, $onload);
-
-  $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')
+  my ($vc, $arap, $exchangerate);
+  my ($onload);
 
   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|
-              <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>
-|;
-    }
-  }
-  foreach my $item ($form->{vc}, "account", "currency", $form->{ARAP}) {
+  for 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}/;
+    $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
   $vc =
@@ -168,310 +139,55 @@ sub form_header {
     ? 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;
-  }
+  $form->{openinvoices} = $form->{all_vc} ? "" : 1;
 
   # $locale->text('AR')
   # $locale->text('AP')
 
-  $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}" onBlur=\"check_right_date_format(this)\">
-       <input type=button name=datepaid id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-       |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "1", "datepaid", "BL", "trigger1");
-  } else {
-
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <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 onLoad="$onload">
-
-<form method=post action=cp.pl>
-
-<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>
-          <td>
-            <table>
-              <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>
-                <th align=right>| . $locale->text('Invoice Number') . qq|</th>
-                <td><input name="invnumber" size="35"</td>
-              </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>
-              <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">| .  $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-$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();
+  print $::form->parse_html_template('cp/form_header', {
+    is_customer => $form->{vc}   eq 'customer',
+    is_receipt  => $form->{type} eq 'receipt',
+    onload      => $onload,
+    arap        => $arap,
+    vccontent   => $vc,
+  });
+
+  $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;
-
-  $invoice = $locale->text('Invoices');
-
-  print qq|
-  <input type=hidden name=column_index value="id @column_index">
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-          <th class=listheading colspan=$colspan>$invoice</th>
-        </tr>
-|;
-
-  $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>
-|;
-
-  for my $i (1 .. $form->{rowcount}) {
-
-    my $j = 0;
-
-    map {
-      $form->{"${_}_$i"} =
-        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-    } 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|
-        <tr class=listrow$j>
-|;
-    map { print "$column_data{$_}\n" } @column_index;
-    print qq|
-        </tr>
-|;
+  $::lxdebug->enter_sub;
+  $::auth->assert('cash');
+
+  my @columns = qw(amount due paid invnumber id transdate checked);
+  my (@invoices, %total);
+  for my $i (1 .. $::form->{rowcount}) {
+    push @invoices, +{ map { $_ => $::form->{"$_\_$i"} } @columns };
+    $total{$_} += $invoices[-1]{$_} = $::form->parse_amount(\%::myconfig, $invoices[-1]{$_}) for qw(amount due paid);
   }
 
-  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>
-|;
+  print $::form->parse_html_template('cp/invoices', {
+    invoices => \@invoices,
+    totals   => \%total,
+  });
 
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub form_footer {
-  $lxdebug->enter_sub();
-
-  $auth->assert('cash');
+  $::lxdebug->enter_sub;
+  $::auth->assert('cash');
 
-  print qq|
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-<input type=hidden name=rowcount value=$form->{rowcount}>
+  print $::form->parse_html_template('cp/form_footer');
 
-<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|">
- </form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub update {
@@ -524,23 +240,63 @@ sub update {
       }
     }
   }
-  # Falls Suche über Rechnungsnummer und kein Kundenname vorhanden
-  if ($form->{invnumber} && !($form->{$form->{vc}})){
-  $form->{open} ='Y'; # nur die offenen rechnungen
-  if ($form->{ARAP} eq 'AR'){
-    AR->ar_transactions(\%myconfig, \%$form);
-    # den ersten treffen nehmen und mit dem namen überschreiben
-    $form->{$form->{vc}} = $form->{AR}[0]{name};
-  } else {
-    # s.o. nur für zahlungsausgang
-    AP->ap_transactions(\%myconfig, \%$form);
-    $form->{$form->{vc}} = $form->{AP}[0]{name};
+
+  # search by invoicenumber, 
+  if ($form->{invnumber}) { 
+    $form->{open} ='Y'; # nur die offenen rechnungen
+    if ($form->{ARAP} eq 'AR'){
+
+      # ar_transactions automatically searches by $form->{customer_id} or else
+      # $form->{customer} if available, and these variables will always be set
+      # when we have a dropdown field rather than an input field, so we have to
+      # empty these values first
+      $form->{customer_id} = '';
+      $form->{customer} = '';
+      AR->ar_transactions(\%myconfig, \%$form);
+
+      # if you search for invoice '11' ar_transactions will also match invoices
+      # 112, 211, ... due to the LIKE
+
+      # so there is now an extra loop that tries to match the invoice number
+      # exactly among all returned results, and then passes the customer_id instead of the name
+      # because the name may not be unique
+
+      my $found_exact_invnumber_match = 0;
+      foreach my $i ( @{ $form->{AR} } ) {
+        next unless $i->{invnumber} eq $form->{invnumber};
+        # found exactly matching invnumber
+        $form->{$form->{vc}} = $i->{name};
+        $form->{customer_id} = $i->{customer_id};
+        #$form->{"old${form->{vc}"} = $i->{customer_id};
+        $found_exact_invnumber_match = 1;
+      };
+
+      unless ( $found_exact_invnumber_match ) {
+        # use first returned entry, may not be the correct one if invnumber doesn't
+        # match uniquely
+        $form->{$form->{vc}} = $form->{AR}[0]{name};
+        $form->{customer_id} = $form->{AR}[0]{customer_id};
+      };
+    } else {
+      # s.o. nur für zahlungsausgang
+      AP->ap_transactions(\%myconfig, \%$form);
+      $form->{$form->{vc}} = $form->{AP}[0]{name};
     }
   }
-  # get customer and invoices
-  $updated = &check_name($form->{vc});
+
+  # determine customer/vendor
+  if ( $form->{customer_id} and $form->{invnumber} ) {
+    # we already know the exact customer_id, so fill $form with customer data
+    IS->get_customer(\%myconfig, \%$form);
+    $updated = 1;
+  } else {
+    # check_name is called with "customer" or "vendor" and otherwise uses contents of $form
+    # check_name also runs get_customer/get_vendor
+    $updated = &check_name($form->{vc});
+  };
 
   if ($new_name_selected || $updated) {
+    # get open invoices from ar/ap using $form->{vc} and a.${vc}_id, i.e. customer_id
     CP->get_openinvoices(\%myconfig, \%$form);
     ($newvc) = split /--/, $form->{ $form->{vc} };
     $form->{"old$form->{vc}"} = qq|$newvc--$form->{"$form->{vc}_id"}|;
@@ -645,21 +401,16 @@ sub post {
 
   # Beim Aktualisieren wird das Konto übernommen
   # und jetzt auch Beleg und Datum
-  $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}&$form->{currency}" . 
+  $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}&$form->{currency}" .
                       "&datepaid=$form->{datepaid}&source=$form->{source}";
 
-  my $msg1 = "$form->{origtitle} posted!";
-  my $msg2 = "Cannot post $form->{origtitle}!";
+  my $msg1 = $::form->{type} eq 'receipt' ? $::locale->text("Receipt posted!") : $::locale->text("Payment posted!");
+  my $msg2 = $::form->{type} eq 'receipt' ? $::locale->text("Cannot post Receipt!") : $::locale->text("Cannot post Payment!");
 
-  # $locale->text('Payment posted!')
-  # $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));
+  $form->redirect($msg1) if (CP->process_payment(\%::myconfig, $::form));
+  $form->error($msg2);
 
   $lxdebug->leave_sub();
 }
@@ -678,7 +429,7 @@ sub check_form {
     ::end_of_request();
   }
   $form->error($locale->text('Date missing!')) unless $form->{datepaid};
-  my $selected_check = 1; 
+  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
@@ -686,7 +437,7 @@ sub check_form {
       }
         undef($selected_check);
         # last; # ich muss doch über alle buchungen laufen, da ich noch
-        # die freitext-eingabe der werte prüfen will 
+        # die freitext-eingabe der werte prüfen will
     }
   }
   $form->error($locale->text('No transaction selected!')) if $selected_check;
@@ -704,10 +455,10 @@ sub check_form {
     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"});
-      push(@{ $form->{invnumber} }, $form->{"invnumber_$i"});
-      push(@{ $form->{invdate} },   $form->{"transdate_$i"});
+      push(@{ $form->{paid}      ||= [] }, $form->{"paid_$i"});
+      push(@{ $form->{due}       ||= [] }, $form->{"due_$i"});
+      push(@{ $form->{invnumber} ||= [] }, $form->{"invnumber_$i"});
+      push(@{ $form->{invdate}   ||= [] }, $form->{"transdate_$i"});
     }
   }