X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=a496faa9114ee88ffcfc69aa5d0d565a7fb5edc9;hb=644c68bae03521cec693800af0a19b9ab4e0ed9c;hp=fef3355b56429a467567fa5435fa9dc05c1ccba5;hpb=30531673553bc83a944806586bd4226cd6ec336c;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index fef3355b5..a496faa91 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -36,6 +36,7 @@ #====================================================================== require "$form->{path}/arap.pl"; +require "bin/mozilla/common.pl"; use SL::PE; use SL::RP; @@ -130,6 +131,21 @@ sub report { | if $form->{selectdepartment}; + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }); + + my %project_labels = (); + my @project_values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@project_values, $item->{"id"}); + $project_labels{$item->{"id"}} = $item->{"projectnumber"}; + } + + my $projectnumber = + NTI($cgi->popup_menu('-name' => "project_id", + '-values' => \@project_values, + '-labels' => \%project_labels)); + # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; $jsscript = ""; @@ -280,7 +296,7 @@ $jsscript print qq| | . $locale->text('Project') . qq| - + $projectnumber @@ -390,7 +406,7 @@ $jsscript print qq| | . $locale->text('Project') . qq| - + $projectnumber @@ -687,8 +703,6 @@ $jsscript } if ($form->{report} =~ /^tax_/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap"; RP->get_taxaccounts(\%myconfig, \%$form); @@ -725,32 +739,6 @@ $jsscript -|; - - if (@{ $form->{gifi_taxaccounts} }) { - print qq| - - | . $locale->text('GIFI') . qq| - -|; - - foreach $ref (@{ $form->{gifi_taxaccounts} }) { - - print - qq| $ref->{description} - - - |; - - } - - print qq| - - -|; - } - - print qq| | . $locale->text('Method') . qq| | @@ -807,8 +795,6 @@ $jsscript } if ($form->{report} =~ /^nontaxable_/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap"; print qq| @@ -872,8 +858,6 @@ $jsscript } if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) { - $gifi = ""; - if ($form->{report} eq 'ar_aging') { $label = $locale->text('Customer'); $form->{vc} = 'customer'; @@ -922,8 +906,6 @@ $jsscript # above action can be removed if there is more than one input field if ($form->{report} =~ /(receipts|payments)$/) { - $gifi = ""; - $form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar"; RP->paymentaccounts(\%myconfig, \%$form); @@ -1062,10 +1044,6 @@ sub generate_income_statement { $form->{endbold} = ""; $form->{br} = "
"; - &get_project(generate_income_statement); - - $form->{projectnumber} = $form->{projectnumber_1}; - if ($form->{reporttype} eq "custom") { #forgotten the year --> thisyear @@ -1346,11 +1324,6 @@ sub list_accounts { $column_header{endbalance} = qq|| . $locale->text('Balance') . qq||; - if ($form->{accounttype} eq 'gifi') { - $column_header{accno} = - qq|| . $locale->text('GIFI') . qq||; - } - $form->header; print qq| @@ -1381,15 +1354,7 @@ sub list_accounts { $description = $form->escape($ref->{description}); $href = - qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|; - - if ($form->{accounttype} eq 'gifi') { - $href .= "&gifi_accno=$ref->{accno}&gifi_description=$description"; - $na = $locale->text('N/A'); - map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno}; - } else { - $href .= "&accno=$ref->{accno}&description=$description"; - } + qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description"; $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; @@ -2114,7 +2079,13 @@ sub print_form { } } } - + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "PRINTED"; + $form->{what_done} = $form->{type}; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $lxdebug->leave_sub(); } @@ -2149,12 +2120,6 @@ sub generate_tax_report { $description = $form->escape($form->{$descvar}); $ratevar = "$form->{accno}_rate"; - if ($form->{accno} =~ /^gifi_/) { - $descvar = "gifi_$form->{accno}_description"; - $description = $form->escape($form->{$descvar}); - $ratevar = "gifi_$form->{accno}_rate"; - } - $department = $form->escape($form->{department}); # construct href @@ -2167,9 +2132,6 @@ sub generate_tax_report { $callback = "$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; - $form->{title} = $locale->text('GIFI') . " - " - if ($form->{accno} =~ /^gifi_/); - $title = $form->escape($form->{title}); $href .= "&title=$title"; $title = $form->escape($form->{title}, 1); @@ -2714,8 +2676,6 @@ sub generate_bwa { $form->{endbold} = ""; $form->{br} = "
"; - # &get_project(generate_bwa); - if ($form->{reporttype} eq "custom") { #forgotten the year --> thisyear