# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Sold Items report
my @values;
+ # default usage: always use parts.description for (sub-)totalling and in header and subheader lines
+ # but use invoice.description in article mode
+ # so we extract both versions in our query and later overwrite the description in article mode
+
my $query =
- qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as description,i.lastcost,i.sellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth | .
- qq|FROM invoice i | .
- qq|JOIN ar on (i.trans_id = ar.id) | .
+ qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.shipvia,ar.id,ar.transdate,p.partnumber,p.description as description, pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as invoice_description,i.lastcost,i.sellprice,i.fxsellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth, p.unit as parts_unit, p.weight, ar.taxincluded | .
+ qq|, COALESCE(er.buy, 1) | .
+ qq|FROM invoice i | .
+ qq|RIGHT JOIN ar on (i.trans_id = ar.id) | .
qq|JOIN parts p on (i.parts_id = p.id) | .
+ qq|LEFT JOIN exchangerate er on (er.transdate = ar.transdate and ar.currency_id = er.currency_id) | .
qq|LEFT JOIN partsgroup pg on (p.partsgroup_id = pg.id) | .
qq|LEFT JOIN customer ct on (ct.id = ar.customer_id) | .
qq|LEFT JOIN business b on (ct.business_id = b.id) | .
# limits by employees (Bearbeiter), not salesmen!
if (!$main::auth->assert('sales_all_edit', 1)) {
$where .= " AND ar.employee_id = (select id from employee where login= ?)";
- push (@values, $form->{login});
+ push (@values, $::myconfig{login});
}
# Stornierte Rechnungen und Stornorechnungen in invoice rausfiltern
# Bestandteile von Erzeugnissen herausfiltern
$where .= " AND i.assemblyitem is not true ";
- my $sortorder;
+ # filter allowed parameters for mainsort and subsort as passed by POST
+ my @databasefields = qw(description customername country partsgroup business salesman month shipvia);
+ my ($mainsort) = grep { /^$form->{mainsort}$/ } @databasefields;
+ my ($subsort) = grep { /^$form->{subsort}$/ } @databasefields;
+ die "illegal parameter for mainsort or subsort" unless $mainsort and $subsort;
+ my $sortorder;
# sorting by month is a special case, we don't want to sort alphabetically by
# month name, so we also extract a numerical month in the from YYYYMM to sort
# by in case of month sorting
if ($form->{mainsort} eq 'month') {
$sortorder .= "nummonth,"
} else {
- $sortorder .= $form->{mainsort} . ",";
+ $sortorder .= $mainsort . ",";
};
if ($form->{subsort} eq 'month') {
$sortorder .= "nummonth,"
} else {
- $sortorder .= $form->{subsort} . ",";
+ $sortorder .= $subsort . ",";
};
$sortorder .= 'ar.transdate,ar.invnumber'; # Default sorting order after mainsort und subsort
-
if ($form->{customer_id}) {
$where .= " AND ar.customer_id = ?";
push(@values, $form->{customer_id});
- };
+ } elsif ($form->{customer}) {
+ $where .= " AND ct.name ILIKE ?";
+ push(@values, like($form->{customer}));
+ }
if ($form->{customernumber}) {
$where .= qq| AND ct.customernumber = ? |;
push(@values, $form->{customernumber});
}
if ($form->{partnumber}) {
$where .= qq| AND (p.partnumber ILIKE ?)|;
- push(@values, '%' . $form->{partnumber} . '%');
+ push(@values, like($form->{partnumber}));
}
if ($form->{partsgroup_id}) {
$where .= qq| AND (pg.id = ?)|;
}
if ($form->{country}) {
$where .= qq| AND (ct.country ILIKE ?)|;
- push(@values, '%' . $form->{country} . '%');
+ push(@values, like($form->{country}));
}
- # nimmt man description am Besten aus invoice oder parts?
+
+ # when filtering for parts by description we probably want to filter by the description of the part as per the master data
+ # invoice.description may differ due to manually changing the description in the invoice or because of translations of the description
+ # at least in the translation case we probably want the report to also include translated articles, so we have to filter via parts.description
if ($form->{description}) {
- $where .= qq| AND (i.description ILIKE ?)|;
- push(@values, '%' . $form->{description} . '%');
+ $where .= qq| AND (p.description ILIKE ?)|;
+ push(@values, like($form->{description}));
}
if ($form->{transdatefrom}) {
$where .= " AND ar.transdate >= ?";
$where .= " AND ar.transdate <= ?";
push(@values, $form->{transdateto});
}
- if ($form->{department}) {
- my ($null, $department_id) = split /--/, $form->{department};
+ if ($form->{department_id}) {
$where .= " AND ar.department_id = ?";
- push(@values, $department_id);
+ push @values, conv_i($form->{department_id});
}
if ($form->{employee_id}) {
$where .= " AND ar.employee_id = ?";
push(@values, $form->{"project_id"}, $form->{"project_id"});
}
if ($form->{business_id}) {
- $where .= qq| AND ct.business_id = ? |;
+ $where .= qq| AND ct.business_id = ? |;
push(@values, $form->{"business_id"});
}
$where .= qq| AND ($cvar_where_ic)|;
push @values, @cvar_values_ic;
}
-
+
$query .= " WHERE $where ORDER BY $sortorder "; # LIMIT 5000";
my @result = selectall_hashref_query($form, $dbh, $query, @values);
projects / kivitendo-erp.git / blobdiff