X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Foe.pl;h=a2d7175bc23b577bfa5c6f0a93efda5109c21a05;hb=e86e30de944c4bbe4b42f43d933e0a28a83408dd;hp=73c70b30f1a1a506bd19311008e3ab279e65c35a;hpb=4fa7102b36468079313df9e579f7537d49aab859;p=kivitendo-erp.git diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 73c70b30f..a2d7175bc 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -31,6 +31,8 @@ # Quotation module #====================================================================== + +use Carp; use POSIX qw(strftime); use SL::DO; @@ -42,9 +44,12 @@ use SL::MoreCommon qw(ary_diff); use SL::PE; use SL::ReportGenerator; use List::MoreUtils qw(any none); -use List::Util qw(max reduce sum); +use List::Util qw(min max reduce sum); use Data::Dumper; +use SL::DB::Customer; +use SL::DB::TaxZone; + require "bin/mozilla/io.pl"; require "bin/mozilla/arap.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -153,6 +158,8 @@ sub edit { check_oe_access(); + $form->{taxincluded_changed_by_user} = 1; + # show history button $form->{javascript} = qq||; #/show hhistory button @@ -223,8 +230,7 @@ sub order_links { $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); # retrieve order/quotation - $form->{webdav} = $::lx_office_conf{features}->{webdav}; - $form->{jsscript} = 1; + $form->{webdav} = $::instance_conf->get_webdav; my $editing = $form->{id}; @@ -239,14 +245,14 @@ sub order_links { $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 currency)); + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id delivery_term_id currency)); $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids}; # get customer / vendor IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/; IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/; - $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id)); + $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id delivery_term_id)); $form->restore_vars(qw(currency)) if $form->{id}; $form->restore_vars(qw(taxincluded)) if $form->{id}; $form->restore_vars(qw(salesman_id)) if $editing; @@ -312,9 +318,6 @@ sub form_header { $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - # use JavaScript Calendar or not - $form->{jsscript} = 1; - # openclosed checkboxes my @tmp; push @tmp, sprintf qq||, @@ -339,12 +342,13 @@ sub form_header { "price_factors" => "ALL_PRICE_FACTORS"); # label subs - $TMPL_VAR{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]); - $TMPL_VAR{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]); - $TMPL_VAR{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all(query => [ + my $employee_list_query_gen = sub { $::form->{$_[0]} ? [ or => [ id => $::form->{$_[0]}, deleted => 0 ] ] : [ deleted => 0 ] }; + $TMPL_VAR{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('employee_id')); + $TMPL_VAR{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('salesman_id')); + $TMPL_VAR{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all_sorted(query => [ or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ] ]); - $TMPL_VAR{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all(query => [ + $TMPL_VAR{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [ or => [ cp_cv_id => $::form->{"$::form->{vc}_id"} * 1, and => [ @@ -400,19 +404,18 @@ sub form_header { } } - my $onload = ""; + my $dispatch_to_popup = ''; if ($form->{resubmit} && ($form->{format} eq "html")) { - $onload = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';"; - $onload .= "document.do.submit();"; + $dispatch_to_popup = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';"; + $dispatch_to_popup .= "document.do.submit();"; } elsif ($form->{resubmit}) { # emulate click for resubmitting actions - $onload = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form; - $onload .= "document.oe.submit();"; + $dispatch_to_popup = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form; } elsif ($creditwarning) { - $onload = "alert('$credittext')"; + $::request->{layout}->add_javascripts_inline("alert('$credittext');"); } - $TMPL_VAR{onload} = $onload; + $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});"); $TMPL_VAR{dateformat} = $myconfig{dateformat}; $TMPL_VAR{numberformat} = $myconfig{numberformat}; @@ -426,21 +429,22 @@ sub form_header { } } - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details)); $form->header; - + if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) { + $form->{shipto_id} = $form->{CFDD_shipto_id}; + } $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} }, qw(id action type vc formname media format proforma queued printed emailed title creditlimit creditremaining tradediscount business max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode - shiptocity shiptocountry shiptocontact shiptophone shiptofax + 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), + message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus + show_details), @custom_hiddens, - map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ]; # deleted: discount + map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ]; # deleted: discount %TMPL_VAR = ( %TMPL_VAR, @@ -475,16 +479,9 @@ sub form_footer { $TMPL_VAR{notes} = qq||; $TMPL_VAR{intnotes} = qq||; - IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/; - - if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) { - if ( $form->{taxincluded_checked} eq 'y' ) { - $form->{taxincluded} = 1; - } elsif ( $form->{taxincluded_checked} eq 'n' ) { - $form->{taxincluded} = 0; - } else { - $form->{taxincluded} = $myconfig{taxincluded_checked}; - } + if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) { + my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load(); + $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked}; } if (!$form->{taxincluded}) { @@ -527,9 +524,11 @@ sub form_footer { $form->{oldinvtotal} = $form->{invtotal}; + $TMPL_VAR{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); + print $form->parse_html_template("oe/form_footer", { %TMPL_VAR, - webdav => $::lx_office_conf{features}->{webdav}, + webdav => $::instance_conf->get_webdav, print_options => print_options(inline => 1), label_edit => $locale->text("Edit the $form->{type}"), label_workflow => $locale->text("Workflow $form->{type}"), @@ -602,7 +601,11 @@ sub update { $form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"}); if ($rows) { - $form->{"qty_$i"} = 1 unless ($form->parse_amount(\%myconfig, $form->{"qty_$i"})); + + $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"}); + if( !$form->{"qty_$i"} ) { + $form->{"qty_$i"} = 1; + } if ($rows > 1) { @@ -722,11 +725,12 @@ sub search { $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"); - $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); + "$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 ]); # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header(); @@ -783,8 +787,10 @@ sub orders { my @columns = ( "transdate", "reqdate", "id", $ordnumber, + "cusordnumber", "customernumber", "name", "netamount", "tax", "amount", + "remaining_netamount", "remaining_amount", "curr", "employee", "salesman", "shipvia", "globalprojectnumber", @@ -792,7 +798,8 @@ sub orders { "delivered", "periodic_invoices", "marge_total", "marge_percent", "vcnumber", "ustid", - "country", + "country", "shippingpoint", + "taxzone", ); # only show checkboxes if gotten here via sales_order form. @@ -828,11 +835,15 @@ sub orders { my $report = SL::ReportGenerator->new(\%myconfig, $form); my @hidden_variables = map { "l_${_}" } @columns; - push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber + push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber transaction_description transdatefrom transdateto type vc employee_id salesman_id - reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive); + reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive + business_id shippingpoint taxzone_id); - my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); + my @keys_for_url = grep { $form->{$_} } @hidden_variables; + push @keys_for_url, 'taxzone_id' if $form->{taxzone_id} ne ''; # taxzone_id could be 0 + + my $href = build_std_url('action=orders', @keys_for_url); my %column_defs = ( 'ids' => { 'text' => '', }, @@ -841,10 +852,14 @@ sub orders { 'id' => { 'text' => $locale->text('ID'), }, 'ordnumber' => { 'text' => $locale->text('Order'), }, 'quonumber' => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), }, + 'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), }, 'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, + 'customernumber' => { 'text' => $locale->text('Customer Number'), }, 'netamount' => { 'text' => $locale->text('Amount'), }, 'tax' => { 'text' => $locale->text('Tax'), }, 'amount' => { 'text' => $locale->text('Total'), }, + 'remaining_amount' => { 'text' => $locale->text('Remaining Amount'), }, + 'remaining_netamount' => { 'text' => $locale->text('Remaining Net Amount'), }, 'curr' => { 'text' => $locale->text('Curr'), }, 'employee' => { 'text' => $locale->text('Employee'), }, 'salesman' => { 'text' => $locale->text('Salesman'), }, @@ -859,14 +874,16 @@ sub orders { 'country' => { 'text' => $locale->text('Country'), }, 'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, 'periodic_invoices' => { 'text' => $locale->text('Per. Inv.'), }, + 'shippingpoint' => { 'text' => $locale->text('Shipping Point'), }, + 'taxzone' => { 'text' => $locale->text('Steuersatz'), }, ); - foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) { + foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } - my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr); + my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr remaining_amount remaining_netamount); $form->{"l_type"} = "Y"; map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns; @@ -884,8 +901,10 @@ sub orders { push @options, $locale->text('Vendor') . " : $form->{vendor}" if $form->{vendor}; push @options, $locale->text('Department') . " : $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('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; 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}; @@ -900,7 +919,15 @@ sub orders { push @options, $locale->text('Closed') if $form->{closed}; push @options, $locale->text('Delivery Order created') if $form->{delivered}; push @options, $locale->text('Not delivered') if $form->{notdelivered}; - push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_actibe}; + push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_active}; + + if ($form->{business_id}) { + my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type'); + push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description; + } + if ($form->{taxzone_id} ne '') { # taxzone_id could be 0 + push @options, $locale->text('Steuersatz') . " : " . SL::DB::TaxZone->new(id => $form->{taxzone_id})->load->description; + } $report->set_options('top_info_text' => join("\n", @options), 'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), @@ -918,12 +945,12 @@ sub orders { # escape callback for href my $callback = $form->escape($href); - my @subtotal_columns = qw(netamount amount marge_total marge_percent); + my @subtotal_columns = qw(netamount amount marge_total marge_percent remaining_amount remaining_netamount); my %totals = map { $_ => 0 } @subtotal_columns; my %subtotals = map { $_ => 0 } @subtotal_columns; - my $idx = 0; + my $idx = 1; my $edit_url = build_std_url('action=edit', 'type', 'vc'); @@ -941,7 +968,7 @@ sub orders { $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0; $totals{marge_percent} = $totals{netamount} ? ($totals{marge_total} * 100 / $totals{netamount} ) : 0; - map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent); + map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent remaining_amount remaining_netamount); my $row = { }; @@ -965,8 +992,8 @@ sub orders { my $row_set = [ $row ]; if (($form->{l_subtotal} eq 'Y') - && (($idx == (scalar @{ $form->{OE} } - 1)) - || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx + 1]->{ $form->{sort} }))) { + && (($idx == (scalar @{ $form->{OE} })) + || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx]->{ $form->{sort} }))) { push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal'); } @@ -1098,10 +1125,8 @@ sub save_and_close { } - # get new number in sequence if no number is given or if saveasnew was requested - if (!$form->{$ordnumber} || $form->{saveasnew}) { - $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld); - } + # get new number in sequence if saveasnew was requested + delete $form->{$ordnumber} if $form->{saveasnew}; relink_accounts(); @@ -1208,16 +1233,18 @@ sub save { } - $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld) - unless $form->{$ordnumber}; - relink_accounts(); OE->save(\%myconfig, \%$form); # saving the history if(!exists $form->{addition}) { - $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + if ( $form->{formname} eq 'sales_quotation' or $form->{formname} eq 'request_quotation' ) { + $form->{snumbers} = qq|quonumber_| . $form->{quonumber}; + } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + }; + $form->{what_done} = $form->{formname}; $form->{addition} = "SAVED"; $form->save_history; } @@ -1225,7 +1252,7 @@ sub save { $form->{simple_save} = 1; if(!$form->{print_and_save}) { - delete @{$form}{ary_diff([keys %{ $form }], [qw(login stylesheet id script type cursor_fokus)])}; + delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])}; edit(); ::end_of_request(); } @@ -1233,31 +1260,6 @@ sub save { } sub delete { - $::lxdebug->enter_sub; - - check_oe_access(); - - $::form->header; - - # delete action variable - delete $::form->{$_} for qw(action header); - - my @hiddens; - for my $key (keys %$::form) { - next if $key eq 'login' || $key eq 'password' || '' ne ref $::form->{$key}; - push @hiddens, { key => $key, value => $::form->{$key} }; - } - - print $::form->parse_html_template('oe/delete', { - hiddens => \@hiddens, - is_order => scalar($::form->{type} =~ /_order$/), - }); - - - $::lxdebug->leave_sub; -} - -sub delete_order_quotation { $main::lxdebug->enter_sub(); my $form = $main::form; @@ -1335,6 +1337,8 @@ sub invoice { ::end_of_request(); } + _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'billed'); + $form->{cp_id} *= 1; for my $i (1 .. $form->{rowcount}) { @@ -1354,8 +1358,7 @@ sub invoice { $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $orddate, $buysell); if (!$exchangerate) { - &backorder_exchangerate($orddate, $buysell); - ::end_of_request(); + $exchangerate = 0; } } @@ -1446,80 +1449,6 @@ sub invoice { $main::lxdebug->leave_sub(); } -sub backorder_exchangerate { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my $locale = $main::locale; - - check_oe_access(); - - my ($orddate, $buysell) = @_; - - $form->header; - - print qq| -
- - - - -