X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4493d1eb7845b7eba868f0a16ec2e623dcf1d591..46b5ee69606969a990eaae920bda522a56374c0e:/bin/mozilla/oe.pl diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 8f68f4d38..17d9fb500 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,10 @@ use Data::Dumper; use SL::DB::Customer; use SL::DB::TaxZone; +use SL::DB::PaymentTerm; +require "bin/mozilla/common.pl"; require "bin/mozilla/io.pl"; -require "bin/mozilla/arap.pl"; require "bin/mozilla/reportgenerator.pl"; use strict; @@ -240,9 +241,6 @@ sub order_links { check_oe_access(); - # get customer/vendor - $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - # retrieve order/quotation my $editing = $form->{id}; @@ -255,8 +253,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 @@ -270,18 +266,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(); } @@ -352,12 +336,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"}); @@ -396,25 +379,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}; @@ -425,7 +393,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!!!'); @@ -434,7 +402,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 }; @@ -560,10 +528,12 @@ sub form_footer { } } + my $grossamount = $form->{invtotal}; + $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1); $form->{rounding} = $form->round_amount( - $form->round_amount($form->{invtotal}, 2, 1) - $form->round_amount($form->{invtotal}, 2) + $form->{invtotal} - $form->round_amount($grossamount, 2), + 2 ); - $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1); $form->{oldinvtotal} = $form->{invtotal}; $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); @@ -601,7 +571,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; @@ -651,7 +627,7 @@ sub update { if ($rows > 1) { select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"}); - ::end_of_request(); + $::dispatcher->end_request; } else { @@ -767,17 +743,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}, @@ -790,6 +764,8 @@ sub search { $form->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ]; + $::request->{layout}->use_javascript(map { "${_}.js" } qw(autocomplete_project)); + $form->header(); print $form->parse_html_template('oe/search', { @@ -906,7 +882,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; @@ -977,18 +954,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}; @@ -1019,6 +997,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} . '%'; } @@ -1171,7 +1153,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!'); @@ -1181,18 +1163,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}; @@ -1278,7 +1257,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!'); @@ -1289,18 +1268,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}; @@ -1363,7 +1339,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(); } @@ -1399,7 +1375,7 @@ sub delete { } # /saving the history $form->info($msg); - ::end_of_request(); + $::dispatcher->end_request; } $form->error($err); @@ -1442,16 +1418,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}; - # 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(); + IS->get_customer(\%myconfig, $form) if $vc eq 'customer'; + IR->get_vendor(\%myconfig, $form) if $vc eq 'vendor'; + + update(); + $::dispatcher->end_request; } _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed'); @@ -1459,7 +1434,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"}; @@ -1488,11 +1463,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') { @@ -1521,8 +1491,6 @@ sub invoice { require "bin/mozilla/$form->{script}"; - map { $form->{"select$_"} = "" } ($form->{vc}, "currency"); - my $currency = $form->{currency}; &invoice_links; @@ -1581,76 +1549,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(); @@ -1753,7 +1651,7 @@ sub check_for_direct_delivery { $main::lxdebug->leave_sub(); - ::end_of_request(); + $::dispatcher->end_request; } sub purchase_order { @@ -2077,6 +1975,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); @@ -2105,6 +2007,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); @@ -2116,6 +2024,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) = @_; @@ -2124,6 +2060,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', @@ -2174,4 +2122,3 @@ sub dispatcher { $::form->error($::locale->text('No action defined.')); } -