use SL::PriceSource;
use SL::Webdav;
use SL::File;
+use SL::MIME;
use SL::Util qw(trim);
+use SL::YAML;
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::Helper::UserPreferences::PositionsScrollbar;
use SL::Controller::Helper::GetModels;
use English qw(-no_match_vars);
use File::Spec;
use Cwd;
+use Sort::Naturally;
use Rose::Object::MakeMethods::Generic
(
scalar => [ qw(item_ids_to_delete) ],
- 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors search_cvpartnumber) ],
);
# 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
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' ? $::instance_conf->get_reqdate_interval :
+ $self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_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}}
);
}
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}}
);
}
+# edit a collective order (consisting of one or more existing orders)
+sub action_edit_collective {
+ my ($self) = @_;
+
+ # collect order ids
+ my @multi_ids = map {
+ $_ =~ m{^multi_id_(\d+)$} && $::form->{'multi_id_' . $1} && $::form->{'trans_id_' . $1} && $::form->{'trans_id_' . $1}
+ } grep { $_ =~ m{^multi_id_\d+$} } keys %$::form;
+
+ # fall back to add if no ids are given
+ if (scalar @multi_ids == 0) {
+ $self->action_add();
+ return;
+ }
+
+ # fall back to save as new if only one id is given
+ if (scalar @multi_ids == 1) {
+ $self->order(SL::DB::Order->new(id => $multi_ids[0])->load);
+ $self->action_save_as_new();
+ return;
+ }
+
+ # make new order from given orders
+ my @multi_orders = map { SL::DB::Order->new(id => $_)->load } @multi_ids;
+ $self->{converted_from_oe_id} = join ' ', map { $_->id } @multi_orders;
+ $self->order(SL::DB::Order->new_from_multi(\@multi_orders, sort_sources_by => 'transdate'));
+
+ $self->action_edit();
+}
+
# delete the order
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);
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);
# 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;
+ my $extra_days = $self->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval :
+ $self->{type} eq 'sales_order' ? $::instance_conf->get_delivery_date_interval : 1;
$new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days);
} else {
$new_attrs{reqdate} = $order->reqdate;
sub action_print {
my ($self) = @_;
+ my $errors = $self->save();
+
+ if (scalar @{ $errors }) {
+ $self->js->flash('error', $_) foreach @{ $errors };
+ return $self->js->render();
+ }
+
+ $self->js_reset_order_and_item_ids_after_save;
+
my $format = $::form->{print_options}->{format};
my $media = $::form->{print_options}->{media};
my $formname = $::form->{print_options}->{formname};
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;
}
$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;
}
$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)
}
# 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,
$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,
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',
+ type => SL::MIME->mime_type_from_ext($::form->{pdf_filename}),
name => $::form->{pdf_filename},
);
}
# 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'),
sub action_send_email {
my ($self) = @_;
+ my $errors = $self->save();
+
+ if (scalar @{ $errors }) {
+ $self->js->run('kivi.Order.close_email_dialog');
+ $self->js->flash('error', $_) foreach @{ $errors };
+ return $self->js->render();
+ }
+
+ $self->js_reset_order_and_item_ids_after_save;
+
my $email_form = delete $::form->{email_form};
my %field_names = (to => '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);
}
$intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
$intnotes .= t8('Message') . ": " . $::form->{message};
+ $self->order->update_attributes(intnotes => $intnotes);
+
$self->js
->val('#order_intnotes', $intnotes)
->run('kivi.Order.close_email_dialog')
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
- start_date_as_date => $::form->{transdate} || $::form->current_date,
+ start_date_as_date => $::form->{transdate_as_date} || $::form->current_date,
extend_automatically_by => 12,
active => 1,
email_subject => GenericTranslations->get(
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;
}
$self->render('oe/edit_periodic_invoices_config', { layout => 0 },
$::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},
email_body => $::form->{email_body},
};
- my $periodic_invoices_config = YAML::Dump($config);
+ my $periodic_invoices_config = SL::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')
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))
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);
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);
# 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
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) {
$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)
->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)
+ ->val( '#language_id', $self->order->$cv_method->language_id)
->focus( '#order_' . $self->cv . '_id');
- $self->_js_redisplay_amounts_and_taxes;
+ $self->js_redisplay_amounts_and_taxes;
+ $self->js_redisplay_cvpartnumbers;
$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) = @_;
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();
}
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();
+
+ $self->get_item_cvpartnumber($item);
my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
my $row_as_html = $self->p->render('order/tabs/_row',
- ITEM => $item,
- ID => $item_id,
- TYPE => $self->type,
- ALL_PRICE_FACTORS => $self->all_price_factors
+ ITEM => $item,
+ ID => $item_id,
+ TYPE => $self->type,
+ ALL_PRICE_FACTORS => $self->all_price_factors,
+ SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
);
$self->js
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();
+ $self->get_item_cvpartnumber($item);
my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
my $row_as_html = $self->p->render('order/tabs/_row',
- ITEM => $item,
- ID => $item_id,
- TYPE => $self->type,
- ALL_PRICE_FACTORS => $self->all_price_factors
+ ITEM => $item,
+ ID => $item_id,
+ TYPE => $self->type,
+ ALL_PRICE_FACTORS => $self->all_price_factors,
+ SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
);
$self->js
->append('#row_table_id', $row_as_html);
->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);
}
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} ) {
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(@items);
- $self->_recalc();
+ $self->recalc();
foreach my $item (@items) {
+ $self->get_item_cvpartnumber($item);
my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
my $row_as_html = $self->p->render('order/tabs/_row',
- ITEM => $item,
- ID => $item_id,
- TYPE => $self->type,
- ALL_PRICE_FACTORS => $self->all_price_factors
+ ITEM => $item,
+ ID => $item_id,
+ TYPE => $self->type,
+ ALL_PRICE_FACTORS => $self->all_price_factors,
+ SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
);
$self->js->append('#row_table_id', $row_as_html);
->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();
}
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();
}
my ($self) = @_;
my %sort_keys = (
- partnumber => sub { $_[0]->part->partnumber },
- description => sub { $_[0]->description },
- qty => sub { $_[0]->qty },
- sellprice => sub { $_[0]->sellprice },
- discount => sub { $_[0]->discount },
+ partnumber => sub { $_[0]->part->partnumber },
+ description => sub { $_[0]->description },
+ qty => sub { $_[0]->qty },
+ sellprice => sub { $_[0]->sellprice },
+ discount => sub { $_[0]->discount },
+ cvpartnumber => sub { $_[0]->{cvpartnumber} },
);
+ $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
+
my $method = $sort_keys{$::form->{order_by}};
my @to_sort = map { { old_pos => $_->position, order_by => $method->($_) } } @{ $self->order->items_sorted };
if ($::form->{sort_dir}) {
- @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort;
+ if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){
+ @to_sort = sort { $a->{order_by} <=> $b->{order_by} } @to_sort;
+ } else {
+ @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort;
+ }
} else {
- @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort;
+ if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){
+ @to_sort = sort { $b->{order_by} <=> $a->{order_by} } @to_sort;
+ } else {
+ @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort;
+ }
}
$self->js
->run('kivi.Order.redisplay_items', \@to_sort)
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
$self->js->render();
}
-sub _js_load_second_row {
+sub js_load_second_row {
my ($self, $item, $item_id, $do_parse) = @_;
if ($do_parse) {
my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item, TYPE => $self->type);
$self->js
- ->html('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', $row_as_html)
- ->data('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', 'loaded', 1);
+ ->html('#second_row_' . $item_id, $row_as_html)
+ ->data('#second_row_' . $item_id, 'loaded', 1);
}
-sub _js_redisplay_line_values {
+sub js_redisplay_line_values {
my ($self) = @_;
my $is_sales = $self->order->is_sales;
->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} }) {
$self->js->show('#subtotal_row_id');
}
+ if ($self->order->is_sales) {
+ my $is_neg = $self->order->marge_total < 0;
+ $self->js
+ ->html('#marge_total_id', $::form->format_amount(\%::myconfig, $self->order->marge_total, 2))
+ ->html('#marge_percent_id', $::form->format_amount(\%::myconfig, $self->order->marge_percent, 2))
+ ->action_if( $is_neg, 'addClass', '#marge_total_id', 'plus0')
+ ->action_if( $is_neg, 'addClass', '#marge_percent_id', 'plus0')
+ ->action_if( $is_neg, 'addClass', '#marge_percent_sign_id', 'plus0')
+ ->action_if(!$is_neg, 'removeClass', '#marge_total_id', 'plus0')
+ ->action_if(!$is_neg, 'removeClass', '#marge_percent_id', 'plus0')
+ ->action_if(!$is_neg, 'removeClass', '#marge_percent_sign_id', 'plus0');
+ }
+
$self->js
->html('#netamount_id', $::form->format_amount(\%::myconfig, $self->order->netamount, -2))
->html('#amount_id', $::form->format_amount(\%::myconfig, $self->order->amount, -2))
->insertBefore($self->build_tax_rows, '#amount_row_id');
}
+sub js_redisplay_cvpartnumbers {
+ my ($self) = @_;
+
+ $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
+
+ my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted };
+
+ $self->js
+ ->run('kivi.Order.redisplay_cvpartnumbers', \@data);
+}
+
+sub js_reset_order_and_item_ids_after_save {
+ my ($self) = @_;
+
+ $self->js
+ ->val('#id', $self->order->id)
+ ->val('#converted_from_oe_id', '')
+ ->val('#order_' . $self->nr_key(), $self->order->number);
+
+ my $idx = 0;
+ foreach my $form_item_id (@{ $::form->{orderitem_ids} }) {
+ next if !$self->order->items_sorted->[$idx]->id;
+ next if $form_item_id !~ m{^new};
+ $self->js
+ ->val ('[name="orderitem_ids[+]"][value="' . $form_item_id . '"]', $self->order->items_sorted->[$idx]->id)
+ ->val ('#item_' . $form_item_id, $self->order->items_sorted->[$idx]->id)
+ ->attr('#item_' . $form_item_id, "id", 'item_' . $self->order->items_sorted->[$idx]->id);
+ } continue {
+ $idx++;
+ }
+ $self->js->val('[name="converted_from_orderitems_ids[+]"]', '');
+}
+
#
# helpers
#
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 {
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;
}
+sub init_search_cvpartnumber {
+ my ($self) = @_;
+
+ my $user_prefs = SL::Helper::UserPreferences::PartPickerSearch->new();
+ my $search_cvpartnumber;
+ $search_cvpartnumber = !!$user_prefs->get_sales_search_customer_partnumber() if $self->cv eq 'customer';
+ $search_cvpartnumber = !!$user_prefs->get_purchase_search_makemodel() if $self->cv eq 'vendor';
+
+ return $search_cvpartnumber;
+}
+
sub init_p {
SL::Presenter->get;
}
sub init_order {
- $_[0]->_make_order;
+ $_[0]->make_order;
}
# model used to filter/display the parts in the multi-items dialog
SL::DB::Manager::PriceFactor->get_all;
}
-sub _check_auth {
+sub check_auth {
my ($self) = @_;
my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} };
$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
# 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
# be retrieved via items until the order is saved. Adding empty items to new
# order here solves this problem.
my $order;
- $order = SL::DB::Manager::Order->find_by(id => $::form->{id}) if $::form->{id};
+ $order = SL::DB::Order->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) 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);
- $order->periodic_invoices_config($periodic_invoices_config) if $periodic_invoices_config;
+ if (my $periodic_invoices_config_attrs = $form_periodic_invoices_config ? SL::YAML::Load($form_periodic_invoices_config) : undef) {
+ my $periodic_invoices_config = $order->periodic_invoices_config || $order->periodic_invoices_config(SL::DB::PeriodicInvoicesConfig->new);
+ $periodic_invoices_config->assign_attributes(%$periodic_invoices_config_attrs);
+ }
# remove deleted items
$self->item_ids_to_delete([]);
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++;
#
# 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;
# 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;
# 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 {
}
my $discount_src;
- if ($item->discount) {
+ if (defined $item->discount) {
$discount_src = $price_source->discount_from_source("");
$discount_src->discount($item->discount);
} else {
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 || SL::DB::Manager::Employee->current->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
tax => $tax });
}
- pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}};
+ pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items_sorted}, @{$pat{items}};
}
# 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 }) {
# delete the order
#
# And remove related files in the spool directory
-sub _delete {
+sub delete {
my ($self) = @_;
my $errors = [];
# save the order
#
# And delete items that are deleted in the form.
-sub _save {
+sub save {
my ($self) = @_;
my $errors = [];
my $db = $self->order->db;
$db->with_transaction(sub {
- SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete};
+ SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []};
$self->order->save(cascade => 1);
# link records
if ($::form->{converted_from_oe_id}) {
- SL::DB::Order->new(id => $::form->{converted_from_oe_id})->load->link_to_record($self->order);
-
+ 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$/;
+ $src->link_to_record($self->order);
+ }
if (scalar @{ $::form->{converted_from_orderitems_ids} || [] }) {
my $idx = 0;
foreach (@{ $self->order->items_sorted }) {
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()
+ # always save
+ my $errors = $self->save();
+
+ if (scalar @{ $errors }) {
+ $self->js->flash('error', $_) foreach @{ $errors };
+ return $self->js->render();
+ }
+
+ 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
$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();
- $self->{all_departments} = SL::DB::Manager::Department->get_all_sorted();
- $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id,
- deleted => 0 ] ],
- sort_by => 'name');
- $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->{order_probabilities} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+ $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted();
+ $self->{all_departments} = SL::DB::Manager::Department->get_all_sorted();
+ $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id,
+ deleted => 0 ] ],
+ sort_by => 'name');
+ $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->salesman_id,
+ deleted => 0 ] ],
+ sort_by => 'name');
+ $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->{order_probabilities} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
+ $self->{positions_scrollbar_height} = SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height();
my $print_form = Form->new('');
$print_form->{type} = $self->type;
show_headers => 1,
no_queue => 1,
no_postscript => 1,
- no_opendocument => 1,
+ no_opendocument => 0,
no_html => 1},
);
$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,
} } @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;
+ $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);
+ $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 => [
checks => [ 'kivi.Order.check_save_active_periodic_invoices' ],
disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
],
- action => [
- t8('Save and Delivery Order'),
- call => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ],
- checks => [ 'kivi.Order.check_save_active_periodic_invoices' ],
- 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' ],
- ],
], # end of combobox "Save"
combobox => [
t8('Workflow'),
],
action => [
- t8('Sales Order'),
+ t8('Save and 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'),
+ t8('Save and 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,
],
+ action => [
+ t8('Save and Delivery Order'),
+ 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()))
+ ],
+ 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' ],
+ ],
], # end of combobox "Workflow"
combobox => [
t8('Export'),
],
action => [
- t8('Print'),
- call => [ 'kivi.Order.show_print_options' ],
+ t8('Save and print'),
+ call => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts ],
],
action => [
- t8('E-mail'),
- call => [ 'kivi.Order.email' ],
+ t8('Save and E-mail'),
+ call => [ 'kivi.Order.email', $::instance_conf->get_order_warn_duplicate_parts ],
],
action => [
t8('Download attachments of all parts'),
}
}
-sub _create_pdf {
+sub generate_pdf {
my ($order, $pdf_ref, $params) = @_;
my @errors = ();
$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
$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',
},
);
1;
- } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->getMessage : $EVAL_ERROR;
+ } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->error : $EVAL_ERROR;
});
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);
return %files;
}
-sub _make_periodic_invoices_config_from_yaml {
+sub make_periodic_invoices_config_from_yaml {
my ($yaml_config) = @_;
return if !$yaml_config;
- my $attr = YAML::Load($yaml_config);
+ my $attr = SL::YAML::Load($yaml_config);
return if 'HASH' ne ref $attr;
return SL::DB::PeriodicInvoicesConfig->new(%$attr);
}
-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}
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);
# $::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 get_item_cvpartnumber {
+ my ($self, $item) = @_;
+
+ if ($self->cv eq 'vendor') {
+ my @mms = grep { $_->make eq $self->order->customervendor->id } @{$item->part->makemodels};
+ $item->{cvpartnumber} = $mms[0]->model if scalar @mms;
+ } elsif ($self->cv eq 'customer') {
+ my @cps = grep { $_->customer_id eq $self->order->customervendor->id } @{$item->part->customerprices};
+ $item->{cvpartnumber} = $cps[0]->customer_partnumber if scalar @cps;
+ }
+}
+
+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__
This is a new form to enter orders, completely rewritten with the use
of controller and java script techniques.
-The aim is to provide the user a better expirience and a faster flow
-of work. Also the code should be more readable, more reliable and
-better to maintain.
+The aim is to provide the user a better experience and a faster workflow. Also
+the code should be more readable, more reliable and better to maintain.
=head2 Key Features
=item *
-Save order only on "save" (and "save and delivery order"-workflow). No
-hidden save on "print" or "email".
-
-=item *
-
Item list in a scrollable area, so that the workflow buttons stay at
the bottom.
=item *
No C<update> is necessary. All entries and calculations are managed
-with ajax-calls and the page does only reload on C<save>.
+with ajax-calls and the page only reloads on C<save>.
=item *
=item * currency
-=item * customer/vendor details ('D'-button)
-
=item * credit limit
-=item * more workflows (save as new, quotation, purchase order)
+=item * more workflows (quotation, rfq)
=item * price sources: little symbols showing better price / better discount
=item * custom shipto address
+=item * check for direct delivery (workflow sales order -> purchase order)
+
=item * language / part translations
=item * access rights
A warning when leaving the page without saveing unchanged inputs.
-=item *
-
-Workflows for delivery order and invoice are in the menu "Save", because the
-order is saved before opening the new document form. Nevertheless perhaps these
-workflow buttons should be put under "Workflows".
-
=back