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';
CVar->get_non_editable_ic_cvars(form => $form,
dbh => $dbh,
- row => $i,
+ row => $i,
sub_module => 'delivery_order_items',
- may_converted_from => ['orderitems']);
+ may_converted_from => ['orderitems', 'delivery_order_items']);
my $position = $i;
name_prefix => 'ic_',
name_postfix => "_$i",
dbh => $dbh);
+
# link order items with doi, for future extension look at foreach IS.pm
- if ($form->{"converted_from_orderitems_id_$i"}) {
+ if (!$form->{saveasnew} && $form->{"converted_from_orderitems_id_$i"}) {
RecordLinks->create_links('dbh' => $dbh,
'mode' => 'ids',
'from_table' => 'orderitems',
'to_table' => 'delivery_order_items',
'to_id' => $form->{"delivery_order_items_id_$i"},
);
- delete $form->{"converted_from_orderitems_id_$i"};
}
+ delete $form->{"converted_from_orderitems_id_$i"};
}
# 1. search for orphaned dois; processed_dois may be empty (no transfer) TODO: be supersafe and alter same statement for doi and oi
$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}),
dord.shipto_id,
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.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)
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->{TEMPLATE_ARRAYS}->{entry_type} }, 'partsgroup');
push(@{ $form->{TEMPLATE_ARRAYS}->{description} }, qq|$item->[1]|);
$sameitem = $item->[1];
- 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));
$si_position++;
}
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,
+ row => $i,
sub_module => 'delivery_order_items',
- may_converted_from => ['orderitems']);
+ 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"}, $_), $_)
'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},
};
}