projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beim Aufrufen der Masken für Dialogbuchen, Debitoren- und Kreditorenrechnungen wird...
[kivitendo-erp.git]
/
bin
/
mozilla
/
ar.pl
diff --git
a/bin/mozilla/ar.pl
b/bin/mozilla/ar.pl
index
17f37f4
..
4fb3d51
100644
(file)
--- a/
bin/mozilla/ar.pl
+++ b/
bin/mozilla/ar.pl
@@
-79,6
+79,7
@@
sub add {
unless $form->{callback};
&create_links;
unless $form->{callback};
&create_links;
+ AR->get_transdate(\%myconfig, $form);
&display_form;
$lxdebug->leave_sub();
&display_form;
$lxdebug->leave_sub();
@@
-121,7
+122,7
@@
sub create_links {
$form->{rowcount} = 1;
# currencies
$form->{rowcount} = 1;
# currencies
- @curr = split
/:/, $form->{currencies}
;
+ @curr = split
(/:/, $form->{currencies})
;
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
@@
-251,9
+252,9
@@
sub create_links {
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
$form->{"${key}_$i"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
$form->{"${key}_$i"} =
"$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+ my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description});
$form->{"select${key}"} =~
$form->{"select${key}"} =~
- /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}<\/option>\n/;
- $test = $1;
+ /<option value=\"($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)\">$form->{acc_trans}{$key}->[$i-1]->{accno}--${q_description}<\/option>\n/;
$form->{"${key}_$k"} = $1;
if ($akey eq 'amount') {
$form->{"taxchart_$k"} = $form->{taxchart};
$form->{"${key}_$k"} = $1;
if ($akey eq 'amount') {
$form->{"taxchart_$k"} = $form->{taxchart};
@@
-972,7
+973,7
@@
sub post_as_new {
sub use_as_template {
$lxdebug->enter_sub();
sub use_as_template {
$lxdebug->enter_sub();
- map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1);
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1
storno
);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
@@
-1296,9
+1297,11
@@
sub ar_transactions {
}
@columns = $form->sort_columns(
}
@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;
foreach $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
@@
-1326,6
+1329,8
@@
sub ar_transactions {
"<th><a class=listheading href=$href&sort=duedate>"
. $locale->text('Due Date')
. "</a></th>";
"<th><a class=listheading href=$href&sort=duedate>"
. $locale->text('Due Date')
. "</a></th>";
+ $column_header{type} =
+ "<th class=\"listheading\">" . $locale->text('Type') . "</th>";
$column_header{invnumber} =
"<th><a class=listheading href=$href&sort=invnumber>"
. $locale->text('Invoice')
$column_header{invnumber} =
"<th><a class=listheading href=$href&sort=invnumber>"
. $locale->text('Invoice')
@@
-1452,6
+1457,11
@@
sub ar_transactions {
$column_data{invnumber} =
"<td><a href=$module?action=edit&id=$ar->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
$column_data{invnumber} =
"<td><a href=$module?action=edit&id=$ar->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+ $column_data{type} = "<td>" .
+ ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
+ $ar->{amount} < 0 ?
+ $locale->text("Credit note (one letter abbreviation)") :
+ $locale->text("Invoice (one letter abbreviation)")) . "</td>";
$column_data{ordnumber} = "<td>$ar->{ordnumber} </td>";
$column_data{name} = "<td>$ar->{name}</td>";
$ar->{notes} =~ s/\r\n/<br>/g;
$column_data{ordnumber} = "<td>$ar->{ordnumber} </td>";
$column_data{name} = "<td>$ar->{name}</td>";
$ar->{notes} =~ s/\r\n/<br>/g;