roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-02-22 19:56:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

SubOp workaround for yearly Accounting

Browse source
This commit is contained in:
ragu 2025-01-08 10:44:55 +01:00
parent 67c894cc76
commit 4055e5a81b
7 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
copri4/main/src/Mod/Shareework.pm
View file

@ -289,7 +289,8 @@ sub save_account(){
$valxx =~ s/\s//g; $valxx =~ s/\s//g;
my $bonus_prefix = uc($1), my $bonus_prefix = uc($1),
my $bonusnr = $2; 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 $operator_conf = $dbt->get_operator_conf($bonus_prefix);
my @txt30_op = (); my @txt30_op = ();

2
copri4/main/src/Tpl/Liste3.pm
View file

@ -89,6 +89,7 @@ sub tpl(){
my $start_date_time = $R::start_date_time || ""; my $start_date_time = $R::start_date_time || "";
$start_date_time = "01.$mon.$year" if(!$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 || ""; my $end_date_time = $R::end_date_time || "";
if(!$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 #trying to save hashref
if(ref($searchref) eq "HASH"){ if(ref($searchref) eq "HASH"){

2
copri4/main/src/Tpl/TransInvoices.pm
View file

@ -375,6 +375,8 @@ sub tpl(){
mtime => "no_time", mtime => "no_time",
c_id => $ctt->{content_id}, 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'"); $dbt->update_one($dbh,$update_ctt,"txt20='$accounting_start - $accounting_end'");
} }

4
copri4/main/src/scripts/Ilockit_cloud.pl
View file

@ -125,8 +125,8 @@ sub utctime {
#'deviceTime' => '2021-10-14T08:19:35.000+0000', #'deviceTime' => '2021-10-14T08:19:35.000+0000',
#'serverTime' => '2021-10-14T07:19:37.000+0000', #'serverTime' => '2021-10-14T07:19:37.000+0000',
$utc_epoch -= 2*60*60;# -2 std (Sommerzeit) #$utc_epoch -= 2*60*60;# -2 std (Sommerzeit)
#$utc_epoch -= 1*60*60;# -1 std (Winterzeit) $utc_epoch -= 1*60*60;# -1 std (Winterzeit)
$utc_epoch += $latency; $utc_epoch += $latency;
$time = gmtime($utc_epoch);#epoch $time = gmtime($utc_epoch);#epoch

4
copri4/main/src/scripts/Ilockit_trackingcloud.pl
View file

@ -87,8 +87,8 @@ sub utctime {
my $time = Time::Piece->strptime($date, "%Y-%m-%dT%H:%M:%S"); my $time = Time::Piece->strptime($date, "%Y-%m-%dT%H:%M:%S");
print FILE "localtime: " . $time->datetime . "\n";#localtime print FILE "localtime: " . $time->datetime . "\n";#localtime
my $utc_epoch = $time->epoch; my $utc_epoch = $time->epoch;
$utc_epoch -= 2*60*60;# -2 std (Sommerzeit) #$utc_epoch -= 2*60*60;# -2 std (Sommerzeit)
#$utc_epoch -= 1*60*60;# -1 std (Winterzeit) $utc_epoch -= 1*60*60;# -1 std (Winterzeit)
$utc_epoch += $latency; $utc_epoch += $latency;
$time = gmtime($utc_epoch);#epoch $time = gmtime($utc_epoch);#epoch
print FILE "utctime: " . $time->datetime . "\n";#utc zulu date time print FILE "utctime: " . $time->datetime . "\n";#utc zulu date time

BIN
copri4/shareeconf/examples/sharee_operator.sql.gz
View file

Binary file not shown.

2
copri4/shareeweb-project/src/Lib/Mlogic.pm
View file

@ -184,7 +184,7 @@ sub tpl(){
} }
print "<div id='Contenttxt' style='margin:25px 0px 5px 0px;border:0px dotted #$fgcolor1;'>\n"; print "<div id='Contenttxt' style='margin:25px 0px 5px 0px;border:0px dotted #$fgcolor1;'>\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){ if(($node_meta->{tpl_id} == 1 || $node_meta->{tpl_id} == 3) && $node_meta->{main_id} == 200017){
require "Tpl/Karte_osm.pm"; require "Tpl/Karte_osm.pm";