X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=4634cb19d48ffe550a69c89833e23f381c62aa3e;hb=828bd68326ee5bd732d3d01e9f166dacb7424657;hp=540a4f12ee0ef266821fd588e96d62dc807791d8;hpb=326d4c54db908fe57a661a472152cd1a4607aebe;p=kivitendo-erp.git
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 540a4f12e..4634cb19d 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -79,6 +79,7 @@ sub add {
unless $form->{callback};
&create_links;
+ AR->get_transdate(\%myconfig, $form);
&display_form;
$lxdebug->leave_sub();
@@ -291,6 +292,8 @@ sub create_links {
($form->datetonum($form->{transdate}, \%myconfig) <=
$form->datetonum($form->{closedto}, \%myconfig));
+ $form->{"ARselected"} = $form->{"AR_1"};
+
$lxdebug->leave_sub();
}
@@ -330,6 +333,11 @@ sub form_header {
($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
$readonly = ($form->{radier}) ? "" : $readonly;
+ my $ARselected_quoted = quotemeta($form->{"ARselected"});
+ $form->{selectAR} = $form->{AR};
+ $form->{selectAR} =~
+ s/value=\"${ARselected_quoted}\"/value=\"$form->{ARselected}\" selected/;
+
# set option selected
foreach $item (qw(customer currency department employee)) {
$form->{"select$item"} =~ s/ selected//;
@@ -654,6 +662,7 @@ $jsscript
";
+ my @triggers = ();
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
print "
@@ -693,7 +702,8 @@ $jsscript
qq|
| |;
$column_data{exchangerate} = qq|$exchangerate | |;
$column_data{datepaid} =
- qq|{"datepaid_$i"}> | |;
+ qq|{"datepaid_$i"}>
+ | |;
$column_data{source} =
qq| | |;
$column_data{memo} =
@@ -704,9 +714,12 @@ $jsscript
print "
";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid);
- print qq|
+
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
{paidaccounts}>
@@ -758,6 +771,10 @@ sub form_footer {
. $locale->text('Use As Template') . qq|">
|;
}
+ print qq|
+
+ |;
} else {
if ($transdate > $closedto) {
@@ -768,11 +785,6 @@ sub form_footer {
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
print "
@@ -798,11 +810,6 @@ sub update {
# $form->{selectAR_amount} =~
# s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/;
- $form->{selectAR} = $form->{AR};
-
- $form->{selectAR} =~
- s/value=\"$form->{ARselected}\"/value=\"$form->{ARselected}\" selected/;
-
($AR_amountaccno, $AR_amounttaxkey) =
split(/--/, $form->{AR_amountselected});
$form->{selecttaxchart} = $form->{taxchart};
@@ -897,6 +904,36 @@ sub update {
$lxdebug->leave_sub();
}
+sub post_payment {
+ $lxdebug->enter_sub();
+ for $i (1 .. $form->{paidaccounts}) {
+ if ($form->{"paid_$i"}) {
+ $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
+
+ $form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($datepaid <= $closedto);
+
+ if ($form->{currency} ne $form->{defaultcurrency}) {
+ $form->{"exchangerate_$i"} = $form->{exchangerate}
+ if ($invdate == $datepaid);
+ $form->isblank("exchangerate_$i",
+ $locale->text('Exchangerate for payment missing!'));
+ }
+ }
+ }
+
+ ($form->{AR}) = split /--/, $form->{AR};
+ ($form->{AR_paid}) = split /--/, $form->{AR_paid};
+ $form->redirect($locale->text(' Payment posted!'))
+ if (AR->post_payment(\%myconfig, \%$form));
+ $form->error($locale->text('Cannot post payment!'));
+
+
+ $lxdebug->leave_sub();
+}
+
sub post {
$lxdebug->enter_sub();
@@ -1296,9 +1333,11 @@ sub ar_transactions {
}
@columns = $form->sort_columns(
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia)
+ qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee shippingpoint shipvia)
);
+ $form->{"l_type"} = "Y";
+
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
@@ -1326,6 +1365,8 @@ sub ar_transactions {
""
. $locale->text('Due Date')
. " | ";
+ $column_header{type} =
+ "" . $locale->text('Type') . " | ";
$column_header{invnumber} =
""
. $locale->text('Invoice')
@@ -1452,6 +1493,11 @@ sub ar_transactions {
$column_data{invnumber} =
" | {id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber} | ";
+ $column_data{type} = "" .
+ ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ?
+ $locale->text("Credit note (one letter abbreviation)") :
+ $locale->text("Invoice (one letter abbreviation)")) . " | ";
$column_data{ordnumber} = "$ar->{ordnumber} | ";
$column_data{name} = "$ar->{name} | ";
$ar->{notes} =~ s/\r\n/
/g;
@@ -1526,14 +1572,8 @@ sub ar_transactions {
|;
+ . $locale->text('Sales Invoice') . qq|">
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|