roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-14 07:36:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Faktura Address edit

Browse source
This commit is contained in:
Rainer Gümpelein 2022-03-18 14:51:25 +01:00
parent 6a99d40224
commit 41ba9e252e
8 changed files with 46 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

7
copri4/main/src/Mod/APIpayone.pm
View file

@ -86,6 +86,7 @@ sub handler {
int14 => 0,#OPOS
int16 => 0,#balance
int18 => 0,#sequencenumber
int19 => 0,#receivable
};
my $operator_prefix = "";
@ -113,6 +114,7 @@ sub handler {
}
$update_ctt->{int16} = $val if($_ eq "balance");
$update_ctt->{int18} = $val if($_ eq "sequencenumber");
$update_ctt->{int19} = $val if($_ eq "receivable");
#contentadr
$update_adr->{int24} = $val if($_ eq "cardexpiredate");
@ -133,7 +135,7 @@ sub handler {
if($ctt->{c_id} > 0){
#balance > 0 then payment fails
if($update_ctt->{int16} > 0){
if($update_ctt->{int16} && $update_ctt->{int16} > 0){
$update_ctt->{int14} = 1;
$update_ctt->{txt23} = "$now_dt $txaction\nSaldo > 0 Meldung, Rücklastschrift oder Mahnung?\n" . $ctt->{txt23} if($ctt->{txt23} !~ /0 Meldung,/);#only once;
}else{
@ -142,9 +144,10 @@ sub handler {
}
$dbt->update_record($dbh,$update_ctt,$ctt);
print FILE Dumper($update_ctt) . "\n";
#set cardexpiredate
if($update_adr->{int24} > 0 && $ctadr->{c_id} > 0){
if($update_adr->{int24} && $update_adr->{int24} > 0 && $ctadr->{c_id} > 0){
$dbt->update_record($dbh,$update_adr,$ctadr);
}
}

4
copri4/main/src/Mod/Buttons.pm
View file

@ -75,8 +75,8 @@ auswerten',
'print_pdf' => ' PDF ',
'set_relation' => 'Formular',
'set_workflow' => 'Workflow',
'set_workflow2invoice' => 'Rechnung erstellen',
'set_workflow2storno' => 'Storno erstellen',
'set_workflow2invoice' => 'Rechnung generieren',
'set_workflow2storno' => 'Storno generieren',
'relate_content' => 'Content-Menu Relation',
'relate_dialog' => 'Relation herstellen',
'relate_dialog4menu' => 'Relation herstellen',

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

@ -82,11 +82,14 @@ sub set_workflow {
delete $ctt->{int01};
delete $ctt->{int14};
delete $ctt->{int15};
delete $ctt->{int16};
delete $ctt->{int18};
delete $ctt->{txt16};
delete $ctt->{txt12};
delete $ctt->{txt21};
delete $ctt->{txt22};
delete $ctt->{txt23};
delete $ctt->{txt25};
delete $ctt->{txt30};
delete $ctt->{itime};
delete $ctt->{mtime};

43
copri4/main/src/Mod/Prelogic.pm
View file

@ -486,49 +486,6 @@ sub preinit(){
}
#copy ADD ADDRESS from contentadr to contenttrans
my $c_id4trans = $R::c_id4trans || "";#It needs hidden posts. Only implemented in Address and Transact
#TODO
if(1==2 && ($R::ct_trans !~ /print_pdf|print/i) && (($ib_key eq "add_transadr") || $R::ct_trans2c_idadr || $R::set_main_id || $R::set_main_id4workflow)){
$c_id4trans = $users_dms->{c_id4trans} if($ib_key eq "add_transadr" && $users_dms->{c_id4trans});
if(!$c_id4trans){
return "failure::Wohin damit? Für die Zuweisung bitte erst ein Ziel öffnen.";
}
$table = "contenttrans";
my $ctt;
#202=Adressenliste
if(($ib_key eq "add_transadr") || ($R::ct_trans2c_idadr eq "save_contentadr")){
$ctt = $db->get_ctrel("contentadr","",$lang,"",$R::c_idadr,"202");
}else{
my $c_id4copy = $R::c_id4copy || $c_id4trans;
$ctt = $db->get_content1("contenttrans",$c_id4copy);
}
#214=Adressendefinition
my $tpl = $db->get_tpl("214");
my @ct4tpl = split (/,/,$tpl->{tpl_order});
foreach(@ct4tpl){#copy
my ($key,$val) = split /=/,$_;
$ctt->{$key} = "no" if(!$ctt->{$key} && $key =~ /txt/);
$ctt->{$key} = "0" if(!$ctt->{$key} && $key =~ /int/);
if($R::c_idadr > 0){#from contentadr
#print "---> $key";
if($key =~ /int10/){
$u_rows += $db->update_content4change($table,$c_id4trans,"",$R::c_idadr,"int10");
}elsif(($ib_key eq "add_transadr") && ($key =~ /txt09|txt10|txt11|txt12/)){
my $advanced_fields = "no";
}elsif(($R::ct_trans2c_idadr eq "save_contentadr") && ($key =~ /txt10|txt11|txt12/)){#wg.Reparaturobjekt|Rahmen|Freitext
my $advanced_fields = "no";
}else{
$u_rows += $db->update_content4change($table,$c_id4trans,"",$ctt->{$key},$key);
}
}else{
$u_rows += $db->update_content4change($table,$c_id4trans,"",$ctt->{$key},$key);
}
}
$db->update_content4change($table,$c_id4trans,"",$users_dms->{u_id},"owner");
}
###
#delete ask
if("$ib_key" eq "remove_chk4rel" && $R::main_id && $R::c_id && $R::template_id && $R::rel_id){
my $rel4nd = $db->collect_rel4nodes("",$R::c_id,$R::template_id);