use SL::RecordLinks;
use SL::IC;
use SL::TransNumber;
+use SL::Util qw(trim);
use strict;
} elsif ($form->{$vc}) {
push @where, qq|ct.name ILIKE ?|;
- push @values, '%' . $form->{$vc} . '%';
+ push @values, '%' . trim($form->{$vc}) . '%';
}
if ($form->{"cp_name"}) {
push @where, "(cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
- push @values, ('%' . $form->{"cp_name"} . '%')x2;
+ push @values, ('%' . trim($form->{"cp_name"}) . '%')x2;
}
foreach my $item (qw(employee_id salesman_id)) {
foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
next unless ($form->{$item});
push @where, qq|dord.$item ILIKE ?|;
- push @values, '%' . $form->{$item} . '%';
+ push @values, '%' . trim($form->{$item}) . '%';
}
if (($form->{open} || $form->{closed}) &&
if ($form->{serialnumber}) {
push @where, 'dord.id IN (SELECT doi.delivery_order_id FROM delivery_order_items doi WHERE doi.serialnumber LIKE ?)';
- push @values, '%' . $form->{serialnumber} . '%';
+ push @values, '%' . trim($form->{serialnumber}) . '%';
}
if($form->{transdatefrom}) {
do_query($form, $dbh, $query, conv_i($sinfo->{"delivery_order_items_stock_id"}),
conv_i($form->{"delivery_order_items_id_$i"}), $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}),
conv_i($sinfo->{bin_id}));
- $h_item_stock_id->finish();
- # write back the id to the form (important if only transfer was clicked (id fk for invoice)
- $form->{"stock_${in_out}_$i"} = YAML::Dump($stock_info);
+ $h_item_stock_id->finish();
+ # write back the id to the form (important if only transfer was clicked (id fk for invoice)
+ $form->{"stock_${in_out}_$i"} = YAML::Dump($stock_info);
}
@values = ($form->{"delivery_order_items_id_$i"}, $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}),
conv_i($sinfo->{bin_id}), $sinfo->{chargenumber}, conv_date($sinfo->{bestbefore}),
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
+ $form->new_lastmtime('delivery_orders');
+
$form->{name} = $form->{ $form->{vc} };
$form->{name} =~ s/--$form->{"$form->{vc}_id"}//;
do_query($form, $dbh, $query, map { conv_i($_) } @{ $params{ids} });
$dbh->commit() unless ($params{dbh});
+ $form->new_lastmtime('delivery_orders');
$main::lxdebug->leave_sub();
}
dord.closed, dord.reqdate, dord.department_id, dord.cusordnumber,
d.description AS department, dord.language_id,
dord.shipto_id,
+ dord.itime, dord.mtime,
dord.globalproject_id, dord.delivered, dord.transaction_description,
dord.taxzone_id, dord.taxincluded, dord.payment_id, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
dord.delivery_term_id, dord.itime::DATE AS insertdate
}
}
$sth->finish();
-
+ $form->{mtime} ||= $form->{itime};
+ $form->{lastmtime} = $form->{mtime};
$form->{donumber_array} =~ s/\s*$//g;
$form->{ordnumber_array} =~ s/ //;
$form->{ordnumber_array} =~ s/\s*$//g;
$form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
$form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
+ $form->{department} = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id};
$form->{username} = $myconfig->{name};