X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=c8a3ba6d6a32e910cec77597aec74707f4c2abad;hb=6bad0469c4f5bb92830f77cf7675e76730e79ae4;hp=65c51a1f158c232039a62602bf8e5db4ab1188b5;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 65c51a1f1..c8a3ba6d6 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -461,12 +461,12 @@ selectvendor } |
# with JavaScript Calendar
$button1 = qq|
-
{transdate} onBlur=\"check_right_date_format(this)\"> $readonly |
+ $readonly |
text('button') . qq|> |
|;
$button2 = qq|
- {duedate} onBlur=\"check_right_date_format(this)\"> $readonly |
+ $readonly |
text('button') . qq|> |
|;
@@ -479,9 +479,9 @@ selectvendor } |
# without JavaScript Calendar
$button1 =
- qq|{transdate} onBlur=\"check_right_date_format(this)\"> $readonly | |;
+ qq| $readonly | |;
$button2 =
- qq|{duedate} onBlur=\"check_right_date_format(this)\"> $readonly | |;
+ qq| $readonly | |;
}
$form->{javascript} .= qq||;
$form->header;
@@ -776,12 +776,12 @@ $jsscript
|;
$column_data{"paid_$i"} =
- qq|{"paid_$i"} onBlur=\"check_right_number_format(this)\"> | |;
+ qq| | |;
$column_data{"AP_paid_$i"} =
qq|${selectAP_paid} | |;
$column_data{"exchangerate_$i"} = qq|$exchangerate | |;
$column_data{"datepaid_$i"} =
- qq|{"datepaid_$i"} onBlur=\"check_right_date_format(this)\">
+ qq| |
| |;
$column_data{"source_$i"} =
qq| | |;
@@ -1456,9 +1456,11 @@ sub ap_transactions {
}
@columns =
- qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid
+ qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
due duedate notes employee globalprojectnumber);
+ $form->{"l_type"} = "Y";
+
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
@@ -1482,6 +1484,8 @@ sub ap_transactions {
qq||
. $locale->text('Date')
. qq| | |;
+ $column_header{type} =
+ "" . $locale->text('Type') . " | ";
$column_header{duedate} =
qq||
. $locale->text('Due Date')
@@ -1596,6 +1600,10 @@ sub ap_transactions {
$subtotaldue += ($ap->{amount} - $ap->{paid});
$column_data{transdate} = " | $ap->{transdate} | ";
+ $column_data{type} = "" .
+ ($ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") :
+ $locale->text("AP Transaction (abbreviation)"))
+ . " | ";
$column_data{duedate} = "$ap->{duedate} | ";
$column_data{datepaid} = "$ap->{datepaid} | ";