X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fam.pl;h=ebe7ed1879b1260722e9157a0408ef26a9904c79;hb=a27cd427a2689b49a7642884edd2d24555305a4b;hp=e24e7c2eb1e5a0b937dff9ec91344199e739a2c6;hpb=2f833a265b6b21799b80724c59456a876ec36ed3;p=kivitendo-erp.git diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index e24e7c2eb..ebe7ed187 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -144,7 +144,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; @@ -336,7 +336,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; } @@ -394,6 +394,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 +437,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 +473,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; @@ -618,137 +625,32 @@ sub edit_lead { } sub list_lead { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - - $main::auth->assert('config'); - - AM->lead(\%myconfig, \%$form); - - $form->{callback} = "am.pl?action=list_lead"; - - my $callback = $form->escape($form->{callback}); - - $form->{title} = $locale->text('Lead'); - - my @column_index = qw(description cost profit); - my %column_header; - $column_header{description} = - qq|
$form->{title} | -
---|
$ref->{lead} | |; - - map { print "$column_data{$_}\n" } @column_index; - - print qq| -