X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=09d2007a23cd5608f9da1994edd286eaf5646a95;hb=11e6f144c6af375d7b061bde6484266884d6f636;hp=c9b5f549fdbdba8ab4e78b3ab1ee8ed17d9f6ed2;hpb=56041df395cc2d8971f822c54f4e48743cc4f22b;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c9b5f549f..09d2007a2 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -177,10 +177,14 @@ sub account_header {
76 => $locale->text('UStVA-Nr. 76'),
77 => $locale->text('UStVA-Nr. 77'),
80 => $locale->text('UStVA-Nr. 80'),
+ 81 => $locale->text('UStVA-Nr. 81 left'),
+ 811 => $locale->text('UStVA-Nr. 81 right'),
84 => $locale->text('UStVA-Nr. 84'),
85 => $locale->text('UStVA-Nr. 85'),
86 => $locale->text('UStVA-Nr. 86 left'),
861 => $locale->text('UStVA-Nr. 86 right'),
+ 89 => $locale->text('UStVA-Nr. 89 left'),
+ 891 => $locale->text('UStVA-Nr. 89 right'),
91 => $locale->text('UStVA-Nr. 91'),
93 => $locale->text('UStVA-Nr. 93 left'),
931 => $locale->text('UStVA-Nr. 93 right'),
@@ -575,12 +579,11 @@ sub list_account {
$ca->{link} .= qq|[| . $link . qq|] |;
}
- $ca->{startdate} =~ s/,/
/og;
- $ca->{tk_ustva} =~ s/,/
/og;
-
- $ca->{taxkey_id} =~ s/,/
/og;
- $ca->{taxdescription} =~ s/,/
/og;
-
+ $ca->{startdate} =~ s/,/
/og;
+ $ca->{tk_ustva} =~ s/,/
/og;
+ $ca->{taxkey} =~ s/,/
/og;
+ $ca->{taxaccount} =~ s/,/
/og;
+ $ca->{taxdescription} =~ s/,/
/og;
$ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):q{};
$ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
@@ -595,7 +598,7 @@ sub list_account {
$ca->{link_edit_account} =
qq|$form->{script}?action=edit_account&id=$ca->{id}|
.qq|&path=$form->{path}&login=$form->{login}|
- .qq|&password=$form->{password}&callback=$callback>$ca->{accno}|;
+ .qq|&password=$form->{password}&callback=$callback|;
}
my $parameters_ref = {
@@ -2326,6 +2329,10 @@ sub add_payment {
$form->{terms_netto} = 0;
$form->{terms_skonto} = 0;
$form->{percent_skonto} = 0;
+ my @languages = AM->language(\%myconfig, $form, 1);
+ map({ $_->{"language"} = $_->{"description"};
+ $_->{"language_id"} = $_->{"id"}; } @languages);
+ $form->{"TRANSLATION"} = \@languages;
&payment_header;
&form_footer;
@@ -2337,7 +2344,7 @@ sub edit_payment {
$form->{title} = "Edit";
- AM->get_payment(\%myconfig, \%$form);
+ AM->get_payment(\%myconfig, $form);
$form->{percent_skonto} =
$form->format_amount(\%myconfig, $form->{percent_skonto} * 100);
@@ -2453,7 +2460,7 @@ sub list_payment {
build_std_url("action=edit_payment", "id=$ref->{id}", "callback=$callback") .
qq|">| . H($ref->{description}) . qq||;
$column_data{description_long} =
- qq|
| . $locale->text("You can use the following strings in the long " . + "description and all translations. They will be " . + "replaced by their actual values by Lx-Office " . + "before they're output.") +. qq|
+ +