use SL::Common;
use SL::DBUtils;
use SL::MoreCommon;
+use SL::DB;
use Data::Dumper;
use strict;
my $myconfig = \%main::myconfig;
my $form = $main::form;
- my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
+ my $dbh = $params{dbh} || SL::DB->client->dbh;
# First, find all order IDs from which this invoice has been
# created. Either directly by a conversion from an order to this invoice
my $q_billed = qq|SELECT i.parts_id, i.qty ${qtyfactor} AS qty, i.unit, p.unit AS partunit
FROM invoice i
LEFT JOIN parts p ON (i.parts_id = p.id)
- WHERE i.trans_id = ?|;
+ WHERE i.trans_id = ? AND i.assemblyitem is false|;
my $h_billed = prepare_query($form, $dbh, $q_billed);
my $q_ordered = qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit
FROM orderitems oi
LEFT JOIN parts p ON (oi.parts_id = p.id)
- WHERE oi.trans_id = ?|;
+ WHERE oi.trans_id = ?
+ AND not oi.optional|;
my $h_ordered = prepare_query($form, $dbh, $q_ordered);
my @close_oe_ids;
# said order. Again consider both direct conversions and indirect
# conversions via delivery orders.
foreach my $oe_id (@oe_ids) {
+
+ # Dont close orders with periodic invoice
+ next if SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $oe_id);
+
# Direct conversions "order -> invoice":
@links = RecordLinks->get_links('dbh' => $dbh,
'from_table' => 'oe',
# Close orders that have been billed fully.
if (scalar @close_oe_ids) {
- my $query = qq|UPDATE oe SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar @close_oe_ids) . qq|)|;
- do_query($form, $dbh, $query, @close_oe_ids);
-
- $dbh->commit unless $params{dbh};
+ SL::DB->client->with_transaction(sub {
+ my $query = qq|UPDATE oe SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar @close_oe_ids) . qq|)|;
+ do_query($form, $dbh, $query, @close_oe_ids);
+ 1;
+ }) or do { die SL::DB->client->error };
}
$main::lxdebug->leave_sub();