\n";
if(!$ctx->{c_id}){
@@ -115,7 +106,8 @@ EOF
#######Verkauf Header
print $q->start_form(),"\n";
- print "\n
\n";
+ print $q->hidden(-name=>'printer_id', -override=>'1', -value=>"PDF");
+ print "\n
\n";
#submit Header
my $invoice_time = "";
@@ -134,34 +126,31 @@ EOF
}
$set_main_id=$main_id if($rel4tpl->{main_id} > "300000");
- if(!$ctx->{close_time} && ($ctx->{txt00} !~ /Storno/)){
- my $ebutton = "ebutton";
- $ebutton = "ebutton4" if($ctx->{ct_name} !~ /\d+/ && $R::trans2edit ne "client");
- print $but->singlesubmit1("set_relation","set_relation","$ebutton","","Generiert RechnungNr. incl. payone Vorautorisierung (txid)");
- print $but->selector("set_main_id","11em",$set_main_id,@formular_relations);
- }else{
- print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id");
- print $q->span({-style=>'padding:0.05em 3em;background-color:white;border:solid thin gray;'}, "$ctx->{txt00}");
- }
+ print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id");
+ print $q->span({-style=>'margin:0.2em 0.5em 0 0.5em;padding:0.8em 3em;background-color:white;border:solid thin gray;'}, "$ctx->{txt00}");
print $q->b("\# $ctx->{ct_name}");
- print $q->span({-style=>'margin:0 0.2em;'}," | ");
- if($ctx->{ct_name} =~ /\d+/){
- print $but->singlesubmit1("set_workflow","set_workflow");
- print $but->selector("set_main_id4workflow","11em","",@workflow_relations);
- print $q->span({-style=>'margin:0 0.2em;'}," | ");
+ print $q->span({-style=>'margin:0 0.5em;'}," ");
+ if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Storno"){
+ print $but->singlesubmit3("ct_trans","set_workflow2invoice","","","");
+ print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300008");
+ print $q->span({-style=>'margin:0 0.5em;'}," ");
}
- print $but->singlesubmit1("ct_trans","print_pdf");
- print $q->hidden(-name=>'printer_id', -override=>'1', -value=>"PDF");
+ if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Rechnung"){
+ print $but->singlesubmit3("ct_trans","set_workflow2storno","","","");
+ print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300009");
+ print $q->span({-style=>'margin:0 0.5em;'}," ");
+ }
+
if(!$ctt->{int01} || $ctt->{ct_name} =~ /-/){
- print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}," $buchen_users->{txt01} / $invoice_time ", $but->singlesubmit7("ct_trans","remove_chk4rel","$ib{remove_chk4rel}","")),"\n";
+ print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}, $but->singlesubmit3("ct_trans","print_pdf","","","")," $buchen_users->{txt01} / $invoice_time ", $but->singlesubmit7("ct_trans","remove_chk4rel","$ib{remove_chk4rel}","")),"\n";
print $q->hidden(-name=>'c_id', -override=>'1', -value=>"$rel4tpl->{content_id}");
print $q->hidden(-name=>'template_id', -override=>'1', -value=>"$rel4tpl->{template_id}");
print $q->hidden(-name=>'main_id', -override=>'1', -value=>"$rel4tpl->{main_id}");
print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$rel4tpl->{rel_id}");
}else{
- print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}," $buchen_users->{txt01} / $invoice_time "),"\n";
+ print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}, $but->singlesubmit3("ct_trans","print_pdf","","","")," $buchen_users->{txt01} / $invoice_time "),"\n";
}
print "
\n";
@@ -172,7 +161,7 @@ EOF
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=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}");
- print $q->hidden(-name=>'c_id4copy', -override=>'1', -value=>"$ctx->{c_id}");
+ print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$rel4tpl->{template_id}");
print $q->hidden(-name=>'close_time', -override=>'1', -value=>"$ctx->{close_time}");
print $q->end_form,"\n";
@@ -201,7 +190,7 @@ EOF
print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$rel4tpl->{rel_id}"),"\n";
print $q->Tr(),"\n";
print "
";
- print $but->singlesubmit7("ct_trans","save_adr","$ib{save_adr}","","","ebutton4"),"\n";
+ print $but->singlesubmit7("ct_trans","save_adr","$ib{save_adr}","","","ebutton"),"\n";
#print $q->span($q->a({-class=>"ebutton3",-href=>'javascript:history.back()'}, " back "));
print " | \n";
print $q->td({-class=>'tdval',-nowrap=>1}, $but->selector("txt02","60px",$ctt->{txt02},@_anrede)),"\n";
@@ -325,6 +314,9 @@ EOF
print $q->start_form(),"\n";
+ print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}");
+ print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id"),"\n";
+
print "
\n";
print $q->start_table({-class=>'list', -border=>'0', -width=>'100%',-align=>'left', -cellpadding=>'0', -cellspacing=>'0'}),"\n";
@@ -341,8 +333,6 @@ EOF
print $q->Tr(),"\n";
print $q->td({-class=>'tdval4',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt23', -default=>"$ctt->{txt23}", -rows=>6, -columns=>65)),"\n";
- print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}");
- print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id"),"\n";
my $ebutton = "ebutton";
$ebutton = "ebutton4" if($ctx->{ct_name} && $ctx->{ct_name} =~ /\d+/ && !$R::trans2edit && !$ctt->{txt12} && $ctt->{txt21} && $ctt->{txt21} !~ /\,/);
@@ -355,28 +345,6 @@ EOF
}
- #Zahlungstexte
- foreach(@tplf_order){
- my ($key,$des,$size) = split /=/,$_;
- if($key =~ /txt5/ && $ctf->{$key}){
- my @line_txt = split(/\n/,$ctf->{$key});
- $line_count1 += scalar(@line_txt);
- $ctf->{$key} = $q->unescapeHTML("$ctf->{$key}");
- $ctf->{$key} = $lb->newline($ctf->{$key},"","");
- if("$des" =~ /$ctt->{state}/){
- print $q->Tr(),"\n"; $line_count1++;
- if($ctt->{int01} < 0){
- #print $q->td({-class=>'tdval4',-style=>'width:8em;'},"Gutschrift Text"),"\n";
- print $q->td({-class=>'tdval4',-colspan=>2},"$ctf->{txt58}"),"\n";
- }else{
- #print $q->td({-class=>'tdval4',-style=>'width:8em;'},"$des"),"\n";
- print $q->td({-class=>'tdval4',-colspan=>2},"$ctf->{$key}"),"\n";
- }
- }
- }
- }
-
-
$ctt->{txt12} = $q->unescapeHTML($ctt->{txt12}) || "";
print $q->td({-class=>'tdval4',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt12', -default=>"$ctt->{txt12}", -rows=>6, -columns=>65)),"\n";
diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm
index aee2640..0a4719c 100755
--- a/copri4/main/src/Tpl/Liste3.pm
+++ b/copri4/main/src/Tpl/Liste3.pm
@@ -234,7 +234,7 @@ sub tpl(){
#Filter OPOS
if($path =~ /OPOS/){
$R::detail_search="suchen";
- $searchref->{int14}=1;
+ $searchref->{int14} = ">=1";
$R::todo="Filter";
$message .= ">>> Offene Payone Posten (Fehlgeschlagene Geldeinzüge) <<<";
$offset=0;
@@ -463,7 +463,8 @@ sub tpl(){
if($node_meta->{node_name} eq "Faktura"){
if($v_journal && (!$R::detail_search || $R::s_start_mtime && $R::s_start_mtime =~ /letzt/)){
my $xtime = "date \'$today\' + integer \'7\'";#just time
- $last_ab = $db->get_content6("contenttrans","state","Kassenbestand","int09","$dbt->{shareedms_conf}->{parent_id}","int12","$j_exist->{main_id}","close_time","$xtime","");
+ #$last_ab = $db->get_content6("contenttrans","state","Kassenbestand","int09","$dbt->{shareedms_conf}->{parent_id}","int12","$j_exist->{main_id}","close_time","$xtime","");
+ $last_ab = $db->get_content6("contenttrans","state","Kassenbestand","","","","","close_time","$xtime","");
}
#
my $v_journalparts = $v_journal . "_parts";
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index 6d0a46d..433dd4f 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -143,7 +143,7 @@ EOF
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'),"");
+ 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',-autofocus=>1),"");
}elsif($key =~ /int|txt/){
print $q->th("$val");
}
|