diff --git a/copri4/main/src/Mod/Basework.pm b/copri4/main/src/Mod/Basework.pm
index 3ecf741..73a0f25 100755
--- a/copri4/main/src/Mod/Basework.pm
+++ b/copri4/main/src/Mod/Basework.pm
@@ -37,8 +37,7 @@ sub log {
$now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
my $logfile = "/var/log/copri4/$varenv{syshost}-process.log";
- #if($varenv{debug}){
- if(1==1){
+ if($varenv{debug}){
warn "$$ $what" . "\n" . Dumper($message) . "\n";#to apache2/error.log
#2021-07-21 disabled. error.log is enough
diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm
index db260a4..1c84f09 100755
--- a/copri4/main/src/Mod/DBtank.pm
+++ b/copri4/main/src/Mod/DBtank.pm
@@ -157,6 +157,7 @@ sub update_operatorsloop {
#delete $record_primary->{int12};#Vde (remove delete for global setting)
delete $record_primary->{int23};#mini_answer count will be saved on operator
delete $record_primary->{txt29};#Sonstiges
+ delete $record_primary->{txt35};#Umfragelink
#}
my $update = {
diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm
index 6bed7f8..efe4de1 100755
--- a/copri4/main/src/Mod/Pricing.pm
+++ b/copri4/main/src/Mod/Pricing.pm
@@ -119,6 +119,7 @@ sub counting_rental {
#init with some defaults
my $total_price = 0;
my $ctpos_freed = { c_id => 0 };
+ $ctpos->{int35} = 0 if(!$ctpos->{int35});
#convert tariff unit by minute time
my $tariff_unitbyminute = 60;#defaults to Stundentarif
@@ -252,7 +253,7 @@ sub counting_rental {
$return->{end_time} = "$computed_end_time";
$return->{freed_time} = "$freed_time";
$return->{computed_hours} = "$computed_hours";
- $return->{unit_price} = "$ctpos->{int35}";
+ $return->{unit_price} = "$ctpos->{int35}" || "";
$return->{real_clock} = "$real_clock";
$return->{total_price} = "$total_price";
$return->{discount} = "$discount";
@@ -536,7 +537,8 @@ sub operator_accounting2calc {
$oac->{int02} = $oac->{int01} + $oac->{int94} + $oac->{int95} + $oac->{int96} + $oac->{int97};
$oac->{int02} = sprintf('%.3f', $oac->{int02});
#operator invoice
- $oac->{int100} = $oac->{int93} + $oac->{int98};
+ #$oac->{int100} = $oac->{int93} + $oac->{int98};#brutto
+ $oac->{int100} = $oac->{int93};#netto
$oac->{int100} = sprintf('%.3f', $oac->{int100});
}
}
diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm
index 5e83662..3cf5479 100755
--- a/copri4/main/src/Mod/Printpreview.pm
+++ b/copri4/main/src/Mod/Printpreview.pm
@@ -171,7 +171,7 @@ td {
my $site_all=1;
my $header_top = 0;
- my $footer_px = 1790;
+ my $footer_px = 1780;
my $footer_top = $footer_px;#end 1.site
my $sum_paid = 0;
@@ -447,9 +447,9 @@ td {
#operator accounting
else{
if($varenv->{dbname} eq "sharee_sx"){
- @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=payone Disagio","int02=Summe Gutschrift");
+ @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int02=Summe Gutschrift");
}else{
- @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungsmeldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift");
+ @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int95=Transaktion","int96=Zahlungsmeldung","int97=Kreditkarte Zuordnung","int02=Summe Gutschrift");
}
}
@@ -545,36 +545,32 @@ td {
}
}
- #Sum Endrechnung
+ #Sum Operator invoice
if($break_table_wc > 0 && $break_table_wc <= $max_table_wc){
- my $sum_parts19 = $ctt->{int01} || 0;
- if($sum_parts19 && $sum_parts19 != 0){
- $sum_umst19 = $sum_parts19 / $diff19 * 19;
+ my $sum_brutto = $ctt->{int01} || 0;
+ my $sum_operatorcredit = $ctt->{int02} || 0;
+ my $total_operatorcredit = $sum_operatorcredit - $sum_brutto;
+
+ if($sum_brutto && $sum_brutto != 0){
+ $sum_umst19 = $sum_brutto / $diff19 * 19;
$sum_umst19 = $pri->round($sum_umst19);
}
- my $sum_netto19 = $sum_parts19 - $sum_umst19;
+
+ my $sum_netto19 = $sum_brutto - $sum_umst19;
$sum_netto19 = sprintf('%.2f', $sum_netto19);
$sum_netto19 =~ s/\./,/;
+ $sum_brutto =~ s/\./,/;
- my $sum_paid = $sum_parts19;
- $sum_paid = $pri->round($sum_paid);
- $sum_paid = sprintf('%.2f', $sum_paid);
- $sum_paid =~ s/\./,/;
-
- $sum_parts19 = sprintf('%.2f', $sum_parts19);
$sum_umst19 = sprintf('%.2f', $sum_umst19);
$sum_umst19 =~ s/\./,/;
- my $sum_operatorcredit = $ctt->{int02} || 0;
- $sum_operatorcredit = $pri->round($sum_operatorcredit);
$sum_operatorcredit = sprintf('%.2f', $sum_operatorcredit);
$sum_operatorcredit =~ s/\./,/;
print $q->Tr(),"\n";
print $q->td({-class=>'Oline',-colspan=>$tc}," "),"\n";
- my $cs = $tc - 2;
my $payment_text = "";
foreach(@tplf_order){
my ($key,$des,$size) = split /=/,$_;
@@ -583,7 +579,7 @@ td {
$ctf->{$key} = $lb->newline($ctf->{$key},"","");
$ctt->{state} =~ s/\(payone.*//;
if($des =~ /$ctt->{state}/){
- if($sum_parts19 < 0){
+ if($sum_brutto < 0){
$payment_text = "$ctf->{txt58}";
}else{
$payment_text = "$ctf->{$key}";
@@ -591,14 +587,18 @@ td {
}
}
}
+
+ my $sc = 2;
+ $sc = 1 if($ctt->{template_id} != 208);
+ my $pt = $tc - $sc;
print "
\n";
- print "$payment_text | \n";
+ print "$payment_text | \n";
###print sum
- print "\n";
- print $q->start_table({-style=>'border:1px solid silver;', -border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
+ print " | \n";
+ print $q->start_table({-style=>'border:1px solid silver;', -border=>'0', -width=>'100%',-align=>'right', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
- #Summe Betreiber Rechnung
+ #Sum operator invoive
if($ctt->{template_id} != 208){#not equal Abrechnung
print $q->Tr("\n");
print $q->td({-class=>'tdint',-colspan=>1},"Nettobetrag");
@@ -612,13 +612,21 @@ td {
print $q->Tr("\n");
print $q->td({-class=>'tdsum',-colspan=>1},"Entgeld TeilRad GmbH");
- print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_paid €");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_brutto €");
}
#Summe Betreiber Abrechnung (Gutschrift)
else{
print $q->Tr("\n");
print $q->td({-class=>'tdsum',-colspan=>1},"Summe");
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_operatorcredit €");
+
+ print $q->Tr("\n");
+ print $q->td({-class=>'tdsum',-colspan=>1},"Entgeld TeilRad GmbH");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"- $sum_brutto €");
+
+ print $q->Tr("\n");
+ print $q->td({-class=>'tdsum',-colspan=>1},"Auszahlungsbetrag");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"$total_operatorcredit €");
}
print $q->end_table,"\n";
@@ -946,18 +954,26 @@ td {
print "$line\n";
if($ctt->{int10} == 2){
+ print $q->span({-style=>'padding:0.2em;text-align:center;font-size:0.81em;'},"Gebühren der Zahlungsdienstleistung:"),"\n" if($ctt->{template_id} == 208);
my $tplop = $dbt->get_tpl($dbh,"196");#Operator-Faktura
my @tplop_order = split /,/,$tplop->{tpl_order};
foreach(@tplop_order){
my ($key,$val,$size,$unit) = split /=/,$_;
- if($key =~ /int(\d+)/){
- #take fee values used by creating operator accounting invoice
- my $count_key = $1 + 20;#cu.int to ctt.int
- my $ctt_key = "int" . $count_key;
- if($ctt->{$ctt_key}){
- $ctt->{$ctt_key} =~ s/\./,/;
- print $q->span({-style=>'padding:0.2em;text-align:center;font-size:0.81em;'},"$val $ctt->{$ctt_key} $unit | "),"\n";
+ if($ctt->{template_id} != 208){
+ if($key eq "int01"){
+ $ctt->{$key} =~ s/\./,/;
+ print $q->span({-style=>'padding:0.2em;text-align:center;font-size:0.81em;'},"$val $ctt->{int21} $unit "),"\n";
}
+ }else{
+ if($key ne "int01" && $key =~ /int(\d+)/){
+ #take fee values used by creating operator accounting invoice
+ my $count_key = $1 + 20;#cu.int to ctt.int
+ my $ctt_key = "int" . $count_key;
+ if($ctt->{$ctt_key}){
+ $ctt->{$ctt_key} =~ s/\./,/;
+ print $q->span({-style=>'padding:0.2em;text-align:center;font-size:0.81em;'},"$val $ctt->{$ctt_key} $unit | "),"\n";
+ }
+ }
}
}
print " \n";
diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm
index 739d531..80216f5 100755
--- a/copri4/main/src/Mod/Shareework.pm
+++ b/copri4/main/src/Mod/Shareework.pm
@@ -188,14 +188,20 @@ sub save_account(){
my $fkeys = "";
my $pw_dummy = "";
@keywords = grep {!/txt31/} @keywords;
- print FILE Dumper($q) if($debug);
+ #print FILE Dumper($q) if($debug);
foreach(@keywords){
$fkeys .= "$_,";
my $val = $q->param("$_");
my $valxx = $q->escapeHTML("$val");
$valxx =~ s/^\s+//;
$valxx =~ s/\s+$//;
- print FILE "$_:$valxx \n" if($debug);
+ if($debug){
+ if($_ !~ /txt04/){
+ print FILE "$_:$valxx \n";
+ }else{
+ print FILE "$_:is not logged\n";
+ }
+ }
if($_ =~ /^int|barcode/){
$valxx =~ s/,/./g;
if(looks_like_number($valxx)){
diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm
index df785b8..203b007 100755
--- a/copri4/main/src/Tpl/Calorin.pm
+++ b/copri4/main/src/Tpl/Calorin.pm
@@ -60,7 +60,7 @@ sub tpl(){
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
my $users_dms_primary = { u_id => 0 };
- $users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
+ $users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"");
my $table = "contenttrans";
my $u_name = $q->escapeHTML("$R::u_name");
@@ -458,7 +458,7 @@ sub tpl(){
$comment_view = "→ $comment" if($comment);
my $kunde = "$cttpos->{$pid}->{txt08}";
- if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){
+ if($users_dms_primary->{u_id} && $users_dms->{u_id} && $users_dms->{int02} >= 1){
$kunde = $q->a({-class=>"linknav3",-style=>"$part_style",-href=>"/DMS/Kunden/?detail_search=1&s_c_id=$cttpos->{$pid}->{ca_id}",-title=>"Kunde im Kundenstamm"},"$cttpos->{$pid}->{txt08} ($cttpos->{$pid}->{ca_id})");#2021-05-24 saves kd name
}
@@ -470,7 +470,7 @@ sub tpl(){
print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → $start_time – $end_time → $kunde → Start Station $start_station → End Station $end_station → Bike $bikenr $status $lock_state → $u_name/$u_name_end $track_info $charge $comment_view"),"\n";
}
- if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){
+ if($users_dms_primary->{u_id} && $users_dms->{u_id} && $users_dms->{int03} >= 1){
print $q->div({-style=>'float:left;margin-left:1em;'}, "→ Faktura", $q->a({-class=>"linknav3",-style=>"$trans_style",-href=>"/DMS/Faktura?ct_trans=open\&c_id4trans=$c_id4trans\&tpl_id4trans=$tpl_id4trans\&kind_of_trans=Faktura\&owner=$users_dms->{owner}",-title=>"Faktura Terminal öffnen"},"\#$ct_name")),"\n" if($c_id4trans && $tpl_id4trans);
print $q->div({-style=>'float:left;margin-left:1em;'}, "$user_device"),"\n";
}
diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm
index 696321d..0374dc7 100755
--- a/copri4/main/src/Tpl/Liste3.pm
+++ b/copri4/main/src/Tpl/Liste3.pm
@@ -399,7 +399,7 @@ sub tpl(){
my $ctrel = {};
#only if permission read
- if(($node_meta->{ct_table} eq "content" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentadr" && $users_dms_primary->{u_id} && $users_dms_primary->{int02} >= 1 && $users_dms->{u_id} && $users_dms->{int02} >= 1) || ($node_meta->{ct_table} eq "contenttrans" && $users_dms_primary->{u_id} && $users_dms_primary->{int03} >= 1 && $users_dms->{u_id} && $users_dms->{int03} >= 1)){
+ if(($node_meta->{ct_table} eq "content" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentadr" && $users_dms_primary->{u_id} && $users_dms->{u_id} && $users_dms->{int02} >= 1) || ($node_meta->{ct_table} eq "contenttrans" && $users_dms_primary->{u_id} && $users_dms->{u_id} && $users_dms->{int03} >= 1)){
my $c_id4trans = $R::c_id4trans || "";
diff --git a/copri4/main/src/Tpl/SubListe.pm b/copri4/main/src/Tpl/SubListe.pm
index 8f1048c..199d4b1 100755
--- a/copri4/main/src/Tpl/SubListe.pm
+++ b/copri4/main/src/Tpl/SubListe.pm
@@ -213,19 +213,12 @@ EOF
}
}
}
- #trying to save hashref
- #if($R::detail_search && ref($searchref) eq "HASH"){
- # store $searchref, $hashfile;
- #}elsif($keycount > 0 && !$R::detail_search && -f $hashfile && !$R::col_sort && !$R::sort_updown){
- # $searchref = {};
- # $searchref = retrieve($hashfile);
- #}
- #print Dumper($searchref);
+
my $export = "";
my $todo = "";
my $ck4ex = "";
#only if permission read
- if(($node_meta->{ct_table} eq "users" && $users_dms->{int07} >= 1) || ($node_meta->{ct_table} eq "contentadrpos" && $users_dms->{int02} >= 1) || ($node_meta->{ct_table} eq "contentpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} >= 1)){
+ if(($node_meta->{ct_table} eq "users" && $users_dms->{int07} >= 1) || ($node_meta->{ct_table} eq "contentadrpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} >= 1)){
$ct4rel = $db->search_content3($searchref,$table,$dbt->{shareedms_conf}->{parent_id},$node_meta,$users_dms->{u_id},$lang,"$main_ids","$tpl_ids","","",$time,"",$scol,$users_dms->{sort_updown},$offset,$limit,$export,$todo,$ck4ex,"");
}else{
$return = "failure::Abbruch. Keine Zugriffsberechtigung";
diff --git a/copri4/main/src/Tpl/TransInvoices.pm b/copri4/main/src/Tpl/TransInvoices.pm
index eb4cf3e..fadfd2e 100755
--- a/copri4/main/src/Tpl/TransInvoices.pm
+++ b/copri4/main/src/Tpl/TransInvoices.pm
@@ -98,9 +98,9 @@ sub tpl(){
($cttpos,$rows) = $dbt->collect_contenttrans($dbh,$ctt->{content_id});
#int9x are not in db
if($varenv{dbname} eq "sharee_sx"){
- @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=payone Disagio","int02=Summe Gutschrift");
+ @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int02=Summe Gutschrift");
}else{
- @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungsmeldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift");
+ @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int95=Transaktion","int96=Zahlungsmeldung","int97=Kreditkarte Zuordnung","int02=Summe Gutschrift");
}
}
my $tplf = $dbt->get_tpl($dbh,201);#Kunden-Faktura, ex Firma
@@ -127,10 +127,9 @@ sub tpl(){
print $q->start_form(-name=>'transposform'),"\n";
my $sum_operatorcredit=0;
- my $sum_payonecapture=0;
- my $sum_parts19=0;
+ my $sum_netto=0;
+ my $sum_brutto=0;
my $sum_all=0;
- my $diff19 = 100 + 19;
my $sum_umst19=0;
my $i=0;
my $accounting_start = "";
@@ -140,7 +139,7 @@ sub tpl(){
my $oac = $pri->operator_accounting2calc(\%varenv,$cttpos->{$id},$ctf_operator);
$sum_operatorcredit += $oac->{int02};#Abrechnung Gutschrift
- $sum_parts19 += $oac->{int100};#Operator Rechnung (TeilRad Gebühren + Disagio incl. 19%)
+ $sum_netto += $oac->{int100};#Operator invoice (TeilRad Gebühren netto)
$sum_all += $oac->{int99};#capture brutto
$oac->{int01} = sprintf('%.2f', $oac->{int01});#capture netto
@@ -192,26 +191,28 @@ sub tpl(){
}
}#foreach end
- if($sum_parts19 && $sum_parts19 != 0){
- $sum_umst19 = $sum_parts19 / $diff19 * 19;
- $sum_umst19 = $pri->round($sum_umst19);
+ #sum int100 netto
+ if($sum_netto && $sum_netto != 0){
+ $sum_brutto = $sum_netto * 1.19;
+ $sum_netto = $pri->round($sum_netto);
+ $sum_brutto = $pri->round($sum_brutto);
+ $sum_umst19 = $sum_brutto - $sum_netto;
}
- my $sum_netto19 = $sum_parts19 - $sum_umst19;
- $sum_netto19 = sprintf('%.2f', $sum_netto19);
- $sum_netto19 =~ s/\./,/;
+ $sum_operatorcredit = $pri->round($sum_operatorcredit);
+ my $total_operatorcredit = $sum_operatorcredit - $sum_brutto;
+ my $sum_paid = $sum_brutto;
- my $sum_paid = $sum_parts19;
- $sum_paid = $pri->round($sum_paid);
- $sum_paid = sprintf('%.2f', $sum_paid);
- $sum_paid =~ s/\./,/;
-
- $sum_parts19 = sprintf('%.2f', $sum_parts19);
+ $sum_netto = sprintf('%.2f', $sum_netto);
+ $sum_netto =~ s/\./,/;
+ $sum_brutto = sprintf('%.2f', $sum_brutto);
+ $sum_brutto =~ s/\./,/;
$sum_umst19 = sprintf('%.2f', $sum_umst19);
$sum_umst19 =~ s/\./,/;
- $sum_operatorcredit = $pri->round($sum_operatorcredit);
$sum_operatorcredit = sprintf('%.2f', $sum_operatorcredit);
$sum_operatorcredit =~ s/\./,/;
+ $total_operatorcredit = sprintf('%.2f', $total_operatorcredit);
+ $total_operatorcredit =~ s/\./,/;
$sum_all = sprintf('%.2f', $sum_all);
$sum_all =~ s/\./,/;
@@ -225,48 +226,63 @@ sub tpl(){
$ctf->{$key} = $lb->newline($ctf->{$key},"","");
$ctt->{state} =~ s/\(payone.*//;
if($des =~ /$ctt->{state}/){
- if($sum_parts19 < 0){
- $payment_text = "$ctf->{txt58}";
+ $payment_text = "($key) " if($users_dms->{u_id} eq $varenv{superu_id});
+ if($sum_netto < 0){
+ $payment_text .= "$ctf->{txt58}";
}else{
- $payment_text = "$ctf->{$key}";
+ $payment_text .= "$ctf->{$key}";
}
}
}
}
- my $cs = $tc - 3;
+ my $sc = 2;
+ $sc = 1 if($ctt->{template_id} != 208);
+ my $pt = $tc - $sc;
print " \n";
- print "$payment_text | \n";
+ print "$payment_text | \n";
###print sum
- print "\n";
- print $q->start_table({-class=>'list',-style=>'border-top:0px;border-style:solid;border-color:black;', -border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
+ print " | \n";
+ print $q->start_table({-class=>'list',-style=>'', -border=>'0', -width=>'100%',-align=>'right', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
print $q->Tr("\n");
print $q->td(" ");
- #Summe Betreiber Rechnung
+ #Sum operator invoice
if($ctt->{template_id} != 208){#not equal Abrechnung
print $q->Tr("\n"); $line_count2++;
- print $q->td({-class=>'tdint',-colspan=>2},"Nettobetrag");
- print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_netto19 €");
+ print $q->td({-class=>'tdint',-colspan=>1},"Nettobetrag");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_netto €");
- if($sum_netto19 != 0){
+ if($sum_netto != 0){
print $q->Tr("\n");$line_count2++;
- print $q->td({-class=>'tdint',-colspan=>2,-nowrap=>"1"},"19% UmSt auf $sum_netto19 €");
+ print $q->td({-class=>'tdint',-colspan=>1,-nowrap=>"1"},"19% UmSt auf $sum_netto €");
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_umst19 €");
}
print $q->Tr("\n");$line_count2++;
- print $q->td({-class=>'tdint',-colspan=>1,-style=>'color:silver;'},"(Einzüge brutto $sum_all)");
print $q->td({-class=>'tdsum',-colspan=>1},"Entgeld TeilRad GmbH");
- print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_paid €");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_brutto €");
+
+ #print $q->Tr("\n");$line_count2++;
+ #print $q->td({-class=>'tdint',-colspan=>1,-style=>'color:silver;'},"(pay Einzüge brutto)");
+ #print $q->td({-class=>'tdint',-nowrap=>"1",-style=>'color:silver;'},"$sum_all €");
+
}
#Summe Betreiber Abrechnung (Gutschrift)
else{
print $q->Tr("\n");$line_count2++;
- print $q->td({-class=>'tdint',-colspan=>1,-style=>'color:silver;'},"(Einzüge brutto $sum_all)");
+ #print $q->td({-class=>'tdint',-colspan=>1,-style=>'color:silver;'},"(Einzüge brutto $sum_all)");
print $q->td({-class=>'tdsum',-colspan=>1},"Summe");
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_operatorcredit €");
+
+ print $q->Tr("\n");$line_count2++;
+ print $q->td({-class=>'tdsum',-colspan=>1},"Entgeld TeilRad GmbH");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"- $sum_brutto €");
+
+ print $q->Tr("\n");$line_count2++;
+ print $q->td({-class=>'tdsum',-colspan=>1},"Auszahlungsbetrag");
+ print $q->td({-class=>'tdint',-nowrap=>"1"},"$total_operatorcredit €");
}
print $q->end_table;
@@ -297,8 +313,10 @@ sub tpl(){
if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){
my @_paymentstate = ("");
my $kind_of_payment = "";
+ #we need it for both
+ print $q->hidden(-name=>'sum_operatorcredit', -override=>'1',-value=>"$sum_operatorcredit");
+ print $q->hidden(-name=>'sum_paid', -override=>'1',-value=>"$sum_paid");
if($ctt->{template_id} != 208){#not equal Abrechnung
- print $q->hidden(-name=>'sum_paid', -override=>'1',-value=>"$sum_paid");
push @_paymentstate, "Entgeld TeilRad GmbH";
if($ctt->{state} && $ctt->{int01}){
$kind_of_payment = "$ctt->{state}";
@@ -310,8 +328,7 @@ sub tpl(){
}
}
else{
- print $q->hidden(-name=>'sum_operatorcredit', -override=>'1',-value=>"$sum_operatorcredit");
- push @_paymentstate, "Gutschrift";
+ push @_paymentstate, "Betreiber Abrechnung";
if($ctt->{state} && $ctt->{int02}){
$kind_of_payment = "$ctt->{state}";
$ctt->{int02} =~ s/\./,/;
@@ -355,6 +372,6 @@ sub tpl(){
$db->updater("contenttrans","c_id","$ctt->{content_id}","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end);
- return "$line_count2";
+ return $line_count2;
}
1;
diff --git a/copri4/main/src/scripts/statistik_occubike_stationCSV_innofact.pl b/copri4/main/src/scripts/statistik_occubike_stationCSV_innofact.pl
new file mode 120000
index 0000000..3bb2cec
--- /dev/null
+++ b/copri4/main/src/scripts/statistik_occubike_stationCSV_innofact.pl
@@ -0,0 +1 @@
+../../../../../sharee.bike/copri-bike/main/src/scripts/statistik_occubike_stationCSV_innofact.pl
\ No newline at end of file
| |