use SL::DB::PeriodicInvoicesConfig;
use SL::DB::Project;
use SL::DB::ProjectType;
+use SL::DB::RequirementSpecOrder;
use SL::DB::Status;
use SL::DB::Tax;
use SL::DBUtils;
}
}
+ my ($phone_notes_columns, $phone_notes_join);
+ $form->{phone_notes} = trim($form->{phone_notes});
+ if ($form->{phone_notes}) {
+ $phone_notes_columns = qq| , phone_notes.subject AS phone_notes_subject, phone_notes.body AS phone_notes_body |;
+ $phone_notes_join = qq| JOIN notes phone_notes ON (o.id = phone_notes.trans_id AND phone_notes.trans_module LIKE 'oe') |;
+ }
+
$query =
qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
qq| o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id, | .
qq| tz.description AS taxzone | .
$periodic_invoices_columns .
+ $phone_notes_columns .
qq| , o.order_probability, o.expected_billing_date, (o.netamount * o.order_probability / 100) AS expected_netamount | .
qq|FROM oe o | .
qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
qq|LEFT JOIN department ON (o.department_id = department.id) | .
qq|$periodic_invoices_joins | .
+ $phone_notes_join .
qq|WHERE (o.quotation = ?) |;
push(@values, $quotation);
push(@values, (like($form->{"cp_name"}))x2);
}
- if ( !(($vc eq 'customer' && $main::auth->assert('sales_all_edit', 1)) || ($vc eq 'vendor' && $main::auth->assert('purchase_all_edit', 1))) ) {
+ if ( !( ($vc eq 'customer' && ($main::auth->assert('sales_all_edit', 1) || $main::auth->assert('sales_order_view', 1)))
+ || ($vc eq 'vendor' && ($main::auth->assert('purchase_all_edit', 1) || $main::auth->assert('purchase_order_view', 1))) ) ) {
$query .= " AND o.employee_id = (select id from employee where login= ?)";
push @values, $::myconfig{login};
}
push(@values, like($form->{intnotes}));
}
+ if ($form->{phone_notes}) {
+ $query .= qq| AND (phone_notes.subject ILIKE ? OR phone_notes.body ILIKE ?)|;
+ push(@values, like($form->{phone_notes}), like($form->{phone_notes}));
+ }
+
+ $form->{fulltext} = trim($form->{fulltext});
+ if ($form->{fulltext}) {
+ my @fulltext_fields = qw(o.notes
+ o.intnotes
+ o.shippingpoint
+ o.shipvia
+ o.transaction_description
+ o.quonumber
+ o.ordnumber
+ o.cusordnumber);
+ $query .= ' AND (';
+ $query .= join ' ILIKE ? OR ', @fulltext_fields;
+ $query .= ' ILIKE ?';
+
+ $query .= <<SQL;
+ OR EXISTS (
+ SELECT files.id FROM files LEFT JOIN file_full_texts ON (file_full_texts.file_id = files.id)
+ WHERE files.object_id = o.id AND files.object_type = 'sales_order'
+ AND file_full_texts.full_text ILIKE ?)
+SQL
+
+ $query .= <<SQL;
+ OR EXISTS (
+ SELECT notes.id FROM notes
+ WHERE notes.trans_id = o.id AND notes.trans_module LIKE 'oe'
+ AND (notes.subject ILIKE ? OR notes.body ILIKE ?))
+SQL
+
+ $query .= <<SQL;
+ OR EXISTS (
+ SELECT follow_up_links.id FROM follow_up_links
+ WHERE follow_up_links.trans_id = o.id AND trans_type = 'sales_order'
+ AND EXISTS (
+ SELECT notes.id FROM notes
+ WHERE trans_module LIKE 'fu' AND trans_id = follow_up_links.follow_up_id
+ AND (notes.subject ILIKE ? OR notes.body ILIKE ?)))
+SQL
+
+ $query .= ')';
+
+ push(@values, like($form->{fulltext})) for 1 .. (scalar @fulltext_fields) + 5;
+ }
+
if ($form->{parts_partnumber}) {
$query .= <<SQL;
AND EXISTS (
my $number_field = $form->{type} =~ m{order} ? 'ordnumber' : 'quonumber';
my $trans_number = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{$number_field}, id => $form->{id});
$form->{$number_field} ||= $trans_number->create_unique; # set $form->{ordnumber} or $form->{quonumber}
+ my $is_new = !$form->{id};
if ($form->{id}) {
$query = qq|DELETE FROM custom_variables
customer_id = ?, amount = ?, netamount = ?, reqdate = ?, tax_point = ?, taxincluded = ?,
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, currency_id = (SELECT id FROM currencies WHERE name=?), closed = ?,
delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?,
- taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,delivery_term_id = ?,
+ taxzone_id = ?, shipto_id = ?, billing_address_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,delivery_term_id = ?,
globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ?
, order_probability = ?, expected_billing_date = ?
WHERE id = ?|;
$form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
$quotation, conv_i($form->{department_id}),
conv_i($form->{language_id}), conv_i($form->{taxzone_id}),
- conv_i($form->{shipto_id}), conv_i($form->{payment_id}),
+ conv_i($form->{shipto_id}), conv_i($form->{billing_address_id}), conv_i($form->{payment_id}),
conv_i($form->{delivery_vendor_id}),
conv_i($form->{delivery_customer_id}),
conv_i($form->{delivery_term_id}),
config_yaml => $form->{periodic_invoices_config})
if ($form->{type} eq 'sales_order');
+ $self->_link_created_sales_order_to_requirement_specs_for_sales_quotations(
+ type => $form->{type},
+ converted_from_ids => \@convert_from_oe_ids,
+ sales_order_id => $form->{id},
+ is_new => $is_new,
+ );
+
+ $self->_set_project_in_linked_requirement_spec(
+ type => $form->{type},
+ project_id => $form->{globalproject_id},
+ sales_order_id => $form->{id},
+ );
+
$main::lxdebug->leave_sub();
return 1;
}
+sub _link_created_sales_order_to_requirement_specs_for_sales_quotations {
+ my ($self, %params) = @_;
+
+ # If this is a sales order created from a sales quotation and if
+ # that sales quotation was created from a requirement spec document
+ # then link the newly created sales order to the requirement spec
+ # document, too.
+
+ return if !$params{is_new};
+ return if $params{type} ne 'sales_order';
+ return if !@{ $params{converted_from_ids} };
+
+ my $oe_objects = SL::DB::Manager::Order->get_all(where => [ id => $params{converted_from_ids} ]);
+ my @sales_quotations = grep { $_->is_type('sales_quotation') } @{ $oe_objects };
+
+ return if !@sales_quotations;
+
+ my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => [ map { $_->id } @sales_quotations ] ]);
+
+ return if !@{ $rs_orders };
+
+ $rs_orders->[0]->db->with_transaction(sub {
+ foreach my $rs_order (@{ $rs_orders }) {
+ SL::DB::RequirementSpecOrder->new(
+ order_id => $params{sales_order_id},
+ requirement_spec_id => $rs_order->requirement_spec_id,
+ version_id => $rs_order->version_id,
+ )->save;
+ }
+
+ 1;
+ });
+}
+
+sub _set_project_in_linked_requirement_spec {
+ my ($self, %params) = @_;
+
+ return if $params{type} ne 'sales_order';
+ return if !$params{project_id} || !$params{sales_order_id};
+
+ my $query = <<SQL;
+ UPDATE requirement_specs
+ SET project_id = ?
+ WHERE id IN (
+ SELECT so.requirement_spec_id
+ FROM requirement_spec_orders so
+ WHERE so.order_id = ?
+ )
+SQL
+
+ do_query($::form, $::form->get_standard_dbh, $query, $params{project_id}, $params{sales_order_id});
+}
+
sub save_periodic_invoices_config {
my ($self, %params) = @_;
if (!$form->{id}) {
my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
$form->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
- $form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
+ if ( ($form->{type} eq 'sales_order' && !$::instance_conf->get_deliverydate_on)
+ || ($form->{type} eq 'sales_quotation' && !$::instance_conf->get_reqdate_on)) {
+ $form->{reqdate} = '';
+ } else {
+ $form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
+ }
$form->{transdate} = DateTime->today_local->to_kivitendo;
}
o.closed, o.reqdate, o.tax_point, o.quonumber, o.department_id, o.cusordnumber,
o.mtime, o.itime,
d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
- o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
+ o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, o.billing_address_id,
o.globalproject_id, o.delivered, o.transaction_description, o.delivery_term_id,
o.itime::DATE AS insertdate, o.order_probability, o.expected_billing_date
FROM oe o
partnotes serialnumber reqdate sellprice sellprice_nofmt listprice listprice_nofmt netprice netprice_nofmt
discount discount_nofmt p_discount discount_sub discount_sub_nofmt nodiscount_sub nodiscount_sub_nofmt
linetotal linetotal_nofmt nodiscount_linetotal nodiscount_linetotal_nofmt tax_rate projectnumber projectdescription
- price_factor price_factor_name partsgroup weight weight_nofmt lineweight lineweight_nofmt);
+ price_factor price_factor_name partsgroup weight weight_nofmt lineweight lineweight_nofmt optional);
push @arrays, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
push @arrays, map { "project_cvar_$_->{name}" } @{ $project_cvar_configs };
push @{ $form->{TEMPLATE_ARRAYS}->{price_factor} }, $price_factor->{formatted_factor};
push @{ $form->{TEMPLATE_ARRAYS}->{price_factor_name} }, $price_factor->{description};
push @{ $form->{TEMPLATE_ARRAYS}->{partsgroup} }, $form->{"partsgroup_$i"};
+ push @{ $form->{TEMPLATE_ARRAYS}->{optional} }, $form->{"optional_$i"};
my $sellprice = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
my ($dec) = ($sellprice =~ /\.(\d+)/);
$form->{non_separate_subtotal} += $linetotal;
}
- $form->{ordtotal} += $linetotal;
+ $form->{ordtotal} += $linetotal unless $form->{"optional_$i"};
$form->{nodiscount_total} += $nodiscount_linetotal;
$form->{discount_total} += $discount;
map { $taxrate += $form->{"${_}_rate"} } split(/ /, $form->{"taxaccounts_$i"});
- if ($form->{taxincluded}) {
+ unless ($form->{"optional_$i"}) {
+ if ($form->{taxincluded}) {
- # calculate tax
- $taxamount = $linetotal * $taxrate / (1 + $taxrate);
- $taxbase = $linetotal / (1 + $taxrate);
- } else {
- $taxamount = $linetotal * $taxrate;
- $taxbase = $linetotal;
+ # calculate tax
+ $taxamount = $linetotal * $taxrate / (1 + $taxrate);
+ $taxbase = $linetotal / (1 + $taxrate);
+ } else {
+ $taxamount = $linetotal * $taxrate;
+ $taxbase = $linetotal;
+ }
}
if ($taxamount != 0) {