diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index 68e4bb5..0e3e28c 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -289,7 +289,8 @@ sub save_account(){ $valxx =~ s/\s//g; my $bonus_prefix = uc($1), my $bonusnr = $2; - $bonusnr = "$1-$2" if($valxx =~ /^(\w{2,3})-(\w+)/i);#TR Oberried + ##TR-TR-xxxx mistake workaround + $bonusnr = "$1-$2" if($valxx =~ /^(TR)-(\w+)/i); my $operator_conf = $dbt->get_operator_conf($bonus_prefix); my @txt30_op = (); diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm index b76ad5b..3ff7d70 100755 --- a/copri4/main/src/Tpl/Liste3.pm +++ b/copri4/main/src/Tpl/Liste3.pm @@ -89,6 +89,7 @@ sub tpl(){ my $start_date_time = $R::start_date_time || ""; $start_date_time = "01.$mon.$year" if(!$start_date_time); + #$start_date_time = "01.01.2024";#sharee_tr workaround for SubOp yearly Abrechnung my $end_date_time = $R::end_date_time || ""; if(!$end_date_time){ @@ -436,6 +437,7 @@ EOF } } } + #$searchref->{txt29} = "Oberried";#sharee_tr workaround for SubOp yearly Abrechnung #trying to save hashref if(ref($searchref) eq "HASH"){ diff --git a/copri4/main/src/Tpl/TransInvoices.pm b/copri4/main/src/Tpl/TransInvoices.pm index 48f6d4a..c81b14e 100755 --- a/copri4/main/src/Tpl/TransInvoices.pm +++ b/copri4/main/src/Tpl/TransInvoices.pm @@ -375,6 +375,8 @@ sub tpl(){ mtime => "no_time", c_id => $ctt->{content_id}, }; + #disable Leistungszeitraum workaround for SubOp + #UPDATE contenttrans set txt20='01.05.2024 - 31.12.2024' where c_id = 29152; $dbt->update_one($dbh,$update_ctt,"txt20='$accounting_start - $accounting_end'"); } diff --git a/copri4/main/src/scripts/Ilockit_cloud.pl b/copri4/main/src/scripts/Ilockit_cloud.pl index 0049c11..83bf9f1 100755 --- a/copri4/main/src/scripts/Ilockit_cloud.pl +++ b/copri4/main/src/scripts/Ilockit_cloud.pl @@ -125,8 +125,8 @@ sub utctime { #'deviceTime' => '2021-10-14T08:19:35.000+0000', #'serverTime' => '2021-10-14T07:19:37.000+0000', - $utc_epoch -= 2*60*60;# -2 std (Sommerzeit) - #$utc_epoch -= 1*60*60;# -1 std (Winterzeit) + #$utc_epoch -= 2*60*60;# -2 std (Sommerzeit) + $utc_epoch -= 1*60*60;# -1 std (Winterzeit) $utc_epoch += $latency; $time = gmtime($utc_epoch);#epoch diff --git a/copri4/main/src/scripts/Ilockit_trackingcloud.pl b/copri4/main/src/scripts/Ilockit_trackingcloud.pl index faae68f..775e5f4 100755 --- a/copri4/main/src/scripts/Ilockit_trackingcloud.pl +++ b/copri4/main/src/scripts/Ilockit_trackingcloud.pl @@ -87,8 +87,8 @@ sub utctime { my $time = Time::Piece->strptime($date, "%Y-%m-%dT%H:%M:%S"); print FILE "localtime: " . $time->datetime . "\n";#localtime my $utc_epoch = $time->epoch; - $utc_epoch -= 2*60*60;# -2 std (Sommerzeit) - #$utc_epoch -= 1*60*60;# -1 std (Winterzeit) + #$utc_epoch -= 2*60*60;# -2 std (Sommerzeit) + $utc_epoch -= 1*60*60;# -1 std (Winterzeit) $utc_epoch += $latency; $time = gmtime($utc_epoch);#epoch print FILE "utctime: " . $time->datetime . "\n";#utc zulu date time diff --git a/copri4/shareeconf/examples/sharee_operator.sql.gz b/copri4/shareeconf/examples/sharee_operator.sql.gz index 8de79f4..2bdc47b 100755 Binary files a/copri4/shareeconf/examples/sharee_operator.sql.gz and b/copri4/shareeconf/examples/sharee_operator.sql.gz differ diff --git a/copri4/shareeweb-project/src/Lib/Mlogic.pm b/copri4/shareeweb-project/src/Lib/Mlogic.pm index 5c79378..1a20e59 100755 --- a/copri4/shareeweb-project/src/Lib/Mlogic.pm +++ b/copri4/shareeweb-project/src/Lib/Mlogic.pm @@ -184,7 +184,7 @@ sub tpl(){ } print "
\n"; - print $q->div({-style=>"text-align:left;border:0px dotted #$fgcolor1;"},$q->ul({-id=>'TopNavi'},$lmenu0)),"\n" if($project ne "Freiburg"); + print $q->div({-style=>"text-align:left;border:0px dotted #$fgcolor1;"},$q->ul({-id=>'TopNavi'},$lmenu0)),"\n";# if($project ne "Freiburg"); if(($node_meta->{tpl_id} == 1 || $node_meta->{tpl_id} == 3) && $node_meta->{main_id} == 200017){ require "Tpl/Karte_osm.pm";