X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fgl.pl;h=dc9238a34877afa0a45f45269cb4431ba1a916f5;hb=840aea131eef33512dccc13184e01affafaafb37;hp=253b97ee4de6acd3fed910cb92cc0c28e9936e9c;hpb=ee4b3441e94a1e1481ec84554987ed1b079eb52e;p=kivitendo-erp.git
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 253b97ee4..dc9238a34 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -339,8 +339,6 @@ sub search {
| . $locale->text('Source') . qq| |
|
| . $locale->text('Account') . qq| |
- |
- | . $locale->text('GIFI') . qq| |
|
@@ -412,14 +410,6 @@ sub generate_report {
$locale->text('Account')
. " : $form->{accno} $form->{account_description}";
}
- if ($form->{gifi_accno}) {
- $href .= "&gifi_accno=" . $form->escape($form->{gifi_accno});
- $callback .= "&gifi_accno=" . $form->escape($form->{gifi_accno}, 1);
- $option .= "\n
" if $option;
- $option .=
- $locale->text('GIFI')
- . " : $form->{gifi_accno} $form->{gifi_account_description}";
- }
if ($form->{source}) {
$href .= "&source=" . $form->escape($form->{source});
$callback .= "&source=" . $form->escape($form->{source}, 1);
@@ -482,13 +472,13 @@ sub generate_report {
transdate id reference description
notes source debit debit_accno
credit credit_accno debit_tax debit_tax_accno
- credit_tax credit_tax_accno accno gifi_accno
+ credit_tax credit_tax_accno accno
projectnumbers
)
);
- if ($form->{accno} || $form->{gifi_accno}) {
- @columns = grep !/(accno|gifi_accno)/, @columns;
+ if ($form->{accno}) {
+ @columns = grep !/accno/, @columns;
push @columns, "balance";
$form->{l_balance} = "Y";
@@ -569,10 +559,6 @@ sub generate_report {
""
. $locale->text('Credit Tax Account')
. " | ";
- $column_header{gifi_accno} =
- ""
- . $locale->text('GIFI')
- . " | ";
$column_header{balance} = "" . $locale->text('Balance') . " | ";
$column_header{projectnumbers} =
"" . $locale->text('Project Numbers') . " | ";
@@ -617,7 +603,7 @@ sub generate_report {
$sameitem = $form->{GL}->[0]->{ $form->{sort} };
}
- if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
+ if ($form->{accno} && $form->{balance}) {
map { $column_data{$_} = " | " } @column_index;
$column_data{balance} =
@@ -766,11 +752,11 @@ sub generate_report {
}
$transdate = "";
- foreach $key (sort keys(%{ $ref->{transdate} })) {
+ foreach $key (sort keys(%{ $ref->{ac_transdate} })) {
if ($key == 0) {
- $transdate = "$ref->{transdate}{$key}";
+ $transdate = "$ref->{ac_transdate}{$key}";
} else {
- $transdate .= "
$ref->{transdate}{$key}";
+ $transdate .= "
$ref->{ac_transdate}{$key}";
}
}
@@ -793,15 +779,11 @@ sub generate_report {
? "$debittax | "
: " | ";
$column_data{debit_tax_accno} = "$debittaxaccno | ";
- $column_data{gifi_accno} =
- "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
$column_data{credit_tax} =
($ref->{credit_tax_accno} ne "")
? "$credittax | "
: " | ";
$column_data{credit_tax_accno} = "$credittaxaccno | ";
- $column_data{gifi_accno} =
- "{gifi_accno}&callback=$callback>$ref->{gifi_accno} | ";
$column_data{balance} =
""
. $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . " | ";
@@ -1127,7 +1109,6 @@ sub display_rows {
if ($previous_accno &&
($previous_accno eq $selected_accno) &&
($previous_tax_id ne $selected_tax_id)) {
- $lxdebug->message(0, "yeah");
my $item = $taxcharts{$selected_tax_id};
$selected_taxchart = "$item->{id}--$item->{rate}";
}