projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Buchungen wurden nicht korrekt angezeigt, wenn gleiche Referenz aber unterschiedliche
[kivitendo-erp.git]
/
bin
/
mozilla
/
rp.pl
diff --git
a/bin/mozilla/rp.pl
b/bin/mozilla/rp.pl
index
c311784
..
da1a265
100644
(file)
--- a/
bin/mozilla/rp.pl
+++ b/
bin/mozilla/rp.pl
@@
-35,12
+35,13
@@
#
#======================================================================
#
#======================================================================
-require "
$form->{path}
/arap.pl";
+require "
bin/mozilla
/arap.pl";
require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
use SL::USTVA;
require "bin/mozilla/common.pl";
use SL::PE;
use SL::RP;
use SL::USTVA;
+use SL::Iconv;
1;
1;
@@
-110,9
+111,7
@@
sub report {
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
$accrual = ($eur) ? "" : "checked";
$cash = ($eur) ? "checked" : "";
- ($null, $null, $null, $null, $null, $year, $null, $null, $null) =
- localtime();
- $year += 1900;
+ $year = (localtime)[5] + 1900;
# get departments
$form->all_departments(\%myconfig);
# get departments
$form->all_departments(\%myconfig);
@@
-148,7
+147,7
@@
sub report {
'-labels' => \%project_labels));
# use JavaScript Calendar or not
'-labels' => \%project_labels));
# use JavaScript Calendar or not
- $form->{jsscript} =
$jscalendar
;
+ $form->{jsscript} =
1
;
$jsscript = "";
if ($form->{report} eq "ustva") {
$department = "";
$jsscript = "";
if ($form->{report} eq "ustva") {
$department = "";
@@
-978,7
+977,6
@@
$jsscript
</table>
<br>
</table>
<br>
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-1356,7
+1354,7
@@
sub list_accounts {
$description = $form->escape($ref->{description});
$href =
$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}&accno=$ref->{accno}&description=$description|;
+ qq|ca.pl?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;
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
@@
-1524,7
+1522,7
@@
sub generate_ar_aging {
$form->{arap} = "ar";
$form->{callback} =
$form->{arap} = "ar";
$form->{callback} =
- qq|$form->{script}?
path=$form->{path}&
action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|;
+ qq|$form->{script}?action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|;
RP->aging(\%myconfig, \%$form);
&aging;
RP->aging(\%myconfig, \%$form);
&aging;
@@
-1544,7
+1542,7
@@
sub generate_ap_aging {
$form->{arap} = "ap";
$form->{callback} =
$form->{arap} = "ap";
$form->{callback} =
- qq|$form->{script}?
path=$form->{path}&
action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|;
+ qq|$form->{script}?action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|;
RP->aging(\%myconfig, \%$form);
&aging;
RP->aging(\%myconfig, \%$form);
&aging;
@@
-1709,7
+1707,7
@@
sub aging {
$ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : "";
$href =
$ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : "";
$href =
- qq|$ref->{module}.pl?
path=$form->{path}&
action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
+ qq|$ref->{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
. $form->escape($form->{callback});
$column_data{invnumber} = qq|<td><a href=$href>$ref->{invnumber}</a></td>|;
. $form->escape($form->{callback});
$column_data{invnumber} = qq|<td><a href=$href>$ref->{invnumber}</a></td>|;
@@
-1808,7
+1806,6
@@
sub aging {
<input type=hidden name=department value="$form->{department}">
<input type=hidden name=department value="$form->{department}">
-<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
@@
-1950,8
+1947,6
@@
sub e_mail {
sub send_email {
$lxdebug->enter_sub();
sub send_email {
$lxdebug->enter_sub();
- $form->{OUT} = "$sendmail";
-
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
$form->{subject} = $locale->text('Statement') . qq| - $form->{todate}|
unless $form->{subject};
@@
-1959,10
+1954,10
@@
sub send_email {
$form->{"statement_1"} = 1;
$form->{"statement_1"} = 1;
- &print_form;
+ $form->{media} = 'email';
+ print_form();
- $form->redirect(
- $locale->text('Statement sent to') . " $form->{$form->{ct}}");
+ $form->redirect($locale->text('Statement sent to') . " $form->{$form->{ct}}");
$lxdebug->leave_sub();
}
$lxdebug->leave_sub();
}
@@
-1986,7
+1981,6
@@
sub print {
$form->error($locale->text('Nothing selected!')) unless $selected;
if ($form->{media} eq 'printer') {
$form->error($locale->text('Nothing selected!')) unless $selected;
if ($form->{media} eq 'printer') {
- $form->{OUT} = "| $myconfig{printer}";
$form->{"$form->{ct}_id"} = "";
} else {
$form->{"statement_1"} = 1;
$form->{"$form->{ct}_id"} = "";
} else {
$form->{"statement_1"} = 1;
@@
-1994,7
+1988,7
@@
sub print {
RP->aging(\%myconfig, \%$form);
RP->aging(\%myconfig, \%$form);
-
&print_form
;
+
print_form()
;
$form->redirect($locale->text('Statements sent to printer!'))
if ($form->{media} eq 'printer');
$form->redirect($locale->text('Statements sent to printer!'))
if ($form->{media} eq 'printer');
@@
-2013,6
+2007,11
@@
sub print_form {
" " => "_"
);
" " => "_"
);
+ foreach my $key (keys %replacements) {
+ my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
+ $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
+ }
+
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
@@
-2029,8
+2028,10
@@
sub print_form {
$attachment_suffix = "pdf";
}
$attachment_suffix = "pdf";
}
- $form->{IN} = "$form->{type}.$suffix";
-
+ $form->{IN} = "$form->{type}.$suffix";
+ $form->{OUT} =
+ $form->{media} eq 'email' ? $sendmail :
+ $form->{media} eq 'printer' ? "| $myconfig{printer}" : "";
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};
# Save $form->{email} because it will be overwritten.
$form->{EMAIL_RECIPIENT} = $form->{email};
@@
-2145,13
+2146,13
@@
sub generate_tax_report {
# construct href
$href =
# construct href
$href =
- "$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->{script}?&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}";
# construct callback
$description = $form->escape($form->{$descvar}, 1);
$department = $form->escape($form->{department}, 1);
$callback =
# construct callback
$description = $form->escape($form->{$descvar}, 1);
$department = $form->escape($form->{department}, 1);
$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->{script}?&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}";
$title = $form->escape($form->{title});
$href .= "&title=$title";
$title = $form->escape($form->{title});
$href .= "&title=$title";
@@
-2290,7
+2291,7
@@
sub generate_tax_report {
$column_data{id} = qq|<td>$ref->{id}</td>|;
$column_data{invnumber} =
$column_data{id} = qq|<td>$ref->{id}</td>|;
$column_data{invnumber} =
- qq|<td><a href=$module?
path=$form->{path}&
action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
+ qq|<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|;
$column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
$column_data{name} = qq|<td>$ref->{name} </td>|;
$column_data{transdate} = qq|<td>$ref->{transdate}</td>|;
$column_data{name} = qq|<td>$ref->{name} </td>|;
@@
-2410,7
+2411,7
@@
sub list_payments {
$memo = $form->escape($form->{memo});
$href =
$memo = $form->escape($form->{memo});
$href =
- "$form->{script}?
path=$form->{path}&
action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo";
+ "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo";
# construct callback
$account = $form->escape($form->{account}, 1);
# construct callback
$account = $form->escape($form->{account}, 1);
@@
-2421,7
+2422,7
@@
sub list_payments {
$memo = $form->escape($form->{memo}, 1);
$form->{callback} =
$memo = $form->escape($form->{memo}, 1);
$form->{callback} =
- "$form->{script}?
path=$form->{path}&
action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}";
+ "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}";
$callback = $form->escape($form->{callback});
$column_header{name} =
$callback = $form->escape($form->{callback});
$column_header{name} =
@@
-2505,7
+2506,7
@@
sub list_payments {
$module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
$href =
$module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap');
$href =
- qq|${module}.pl?
path=$form->{path}&
action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
+ qq|${module}.pl?action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|;
$column_data{name} = "<td>$payment->{name} </td>";
$column_data{reference} =
$column_data{name} = "<td>$payment->{name} </td>";
$column_data{reference} =