use List::MoreUtils qw(uniq);
use List::Util qw(max sum);
use POSIX qw(strftime);
-use YAML;
use SL::DB::DeliveryOrder;
use SL::DO;
use SL::MoreCommon qw(ary_diff restore_form save_form);
use SL::ReportGenerator;
use SL::WH;
+use SL::YAML;
use Sort::Naturally ();
require "bin/mozilla/common.pl";
require "bin/mozilla/io.pl";
action => [
t8('Save'),
submit => [ '#form', { action => "save" } ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
],
action => [
t8('Save as new'),
submit => [ '#form', { action => "save_as_new" } ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
disabled => !$::form->{id},
],
action => [
t8('Mark as closed'),
submit => [ '#form', { action => "mark_closed" } ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
confirm => t8('This will remove the delivery order from showing as open even if contents are not delivered. Proceed?'),
disabled => !$::form->{id} ? t8('This record has not been saved yet.')
: $::form->{closed} ? t8('This record has already been closed.')
action => [
t8('Transfer out'),
submit => [ '#form', { action => "transfer_out" } ],
- checks => [ @req_trans_desc, @transfer_qty ],
+ checks => [ 'kivi.validate_form', @transfer_qty ],
disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
only_if => $is_customer,
],
action => [
t8('Transfer out via default'),
submit => [ '#form', { action => "transfer_out_default" } ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
only_if => $is_customer && $::instance_conf->get_transfer_default,
],
action => [
t8('Transfer in'),
submit => [ '#form', { action => "transfer_in" } ],
- checks => [ @req_trans_desc, @transfer_qty ],
+ checks => [ 'kivi.validate_form', @transfer_qty ],
disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
only_if => !$is_customer,
],
action => [
t8('Transfer in via default'),
submit => [ '#form', { action => "transfer_in_default" } ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
only_if => !$is_customer && $::instance_conf->get_transfer_default,
],
t8('Invoice'),
submit => [ '#form', { action => "invoice" } ],
disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+ confirm => $::form->{delivered} ? undef
+ : ($::form->{vc} eq 'customer' && $::instance_conf->get_sales_delivery_order_check_stocked) ? t8('This record has not been stocked out. Proceed?')
+ : ($::form->{vc} eq 'vendor' && $::instance_conf->get_purchase_delivery_order_check_stocked) ? t8('This record has not been stocked in. Proceed?')
+ : undef,
],
combobox => [
action => [
t8('Print'),
call => [ 'kivi.SalesPurchase.show_print_dialog' ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
],
action => [
t8('E Mail'),
call => [ 'kivi.SalesPurchase.show_email_dialog' ],
- checks => [ @req_trans_desc ],
+ checks => [ 'kivi.validate_form' ],
+ disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
],
], # end of combobox "Export"
], # end if combobox "more"
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_do_search_action_bar {
t8('Search'),
submit => [ '#form' ],
accesskey => 'enter',
+ checks => [ 'kivi.validate_form' ],
],
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_do_orders_action_bar {
$form->get_lists("price_factors" => "ALL_PRICE_FACTORS",
"business_types" => "ALL_BUSINESS_TYPES",
);
- $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
+ $form->{ALL_LANGUAGES} = SL::DB::Manager::Language->get_all_sorted;
# Projects
my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
if ($form->{resubmit} && ($form->{format} eq "html")) {
$dispatch_to_popup = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
$dispatch_to_popup .= "document.do.submit();";
- } elsif ($form->{resubmit}) {
+ } elsif ($form->{resubmit} && $form->{action_print}) {
# emulate click for resubmitting actions
- $dispatch_to_popup = "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
+ $dispatch_to_popup = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
}
$::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
$form->{follow_up_trans_info} = $form->{donumber} .'('. $form->{VC_OBJ}->name .')' if $form->{VC_OBJ};
- $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.File kivi.MassDeliveryOrderPrint kivi.SalesPurchase kivi.Part ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer));
-
- my @custom_hidden;
- push @custom_hidden, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
-
- $::form->{HIDDENS} = [ map { +{ name => $_, value => $::form->{$_} } } (@custom_hidden) ];
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.File kivi.MassDeliveryOrderPrint kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor/ckeditor ckeditor/adapters/jquery kivi.io));
setup_do_action_bar();
$form->{PRINT_OPTIONS} = setup_sales_purchase_print_options();
$form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+ my $shipto_cvars = SL::DB::Shipto->new->cvars_by_config;
+ foreach my $var (@{ $shipto_cvars }) {
+ my $name = "shiptocvar_" . $var->config->name;
+ $var->value($form->{$name}) if exists $form->{$name};
+ }
+
print $form->parse_html_template('do/form_footer',
- {transfer_default => ($::instance_conf->get_transfer_default)});
+ {transfer_default => ($::instance_conf->get_transfer_default),
+ shipto_cvars => $shipto_cvars});
$main::lxdebug->leave_sub();
}
"all" => 1 },
"business_types" => "ALL_BUSINESS_TYPES");
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
- $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
$form->{title} = $locale->text('Delivery Orders');
setup_do_search_action_bar();
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
transaction_description transdatefrom transdateto reqdatefrom reqdateto
type vc employee_id salesman_id project_id parts_partnumber parts_description
- insertdatefrom insertdateto business_id);
+ insertdatefrom insertdateto business_id all department_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
- 'ids' => { 'text' => '<input type="checkbox" id="multi_all" value="1">', 'align' => 'center' },
+ 'ids' => { raw_header_data => SL::Presenter::Tag::checkbox_tag("", id => "multi_all", checkall => "[data-checkall=1]"), align => 'center' },
'transdate' => { 'text' => $locale->text('Delivery Order Date'), },
'reqdate' => { 'text' => $locale->text('Reqdate'), },
'id' => { 'text' => $locale->text('ID'), },
if ($form->{notdelivered}) {
push @options, $locale->text('Not delivered');
}
+ push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all};
my $pr = SL::DB::Manager::Printer->find_by(
printer_description => $::locale->text("sales_delivery_order_printer"));
my $callback = $form->escape($href);
my $edit_url = build_std_url('action=edit', 'type', 'vc');
- my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit');
+ my $edit_order_url = ($::instance_conf->get_feature_experimental_order)
+ ? build_std_url('script=controller.pl', 'action=Order/edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'))
+ : build_std_url('script=oe.pl', 'action=edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'));
my $idx = 1;
my $ord_id = $dord->{id};
$row->{ids} = {
'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $ord_id)
- . $cgi->checkbox('-name' => "multi_id_${idx}",' id' => "multi_id_id_".$ord_id, '-value' => 1, '-label' => ''),
+ . $cgi->checkbox('-name' => "multi_id_${idx}",' id' => "multi_id_id_".$ord_id, '-value' => 1, 'data-checkall' => 1, '-label' => ''),
'valign' => 'center',
'align' => 'center',
};
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
-
- if (DO->delete()) {
+ my $ret;
+ if ($ret = DO->delete()) {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
$::dispatcher->end_request;
}
- $form->error($locale->text('Cannot delete delivery order!'));
+ $form->error($locale->text('Cannot delete delivery order!') . $ret);
$main::lxdebug->leave_sub();
}
if ($form->{ordnumber}) {
require SL::DB::Order;
- if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber})) {
+ my $vc_id = $form->{type} =~ /^sales/ ? 'customer_id' : 'vendor_id';
+ if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber}, $vc_id => $form->{"$vc_id"})) {
$order->load;
$form->{orddate} = $order->transdate_as_date;
- $form->{$_} = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber);
+ $form->{$_} = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber taxincluded);
+ $form->{taxincluded_changed_by_user} = 1;
}
}
push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(delivery_order_items_stock_id warehouse_id bin_id chargenumber bestbefore qty unit) };
}
- $form->{stock} = YAML::Dump($stock_info);
+ $form->{stock} = SL::YAML::Dump($stock_info);
_stock_in_out_set_qty_display($stock_info);
my @errors = DO->check_stock_availability('requests' => $stock_info,
'parts_id' => $form->{parts_id});
- $form->{stock} = YAML::Dump($stock_info);
+ $form->{stock} = SL::YAML::Dump($stock_info);
if (@errors) {
$form->{ERRORS} = [];
foreach (@all_requests){
$i++;
next unless scalar(%{ $_ });
- $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]);
+ $form->{"stock_${prefix}_$i"} = SL::YAML::Dump([$_]);
}
save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern
projects / kivitendo-erp.git / blobdiff