X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=111e14e949cef19524f552c26c0d316ebf21429f;hb=c13acbec41af2e85ad469d36d1eec19343b7d680;hp=276a2dafecc43c06eadb013e97f5daa20427aca2;hpb=ab18ac36133d48a5c38026bff01f3733d8638db8;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 276a2dafe..111e14e94 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -31,45 +31,63 @@ # #====================================================================== +use utf8; + +use SL::Auth; +use SL::Auth::PasswordPolicy; use SL::AM; use SL::CA; use SL::Form; use SL::User; +use SL::USTVA; +use SL::Iconv; +use SL::TODO; +use SL::Printer; +use CGI::Ajax; +use CGI; -use Data::Dumper; - -1; - +require "bin/mozilla/common.pl"; +use strict; -require "$form->{path}/common.pl"; +1; # end of main -sub add { &{"add_$form->{type}"} } -sub edit { &{"edit_$form->{type}"} } -sub save { &{"save_$form->{type}"} } -sub delete { &{"delete_$form->{type}"} } +sub add { call_sub("add_$main::form->{type}"); } +sub delete { call_sub("delete_$main::form->{type}"); } +sub save { call_sub("save_$main::form->{type}"); } +sub edit { call_sub("edit_$main::form->{type}"); } +sub continue { call_sub($main::form->{"nextsub"}); } +sub save_as_new { call_sub("save_as_new_$main::form->{type}"); } sub add_account { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + $main::auth->assert('config'); $form->{title} = "Add"; $form->{charttype} = "A"; AM->get_account(\%myconfig, \%$form); - $form->{callback} = - "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; + $form->{callback} = "am.pl?action=list_account" unless $form->{callback}; &account_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub edit_account { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + $main::auth->assert('config'); $form->{title} = "Edit"; AM->get_account(\%myconfig, \%$form); @@ -81,163 +99,144 @@ sub edit_account { &account_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub account_header { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + $main::auth->assert('config'); + + if ( $form->{action} eq 'edit_account') { + $form->{account_exists} = '1'; + } $form->{title} = $locale->text("$form->{title} Account"); - $checked{ $form->{charttype} } = "checked"; - $checked{"$form->{category}_"} = "checked"; - $checked{CT_tax} = ($form->{CT_tax}) ? "" : "checked"; + $form->{"$form->{charttype}_checked"} = "checked"; + $form->{"$form->{category}_checked"} = "checked"; - $form->{description} =~ s/\"/"/g; + $form->{select_tax} = ""; + + my @tax_report_pos = USTVA->report_variables({ + myconfig => \%myconfig, + form => $form, + type => '', + attribute => 'position', + calc => '', + }); if (@{ $form->{TAXKEY} }) { foreach my $item (@{ $form->{TAXKEY} }) { - $item->{rate} = $item->{rate} * 100 . '%'; + } + + # Fill in empty row for new Taxkey + my $newtaxkey_ref = { + id => '', + chart_id => '', + accno => '', + tax_id => '', + taxdescription => '', + rate => '', + taxkey_id => '', + pos_ustva => '', + startdate => '', + }; + + push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref; + + my $i = 0; + foreach my $taxkey_used (@{ $form->{ACCOUNT_TAXKEYS} } ) { + + # Fill in a runningnumber + $form->{ACCOUNT_TAXKEYS}[$i]{runningnumber} = $i; + + # Fill in the Taxkeys as select options + foreach my $item (@{ $form->{TAXKEY} }) { + if ($item->{id} == $taxkey_used->{tax_id}) { + $form->{ACCOUNT_TAXKEYS}[$i]{selecttaxkey} .= + qq|"; + $form->{selectnewaccount} = qq||; } - foreach $item (@{ $form->{NEWACCOUNT} }) { + foreach my $item (@{ $form->{NEWACCOUNT} }) { if ($item->{id} == $form->{new_chart_id}) { $form->{selectnewaccount} .= - ""; + qq||; } elsif (!$form->{new_chart_valid}) { $form->{selectnewaccount} .= - ""; + qq||; } } } - $newaccount = qq| - - - - - - - - - -
| . $locale->text('Folgekonto') . qq|| . $locale->text('Gültig ab') . qq|
- - |; - - $form->{selectustva} = "\n|; + my %eur = ( + 1 => "Umsatzerlöse", + 2 => "sonstige Erlöse", 3 => "Privatanteile", - 4 => "Zinserträge", - 5 => "Ausserordentliche Erträge", + 4 => "Zinserträge", + 5 => "Ausserordentliche Erträge", 6 => "Vereinnahmte Umsatzst.", 7 => "Umsatzsteuererstattungen", - 8 => "Wareneingänge", - 9 => "Löhne und Gehälter", + 8 => "Wareneingänge", + 9 => "Löhne und Gehälter", 10 => "Gesetzl. sozialer Aufw.", 11 => "Mieten", 12 => "Gas, Strom, Wasser", 13 => "Instandhaltung", - 14 => "Steuern, Versich., Beiträge", + 14 => "Steuern, Versich., Beiträge", 15 => "Kfz-Steuern", 16 => "Kfz-Versicherungen", - 17 => "Sonst. Fahrtkosten", + 17 => "Sonst. Fahrzeugkosten", 18 => "Werbe- und Reisekosten", 19 => "Instandhaltung u. Werkzeuge", - 20 => "Fachzeitschriften, Bücher", - 21 => "Miete für Einrichtungen", + 20 => "Fachzeitschriften, Bücher", + 21 => "Miete für Einrichtungen", 22 => "Rechts- und Beratungskosten", - 23 => "Bürobedarf, Porto, Telefon", + 23 => "Bürobedarf, Porto, Telefon", 24 => "Sonstige Aufwendungen", 25 => "Abschreibungen auf Anlagever.", 26 => "Abschreibungen auf GWG", @@ -246,249 +245,140 @@ sub account_header { 29 => "Zinsaufwand", 30 => "Ausserordentlicher Aufwand", 31 => "Betriebliche Steuern"); - foreach $item (sort({ $a <=> $b } keys(%eur))) { + foreach my $item (sort({ $a <=> $b } keys(%eur))) { + my $text = H($::locale->{iconv_utf8}->convert($eur{$item})); if ($item == $form->{pos_eur}) { - $form->{selecteur} .= "\n|; } else { - $form->{selecteur} .= "\n|; } } - $eur = qq| - - | . $locale->text('EUER') . qq| - - - |; + my $select_bwa = q|\n|; - $form->{selectbwa} = "\n|; + foreach my $item ((1, 2, 3, 4)) { + if ($item == $form->{pos_bilanz}) { + $select_bilanz .= qq|\n|; + + my %category = ( + 'A' => $locale->text('Asset'), + 'L' => $locale->text('Liability'), + 'Q' => $locale->text('Equity'), + 'I' => $locale->text('Revenue'), + 'E' => $locale->text('Expense'), + 'C' => $locale->text('Costs'), + ); + foreach my $item ( sort({ $a <=> $b } keys %category) ) { + if ($item eq $form->{category}) { + $select_category .= qq||; - foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) { - $numberformat .= - ($item eq $form->{output_numberformat}) - ? ""; - } - - my $dateformat = - qq||; - foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) { - $dateformat .= - ($item eq $form->{output_dateformat}) - ? ""; - } - - print qq| - - -
{script}> - -{id}> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$form->{title}
| . $locale->text('Language') . qq|
| . $locale->text('Template Code') . qq|
| . $locale->text('Article Code') . qq|
| . $locale->text('Number Format') . qq|
| . $locale->text('Date Format') . qq|
| . $locale->text('Long Dates') . qq|{output_longdates} ? " checked" : "") . - qq|>| . $locale->text("Yes") . - qq|{output_longdates} ? "" : " checked") . - qq|>| . $locale->text("No") . - qq|
-|; - - $lxdebug->leave_sub(); -} - -sub save_language { - $lxdebug->enter_sub(); - - $form->isblank("description", $locale->text('Language missing!')); - $form->isblank("template_code", $locale->text('Template Code missing!')); - $form->isblank("article_code", $locale->text('Article Code missing!')); - AM->save_language(\%myconfig, \%$form); - $form->redirect($locale->text('Language saved!')); - - $lxdebug->leave_sub(); -} - -sub delete_language { - $lxdebug->enter_sub(); - - AM->delete_language(\%myconfig, \%$form); - $form->redirect($locale->text('Language deleted!')); - - $lxdebug->leave_sub(); -} - - -sub add_buchungsgruppe { - $lxdebug->enter_sub(); - - # $locale->text("Add Buchungsgruppe") - # $locale->text("Edit Buchungsgruppe") - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - AM->get_buchungsgruppe(\%myconfig, \%$form); - $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; - for (my $i = 0; 4 > $i; $i++) { - map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; } - qw(income expense)); - } - - &buchungsgruppe_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub edit_buchungsgruppe { - $lxdebug->enter_sub(); - - $form->{title} = "Edit"; - - AM->get_buchungsgruppe(\%myconfig, \%$form); - - &buchungsgruppe_header; - - &form_footer; - - $lxdebug->leave_sub(); -} - -sub list_buchungsgruppe { - $lxdebug->enter_sub(); - - AM->buchungsgruppe(\%myconfig, \%$form); - - $form->{callback} = - "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $callback = $form->escape($form->{callback}); - - $form->{title} = $locale->text('Buchungsgruppen'); - - @column_index = qw(up down description inventory_accno - income_accno_0 expense_accno_0 - income_accno_1 expense_accno_1 - income_accno_2 expense_accno_2 - income_accno_3 expense_accno_3 ); - - $column_header{up} = - qq|| - . qq|| . $locale->text(| - . qq||; - $column_header{down} = - qq|| - . qq|| . $locale->text(| - . qq||; - $column_header{description} = - qq|| - . $locale->text('Description') - . qq||; - $column_header{inventory_accno} = - qq|| - . $locale->text('Bestandskonto') - . qq||; - $column_header{income_accno_0} = - qq|| - . $locale->text('Erlöse Inland') - . qq||; - $column_header{expense_accno_0} = - qq|| - . $locale->text('Aufwand Inland') - . qq||; - $column_header{income_accno_1} = - qq|| - . $locale->text('Erlöse EU m. UStId') - . qq||; - $column_header{expense_accno_1} = - qq|| - . $locale->text('Aufwand EU m. UStId') - . qq||; - $column_header{income_accno_2} = - qq|| - . $locale->text('Erlöse EU o. UStId') - . qq||; - $column_header{expense_accno_2} = - qq|| - . $locale->text('Aufwand EU o. UStId') - . qq||; - $column_header{income_accno_3} = - qq|| - . $locale->text('Erlöse Ausland') - . qq||; - $column_header{expense_accno_3} = - qq|| - . $locale->text('Aufwand Ausland') - . qq||; - $form->header; - - print qq| - - - - - - - - - - - - - |; - } else { - $linkaccounts = qq| - {inventory_accno_id}>|; - } + $form->{description} =~ s/\"/"/g; + $form->{template_code} =~ s/\"/"/g; + $form->{article_code} =~ s/\"/"/g; - $linkaccounts .= qq| - - - - - - - - |; - if ($form->{id}) { - $form->{selectIC_income} =~ s/selected//g; - $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_1}/ value=$form->{income_accno_id_1} selected/; - $form->{selectIC_expense} =~ s/selected//g; - $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_1}/ value=$form->{expense_accno_id_1} selected/; - } - $linkaccounts .= qq| - - - - - - - |; + $form->header; - if ($form->{id}) { - $form->{selectIC_income} =~ s/selected//g; - $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_2}/ value=$form->{income_accno_id_2} selected/; - $form->{selectIC_expense} =~ s/selected//g; - $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_2}/ value=$form->{expense_accno_id_2} selected/; + my $numberformat = + qq||; + foreach my $item (('1,000.00', '1000.00', '1.000,00', '1000,00')) { + $numberformat .= + ($item eq $form->{output_numberformat}) + ? ""; } - $linkaccounts .= qq| - - - - - - - |; - - if ($form->{id}) { - $form->{selectIC_income} =~ s/selected//g; - $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_3}/ value=$form->{income_accno_id_3} selected/; - $form->{selectIC_expense} =~ s/selected//g; - $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_3}/ value=$form->{expense_accno_id_3} selected/; + my $dateformat = + qq||; + foreach my $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) { + $dateformat .= + ($item eq $form->{output_dateformat}) + ? ""; } - $linkaccounts .= qq| - - - - - - - -|; - - - $form->header; - print qq| -{script}> +{id}> - +
$form->{title}
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|; - map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" } - qw(login password path)); - - my $row = 0; - foreach $ref (@{ $form->{ALL} }) { - - $i++; - $i %= 2; - - print qq| - -|; - - if ($row) { - my $pref = $form->{ALL}->[$row - 1]; - $column_data{up} = - qq||; - } else { - $column_data{up} = qq||; - } - - if ($row == (scalar(@{ $form->{ALL} }) - 1)) { - $column_data{down} = qq||; - } else { - my $nref = $form->{ALL}->[$row + 1]; - $column_data{down} = - qq||; - } - - $column_data{description} = - qq||; - $column_data{inventory_accno} = qq||; - $column_data{income_accno_0} = - qq||; - $column_data{expense_accno_0} = qq||; - $column_data{income_accno_1} = - qq||; - $column_data{expense_accno_1} = qq||; - $column_data{income_accno_2} = - qq||; - $column_data{expense_accno_2} = qq||; - $column_data{income_accno_3} = - qq||; - $column_data{expense_accno_3} = qq||; + $column_data{description} = + qq||; + $column_data{template_code} = qq||; + $column_data{article_code} = + qq||; + $column_data{output_numberformat} = + ""; + $column_data{output_dateformat} = + ""; + $column_data{output_longdates} = + ""; map { print "$column_data{$_}\n" } @column_index; print qq| - + |; - - $row++; } print qq| @@ -1701,15 +973,11 @@ sub list_buchungsgruppe {
| . - qq|| . - qq|| . $locale->text(| . - qq|  | . - qq|| . - qq|| . $locale->text(| . - qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}$ref->{inventory_accno}$ref->{income_accno_0}$ref->{expense_accno_0}$ref->{income_accno_1}$ref->{expense_accno_1}$ref->{income_accno_2}$ref->{expense_accno_2}$ref->{income_accno_3}$ref->{expense_accno_3}$ref->{description}$ref->{template_code}$ref->{article_code}" . + ($ref->{output_numberformat} ? $ref->{output_numberformat} : + $locale->text("use program settings")) . + "" . + ($ref->{output_dateformat} ? $ref->{output_dateformat} : + $locale->text("use program settings")) . + "" . + ($ref->{output_longdates} ? $locale->text("Yes") : $locale->text("No")) . + "

-{script}> + - - -{path}> -{login}> -{password}> + @@ -1720,130 +988,58 @@ sub list_buchungsgruppe { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub buchungsgruppe_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} Buchungsgruppe"); - - # $locale->text('Buchungsgruppe hinzufügen') - # $locale->text('Buchungsgruppe bearbeiten') +sub language_header { + $main::lxdebug->enter_sub(); - my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {}); - my %acc_type_map = ( - "IC" => $acc_inventory, - "IC_income" => $acc_income, - "IC_sale" => $acc_income, - "IC_expense" => $acc_expense, - "IC_cogs" => $acc_expense, - ); + my $form = $main::form; + my $locale = $main::locale; - foreach $key (keys(%acc_type_map)) { - foreach $ref (@{ $form->{IC_links}{$key} }) { - $acc_type_map{$key}->{$ref->{"id"}} = $ref; - } - } + $main::auth->assert('config'); - foreach my $type (qw(IC IC_income IC_expense)) { - $form->{"select$type"} = - join("", - map({ "" } - sort({ $a->{"accno"} cmp $b->{"accno"} } - values(%{$acc_type_map{$type}})))); - } + $form->{title} = $locale->text("$form->{title} Language"); - if ($form->{id}) { - $form->{selectIC} =~ s/selected//g; - $form->{selectIC} =~ s/ value=$form->{inventory_accno_id}/ value=$form->{inventory_accno_id} selected/; - $form->{selectIC_income} =~ s/selected//g; - $form->{selectIC_income} =~ s/ value=$form->{income_accno_id_0}/ value=$form->{income_accno_id_0} selected/; - $form->{selectIC_expense} =~ s/selected//g; - $form->{selectIC_expense} =~ s/ value=$form->{expense_accno_id_0}/ value=$form->{expense_accno_id_0} selected/; - } + # $locale->text('Add Language') + # $locale->text('Edit Language') - if (!$eur) { - $linkaccounts = qq| -
| . $locale->text('Inventory') . qq|
| . $locale->text('Erlöse Inland') . qq|
| . $locale->text('Aufwand Inland') . qq|
| . $locale->text('Erlöse EU m. UStId') . qq|
| . $locale->text('Aufwand EU m UStId') . qq|
| . $locale->text('Erlöse EU o. UStId') . qq|
| . $locale->text('Aufwand EU o. UStId') . qq|
| . $locale->text('Erlöse Ausland') . qq|
| . $locale->text('Aufwand Ausland') . qq|
@@ -1851,332 +1047,195 @@ sub buchungsgruppe_header { - + - $linkaccounts - - -
| . $locale->text('Buchungsgruppe') . qq|| . $locale->text('Language') . qq|
-|; - - $lxdebug->leave_sub(); -} - -sub save_buchungsgruppe { - $lxdebug->enter_sub(); - - $form->isblank("description", $locale->text('Description missing!')); - - AM->save_buchungsgruppe(\%myconfig, \%$form); - $form->redirect($locale->text('Buchungsgruppe gespeichert!')); - - $lxdebug->leave_sub(); -} - -sub delete_buchungsgruppe { - $lxdebug->enter_sub(); - - AM->delete_buchungsgruppe(\%myconfig, \%$form); - $form->redirect($locale->text('Buchungsgruppe gelöscht!')); - - $lxdebug->leave_sub(); -} - -sub swap_buchungsgruppen { - $lxdebug->enter_sub(); - - AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen"); - list_buchungsgruppe(); - - $lxdebug->leave_sub(); -} - - -sub add_printer { - $lxdebug->enter_sub(); - - $form->{title} = "Add"; - - $form->{callback} = - "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - - &printer_header; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub edit_printer { - $lxdebug->enter_sub(); - - $form->{title} = "Edit"; - - AM->get_printer(\%myconfig, \%$form); - - &printer_header; - - $form->{orphaned} = 1; - &form_footer; - - $lxdebug->leave_sub(); -} - -sub list_printer { - $lxdebug->enter_sub(); - - AM->printer(\%myconfig, \%$form); - - $form->{callback} = - "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"; - - $callback = $form->escape($form->{callback}); - - $form->{title} = $locale->text('Printer'); - - @column_index = qw(printer_description printer_command template_code); - - $column_header{printer_description} = - qq|| - . $locale->text('Printer Description') - . qq||; - $column_header{printer_command} = - qq|| - . $locale->text('Printer Command') - . qq||; - $column_header{template_code} = - qq|| - . $locale->text('Template Code') - . qq||; - - $form->header; - - print qq| - - - - - - - - - - - + + -
$form->{title}
- - -|; - - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - - foreach $ref (@{ $form->{ALL} }) { - - $i++; - $i %= 2; - - print qq| - -|; - - - $column_data{printer_description} = - qq||; - $column_data{printer_command} = qq||; - $column_data{template_code} = - qq||; - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - } - - print qq| -
{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}$ref->{printer_command}$ref->{template_code}
-
| . $locale->text('Template Code') . qq|
- -
-{script}> - - - - - -{path}> -{login}> -{password}> - - - -
- - - -|; - - $lxdebug->leave_sub(); -} - -sub printer_header { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("$form->{title} Printer"); - - # $locale->text('Add Printer') - # $locale->text('Edit Printer') - - $form->{printer_description} =~ s/\"/"/g; - $form->{template_code} =~ s/\"/"/g; - $form->{printer_command} =~ s/\"/"/g; - - - $form->header; - - print qq| - - -
{script}> - -{id}> - - - - + + - - - - + + + - - + + - - + +
$form->{title}| . $locale->text('Article Code') . qq|
| . $locale->text('Printer') . qq|
| . $locale->text('Number Format') . qq|
| . $locale->text('Printer Command') . qq|| . $locale->text('Date Format') . qq|
| . $locale->text('Template Code') . qq|| . $locale->text('Long Dates') . qq|{output_longdates} ? " checked" : "") . + qq|>| . $locale->text("Yes") . + qq|{output_longdates} ? "" : " checked") . + qq|>| . $locale->text("No") . + qq|
|; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub save_printer { - $lxdebug->enter_sub(); +sub save_language { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $form->isblank("printer_description", $locale->text('Description missing!')); - $form->isblank("printer_command", $locale->text('Printer Command missing!')); - AM->save_printer(\%myconfig, \%$form); - $form->redirect($locale->text('Printer saved!')); + $main::auth->assert('config'); - $lxdebug->leave_sub(); + $form->isblank("description", $locale->text('Language missing!')); + $form->isblank("template_code", $locale->text('Template Code missing!')); + $form->isblank("article_code", $locale->text('Article Code missing!')); + AM->save_language(\%myconfig, \%$form); + $form->redirect($locale->text('Language saved!')); + + $main::lxdebug->leave_sub(); } -sub delete_printer { - $lxdebug->enter_sub(); +sub delete_language { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - AM->delete_printer(\%myconfig, \%$form); - $form->redirect($locale->text('Printer deleted!')); + $main::auth->assert('config'); - $lxdebug->leave_sub(); + AM->delete_language(\%myconfig, \%$form); + $form->redirect($locale->text('Language deleted!')); + + $main::lxdebug->leave_sub(); } -sub add_payment { - $lxdebug->enter_sub(); +sub add_buchungsgruppe { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + + $main::auth->assert('config'); + + # $locale->text("Add Buchungsgruppe") + # $locale->text("Edit Buchungsgruppe") $form->{title} = "Add"; - $form->{callback} = - "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; + $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback}; - $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; + AM->get_buchungsgruppe(\%myconfig, \%$form); + $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; + for (my $i = 0; 4 > $i; $i++) { + map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; } + qw(income expense)); + } + + &buchungsgruppe_header; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub edit_payment { - $lxdebug->enter_sub(); +sub edit_buchungsgruppe { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + $main::auth->assert('config'); $form->{title} = "Edit"; - AM->get_payment(\%myconfig, $form); - $form->{percent_skonto} = - $form->format_amount(\%myconfig, $form->{percent_skonto} * 100); + AM->get_buchungsgruppe(\%myconfig, \%$form); - &payment_header; + &buchungsgruppe_header; - $form->{orphaned} = 1; &form_footer; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub list_payment { - $lxdebug->enter_sub(); +sub list_buchungsgruppe { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - AM->payment(\%myconfig, \%$form); + $main::auth->assert('config'); - $form->{callback} = build_std_url("action=list_payment"); + AM->buchungsgruppe(\%myconfig, \%$form); - $callback = $form->escape($form->{callback}); + $form->{callback} = "am.pl?action=list_buchungsgruppe"; - $form->{title} = $locale->text('Payment Terms'); + my $callback = $form->escape($form->{callback}); - @column_index = qw(up down description description_long terms_netto - terms_skonto percent_skonto); + $form->{title} = $locale->text('Buchungsgruppen'); + my @column_index = qw(up down description inventory_accno + income_accno_0 expense_accno_0 + income_accno_1 expense_accno_1 + income_accno_2 expense_accno_2 + income_accno_3 expense_accno_3 ); + my %column_header; $column_header{up} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{down} = - qq|| + qq|| . qq|| . $locale->text(| . qq||; $column_header{description} = - qq|| + qq|| . $locale->text('Description') . qq||; - $column_header{description_long} = + $column_header{inventory_accno} = + qq|| + . $locale->text('Bestandskonto') + . qq||; + $column_header{income_accno_0} = + qq|| + . $locale->text('National Revenues') + . qq||; + $column_header{expense_accno_0} = qq|| - . $locale->text('Long Description') + . $locale->text('National Expenses') . qq||; - $column_header{terms_netto} = + $column_header{income_accno_1} = qq|| - . $locale->text('Netto Terms') + . $locale->text('Revenues EU with UStId') . qq||; - $column_header{terms_skonto} = + $column_header{expense_accno_1} = qq|| - . $locale->text('Skonto Terms') + . $locale->text('Expenses EU with UStId') . qq||; - $column_header{percent_skonto} = + $column_header{income_accno_2} = qq|| - . $locale->text('Skonto') - . qq| %|; - + . $locale->text('Revenues EU without UStId') + . qq||; + $column_header{expense_accno_2} = + qq|| + . $locale->text('Expenses EU without UStId') + . qq||; + $column_header{income_accno_3} = + qq|| + . $locale->text('Foreign Revenues') + . qq||; + $column_header{expense_accno_3} = + qq|| + . $locale->text('Foreign Expenses') + . qq||; $form->header; print qq| @@ -2199,10 +1258,11 @@ sub list_payment { |; - my $swap_link = build_std_url("action=swap_payment_terms"); + my $swap_link = qq|am.pl?action=swap_buchungsgruppen&|; my $row = 0; - foreach $ref (@{ $form->{ALL} }) { + my ($i, %column_data); + foreach my $ref (@{ $form->{ALL} }) { $i++; $i %= 2; @@ -2215,7 +1275,7 @@ sub list_payment { my $pref = $form->{ALL}->[$row - 1]; $column_data{up} = qq|| . - qq|| . + qq|| . qq|| . $locale->text(| . qq||; } else { @@ -2228,30 +1288,32 @@ sub list_payment { my $nref = $form->{ALL}->[$row + 1]; $column_data{down} = qq|| . - qq|| . + qq|| . qq|| . $locale->text(| . qq||; } - $column_data{description} = - qq|{id}", "callback=$callback") . - qq|">| . H($ref->{description}) . qq||; - $column_data{description_long} = - qq|| . H($ref->{description_long}) . qq||; - $column_data{terms_netto} = - qq|$ref->{terms_netto}|; - $column_data{terms_skonto} = - qq|$ref->{terms_skonto}|; - $column_data{percent_skonto} = - qq|| . - $form->format_amount(\%myconfig, $ref->{percent_skonto} * 100) . - qq|%|; + $column_data{description} = qq|$ref->{description}|; + $column_data{inventory_accno} = qq|$ref->{inventory_accno}|; + $column_data{income_accno_0} = + qq|$ref->{income_accno_0}|; + $column_data{expense_accno_0} = qq|$ref->{expense_accno_0}|; + $column_data{income_accno_1} = + qq|$ref->{income_accno_1}|; + $column_data{expense_accno_1} = qq|$ref->{expense_accno_1}|; + $column_data{income_accno_2} = + qq|$ref->{income_accno_2}|; + $column_data{expense_accno_2} = qq|$ref->{expense_accno_2}|; + $column_data{income_accno_3} = + qq|$ref->{income_accno_3}|; + $column_data{expense_accno_3} = qq|$ref->{expense_accno_3}|; + map { print "$column_data{$_}\n" } @column_index; print qq| - + |; + $row++; } @@ -2265,15 +1327,11 @@ sub list_payment {
-{script}> + - - -{path}> -{login}> -{password}> + @@ -2284,19 +1342,126 @@ sub list_payment { |; - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub payment_header { - $lxdebug->enter_sub(); +sub buchungsgruppe_header { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; + + $main::auth->assert('config'); - $form->{title} = $locale->text("$form->{title} Payment Terms"); + $form->{title} = $locale->text("$form->{title} Buchungsgruppe"); - # $locale->text('Add Payment Terms') - # $locale->text('Edit Payment Terms') + # $locale->text('Add Accounting Group') + # $locale->text('Edit Accounting Group') - $form->{description} =~ s/\"/"/g; + my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {}); + my %acc_type_map = ( + "IC" => $acc_inventory, + "IC_income" => $acc_income, + "IC_sale" => $acc_income, + "IC_expense" => $acc_expense, + "IC_cogs" => $acc_expense, + ); + + foreach my $key (keys(%acc_type_map)) { + foreach my $ref (@{ $form->{IC_links}{$key} }) { + $acc_type_map{$key}->{$ref->{"id"}} = $ref; + } + } + + foreach my $type (qw(IC IC_income IC_expense)) { + $form->{"select$type"} = + join("", + map({ "" } + sort({ $a->{"accno"} cmp $b->{"accno"} } + values(%{$acc_type_map{$type}})))); + } + + if ($form->{id}) { + $form->{selectIC} =~ s/selected//g; + $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/ value=$form->{inventory_accno_id} selected/; + $form->{selectIC_income} =~ s/selected//g; + $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/ value=$form->{income_accno_id_0} selected/; + $form->{selectIC_expense} =~ s/selected//g; + $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/ value=$form->{expense_accno_id_0} selected/; + } + + my $linkaccounts; + if ( $::instance_conf->get_inventory_system eq 'perpetual' ) { # was !$::lx_office_conf{system}->{eur}) { + $linkaccounts = qq| + + | . $locale->text('Inventory') . qq| + + + |; + } elsif ( $::instance_conf->get_inventory_system eq 'periodic' ) { + # don't allow choice of inventory accno and don't show that line + $linkaccounts = qq| + {inventory_accno_id}>|; + }; + + + $linkaccounts .= qq| + + | . $locale->text('National Revenues') . qq| + + + + | . $locale->text('National Expenses') . qq| + + |; + if ($form->{id}) { + $form->{selectIC_income} =~ s/selected//g; + $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/ value=$form->{income_accno_id_1} selected/; + $form->{selectIC_expense} =~ s/selected//g; + $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/ value=$form->{expense_accno_id_1} selected/; + } + $linkaccounts .= qq| + | . $locale->text('Revenues EU with UStId') . qq| + + + + | . $locale->text('Expenses EU with UStId') . qq| + + |; + + if ($form->{id}) { + $form->{selectIC_income} =~ s/selected//g; + $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/ value=$form->{income_accno_id_2} selected/; + $form->{selectIC_expense} =~ s/selected//g; + $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/ value=$form->{expense_accno_id_2} selected/; + } + + $linkaccounts .= qq| + | . $locale->text('Revenues EU without UStId') . qq| + + + + | . $locale->text('Expenses EU without UStId') . qq| + + |; + + if ($form->{id}) { + $form->{selectIC_income} =~ s/selected//g; + $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/ value=$form->{income_accno_id_3} selected/; + $form->{selectIC_expense} =~ s/selected//g; + $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/ value=$form->{expense_accno_id_3} selected/; + } + $linkaccounts .= qq| + | . $locale->text('Foreign Revenues') . qq| + + + + | . $locale->text('Foreign Expenses') . qq| + + +|; $form->header; @@ -2304,10 +1469,10 @@ sub payment_header { print qq| -{script}> + {id}> - + @@ -2315,261 +1480,161 @@ sub payment_header { - - - - - - - -|; - - foreach my $language (@{ $form->{"TRANSLATION"} }) { - print qq| - - - - -|; - } - - print qq| - - - - - - - - + + - - - + $linkaccounts
| . $locale->text('Description') . qq|
| . $locale->text('Long Description') . qq|
| . - sprintf($locale->text('Translation (%s)'), - $language->{"language"}) - . qq|
| . $locale->text('Netto Terms') . qq|
| . $locale->text('Skonto Terms') . qq|
| . $locale->text('Buchungsgruppe') . qq|
| . $locale->text('Skonto') . 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|

- -|; - - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub save_payment { - $lxdebug->enter_sub(); +sub save_buchungsgruppe { + $main::lxdebug->enter_sub(); - $form->isblank("description", $locale->text('Description missing!')); - $form->{"percent_skonto"} = - $form->parse_amount(\%myconfig, $form->{percent_skonto}) / 100; - AM->save_payment(\%myconfig, \%$form); - $form->redirect($locale->text('Payment Terms saved!')); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $lxdebug->leave_sub(); -} + $main::auth->assert('config'); -sub delete_payment { - $lxdebug->enter_sub(); + $form->isblank("description", $locale->text('Description missing!')); - AM->delete_payment(\%myconfig, \%$form); - $form->redirect($locale->text('Payment terms deleted!')); + AM->save_buchungsgruppe(\%myconfig, \%$form); + $form->redirect($locale->text('Accounting Group saved!')); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub swap_payment_terms { - $lxdebug->enter_sub(); - - AM->swap_sortkeys(\%myconfig, $form, "payment_terms"); - list_payment(); +sub delete_buchungsgruppe { + $main::lxdebug->enter_sub(); - $lxdebug->leave_sub(); -} + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; -sub display_stylesheet { - $lxdebug->enter_sub(); + $main::auth->assert('config'); - $form->{file} = "css/$myconfig{stylesheet}"; - &display_form; + AM->delete_buchungsgruppe(\%myconfig, \%$form); + $form->redirect($locale->text('Accounting Group deleted!')); - $lxdebug->leave_sub(); + $main::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}> +sub swap_buchungsgruppen { + $main::lxdebug->enter_sub(); - + my $form = $main::form; + my %myconfig = %main::myconfig; - + $main::auth->assert('config'); - - -|; + AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen"); + list_buchungsgruppe(); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub edit_template { - $lxdebug->enter_sub(); +sub edit_defaults { + $main::lxdebug->enter_sub(); - AM->load_template(\%$form); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $form->{title} = $locale->text('Edit Template'); + # get defaults for account numbers and last numbers + AM->defaultaccounts(\%myconfig, \%$form); + $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g'); - # convert   to &nbsp; - $form->{body} =~ s/ /&nbsp;/gi; + map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} }; - $form->header; + # default language + my $all_languages = SL::DB::Manager::Language->get_all; - print qq| - +# EÜR = cash, Bilanzierung = accrual -
{script}> + foreach my $key (keys %{ $form->{IC} }) { + foreach my $accno (sort keys %{ $form->{IC}->{$key} }) { + my $array = "ACCNOS_" . uc($key); + $form->{$array} ||= []; -{file}> - + my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description}; + push @{ $form->{$array} }, { + 'name' => $value, + 'value' => $value, + 'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key}, + }; + } + } -{path}> -{login}> -{password}> + $form->{title} = $locale->text('Ranges of numbers and default accounts'); - + $form->header(); + print $form->parse_html_template('am/edit_defaults', + { ALL_LANGUAGES => $all_languages, }); - + $main::lxdebug->leave_sub(); +} -
- +sub save_defaults { + $main::lxdebug->enter_sub(); -
+ my $form = $main::form; + my $locale = $main::locale; + AM->save_defaults(); - - -|; + $form->redirect($locale->text('Defaults saved.')); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } -sub save_template { - $lxdebug->enter_sub(); +sub _build_cfg_options { + my $form = $main::form; + my %myconfig = %main::myconfig; - AM->save_template(\%$form); - $form->redirect($locale->text('Template saved!')); + my $idx = shift; + my $array = uc($idx) . 'S'; - $lxdebug->leave_sub(); + $form->{$array} = []; + foreach my $item (@_) { + push @{ $form->{$array} }, { + 'name' => $item, + 'value' => $item, + 'selected' => $item eq $myconfig{$idx}, + }; + } } sub config { - $lxdebug->enter_sub(); - - # get defaults for account numbers and last numbers - AM->defaultaccounts(\%myconfig, \%$form); + $main::lxdebug->enter_sub(); - foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) { - $dateformat .= - ($item eq $myconfig{dateformat}) - ? ""; + $form->{TEMPLATE_FORMATS} = []; + foreach my $item (@formats) { + push @{ $form->{TEMPLATE_FORMATS} }, { + 'name' => $item->{name}, + 'value' => $item->{value}, + 'selected' => $item->{value} eq $myconfig{template_format}, + }; } if (!$myconfig{"default_media"}) { $myconfig{"default_media"} = "screen"; } - my %selected = ($myconfig{"default_media"} => "selected"); - my $default_media = qq| - - - -|; - - %selected = (); - $selected{$myconfig{"default_printer_id"}} = "selected" - if ($myconfig{"default_printer_id"}); - my $default_printer = qq||; - AM->printer(\%myconfig, $form); - foreach my $printer (@{$form->{"ALL"}}) { - $default_printer .= qq||; - } - - %countrycodes = User->country_codes; - $countrycodes = ''; - foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} } - keys %countrycodes - ) { - $countrycodes .= - ($myconfig{countrycode} eq $key) - ? "