From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 12 Oct 2010 10:23:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~101^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/aef4bc0c25c038294c180ba710099d63d2919a3e?hp=-c

Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

	bin/mozilla/cp.pl
---

aef4bc0c25c038294c180ba710099d63d2919a3e
diff --combined bin/mozilla/cp.pl
index d454faf9b,2df7812e7..df454c42d
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@@ -48,7 -48,6 +48,7 @@@ our ($form, %myconfig, $lxdebug, $local
  
  sub payment {
    $lxdebug->enter_sub();
 +
    $auth->assert('cash');
  
    my (@curr);
@@@ -58,8 -57,6 +58,8 @@@
  
    # 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);
@@@ -68,15 -65,12 +68,15 @@@
    $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
 +  # auf departments kann man auch nicht mehr buchen. Raus oder wieder 
 +  # aktivieren? Im Backend dann auch anpassen. jb 12.10.2010
    if (@{ $form->{all_departments} || [] }) {
      $form->{selectdepartment} = "<option>\n";
      $form->{department}       = "$form->{department}--$form->{department_id}";
@@@ -88,7 -82,6 +88,7 @@@
    }
  
    CP->paymentaccounts(\%myconfig, \%$form);
 +
    $form->{selectaccount} = "";
    $form->{"select$form->{ARAP}"} = "";
  
@@@ -100,20 -93,15 +100,20 @@@
    } @{ $form->{PR}{ $form->{ARAP} } };
  
    # currencies
 -  @curr = split(/:/, $form->{currencies});
 -  chomp $curr[0];
 +  # 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?
 +  @curr_unsorted = split(/:/, $form->{currencies});
 +  chomp $curr_unsorted[0];
 +  @curr = sort {} @curr_unsorted;
    $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} =
      $curr[0];
  
    $form->{selectcurrency} = "";
    map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
  
 -  $form->{media} = "screen";
  
    &form_header;
    &form_footer;
@@@ -298,7 -286,6 +298,7 @@@ sub form_header 
                  <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>
@@@ -461,6 -448,28 +461,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>
@@@ -472,8 -481,19 +472,8 @@@
  <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>
@@@ -498,7 -518,6 +498,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;
@@@ -514,7 -533,7 +514,7 @@@
              "<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}"}) {
@@@ -638,8 -657,8 +638,9 @@@ sub post 
      $form->error($locale->text('Exchangerate missing!'))
        unless $form->{exchangerate};
    }
+ 
 +  # Beim Aktualisieren wird das Konto übernommen
-   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&muh=kuh&account=$form->{account}";
+   $form->{callback} = "cp.pl?action=payment&vc=$form->{vc}&type=$form->{type}&account=$form->{account}";
  
    my $msg1 = "$form->{origtitle} posted!";
    my $msg2 = "Cannot post $form->{origtitle}!";
@@@ -648,8 -667,7 +649,8 @@@
    # $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));
@@@ -657,6 -675,82 +658,6 @@@
    $lxdebug->leave_sub();
  }
  
 -sub print {
 -  $lxdebug->enter_sub();
 -  exit; # Niemand braucht mich mehr! LöschMich endlich! jb 8.10.2010
 -  $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();
  
@@@ -675,7 -769,7 +676,7 @@@
    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('No zero or negative values, please! Correct row number:' . $i));
+           $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