X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=cd36a07a5c6e4c0c701f4953862be9e7981cbbf1;hb=698bf12d23e82883b9cc8920e40e1d15c6298d00;hp=b87049a0a1b62ea36af4462b1414c1670180bd30;hpb=ccbd0240ff944d1fd484c8744349e052df1613fe;p=kivitendo-erp.git diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index b87049a0a..cd36a07a5 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -15,12 +15,14 @@ use SL::DB::Order; use SL::DB::Default; use SL::DB::Unit; use SL::DB::Part; +use SL::DB::PartsGroup; use SL::DB::Printer; use SL::DB::Language; use SL::DB::RecordLink; use SL::Helper::CreatePDF qw(:all); use SL::Helper::PrintOptions; +use SL::Helper::ShippedQty; use SL::Controller::Helper::GetModels; @@ -39,13 +41,13 @@ use Rose::Object::MakeMethods::Generic # safety -__PACKAGE__->run_before('_check_auth'); +__PACKAGE__->run_before('check_auth'); -__PACKAGE__->run_before('_recalc', - only => [ qw(save save_as_new save_and_delivery_order save_and_invoice print create_pdf send_email) ]); +__PACKAGE__->run_before('recalc', + only => [ qw(save save_as_new save_and_delivery_order save_and_invoice print send_email) ]); -__PACKAGE__->run_before('_get_unalterable_data', - only => [ qw(save save_as_new save_and_delivery_order save_and_invoice print create_pdf send_email) ]); +__PACKAGE__->run_before('get_unalterable_data', + only => [ qw(save save_as_new save_and_delivery_order save_and_invoice print send_email) ]); # # actions @@ -56,12 +58,13 @@ sub action_add { my ($self) = @_; $self->order->transdate(DateTime->now_local()); - $self->order->reqdate(DateTime->today_local->next_workday) if !$self->order->reqdate; + my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval : 1; + $self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days)) if !$self->order->reqdate; - $self->_pre_render(); + $self->pre_render(); $self->render( 'order/form', - title => $self->_get_title_for('add'), + title => $self->get_title_for('add'), %{$self->{template_args}} ); } @@ -70,12 +73,28 @@ sub action_add { sub action_edit { my ($self) = @_; - $self->_load_order; - $self->_recalc(); - $self->_pre_render(); + if ($::form->{id}) { + $self->load_order; + + } else { + # this is to edit an order from an unsaved order object + + # 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); + } + # 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->recalc(); + $self->pre_render(); $self->render( 'order/form', - title => $self->_get_title_for('edit'), + title => $self->get_title_for('edit'), %{$self->{template_args}} ); } @@ -84,17 +103,17 @@ sub action_edit { sub action_delete { my ($self) = @_; - my $errors = $self->_delete(); + my $errors = $self->delete(); if (scalar @{ $errors }) { $self->js->flash('error', $_) foreach @{ $errors }; return $self->js->render(); } - my $text = $self->type eq _sales_order_type() ? $::locale->text('The order has been deleted') - : $self->type eq _purchase_order_type() ? $::locale->text('The order has been deleted') - : $self->type eq _sales_quotation_type() ? $::locale->text('The quotation has been deleted') - : $self->type eq _request_quotation_type() ? $::locale->text('The rfq has been deleted') + my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been deleted') + : $self->type eq purchase_order_type() ? $::locale->text('The order has been deleted') + : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been deleted') + : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been deleted') : ''; flash_later('info', $text); @@ -110,17 +129,17 @@ sub action_delete { sub action_save { my ($self) = @_; - my $errors = $self->_save(); + my $errors = $self->save(); if (scalar @{ $errors }) { $self->js->flash('error', $_) foreach @{ $errors }; return $self->js->render(); } - my $text = $self->type eq _sales_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _purchase_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _sales_quotation_type() ? $::locale->text('The quotation has been saved') - : $self->type eq _request_quotation_type() ? $::locale->text('The rfq has been saved') + my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been saved') + : $self->type eq purchase_order_type() ? $::locale->text('The order has been saved') + : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been saved') + : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved') : ''; flash_later('info', $text); @@ -137,32 +156,44 @@ sub action_save { sub action_save_as_new { my ($self) = @_; - if (!$self->order->id) { + my $order = $self->order; + + if (!$order->id) { $self->js->flash('error', t8('This object has not been saved yet.')); return $self->js->render(); } - delete $::form->{$_} for qw(closed delivered converted_from_oe_id converted_from_orderitems_ids); - - my $src_order = SL::DB::Order->new(id => $self->order->id)->load; + # load order from db to check if values changed + my $saved_order = SL::DB::Order->new(id => $order->id)->load; + my %new_attrs; # Lets assign a new number if the user hasn't changed the previous one. # If it has been changed manually then use it as-is. - if (trim($self->order->number) eq $src_order->number) { - $self->order->number(''); - } - - # Clear reqdate and transdate unless changed - if ($self->order->transdate == $src_order->transdate) { - $self->order->transdate(DateTime->today_local) - } - if ($self->order->reqdate == $src_order->reqdate) { - my $extra_days = $self->type eq _sales_quotation_type() ? $::instance_conf->get_reqdate_interval : 1; - $self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days)); + $new_attrs{number} = (trim($order->number) eq $saved_order->number) + ? '' + : trim($order->number); + + # Clear transdate unless changed + $new_attrs{transdate} = ($order->transdate == $saved_order->transdate) + ? DateTime->today_local + : $order->transdate; + + # Set new reqdate unless changed + if ($order->reqdate == $saved_order->reqdate) { + my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval : 1; + $new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days); + } else { + $new_attrs{reqdate} = $order->reqdate; } # Update employee - $self->order->employee(SL::DB::Manager::Employee->current); + $new_attrs{employee} = SL::DB::Manager::Employee->current; + + # Create new record from current one + $self->order(SL::DB::Order->new_from($order, destination_type => $order->type, attributes => \%new_attrs)); + + # no linked records on save as new + delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids); # save $self->action_save(); @@ -185,8 +216,8 @@ sub action_print { my $copies = $::form->{print_options}->{copies}; my $groupitems = $::form->{print_options}->{groupitems}; - # only pdf by now - if (none { $format eq $_ } qw(pdf)) { + # only pdf and opendocument by now + if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf)) { return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render; } @@ -199,19 +230,19 @@ sub action_print { $language = SL::DB::Language->new(id => $::form->{print_options}->{language_id})->load if $::form->{print_options}->{language_id}; # create a form for generate_attachment_filename - my $form = Form->new; - $form->{ordnumber} = $self->order->ordnumber; - $form->{type} = $self->type; - $form->{format} = $format; - $form->{formname} = $formname; - $form->{language} = '_' . $language->template_code if $language; - my $pdf_filename = $form->generate_attachment_filename(); + my $form = Form->new; + $form->{$self->nr_key()} = $self->order->number; + $form->{type} = $self->type; + $form->{format} = $format; + $form->{formname} = $formname; + $form->{language} = '_' . $language->template_code if $language; + my $pdf_filename = $form->generate_attachment_filename(); my $pdf; - my @errors = _create_pdf($self->order, \$pdf, { format => $format, - formname => $formname, - language => $language, - groupitems => $groupitems }); + my @errors = generate_pdf($self->order, \$pdf, { format => $format, + formname => $formname, + language => $language, + groupitems => $groupitems }); if (scalar @errors) { return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render; } @@ -223,7 +254,7 @@ sub action_print { $sfile->fh->close; my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000); - $::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name); + $::auth->set_session_value("Order::print-${key}" => $sfile->file_name); $self->js ->run('kivi.Order.download_pdf', $pdf_filename, $key) @@ -241,10 +272,10 @@ sub action_print { } # copy file to webdav folder - if ($self->order->ordnumber && $::instance_conf->get_webdav_documents) { + if ($self->order->number && $::instance_conf->get_webdav_documents) { my $webdav = SL::Webdav->new( type => $self->type, - number => $self->order->ordnumber, + number => $self->order->number, ); my $webdav_file = SL::Webdav::File->new( webdav => $webdav, @@ -257,7 +288,7 @@ sub action_print { $self->js->flash('error', t8('Storing PDF to webdav folder failed: #1', $@)); } } - if ($self->order->ordnumber && $::instance_conf->get_doc_storage) { + if ($self->order->number && $::instance_conf->get_doc_storage) { eval { SL::File->save(object_id => $self->order->id, object_type => $self->type, @@ -281,7 +312,7 @@ sub action_download_pdf { my ($self) = @_; my $key = $::form->{key}; - my $tmp_filename = $::auth->get_session_value("Order::create_pdf-${key}"); + my $tmp_filename = $::auth->get_session_value("Order::print-${key}"); return $self->send_file( $tmp_filename, type => 'application/pdf', @@ -308,18 +339,18 @@ sub action_show_email_dialog { # Todo: get addresses from shipto, if any my $form = Form->new; - $form->{ordnumber} = $self->order->ordnumber; - $form->{formname} = $self->type; - $form->{type} = $self->type; - $form->{language} = 'de'; - $form->{format} = 'pdf'; + $form->{$self->nr_key()} = $self->order->number; + $form->{formname} = $self->type; + $form->{type} = $self->type; + $form->{language} = 'de'; + $form->{format} = 'pdf'; $email_form->{subject} = $form->generate_email_subject(); $email_form->{attachment_filename} = $form->generate_attachment_filename(); $email_form->{message} = $form->generate_email_body(); $email_form->{js_send_function} = 'kivi.Order.send_email()'; - my %files = $self->_get_files_for_email_dialog(); + my %files = $self->get_files_for_email_dialog(); my $dialog_html = $self->render('common/_send_email_dialog', { output => 0 }, email_form => $email_form, show_bcc => $::auth->assert('email_bcc', 'may fail'), @@ -348,18 +379,19 @@ sub action_send_email { $::form->{cwd} = getcwd(); $::form->{tmpdir} = $::lx_office_conf{paths}->{userspath}; + $::form->{$_} = $::form->{print_options}->{$_} for keys %{ $::form->{print_options} }; $::form->{media} = 'email'; - if (($::form->{attachment_policy} // '') eq 'normal') { + if (($::form->{attachment_policy} // '') !~ m{^(?:old_file|no_file)$}) { my $language; $language = SL::DB::Language->new(id => $::form->{print_options}->{language_id})->load if $::form->{print_options}->{language_id}; my $pdf; - my @errors = _create_pdf($self->order, \$pdf, {media => $::form->{media}, - format => $::form->{print_options}->{format}, - formname => $::form->{print_options}->{formname}, - language => $language, - groupitems => $::form->{print_options}->{groupitems}}); + my @errors = generate_pdf($self->order, \$pdf, {media => $::form->{media}, + format => $::form->{print_options}->{format}, + formname => $::form->{print_options}->{formname}, + language => $language, + groupitems => $::form->{print_options}->{groupitems}}); if (scalar @errors) { return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self); } @@ -399,7 +431,7 @@ sub action_send_email { sub action_show_periodic_invoices_config_dialog { my ($self) = @_; - my $config = _make_periodic_invoices_config_from_yaml(delete $::form->{config}); + my $config = make_periodic_invoices_config_from_yaml(delete $::form->{config}); $config ||= SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $::form->{id}) if $::form->{id}; $config ||= SL::DB::PeriodicInvoicesConfig->new(periodicity => 'm', order_value_periodicity => 'p', # = same as periodicity @@ -441,19 +473,19 @@ sub action_assign_periodic_invoices_config { $::form->isblank('start_date_as_date', $::locale->text('The start date is missing.')); - my $config = { active => $::form->{active} ? 1 : 0, - terminated => $::form->{terminated} ? 1 : 0, - direct_debit => $::form->{direct_debit} ? 1 : 0, - periodicity => (any { $_ eq $::form->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES) ? $::form->{periodicity} : 'm', - order_value_periodicity => (any { $_ eq $::form->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES)) ? $::form->{order_value_periodicity} : 'p', - start_date_as_date => $::form->{start_date_as_date}, - end_date_as_date => $::form->{end_date_as_date}, + my $config = { active => $::form->{active} ? 1 : 0, + terminated => $::form->{terminated} ? 1 : 0, + direct_debit => $::form->{direct_debit} ? 1 : 0, + periodicity => (any { $_ eq $::form->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES) ? $::form->{periodicity} : 'm', + order_value_periodicity => (any { $_ eq $::form->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES)) ? $::form->{order_value_periodicity} : 'p', + start_date_as_date => $::form->{start_date_as_date}, + end_date_as_date => $::form->{end_date_as_date}, first_billing_date_as_date => $::form->{first_billing_date_as_date}, - print => $::form->{print} ? 1 : 0, - printer_id => $::form->{print} ? $::form->{printer_id} * 1 : undef, - copies => $::form->{copies} * 1 ? $::form->{copies} : 1, - extend_automatically_by => $::form->{extend_automatically_by} * 1 || undef, - ar_chart_id => $::form->{ar_chart_id} * 1, + print => $::form->{print} ? 1 : 0, + printer_id => $::form->{print} ? $::form->{printer_id} * 1 : undef, + copies => $::form->{copies} * 1 ? $::form->{copies} : 1, + extend_automatically_by => $::form->{extend_automatically_by} * 1 || undef, + ar_chart_id => $::form->{ar_chart_id} * 1, send_email => $::form->{send_email} ? 1 : 0, email_recipient_contact_id => $::form->{email_recipient_contact_id} * 1 || undef, email_recipient_address => $::form->{email_recipient_address}, @@ -464,7 +496,7 @@ sub action_assign_periodic_invoices_config { my $periodic_invoices_config = YAML::Dump($config); - my $status = $self->_get_periodic_invoices_status($config); + my $status = $self->get_periodic_invoices_status($config); $self->js ->remove('#order_periodic_invoices_config') @@ -478,11 +510,11 @@ sub action_assign_periodic_invoices_config { sub action_get_has_active_periodic_invoices { my ($self) = @_; - my $config = _make_periodic_invoices_config_from_yaml(delete $::form->{config}); + my $config = make_periodic_invoices_config_from_yaml(delete $::form->{config}); $config ||= SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $::form->{id}) if $::form->{id}; my $has_active_periodic_invoices = - $self->type eq _sales_order_type() + $self->type eq sales_order_type() && $config && $config->active && (!$config->end_date || ($config->end_date > DateTime->today_local)) @@ -496,17 +528,17 @@ sub action_get_has_active_periodic_invoices { sub action_save_and_delivery_order { my ($self) = @_; - my $errors = $self->_save(); + my $errors = $self->save(); if (scalar @{ $errors }) { $self->js->flash('error', $_) foreach @{ $errors }; return $self->js->render(); } - my $text = $self->type eq _sales_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _purchase_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _sales_quotation_type() ? $::locale->text('The quotation has been saved') - : $self->type eq _request_quotation_type() ? $::locale->text('The rfq has been saved') + my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been saved') + : $self->type eq purchase_order_type() ? $::locale->text('The order has been saved') + : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been saved') + : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved') : ''; flash_later('info', $text); @@ -524,17 +556,17 @@ sub action_save_and_delivery_order { sub action_save_and_invoice { my ($self) = @_; - my $errors = $self->_save(); + my $errors = $self->save(); if (scalar @{ $errors }) { $self->js->flash('error', $_) foreach @{ $errors }; return $self->js->render(); } - my $text = $self->type eq _sales_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _purchase_order_type() ? $::locale->text('The order has been saved') - : $self->type eq _sales_quotation_type() ? $::locale->text('The quotation has been saved') - : $self->type eq _request_quotation_type() ? $::locale->text('The rfq has been saved') + my $text = $self->type eq sales_order_type() ? $::locale->text('The order has been saved') + : $self->type eq purchase_order_type() ? $::locale->text('The order has been saved') + : $self->type eq sales_quotation_type() ? $::locale->text('The quotation has been saved') + : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved') : ''; flash_later('info', $text); @@ -549,12 +581,12 @@ sub action_save_and_invoice { # workflow from sales quotation to sales order sub action_sales_order { - $_[0]->_workflow_sales_or_purchase_order(); + $_[0]->workflow_sales_or_purchase_order(); } # workflow from rfq to purchase order sub action_purchase_order { - $_[0]->_workflow_sales_or_purchase_order(); + $_[0]->workflow_sales_or_purchase_order(); } # set form elements in respect to a changed customer or vendor @@ -563,6 +595,9 @@ sub action_purchase_order { sub action_customer_vendor_changed { my ($self) = @_; + setup_order_from_cv($self->order); + $self->recalc(); + my $cv_method = $self->cv; if ($self->order->$cv_method->contacts && scalar @{ $self->order->$cv_method->contacts } > 0) { @@ -577,34 +612,57 @@ sub action_customer_vendor_changed { $self->js->hide('#shipto_row'); } - $self->order->taxzone_id($self->order->$cv_method->taxzone_id); - - if ($self->order->is_sales) { - $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked) - ? $self->order->$cv_method->taxincluded_checked - : $::myconfig{taxincluded_checked}); - $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id); - } - - $self->order->payment_id($self->order->$cv_method->payment_id); - $self->order->delivery_term_id($self->order->$cv_method->delivery_term_id); - - $self->_recalc(); + $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('#business_info_row', $self->build_business_info_row) ->val( '#order_taxzone_id', $self->order->taxzone_id) ->val( '#order_taxincluded', $self->order->taxincluded) ->val( '#order_payment_id', $self->order->payment_id) ->val( '#order_delivery_term_id', $self->order->delivery_term_id) - ->val( '#order_intnotes', $self->order->$cv_method->notes) + ->val( '#order_intnotes', $self->order->intnotes) ->focus( '#order_' . $self->cv . '_id'); - $self->_js_redisplay_amounts_and_taxes; + $self->js_redisplay_amounts_and_taxes; $self->js->render(); } +# open the dialog for customer/vendor details +sub action_show_customer_vendor_details_dialog { + my ($self) = @_; + + my $is_customer = 'customer' eq $::form->{vc}; + my $cv; + if ($is_customer) { + $cv = SL::DB::Customer->new(id => $::form->{vc_id})->load; + } else { + $cv = SL::DB::Vendor->new(id => $::form->{vc_id})->load; + } + + my %details = map { $_ => $cv->$_ } @{$cv->meta->columns}; + $details{discount_as_percent} = $cv->discount_as_percent; + $details{creditlimt} = $cv->creditlimit_as_number; + $details{business} = $cv->business->description if $cv->business; + $details{language} = $cv->language_obj->description if $cv->language_obj; + $details{delivery_terms} = $cv->delivery_term->description if $cv->delivery_term; + $details{payment_terms} = $cv->payment->description if $cv->payment; + $details{pricegroup} = $cv->pricegroup->pricegroup if $is_customer && $cv->pricegroup; + + foreach my $entry (@{ $cv->shipto }) { + push @{ $details{SHIPTO} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} }; + } + foreach my $entry (@{ $cv->contacts }) { + push @{ $details{CONTACTS} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} }; + } + + $_[0]->render('common/show_vc_details', { layout => 0 }, + is_customer => $is_customer, + %details); + +} + # called if a unit in an existing item row is changed sub action_unit_changed { my ($self) = @_; @@ -615,12 +673,12 @@ sub action_unit_changed { my $old_unit_obj = SL::DB::Unit->new(name => $::form->{old_unit})->load; $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj)); - $self->_recalc(); + $self->recalc(); $self->js ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number); - $self->_js_redisplay_line_values; - $self->_js_redisplay_amounts_and_taxes; + $self->js_redisplay_line_values; + $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -632,11 +690,11 @@ sub action_add_item { return unless $form_attr->{parts_id}; - my $item = _new_item($self->order, $form_attr); + my $item = new_item($self->order, $form_attr); $self->order->add_items($item); - $self->_recalc(); + $self->recalc(); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); my $row_as_html = $self->p->render('order/tabs/_row', @@ -657,13 +715,13 @@ sub action_add_item { unit => $assortment_item->unit, description => $assortment_item->part->description, }; - my $item = _new_item($self->order, $attr); + my $item = new_item($self->order, $attr); # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount $item->discount(1) unless $assortment_item->charge; $self->order->add_items( $item ); - $self->_recalc(); + $self->recalc(); my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item, @@ -683,13 +741,12 @@ sub action_add_item { ->run('kivi.Order.renumber_positions') ->focus('#add_item_parts_id_name'); - $self->_js_redisplay_amounts_and_taxes; + $self->js_redisplay_amounts_and_taxes; $self->js->render(); } # open the dialog for entering multiple items at once sub action_show_multi_items_dialog { - require SL::DB::PartsGroup; $_[0]->render('order/tabs/_multi_items_dialog', { layout => 0 }, all_partsgroups => SL::DB::Manager::PartsGroup->get_all); } @@ -724,7 +781,7 @@ sub action_add_multi_items { my @items; foreach my $attr (@form_attr) { - my $item = _new_item($self->order, $attr); + my $item = new_item($self->order, $attr); push @items, $item; if ( $item->part->is_assortment ) { foreach my $assortment_item ( @{$item->part->assortment_items} ) { @@ -733,7 +790,7 @@ sub action_add_multi_items { unit => $assortment_item->unit, description => $assortment_item->part->description, }; - my $item = _new_item($self->order, $attr); + my $item = new_item($self->order, $attr); # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount $item->discount(1) unless $assortment_item->charge; @@ -743,7 +800,7 @@ sub action_add_multi_items { } $self->order->add_items(@items); - $self->_recalc(); + $self->recalc(); foreach my $item (@items) { my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000); @@ -764,7 +821,7 @@ sub action_add_multi_items { ->run('kivi.Order.renumber_positions') ->focus('#add_item_parts_id_name'); - $self->_js_redisplay_amounts_and_taxes; + $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -772,10 +829,10 @@ sub action_add_multi_items { sub action_recalc_amounts_and_taxes { my ($self) = @_; - $self->_recalc(); + $self->recalc(); - $self->_js_redisplay_line_values; - $self->_js_redisplay_amounts_and_taxes; + $self->js_redisplay_line_values; + $self->js_redisplay_amounts_and_taxes; $self->js->render(); } @@ -836,13 +893,13 @@ sub action_get_item_longdescription { sub action_load_second_rows { my ($self) = @_; - $self->_recalc() if $self->order->is_sales; # for margin calculation + $self->recalc() if $self->order->is_sales; # for margin calculation foreach my $item_id (@{ $::form->{item_ids} }) { my $idx = first_index { $_ eq $item_id } @{ $::form->{orderitem_ids} }; my $item = $self->order->items_sorted->[$idx]; - $self->_js_load_second_row($item, $item_id, 0); + $self->js_load_second_row($item, $item_id, 0); } $self->js->run('kivi.Order.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback @@ -850,7 +907,7 @@ sub action_load_second_rows { $self->js->render(); } -sub _js_load_second_row { +sub js_load_second_row { my ($self, $item, $item_id, $do_parse) = @_; if ($do_parse) { @@ -870,7 +927,7 @@ sub _js_load_second_row { ->data('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', 'loaded', 1); } -sub _js_redisplay_line_values { +sub js_redisplay_line_values { my ($self) = @_; my $is_sales = $self->order->is_sales; @@ -895,7 +952,7 @@ sub _js_redisplay_line_values { ->run('kivi.Order.redisplay_line_values', $is_sales, \@data); } -sub _js_redisplay_amounts_and_taxes { +sub js_redisplay_amounts_and_taxes { my ($self) = @_; if (scalar @{ $self->{taxes} }) { @@ -922,7 +979,7 @@ sub _js_redisplay_amounts_and_taxes { # sub init_valid_types { - [ _sales_order_type(), _purchase_order_type(), _sales_quotation_type(), _request_quotation_type() ]; + [ sales_order_type(), purchase_order_type(), sales_quotation_type(), request_quotation_type() ]; } sub init_type { @@ -938,8 +995,8 @@ sub init_type { sub init_cv { my ($self) = @_; - my $cv = (any { $self->type eq $_ } (_sales_order_type(), _sales_quotation_type())) ? 'customer' - : (any { $self->type eq $_ } (_purchase_order_type(), _request_quotation_type())) ? 'vendor' + my $cv = (any { $self->type eq $_ } (sales_order_type(), sales_quotation_type())) ? 'customer' + : (any { $self->type eq $_ } (purchase_order_type(), request_quotation_type())) ? 'vendor' : die "Not a valid type for order"; return $cv; @@ -950,7 +1007,7 @@ sub init_p { } sub init_order { - $_[0]->_make_order; + $_[0]->make_order; } # model used to filter/display the parts in the multi-items dialog @@ -975,7 +1032,7 @@ sub init_all_price_factors { SL::DB::Manager::PriceFactor->get_all; } -sub _check_auth { +sub check_auth { my ($self) = @_; my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} }; @@ -1016,6 +1073,14 @@ sub build_shipto_select { ); } +# render the info line for business +# +# Needed, if customer/vendor changed. +sub build_business_info_row +{ + $_[0]->p->render('order/tabs/_business_info_row', SELF => $_[0]); +} + # build the rows for displaying taxes # # Called if amounts where recalculated and redisplayed. @@ -1051,12 +1116,12 @@ sub render_price_dialog { $self->js->render; } -sub _load_order { +sub load_order { my ($self) = @_; return if !$::form->{id}; - $self->order(SL::DB::Manager::Order->find_by(id => $::form->{id})); + $self->order(SL::DB::Order->new(id => $::form->{id})->load); } # load or create a new order object @@ -1064,8 +1129,8 @@ sub _load_order { # And assign changes from the form to this object. # If the order is loaded from db, check if items are deleted in the form, # remove them form the object and collect them for removing from db on saving. -# Then create/update items from form (via _make_item) and add them. -sub _make_order { +# Then create/update items from form (via make_item) and add them. +sub make_order { my ($self) = @_; # add_items adds items to an order with no items for saving, but they cannot @@ -1074,14 +1139,20 @@ sub _make_order { my $order; $order = SL::DB::Manager::Order->find_by(id => $::form->{id}) if $::form->{id}; $order ||= SL::DB::Order->new(orderitems => [], - quotation => (any { $self->type eq $_ } (_sales_quotation_type(), _request_quotation_type()))); + quotation => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type()))); + + my $cv_id_method = $self->cv . '_id'; + if (!$::form->{id} && $::form->{$cv_id_method}) { + $order->$cv_id_method($::form->{$cv_id_method}); + setup_order_from_cv($order); + } my $form_orderitems = delete $::form->{order}->{orderitems}; my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config}; $order->assign_attributes(%{$::form->{order}}); - my $periodic_invoices_config = _make_periodic_invoices_config_from_yaml($form_periodic_invoices_config); + my $periodic_invoices_config = make_periodic_invoices_config_from_yaml($form_periodic_invoices_config); $order->periodic_invoices_config($periodic_invoices_config) if $periodic_invoices_config; # remove deleted items @@ -1097,7 +1168,7 @@ sub _make_order { my @items; my $pos = 1; foreach my $form_attr (@{$form_orderitems}) { - my $item = _make_item($order, $form_attr); + my $item = make_item($order, $form_attr); $item->position($pos); push @items, $item; $pos++; @@ -1111,7 +1182,7 @@ sub _make_order { # # Make item objects from form values. For items already existing read from db. # Create a new item else. And assign attributes. -sub _make_item { +sub make_item { my ($record, $attr) = @_; my $item; @@ -1135,10 +1206,18 @@ sub _make_item { # create a new item # # This is used to add one item -sub _new_item { +sub new_item { my ($record, $attr) = @_; my $item = SL::DB::OrderItem->new; + + # Remove attributes where the user left or set the inputs empty. + # So these attributes will be undefined and we can distinguish them + # from zero later on. + for (qw(qty_as_number sellprice_as_number discount_as_percent)) { + delete $attr->{$_} if $attr->{$_} eq ''; + } + $item->assign_attributes(%$attr); my $part = SL::DB::Part->new(id => $attr->{parts_id})->load; @@ -1151,7 +1230,7 @@ sub _new_item { # add assortment items with price 0, as the components carry the price $price_src = $price_source->price_from_source(""); $price_src->price(0); - } elsif ($item->sellprice) { + } elsif (defined $item->sellprice) { $price_src = $price_source->price_from_source(""); $price_src->price($item->sellprice); } else { @@ -1162,7 +1241,7 @@ sub _new_item { } my $discount_src; - if ($item->discount) { + if (defined $item->discount) { $discount_src = $price_source->discount_from_source(""); $discount_src->discount($item->discount); } else { @@ -1195,10 +1274,26 @@ sub _new_item { return $item; } +sub setup_order_from_cv { + my ($order) = @_; + + $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id)); + + $order->intnotes($order->customervendor->notes); + + if ($order->is_sales) { + $order->salesman_id($order->customer->salesman_id); + $order->taxincluded(defined($order->customer->taxincluded_checked) + ? $order->customer->taxincluded_checked + : $::myconfig{taxincluded_checked}); + } + +} + # recalculate prices and taxes # # Using the PriceTaxCalculator. Store linetotals in the item objects. -sub _recalc { +sub recalc { my ($self) = @_; # bb: todo: currency later @@ -1221,7 +1316,7 @@ sub _recalc { # get data for saving, printing, ..., that is not changed in the form # # Only cvars for now. -sub _get_unalterable_data { +sub get_unalterable_data { my ($self) = @_; foreach my $item (@{ $self->order->items }) { @@ -1237,7 +1332,7 @@ sub _get_unalterable_data { # delete the order # # And remove related files in the spool directory -sub _delete { +sub delete { my ($self) = @_; my $errors = []; @@ -1259,7 +1354,7 @@ sub _delete { # save the order # # And delete items that are deleted in the form. -sub _save { +sub save { my ($self) = @_; my $errors = []; @@ -1293,24 +1388,32 @@ sub _save { return $errors; } -sub _workflow_sales_or_purchase_order { +sub workflow_sales_or_purchase_order { my ($self) = @_; - my $destination_type = $::form->{type} eq _sales_quotation_type() ? _sales_order_type() - : $::form->{type} eq _request_quotation_type() ? _purchase_order_type() + my $destination_type = $::form->{type} eq sales_quotation_type() ? sales_order_type() + : $::form->{type} eq request_quotation_type() ? purchase_order_type() + : $::form->{type} eq purchase_order_type() ? sales_order_type() + : $::form->{type} eq sales_order_type() ? purchase_order_type() : ''; $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type)); $self->{converted_from_oe_id} = delete $::form->{id}; + # 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); + } + # change form type $::form->{type} = $destination_type; - $self->init_type; - $self->_check_auth; + $self->type($self->init_type); + $self->cv ($self->init_cv); + $self->check_auth; - $self->_recalc(); - $self->_get_unalterable_data(); - $self->_pre_render(); + $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 @@ -1320,13 +1423,13 @@ sub _workflow_sales_or_purchase_order { $self->render( 'order/form', - title => $self->_get_title_for('edit'), + title => $self->get_title_for('edit'), %{$self->{template_args}} ); } -sub _pre_render { +sub pre_render { my ($self) = @_; $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); @@ -1337,14 +1440,11 @@ sub _pre_render { $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->salesman_id, deleted => 0 ] ], sort_by => 'name'); - $self->{all_projects} = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id, - active => 1 ] ], - sort_by => 'projectnumber'); $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id, obsolete => 0 ] ]); $self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); $self->{current_employee_id} = SL::DB::Manager::Employee->current->id; - $self->{periodic_invoices_status} = $self->_get_periodic_invoices_status($self->order->periodic_invoices_config); + $self->{periodic_invoices_status} = $self->get_periodic_invoices_status($self->order->periodic_invoices_config); $self->{order_probabilities} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; my $print_form = Form->new(''); @@ -1357,7 +1457,7 @@ sub _pre_render { show_headers => 1, no_queue => 1, no_postscript => 1, - no_opendocument => 1, + no_opendocument => 0, no_html => 1}, ); @@ -1367,10 +1467,15 @@ sub _pre_render { $item->active_discount_source($price_source->discount_from_source($item->active_discount_source)); } - if ($self->order->ordnumber && $::instance_conf->get_webdav) { + 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; + } + + if ($self->order->number && $::instance_conf->get_webdav) { my $webdav = SL::Webdav->new( type => $self->type, - number => $self->order->ordnumber, + number => $self->order->number, ); my @all_objects = $webdav->get_all_objects; @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename, @@ -1379,23 +1484,25 @@ sub _pre_render { } } @all_objects; } - $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery edit_periodic_invoices_config); - $self->_setup_edit_action_bar; + $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery edit_periodic_invoices_config calculate_qty); + $self->setup_edit_action_bar; } -sub _setup_edit_action_bar { +sub setup_edit_action_bar { my ($self, %params) = @_; - my $deletion_allowed = (any { $self->type eq $_ } (_sales_quotation_type(), _request_quotation_type())) - || (($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 $deletion_allowed = (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())) + || (($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); for my $bar ($::request->layout->get('actionbar')) { $bar->add( combobox => [ action => [ t8('Save'), - call => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts ], + 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' ], ], action => [ @@ -1406,9 +1513,11 @@ sub _setup_edit_action_bar { ], action => [ t8('Save and Delivery Order'), - call => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ], + 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' ], - only_if => (any { $self->type eq $_ } (_sales_order_type(), _purchase_order_type())) + only_if => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) ], action => [ t8('Save and Invoice'), @@ -1424,13 +1533,13 @@ sub _setup_edit_action_bar { action => [ t8('Sales Order'), submit => [ '#order_form', { action => "Order/sales_order" } ], - only_if => (any { $self->type eq $_ } (_sales_quotation_type())), + only_if => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())), disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, ], action => [ t8('Purchase Order'), submit => [ '#order_form', { action => "Order/purchase_order" } ], - only_if => (any { $self->type eq $_ } (_request_quotation_type())), + only_if => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())), disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef, ], ], # end of combobox "Workflow" @@ -1466,7 +1575,7 @@ sub _setup_edit_action_bar { } } -sub _create_pdf { +sub generate_pdf { my ($order, $pdf_ref, $params) = @_; my @errors = (); @@ -1482,9 +1591,17 @@ sub _create_pdf { $order->language($params->{language}); $order->flatten_to_form($print_form, format_amounts => 1); + my $template_ext; + my $template_type; + if ($print_form->{format} =~ /(opendocument|oasis)/i) { + $template_ext = 'odt'; + $template_type = 'OpenDocument'; + } + # search for the template my ($template_file, @template_files) = SL::Helper::CreatePDF->find_template( name => $print_form->{formname}, + extension => $template_ext, email => $print_form->{media} eq 'email', language => $params->{language}, printer_id => $print_form->{printer_id}, # todo @@ -1501,8 +1618,10 @@ sub _create_pdf { $print_form->prepare_for_printing; $$pdf_ref = SL::Helper::CreatePDF->create_pdf( - template => $template_file, - variables => $print_form, + format => $print_form->{format}, + template_type => $template_type, + template => $template_file, + variables => $print_form, variable_content_types => { longdescription => 'html', partnotes => 'html', @@ -1516,7 +1635,7 @@ sub _create_pdf { return @errors; } -sub _get_files_for_email_dialog { +sub get_files_for_email_dialog { my ($self) = @_; my %files = map { ($_ => []) } qw(versions files vc_files part_files); @@ -1548,7 +1667,7 @@ sub _get_files_for_email_dialog { return %files; } -sub _make_periodic_invoices_config_from_yaml { +sub make_periodic_invoices_config_from_yaml { my ($yaml_config) = @_; return if !$yaml_config; @@ -1558,10 +1677,10 @@ sub _make_periodic_invoices_config_from_yaml { } -sub _get_periodic_invoices_status { +sub get_periodic_invoices_status { my ($self, $config) = @_; - return if $self->type ne _sales_order_type(); + return if $self->type ne sales_order_type(); return t8('not configured') if !$config; my $active = ('HASH' eq ref $config) ? $config->{active} @@ -1571,7 +1690,7 @@ sub _get_periodic_invoices_status { return $active ? t8('active') : t8('inactive'); } -sub _get_title_for { +sub get_title_for { my ($self, $action) = @_; return '' if none { lc($action)} qw(add edit); @@ -1587,29 +1706,37 @@ sub _get_title_for { # $::locale->text("Edit Request for Quotation"); $action = ucfirst(lc($action)); - return $self->type eq _sales_order_type() ? $::locale->text("$action Sales Order") - : $self->type eq _purchase_order_type() ? $::locale->text("$action Purchase Order") - : $self->type eq _sales_quotation_type() ? $::locale->text("$action Quotation") - : $self->type eq _request_quotation_type() ? $::locale->text("$action Request for Quotation") + return $self->type eq sales_order_type() ? $::locale->text("$action Sales Order") + : $self->type eq purchase_order_type() ? $::locale->text("$action Purchase Order") + : $self->type eq sales_quotation_type() ? $::locale->text("$action Quotation") + : $self->type eq request_quotation_type() ? $::locale->text("$action Request for Quotation") : ''; } -sub _sales_order_type { +sub sales_order_type { 'sales_order'; } -sub _purchase_order_type { +sub purchase_order_type { 'purchase_order'; } -sub _sales_quotation_type { +sub sales_quotation_type { 'sales_quotation'; } -sub _request_quotation_type { +sub request_quotation_type { 'request_quotation'; } +sub nr_key { + return $_[0]->type eq sales_order_type() ? 'ordnumber' + : $_[0]->type eq purchase_order_type() ? 'ordnumber' + : $_[0]->type eq sales_quotation_type() ? 'quonumber' + : $_[0]->type eq request_quotation_type() ? 'quonumber' + : ''; +} + 1; __END__ @@ -1695,6 +1822,10 @@ reused from generic code. =over 4 +=item * C