X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=c8a3ba6d6a32e910cec77597aec74707f4c2abad;hb=6bad0469c4f5bb92830f77cf7675e76730e79ae4;hp=439530ada1f477ab0edbf34a78132d27d7c496fd;hpb=5c3ccca49f076038fe3d48cbd30c8a618ff876fc;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 439530ada..c8a3ba6d6 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -35,7 +35,7 @@ use SL::AP; use SL::IR; use SL::PE; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/drafts.pl"; @@ -79,7 +79,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AP->get_transdate(\%myconfig, $form); @@ -389,7 +389,9 @@ sub form_header { $vendor = ($form->{selectvendor}) - ? qq|| + ? qq|| : qq||; my @old_project_ids = (); @@ -459,12 +461,12 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - {transdate}> $readonly + $readonly text('button') . qq|> |; $button2 = qq| - {duedate}> $readonly + $readonly text('button') . qq|> |; @@ -477,15 +479,16 @@ sub form_header { # without JavaScript Calendar $button1 = - qq|{transdate}> $readonly|; + qq| $readonly|; $button2 = - qq|{duedate}> $readonly|; + qq| $readonly|; } - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +

{script}> @@ -773,12 +776,12 @@ $jsscript |; $column_data{"paid_$i"} = - qq|{"paid_$i"}>|; + qq||; $column_data{"AP_paid_$i"} = qq|${selectAP_paid}|; $column_data{"exchangerate_$i"} = qq|$exchangerate|; $column_data{"datepaid_$i"} = - qq|{"datepaid_$i"}> + qq| |; $column_data{"source_$i"} = qq||; @@ -823,7 +826,6 @@ sub form_footer { -{path}> {login}> {password}> | @@ -846,7 +848,7 @@ sub form_footer { $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); - print qq||; if ($form->{id}) { @@ -1072,6 +1074,7 @@ sub post { if (AP->post_transaction(\%myconfig, \%$form)) { # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "POSTED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1090,6 +1093,7 @@ sub post_as_new { $form->{postasnew} = 1; # saving the history if(!exists $form->{addition} && $form->{id} ne "") { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "POSTED AS NEW"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1154,6 +1158,7 @@ sub yes { if (AP->delete_transaction(\%myconfig, \%$form, $spool)) { # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1205,12 +1210,12 @@ sub search { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; @@ -1223,9 +1228,9 @@ sub search { # without JavaScript Calendar $button1 = qq| - |; + |; $button2 = qq| - |; + |; } $form->get_lists("projects" => { "key" => "ALL_PROJECTS", @@ -1240,11 +1245,12 @@ sub search { my $projectnumber = NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values, '-labels' => \%labels)); - + $form->{javascript} .= qq||; $form->header; - + $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - + {script}> @@ -1359,7 +1365,6 @@ $jsscript
{nextsub}> -{path}> {login}> {password}> @@ -1383,7 +1388,7 @@ sub ap_transactions { AP->ap_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=ap_transactions&login=$form->{login}&password=$form->{password}"; $href = $callback; if ($form->{vendor}) { @@ -1451,9 +1456,11 @@ sub ap_transactions { } @columns = - qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid + qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee globalprojectnumber); + $form->{"l_type"} = "Y"; + foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { push @column_index, $item; @@ -1477,6 +1484,8 @@ sub ap_transactions { qq|| . $locale->text('Date') . qq||; + $column_header{type} = + "" . $locale->text('Type') . ""; $column_header{duedate} = qq|| . $locale->text('Due Date') @@ -1591,13 +1600,17 @@ sub ap_transactions { $subtotaldue += ($ap->{amount} - $ap->{paid}); $column_data{transdate} = "$ap->{transdate} "; + $column_data{type} = "" . + ($ap->{invoice} ? $locale->text("Invoice (one letter abbreviation)") : + $locale->text("AP Transaction (abbreviation)")) + . ""; $column_data{duedate} = "$ap->{duedate} "; $column_data{datepaid} = "$ap->{datepaid} "; $module = ($ap->{invoice}) ? "ir.pl" : $form->{script}; $column_data{invnumber} = - qq|$ap->{invnumber}|; + qq|$ap->{invnumber}|; $column_data{id} = "$ap->{id}"; $column_data{ordnumber} = "$ap->{ordnumber} "; $column_data{name} = "$ap->{name}"; @@ -1666,7 +1679,6 @@ sub ap_transactions { -{path}> {login}> {password}>