# 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
# 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,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|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) | .
$where .= " AND i.assemblyitem is not true ";
# filter allowed parameters for mainsort and subsort as passed by POST
- my @databasefields = qw(description customername country partsgroup business salesman month);
+ 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;
$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 = ?";