Merge branch 'tax_festsetzen'

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

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index f9d299ff57d456a5408db7739c1249fdc9b53081..bcb39d258f066a65813f4ca81a272541914ae4be 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -144,7 +144,7 @@ sub account_header {
       rate           => '',
       taxkey_id      => '',
       pos_ustva      => '',
       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;
     };
 
     push @{ $form->{ACCOUNT_TAXKEYS} }, $newtaxkey_ref;


@@ -394,6 +394,17 @@ sub save_account {
 
   if ($form->{charttype} eq 'A'){
     $form->isblank("category",  $locale->text('Account Type missing!'));
 
   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!'))
   }
 
   $form->redirect($locale->text('Account saved!'))


@@ -940,7 +951,7 @@ sub edit_defaults {
   # default language
   my $all_languages = SL::DB::Manager::Language->get_all;
 
   # default language
   my $all_languages = SL::DB::Manager::Language->get_all;
 

-# EÜR = cash, Bilanzierung = accrual
+# cash = IST-Versteuerung, accrual = SOLL-Versteuerung

 
   foreach my $key (keys %{ $form->{IC} }) {
     foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {
 
   foreach my $key (keys %{ $form->{IC} }) {
     foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {


@@ -1062,7 +1073,7 @@ sub config {
   }
 
   $form->{STYLESHEETS} = [];
   }
 
   $form->{STYLESHEETS} = [];

-  foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css)) {
+  foreach my $item (qw(lx-office-erp.css Mobile.css kivitendo.css)) {

     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,
     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,


@@ -1480,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


@@ -1541,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'));
   }