#======================================================================
use SL::CP;
-use SL::OP;
use SL::IS;
use SL::IR;
+use SL::AR;
+use SL::AP;
+use strict ("vars", "subs");
+#use warnings;
require "bin/mozilla/arap.pl";
require "bin/mozilla/common.pl";
+our ($form, %myconfig, $lxdebug, $locale, $auth);
+
1;
# end of main
sub payment {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
+ my (@curr);
+
$form->{ARAP} = ($form->{type} eq 'receipt') ? "AR" : "AP";
$form->{arap} = lc $form->{ARAP};
# 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);
$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);
+ # 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
+ # 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} =
$form->{selectcurrency} = "";
map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
- $form->{media} = "screen";
&form_header;
&form_footer;
sub form_header {
$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);
$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>
+ <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>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
+ <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
+ </tr>
|;
}
}
-
- foreach $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}/;
# $locale->text('AR')
# $locale->text('AP')
- $department = qq|
- <tr>
- <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td><select name=department>$form->{selectdepartment}</select>
- <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-
- </td>
- </tr>
-| if $form->{selectdepartment};
-
$form->{jsscript} = 1;
$jsscript = "";
if ($form->{jsscript}) {
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}>
<td>
<table width=100%>
<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>
- <input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}">
- <input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
- <input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
- </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($form->{ARAP}) . qq|</th>
- <td colspan=3><select name=$form->{ARAP}>$form->{"select$form->{ARAP}"}</select>
- </td>
- <input type=hidden name="select$form->{ARAP}" value="$form->{"select$form->{ARAP}"}">
- </tr>
- <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>
+ <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"><input name="amount" size="10" value="|
- . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq|" onBlur=\"check_right_number_format(this)\"></td>
- </tr>
- </table>
- </td>
- </tr>
+ </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();
}
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;
<tr>
<td>
<table width=100%>
- <tr>
- <th class=listheading colspan=$colspan>$invoice</th>
- </tr>
+ <tr>
+ <th class=listheading colspan=$colspan>$invoice</th>
+ </tr>
|;
$column_data{invnumber} =
</tr>
|;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
+
+ my $j = 0;
map {
$form->{"${_}_$i"} =
$j++;
$j %= 2;
print qq|
- <tr class=listrow$j>
+ <tr class=listrow$j>
|;
map { print "$column_data{$_}\n" } @column_index;
print qq|
sub form_footer {
$lxdebug->enter_sub();
- $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');
- }
+ $auth->assert('cash');
print qq|
<tr>
</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|">
<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>
sub update {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
my ($new_name_selected) = @_;
+ my ($buysell, $newvc, $updated, $exchangerate, $amount);
+
if ($form->{vc} eq 'customer') {
$buysell = "buy";
} else {
}
# 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;
"<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}"}) {
}
}
}
-
+ # 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};
+ }
+ }
# get customer and invoices
$updated = &check_name($form->{vc});
}
}
- $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});
$form->{queued} = "";
- $i = 0;
- foreach $ref (@{ $form->{PR} }) {
+ my $i = 0;
+ foreach my $ref (@{ $form->{PR} }) {
$i++;
$form->{"id_$i"} = $ref->{id};
$form->{"invnumber_$i"} = $ref->{invnumber};
# Modified from $amount = $form->{amount} by J.Zach to update amount to total
# payment amount in Zahlungsausgang
$amount = 0;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
map {
$form->{"${_}_$i"} =
}
# Modified by J.Zach, see abovev
- $amount += $form->{"paid_$i"};
+ $amount += $form->{"paid_$i"};
} else {
$form->{"paid_$i"} = "";
}
# Line added by J.Zach, see above
- $form->{amount}=$amount;
+ $form->{amount}=$amount;
&form_header;
&list_invoices;
sub post {
$lxdebug->enter_sub();
+ $auth->assert('cash');
+
&check_form;
if ($form->{currency} ne $form->{defaultcurrency}) {
unless $form->{exchangerate};
}
- $msg1 = "$form->{origtitle} posted!";
- $msg2 = "Cannot post $form->{origtitle}!";
+ # 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}" .
+ "&datepaid=$form->{datepaid}&source=$form->{source}";
+
+ my $msg1 = "$form->{origtitle} posted!";
+ my $msg2 = "Cannot post $form->{origtitle}!";
# $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));
$lxdebug->leave_sub();
}
-sub print {
+sub check_form {
$lxdebug->enter_sub();
- &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);
-
- call_sub("$form->{vc}_details");
-
- $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};
+ $auth->assert('cash');
- 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} =
- "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}";
-
- $form->redirect if (CP->process_payment(\%myconfig, \%$form));
- $form->error($locale->text('Cannot post payment!'));
- }
-
- $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();
+ my ($closedto, $datepaid, $amount);
&check_name($form->{vc});
if ($form->{currency} ne $form->{oldcurrency}) {
&update;
- exit;
+ ::end_of_request();
}
-
- $form->error($locale->text('Zero amount posting!')) if ($form->{amount} eq "0,00" || $form->{amount} eq "0.00");
$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);
$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;
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
- $amount -= $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"});
projects / kivitendo-erp.git / blobdiff