Bug 639 behoben (Checkbox taxincluded hat sich bei Erneuern klicken deaktiviert)

[kivitendo-erp.git] / bin / mozilla / is.pl

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 9140574546d40dd3c2ed513f4cb6269b711a701c..0b4c0e5d1046066d6f4dc5472bfd785fb8ba40d2 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -38,7 +38,7 @@ use Data::Dumper;
 require "bin/mozilla/io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/drafts.pl";
 require "bin/mozilla/io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/drafts.pl";

-
+$form->{"Watchdog::taxincluded"} = 1;

 1;
 
 # end of main
 1;
 
 # end of main


@@ -845,13 +845,13 @@ sub form_footer {
     qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
   $intnotes =
     qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
     qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
   $intnotes =
     qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;

-
-  $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
+ 
+  $form->{taxincluded} = ($form->{taxincluded} == 1 ? "checked" : "");

 
   $taxincluded = "";
   if ($form->{taxaccounts}) {
     $taxincluded = qq|
 
   $taxincluded = "";
   if ($form->{taxaccounts}) {
     $taxincluded = qq|

-               <input name="taxincluded" class="checkbox" type="checkbox" value=$form->{taxincluded}> <b>|
+               <input name="taxincluded" class="checkbox" type="checkbox" value="1" $form->{taxincluded}> <b>|

       . $locale->text('Tax Included') . qq|</b><br><br>|;
   }
 
       . $locale->text('Tax Included') . qq|</b><br><br>|;
   }
 


@@ -1208,10 +1208,19 @@ sub update {
     $form->{print_and_post} = 0;
   }
 
     $form->{print_and_post} = 0;
   }
 

+  
+  if($form->{taxincluded}) {
+    $taxincluded = "checked";
+  }

   $form->{update} = 1;
 
   &check_name(customer);
 
   $form->{update} = 1;
 
   &check_name(customer);
 

+  if(!$form->{taxincluded}) {
+    $form->{taxincluded} = $taxincluded;
+  }
+
+

   $form->{exchangerate} = $exchangerate
     if (
         $form->{forex} = (
   $form->{exchangerate} = $exchangerate
     if (
         $form->{forex} = (