X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=faac8cc74381c43db1d47669b4d78e2db86b8009;hb=f36eb9fca78c4940b486b7dafa4ab636cdaf99cd;hp=45c8cc7553edb9b31cd4bd1791fdcab079b0ae9d;hpb=30a70ccf6975394a86d2ff036fe1d0fb34fcda04;p=kivitendo-erp.git diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 45c8cc755..faac8cc74 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -71,12 +71,10 @@ sub chart_of_accounts { CA->all_accounts(\%myconfig, \%$form); - @column_index = qw(accno gifi_accno description debit credit); + @column_index = qw(accno description debit credit); $column_header{accno} = qq|| . $locale->text('Account') . qq|\n|; - $column_header{gifi_accno} = - qq|| . $locale->text('GIFI') . qq|\n|; $column_header{description} = qq|| . $locale->text('Description') . qq|\n|; $column_header{debit} = @@ -107,22 +105,18 @@ sub chart_of_accounts { foreach $ca (@{ $form->{CA} }) { $description = $form->escape($ca->{description}); - $gifi_description = $form->escape($ca->{gifi_description}); $href = - qq|$form->{script}?path=$form->{path}&action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description&gifi_accno=$ca->{gifi_accno}&gifi_description=$gifi_description|; + qq|$form->{script}?action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description|; if ($ca->{charttype} eq "H") { print qq||; map { $column_data{$_} = "$ca->{$_}"; } qw(accno description); - $column_data{gifi_accno} = "$ca->{gifi_accno} "; } else { $i++; $i %= 2; print qq||; $column_data{accno} = "$ca->{accno}"; - $column_data{gifi_accno} = - "$ca->{gifi_accno} "; $column_data{description} = "$ca->{description}"; } my $debit = ""; @@ -153,7 +147,7 @@ sub chart_of_accounts { } map { $column_data{$_} = " "; } - qw(accno gifi_accno description); + qw(accno description); $column_data{debit} = "" @@ -184,11 +178,7 @@ sub list { $lxdebug->enter_sub(); $form->{title} = $locale->text('List Transactions'); - if ($form->{accounttype} eq 'gifi') { - $form->{title} .= " - " . $locale->text('GIFI') . " $form->{gifi_accno}"; - } else { - $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}"; - } + $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}"; # get departments $form->all_departments(\%myconfig); @@ -210,7 +200,7 @@ sub list { $form->header; - map { $form->{$_} =~ s/\"/"/g; } qw(description gifi_description); + $form->{description} =~ s/\"/"/g; print qq| @@ -222,8 +212,6 @@ sub list { {accounttype}> -{gifi_accno}> - @@ -251,7 +239,6 @@ sub list {

$form->{title}

{login}> -{path}> {password}>
{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; + "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; $description = $form->escape($form->{description}, 1); - $gifi_description = $form->escape($form->{gifi_description}, 1); $department = $form->escape($form->{department}, 1); $projectnumber = $form->escape($form->{projectnumber}, 1); $title = $form->escape($form->{title}, 1); # construct callback $callback = - "$form->{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&gifi_accno=$form->{gifi_accno}&gifi_description=$gifi_description&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; + "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; # figure out which column comes first $column_header{transdate} = @@ -310,19 +295,12 @@ sub list_transactions { @column_index = $form->sort_columns(qw(transdate reference description debit credit)); - if ($form->{accounttype} eq 'gifi') { - map { $form->{$_} = $form->{"gifi_$_"} } qw(accno description); - } if ($form->{accno}) { push @column_index, "balance"; } - $form->{title} = - ($form->{accounttype} eq 'gifi') - ? $locale->text('GIFI') - : $locale->text('Account'); - - $form->{title} .= " $form->{accno} - $form->{description}"; + $form->{title} = $locale->text('Account') . + " $form->{accno} - $form->{description}"; if ($form->{department}) { ($department) = split /--/, $form->{department}; @@ -412,14 +390,13 @@ sub list_transactions { # construct link to source $href = - "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; - + "{module}.pl?action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; + my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") : " "; $column_data{debit} = - "" - . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") . ""; + "$debit"; + my $credit = ($ca->{credit} != 0) ? $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") : " "; $column_data{credit} = - "" - . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") . ""; + "$credit"; $form->{balance} += $ca->{amount}; $column_data{balance} = @@ -433,12 +410,13 @@ sub list_transactions { $totaldebit += $ca->{debit}; $totalcredit += $ca->{credit}; - $column_data{transdate} = qq|$ca->{transdate}|; - $column_data{reference} = qq|$href|; - $column_data{description} = qq|$ca->{description}|; - - $i++; + $column_data{transdate} = ($ca->{"reference"} ne $last || $form->{sort} ne "transdate") ? qq|$ca->{transdate}| : qq||; + $column_data{reference} = ($ca->{"reference"} ne $last) ? qq|$href| : qq||; + $column_data{description} = ($ca->{"reference"} ne $last) ? qq|$ca->{description}| : qq||; + + $i++ if($ca->{"reference"} ne $last); $i %= 2; + $last=$ca->{"reference"}; print qq| |;