X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fam.pl;h=7e760c27e9012d2f9f31dd964a6dfbe20656b288;hb=6768ddad54d2a675939e1167536f4943628de2bb;hp=7549bc1610a2d0cf4efc35e51d39a5c677e195fb;hpb=c707edd523dc852f3bd11008d64ab3cb1daca545;p=kivitendo-erp.git
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 7549bc161..7e760c27e 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -42,7 +42,11 @@ use SL::User;
use SL::USTVA;
use SL::Iconv;
use SL::TODO;
-use SL::Printer;
+use SL::DB::Printer;
+use SL::DB::Tax;
+use SL::DB::Language;
+use SL::DB::Default;
+use SL::DBUtils qw(selectall_array_query);
use CGI;
require "bin/mozilla/common.pl";
@@ -85,10 +89,17 @@ sub edit_account {
my $form = $main::form;
my %myconfig = %main::myconfig;
+ my $defaults = SL::DB::Default->get;
$main::auth->assert('config');
$form->{title} = "Edit";
+ $form->{feature_balance} = $defaults->feature_balance;
+ $form->{feature_datev} = $defaults->feature_datev;
+ $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung;
+ $form->{feature_eurechnung} = $defaults->feature_eurechnung;
+ $form->{feature_ustva} = $defaults->feature_ustva;
+
AM->get_account(\%myconfig, \%$form);
foreach my $item (split(/:/, $form->{link})) {
@@ -144,7 +155,7 @@ sub account_header {
rate => '',
taxkey_id => '',
pos_ustva => '',
- startdate => '',
+ startdate => $form->{account_exists} ? '' : DateTime->new(year => 1970, month => 1, day => 1)->to_lxoffice,
};
push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;
@@ -254,6 +265,20 @@ sub account_header {
}
+ my $select_er = q|\n|;
+ my %er = (
+ 1 => "Ertrag",
+ 6 => "Aufwand");
+ foreach my $item (sort({ $a <=> $b } keys(%er))) {
+ my $text = H($::locale->{iconv_utf8}->convert($er{$item}));
+ if ($item == $form->{pos_er}) {
+ $select_er .= qq|\n|;
+ } else {
+ $select_er .= qq|\n|;
+ }
+
+ }
+
my $select_bwa = q|\n|;
my %bwapos = (
@@ -336,7 +361,7 @@ sub account_header {
# account where AR_tax or AP_tax is set are not orphaned if they are used as
# tax-o-matic account
- if ( $form->{id} && !$form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
+ if ( $form->{id} && $form->{orphaned} && ($form->{link} =~ m/(AP_tax|AR_tax)/) ) {
if (SL::DB::Manager::Tax->find_by(chart_id => $form->{id})) {
$form->{orphaned} = 0;
}
@@ -356,6 +381,7 @@ sub account_header {
select_bwa => $select_bwa,
select_bilanz => $select_bilanz,
select_eur => $select_eur,
+ select_er => $select_er,
};
# Ausgabe des Templates
@@ -394,6 +420,17 @@ sub save_account {
if ($form->{charttype} eq 'A'){
$form->isblank("category", $locale->text('Account Type missing!'));
+
+ my $found_valid_taxkey = 0;
+ foreach my $i (0 .. 10) { # 10 is maximum count of taxkeys in form
+ if ($form->{"taxkey_startdate_$i"} and !$form->{"taxkey_del_$i"}) {
+ $found_valid_taxkey = 1;
+ last;
+ }
+ }
+ if ($found_valid_taxkey == 0) {
+ $form->error($locale->text('A valid taxkey is missing!'));
+ }
}
$form->redirect($locale->text('Account saved!'))
@@ -426,10 +463,6 @@ sub save_as_new_account {
}
$form->{id} = 0;
- if ($form->{"original_accno"} &&
- ($form->{"accno"} eq $form->{"original_accno"})) {
- $form->error($locale->text('Account Number already used!'));
- }
$form->redirect($locale->text('Account saved!'))
if (AM->save_account(\%myconfig, \%$form));
$form->error($locale->text('Cannot save account!'));
@@ -466,7 +499,7 @@ sub list_account {
$ca->{link_edit_account} = $link_edit_account . '&id=' . E($ca->{id});
}
- $form->use_stylesheet("list_accounts.css");
+ $::request->{layout}->use_stylesheet("list_accounts.css");
$form->{title} = $locale->text('Chart of Accounts');
$form->header;
@@ -566,7 +599,7 @@ sub delete_account {
$form->{title} = $locale->text('Delete Account');
foreach my $id (
- qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
+ qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id rndgain_accno_id rndloss_accno_id)
) {
if ($form->{id} == $form->{$id}) {
$form->error($locale->text('Cannot delete default account!'));
@@ -741,8 +774,8 @@ sub language_header {
$::form->header;
print $::form->parse_html_template('am/language_header', {
- numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
- dateformats => [ qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
+ numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ],
+ dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
});
$::lxdebug->leave_sub;
@@ -781,207 +814,6 @@ sub delete_language {
$main::lxdebug->leave_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} = "am.pl?action=add_buchungsgruppe" 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;
-
- $main::lxdebug->leave_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_buchungsgruppe(\%myconfig, \%$form);
-
- &buchungsgruppe_header;
-
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_buchungsgruppe {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- AM->buchungsgruppe(\%::myconfig, $::form);
-
- $::form->{callback} = "am.pl?action=list_buchungsgruppe";
- $::form->{title} = $::locale->text('Buchungsgruppen');
- $::form->header;
-
- print $::form->parse_html_template('am/buchungsgruppe_list', {
- swap_link => qq|am.pl?action=swap_buchungsgruppen&|,
- });
-
- $::lxdebug->leave_sub;
-}
-
-sub buchungsgruppe_header {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- # $locale->text('Add Accounting Group')
- # $locale->text('Edit Accounting Group')
- $::form->{title} = $::locale->text("$::form->{title} Buchungsgruppe");
-
- 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,
- );
-
- for my $key (keys %acc_type_map) {
- for my $ref (@{ $::form->{IC_links}{$key} }) {
- $acc_type_map{$key}{$ref->{id}} = $ref;
- }
- }
-
- my %sorted_accounts = map {
- $_ => [ sort { $a->{accno} cmp $b->{accno} } values %{ $acc_type_map{$_} } ],
- } keys %acc_type_map;
-
- $::form->header;
- print $::form->parse_html_template('am/buchungsgruppe_header', {
- accounts => \%sorted_accounts,
- account_label => sub { "$_[0]{accno}--$_[0]{description}" },
- });
-
- $::lxdebug->leave_sub;
-}
-
-sub save_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->isblank("description", $locale->text('Description missing!'));
-
- AM->save_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Accounting Group saved!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->delete_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Accounting Group deleted!'));
-
- $main::lxdebug->leave_sub();
-}
-
-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();
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_defaults {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- # get defaults for account numbers and last numbers
- AM->defaultaccounts(\%myconfig, \%$form);
- $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');
-
- map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
-
- # default language
- my $all_languages = SL::DB::Manager::Language->get_all;
-
-# EÃR = cash, Bilanzierung = accrual
-
- foreach my $key (keys %{ $form->{IC} }) {
- foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
- my $array = "ACCNOS_" . uc($key);
- $form->{$array} ||= [];
-
- my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description};
- push @{ $form->{$array} }, {
- 'name' => $value,
- 'value' => $value,
- 'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key},
- };
- }
- }
-
- $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.'));
-
- $main::lxdebug->leave_sub();
-}
-
sub _build_cfg_options {
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -1006,8 +838,9 @@ sub config {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
- _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
+ _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
+ _build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
+ _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00"));
my @formats = ();
if ($::lx_office_conf{print_templates}->{opendocument}
@@ -1052,7 +885,7 @@ sub config {
{ 'name' => $locale->text('Queue'), 'value' => 'queue', 'selected' => $selected{queue}, },
];
- $form->{PRINTERS} = [ SL::Printer->all_printers(%::myconfig) ];
+ $form->{PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
my %countrycodes = User->country_codes;
@@ -1066,7 +899,7 @@ sub config {
}
$form->{STYLESHEETS} = [];
- foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css)) {
+ foreach my $item (qw(lx-office-erp.css kivitendo.css)) {
push @{ $form->{STYLESHEETS} }, {
'name' => $item,
'value' => $item,
@@ -1076,11 +909,14 @@ sub config {
$myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
$form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
- $form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
+ $form->{todo_cfg} = { TODO->get_user_config('login' => $::myconfig{login}) };
- $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
+ $form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login});
$form->header();
+
+ $form->{full_signature} = $form->create_email_signature();
+
print $form->parse_html_template('am/config');
$main::lxdebug->leave_sub();
@@ -1095,9 +931,9 @@ sub save_preferences {
$form->{stylesheet} = $form->{usestylesheet};
- TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+ TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });
- if (AM->save_preferences(\%myconfig, $form)) {
+ if (AM->save_preferences($form)) {
if ($::auth->can_change_password()
&& defined $form->{new_password}
&& ($form->{new_password} ne '********')) {
@@ -1108,11 +944,7 @@ sub save_preferences {
$form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
}
- $::auth->change_password($form->{login}, $form->{new_password});
-
- $form->{password} = $form->{new_password};
- $::auth->set_session_value('password', $form->{password});
- $::auth->create_or_refresh_session();
+ $::auth->change_password($::myconfig{login}, $form->{new_password});
}
$form->redirect($locale->text('Preferences saved!'));
@@ -1382,23 +1214,28 @@ sub show_am_history {
my $callback = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
$form->{order} ||= 'h.itime--1';
- my %search = ( "Artikelnummer" => "parts",
- "Kundennummer" => "customer",
- "Lieferantennummer" => "vendor",
- "Projektnummer" => "project",
- "Buchungsnummer" => "oe",
- "Eingangsrechnungnummer" => "ap",
- "Ausgangsrechnungnummer" => "ar",
- "Mahnungsnummer" => "dunning"
- );
+ # my %search = ( "Artikelnummer" => "parts",
+ # "Kundennummer" => "customer",
+ # "Lieferantennummer" => "vendor",
+ # "Projektnummer" => "project",
+ # "Auftragsnummer" => "oe",
+ # "Angebotsnummer" => "oe",
+ # "Eingangsrechnungnummer" => "ap",
+ # "Ausgangsrechnungnummer" => "ar",
+ # "Mahnungsnummer" => "dunning",
+ # "Buchungsnummer" => "gl",
+ # );
+
my %searchNo = ( "Artikelnummer" => "partnumber",
"Kundennummer" => "customernumber",
"Lieferantennummer" => "vendornumber",
"Projektnummer" => "projectnumber",
- "Buchungsnummer" => "ordnumber",
+ "Auftragsnummer" => "ordnumber",
+ "Angebotsnummer" => "quonumber",
"Eingangsrechnungnummer" => "invnumber",
"Ausgangsrechnungnummer" => "invnumber",
- "Mahnungsnummer" => "dunning_id"
+ "Mahnungsnummer" => "dunning_id",
+ "Buchungsnummer" => "gltransaction"
);
my $dbh = $form->dbconnect(\%myconfig);
@@ -1454,10 +1291,18 @@ sub add_tax {
_get_taxaccount_selection();
+ $form->{asset} = 1;
+ $form->{liability} = 1;
+ $form->{equity} = 1;
+ $form->{revenue} = 1;
+ $form->{expense} = 1;
+ $form->{costs} = 1;
+
$form->header();
my $parameters_ref = {
# ChartTypeIsAccount => $ChartTypeIsAccount,
+ LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
};
# Ausgabe des Templates
@@ -1478,13 +1323,23 @@ sub edit_tax {
$form->{title} = $locale->text('Edit');
AM->get_tax(\%myconfig, \%$form);
+
_get_taxaccount_selection();
+ $form->{asset} = $form->{chart_categories} =~ 'A' ? 1 : 0;
+ $form->{liability} = $form->{chart_categories} =~ 'L' ? 1 : 0;
+ $form->{equity} = $form->{chart_categories} =~ 'Q' ? 1 : 0;
+ $form->{revenue} = $form->{chart_categories} =~ 'I' ? 1 : 0;
+ $form->{expense} = $form->{chart_categories} =~ 'E' ? 1 : 0;
+ $form->{costs} = $form->{chart_categories} =~ 'C' ? 1 : 0;
+
$form->{rate} = $form->format_amount(\%myconfig, $form->{rate}, 2);
$form->header();
my $parameters_ref = {
+ LANGUAGES => SL::DB::Manager::Language->get_all_sorted,
+ TAX => SL::DB::Manager::Tax->find_by(id => $form->{id}),
};
# Ausgabe des Templates
@@ -1545,12 +1400,16 @@ sub save_tax {
$main::auth->assert('config');
- $form->isblank("rate", $locale->text('Taxrate missing!'));
- $form->isblank("taxdescription", $locale->text('Taxdescription missing!'));
- $form->isblank("taxkey", $locale->text('Taxkey missing!'));
+ $form->error($locale->text('Taxkey missing!')) unless length($form->{taxkey}) != 0;
+ $form->error($locale->text('Taxdescription missing!')) unless length($form->{taxdescription}) != 0;
+ $form->error($locale->text('Taxrate missing!')) unless length($form->{rate}) != 0;
$form->{rate} = $form->parse_amount(\%myconfig, $form->{rate});
+ if ($form->{taxkey} == 0 and $form->{rate} > 0) {
+ $form->error($locale->text('Taxkey 0 is reserved for rate 0'));
+ }
+
if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
$form->error($locale->text('Tax Percent is a number between 0 and 100'));
}
@@ -1559,6 +1418,9 @@ sub save_tax {
$form->error($locale->text('Tax Percent is a number between 0 and 100'));
}
+ my @translation_keys = grep { $_ =~ '^translation_\d+' } keys %$form;
+ $form->{translations} = { map { $_ =~ '^translation_(\d+)'; $1 => $form->{$_} } @translation_keys };
+
AM->save_tax(\%myconfig, \%$form);
$form->redirect($locale->text('Tax saved!'));
@@ -1590,7 +1452,6 @@ sub add_price_factor {
$form->{title} = $locale->text('Add Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
- $form->{fokus} = 'description';
$form->header();
print $form->parse_html_template('am/edit_price_factor');
@@ -1609,7 +1470,6 @@ sub edit_price_factor {
$form->{title} = $locale->text('Edit Price Factor');
$form->{callback} ||= build_std_url('action=add_price_factor');
- $form->{fokus} = 'description';
AM->get_price_factor(\%myconfig, $form);
@@ -1697,7 +1557,6 @@ sub add_warehouse {
$form->{title} = $locale->text('Add Warehouse');
$form->{callback} ||= build_std_url('action=add_warehouse');
- $form->{fokus} = 'description';
$form->header();
print $form->parse_html_template('am/edit_warehouse');
@@ -1720,7 +1579,6 @@ sub edit_warehouse {
$form->{title} = $locale->text('Edit Warehouse');
$form->{callback} ||= build_std_url('action=list_warehouses');
- $form->{fokus} = 'description';
$form->header();
print $form->parse_html_template('am/edit_warehouse');
@@ -1785,7 +1643,7 @@ sub delete_warehouse {
$form->header();
print $form->parse_html_template('am/confirm_delete_warehouse');
- ::end_of_request();
+ $::dispatcher->end_request;
}
if (AM->delete_warehouse(\%myconfig, $form)) {