diff --git a/copri4/main/src/Mod/Prelogic.pm b/copri4/main/src/Mod/Prelogic.pm
index 824d92d..8cf2ebe 100755
--- a/copri4/main/src/Mod/Prelogic.pm
+++ b/copri4/main/src/Mod/Prelogic.pm
@@ -929,7 +929,7 @@ sub preinit(){
 
    #collect sub-nodes
    #TODO
-   my $main_ids = "300008,300009";#Rechnung,Storno
+   my $main_ids = "300008,300009,300011";#Rechnung,Storno,Verkaufsjournal
    #my $main_ids = "$parent_trans->{main_id},";
    #$main_ids .= $db->collect_noderec($parent_trans->{main_id},$lang,"nothing") if($parent_trans->{main_id});
    #$main_ids =~ s/,$//;
@@ -941,13 +941,13 @@ sub preinit(){
    $sum_start = $lb->checkint($sum_start);
    $sum_kasse = $lb->checkint($sum_kasse);
    my $c_id4kasse = "";
-   my $c_id4abschluss = $db->get_content6("$table","close_time","null","state","Kassenbestand","int09","$parent_trans->{parent_id}","","","$s_owner_id");
+   my $c_id4abschluss = $db->get_content6("$table","close_time","null","state","Tagesabschluss","int09","$parent_trans->{parent_id}","","","$s_owner_id");
    if($journal_id){
      if($c_id4abschluss->{c_id} && $c_id4abschluss->{c_id} > 0){
        $c_id4kasse = $c_id4abschluss->{c_id};
      }else{
        $ct_name = "--- auto ct_name = c_id ---";
-       $c_id4kasse = $db->insert_content2($table,$ct_name,$users_dms->{u_id},"Kassenbestand");
+       $c_id4kasse = $db->insert_content2($table,$ct_name,$users_dms->{u_id},"Tagesabschluss");
 	$i_rows += 1 if($c_id4kasse > 0);
        $db->update_content4change("contenttrans",$c_id4kasse,"$c_id4kasse");
        $db->update_content4change("contenttrans",$c_id4kasse,"",$parent_trans->{parent_id},"int09");#mandant_main_id
diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm
index 4850a3f..6803104 100755
--- a/copri4/main/src/Mod/Shareework.pm
+++ b/copri4/main/src/Mod/Shareework.pm
@@ -423,12 +423,10 @@ sub save_account(){
 	    }
 	    $u_rows = $dbt->update_one($dbh,$update_primary,"$_='$valxx'");
 	  }
-        }elsif($_ eq "int12"){
-	  if($varenv{dbname} eq "sharee_primary"){
-	    $u_rows = $dbt->update_one($dbh,$update_primary,"$_=2");
-  	  }else{
-	    $u_rows = $dbt->update_one($dbh,$update_primary,"$_=$valxx");
-  	  }
+        }elsif($_ eq "int12" && $varenv{dbname} ne "sharee_primary"){
+	  my $vde_on_fail = 0;
+	  $vde_on_fail = 2 if($valxx && $valxx == 1);
+	  $u_rows = $dbt->update_one($dbh,$update_primary,"$_=$vde_on_fail");
         }elsif($_ =~ /^int|barcode/){
 	  $u_rows = $dbt->update_one($dbh,$update_primary,"$_=$valxx");
 	}elsif($_ eq "ct_name" && $R::base_edit){
diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm
index fddd35c..851e155 100755
--- a/copri4/main/src/Tpl/Liste3.pm
+++ b/copri4/main/src/Tpl/Liste3.pm
@@ -987,7 +987,7 @@ sub tpl(){
 	    $betrag =~ s/\./,/;
             print $q->td({-class=>'tdint',-style=>"$txtstyle $set_style"},"$betrag"),"\n";
 	  }
-        }elsif($key =~ /int02/ && $ct4rel->{$id}->{state} eq "Kassenbestand"){
+        }elsif($key =~ /int02/ && $ct4rel->{$id}->{state} eq "Tagesabschluss"){
           print $q->td({-class=>'tdint',-style=>"$txtstyle $set_style"},$q->b("Anfangst. $ct4rel->{$id}->{$key}")),"\n";
 	}elsif($key =~ /int03/ && "$table" eq "contenttrans"){ 
 	  print $q->td({-class=>'tdint',-style=>"$txtstyle $set_style"},""),"\n";
diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
index 9daac33..1e564f5 100755
--- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
+++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
@@ -312,7 +312,6 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
       $ctrel->{$key} = $q->unescapeHTML("$ctrel->{$key}");
       $ctrel->{$key} = $lb->newline($ctrel->{$key},"","1");
      
-      #radID & timeCode from contenttranspos----------------
       if($ctrel->{int03} && $path =~ /$varenv->{accounting_3}|$varenv->{profile}/){ 
        if(1==1){
 	if($key =~ /ct_name/){
@@ -454,25 +453,7 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
         $label_des="$des";
       }
 
-      #sharee Tarife
-      if(1==2 && $key =~ /txt30/){
-	#FIXME
-	print $q->div({-style=>'padding-top:10px;'}, "aktivierte Tarife: $ctrel->{$key}"),"\n" if($users_sharee->{txt08} =~ /gnu-systems|tux-edv/);
-        if(($R::failure && $R::failure =~ /^$key/) || ($ctrel->{txt31} && $ctrel->{txt31} =~ /$key/)){
-          $autofocus = "autofocus";
-          $label_des = "<span style=color:$red>Bitte \"$des\" bestätigen</span>";
-        }
-
-  	my ($bike_group,$user_group,$tariff_all,$user_tour) = $apif->fetch_tariff($users_sharee,"");
-	my $required="";
-	my @tariff = ("$ctrel->{$key}");
-	@tariff = split(/\s/,$ctrel->{$key}) if($ctrel->{$key} =~ /\s/);
-	my $record_bonus = {c_id => 0};
-	foreach my $rid (sort { $tariff_all->{$a}->{barcode} <=> $tariff_all->{$b}->{barcode} } keys (%$tariff_all)){
-	  print "xxxxxxxxxxxxx $tariff_all->{$rid}->{barcode} | $tariff_all->{$rid}->{int18}\n";
-	}#end foreach tariff_all
-
-      }elsif($key =~ /txt/ && $size eq "select" && $des eq "Land"){
+      if($key =~ /txt/ && $size eq "select" && $des eq "Land"){
 	my $country = $lb->country_code();
 	$ctrel->{$key} = "DE" if(!$ctrel->{$key});
 	my @_valxx;
@@ -497,12 +478,6 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
           $required="";
 	  $label_des = "<span style='font-weight:normal;'>$des</span>";
 	}
-	elsif($key eq "txt07" && $R::failure && $R::failure =~ /conflict_txt07/){
-	  $autofocus = "autofocus";
-	  my ($failkey,$failval) = split(/=/,$R::failure);
-	  $label_des = "<span style=color:$red>Achtung, es existiert bereits ein Account mit der Telefon Nr.: $failval</span>";
-	  $ctrel->{$key} = $R::conflict_txt07;
-	}
 	elsif($key eq "txt08" && $R::failure && $R::failure =~ /conflict_txt08/){
 	  $autofocus = "autofocus";
 	  my ($failkey,$failval) = split(/=/,$R::failure);
@@ -552,13 +527,14 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
 	 print $q->div({-style=>'text-align:left;color:grey;'}, "<input type='checkbox' onclick='show_passwd()'>", "Passwort anzeigen"),"\n" if($pw ne "xxxxxxxx");
 	}else{
 	 #all other input textfields
-	 $required = "";# if($key =~ /txt09|txt16/);
     	 print $q->label({-for=>"$key", -style=>'padding-top:1.5em;'},"$label_des"),"\n";
 	 print "<input id='$key' type='text' class='form-control' name='$key' value='$ctrel->{$key}' override placeholder='$des' $required $autofocus />\n";
-	}#end $key =~ /txt/
+	}
+      }
+      #end $key =~ /txt/
 
       #all int checkboxes disabled because of AGB downunder
-      }elsif($key =~ /int/ && $size eq "checkbox"){
+      elsif($key =~ /int/ && $size eq "checkbox"){
         if(($R::failure && $R::failure =~ /^$key/) || ($ctrel->{txt31} && $ctrel->{txt31} =~ /$key/)){
 	  $autofocus = "autofocus";
 	  $label_des = "<span style=color:$red>Bitte \"$des\" bestätigen</span>";
@@ -579,12 +555,9 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
 	  #print $q->div({-class=>'content2'},"Bitte beachten Sie unsere <a href='$varenv->{wwwhost}/site/privacy_2.html' target='_blank'>Datenschutzhinweise.</a>"),"\n";
 
         }elsif(1==2 && $key =~ /int02/){#newsletter
-	  if($varenv->{wwwhost} !~ /konrad/){
     	  	print $q->label({-for=>"$key", -style=>'padding-top:10px;'},""),"\n";
           	print $q->div({-id=>"$key"},$but->checkbox("1","$key","$ctrel->{$key}","","$required"), " $des"),"\n";
           	print $q->hidden(-name=>"$key",-override=>1,-value=>"0");
-	  }
-
         }else{
     	  print $q->label({-for=>"$key", -style=>'padding-top:10px;'},""),"\n";
           print $q->div({-id=>"$key"},$but->checkbox("1","$key","$ctrel->{$key}","","$required"), " $des"),"\n";
@@ -618,7 +591,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
 	}
       }
 
-      if($key eq "txt16" && $ctrel->{c_id} && !$R::confirm_success){
+      if($key eq "txt16" && $ctrel->{c_id}){
         print $q->div({-style=>'margin-top:1em;'},"<button type='submit' name='sharee_edit' value='save_transact' class='btn btn-primary btn-lg btn-block' style='border:1px solid #$bgcolor1;background-color:#$bgcolor1;'>Speichern</button>"),"\n";
       }