use parent qw(SL::Controller::Base);
use SL::Helper::Flash qw(flash_later);
-use SL::Helper::Number qw(_format_number_units _parse_number);
+use SL::Helper::Number qw(_format_number _parse_number);
use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);
use SL::Presenter::DeliveryOrder qw(delivery_order_status_line);
use SL::Locale::String qw(t8);
$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()';
+ $email_form->{js_send_function} = 'kivi.DeliveryOrder.send_email()';
my %files = $self->get_files_for_email_dialog();
$self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
);
$self->js
- ->run('kivi.Order.show_email_dialog', $dialog_html)
+ ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html)
->reinit_widgets
->render($self);
}
my $errors = $self->save();
if (scalar @{ $errors }) {
- $self->js->run('kivi.Order.close_email_dialog');
+ $self->js->run('kivi.DeliveryOrder.close_email_dialog');
$self->js->flash('error', $_) foreach @{ $errors };
return $self->js->render();
}
$::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
$::form->send_email(\%::myconfig, 'pdf');
- # internal notes
- my $intnotes = $self->order->intnotes;
- $intnotes .= "\n\n" if $self->order->intnotes;
- $intnotes .= t8('[email]') . "\n";
- $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
- $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
- $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
- $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
- $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
- $intnotes .= t8('Message') . ": " . $::form->{message};
+ # internal notes unless no email journal
+ unless ($::instance_conf->get_email_journal) {
- $self->order->update_attributes(intnotes => $intnotes);
+ my $intnotes = $self->order->intnotes;
+ $intnotes .= "\n\n" if $self->order->intnotes;
+ $intnotes .= t8('[email]') . "\n";
+ $intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
+ $intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
+ $intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
+ $intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
+ $intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
+ $intnotes .= t8('Message') . ": " . $::form->{message};
+
+ $self->order->update_attributes(intnotes => $intnotes);
+ }
$self->save_history('MAILED');
->val( '#order_intnotes', $self->order->intnotes)
->val( '#order_language_id', $self->order->$cv_method->language_id)
->focus( '#order_' . $self->cv . '_id')
- ->run('kivi.Order.update_exchangerate');
+ ->run('kivi.DeliveryOrder.update_exchangerate');
$self->js_redisplay_cvpartnumbers;
$self->js->render();
$item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
$self->js
- ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
+ ->run('kivi.DeliveryOrder.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
$self->js_redisplay_line_values;
$self->js->render();
}
$self->js
->val('.add_item_input', '')
- ->run('kivi.Order.init_row_handlers')
- ->run('kivi.Order.renumber_positions')
+ ->run('kivi.DeliveryOrder.init_row_handlers')
+ ->run('kivi.DeliveryOrder.renumber_positions')
->focus('#add_item_parts_id_name');
- $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id};
+ $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id};
$self->js->render();
}
$self->js
->run('kivi.Part.close_picker_dialogs')
- ->run('kivi.Order.init_row_handlers')
- ->run('kivi.Order.renumber_positions')
+ ->run('kivi.DeliveryOrder.init_row_handlers')
+ ->run('kivi.DeliveryOrder.renumber_positions')
->focus('#add_item_parts_id_name');
- $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id};
+ $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id};
$self->js->render();
}
}
}
$self->js
- ->run('kivi.Order.redisplay_items', \@to_sort)
+ ->run('kivi.DeliveryOrder.redisplay_items', \@to_sort)
->render;
}
my ($self) = @_;
my $part = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";
+ my $unit = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit";
my $stock = $::form->{stock};
- my $unit = $::form->{unit};
my $row = $::form->{row};
my $item_id = $::form->{item_id};
my $qty = _parse_number($::form->{qty_as_number});
my @contents = DO->get_item_availability(parts_id => $part->id);
my $stock_info = DO->unpack_stock_information(packed => $stock);
- $self->merge_stock_data($stock_info, \@contents, $part);
+ $self->merge_stock_data($stock_info, \@contents, $part, $unit);
$self->render("delivery_order/stock_dialog", { layout => 0 },
WHCONTENTS => $self->order->delivered ? $stock_info : \@contents,
part => $part,
do_qty => $qty,
- do_unit => $unit,
+ do_unit => $unit->unit,
delivered => $self->order->delivered,
row => $row,
item_id => $item_id,
stock_info => $yaml,
stock_qty => $stock_qty,
};
-
$self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 });
}
sub merge_stock_data {
- my ($self, $stock_info, $contents, $part) = @_;
+ my ($self, $stock_info, $contents, $part, $unit) = @_;
# TODO rewrite to mapping
if (!$self->order->delivered) {
for my $row (@$contents) {
- $row->{available_qty} = _format_number_units($row->{qty}, $row->{unit}, $part->unit);
+ # row here is in parts units. stock is in item units
+ $row->{available_qty} = _format_number($part->unit_obj->convert_to($row->{qty}, $unit));
for my $sinfo (@{ $stock_info }) {
next if $row->{bin_id} != $sinfo->{bin_id} ||
} else {
for my $sinfo (@{ $stock_info }) {
my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id});
- $sinfo->{warehouse_description} = $bin->warehouse->description;
- $sinfo->{bin_description} = $bin->description;
+ $sinfo->{warehousedescription} = $bin->warehouse->description;
+ $sinfo->{bindescription} = $bin->description;
map { $sinfo->{"stock_$_"} = $sinfo->{$_} } qw(qty unit);
}
}
$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->run('kivi.DeliveryOrder.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback
$self->js->render();
}
$item->active_price_source($price_src);
$self->js
- ->run('kivi.Order.update_sellprice', $item_id, $item->sellprice_as_number)
+ ->run('kivi.DeliveryOrder.update_sellprice', $item_id, $item->sellprice_as_number)
->html('.row_entry:has(#item_' . $item_id . ') [name = "partnumber"] a', $item->part->partnumber)
->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description)
->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription);
}
if (!@transfer_requests) {
- $self->js->flash("error", t8("No stock to transfer"))->render;
+ return $self->js->flash("error", t8("No stock to transfer"))->render;
}
SL::DB->client->with_transaction(sub {
->flash("info", t8("Stock transfered"))
->run('kivi.ActionBar.setDisabled', '#transfer_out_action', t8('The parts for this order have already been transferred'))
->run('kivi.ActionBar.setDisabled', '#transfer_in_action', t8('The parts for this order have already been transferred'))
+ ->run('kivi.ActionBar.setDisabled', '#delete_action', t8('The parts for this order have already been transferred'))
->replaceWith('#data-status-line', delivery_order_status_line($self->order))
->render;
}
$self->js
- ->run('kivi.Order.redisplay_line_values', $is_sales, \@data);
+ ->run('kivi.DeliveryOrder.redisplay_line_values', $is_sales, \@data);
}
sub js_redisplay_cvpartnumbers {
my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted };
$self->js
- ->run('kivi.Order.redisplay_cvpartnumbers', \@data);
+ ->run('kivi.DeliveryOrder.redisplay_cvpartnumbers', \@data);
}
sub js_reset_order_and_item_ids_after_save {
action => [
t8('Save as new'),
call => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
- disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+ disabled => $self->type eq 'supplier_delivery_order' ? t8('Need a workflow for Supplier Delivery Order')
+ : !$self->order->id ? t8('This object has not been saved yet.')
+ : undef,
],
], # end of combobox "Save"
action => [
t8('Delete'),
+ id => 'delete_action',
call => [ 'kivi.DeliveryOrder.delete_order' ],
confirm => $::locale->text('Do you really want to delete this object?'),
- disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+ disabled => !$self->order->id ? t8('This object has not been saved yet.') :
+ $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
only_if => $self->type_data->show_menu("delete"),
],
$units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit})
} @$stock_info;
- my $content = _format_number_units($sum, 2, $units_by_name{$unit}, $units_by_name{$unit});
+ my $content = _format_number($sum, 2) . ' ' . $unit;
return $content;
}
$_->unit_obj->convert_to($_->qty, $item->unit_obj)
} $item->delivery_order_stock_entries;
- my $content = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj);
+ my $content = _format_number($sum, 2);
return $content;
}
projects / kivitendo-erp.git / blobdiff