diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm
index af1715b..a7bb740 100755
--- a/copri4/main/src/Mod/APIfunc.pm
+++ b/copri4/main/src/Mod/APIfunc.pm
@@ -1169,7 +1169,7 @@ sub booking_update(){
}
$booking_values->{geo_distance} = "$geo_distance_next";
#print "$geo_debug\n";
- $bw->log("locked GEOfencing geo_debug:$geo_debug",$q,"");
+ $bw->log("locked GEOfencing geo_debug:$geo_debug",$booking_values->{geo_distance},"");
}
######## end locke GPS
diff --git a/copri4/main/src/Mod/Buttons.pm b/copri4/main/src/Mod/Buttons.pm
index a841dca..2fa31bb 100755
--- a/copri4/main/src/Mod/Buttons.pm
+++ b/copri4/main/src/Mod/Buttons.pm
@@ -718,30 +718,19 @@ sub singlesubmit2(){
my $self = shift;
my ($function,$b_name,$title,$set_style,$jscript) = @_;
my $b_img; my $a_key;
- $b_img = "submit.png" if("$b_name" =~ /post_email/);
- $b_img = "actions/view-barcode.png" if("$b_name" =~ /barcode/);
- $b_img = "actions/edit-copy.png" if("$b_name" =~ /copy|relate/);
- $b_img = "actions/edit-paste.png" if("$b_name" =~ /move_/);
- $b_img = "actions/archive-remove.png" if("$b_name" =~ /delete|remove/);
- $b_img = "actions/edit-delete.png" if("$b_name" =~ /delete_media/);
- $b_img = "actions/document-save.png" if("$b_name" =~ /save/);
+ $b_img = "glyphicons-446-floppy-remove.png" if("$b_name" =~ /delete|remove/);
+ $b_img = "glyphicons-445-floppy-saved.png" if("$b_name" =~ /save/);
$a_key = "y" if("$b_name" =~ /save/);
- $b_img = "edittrash.png" if("$b_name" =~ /delete_all/);
- $b_img = "search.png" if("$b_name" =~ /search/);
- $b_img = "actions/document-new.png" if("$b_name" =~ /new/);
- $b_img = "actions/document-properties.png" if("$b_name" =~ /open|client/);
- $b_img = "fileclose.png" if("$b_name" eq "close");
- $b_img = "actions/view-media-artist.png" if("$b_name" eq "change_login");
my $button = " ";
if($b_name){
if("$b_name" =~ /delete/ && "$b_name" !~ /delete_verposdate/){
if($jscript){
- $button = "";
+ $button = "";
}else{
- $button = "";
+ $button = "";
}
}else{
- $button = "";
+ $button = "";
}
}
return $button;
diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm
index c041d17..a6bec81 100755
--- a/copri4/main/src/Mod/Indexsharee.pm
+++ b/copri4/main/src/Mod/Indexsharee.pm
@@ -354,14 +354,16 @@ sub handler {
#DMS Faktura
if($node_meta->{ct_table} eq "contenttrans"){
if($users_dms->{int03} == 1 && $R::ct_trans eq "open"){#DMS Faktura read
- $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id});
+ $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id}) if($R::c_id4trans && $R::tpl_id4trans);
}elsif($users_dms->{int03} == 2){#DMS Faktura rw
+ $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id}) if($R::c_id4trans && $R::tpl_id4trans);
$return .= "|";
$return .= $pre->preinit($users_dms,$lang);#transactions logic
}elsif($R::ct_trans){
$return = "failure::Abbruch. Schreibender Zugriff \"Faktura\" verweigert.";
}
}
+ $users_dms = $dbt->select_users($dbh,$users_dms->{u_id},"");#just to get update after save
#none DMS hosts ----------------------------------------------------
}elsif($varenv{orga} ne "dms"){
diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm
index 30b16bd..32d2c2e 100755
--- a/copri4/main/src/Tpl/Address3.pm
+++ b/copri4/main/src/Tpl/Address3.pm
@@ -53,12 +53,11 @@ sub tpl(){
#get Firma
my $ctf = $db->get_content1("contentuser",$dbt->{shareedms_conf}->{parent_id});
my $rel4tpl = { c_id => 0 };
- if($R::c_id4trans && $R::tpl_id4trans && $users_dms->{u_id} > 0){
- $rel4tpl = $db->get_rel4tpl("",$lang,$R::c_id4trans,$R::tpl_id4trans);
- $db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id});
+ if($R::c_id4trans && $node_meta->{tpl_id} && $users_dms->{u_id} > 0){
+ $rel4tpl = $db->get_rel4tpl("",$lang,$R::c_id4trans,$node_meta->{tpl_id});
}
my @tpl_order = split /,/,$rel4tpl->{tpl_order};
- my $node = $db->get_node4multi($rel4tpl->{main_id},$lang) if($rel4tpl->{main_id});
+ my $node = $db->get_node4multi($node_meta->{main_id},$lang) if($node_meta->{main_id});
if(!$node->{main_id} && $users->{owner}){
$db->update_users4trans("0","0",$R::kind_of_trans,$users_dms->{u_id});
$users = $db->select_users($u_id);
@@ -67,7 +66,8 @@ sub tpl(){
if($u_id && $R::trans2edit && $R::c_id4trans){
$db->users_up("c_id4edit","$R::c_id4trans","$users->{owner}");
}
- my $ctx = $db->get_content1("contenttrans",$R::c_id4trans);
+ my $ctx = { c_id => 0 };
+ $ctx = $db->get_content1("contenttrans",$R::c_id4trans);
my $c_idadr = $ctx->{int10};#c_id orig from contentadr
my $ctadr = $db->get_content1("contentadr",$c_idadr);
my $rel_adr = $db->get_rel4tpl("","$lang","$c_idadr","202");
@@ -127,7 +127,7 @@ EOF
}
print "\n\n";
- if(!$R::c_id4trans || !$R::tpl_id4trans){
+ if(!$ctx->{c_id}){
$lb->failure3("Das Formular wurde gelöscht bzw. ist nicht vorhanden");
}
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index e0d5cf9..3d6ea8d 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -136,6 +136,7 @@ EOF
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'),"");
@@ -260,10 +261,11 @@ EOF
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=>'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=>"$tpath?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$c_id\&owner=$users->{u_id}",-title=>"Datensatz bearbeiten"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-151-edit.png"})),"\n";
+ print $q->a({-class=>"editnav",-href=>"$tpath?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$c_id\&tpl_id4trans=$node_meta->{tpl_id}\&owner=$users->{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=>"$script/$users->{fullurl}/$calpath/?cttpos_id=$cttpos->{$id}->{c_id}",-title=>"Im $calpath öffnen"},"
ID $cttpos->{$id}->{c_id}"),"\n";
@@ -477,6 +479,7 @@ EOF
print $q->hidden(-name=>'owner', -override=>'1', -value=>"$users->{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=>'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);