X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=4c2d05916e409ce6f43d79ce645af418d6a8453f;hb=0399bdb1fcfbb8f7fd1a48771e4fa995037eb4b7;hp=ad119c477af13ae579c47d92dae8d90cba2fa585;hpb=d735aab3fc2987d555c63ce0dc8e24626ca30654;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index ad119c477..4c2d05916 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -24,7 +24,8 @@ # 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. #====================================================================== # # Order entry module @@ -41,8 +42,7 @@ use SL::FU; use SL::OE; use SL::IR; use SL::IS; -use SL::MoreCommon qw(ary_diff); -use SL::PE; +use SL::MoreCommon qw(ary_diff restore_form save_form); use SL::ReportGenerator; use List::MoreUtils qw(uniq any none); use List::Util qw(min max reduce sum); @@ -50,9 +50,11 @@ use Data::Dumper; use SL::DB::Customer; use SL::DB::TaxZone; +use SL::DB::PaymentTerm; +use SL::DB::Vendor; +require "bin/mozilla/common.pl"; require "bin/mozilla/io.pl"; -require "bin/mozilla/arap.pl"; require "bin/mozilla/reportgenerator.pl"; use strict; @@ -155,6 +157,8 @@ sub add { "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}" unless $form->{callback}; + $form->{show_details} = $::myconfig{show_form_details}; + &order_links; &prepare_order; &display_form; @@ -169,6 +173,7 @@ sub edit { check_oe_access(); + $form->{show_details} = $::myconfig{show_form_details}; $form->{taxincluded_changed_by_user} = 1; # show history button @@ -237,12 +242,7 @@ sub order_links { check_oe_access(); - # get customer/vendor - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - - # retrieve order/quotation and webdav config - $form->{webdav} = $::instance_conf->get_webdav; - + # retrieve order/quotation my $editing = $form->{id}; OE->retrieve(\%myconfig, \%$form); @@ -254,8 +254,6 @@ sub order_links { if $form->{rowcount} && $form->{type} eq 'sales_order' && defined $form->{customer} && $form->{customer} eq ''; - $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"}; - $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency)); # get customer / vendor @@ -269,18 +267,6 @@ sub order_links { $form->{forex} = $form->{exchangerate}; $form->{employee} = "$form->{employee}--$form->{employee_id}"; - # build vendor/customer drop down comatibility... don't ask - if (@{ $form->{"all_$form->{vc}"} || [] }) { - $form->{"select$form->{vc}"} = 1; - $form->{$form->{vc}} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - } - - $form->{"old$form->{vc}"} = $form->{$form->{vc}}; - - if ($form->{"old$form->{vc}"} !~ m/--\d+$/ && $form->{"$form->{vc}_id"}) { - $form->{"old$form->{vc}"} .= qq|--$form->{"$form->{vc}_id"}| - } - $main::lxdebug->leave_sub(); } @@ -308,6 +294,176 @@ sub prepare_order { $main::lxdebug->leave_sub(); } +sub setup_oe_action_bar { + my %params = @_; + my $form = $::form; + + my $has_active_periodic_invoice; + if ($params{obj}) { + $has_active_periodic_invoice = + $params{obj}->is_type('sales_order') + && $params{obj}->periodic_invoices_config + && $params{obj}->periodic_invoices_config->active + && ( !$params{obj}->periodic_invoices_config->end_date + || ($params{obj}->periodic_invoices_config->end_date > DateTime->today_local)) + && $params{obj}->periodic_invoices_config->get_previous_billed_period_start_date; + } + + my $allow_invoice = $params{is_req_quo} + || $params{is_pur_ord} + || ($params{is_sales_quo} && $::instance_conf->get_allow_sales_invoice_from_sales_quotation) + || ($params{is_sales_ord} && $::instance_conf->get_allow_sales_invoice_from_sales_order); + my @req_trans_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps; + my @req_trans_cost_art = qw(kivi.SalesPurchase.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id; + my @warn_p_invoice = qw(kivi.SalesPurchase.oe_warn_save_active_periodic_invoice) x!!$has_active_periodic_invoice; + + 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 => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ], + ], + action => [ + t8('Save as new'), + submit => [ '#form', { action => "save_as_new" } ], + checks => [ @req_trans_desc, @req_trans_cost_art ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + ], + action => [ + t8('Save and Close'), + submit => [ '#form', { action => "save_and_close" } ], + checks => [ @req_trans_desc, @req_trans_cost_art, @warn_p_invoice ], + ], + 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.') + : ( ($params{is_sales_ord} && !$::instance_conf->get_sales_order_show_delete) + || ($params{is_pur_ord} && !$::instance_conf->get_purchase_order_show_delete)) ? t8('Deleting this type of record has been disabled in the configuration.') + : undef, + ], + ], # end of combobox "Save" + + 'separator', + + combobox => [ + action => [ t8('Workflow') ], + action => [ + t8('Sales Order'), + submit => [ '#form', { action => "sales_order" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $params{is_sales_quo} || $params{is_pur_ord}, + ], + action => [ + t8('Purchase Order'), + submit => [ '#form', { action => "purchase_order" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $params{is_sales_ord} || $params{is_req_quo}, + ], + action => [ + t8('Delivery Order'), + submit => [ '#form', { action => "delivery_order" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $params{is_sales_ord} || $params{is_pur_ord}, + ], + action => [ + t8('Invoice'), + submit => [ '#form', { action => "invoice" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $allow_invoice, + ], + action => [ + t8('Quotation'), + submit => [ '#form', { action => "quotation" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $params{is_sales_ord}, + ], + action => [ + t8('Request for Quotation'), + submit => [ '#form', { action => "request_for_quotation" } ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $params{is_pur_ord}, + ], + ], # end of combobox "Workflow" + + combobox => [ + action => [ t8('Export') ], + action => [ + t8('Print'), + call => [ 'kivi.SalesPurchase.show_print_dialog' ], + checks => [ @req_trans_desc ], + ], + action => [ + t8('E Mail'), + call => [ 'kivi.SalesPurchase.show_email_dialog' ], + checks => [ @req_trans_desc ], + ], + action => [ + t8('Download attachments of all parts'), + call => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ], + disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef, + only_if => $::instance_conf->get_doc_storage, + ], + ], #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 of combobox "more" + ); + } +} + +sub setup_oe_search_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Search'), + submit => [ '#form' ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_oe_orders_action_bar { + my %params = @_; + + return unless $::form->{type} eq 'sales_order'; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('New sales order'), + submit => [ '#form', { action => 'edit' } ], + checks => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ], + accesskey => 'enter', + ], + ); + } +} + sub form_header { $main::lxdebug->enter_sub(); my @custom_hiddens; @@ -323,22 +479,18 @@ sub form_header { # visible in form_footer too, so package local level and not my here. %TMPL_VAR = (); if ($form->{id}) { - my $obj = SL::DB::Order->new(id => $form->{id})->load; - $TMPL_VAR{warn_save_active_periodic_invoice} = - $obj->is_type('sales_order') - && $obj->periodic_invoices_config - && $obj->periodic_invoices_config->active - && ( !$obj->periodic_invoices_config->end_date - || ($obj->periodic_invoices_config->end_date > DateTime->today_local)) - && $obj->periodic_invoices_config->get_previous_billed_period_start_date; - - $TMPL_VAR{oe_obj} = $obj; + $TMPL_VAR{oe_obj} = SL::DB::Order->new(id => $form->{id})->load; } + $TMPL_VAR{vc_obj} = SL::DB::Customer->new(id => $form->{customer_id})->load if $form->{customer_id}; + $TMPL_VAR{vc_obj} = SL::DB::Vendor->new(id => $form->{vendor_id})->load if $form->{vendor_id}; $form->{defaultcurrency} = $form->get_default_currency(\%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 $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; # openclosed checkboxes my @tmp; @@ -351,12 +503,11 @@ sub form_header { my $vc = $form->{vc} eq "customer" ? "customers" : "vendors"; $form->get_lists("taxzones" => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"), - "payments" => "ALL_PAYMENTS", "currencies" => "ALL_CURRENCIES", - "departments" => "ALL_DEPARTMENTS", - $vc => { key => "ALL_" . uc($vc), - limit => $myconfig{vclimit} + 1 }, "price_factors" => "ALL_PRICE_FACTORS"); + $form->{ALL_PAYMENTS} = SL::DB::Manager::PaymentTerm->get_all( where => [ or => [ obsolete => 0, id => $form->{payment_id} || undef ] ]); + + $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all; # Projects my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"}); @@ -395,25 +546,10 @@ sub form_header { ] ]); $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; - $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" }; - - # vendor/customer - $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; - $TMPL_VAR{vclimit} = $myconfig{vclimit}; - $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('$form->{vc}', '', @{[ $form->{vc} eq 'vendor' ? 1 : 0 ]}, 0)"; - push @custom_hiddens, "$form->{vc}_id"; - push @custom_hiddens, "old$form->{vc}"; - push @custom_hiddens, "select$form->{vc}"; # currencies and exchangerate - my @values = map { $_ } @{ $form->{ALL_CURRENCIES} }; - my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} }; $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency}; - $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, - '-values' => \@values, '-labels' => \%labels, - '-onchange' => "document.getElementById('update_button').click();" - )) if scalar @values; push @custom_hiddens, "forex"; push @custom_hiddens, "exchangerate" if $form->{forex}; @@ -424,7 +560,7 @@ sub form_header { # business $TMPL_VAR{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type')); - push @custom_hiddens, "customer_klass" if $form->{vc} eq 'customer'; + push @custom_hiddens, "customer_pricegroup_id" if $form->{vc} eq 'customer'; my $credittext = $locale->text('Credit Limit exceeded!!!'); @@ -433,7 +569,7 @@ sub form_header { $TMPL_VAR{follow_up_trans_info} = ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)"; if ($form->{id}) { - my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); + my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1); if (scalar @{ $follow_ups }) { $TMPL_VAR{num_follow_ups} = scalar @{ $follow_ups }; @@ -445,9 +581,9 @@ sub form_header { if ($form->{resubmit} && ($form->{format} eq "html")) { $dispatch_to_popup = "window.open('about:blank','Beleg'); document.oe.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.oe.${_}.click(); " for grep { /^action_/ } keys %$form; + $dispatch_to_popup = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();"; } elsif ($creditwarning) { $::request->{layout}->add_javascripts_inline("alert('$credittext');"); } @@ -466,35 +602,49 @@ sub form_header { } } - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase kivi.File kivi.Part show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer)); + + + # original snippets: + my %type_check_vars = ( + is_sales => scalar($form->{type} =~ /^sales_/), + is_order => scalar($form->{type} =~ /_order$/), + is_sales_quo => scalar($form->{type} =~ /sales_quotation$/), + is_req_quo => scalar($form->{type} =~ /request_quotation$/), + is_sales_ord => scalar($form->{type} =~ /sales_order$/), + is_pur_ord => scalar($form->{type} =~ /purchase_order$/), + ); + + setup_oe_action_bar(%type_check_vars); $form->header; if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) { $form->{shipto_id} = $form->{CFDD_shipto_id}; } + + push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) }; + $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} }, - qw(id action type vc formname media format proforma queued printed emailed + qw(id type vc proforma queued printed emailed title creditlimit creditremaining tradediscount business - max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode - CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax - shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender - message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus + max_dunning_level dunning_amount + CFDD_shipto CFDD_shipto_id + taxpart taxservice taxaccounts cursor_fokus show_details useasnew), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount %TMPL_VAR = ( %TMPL_VAR, - is_sales => scalar ($form->{type} =~ /^sales_/), # these vars are exported, so that the template - is_order => scalar ($form->{type} =~ /_order$/), # may determine what to show - is_sales_quo => scalar ($form->{type} =~ /sales_quotation$/), - is_req_quo => scalar ($form->{type} =~ /request_quotation$/), - is_sales_ord => scalar ($form->{type} =~ /sales_order$/), - is_pur_ord => scalar ($form->{type} =~ /purchase_order$/), + %type_check_vars, ); $TMPL_VAR{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + if ($type_check_vars{is_sales} && $::instance_conf->get_transport_cost_reminder_article_number_id) { + $TMPL_VAR{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load; + } + print $form->parse_html_template("oe/form_header", { %TMPL_VAR }); $main::lxdebug->leave_sub(); @@ -535,9 +685,6 @@ sub form_footer { |; } } - -# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this - } else { foreach my $item (split / /, $form->{taxaccounts}) { if ($form->{"${item}_base"}) { @@ -559,19 +706,21 @@ sub form_footer { } } + my $grossamount = $form->{invtotal}; + $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1); + $form->{rounding} = $form->round_amount( + $form->{invtotal} - $form->round_amount($grossamount, 2), + 2 + ); $form->{oldinvtotal} = $form->{invtotal}; $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); - my $tpca_reminder; - $tpca_reminder = check_transport_cost_reminder_article_number() if $::instance_conf->get_transport_cost_reminder_article_number_id; + my $print_options_html = setup_sales_purchase_print_options(); + print $form->parse_html_template("oe/form_footer", { %TMPL_VAR, - webdav => $::instance_conf->get_webdav, - tpca_reminder => $tpca_reminder, - print_options => print_options(inline => 1), - label_edit => $locale->text("Edit the $form->{type}"), - label_workflow => $locale->text("Workflow $form->{type}"), + print_options => $print_options_html, is_sales => scalar ($form->{type} =~ /^sales_/), # these vars are exported, so that the template is_order => scalar ($form->{type} =~ /_order$/), # may determine what to show is_sales_quo => scalar ($form->{type} =~ /sales_quotation$/), @@ -597,7 +746,13 @@ sub update { $form->{update} = 1; - &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'; + } if (!$form->{forex}) { # read exchangerate from input field (not hidden) map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call; @@ -647,7 +802,7 @@ sub update { if ($rows > 1) { select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"}); - ::end_of_request(); + $::dispatcher->end_request; } else { @@ -763,17 +918,15 @@ sub search { $form->{ordlabel} = $locale->text('Quotation Number'); } else { - $form->show_generic_error($locale->text('oe.pl::search called with unknown type'), back_button => 1); + $form->show_generic_error($locale->text('oe.pl::search called with unknown type')); } # setup vendor / customer data - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "departments" => "ALL_DEPARTMENTS", - "$form->{vc}s" => "ALL_VC", "taxzones" => "ALL_TAXZONES", "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->{CT_CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT'); ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE}, @@ -786,10 +939,13 @@ sub search { $form->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project)); + + setup_oe_search_action_bar(); + $form->header(); print $form->parse_html_template('oe/search', { - %myconfig, is_order => scalar($form->{type} =~ /_order/), }); @@ -839,7 +995,7 @@ sub orders { my @columns = ( "transdate", "reqdate", - "id", $ordnumber, + "id", $ordnumber, "edit_exp", "cusordnumber", "customernumber", "name", "netamount", "tax", "amount", @@ -866,7 +1022,7 @@ sub orders { $form->{l_open} = $form->{l_closed} = "Y" if ($form->{open} && $form->{closed}); $form->{l_delivered} = "Y" if ($form->{delivered} && $form->{notdelivered}); $form->{l_periodic_invoices} = "Y" if ($form->{periodic_invoices_active} && $form->{periodic_invoices_inactive}); - + $form->{l_edit_exp} = "Y" if $::instance_conf->get_feature_experimental && (any { $form->{type} eq $_ } qw(sales_order purchase_order)); map { $form->{"l_${_}"} = 'Y' } qw(order_probability expected_billing_date expected_netamount) if $form->{l_order_probability_expected_billing_date}; my $attachment_basename; @@ -903,7 +1059,8 @@ sub orders { transaction_description transdatefrom transdateto type vc employee_id salesman_id reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto - order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to); + order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to + parts_partnumber parts_description all department_id); push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; my @keys_for_url = grep { $form->{$_} } @hidden_variables; @@ -947,6 +1104,7 @@ sub orders { 'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), }, 'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), }, 'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, + 'edit_exp' => { 'text' => $locale->text('Edit (experimental)'), }, %column_defs_cvars, ); @@ -973,17 +1131,19 @@ sub orders { 'data' => $form->{OE}); my @options; - my ($department) = split m/--/, $form->{department}; push @options, $locale->text('Customer') . " : $form->{customer}" if $form->{customer}; push @options, $locale->text('Vendor') . " : $form->{vendor}" if $form->{vendor}; push @options, $locale->text('Contact Person') . " : $form->{cp_name}" if $form->{cp_name}; - push @options, $locale->text('Department') . " : $department" if $form->{department}; + push @options, $locale->text('Department') . " : $form->{department}" if $form->{department}; push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber}; push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description}; + push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all}; push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; + push @options, $locale->text('Part Description') . " : $form->{parts_description}" if $form->{parts_description}; + push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}" if $form->{parts_partnumber}; if ( $form->{transdatefrom} or $form->{transdateto} ) { push @options, $locale->text('Order Date'); push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom}; @@ -1014,6 +1174,10 @@ sub orders { push @options, $locale->text('Steuersatz') . " : " . SL::DB::TaxZone->new(id => $form->{taxzone_id})->load->description; } + if ($form->{department_id}) { + push @options, $locale->text('Department') . " : " . SL::DB::Department->new(id => $form->{department_id})->load->description; + } + if (($form->{order_probability_value} || '') ne '') { push @options, $::locale->text('Order probability') . ' ' . ($form->{order_probability_op} eq 'le' ? '<=' : '>=') . ' ' . $form->{order_probability_value} . '%'; } @@ -1026,7 +1190,7 @@ sub orders { $report->set_options('top_info_text' => join("\n", @options), 'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), - 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), + 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), @@ -1072,6 +1236,7 @@ sub orders { foreach my $column (@columns) { next if ($column eq 'ids'); + next if ($column eq 'edit_exp'); $row->{$column} = { 'data' => $oe->{$column}, 'align' => $column_alignment{$column}, @@ -1087,6 +1252,9 @@ sub orders { $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; + $row->{edit_exp}->{data} = $oe->{ordnumber}; + $row->{edit_exp}->{link} = build_std_url('script=controller.pl', 'action=Order/edit', "type=$form->{type}", 'id=' . E($oe->{id})); + my $row_set = [ $row ]; if (($form->{l_subtotal} eq 'Y') @@ -1103,6 +1271,7 @@ sub orders { $report->add_separator(); $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); + setup_oe_orders_action_bar(); $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -1125,6 +1294,8 @@ sub check_delivered_flag { foreach my $i (1 .. $form->{rowcount}) { next if (!$form->{"id_$i"}); + $form->{"ship_$i"} = 0 if $form->{saveasnew}; + if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) { $all_delivered = 1; next; @@ -1135,6 +1306,7 @@ sub check_delivered_flag { } $form->{delivered} = 1 if $all_delivered; + $form->{delivered} = 0 if $form->{saveasnew}; $main::lxdebug->leave_sub(); } @@ -1162,7 +1334,7 @@ sub save_and_close { $form->{$idx} =~ 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!'); @@ -1172,18 +1344,15 @@ sub save_and_close { &validate_items; - my $payment_id; - if($form->{payment_id}) { - $payment_id = $form->{payment_id}; - } + 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}; - # if the name changed get new values - if (&check_name($form->{vc})) { - if($form->{payment_id} eq "") { - $form->{payment_id} = $payment_id; - } - &update; - ::end_of_request(); + IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; + IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + + update(); + $::dispatcher->end_request; } $form->{id} = 0 if $form->{saveasnew}; @@ -1269,7 +1438,7 @@ sub save { $form->{$idx} =~ 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!'); @@ -1280,18 +1449,15 @@ sub save { remove_emptied_rows(); &validate_items; - my $payment_id; - if($form->{payment_id}) { - $payment_id = $form->{payment_id}; - } + 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}; - # if the name changed get new values - if (&check_name($form->{vc})) { - if($form->{payment_id} eq "") { - $form->{payment_id} = $payment_id; - } - &update; - ::end_of_request(); + IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; + IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + + update(); + $::dispatcher->end_request; } $form->{id} = 0 if $form->{saveasnew}; @@ -1354,7 +1520,7 @@ sub save { if(!$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(); } @@ -1390,7 +1556,7 @@ sub delete { } # /saving the history $form->info($msg); - ::end_of_request(); + $::dispatcher->end_request; } $form->error($err); @@ -1433,16 +1599,15 @@ sub invoice { $form->{quodate} = $form->{transdate}; } - my $payment_id; - if ($form->{payment_id}) { - $payment_id = $form->{payment_id}; - } + 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'; - # if the name changed get new values - if (&check_name($form->{vc})) { - $form->{payment_id} = $payment_id if $form->{payment_id} eq ""; - &update; - ::end_of_request(); + update(); + $::dispatcher->end_request; } _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed'); @@ -1450,7 +1615,7 @@ sub invoice { $form->{cp_id} *= 1; for my $i (1 .. $form->{rowcount}) { - for (qw(ship qty sellprice basefactor)) { + for (qw(ship qty sellprice basefactor discount)) { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"}; } $form->{"converted_from_orderitems_id_$i"} = delete $form->{"orderitems_id_$i"}; @@ -1479,11 +1644,6 @@ sub invoice { delete @{$form}{qw(id closed)}; $form->{rowcount}--; - if ($form->{type} =~ /_order$/) { - $form->{exchangerate} = $exchangerate; - &create_backorder; - } - my ($script); if ( $form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation') { @@ -1512,8 +1672,6 @@ sub invoice { require "bin/mozilla/$form->{script}"; - map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); - my $currency = $form->{currency}; &invoice_links; @@ -1572,76 +1730,6 @@ sub save_exchangerate { $main::lxdebug->leave_sub(); } -sub create_backorder { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - - $form->{shipped} = 1; - - # figure out if we need to create a backorder - # items aren't saved if qty != 0 - - my ($totalqty, $totalship); - for my $i (1 .. $form->{rowcount}) { - my $qty = $form->{"qty_$i"}; - my $ship = $form->{"ship_$i"}; - $totalqty += $qty; - $totalship += $ship; - - $form->{"qty_$i"} = $qty - $ship; - } - - if ($totalship == 0) { - map { $form->{"ship_$_"} = $form->{"qty_$_"} } (1 .. $form->{rowcount}); - $form->{ordtotal} = 0; - $form->{shipped} = 0; - return; - } - - if ($totalqty == $totalship) { - map { $form->{"qty_$_"} = $form->{"ship_$_"} } (1 .. $form->{rowcount}); - $form->{ordtotal} = 0; - return; - } - - my @flds = ( - qw(partnumber description qty ship unit sellprice discount id inventory_accno bin income_accno expense_accno listprice assembly taxaccounts partsgroup) - ); - - for my $i (1 .. $form->{rowcount}) { - map { - $form->{"${_}_$i"} = - $form->format_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(sellprice discount); - } - - relink_accounts(); - - OE->save(\%myconfig, \%$form); - - # rebuild rows for invoice - my @a = (); - my $count = 0; - - for my $i (1 .. $form->{rowcount}) { - $form->{"qty_$i"} = $form->{"ship_$i"}; - - if ($form->{"qty_$i"}) { - push @a, {}; - my $j = $#a; - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - } - } - - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; - - $main::lxdebug->leave_sub(); -} - sub save_as_new { $main::lxdebug->enter_sub(); @@ -1667,14 +1755,9 @@ sub save_as_new { if ( $form->{reqdate} && $form->{id} ) { my $saved_order = OE->retrieve_simple(id => $form->{id}); if ( $saved_order && $saved_order->{reqdate} eq $form->{reqdate} && $saved_order->{transdate} eq $form->{transdate} ) { - my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1; - my $next_workday = DateTime->today_local->add(days => $extra_days); - my $day_of_week = $next_workday->day_of_week; - - $next_workday->add(days => (8 - $day_of_week)) if $day_of_week >= 6; - + my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval : 1; + $form->{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo; $form->{transdate} = DateTime->today_local->to_kivitendo; - $form->{reqdate} = $next_workday->to_kivitendo; } } @@ -1730,6 +1813,8 @@ sub check_for_direct_delivery { return; } + my $cvars = SL::DB::Shipto->new->cvars_by_config; + if ($form->{shipto_id}) { Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_"); @@ -1737,15 +1822,17 @@ sub check_for_direct_delivery { map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form }; } + $_->value($::form->{"CFDD_shiptocvar_" . $_->config->name}) for @{ $cvars }; + delete $form->{action}; $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ($_ ne 'login') && ($_ ne 'password') && (ref $_ eq "") } keys %{ $form } ]; $form->header(); - print $form->parse_html_template("oe/check_for_direct_delivery"); + print $form->parse_html_template("oe/check_for_direct_delivery", { cvars => $cvars }); $main::lxdebug->leave_sub(); - ::end_of_request(); + $::dispatcher->end_request; } sub purchase_order { @@ -1794,9 +1881,8 @@ sub sales_order { my $locale = $main::locale; check_oe_access(); - - $form->mtime_ischanged('oe'); $main::auth->assert('sales_order_edit'); + $form->mtime_ischanged('oe'); if ($form->{type} eq "purchase_order") { delete($form->{ordnumber}); @@ -1940,26 +2026,17 @@ sub delivery_order { $main::lxdebug->leave_sub(); } -sub e_mail { - $main::lxdebug->enter_sub(); +sub oe_delivery_order_from_order { - my $form = $main::form; - my $locale = $main::locale; - - check_oe_access(); - - $form->mtime_ischanged('oe','mail'); - $form->{print_and_save} = 1; + return if !$::form->{id}; - my $saved_form = save_form(); + my $order = SL::DB::Order->new(id => $::form->{id})->load; + $order->flatten_to_form($::form, format_amounts => 1); - save(); + # fake last empty row + $::form->{rowcount}++; - restore_form($saved_form, 0, qw(id ordnumber quonumber)); - - edit_e_mail(); - - $main::lxdebug->leave_sub(); + delivery_order(); } sub yes { @@ -2058,6 +2135,10 @@ sub edit_periodic_invoices_config { $::form->{AR} = [ grep { $_->{link} =~ m/(?:^|:)AR(?::|$)/ } @{ $::form->{ALL_CHARTS} } ]; $::form->{title} = $::locale->text('Edit the configuration for periodic invoices'); + if ($::form->{customer_id}) { + $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]); + } + $::form->header(no_layout => 1); print $::form->parse_html_template('oe/edit_periodic_invoices_config', $config); @@ -2086,6 +2167,12 @@ sub save_periodic_invoices_config { 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_sender => $::form->{email_sender}, + email_subject => $::form->{email_subject}, + email_body => $::form->{email_body}, }; $::form->{periodic_invoices_config} = YAML::Dump($config); @@ -2097,6 +2184,34 @@ sub save_periodic_invoices_config { $::lxdebug->leave_sub(); } +sub _remove_full_delivered_rows { + + my @fields = map { s/_1$//; $_ } grep { m/_1$/ } keys %{ $::form }; + my @new_rows; + + my $removed_rows = 0; + my $row = 0; + while ($row < $::form->{rowcount}) { + $row++; + next unless $::form->{"id_$row"}; + my $base_factor = SL::DB::Manager::Unit->find_by(name => $::form->{"unit_$row"})->base_factor; + my $base_qty = $::form->parse_amount(\%::myconfig, $::form->{"qty_$row"}) * $base_factor; + my $ship_qty = $::form->parse_amount(\%::myconfig, $::form->{"ship_$row"}) * $base_factor; + #$main::lxdebug->message(LXDebug->DEBUG2(),"shipto=".$ship_qty." qty=".$base_qty); + + if (!$ship_qty || ($ship_qty < $base_qty)) { + $::form->{"qty_$row"} = $::form->format_amount(\%::myconfig, ($base_qty - $ship_qty) / $base_factor ); + $::form->{"ship_$row"} = 0; + push @new_rows, { map { $_ => $::form->{"${_}_${row}"} } @fields }; + + } else { + $removed_rows++; + } + } + $::form->redo_rows(\@fields, \@new_rows, scalar(@new_rows), $::form->{rowcount}); + $::form->{rowcount} -= $removed_rows; +} + sub _oe_remove_delivered_or_billed_rows { my (%params) = @_; @@ -2105,6 +2220,18 @@ sub _oe_remove_delivered_or_billed_rows { my $ord_quot = SL::DB::Order->new(id => $params{id})->load; return if !$ord_quot; + # Prüfung ob itemlinks existieren, falls ja dann neue Implementierung + + if ( $params{type} eq 'delivered' ) { + my $orderitem = SL::DB::Manager::OrderItem->get_first( where => [trans_id => $ord_quot->id]); + if ( $orderitem) { + my @links = $orderitem->linked_records(to => 'SL::DB::DeliveryOrderItem'); + if ( scalar(@links ) > 0 ) { + #$main::lxdebug->message(LXDebug->DEBUG2(),"item recordlinks vorhanden"); + return _remove_full_delivered_rows(); + } + } + } my %args = ( direction => 'to', to => $params{type} eq 'delivered' ? 'DeliveryOrder' : 'Invoice', @@ -2126,26 +2253,8 @@ sub _oe_remove_delivered_or_billed_rows { _remove_billed_or_delivered_rows(quantities => \%handled_base_qtys); } -# iterate all positions and match articlenumber -sub check_transport_cost_reminder_article_number { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - - check_oe_access(); - - my $transport_article_id = $::instance_conf->get_transport_cost_reminder_article_number_id; - for my $i (1 .. $form->{rowcount}) { - return if $form->{"id_${i}"} eq $transport_article_id; - } - - # simply return the name of the part - return SL::DB::Part->new(id => $transport_article_id)->load()->partnumber; - - $main::lxdebug->leave_sub(); -} sub dispatcher { - foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order quotation + foreach my $action (qw(delete delivery_order invoice print purchase_order quotation request_for_quotation sales_order save save_and_close save_as_new ship_to update)) { if ($::form->{"action_${action}"}) { call_sub($action); @@ -2155,4 +2264,3 @@ sub dispatcher { $::form->error($::locale->text('No action defined.')); } -