my $query =
qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.cusordnumber,
dord.transdate, dord.reqdate,
- ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
+ ct.${vc}number, ct.name, ct.business_id,
+ dord.${vc}_id, dord.globalproject_id,
dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
- dord.transaction_description,
+ dord.transaction_description, dord.itime::DATE AS insertdate,
pr.projectnumber AS globalprojectnumber,
dep.description AS department,
e.name AS employee,
push @values, conv_i($form->{project_id}), conv_i($form->{project_id});
}
+ if ($form->{"business_id"}) {
+ push @where, qq|ct.business_id = ?|;
+ push @values, conv_i($form->{"business_id"});
+ }
+
if ($form->{"${vc}_id"}) {
push @where, qq|dord.${vc}_id = ?|;
push @values, $form->{"${vc}_id"};
}
if (!$main::auth->assert('sales_all_edit', 1)) {
push @where, qq|dord.employee_id = (select id from employee where login= ?)|;
- push @values, $form->{login};
+ push @values, $::myconfig{login};
}
foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
push @values, conv_date($form->{reqdateto});
}
+ if($form->{insertdatefrom}) {
+ push @where, qq|dord.itime::DATE >= ?|;
+ push@values, conv_date($form->{insertdatefrom});
+ }
+
+ if($form->{insertdateto}) {
+ push @where, qq|dord.itime::DATE <= ?|;
+ push @values, conv_date($form->{insertdateto});
+ }
+
if (@where) {
$query .= " WHERE " . join(" AND ", map { "($_)" } @where);
}
"shipvia" => "dord.shipvia",
"transaction_description" => "dord.transaction_description",
"department" => "lower(dep.description)",
+ "insertdate" => "dord.itime",
);
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my $ml = ($form->{type} eq 'sales_delivery_order') ? 1 : -1;
- if ($form->{id}) {
-
- $query = qq|DELETE FROM delivery_order_items_stock WHERE delivery_order_item_id IN (SELECT id FROM delivery_order_items WHERE delivery_order_id = ?)|;
- do_query($form, $dbh, $query, conv_i($form->{id}));
+ my (@processed_doi, @processed_dois);
- $query = qq|DELETE FROM delivery_order_items WHERE delivery_order_id = ?|;
- do_query($form, $dbh, $query, conv_i($form->{id}));
+ if ($form->{id}) {
+ # only delete shipto complete
$query = qq|DELETE FROM shipto WHERE trans_id = ? AND module = 'DO'|;
do_query($form, $dbh, $query, conv_i($form->{id}));
$query = qq|SELECT id, unit FROM parts WHERE id IN (| . join(', ', map { '?' } @part_ids) . qq|)|;
%part_unit_map = selectall_as_map($form, $dbh, $query, 'id', 'unit', @part_ids);
}
-
- my $q_item_id = qq|SELECT nextval('delivery_order_items_id')|;
- my $h_item_id = prepare_query($form, $dbh, $q_item_id);
-
- my $q_item =
- qq|INSERT INTO delivery_order_items (
- id, delivery_order_id, parts_id, description, longdescription, qty, base_qty,
- sellprice, discount, unit, reqdate, project_id, serialnumber,
- ordnumber, transdate, cusordnumber,
- lastcost, price_factor_id, price_factor, marge_price_factor, pricegroup_id,
- active_price_source, active_discount_source)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
- (SELECT factor FROM price_factors WHERE id = ?), ?, ?, ?, ?)|;
+ my $q_item = <<SQL;
+ UPDATE delivery_order_items SET
+ delivery_order_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
+ sellprice = ?, discount = ?, unit = ?, reqdate = ?, project_id = ?, serialnumber = ?,
+ lastcost = ? , price_factor_id = ?, price_factor = (SELECT factor FROM price_factors where id = ?),
+ marge_price_factor = ?, pricegroup_id = ?, active_price_source = ?, active_discount_source = ?
+ WHERE id = ?
+SQL
my $h_item = prepare_query($form, $dbh, $q_item);
- my $q_item_stock =
- qq|INSERT INTO delivery_order_items_stock (delivery_order_item_id, qty, unit, warehouse_id, bin_id, chargenumber, bestbefore)
- VALUES (?, ?, ?, ?, ?, ?, ?)|;
+ my $q_item_stock = <<SQL;
+ UPDATE delivery_order_items_stock SET
+ delivery_order_item_id = ?, qty = ?, unit = ?, warehouse_id = ?,
+ bin_id = ?, chargenumber = ?, bestbefore = ?
+ WHERE id = ?
+SQL
my $h_item_stock = prepare_query($form, $dbh, $q_item_stock);
my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in';
for my $i (1 .. $form->{rowcount}) {
next if (!$form->{"id_$i"});
+ CVar->get_non_editable_ic_cvars(form => $form,
+ dbh => $dbh,
+ row => $i,
+ sub_module => 'delivery_order_items',
+ may_converted_from => ['orderitems', 'delivery_order_items']);
+
+ my $position = $i;
+
+ if (!$form->{"delivery_order_items_id_$i"}) {
+ # there is no persistent id, therefore create one with all necessary constraints
+ my $q_item_id = qq|SELECT nextval('delivery_order_items_id')|;
+ my $h_item_id = prepare_query($form, $dbh, $q_item_id);
+ do_statement($form, $h_item_id, $q_item_id);
+ $form->{"delivery_order_items_id_$i"} = $h_item_id->fetchrow_array();
+ $query = qq|INSERT INTO delivery_order_items (id, delivery_order_id, position, parts_id) VALUES (?, ?, ?, ?)|;
+ do_query($form, $dbh, $query, conv_i($form->{"delivery_order_items_id_$i"}),
+ conv_i($form->{"id"}), conv_i($position), conv_i($form->{"id_$i"}));
+ $h_item_id->finish();
+ }
+
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
my $item_unit = $part_unit_map{$form->{"id_$i"}};
$items_reqdate = ($form->{"reqdate_$i"}) ? $form->{"reqdate_$i"} : undef;
- do_statement($form, $h_item_id, $q_item_id);
- my ($item_id) = $h_item_id->fetchrow_array();
# Get pricegroup_id and save it. Unfortunately the interface
# also uses ID "0" for signalling that none is selected, but "0"
$pricegroup_id = undef if !$pricegroup_id;
# save detail record in delivery_order_items table
- @values = (conv_i($item_id), conv_i($form->{id}), conv_i($form->{"id_$i"}),
+ @values = (conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}),
$form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
$form->{"qty_$i"}, $baseqty,
$form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
$form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}),
$form->{"serialnumber_$i"},
- $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
- $form->{"cusordnumber_$i"},
$form->{"lastcost_$i"},
conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
conv_i($form->{"marge_price_factor_$i"}),
$pricegroup_id,
- $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"});
+ $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
+ conv_i($form->{"delivery_order_items_id_$i"}));
do_statement($form, $h_item, $q_item, @values);
+ push @processed_doi, $form->{"delivery_order_items_id_$i"}; # transaction safe?
my $stock_info = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_$i"});
foreach my $sinfo (@{ $stock_info }) {
- @values = ($item_id, $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}),
- conv_i($sinfo->{bin_id}), $sinfo->{chargenumber}, conv_date($sinfo->{bestbefore}));
+ # if we have stock_info, we have to check for persistents entries
+ if (!$sinfo->{"delivery_order_items_stock_id"}) {
+ my $q_item_stock_id = qq|SELECT nextval('id')|;
+ my $h_item_stock_id = prepare_query($form, $dbh, $q_item_stock_id);
+ do_statement($form, $h_item_stock_id, $q_item_stock_id);
+ $sinfo->{"delivery_order_items_stock_id"} = $h_item_stock_id->fetchrow_array();
+ $query = qq|INSERT INTO delivery_order_items_stock (id, delivery_order_item_id, qty, unit, warehouse_id, bin_id)
+ VALUES (?, ?, ?, ?, ?, ?)|;
+ 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);
+ }
+ @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($sinfo->{"delivery_order_items_stock_id"}));
do_statement($form, $h_item_stock, $q_item_stock, @values);
+ push @processed_dois, $sinfo->{"delivery_order_items_stock_id"};
}
CVar->save_custom_variables(module => 'IC',
sub_module => 'delivery_order_items',
- trans_id => $item_id,
+ trans_id => $form->{"delivery_order_items_id_$i"},
configs => $ic_cvar_configs,
variables => $form,
name_prefix => 'ic_',
name_postfix => "_$i",
dbh => $dbh);
+
+ # link order items with doi, for future extension look at foreach IS.pm
+ if (!$form->{saveasnew} && $form->{"converted_from_orderitems_id_$i"}) {
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => 'orderitems',
+ 'from_ids' => $form->{"converted_from_orderitems_id_$i"},
+ 'to_table' => 'delivery_order_items',
+ 'to_id' => $form->{"delivery_order_items_id_$i"},
+ );
+ }
+ delete $form->{"converted_from_orderitems_id_$i"};
}
- $h_item_id->finish();
+ # 1. search for orphaned dois; processed_dois may be empty (no transfer) TODO: be supersafe and alter same statement for doi and oi
+ $query = sprintf 'SELECT id FROM delivery_order_items_stock WHERE delivery_order_item_id in
+ (select id from delivery_order_items where delivery_order_id = ?)';
+ $query .= sprintf ' AND NOT id IN (%s)', join ', ', ("?") x scalar @processed_dois if (scalar @processed_dois);
+ @values = (conv_i($form->{id}), map { conv_i($_) } @processed_dois);
+ my @orphaned_dois_ids = map { $_->{id} } selectall_hashref_query($form, $dbh, $query, @values);
+ if (scalar @orphaned_dois_ids) {
+ # clean up delivery_order_items_stock
+ $query = sprintf 'DELETE FROM delivery_order_items_stock WHERE id IN (%s)', join ', ', ("?") x scalar @orphaned_dois_ids;
+ do_query($form, $dbh, $query, @orphaned_dois_ids);
+ }
+ # 2. search for orphaned doi
+ $query = sprintf 'SELECT id FROM delivery_order_items WHERE delivery_order_id = ? AND NOT id IN (%s)', join ', ', ("?") x scalar @processed_doi;
+ @values = (conv_i($form->{id}), map { conv_i($_) } @processed_doi);
+ my @orphaned_ids = map { $_->{id} } selectall_hashref_query($form, $dbh, $query, @values);
+ if (scalar @orphaned_ids) {
+ # clean up delivery_order_items
+ $query = sprintf 'DELETE FROM delivery_order_items WHERE id IN (%s)', join ', ', ("?") x scalar @orphaned_ids;
+ do_query($form, $dbh, $query, @orphaned_ids);
+ }
$h_item->finish();
$h_item_stock->finish();
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
delivered = ?, department_id = ?, language_id = ?, shipto_id = ?,
globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
- is_sales = ?, taxzone_id = ?, taxincluded = ?, terms = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
+ is_sales = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
delivery_term_id = ?
WHERE id = ?|;
$form->{cusordnumber}, conv_date($form->{transdate}),
conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
conv_date($form->{reqdate}), $form->{shippingpoint}, $form->{shipvia},
- $form->{notes}, $form->{intnotes},
+ $restricter->process($form->{notes}), $form->{intnotes},
$form->{closed} ? 't' : 'f', $form->{delivered} ? "t" : "f",
conv_i($form->{department_id}), conv_i($form->{language_id}), conv_i($form->{shipto_id}),
conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
$form->{transaction_description},
$form->{type} =~ /^sales/ ? 't' : 'f',
- conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{currency},
+ conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{payment_id}), $form->{currency},
conv_i($form->{delivery_term_id}),
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
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.terms, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
- dord.delivery_term_id
+ 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
FROM delivery_orders dord
JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
LEFT JOIN employee e ON (dord.employee_id = e.id)
}
}
$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;
LEFT JOIN project pr ON (doi.project_id = pr.id)
LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
WHERE doi.delivery_order_id IN ($do_ids_placeholders)
- ORDER BY doi.oid|;
+ ORDER BY doi.delivery_order_id, doi.position|;
$form->{form_details} = selectall_hashref_query($form, $dbh, $query, @do_ids);
my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in';
$query =
- qq|SELECT qty, unit, bin_id, warehouse_id, chargenumber, bestbefore
+ qq|SELECT id as delivery_order_items_stock_id, qty, unit, bin_id,
+ warehouse_id, chargenumber, bestbefore
FROM delivery_order_items_stock
WHERE delivery_order_item_id = ?|;
my $sth = prepare_query($form, $dbh, $query);
my $ic_cvar_configs = CVar->get_configs(module => 'IC');
my $project_cvar_configs = CVar->get_configs(module => 'Projects');
+ # get some values of parts from db on store them in extra array,
+ # so that they can be sorted in later
+ my %prepared_template_arrays = IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
+ my @prepared_arrays = keys %prepared_template_arrays;
+
$form->{TEMPLATE_ARRAYS} = { };
- IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
my @arrays =
- qw(runningnumber number description longdescription qty unit
+ qw(runningnumber number description longdescription qty qty_nofmt unit
partnotes serialnumber reqdate projectnumber projectdescription
- weight lineweight
+ weight weight_nofmt lineweight lineweight_nofmt
si_runningnumber si_number si_description
si_warehouse si_bin si_chargenumber si_bestbefore
si_qty si_qty_nofmt si_unit);
- map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays);
+ map { $form->{TEMPLATE_ARRAYS}->{$_} = [] } (@arrays, @prepared_arrays);
push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
push @arrays, map { "project_cvar_$_->{name}" } @{ $project_cvar_configs };
next if (!$form->{"id_$i"});
if ($item->[1] ne $sameitem) {
- push(@{ $form->{description} }, qq|$item->[1]|);
+ push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'partsgroup');
+ push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|);
$sameitem = $item->[1];
- map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays)));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays));
+ $si_position++;
}
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
my $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || { 'factor' => 1 };
my $project = $projects_by_id{$form->{"project_id_$i"}} || SL::DB::Project->new;
+ push(@{ $form->{TEMPLATE_ARRAYS}{$_} }, $prepared_template_arrays{$_}[$i - 1]) for @prepared_arrays;
+
+ push @{ $form->{TEMPLATE_ARRAYS}{entry_type} }, 'normal';
push @{ $form->{TEMPLATE_ARRAYS}{runningnumber} }, $position;
push @{ $form->{TEMPLATE_ARRAYS}{number} }, $form->{"partnumber_$i"};
push @{ $form->{TEMPLATE_ARRAYS}{description} }, $form->{"description_$i"};
while (my $ref = $h_pg->fetchrow_hashref("NAME_lc")) {
if ($form->{groupitems} && $ref->{partsgroup} ne $sameitem) {
- map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays)));
map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays));
$sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
+ push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'assembly-item-partsgroup');
push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $sameitem);
$si_position++;
}
- push(@{ $form->{TEMPLATE_ARRAYS}->{"description"} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq| -- $ref->{partnumber}, $ref->{description}|);
- map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays));
+ push(@{ $form->{TEMPLATE_ARRAYS}->{entry_type} }, 'assembly-item');
+ push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq| -- $ref->{partnumber}, $ref->{description}|);
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} (@arrays, @prepared_arrays)));
map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays));
$si_position++;
}
}
+ CVar->get_non_editable_ic_cvars(form => $form,
+ dbh => $dbh,
+ row => $i,
+ sub_module => 'delivery_order_items',
+ may_converted_from => ['orderitems', 'delivery_order_items']);
+
push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
for @{ $ic_cvar_configs };
foreach my $request (@{ $params{requests} }) {
push @transfers, {
- 'parts_id' => $request->{parts_id},
- "${prefix}_warehouse_id" => $request->{warehouse_id},
- "${prefix}_bin_id" => $request->{bin_id},
- 'chargenumber' => $request->{chargenumber},
- 'bestbefore' => $request->{bestbefore},
- 'qty' => $request->{qty},
- 'unit' => $request->{unit},
- 'oe_id' => $form->{id},
- 'shippingdate' => 'current_date',
- 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped',
- 'project_id' => $request->{project_id},
+ 'parts_id' => $request->{parts_id},
+ "${prefix}_warehouse_id" => $request->{warehouse_id},
+ "${prefix}_bin_id" => $request->{bin_id},
+ 'chargenumber' => $request->{chargenumber},
+ 'bestbefore' => $request->{bestbefore},
+ 'qty' => $request->{qty},
+ 'unit' => $request->{unit},
+ 'oe_id' => $form->{id},
+ 'shippingdate' => 'current_date',
+ 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped',
+ 'project_id' => $request->{project_id},
+ 'delivery_order_items_stock_id' => $request->{delivery_order_items_stock_id},
+ 'comment' => $request->{comment},
};
}
return $delivered ? 1 : 0;
}
-
1;
projects / kivitendo-erp.git / blobdiff