X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=576f8aa29b2e2d46ce61d8b11253ad67fbb9e816;hb=3e79972f6ef5617708e4eef5d66c82a66cf6a588;hp=6c122219559a5ce64b24508af0580857f64d1881;hpb=00b80ab43143988264a03c650f4fa06e1d365b30;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 6c1222195..576f8aa29 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -35,7 +35,6 @@ use Carp; use List::MoreUtils qw(uniq); use List::Util qw(max sum); use POSIX qw(strftime); -use YAML; use SL::DB::DeliveryOrder; use SL::DO; @@ -44,6 +43,7 @@ use SL::IS; 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"; @@ -236,6 +236,181 @@ sub prepare_order { $main::lxdebug->leave_sub(); } +sub setup_do_action_bar { + my @transfer_qty = qw(kivi.SalesPurchase.delivery_order_check_transfer_qty); + my @req_trans_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps; + my $is_customer = $::form->{vc} eq 'customer'; + + my $undo_date = DateTime->today->subtract(days => $::instance_conf->get_undo_transfer_interval); + my $insertdate = DateTime->from_kivitendo($::form->{insertdate}); + my $undo_transfer = 0; + if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') { + $undo_transfer = $insertdate > $undo_date; + } + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => + [ t8('Update'), + submit => [ '#form', { action => "update" } ], + id => 'update_button', + accesskey => 'enter', + ], + + combobox => [ + action => [ + t8('Save'), + submit => [ '#form', { action => "save" } ], + 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 => [ 'kivi.validate_form' ], + disabled => !$::form->{id}, + ], + action => [ + t8('Mark as closed'), + submit => [ '#form', { action => "mark_closed" } ], + 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.') + : undef, + ], + ], # end of combobox "Save" + + action => [ + t8('Delete'), + submit => [ '#form', { action => "delete" } ], + confirm => t8('Do you really want to delete this object?'), + disabled => !$::form->{id} ? t8('This record has not been saved yet.') + : $::form->{delivered} ? t8('This record has already been delivered.') + : ($::form->{vc} eq 'customer' && !$::instance_conf->get_sales_delivery_order_show_delete) ? t8('Deleting this type of record has been disabled in the configuration.') + : ($::form->{vc} eq 'vendor' && !$::instance_conf->get_purchase_delivery_order_show_delete) ? t8('Deleting this type of record has been disabled in the configuration.') + : undef, + ], + + combobox => [ + action => [ + t8('Transfer out'), + submit => [ '#form', { action => "transfer_out" } ], + 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 => [ '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 => [ '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 => [ '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('Undo Transfer'), + submit => [ '#form', { action => "delete_transfers" } ], + checks => [ 'kivi.validate_form' ], + only_if => $::form->{delivered}, + disabled => !$undo_transfer ? t8('Transfer date exceeds the maximum allowed interval.') : undef, + ], + ], # end of combobox "Transfer out" + + + 'separator', + + action => [ + 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('Export') ], + action => [ + t8('Print'), + call => [ 'kivi.SalesPurchase.show_print_dialog' ], + checks => [ 'kivi.validate_form' ], + ], + action => [ + t8('E Mail'), + call => [ 'kivi.SalesPurchase.show_email_dialog' ], + checks => [ 'kivi.validate_form' ], + disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef, + ], + ], # end of combobox "Export" + + combobox => [ + action => [ t8('more') ], + action => [ + t8('History'), + call => [ 'set_history_window', $::form->{id} * 1, 'id' ], + disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef, + ], + action => [ + t8('Follow-Up'), + call => [ 'follow_up_window' ], + disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef, + ], + ], # end if combobox "more" + ); + } + $::request->layout->add_javascripts('kivi.Validator.js'); +} + +sub setup_do_search_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Search'), + submit => [ '#form' ], + accesskey => 'enter', + checks => [ 'kivi.validate_form' ], + ], + ); + } + $::request->layout->add_javascripts('kivi.Validator.js'); +} + +sub setup_do_orders_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('New invoice'), + submit => [ '#form', { action => 'invoice_multi' } ], + checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ], + accesskey => 'enter', + ], + action => [ + t8('Print'), + call => [ 'kivi.SalesPurchase.show_print_dialog', 'js:kivi.MassDeliveryOrderPrint.submitMultiOrders' ], + checks => [ [ 'kivi.check_if_entries_selected', '#form tbody input[type=checkbox]' ] ], + ], + ); + } +} + sub form_header { $main::lxdebug->enter_sub(); @@ -247,14 +422,19 @@ sub form_header { my $class = "SL::DB::" . ($form->{vc} eq 'customer' ? 'Customer' : 'Vendor'); $form->{VC_OBJ} = $class->load_cached($form->{ $form->{vc} . '_id' }); - $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; - $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; + $form->{CONTACT_OBJ} = $form->{cp_id} ? SL::DB::Contact->load_cached($form->{cp_id}) : undef; + my $current_employee = SL::DB::Manager::Employee->current; + $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; + $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; + $form->{employee_id} ||= $current_employee->id; + $form->{salesman_id} ||= $current_employee->id; my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; $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"}); @@ -293,21 +473,18 @@ sub form_header { 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 .')'; + $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 ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); + $::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)); - 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) ]; + setup_do_action_bar(); $form->header(); # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID' @@ -334,11 +511,18 @@ sub form_footer { my $form = $main::form; - $form->{PRINT_OPTIONS} = print_options('inline' => 1); + $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(); } @@ -487,9 +671,11 @@ sub search { "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(); + $form->header(); print $form->parse_html_template('do/search'); @@ -507,7 +693,7 @@ sub orders { my $locale = $main::locale; my $cgi = $::request->{cgi}; - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.MassDeliveryOrderPrint)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.MassDeliveryOrderPrint kivi.SalesPurchase)); ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} }); report_generator_set_default_sort('transdate', 1); @@ -540,12 +726,12 @@ sub orders { 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' => '', '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'), }, @@ -642,6 +828,7 @@ sub orders { 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")); @@ -649,9 +836,17 @@ sub orders { $form->{printer_id} = $pr->id; } + my $print_options = SL::Helper::PrintOptions->get_print_options( + options => { + hide_language_id => 1, + show_bothsided => 1, + show_headers => 1, + }, + ); + $report->set_options('top_info_text' => join("\n", @options), 'raw_top_info_text' => $form->parse_html_template('do/orders_top'), - 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom', { print_options => print_options(inline => 1,hide_language_id => 1) }), + 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom', { print_options => $print_options }), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), @@ -666,7 +861,9 @@ sub orders { 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; @@ -679,7 +876,7 @@ sub orders { 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', }; @@ -691,6 +888,8 @@ sub orders { $idx++; } + setup_do_orders_action_bar(); + $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -765,8 +964,8 @@ sub delete { 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}; @@ -779,7 +978,38 @@ sub delete { $::dispatcher->end_request; } - $form->error($locale->text('Cannot delete delivery order!')); + $form->error($locale->text('Cannot delete delivery order!') . $ret); + + $main::lxdebug->leave_sub(); +} +sub delete_transfers { + $main::lxdebug->enter_sub(); + + check_do_access(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; + my $ret; + + die "Invalid form type" unless $form->{type} =~ m/^(sales|purchase)_delivery_order$/; + + if ($ret = DO->delete_transfers()) { + # saving the history + if(!exists $form->{addition}) { + $form->{snumbers} = qq|donumber_| . $form->{donumber}; + $form->{addition} = "UNDO TRANSFER"; + $form->save_history; + } + # /saving the history + + flash_later('info', $locale->text("Transfer undone.")); + + $form->{callback} = 'do.pl?action=edit&type=' . $form->{type} . '&id=' . $form->escape($form->{id}); + $form->redirect; + } + + $form->error($locale->text('Cannot undo delivery order transfer!') . $ret); $main::lxdebug->leave_sub(); } @@ -797,7 +1027,9 @@ sub invoice { $main::auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit'); $form->{convert_from_do_ids} = $form->{id}; - $form->{deliverydate} = $form->{transdate}; + # if we have a reqdate (Liefertermin), this is definetely the preferred + # deliverydate for invoices + $form->{deliverydate} = $form->{reqdate} || $form->{transdate}; $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig); $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1); $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); @@ -850,10 +1082,12 @@ sub invoice { 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; } } @@ -1026,26 +1260,6 @@ sub save_as_new { $main::lxdebug->leave_sub(); } -sub e_mail { - $main::lxdebug->enter_sub(); - - check_do_access(); - - $::form->mtime_ischanged('delivery_orders','mail'); - - $::form->{print_and_save} = 1; - - my $saved_form = save_form(); - - save(); - - restore_form($saved_form, 0, qw(id ordnumber quonumber)); - - edit_e_mail(); - - $main::lxdebug->leave_sub(); -} - sub calculate_stock_in_out { $main::lxdebug->enter_sub(); @@ -1228,7 +1442,7 @@ sub set_stock_in { 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); @@ -1323,7 +1537,7 @@ sub set_stock_out { 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} = []; @@ -1409,6 +1623,7 @@ sub transfer_in { SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1); + flash_later('info', $locale->text("Transfer successful")); $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id}); $form->redirect; @@ -1527,6 +1742,7 @@ sub transfer_out { SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1); + flash_later('info', $locale->text("Transfer successful")); $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id}); $form->redirect; @@ -1585,7 +1801,7 @@ sub dispatcher { my $form = $main::form; my $locale = $main::locale; - foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default sort + foreach my $action (qw(update print save transfer_out transfer_out_default sort transfer_in transfer_in_default mark_closed save_as_new invoice delete)) { if ($form->{"action_${action}"}) { call_sub($action); @@ -1654,7 +1870,7 @@ sub transfer_in_out_default { # ... and do not create a hash entry in %qty_parts below (will skip check for bins for the transfer == out case) # ... and push only a empty (undef) element to @all_requests (will skip check for bin_id and warehouse_id and will not alter the row) - $qty = 0 if (!$::instance_conf->get_transfer_default_services && !defined($part_info_map{$form->{"id_$i"}}->{inventory_accno_id}) && !$part_info_map{$form->{"id_$i"}}->{assembly}); + $qty = 0 if (!$::instance_conf->get_transfer_default_services && $part_info_map{$form->{"id_$i"}}->{part_type} eq 'service'); $qty_parts{$form->{"id_$i"}} += $qty; if ($qty == 0) { delete $qty_parts{$form->{"id_$i"}} unless $qty_parts{$form->{"id_$i"}}; @@ -1755,7 +1971,7 @@ sub transfer_in_out_default { 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