X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=3b47b8eac169c7d1de7c3e6d6c132309ad62abae;hb=86f876b61346bf14a4369b2739fc48ac8a7e02be;hp=044bfee8da7e655b48650e4109a702888e70de23;hpb=770515d92619f11ebeb359b871d93d40c0d1af56;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 044bfee8d..3b47b8eac 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -36,6 +36,7 @@ use SL::CA; use SL::Form; use SL::User; use SL::USTVA; +use SL::Iconv; use CGI::Ajax; use CGI; @@ -223,10 +224,11 @@ sub account_header { 30 => "Ausserordentlicher Aufwand", 31 => "Betriebliche Steuern"); foreach $item (sort({ $a <=> $b } keys(%eur))) { + my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $eur{$item})); if ($item == $form->{pos_eur}) { - $select_eur .= qq||. sprintf("%.2d", $item) .qq|. $eur{$item}\n|; + $select_eur .= qq||. sprintf("%.2d", $item) .qq|. $text\n|; } else { - $select_eur .= qq||. sprintf("%.2d", $item) .qq|. $eur{$item}\n|; + $select_eur .= qq||. sprintf("%.2d", $item) .qq|. $text\n|; } } @@ -256,10 +258,11 @@ sub account_header { 34 => 'Verr.kalk.Kosten', 35 => 'Steuern Eink.u.Ertr.'); foreach $item (sort({ $a <=> $b } keys %bwapos)) { + my $text = H(SL::Iconv::convert("ISO-8859-15", $dbcharset, $bwapos{$item})); if ($item == $form->{pos_bwa}) { - $select_bwa .= qq||. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|; + $select_bwa .= qq||. sprintf("%.2d", $item) .qq|. $text\n|; } else { - $select_bwa .= qq||. sprintf("%.2d", $item) .qq|. $bwapos{$item}\n|; + $select_bwa .= qq||. sprintf("%.2d", $item) .qq|. $text\n|; } } @@ -1509,35 +1512,35 @@ sub list_buchungsgruppe { . qq||; $column_header{income_accno_0} = qq|| - . $locale->text('Erlöse Inland') + . $locale->text('National Revenues') . qq||; $column_header{expense_accno_0} = qq|| - . $locale->text('Aufwand Inland') + . $locale->text('National Expenses') . qq||; $column_header{income_accno_1} = qq|| - . $locale->text('Erlöse EU m. UStId') + . $locale->text('Revenues EU with UStId') . qq||; $column_header{expense_accno_1} = qq|| - . $locale->text('Aufwand EU m. UStId') + . $locale->text('Expenses EU with UStId') . qq||; $column_header{income_accno_2} = qq|| - . $locale->text('Erlöse EU o. UStId') + . $locale->text('Revenues EU without UStId') . qq||; $column_header{expense_accno_2} = qq|| - . $locale->text('Aufwand EU o. UStId') + . $locale->text('Expenses EU without UStId') . qq||; $column_header{income_accno_3} = qq|| - . $locale->text('Erlöse Ausland') + . $locale->text('Foreign Revenues') . qq||; $column_header{expense_accno_3} = qq|| - . $locale->text('Aufwand Ausland') + . $locale->text('Foreign Expenses') . qq||; $form->header; @@ -1658,8 +1661,8 @@ sub buchungsgruppe_header { $form->{title} = $locale->text("$form->{title} Buchungsgruppe"); - # $locale->text('Buchungsgruppe hinzufügen') - # $locale->text('Buchungsgruppe bearbeiten') + # $locale->text('Add Accounting Group') + # $locale->text('Edit Accounting Group') my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {}); my %acc_type_map = ( @@ -1709,11 +1712,11 @@ sub buchungsgruppe_header { $linkaccounts .= qq| - | . $locale->text('Erlöse Inland') . qq| + | . $locale->text('National Revenues') . qq| $form->{selectIC_income} - | . $locale->text('Aufwand Inland') . qq| + | . $locale->text('National Expenses') . qq| $form->{selectIC_expense} |; if ($form->{id}) { @@ -1723,11 +1726,11 @@ sub buchungsgruppe_header { $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/ value=$form->{expense_accno_id_1} selected/; } $linkaccounts .= qq| - | . $locale->text('Erlöse EU m. UStId') . qq| + | . $locale->text('Revenues EU with UStId') . qq| $form->{selectIC_income} - | . $locale->text('Aufwand EU m UStId') . qq| + | . $locale->text('Expenses EU with UStId') . qq| $form->{selectIC_expense} |; @@ -1739,11 +1742,11 @@ sub buchungsgruppe_header { } $linkaccounts .= qq| - | . $locale->text('Erlöse EU o. UStId') . qq| + | . $locale->text('Revenues EU without UStId') . qq| $form->{selectIC_income} - | . $locale->text('Aufwand EU o. UStId') . qq| + | . $locale->text('Expenses EU without UStId') . qq| $form->{selectIC_expense} |; @@ -1755,11 +1758,11 @@ sub buchungsgruppe_header { } $linkaccounts .= qq| - | . $locale->text('Erlöse Ausland') . qq| + | . $locale->text('Foreign Revenues') . qq| $form->{selectIC_income} - | . $locale->text('Aufwand Ausland') . qq| + | . $locale->text('Foreign Expenses') . qq| $form->{selectIC_expense} |; @@ -1799,7 +1802,7 @@ sub save_buchungsgruppe { $form->isblank("description", $locale->text('Description missing!')); AM->save_buchungsgruppe(\%myconfig, \%$form); - $form->redirect($locale->text('Buchungsgruppe gespeichert!')); + $form->redirect($locale->text('Accounting Group saved!')); $lxdebug->leave_sub(); } @@ -1808,7 +1811,7 @@ sub delete_buchungsgruppe { $lxdebug->enter_sub(); AM->delete_buchungsgruppe(\%myconfig, \%$form); - $form->redirect($locale->text('Buchungsgruppe gelöscht!')); + $form->redirect($locale->text('Accounting Group deleted!')); $lxdebug->leave_sub(); } @@ -3068,7 +3071,6 @@ sub show_am_history { : "" ) ); - my $dbh = $form->dbconnect(\%myconfig); my $searchSNumber = $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'}; $restriction .= ($form->{mitarbeiter} eq "" ? "" @@ -3092,7 +3094,7 @@ sub show_am_history { $form->header(); my $daten = ""; while(my $hash_ref = $sth->fetchrow_hashref()){ - $daten = $form->get_history($dbh,$hash_ref->{id},$restriction); + $daten = $form->get_history($dbh,$hash_ref->{id},$restriction,$form->{order}); } $dbh->disconnect(); print $form->parse_html_template("/common/show_history",