X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=7efc62232ad7390a42a33c4dcd98a2c8359dc55e;hb=3cf720a8461d2d4c296edb9a4223074929921b5a;hp=21384f4ba5da63f55ba722850e9c47cc76e3e988;hpb=c5b0750518740054929b551285747bf9524b6803;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 21384f4ba..7efc62232 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -24,12 +24,14 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # Delivery orders #====================================================================== +use Carp; use List::MoreUtils qw(uniq); use List::Util qw(max sum); use POSIX qw(strftime); @@ -39,13 +41,11 @@ use SL::DB::DeliveryOrder; use SL::DO; use SL::IR; use SL::IS; -use SL::MoreCommon qw(ary_diff); +use SL::MoreCommon qw(ary_diff restore_form save_form); use SL::ReportGenerator; use SL::WH; use Sort::Naturally (); -require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; -require "bin/mozilla/invoice_io.pl"; require "bin/mozilla/io.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -95,6 +95,7 @@ sub add { set_headings("add"); + $form->{show_details} = $::myconfig{show_form_details}; $form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback}); order_links(); @@ -111,6 +112,8 @@ sub edit { my $form = $main::form; + $form->{show_details} = $::myconfig{show_form_details}; + # show history button $form->{javascript} = qq||; #/show hhistory button @@ -168,12 +171,7 @@ sub order_links { my $form = $main::form; my %myconfig = %main::myconfig; - # get customer/vendor - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - # retrieve order/quotation - $form->{webdav} = $::instance_conf->get_webdav; - my $editing = $form->{id}; DO->retrieve('vc' => $form->{vc}, @@ -195,17 +193,6 @@ sub order_links { $form->restore_vars(qw(taxincluded)) if $form->{id}; $form->restore_vars(qw(salesman_id)) if $editing; - if ($form->{"all_$form->{vc}"}) { - unless ($form->{"$form->{vc}_id"}) { - $form->{"$form->{vc}_id"} = $form->{"all_$form->{vc}"}->[0]->{id}; - } - } - - ($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} }; - $form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - - $form->{employee} = "$form->{employee}--$form->{employee_id}"; - $main::lxdebug->leave_sub(); } @@ -249,6 +236,164 @@ 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'; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => + [ t8('Update'), + submit => [ '#form', { action => "update" } ], + id => 'update_button', + checks => [ 'kivi.validate_form' ], + 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, + ], + ], # 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, + ], + + 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' ], + ], + ], # 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(); @@ -257,15 +402,21 @@ sub form_header { my $form = $main::form; my %myconfig = %main::myconfig; - $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; - $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; + my $class = "SL::DB::" . ($form->{vc} eq 'customer' ? 'Customer' : 'Vendor'); + $form->{VC_OBJ} = $class->load_cached($form->{ $form->{vc} . '_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($vc => "ALL_VC", - "price_factors" => "ALL_PRICE_FACTORS", - "departments" => "ALL_DEPARTMENTS", + $form->get_lists("price_factors" => "ALL_PRICE_FACTORS", "business_types" => "ALL_BUSINESS_TYPES", ); + $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; # Projects my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"}); @@ -300,14 +451,6 @@ sub form_header { ] ]); - map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} }; - map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} }; - - $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; - - $form->{oldvcname} = $form->{"old$form->{vc}"}; - $form->{oldvcname} =~ s/--.*//; - my $dispatch_to_popup = ''; if ($form->{resubmit} && ($form->{format} eq "html")) { $dispatch_to_popup = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';"; @@ -319,12 +462,16 @@ sub form_header { $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});"); - my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' }; - $follow_up_vc =~ s/--\d*\s*$//; + $form->{follow_up_trans_info} = $form->{donumber} .'('. $form->{VC_OBJ}->name .')' if $form->{VC_OBJ}; - $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')'; + $::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)); - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); + 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' @@ -351,7 +498,7 @@ 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(); print $form->parse_html_template('do/form_footer', @@ -377,7 +524,14 @@ sub update_delivery_order { my $payment_id; $payment_id = $form->{payment_id} if $form->{payment_id}; - check_name($form->{vc}); + my $vc = $form->{vc}; + if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) { + $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id}; + + IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; + IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + } + $form->{discount} = $form->{"$form->{vc}_discount"} if defined $form->{"$form->{vc}_discount"}; # Problem: Wenn man ohne Erneuern einen Kunden/Lieferanten # wechselt, wird der entsprechende Kunden/ Lieferantenrabatt @@ -423,7 +577,7 @@ sub update_delivery_order { if ($rows > 1) { select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"}); - ::end_of_request(); + $::dispatcher->end_request; } else { @@ -495,14 +649,13 @@ sub search { $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "departments" => "ALL_DEPARTMENTS", - "$form->{vc}s" => "ALL_VC", "business_types" => "ALL_BUSINESS_TYPES"); $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]); - - $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; + $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'); @@ -520,7 +673,7 @@ sub orders { my $locale = $main::locale; my $cgi = $::request->{cgi}; - $form->{department_id} = (split /--/, $form->{department})[-1]; + $::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); @@ -552,13 +705,13 @@ sub orders { my @hidden_variables = map { "l_${_}" } @columns; 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 + type vc employee_id salesman_id project_id parts_partnumber parts_description insertdatefrom insertdateto business_id); my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); my %column_defs = ( - 'ids' => { 'text' => '', }, + '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'), }, @@ -605,9 +758,8 @@ sub orders { if ($form->{cp_name}) { push @options, $locale->text('Contact Person') . " : $form->{cp_name}"; } - if ($form->{department}) { - my ($department) = split /--/, $form->{department}; - push @options, $locale->text('Department') . " : $department"; + if ($form->{department_id}) { + push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description; } if ($form->{donumber}) { push @options, $locale->text('Delivery Order Number') . " : $form->{donumber}"; @@ -623,6 +775,12 @@ sub orders { if ($form->{transaction_description}) { push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"; } + if ($form->{parts_description}) { + push @options, $locale->text('Part Description') . " : $form->{parts_description}"; + } + if ($form->{parts_partnumber}) { + push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}"; + } if ( $form->{transdatefrom} or $form->{transdateto} ) { push @options, $locale->text('Delivery Order Date'); push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom}; @@ -651,9 +809,23 @@ sub orders { push @options, $locale->text('Not delivered'); } + my $pr = SL::DB::Manager::Printer->find_by( + printer_description => $::locale->text("sales_delivery_order_printer")); + if ($pr ) { + $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'), + '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), @@ -668,7 +840,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) + ? 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; @@ -678,9 +852,10 @@ sub orders { my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns }; + my $ord_id = $dord->{id}; $row->{ids} = { - 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $dord->{id}) - . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''), + '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, 'data-checkall' => 1, '-label' => ''), 'valign' => 'center', 'align' => 'center', }; @@ -692,6 +867,8 @@ sub orders { $idx++; } + setup_do_orders_action_bar(); + $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -718,7 +895,7 @@ sub save { $form->{donumber} =~ s/\s*$//g; my $msg = ucfirst $form->{vc}; - $form->isblank($form->{vc}, $locale->text($msg . " missing!")); + $form->isblank($form->{vc} . "_id", $locale->text($msg . " missing!")); # $locale->text('Customer missing!'); # $locale->text('Vendor missing!'); @@ -727,9 +904,15 @@ sub save { validate_items(); # if the name changed get new values - if (check_name($form->{vc})) { + my $vc = $form->{vc}; + if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) { + $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id}; + + IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; + IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + update(); - ::end_of_request(); + $::dispatcher->end_request; } $form->{id} = 0 if $form->{saveasnew}; @@ -747,7 +930,7 @@ sub save { if (!$params{no_redirect} && !$form->{print_and_save}) { delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])}; edit(); - ::end_of_request(); + $::dispatcher->end_request; } $main::lxdebug->leave_sub(); } @@ -760,8 +943,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}; @@ -771,10 +954,10 @@ sub delete { # /saving the history $form->info($locale->text('Delivery Order deleted!')); - ::end_of_request(); + $::dispatcher->end_request; } - $form->error($locale->text('Cannot delete delivery order!')); + $form->error($locale->text('Cannot delete delivery order!') . $ret); $main::lxdebug->leave_sub(); } @@ -792,7 +975,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); @@ -816,7 +1001,10 @@ sub invoice { } for my $i (1 .. $form->{rowcount}) { + map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor discount); # für bug 1284 + # adds a customer/vendor discount, unless we have a workflow case + # CAVEAT: has to be done, after the above parse_amount unless ($form->{"ordnumber"}) { if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben # und rabattfähig sind, dann @@ -825,7 +1013,6 @@ sub invoice { } } } - map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice lastcost basefactor); $form->{"donumber_$i"} = $form->{donumber}; $form->{"converted_from_delivery_order_items_id_$i"} = delete $form->{"delivery_order_items_id_$i"}; } @@ -843,7 +1030,8 @@ 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); @@ -903,7 +1091,7 @@ sub invoice_multi { my @do_ids = map { $form->{"trans_id_$_"} } grep { $form->{"multi_id_$_"} } (1..$form->{rowcount}); if (!scalar @do_ids) { - $form->show_generic_error($locale->text('You have not selected any delivery order.'), 'back_button' => 1); + $form->show_generic_error($locale->text('You have not selected any delivery order.')); } map { delete $form->{$_} } grep { m/^(?:trans|multi)_id_\d+/ } keys %{ $form }; @@ -957,7 +1145,8 @@ sub invoice_multi { IS->get_customer(\%myconfig, \%$form); $vc_discount = $form->{customer_discount}; } - restore_form($saved_form); + # use payment terms from customer or vendor + restore_form($saved_form,0,qw(payment_id)); $form->{rowcount} = 0; foreach my $ref (@{ $form->{form_details} }) { @@ -1018,26 +1207,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(); @@ -1345,7 +1514,7 @@ sub transfer_in { my $locale = $main::locale; if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) { - $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'), 'back_button' => 1); + $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.')); } save(no_redirect => 1); @@ -1392,7 +1561,7 @@ sub transfer_in { update(); $main::lxdebug->leave_sub(); - ::end_of_request(); + $::dispatcher->end_request; } } @@ -1415,7 +1584,7 @@ sub transfer_out { my $locale = $main::locale; if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) { - $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'), 'back_button' => 1); + $form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.')); } save(no_redirect => 1); @@ -1511,7 +1680,7 @@ sub transfer_out { update(); $main::lxdebug->leave_sub(); - ::end_of_request(); + $::dispatcher->end_request; } } DO->transfer_in_out('direction' => 'out', @@ -1539,6 +1708,27 @@ sub mark_closed { $main::lxdebug->leave_sub(); } +sub display_form { + $::lxdebug->enter_sub; + + $::auth->assert('purchase_delivery_order_edit | sales_delivery_order_edit'); + + relink_accounts(); + retrieve_partunits(); + + my $new_rowcount = $::form->{"rowcount"} * 1 + 1; + $::form->{"project_id_${new_rowcount}"} = $::form->{"globalproject_id"}; + + $::form->language_payment(\%::myconfig); + + Common::webdav_folder($::form); + + form_header(); + display_row(++$::form->{rowcount}); + form_footer(); + + $::lxdebug->leave_sub; +} sub yes { call_sub($main::form->{yes_nextsub}); @@ -1556,7 +1746,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); @@ -1620,12 +1810,12 @@ sub transfer_in_out_default { my $base_unit_factor = $units->{ $part_info_map{$form->{"id_$i"}}->{unit} }->{factor} || 1; my $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor; - $form->show_generic_error($locale->text("Cannot transfer negative entries." ), 'back_button' => 1) if ($qty < 0); + $form->show_generic_error($locale->text("Cannot transfer negative entries." )) if ($qty < 0); # if we do not want to transfer services and this part is a service, set qty to zero # ... 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"}}; @@ -1707,7 +1897,7 @@ sub transfer_in_out_default { } } else { #$main::lxdebug->message(0, 'Fehlertext: ' . $fehlertext); - $form->show_generic_error($locale->text("Cannot transfer.
Reason:
#1", $fehlertext ), 'back_button' => 1); + $form->show_generic_error($locale->text("Cannot transfer.
Reason:
#1", $fehlertext )); } } } @@ -1719,6 +1909,9 @@ sub transfer_in_out_default { # dieser array_ref ist für DO->save da: # einmal die all_requests in YAML verwandeln, damit delivery_order_items_stock # gefüllt werden kann. + # could be dumped to the form in the first loop, + # but maybe bin_id and warehouse_id has changed to the "korrekturlager" with + # allowed negative qty ($::instance_conf->get_warehouse_id_ignore_onhand) ... my $i = 0; foreach (@all_requests){ $i++; @@ -1728,6 +1921,13 @@ sub transfer_in_out_default { save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern # und in delivery_order_items_stock speichern + + # ... and fill back the persistent dois_id for inventory fk + undef (@all_requests); + foreach my $i (1 .. $form->{rowcount}) { + next unless ($form->{"id_$i"} && $form->{"stock_${prefix}_$i"}); + push @all_requests, @{ DO->unpack_stock_information('packed' => $form->{"stock_${prefix}_$i"}) }; + } DO->transfer_in_out('direction' => $prefix, 'requests' => \@all_requests); @@ -1747,11 +1947,16 @@ sub sort { my $form = $main::form; my %temp_hash; - croak ("Delivery Order needs to be saved") unless $form->{id}; + save(no_redirect => 1); # has to be done, at least for newly added positions # hashify partnumbers, positions. key is delivery_order_items_id for my $i (1 .. ($form->{rowcount}) ) { $temp_hash{$form->{"delivery_order_items_id_$i"}} = { runningnumber => $form->{"runningnumber_$i"}, partnumber => $form->{"partnumber_$i"} }; + if ($form->{id} && $form->{"discount_$i"}) { + # prepare_order assumes a db value if there is a form->id and multiplies *100 + # We hope for new controller code (no more format_amount/parse_amount distinction) + $form->{"discount_$i"} /=100; + } } # naturally sort partnumbers and get a sorted array of doi_ids my @sorted_doi_ids = sort { Sort::Naturally::ncmp($temp_hash{$a}->{"partnumber"}, $temp_hash{$b}->{"partnumber"}) } keys %temp_hash; @@ -1763,6 +1968,12 @@ sub sort { $form->{"runningnumber_$temp_hash{$_}->{runningnumber}"} = $new_number; $new_number++; } + # all parse_amounts changes are in form (i.e. , to .) therefore we need + # another format_amount to change it back, for the next save ;-( + # works great except for row discounts (see above comment) + prepare_order(); + + $main::lxdebug->leave_sub(); save(); } @@ -1777,7 +1988,6 @@ __END__ do.pl - Script for all calls to delivery order - =head1 FUNCTIONS =over 2