Merge branch 'tax_festsetzen'

[mfinanz.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 2b7cdf8ee900f6044d247d3261a23f56af8d5672..bcb39d258f066a65813f4ca81a272541914ae4be 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1491,7 +1491,11 @@ sub edit_tax {
 
   $form->header();
 
 
   $form->header();
 

+  #set readonly if the there are entries in acc_trans with the tax
+  my $readonly = $form->{tax_already_used} ? 'readonly' : '';
+

   my $parameters_ref = {
   my $parameters_ref = {

+    readonly => $readonly, 

   };
 
   # Ausgabe des Templates
   };
 
   # Ausgabe des Templates


@@ -1552,12 +1556,16 @@ sub save_tax {
 
   $main::auth->assert('config');
 
 
   $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});
 
 
   $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'));
   }
   if ( $form->{rate} < 0 || $form->{rate} >= 100 ) {
     $form->error($locale->text('Tax Percent is a number between 0 and 100'));
   }