projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dateimanagement: anderes colspan bei Bilder berücksichtigen
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
148edd2
..
db8a4ac
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-573,9
+573,9
@@
sub ar_transactions {
$where .= " AND c.business_id = ?";
push(@values, $business_id);
}
$where .= " AND c.business_id = ?";
push(@values, $business_id);
}
- if ($form->{
department
_id}) {
- $where .= " AND a.
department
_id = ?";
- push(@values, $form->{
department
_id});
+ if ($form->{
taxzone
_id}) {
+ $where .= " AND a.
taxzone
_id = ?";
+ push(@values, $form->{
taxzone
_id});
}
foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) {
if ($form->{$column}) {
}
foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) {
if ($form->{$column}) {
@@
-685,7
+685,7
@@
SQL
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my $sortorder = join(', ', map { "$_ $sortdir" } @a);
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my $sortorder = join(', ', map { "$_ $sortdir" } @a);
- if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description department))) {
+ if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description department
taxzone
))) {
$sortorder = $form->{sort} . " $sortdir";
}
$sortorder = $form->{sort} . " $sortdir";
}