projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bei PDF-Reports nur die Spalten anzeigen, die für PDF konfiguriert wurden
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
df47076
..
fe3e443
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-54,7
+54,7
@@
sub post_transaction {
my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
- delete $form->{currency} unless $form->{default
_
currency};
+ delete $form->{currency} unless $form->{defaultcurrency};
# set exchangerate
$form->{exchangerate} = ($form->{currency} eq $form->{defaultcurrency}) ? 1 :
# set exchangerate
$form->{exchangerate} = ($form->{currency} eq $form->{defaultcurrency}) ? 1 :
@@
-349,7
+349,7
@@
sub post_payment {
$form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
$form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
- delete $form->{currency} unless $form->{default
_
currency};
+ delete $form->{currency} unless $form->{defaultcurrency};
# Get the AR accno (which is normally done by Form::create_links()).
$query =
# Get the AR accno (which is normally done by Form::create_links()).
$query =
@@
-435,7
+435,8
@@
sub ar_transactions {
qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
qq|LEFT JOIN tax_zones tz ON (tz.id = c.taxzone_id)| .
qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
qq|LEFT JOIN tax_zones tz ON (tz.id = c.taxzone_id)| .
- qq|LEFT JOIN payment_terms pt ON (pt.id = c.payment_id)|;
+ qq|LEFT JOIN payment_terms pt ON (pt.id = c.payment_id)| .
+ qq|LEFT JOIN department d ON (d.id = a.department_id)|;
my $where = "1 = 1";
if ($form->{customer_id}) {
my $where = "1 = 1";
if ($form->{customer_id}) {
@@
-445,11
+446,16
@@
sub ar_transactions {
$where .= " AND c.name ILIKE ?";
push(@values, $form->like($form->{customer}));
}
$where .= " AND c.name ILIKE ?";
push(@values, $form->like($form->{customer}));
}
- if ($form->{department}) {
- my
($null, $department_id) = split /--/, $form->{department
};
+ if ($form->{department
_id
}) {
+ my
$department_id = $form->{department_id
};
$where .= " AND a.department_id = ?";
push(@values, $department_id);
}
$where .= " AND a.department_id = ?";
push(@values, $department_id);
}
+ if ($form->{department}) {
+ my $department = "%" . $form->{department} . "%";
+ $where .= " AND d.description ILIKE ?";
+ push(@values, $department);
+ }
foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
if ($form->{$column}) {
$where .= " AND a.$column ILIKE ?";
foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
if ($form->{$column}) {
$where .= " AND a.$column ILIKE ?";