if (!$main::auth->assert('sales_all_edit', 1)) {
$query .= " AND o.employee_id = (select id from employee where login= ?)";
- push @values, $form->{login};
+ push @values, $::myconfig{login};
}
if ($form->{employee_id}) {
$query .= " AND o.employee_id = ?";
my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
my $query = qq|SELECT id FROM employee WHERE login = ?|;
- my ($e_id) = selectrow_query($form, $dbh, $query, $form->{login});
+ my ($e_id) = selectrow_query($form, $dbh, $query, $::myconfig{login});
$query =
qq|SELECT oe.id, oe.transdate, oe.reqdate, oe.quonumber, oe.transaction_description, oe.amount,
$pricegroup_id *= 1;
$pricegroup_id = undef if !$pricegroup_id;
+ CVar->get_non_editable_ic_cvars(form => $form,
+ dbh => $dbh,
+ row => $i,
+ sub_module => 'orderitems',
+ may_converted_from => ['orderitems', 'invoice']);
+
my $position = $i;
# save detail record in orderitems table
- my $cvars;
if (! $form->{"orderitems_id_$i"}) {
$query = qq|SELECT nextval('orderitemsid')|;
($form->{"orderitems_id_$i"}) = selectrow_query($form, $dbh, $query);
$query = qq|INSERT INTO orderitems (id, position) VALUES (?, ?)|;
do_query($form, $dbh, $query, $form->{"orderitems_id_$i"}, conv_i($position));
-
- # get values for CVars from master data for new items
- $cvars = CVar->get_custom_variables(dbh => $dbh,
- module => 'IC',
- trans_id => $form->{"id_$i"},
- );
- } else {
- # get values for CVars from custom_variables for existing items
- $cvars = CVar->get_custom_variables(dbh => $dbh,
- module => 'IC',
- sub_module => 'orderitems',
- trans_id => $form->{"orderitems_id_$i"},
- );
}
- # map only non-editable CVars to form (editable ones are already there)
- map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
my $orderitems_id = $form->{"orderitems_id_$i"};
push @processed_orderitems, $orderitems_id;
name_prefix => 'ic_',
name_postfix => "_$i",
dbh => $dbh);
+
+ # link previous items with orderitems
+ foreach (qw(orderitems invoice)) {
+ if (!$form->{saveasnew} && !$form->{useasnew} && $form->{"converted_from_${_}_id_$i"}) {
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => $_,
+ 'from_ids' => $form->{"converted_from_${_}_id_$i"},
+ 'to_table' => 'orderitems',
+ 'to_id' => $orderitems_id,
+ );
+ }
+ delete $form->{"converted_from_${_}_id_$i"};
+ }
}
}
+
# search for orphaned ids
$query = sprintf 'SELECT id FROM orderitems WHERE trans_id = ? AND NOT id IN (%s)', join ', ', ("?") x scalar @processed_orderitems;
@values = (conv_i($form->{id}), map { conv_i($_) } @processed_orderitems);
conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
$amount, $netamount, conv_date($reqdate),
$form->{taxincluded} ? 't' : 'f', $form->{shippingpoint},
- $form->{shipvia}, $form->{notes}, $form->{intnotes},
+ $form->{shipvia}, $restricter->process($form->{notes}), $form->{intnotes},
$form->{currency}, $form->{closed} ? 't' : 'f',
$form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
$quotation, conv_i($form->{department_id}),
$form->save_status($dbh);
# Link this record to the records it was created from.
+ # check every record type we may link. i am not happy with converting the string to array back
+ # should be a array from the start (OE.pm -> retrieve).
+ # and that i need the local array ref for close_quotation_rfqs. better ideas welcome
$form->{convert_from_oe_ids} =~ s/^\s+//;
$form->{convert_from_oe_ids} =~ s/\s+$//;
my @convert_from_oe_ids = split m/\s+/, $form->{convert_from_oe_ids};
delete $form->{convert_from_oe_ids};
-
- if (scalar @convert_from_oe_ids) {
- RecordLinks->create_links('dbh' => $dbh,
- 'mode' => 'ids',
- 'from_table' => 'oe',
- 'from_ids' => \@convert_from_oe_ids,
- 'to_table' => 'oe',
- 'to_id' => $form->{id},
- );
-
+ @{ $form->{convert_from_oe_ids} } = @convert_from_oe_ids;
+ foreach (qw(ar oe)) {
+ if (!$form->{useasnew} && $form->{"convert_from_${_}_ids"}) {
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => $_,
+ 'from_ids' => $form->{"convert_from_${_}_ids"},
+ 'to_table' => 'oe',
+ 'to_id' => $form->{id},
+ );
+ delete $form->{"convert_from_${_}_ids"};
+ }
$self->_close_quotations_rfqs('dbh' => $dbh,
'from_id' => \@convert_from_oe_ids,
- 'to_id' => $form->{id});
+ 'to_id' => $form->{id}) if $_ eq 'oe';
}
if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
my $config_obj = SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $form->{id});
if ($config_obj) {
- my $config = { map { $_ => $config_obj->$_ } qw(active terminated periodicity start_date_as_date end_date_as_date first_billing_date_as_date extend_automatically_by ar_chart_id
+ my $config = { map { $_ => $config_obj->$_ } qw(active terminated periodicity order_value_periodicity start_date_as_date end_date_as_date first_billing_date_as_date extend_automatically_by ar_chart_id
print printer_id copies) };
$form->{periodic_invoices_config} = YAML::Dump($config);
}
if ($form->{"rowcount"} and $#ids == 0) {
$form->{"id"} = $ids[0];
undef @ids;
+ delete $form->{convert_from_oe_ids};
}
# and remember for the rest of the function
my $is_collective_order = scalar @ids;
+ $form->{useasnew} = !!$is_collective_order;
if (!$form->{id}) {
- my $wday = (localtime(time))[6];
- my $next_workday = $wday == 5 ? 3 : $wday == 6 ? 2 : 1;
+ my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1;
+ my $next_workday = DateTime->today_local->add(days => $extra_days);
+ my $day_of_week = $next_workday->day_of_week;
- # if we have a client configured interval for sales quotation, we add this
- $next_workday += $::instance_conf->get_reqdate_interval if ($::instance_conf->get_reqdate_interval &&
- $form->{type} eq 'sales_quotation' );
+ $next_workday->add(days => (8 - $day_of_week)) if $day_of_week >= 6;
- $query_add = qq|, current_date AS transdate, date(current_date + interval '${next_workday} days') AS reqdate|;
+ $form->{transdate} = DateTime->today_local->to_kivitendo;
+ $form->{reqdate} = $next_workday->to_kivitendo;
}
# get default accounts
}
# delete orderitems_id in collective orders, so that they get cloned no matter what
- delete $ref->{orderitems_id} if $is_collective_order;
+ $ref->{converted_from_orderitems_id} = delete $ref->{orderitems_id} if $is_collective_order;
# get tax rates and description
my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
$sth->finish;
}
- my $cvars;
- if (! $form->{"orderitems_id_$i"}) {
- # get values for CVars from master data for new items
- $cvars = CVar->get_custom_variables(dbh => $dbh,
- module => 'IC',
- trans_id => $form->{"id_$i"},
- );
- } else {
- # get values for CVars from custom_variables for existing items
- $cvars = CVar->get_custom_variables(dbh => $dbh,
- module => 'IC',
- sub_module => 'orderitems',
- trans_id => $form->{"orderitems_id_$i"},
- );
- }
- # map only non-editable CVars to form (editable ones are already there)
- map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
+ CVar->get_non_editable_ic_cvars(form => $form,
+ dbh => $dbh,
+ row => $i,
+ sub_module => 'orderitems',
+ may_converted_from => ['orderitems', 'invoice']);
push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)
projects / kivitendo-erp.git / blobdiff