use SL::MIME;
use SL::Util qw(trim);
use SL::YAML;
+use SL::DB::AdditionalBillingAddress;
+use SL::DB::AuthUser;
use SL::DB::History;
use SL::DB::Order;
use SL::DB::Default;
use SL::DB::Printer;
use SL::DB::Language;
use SL::DB::RecordLink;
+use SL::DB::RequirementSpec;
use SL::DB::Shipto;
use SL::DB::Translation;
my $groupitems = $::form->{print_options}->{groupitems};
my $printer_id = $::form->{print_options}->{printer_id};
- # only pdf and opendocument by now
- if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf)) {
+ # only PDF, OpenDocument & HTML for now
+ if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf html)) {
return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render;
}
$form->{format} = $format;
$form->{formname} = $formname;
$form->{language} = '_' . $self->order->language->template_code if $self->order->language;
- my $pdf_filename = $form->generate_attachment_filename();
-
- my $pdf;
- my @errors = generate_pdf($self->order, \$pdf, { format => $format,
- formname => $formname,
- language => $self->order->language,
- printer_id => $printer_id,
- groupitems => $groupitems });
+ my $doc_filename = $form->generate_attachment_filename();
+
+ my $doc;
+ my @errors = $self->generate_doc(\$doc, { format => $format,
+ formname => $formname,
+ language => $self->order->language,
+ printer_id => $printer_id,
+ groupitems => $groupitems });
if (scalar @errors) {
- return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+ return $self->js->flash('error', t8('Generating the document failed: #1', $errors[0]))->render;
}
if ($media eq 'screen') {
# screen/download
- $self->js->flash('info', t8('The PDF has been created'));
+ $self->js->flash('info', t8('The document has been created.'));
$self->send_file(
- \$pdf,
- type => SL::MIME->mime_type_from_ext($pdf_filename),
- name => $pdf_filename,
+ \$doc,
+ type => SL::MIME->mime_type_from_ext($doc_filename),
+ name => $doc_filename,
js_no_render => 1,
);
my $printer_id = $::form->{print_options}->{printer_id};
SL::DB::Printer->new(id => $printer_id)->load->print_document(
copies => $copies,
- content => $pdf,
+ content => $doc,
);
- $self->js->flash('info', t8('The PDF has been printed'));
+ $self->js->flash('info', t8('The document has been printed.'));
}
- my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $pdf_filename);
+ my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $doc_filename);
if (scalar @warnings) {
$self->js->flash('warning', $_) for @warnings;
}
my $pdf_filename = $form->generate_attachment_filename();
my $pdf;
- my @errors = generate_pdf($self->order, \$pdf, { format => $format,
- formname => $formname,
- language => $self->order->language,
- });
+ my @errors = $self->generate_doc(\$pdf, { format => $format,
+ formname => $formname,
+ language => $self->order->language,
+ });
if (scalar @errors) {
return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
}
$email_form->{js_send_function} = 'kivi.Order.send_email()';
my %files = $self->get_files_for_email_dialog();
+
+ my @employees_with_email = grep {
+ my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login);
+ $user && !!trim($user->get_config_value('email'));
+ } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) };
+
my $dialog_html = $self->render('common/_send_email_dialog', { output => 0 },
- email_form => $email_form,
- show_bcc => $::auth->assert('email_bcc', 'may fail'),
- FILES => \%files,
- is_customer => $self->cv eq 'customer',
+ email_form => $email_form,
+ show_bcc => $::auth->assert('email_bcc', 'may fail'),
+ FILES => \%files,
+ is_customer => $self->cv eq 'customer',
+ ALL_EMPLOYEES => \@employees_with_email,
);
$self->js
$::form->{media} = 'email';
if (($::form->{attachment_policy} // '') !~ m{^(?:old_file|no_file)$}) {
- my $pdf;
- my @errors = generate_pdf($self->order, \$pdf, {media => $::form->{media},
- format => $::form->{print_options}->{format},
- formname => $::form->{print_options}->{formname},
- language => $self->order->language,
- printer_id => $::form->{print_options}->{printer_id},
- groupitems => $::form->{print_options}->{groupitems}});
+ my $doc;
+ my @errors = $self->generate_doc(\$doc, {media => $::form->{media},
+ format => $::form->{print_options}->{format},
+ formname => $::form->{print_options}->{formname},
+ language => $self->order->language,
+ printer_id => $::form->{print_options}->{printer_id},
+ groupitems => $::form->{print_options}->{groupitems}});
if (scalar @errors) {
- return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
+ return $self->js->flash('error', t8('Generating the document failed: #1', $errors[0]))->render($self);
}
- my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $::form->{attachment_filename});
+ my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $::form->{attachment_filename});
if (scalar @warnings) {
flash_later('warning', $_) for @warnings;
}
my $sfile = SL::SessionFile::Random->new(mode => "w");
- $sfile->fh->print($pdf);
+ $sfile->fh->print($doc);
$sfile->fh->close;
$::form->{tmpfile} = $sfile->file_name;
}
$::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
- $::form->send_email(\%::myconfig, 'pdf');
+ $::form->send_email(\%::myconfig, $::form->{print_options}->{format});
# internal notes
my $intnotes = $self->order->intnotes;
if ($::form->{customer_id}) {
$::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]);
- $::form->{email_recipient_invoice_address} = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id})->invoice_mail;
+ my $customer_object = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id});
+ $::form->{postal_invoice} = $customer_object->postal_invoice;
+ $::form->{email_recipient_invoice_address} = $::form->{postal_invoice} ? '' : $customer_object->invoice_mail;
+ $config->send_email(0) if $::form->{postal_invoice};
}
$self->render('oe/edit_periodic_invoices_config', { layout => 0 },
$self->js->hide('#shipto_selection');
}
+ if ($cv_method eq 'customer') {
+ my $show_hide = scalar @{ $self->order->customer->additional_billing_addresses } > 0 ? 'show' : 'hide';
+ $self->js->$show_hide('#billing_address_row');
+ }
+
$self->js->val( '#order_salesman_id', $self->order->salesman_id) if $self->order->is_sales;
$self->js
- ->replaceWith('#order_cp_id', $self->build_contact_select)
- ->replaceWith('#order_shipto_id', $self->build_shipto_select)
- ->replaceWith('#shipto_inputs ', $self->build_shipto_inputs)
- ->replaceWith('#business_info_row', $self->build_business_info_row)
- ->val( '#order_taxzone_id', $self->order->taxzone_id)
- ->val( '#order_taxincluded', $self->order->taxincluded)
- ->val( '#order_currency_id', $self->order->currency_id)
- ->val( '#order_payment_id', $self->order->payment_id)
- ->val( '#order_delivery_term_id', $self->order->delivery_term_id)
- ->val( '#order_intnotes', $self->order->intnotes)
- ->val( '#order_language_id', $self->order->$cv_method->language_id)
+ ->replaceWith('#order_cp_id', $self->build_contact_select)
+ ->replaceWith('#order_shipto_id', $self->build_shipto_select)
+ ->replaceWith('#shipto_inputs ', $self->build_shipto_inputs)
+ ->replaceWith('#order_billing_address_id', $self->build_billing_address_select)
+ ->replaceWith('#business_info_row', $self->build_business_info_row)
+ ->val( '#order_taxzone_id', $self->order->taxzone_id)
+ ->val( '#order_taxincluded', $self->order->taxincluded)
+ ->val( '#order_currency_id', $self->order->currency_id)
+ ->val( '#order_payment_id', $self->order->payment_id)
+ ->val( '#order_delivery_term_id', $self->order->delivery_term_id)
+ ->val( '#order_intnotes', $self->order->intnotes)
+ ->val( '#order_language_id', $self->order->$cv_method->language_id)
->focus( '#order_' . $self->cv . '_id')
->run('kivi.Order.update_exchangerate');
$details{payment_terms} = $cv->payment->description if $cv->payment;
$details{pricegroup} = $cv->pricegroup->pricegroup if $is_customer && $cv->pricegroup;
+ foreach my $entry (@{ $cv->additional_billing_addresses }) {
+ push @{ $details{ADDITIONAL_BILLING_ADDRESSES} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} };
+ }
foreach my $entry (@{ $cv->shipto }) {
push @{ $details{SHIPTO} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} };
}
sub action_add_item {
my ($self) = @_;
+ delete $::form->{add_item}->{create_part_type};
+
my $form_attr = $::form->{add_item};
return unless $form_attr->{parts_id};
$self->render_price_dialog($item);
}
+# save the order in a session variable and redirect to the part controller
+sub action_create_part {
+ my ($self) = @_;
+
+ my $previousform = $::auth->save_form_in_session(non_scalars => 1);
+
+ my $callback = $self->url_for(
+ action => 'return_from_create_part',
+ type => $self->type, # type is needed for check_auth on return
+ previousform => $previousform,
+ );
+
+ flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
+
+ my @redirect_params = (
+ controller => 'Part',
+ action => 'add',
+ part_type => $::form->{add_item}->{create_part_type},
+ callback => $callback,
+ show_abort => 1,
+ );
+
+ $self->redirect_to(@redirect_params);
+}
+
+sub action_return_from_create_part {
+ my ($self) = @_;
+
+ $self->{created_part} = SL::DB::Part->new(id => delete $::form->{new_parts_id})->load if $::form->{new_parts_id};
+
+ $::auth->restore_form_from_session(delete $::form->{previousform});
+
+ # set item ids to new fake id, to identify them as new items
+ foreach my $item (@{$self->order->items_sorted}) {
+ $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+ }
+
+ $self->recalc();
+ $self->get_unalterable_data();
+ $self->pre_render();
+
+ # trigger rendering values for second row/longdescription as hidden,
+ # because they are loaded only on demand. So we need to keep the values
+ # from the source.
+ $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
+ $_->{render_longdescription} = 1 for @{ $self->order->items_sorted };
+
+ $self->render(
+ 'order/form',
+ title => $self->get_title_for('edit'),
+ %{$self->{template_args}}
+ );
+
+}
+
# load the second row for one or more items
#
# This action gets the html code for all items second rows by rendering a template for
);
}
+# build the selection box for the additional billing address
+#
+# Needed, if customer/vendor changed.
+sub build_billing_address_select {
+ my ($self) = @_;
+
+ select_tag('order.billing_address_id',
+ [ {displayable_id => '', id => ''}, $self->order->{$self->cv}->additional_billing_addresses ],
+ value_key => 'id',
+ title_key => 'displayable_id',
+ default => $self->order->billing_address_id,
+ with_empty => 0,
+ style => 'width: 300px',
+ );
+}
+
# build the selection box for shiptos
#
# Needed, if customer/vendor changed.
$order->intnotes($order->customervendor->notes);
- if ($order->is_sales) {
- $order->salesman_id($order->customer->salesman_id || SL::DB::Manager::Employee->current->id);
- $order->taxincluded(defined($order->customer->taxincluded_checked)
- ? $order->customer->taxincluded_checked
- : $::myconfig{taxincluded_checked});
- }
+ return if !$order->is_sales;
+
+ $order->salesman_id($order->customer->salesman_id || SL::DB::Manager::Employee->current->id);
+ $order->taxincluded(defined($order->customer->taxincluded_checked)
+ ? $order->customer->taxincluded_checked
+ : $::myconfig{taxincluded_checked});
+ my $address = $order->customer->default_billing_address;;
+ $order->billing_address_id($address ? $address->id : undef);
}
# setup custom shipto from form
# link records
if ($::form->{converted_from_oe_id}) {
my @converted_from_oe_ids = split ' ', $::form->{converted_from_oe_id};
+
foreach my $converted_from_oe_id (@converted_from_oe_ids) {
my $src = SL::DB::Order->new(id => $converted_from_oe_id)->load;
$src->update_attributes(closed => 1) if $src->type =~ /_quotation$/;
$idx++;
}
}
+
+ $self->link_requirement_specs_linking_to_created_from_objects(@converted_from_oe_ids);
}
+ $self->set_project_in_linked_requirement_specs if $self->order->globalproject_id;
+
$self->save_history('SAVED');
1;
no_queue => 1,
no_postscript => 1,
no_opendocument => 0,
- no_html => 1},
+ no_html => 0},
);
foreach my $item (@{$self->order->orderitems}) {
}
if (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) {
- # calculate shipped qtys here to prevent calling calculate for every item via the items method
- SL::Helper::ShippedQty->new->calculate($self->order)->write_to_objects;
+ # Calculate shipped qtys here to prevent calling calculate for every item via the items method.
+ # Do not use write_to_objects to prevent order->delivered to be set, because this should be
+ # the value from db, which can be set manually or is set when linked delivery orders are saved.
+ SL::Helper::ShippedQty->new->calculate($self->order)->write_to(\@{$self->order->items});
}
if ($self->order->number && $::instance_conf->get_webdav) {
} } @all_objects;
}
+ if ( (any { $self->type eq $_ } (sales_quotation_type(), sales_order_type()))
+ && $::instance_conf->get_transport_cost_reminder_article_number_id ) {
+ $self->{template_args}->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
+ }
+
$self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
- $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
- edit_periodic_invoices_config calculate_qty kivi.Validator follow_up show_history);
+ $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Validator kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
+ edit_periodic_invoices_config calculate_qty follow_up show_history);
$self->setup_edit_action_bar;
}
|| (($self->type eq sales_order_type()) && $::instance_conf->get_sales_order_show_delete)
|| (($self->type eq purchase_order_type()) && $::instance_conf->get_purchase_order_show_delete);
+ my @req_trans_cost_art = qw(kivi.Order.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
+ my @req_cusordnumber = qw(kivi.Order.check_cusordnumber_presence) x($self->type eq sales_order_type() && $::instance_conf->get_order_warn_no_cusordnumber);
+
for my $bar ($::request->layout->get('actionbar')) {
$bar->add(
combobox => [
t8('Save'),
call => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
$::instance_conf->get_order_warn_no_deliverydate,
- ],
- checks => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'] ],
+ ],
+ checks => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'],
+ @req_trans_cost_art, @req_cusordnumber,
+ ],
],
action => [
t8('Save as new'),
call => [ 'kivi.Order.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
- checks => [ 'kivi.Order.check_save_active_periodic_invoices' ],
+ checks => [ 'kivi.Order.check_save_active_periodic_invoices',
+ @req_trans_cost_art, @req_cusordnumber,
+ ],
disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
],
], # end of combobox "Save"
action => [
t8('Save and Quotation'),
submit => [ '#order_form', { action => "Order/sales_quotation" } ],
+ checks => [ @req_trans_cost_art, @req_cusordnumber ],
only_if => (any { $self->type eq $_ } (sales_order_type())),
],
action => [
action => [
t8('Save and Sales Order'),
submit => [ '#order_form', { action => "Order/sales_order" } ],
+ checks => [ @req_trans_cost_art ],
only_if => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())),
],
action => [
t8('Save and Purchase Order'),
call => [ 'kivi.Order.purchase_order_check_for_direct_delivery' ],
+ checks => [ @req_trans_cost_art, @req_cusordnumber ],
only_if => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())),
],
action => [
call => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
$::instance_conf->get_order_warn_no_deliverydate,
],
- checks => [ 'kivi.Order.check_save_active_periodic_invoices' ],
+ checks => [ 'kivi.Order.check_save_active_periodic_invoices',
+ @req_trans_cost_art, @req_cusordnumber,
+ ],
only_if => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type()))
],
action => [
t8('Save and Invoice'),
call => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
- checks => [ 'kivi.Order.check_save_active_periodic_invoices' ],
+ checks => [ 'kivi.Order.check_save_active_periodic_invoices',
+ @req_trans_cost_art, @req_cusordnumber,
+ ],
],
action => [
t8('Save and AP Transaction'),
],
action => [
t8('Save and preview PDF'),
- call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
- $::instance_conf->get_order_warn_no_deliverydate,
- ],
+ call => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
+ $::instance_conf->get_order_warn_no_deliverydate,
+ ],
+ checks => [ @req_trans_cost_art, @req_cusordnumber ],
],
action => [
t8('Save and print'),
- call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts ],
+ call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
+ $::instance_conf->get_order_warn_no_deliverydate,
+ ],
+ checks => [ @req_trans_cost_art, @req_cusordnumber ],
],
action => [
t8('Save and E-mail'),
id => 'save_and_email_action',
- call => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts ],
+ call => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
+ $::instance_conf->get_order_warn_no_deliverydate,
+ ],
disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
],
action => [
action => [
t8('more')
],
+ action => [
+ t8('History'),
+ call => [ 'set_history_window', $self->order->id, 'id' ],
+ disabled => !$self->order->id ? t8('This record has not been saved yet.') : undef,
+ ],
action => [
t8('Follow-Up'),
call => [ 'kivi.Order.follow_up_window' ],
disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
only_if => $::auth->assert('productivity', 1),
],
- action => [
- t8('History'),
- call => [ 'set_history_window', $self->order->id, 'id' ],
- disabled => !$self->order->id ? t8('This record has not been saved yet.') : undef,
- ],
], # end of combobox "more"
);
}
}
-sub generate_pdf {
- my ($order, $pdf_ref, $params) = @_;
+sub generate_doc {
+ my ($self, $doc_ref, $params) = @_;
+ my $order = $self->order;
my @errors = ();
my $print_form = Form->new('');
if ($print_form->{format} =~ /(opendocument|oasis)/i) {
$template_ext = 'odt';
$template_type = 'OpenDocument';
+ } elsif ($print_form->{format} =~ m{html}i) {
+ $template_ext = 'html';
+ $template_type = 'HTML';
}
# search for the template
eval {
$print_form->prepare_for_printing;
- $$pdf_ref = SL::Helper::CreatePDF->create_pdf(
+ $$doc_ref = SL::Helper::CreatePDF->create_pdf(
format => $print_form->{format},
template_type => $template_type,
template => $template_file,
)->save;
}
-sub store_pdf_to_webdav_and_filemanagement {
- my($order, $content, $filename) = @_;
+sub store_doc_to_webdav_and_filemanagement {
+ my ($self, $content, $filename) = @_;
+ my $order = $self->order;
my @errors;
# copy file to webdav folder
$webdav_file->store(data => \$content);
1;
} or do {
- push @errors, t8('Storing PDF to webdav folder failed: #1', $@);
+ push @errors, t8('Storing the document to the WebDAV folder failed: #1', $@);
};
}
if ($order->id && $::instance_conf->get_doc_storage) {
eval {
SL::File->save(object_id => $order->id,
object_type => $order->type,
- mime_type => 'application/pdf',
+ mime_type => SL::MIME->mime_type_from_ext($filename),
source => 'created',
file_type => 'document',
file_name => $filename,
file_contents => $content);
1;
} or do {
- push @errors, t8('Storing PDF in storage backend failed: #1', $@);
+ push @errors, t8('Storing the document in the storage backend failed: #1', $@);
};
}
return @errors;
}
+sub link_requirement_specs_linking_to_created_from_objects {
+ my ($self, @converted_from_oe_ids) = @_;
+
+ return unless @converted_from_oe_ids;
+
+ my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => \@converted_from_oe_ids ]);
+ foreach my $rs_order (@{ $rs_orders }) {
+ SL::DB::RequirementSpecOrder->new(
+ order_id => $self->order->id,
+ requirement_spec_id => $rs_order->requirement_spec_id,
+ version_id => $rs_order->version_id,
+ )->save;
+ }
+}
+
+sub set_project_in_linked_requirement_specs {
+ my ($self) = @_;
+
+ my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => $self->order->id ]);
+ foreach my $rs_order (@{ $rs_orders }) {
+ next if $rs_order->requirement_spec->project_id == $self->order->globalproject_id;
+
+ $rs_order->requirement_spec->update_attributes(project_id => $self->order->globalproject_id);
+ }
+}
+
1;
__END__
=item * optional client/user behaviour
(transactions has to be set - department has to be set -
- force project if enabled in client config - transport cost reminder)
+ force project if enabled in client config)
=back
projects / kivitendo-erp.git / blobdiff