X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=80f05084be3ee47923acc7892b19d768e5ba2cab;hb=4e27e828de91b6f1252f3353f06edea72f13a0c1;hp=c9b5f549fdbdba8ab4e78b3ab1ee8ed17d9f6ed2;hpb=56041df395cc2d8971f822c54f4e48743cc4f22b;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index c9b5f549f..80f05084b 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 = { @@ -632,231 +635,6 @@ sub delete_account { $lxdebug->leave_sub(); } -sub list_gifi { - $lxdebug->enter_sub(); - - @{ $form->{fields} } = (accno, description); - $form->{table} = "gifi"; - $form->{sortorder} = "accno"; - - AM->gifi_accounts(\%myconfig, \%$form); - - $form->{title} = $locale->text('GIFI'); - - # construct callback - $callback = - "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - @column_index = qw(accno description); - - $column_header{accno} = qq|| . $locale->text('GIFI') . qq||; - $column_header{description} = - qq|| . $locale->text('Description') . qq||; - - $form->header; - $colspan = $#column_index + 1; - - print qq| - - - - - - - - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - # escape callback - $callback = $form->escape($callback); - - foreach $ca (@{ $form->{ALL} }) { - - $i++; - $i %= 2; - - print qq| -|; - - $column_data{accno} = - qq||; - $column_data{description} = qq||; - - map { print "$column_data{$_}\n" } @column_index; - - print "\n"; - } - - print qq| - - - -
$form->{title}
{script}?action=edit_gifi&coa=1&accno=$ca->{accno}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{accno}$ca->{description} 
- - - -|; - - $lxdebug->leave_sub(); -} - -sub add_gifi { - $lxdebug->enter_sub(); - - $form->{title} = "Add"; - - # construct callback - $form->{callback} = - "$form->{script}?action=list_gifi&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $form->{coa} = 1; - - &gifi_header; - &gifi_footer; - - $lxdebug->leave_sub(); -} - -sub edit_gifi { - $lxdebug->enter_sub(); - - $form->{title} = "Edit"; - - AM->get_gifi(\%myconfig, \%$form); - - &gifi_header; - &gifi_footer; - - $lxdebug->leave_sub(); -} - -sub gifi_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} GIFI"); - - # $locale->text('Add GIFI') - # $locale->text('Edit GIFI') - - $form->{description} =~ s/\"/"/g; - - $form->header; - - print qq| - - -
{script}> - -{accno}> - - - - - - - - - - - - - -
$form->{title}
- - - - - - - - - -
| . $locale->text('GIFI') . qq|{accno}>
| . $locale->text('Description') . qq|
-
-|; - - $lxdebug->leave_sub(); -} - -sub gifi_footer { - $lxdebug->enter_sub(); - - print qq| - - - -{path}> -{login}> -{password}> - -
|; - - if ($form->{coa}) { - print qq| - -|; - - if ($form->{accno} && $form->{orphaned}) { - print qq||; - } - } - - print qq| -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub save_gifi { - $lxdebug->enter_sub(); - - $form->isblank("accno", $locale->text('GIFI missing!')); - AM->save_gifi(\%myconfig, \%$form); - $form->redirect($locale->text('GIFI saved!')); - - $lxdebug->leave_sub(); -} - -sub copy_to_coa { - $lxdebug->enter_sub(); - - $form->isblank("accno", $locale->text('GIFI missing!')); - - AM->save_gifi(\%myconfig, \%$form); - - delete $form->{id}; - $form->{gifi_accno} = $form->{accno}; - $form->{title} = "Add"; - $form->{charttype} = "A"; - - &account_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub delete_gifi { - $lxdebug->enter_sub(); - - AM->delete_gifi(\%myconfig, \%$form); - $form->redirect($locale->text('GIFI deleted!')); - - $lxdebug->leave_sub(); -} - sub add_department { $lxdebug->enter_sub(); @@ -1332,7 +1110,7 @@ sub list_business { |; $discount = - $form->format_amount(\%myconfig, $ref->{discount} * 100, 1, " "); + $form->format_amount(\%myconfig, $ref->{discount} * 100); $description = ($ref->{salesman}) ? "$ref->{description}" @@ -1438,6 +1216,7 @@ sub save_business { $lxdebug->enter_sub(); $form->isblank("description", $locale->text('Description missing!')); + $form->{discount} = $form->parse_amount(\%myconfig, $form->{discount}) / 100; AM->save_business(\%myconfig, \%$form); $form->redirect($locale->text('Business saved!')); @@ -1779,11 +1558,11 @@ sub list_buchungsgruppe { income_accno_3 expense_accno_3 ); $column_header{up} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{down} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{description} = @@ -1865,20 +1644,20 @@ sub list_buchungsgruppe { if ($row) { my $pref = $form->{ALL}->[$row - 1]; $column_data{up} = - qq|| . + qq|| . qq|| . qq|| . $locale->text(| . qq||; } else { - $column_data{up} = qq| |; + $column_data{up} = qq| |; } if ($row == (scalar(@{ $form->{ALL} }) - 1)) { - $column_data{down} = qq| |; + $column_data{down} = qq| |; } else { my $nref = $form->{ALL}->[$row + 1]; $column_data{down} = - qq|| . + qq|| . qq|| . qq|| . $locale->text(| . qq||; @@ -2313,7 +2092,6 @@ sub delete_printer { $lxdebug->leave_sub(); } - sub add_payment { $lxdebug->enter_sub(); @@ -2326,6 +2104,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 +2119,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); @@ -2364,11 +2146,11 @@ sub list_payment { terms_skonto percent_skonto); $column_header{up} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{down} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{description} = @@ -2429,20 +2211,20 @@ sub list_payment { if ($row) { my $pref = $form->{ALL}->[$row - 1]; $column_data{up} = - qq|| . + qq|| . qq|| . qq|| . $locale->text(| . qq||; } else { - $column_data{up} = qq| |; + $column_data{up} = qq| |; } if ($row == (scalar(@{ $form->{ALL} }) - 1)) { - $column_data{down} = qq| |; + $column_data{down} = qq| |; } else { my $nref = $form->{ALL}->[$row + 1]; $column_data{down} = - qq|| . + qq|| . qq|| . qq|| . $locale->text(| . qq||; @@ -2453,7 +2235,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|| . H($ref->{description_long}) . qq||; + qq|| . H($ref->{description_long}) . qq||; $column_data{terms_netto} = qq|$ref->{terms_netto}|; $column_data{terms_skonto} = @@ -2537,6 +2319,22 @@ sub payment_header { | . $locale->text('Long Description') . qq| +|; + + foreach my $language (@{ $form->{"TRANSLATION"} }) { + print qq| + + | . + sprintf($locale->text('Translation (%s)'), + $language->{"language"}) + . qq| + + +|; + } + + print qq| | . $locale->text('Netto Terms') . qq| @@ -2552,7 +2350,38 @@ sub payment_header {
-|; + +

| . $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|

+ +|; $lxdebug->leave_sub(); } @@ -2587,268 +2416,65 @@ sub swap_payment_terms { $lxdebug->leave_sub(); } -sub add_sic { - $lxdebug->enter_sub(); - - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - - &sic_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub edit_sic { +sub display_stylesheet { $lxdebug->enter_sub(); - $form->{title} = "Edit"; - - AM->get_sic(\%myconfig, \%$form); - - &sic_header; - - $form->{orphaned} = 1; - &form_footer; + $form->{file} = "css/$myconfig{stylesheet}"; + &display_form; $lxdebug->leave_sub(); } -sub list_sic { +sub display_form { $lxdebug->enter_sub(); - AM->sic(\%myconfig, \%$form); - - $form->{callback} = - "$form->{script}?action=list_sic&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + $form->{file} =~ s/^(.:)*?\/|\.\.\///g; + $form->{file} =~ s/^\/*//g; + $form->{file} =~ s/$userspath//; - $callback = $form->escape($form->{callback}); + $form->error("$!: $form->{file}") unless -f $form->{file}; - $form->{title} = $locale->text('Standard Industrial Codes'); + AM->load_template(\%$form); - @column_index = qw(code description); + $form->{title} = $form->{file}; - $column_header{code} = - qq|| . $locale->text('Code') . qq||; - $column_header{description} = - qq|| . $locale->text('Description') . qq||; + # if it is anything but html + if ($form->{file} !~ /\.html$/) { + $form->{body} = "
\n$form->{body}\n
"; + } $form->header; print qq| - - - - - - - - - - - -
$form->{title}
- - -|; +$form->{body} - map { print "$column_header{$_}\n" } @column_index; +{script}> - print qq| - -|; +{file}> + - foreach $ref (@{ $form->{ALL} }) { +{path}> +{login}> +{password}> - $i++; - $i %= 2; + - if ($ref->{sictype} eq 'H') { - print qq| - -|; - $column_data{code} = - qq||; - $column_data{description} = qq||; + - } else { - print qq| - + + |; - $column_data{code} = - qq||; - $column_data{description} = qq||; + $lxdebug->leave_sub(); +} - } +sub edit_template { + $lxdebug->enter_sub(); - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - } - - print qq| -
{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}$ref->{description}
{script}?action=edit_sic&code=$ref->{code}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{code}$ref->{description}
-
- -
-
{script}> - - - - - -{path}> -{login}> -{password}> - - - -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub sic_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} SIC"); - - # $locale->text('Add SIC') - # $locale->text('Edit SIC') - - $form->{code} =~ s/\"/"/g; - $form->{description} =~ s/\"/"/g; - - $checked = ($form->{sictype} eq 'H') ? "checked" : ""; - - $form->header; - - print qq| - - -
{script}> - - -{code}> - - - - - - - - - - - - - - - - - - - - -
$form->{title}
| . $locale->text('Code') . qq|{code}>
| - . $locale->text('Heading') . qq|
| . $locale->text('Description') . qq|
-|; - - $lxdebug->leave_sub(); -} - -sub save_sic { - $lxdebug->enter_sub(); - - $form->isblank("code", $locale->text('Code missing!')); - $form->isblank("description", $locale->text('Description missing!')); - AM->save_sic(\%myconfig, \%$form); - $form->redirect($locale->text('SIC saved!')); - - $lxdebug->leave_sub(); -} - -sub delete_sic { - $lxdebug->enter_sub(); - - AM->delete_sic(\%myconfig, \%$form); - $form->redirect($locale->text('SIC deleted!')); - - $lxdebug->leave_sub(); -} - -sub display_stylesheet { - $lxdebug->enter_sub(); - - $form->{file} = "css/$myconfig{stylesheet}"; - &display_form; - - $lxdebug->leave_sub(); -} - -sub display_form { - $lxdebug->enter_sub(); - - $form->{file} =~ s/^(.:)*?\/|\.\.\///g; - $form->{file} =~ s/^\/*//g; - $form->{file} =~ s/$userspath//; - - $form->error("$!: $form->{file}") unless -f $form->{file}; - - AM->load_template(\%$form); - - $form->{title} = $form->{file}; - - # if it is anything but html - if ($form->{file} !~ /\.html$/) { - $form->{body} = "
\n$form->{body}\n
"; - } - - $form->header; - - print qq| - - -$form->{body} - -{script}> - -{file}> - - -{path}> -{login}> -{password}> - - - -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub edit_template { - $lxdebug->enter_sub(); - - AM->load_template(\%$form); + AM->load_template(\%$form); $form->{title} = $locale->text('Edit Template'); @@ -2990,19 +2616,6 @@ sub config { } $countrycodes = "