mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-05-13 07:06:38 +02:00
saving column into invoices
This commit is contained in:
Rainer Gümpelein
parent
ba041a56b6
commit
4c11beb331
7 changed files with 222 additions and 283 deletions
|
|
@ -26,7 +26,10 @@ sub new {
|
|||
|
||||
#Template
|
||||
sub tpl(){
|
||||
my ($node_meta,$users_dms,$return) = @_;
|
||||
my $node_meta = shift;
|
||||
my $users_dms = shift;
|
||||
my $return = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
my $lb = new Libenz;
|
||||
|
|
@ -36,23 +39,14 @@ sub tpl(){
|
|||
my $transp = new TransPositionen;
|
||||
my %varenv = $cf->envonline();
|
||||
my $lang = "de";
|
||||
|
||||
my $user_agent = $q->user_agent();
|
||||
my %ib = $but->ibuttons();
|
||||
my $line_count1;
|
||||
my $line_count1 = 0;
|
||||
|
||||
#get Firma
|
||||
my $ctf = $db->get_content1("contentuser",$dbt->{shareedms_conf}->{parent_id});
|
||||
#print Dumper($users_dms) . "if($R::c_id4trans && $node_meta->{tpl_id} && $users_dms->{u_id} > 0)\n";
|
||||
|
||||
my $rel4tpl = $db->get_rel4tpl("",$lang,$users_dms->{c_id4trans},$node_meta->{tpl_id});
|
||||
|
||||
my @tpl_order = split /,/,$rel4tpl->{tpl_order};
|
||||
my $node = $db->get_node4multi($node_meta->{main_id},$lang) if($node_meta->{main_id});
|
||||
if(!$node->{main_id} && $users_dms->{u_id}){
|
||||
$db->update_users4trans("0","0",$R::kind_of_trans,$users_dms->{u_id});
|
||||
$users_dms = $db->select_users($users_dms->{u_id});
|
||||
}
|
||||
|
||||
my $ctx = { c_id => 0 };
|
||||
$ctx = $db->get_content1("contenttrans",$users_dms->{c_id4trans});
|
||||
|
|
@ -102,16 +96,16 @@ EOF
|
|||
;
|
||||
|
||||
my $main_id = $rel4tpl->{main_id} || $ctx->{int12};
|
||||
my $set_main_id = $ctf->{txt22};
|
||||
my $set_main_id = $dbt->{shareedms_conf}->{invoice};
|
||||
|
||||
my @formular_relations=("$set_main_id:Typ auswählen ...");
|
||||
my @workflow_relations=("$set_main_id:Typ auswählen ...");
|
||||
my $nodes = $db->collect_node($dbt->{shareedms_conf}->{faktura}, "$lang");
|
||||
my $depends = "irgendeinzeichen";
|
||||
my $depends = "nothingelse";
|
||||
#$depends = "Storno" if(!$ctx->{close_time});
|
||||
foreach my $id (sort { $nodes->{$a}->{node_name} cmp $nodes->{$b}->{node_name} } keys (%$nodes)){
|
||||
push (@formular_relations, "$id:$nodes->{$id}->{node_path}") if(($main_id eq $id) || ($nodes->{$id}->{node_path} !~ /journal|bericht|offen|Storno|Vorauszahlungsrechnung|letzte|langzeit|OPOS|$depends/));
|
||||
push (@workflow_relations, "$id:$nodes->{$id}->{node_path}") if($nodes->{$id}->{node_path} !~ /journal|bericht|offen|Schlussrechnung|letzte|langzeit|OPOS|$node->{node_name}$|$ctx->{txt00}|$depends/);
|
||||
push (@workflow_relations, "$id:$nodes->{$id}->{node_path}") if($nodes->{$id}->{node_path} !~ /journal|bericht|offen|Schlussrechnung|letzte|langzeit|OPOS|$node_meta->{node_name}$|$ctx->{txt00}|$depends/);
|
||||
}
|
||||
|
||||
print "\n<div style='position:absolute;text-align:left;background-color:white;width:100%;'>\n";
|
||||
|
|
@ -177,7 +171,6 @@ EOF
|
|||
print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit");
|
||||
print $q->hidden(-name=>'relids', -override=>'1', -value=>"$R::relids");
|
||||
print $q->hidden(-name=>'ct_name4workflow', -override=>1, -value=>"$ctx->{ct_name}");
|
||||
print $q->hidden(-name=>'p_template', -override=>'1', -value=>"$node->{node_path}");
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}");
|
||||
print $q->hidden(-name=>'c_id4copy', -override=>'1', -value=>"$ctx->{c_id}");
|
||||
print $q->hidden(-name=>'close_time', -override=>'1', -value=>"$ctx->{close_time}");
|
||||
|
|
@ -353,7 +346,7 @@ EOF
|
|||
print "<tr><td colspan='5' style='font-size:1em;'>\n";
|
||||
|
||||
#require "Tpl/TransPositionen.pm";
|
||||
my $line_count2 = $transp->tpl($node_meta,$users_dms,$set_main_id,$rel4tpl->{main_id},$rel4tpl->{rel_id},$rel4tpl->{content_id},$lang,"$return","$node->{node_name}");
|
||||
my $line_count2 = $transp->tpl($node_meta,$users_dms,$set_main_id,$rel4tpl,$return);
|
||||
|
||||
print "</td></tr>\n";
|
||||
###end Edit Parts
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use Mod::Libenz;
|
|||
use Mod::Libenzdb;
|
||||
use Mod::DBtank;
|
||||
use Mod::APIfunc;
|
||||
use Mod::Pricing;
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
|
|
@ -30,8 +31,13 @@ sub new {
|
|||
|
||||
#Template
|
||||
sub tpl(){
|
||||
my $self=shift;
|
||||
my ($node_meta,$users_dms,$set_main_id,$main_id,$rel_id,$c_id,$lang,$return,$node_name) = @_;
|
||||
my $self = shift;
|
||||
my $node_meta = shift;
|
||||
my $users_dms = shift;
|
||||
my $set_main_id = shift;
|
||||
my $rel4tpl = shift;
|
||||
my $return = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
my $lb = new Libenz;
|
||||
|
|
@ -39,15 +45,8 @@ sub tpl(){
|
|||
my $dbt = new DBtank;
|
||||
my $apif = new APIfunc;
|
||||
my $but = new Buttons;
|
||||
my $pri = new Pricing;
|
||||
my %varenv = $cf->envonline();
|
||||
my $script = $q->script_name();
|
||||
my $path_info = $q->path_info();
|
||||
my $path = $path_info;
|
||||
#with meta_host,
|
||||
if("$varenv{metahost}"){
|
||||
$path = "$script" . "$path_info";
|
||||
$script="";
|
||||
}
|
||||
my %ib = $but->ibuttons();
|
||||
my $today = strftime("%d.%m.%Y",localtime(time));
|
||||
my $dbh = "";
|
||||
|
|
@ -62,17 +61,15 @@ sub tpl(){
|
|||
my $c_idpos = $R::c_idpos || $R::pos_id || "";
|
||||
|
||||
my $ctf = $db->get_content1("contentuser",$dbt->{shareedms_conf}->{parent_id});
|
||||
my $ctt = $db->get_content1("contenttrans",$c_id);
|
||||
|
||||
my $umst1619 = $lb->umst_breaking($ctt,"");
|
||||
my $ctt = $db->get_content1("contenttrans",$rel4tpl->{content_id});
|
||||
#my $umst1619 = $lb->umst_breaking($ctt,"");
|
||||
|
||||
my $ctadr = $db->get_content1("contentadr",$ctt->{int10});
|
||||
my $buchen_mtime = $lb->time4de($ctt->{mtime});
|
||||
my $vibuchen_mtime = "";
|
||||
$vibuchen_mtime = "Payone post " . $lb->time4de($ctt->{pay_time},1) . " . " if($ctt->{pay_time});
|
||||
|
||||
my $tpl = $db->get_tpl("208");
|
||||
my @tpl_order = split /,/,$tpl->{tpl_order};
|
||||
my @tpl_order = ("txt01=Beschreibung","ct_name=Nummer","date_time=Mietzeit","int03=Menge","int02=Preis","int07=Rabatt","int04=Gesamt");
|
||||
my $tplf = $db->get_tpl("201");#Firma tpl
|
||||
my @tplf_order = split /,/,$tplf->{tpl_order};
|
||||
|
||||
|
|
@ -87,7 +84,14 @@ sub tpl(){
|
|||
my $max_sum = $ctf->{int03} || "10000";
|
||||
my $cttpos = { c_id => 0 };
|
||||
my $rows = 0;
|
||||
($cttpos,$rows) = $db->collect_contentpos("contenttrans",$c_id);# if($c_id);
|
||||
($cttpos,$rows) = $db->collect_contentpos("contenttrans",$rel4tpl->{content_id});
|
||||
|
||||
foreach my $id (keys(%$cttpos)){
|
||||
if($cttpos->{$id}->{int26}){
|
||||
@tpl_order = ("txt01=Beschreibung","ct_name=Nummer","date_time=Mietzeit","int26=Einsparung","int03=Menge","int02=Preis","int07=Rabatt","int04=Gesamt");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($varenv{orga} eq "dms"){#obsolete after migrating lx-rad and mobile ...
|
||||
print<<EOF
|
||||
|
|
@ -115,49 +119,36 @@ print<<EOF
|
|||
EOF
|
||||
;
|
||||
}
|
||||
#print $q->div({ -class=>"ui-widget"}, $q->label({ -for=>"birds"},"Birds: "),$q->input({ -id=>"birds"},"")),"\n";
|
||||
|
||||
|
||||
print $q->start_table({-class=>'list', -border=>'0', -width=>'100%',-align=>'left', -cellpadding=>'3', -cellspacing=>'0'});
|
||||
|
||||
|
||||
#my $action_sort = "itime";
|
||||
#Parts Header
|
||||
print $q->start_form(-name=>'spartform');
|
||||
print $q->Tr(); $line_count2++;
|
||||
print $q->th($but->singlesubmit("select_part","*"),"\n");
|
||||
foreach (@tpl_order){
|
||||
my ($key,$val) = split /=/,$_;
|
||||
$k++ if($val);
|
||||
if("$key" eq "ct_name"){
|
||||
my $ctpos;
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$c_id");
|
||||
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$node_meta->{tpl_id}");
|
||||
print $q->hidden(-id=>'c_id', -name=>"c_id", -override=>'1');
|
||||
print $q->hidden(-id=>'spart_ct_name', -name=>"spart_ct_name", -override=>'1');
|
||||
print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer'),"");
|
||||
}
|
||||
if($key =~ /int03/){
|
||||
print $q->th("$val");
|
||||
}elsif($key =~ /int|txt03/){
|
||||
print $q->th("$val");
|
||||
}elsif($key =~ /txt01/){
|
||||
|
||||
my $cal_button = "";
|
||||
my $ter_button = "";
|
||||
my $war_button = "";
|
||||
print $q->th("Beschreibung"),"\n";
|
||||
|
||||
}elsif($key =~ /txt/){
|
||||
print $q->th("$val");
|
||||
}
|
||||
}
|
||||
|
||||
$c_idpos = $1 if($return && $return =~ /pos_id=(\d+)/);
|
||||
print $q->hidden(-name=>'trans2edit', -value=>"transpos", -override=>'1');
|
||||
print $q->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset);
|
||||
print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit") if($R::limit);
|
||||
print $q->hidden(-name=>'relids', -override=>'1', -value=>"$R::relids") if($R::relids);
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$rel4tpl->{content_id}");
|
||||
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$node_meta->{tpl_id}");
|
||||
print $q->hidden(-id=>'c_id', -name=>"c_id", -override=>'1');
|
||||
print $q->hidden(-id=>'spart_ct_name', -name=>"spart_ct_name", -override=>'1');
|
||||
|
||||
$line_count2++;
|
||||
print $q->Tr();
|
||||
print $q->th($but->singlesubmit("select_part","*"),"\n");
|
||||
foreach (@tpl_order){
|
||||
my ($key,$val) = split /=/,$_;
|
||||
$k++ if($val);
|
||||
if($key eq "ct_name"){
|
||||
print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer'),"");
|
||||
}elsif($key =~ /int|txt/){
|
||||
print $q->th("$val");
|
||||
}
|
||||
}
|
||||
|
||||
print $q->end_form,"\n";
|
||||
|
||||
print $q->start_form(-name=>'transposform'),"\n";
|
||||
|
|
@ -169,7 +160,8 @@ EOF
|
|||
my $sum_parts7=0;
|
||||
my $sum_parts19=0;
|
||||
my $diff7 = 100 + 7;
|
||||
my $diff19 = 100 + $umst1619;
|
||||
#my $diff19 = 100 + $umst1619;
|
||||
my $diff19 = 100 + 19;
|
||||
my $sum_umst7=0;
|
||||
my $sum_umst19=0;
|
||||
my $i=0;
|
||||
|
|
@ -179,7 +171,6 @@ EOF
|
|||
#foreach my $id (sort { $cttpos->{$b}->{$scol} <=> $cttpos->{$a}->{$scol} } keys(%$cttpos)){
|
||||
foreach my $id (sort { $cttpos->{$b}->{$scol} cmp $cttpos->{$a}->{$scol} } keys(%$cttpos)){
|
||||
my $set_style="";
|
||||
my $gesamt="0";
|
||||
my $occupied_style = "";
|
||||
my $time_style = "";
|
||||
#$occupied_style = "color:#ff1493" if($cttpos->{$id}->{txt10} =~ /occupied|requested|canceled/);
|
||||
|
|
@ -202,44 +193,13 @@ EOF
|
|||
$line_count2++;
|
||||
#$line_count2 += scalar(@line_txt01);
|
||||
}
|
||||
my ($s_date,$s_dd,$s_mo,$s_yy,$s_hh,$s_mi,$e_date,$e_yy,$e_mo,$e_dd,$e_hh,$e_mi);
|
||||
my $einzel = $cttpos->{$id}->{int02};
|
||||
my $menge = $cttpos->{$id}->{int03} || 0;
|
||||
|
||||
#Make date and time
|
||||
if($cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
|
||||
($s_yy,$s_mo,$s_dd,$s_hh,$s_mi) = $lb->split_date($cttpos->{$id}->{start_time});
|
||||
($e_yy,$e_mo,$e_dd,$e_hh,$e_mi) = $lb->split_date($cttpos->{$id}->{end_time});
|
||||
}
|
||||
|
||||
|
||||
my $dt1 = DateTime->new(year => 2018, month => 3, day => 20);
|
||||
my $dt0 = $dt1;
|
||||
my $dt2 = $dt1;
|
||||
$dt0 = DateTime::Format::Pg->parse_datetime($cttpos->{$id}->{start_time}) if($cttpos->{$id}->{start_time});
|
||||
$dt2 = DateTime::Format::Pg->parse_datetime($cttpos->{$id}->{end_time}) if($cttpos->{$id}->{end_time});
|
||||
#if($dt2 < $dt0){
|
||||
#$time_style="color:red;";
|
||||
#}
|
||||
|
||||
if(looks_like_number($einzel) && $einzel != 0 && looks_like_number($menge) && $menge != 0){
|
||||
$gesamt = $einzel * $menge;
|
||||
|
||||
my $rabatt_val = $cttpos->{$id}->{int07} || "";
|
||||
if($rabatt_val != 0){
|
||||
my $rabatt_eur = $rabatt_val;
|
||||
$rabatt_eur = $einzel * $menge * $rabatt_val/100 if($cttpos->{$id}->{int08} != 1);#wenn int08 != 1 alias €
|
||||
$gesamt = $einzel * $menge - $rabatt_eur;
|
||||
}
|
||||
}
|
||||
|
||||
$gesamt = $lb->round($gesamt);
|
||||
$gesamt = $lb->cashme($gesamt);
|
||||
if($cttpos->{$id}->{int05} =~ /\d/){
|
||||
$sum_parts19 += $gesamt;
|
||||
}else{
|
||||
$sum_parts19 += $gesamt;
|
||||
}
|
||||
my $gesamt = 0;
|
||||
my $rabatt = "";
|
||||
($gesamt,$rabatt) = $pri->price2calc($cttpos->{$id});
|
||||
$sum_parts19 += $gesamt;
|
||||
$gesamt = $lb->round($gesamt);
|
||||
$gesamt = $lb->cashme($gesamt,",");
|
||||
|
||||
#1. Spalte
|
||||
print $q->Tr(),"\n";
|
||||
|
|
@ -247,12 +207,12 @@ EOF
|
|||
if(($c_idpos == $cttpos->{$id}->{c_id}) && ($R::trans2edit && $R::trans2edit =~ /transpos/)){
|
||||
print $q->hidden(-name=>'c_idpos', -value=>"$cttpos->{$id}->{c_id}", -override=>'1');
|
||||
print $q->hidden(-name=>'cc_id', -value=>"$cttpos->{$id}->{cc_id}", -override=>'1');
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$c_id");
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$rel4tpl->{content_id}");
|
||||
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$node_meta->{tpl_id}");
|
||||
print $but->singlesubmit2("ct_trans","save_pos","$ib{save_pos}","","ebutton5"),
|
||||
$but->singlesubmit2("ct_trans","delete_pos","$ib{delete_pos}"),"\n";
|
||||
}elsif(!$ctt->{close_time}){
|
||||
print $q->a({-class=>"editnav",-href=>"/DMS/Faktura?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$c_id\&tpl_id4trans=$node_meta->{tpl_id}\&owner=$users_dms->{u_id}",-title=>"Datensatz bearbeiten"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-151-edit.png"})),"\n";
|
||||
print $q->a({-class=>"editnav",-href=>"/DMS/Faktura?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$rel4tpl->{content_id}\&tpl_id4trans=$node_meta->{tpl_id}\&owner=$users_dms->{u_id}",-title=>"Datensatz bearbeiten"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-151-edit.png"})),"\n";
|
||||
}
|
||||
my $calpath = "Mietjournal";
|
||||
print $q->a({-class=>"linknav3", -style=>"background-color:$varenv{calendar_active_color}",-href=>"/DMS/$calpath/?cttpos_id=$cttpos->{$id}->{c_id}",-title=>"Im $calpath öffnen"},"<br /><br />ID $cttpos->{$id}->{c_id}"),"\n";
|
||||
|
|
@ -274,10 +234,26 @@ EOF
|
|||
if(($c_idpos == $cttpos->{$id}->{c_id}) && ($R::trans2edit && $R::trans2edit =~ /transpos/)){
|
||||
if($key =~ /ct_name/){
|
||||
print $q->td({-class=>'element',-style=>"$set_style text-align:right;"}, $q->textfield(-class=>'etxt',-style=>"text-align:right;min-width:120px;",-name=>"ct_name",-default=>"$ct_pos", -override=>'1',-size=>10,-readonly=>'1'),"\n");
|
||||
}elsif($key eq "int26"){
|
||||
my $co2saving = "";
|
||||
if($cttpos->{$id}->{int26}){
|
||||
$co2saving = "Einsparung</br>";
|
||||
my $co2diff = $pri->co2calc($cttpos->{$id});
|
||||
my $sprit_price = $pri->sprit2calc($cttpos->{$id});
|
||||
$co2saving .= "$co2diff kg CO²<br />";
|
||||
$co2saving .= "$sprit_price EUR<br />";
|
||||
$cttpos->{$id}->{int26} =~ s/\./,/;
|
||||
$co2saving .= "bei $cttpos->{$id}->{int26} KM";
|
||||
}
|
||||
print $q->td({-class=>'tdint'},"$co2saving");
|
||||
|
||||
}elsif($key =~ /int03/){
|
||||
print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$menge", -override=>'1',-size=>"$isize",-maxlength=>10, -autofocus=>1),"\n");
|
||||
#TODO, autocalc Menge Preis by time-range
|
||||
#Menge
|
||||
print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>10, -autofocus=>1),"\n");
|
||||
}elsif($key =~ /int02/){
|
||||
print $q->td({-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$einzel", -override=>'1',-size=>"$isize",-maxlength=>100),"\n");
|
||||
#Einzelpreis
|
||||
print $q->td({-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>100),"\n");
|
||||
}elsif($key =~ /int07/){
|
||||
print $q->td({-class=>'element',-style=>"$txtstyle $set_style",-nowrap=>'1'},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>100),$but->selector("int08","40px","$cttpos->{$id}->{int08}",("0.00:%","1.00:€"))),"\n";
|
||||
}elsif($key =~ /int04/){
|
||||
|
|
@ -286,6 +262,10 @@ EOF
|
|||
if($cttpos->{$id}->{int09} && $cttpos->{$id}->{$key} !~ /Manuell/){
|
||||
$cttpos->{$id}->{$key} .= "\nManuell bearbeitet\n";
|
||||
}
|
||||
|
||||
my ($s_yy,$s_mo,$s_dd,$s_hh,$s_mi) = $lb->split_date($cttpos->{$id}->{start_time});
|
||||
my ($e_yy,$e_mo,$e_dd,$e_hh,$e_mi) = $lb->split_date($cttpos->{$id}->{end_time});
|
||||
|
||||
print "<td class='element' style='$txtstyle $set_style;background-color: #ededed;$occupied_style;'\n>";
|
||||
print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;background-color: #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"1",-cols=>65),"<br />\n";
|
||||
|
||||
|
|
@ -325,17 +305,28 @@ EOF
|
|||
}else{
|
||||
print $q->td({-class=>'tdint'},"$article"),"\n";
|
||||
}
|
||||
}elsif($key eq "int26"){
|
||||
my $co2saving = "";
|
||||
if($cttpos->{$id}->{int26}){
|
||||
$co2saving = "Einsparung</br>";
|
||||
my $co2diff = $pri->co2calc($cttpos->{$id});
|
||||
my $sprit_price = $pri->sprit2calc($cttpos->{$id});
|
||||
$co2saving .= "$co2diff kg CO²<br />";
|
||||
$co2saving .= "$sprit_price EUR<br />";
|
||||
$cttpos->{$id}->{int26} =~ s/\./,/;
|
||||
$co2saving .= "bei $cttpos->{$id}->{int26} KM";
|
||||
}
|
||||
print $q->td({-class=>'tdint'},"$co2saving");
|
||||
|
||||
}elsif($key =~ /int02/){
|
||||
$einzel =~ s/\./,/;
|
||||
print $q->td({-class=>'tdint'},"$einzel"),"\n";
|
||||
$cttpos->{$id}->{$key} =~ s/\./,/;
|
||||
print $q->td({-class=>'tdint'},"$cttpos->{$id}->{$key}"),"\n";
|
||||
}elsif($key =~ /int03/){
|
||||
$menge =~ s/\./,/;
|
||||
print $q->td({-colspan=>'1',-class=>'tdint'},"$menge"),"\n";
|
||||
$cttpos->{$id}->{$key} =~ s/\./,/;
|
||||
print $q->td({-colspan=>'1',-class=>'tdint'},"$cttpos->{$id}->{$key}"),"\n";
|
||||
}elsif($key =~ /int04/){
|
||||
$gesamt =~ s/\./,/;
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"$gesamt €"),"\n";
|
||||
}elsif($key =~ /int02/){
|
||||
print $q->td({-class=>'tdint'},"$einzel"),"\n";
|
||||
}elsif($key =~ /int07/){
|
||||
my $proz="";
|
||||
$proz = "%" if($cttpos->{$id}->{$key} && $cttpos->{$id}->{$key} != 0);
|
||||
|
|
@ -380,9 +371,11 @@ EOF
|
|||
if($cttpos->{$id}->{int06} || $cttpos->{$id}->{int04}){
|
||||
print $q->span("Start/End Station: $cttpos->{$id}->{int06} / $cttpos->{$id}->{int04}, GPS: $cttpos->{$id}->{txt06}"),"\n";
|
||||
}
|
||||
if($cttpos->{$id}->{start_time}){
|
||||
if($cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
|
||||
$cttpos->{$id}->{start_time} = $lb->time4de($cttpos->{$id}->{start_time},"1");
|
||||
$cttpos->{$id}->{end_time} = $lb->time4de($cttpos->{$id}->{end_time},"1");
|
||||
print "<br />\n";
|
||||
print $q->span({-style=>"$time_style"}, "Mietzeit: $s_dd.$s_mo.$s_yy $s_hh:$s_mi – $e_dd.$e_mo.$e_yy $e_hh:$e_mi"),"\n";
|
||||
print $q->span({-style=>"$time_style"}, "Mietzeit: $cttpos->{$id}->{start_time} – $cttpos->{$id}->{end_time}"),"\n";
|
||||
}
|
||||
print "</td>\n";
|
||||
}elsif($key =~ /txt/){
|
||||
|
|
@ -400,7 +393,8 @@ EOF
|
|||
$sum_umst7 = $lb->round($sum_umst7);
|
||||
}
|
||||
if($sum_parts19 != "0"){
|
||||
$sum_umst19 = $sum_parts19 / $diff19 * $umst1619;
|
||||
#$sum_umst19 = $sum_parts19 / $diff19 * $umst1619;
|
||||
$sum_umst19 = $sum_parts19 / $diff19 * 19;
|
||||
$sum_umst19 = $lb->round($sum_umst19);
|
||||
}
|
||||
my $sum_netto7 = $sum_parts7 - $sum_umst7;
|
||||
|
|
@ -449,7 +443,7 @@ EOF
|
|||
print $q->Tr("\n");
|
||||
print $q->td(" ");
|
||||
|
||||
if($node_name !~ /steuerfrei/){
|
||||
if($node_meta->{node_name} !~ /steuerfrei/){
|
||||
print $q->Tr("\n"); $line_count2++;
|
||||
print $q->td({-class=>'tdint'},"Nettobetrag:");
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_nettoall €");
|
||||
|
|
@ -466,7 +460,8 @@ EOF
|
|||
}
|
||||
if($sum_netto19 != "0"){
|
||||
print $q->Tr("\n");$line_count2++;
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"$umst1619% UmSt auf $sum_netto19 €:");
|
||||
#print $q->td({-class=>'tdint',-nowrap=>"1"},"$umst1619% UmSt auf $sum_netto19 €:");
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"19% UmSt auf $sum_netto19 €:");
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_umst19 €");
|
||||
}
|
||||
}
|
||||
|
|
@ -483,13 +478,13 @@ EOF
|
|||
|
||||
print $q->hidden(-name=>'owner', -override=>'1', -value=>"$users_dms->{u_id}");
|
||||
print $q->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset);
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$c_id");
|
||||
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$rel4tpl->{content_id}");
|
||||
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$node_meta->{tpl_id}");
|
||||
print $q->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset);
|
||||
print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit") if($R::limit);
|
||||
print $q->hidden(-name=>'relids', -override=>'1', -value=>"$R::relids") if($R::relids);
|
||||
|
||||
$set_main_id=$main_id if($main_id && $main_id > "300000");
|
||||
$set_main_id=$rel4tpl->{main_id} if($rel4tpl->{main_id} && $rel4tpl->{main_id} > "300000");
|
||||
print $q->hidden(-name=>'set_main_id', -value=>"$set_main_id", -override=>'1');
|
||||
|
||||
|
||||
|
|
@ -560,8 +555,8 @@ EOF
|
|||
print $q->div({-style=>"clear:both;padding:0.5em;font-size:0.81em;width:98%;text-align:right;color:green;"}, "Payone SEPA-Lastschrifteinzug war erfolgreich"),"\n";
|
||||
}
|
||||
|
||||
$db->updater("contenttrans","c_id","$c_id","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end);
|
||||
$db->updater("contenttrans","c_id","$c_id","int15","$sum_preauth","","","","","no_time") if($sum_preauth || $sum_preauth == 0);
|
||||
$db->updater("contenttrans","c_id","$rel4tpl->{content_id}","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end);
|
||||
$db->updater("contenttrans","c_id","$rel4tpl->{content_id}","int15","$sum_preauth","","","","","no_time") if($sum_preauth || $sum_preauth == 0);
|
||||
return "$line_count2";
|
||||
}
|
||||
1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue