X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=793099ff0394268056e77d055354333db6bd966c;hb=5a07eafc9d215ad427e1d0e1f1682294703f45ce;hp=b4ae880d158ff51b8e7f0c85890f3e69469b1c49;hpb=0f8e74b871122ef22fa94af78715fd360da203ce;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index b4ae880d1..793099ff0 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -40,7 +40,7 @@ use Carp; use CGI; use List::MoreUtils qw(any uniq apply); -use List::Util qw(min max first); +use List::Util qw(sum min max first); use List::UtilsBy qw(sort_by uniq_by); use SL::ClientJS; @@ -54,9 +54,13 @@ use SL::IO; use SL::File; use SL::PriceSource; use SL::Presenter::Part; +use SL::Util qw(trim); +use SL::DB::AuthUser; use SL::DB::Contact; +use SL::DB::Currency; use SL::DB::Customer; +use SL::DB::DeliveryOrder::TypeData qw(); use SL::DB::Default; use SL::DB::Language; use SL::DB::Printer; @@ -126,8 +130,6 @@ sub _check_io_auth { sub display_row { $main::lxdebug->enter_sub(); - _check_io_auth(); - my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; @@ -142,7 +144,6 @@ sub display_row { $form->{weightunit} = $defaults->{weightunit}; my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl'); - my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order); my $is_delivery_order = $form->{type} =~ /_delivery_order$/; my $is_quotation = $form->{type} =~ /_quotation$/; my $is_invoice = $form->{type} =~ /invoice/; @@ -172,6 +173,12 @@ sub display_row { my @row2_sort = qw( serialnr projectnr reqdate subtotal marge listprice lastcost onhand ); + # serialnr is important for delivery_orders + if ($form->{type} eq 'sales_delivery_order') { + splice @row2_sort, 0, 1; + splice @header_sort, 4, 0, "serialnr"; + } + my %column_def = ( runningnumber => { width => 5, value => $locale->text('No.'), display => 1, }, partnumber => { width => 8, value => $locale->text('Number'), display => 1, }, @@ -319,8 +326,8 @@ sub display_row { my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2; $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -class => "numeric", -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)); - $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/')) - . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}) + $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_dialog('qty_$i', '', 'formel_$i', '')", -value => $locale->text('*/')) + . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) if $form->{"formel_$i"}; $column_data{ship} = ''; @@ -330,7 +337,7 @@ sub display_row { $ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 ); $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"} - . $cgi->hidden(-name => "ship_$i", -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}, $qty_dec)); + . $cgi->hidden(-name => "ship_$i", -value => $form->{"ship_$i"}, $qty_dec); my $ship_missing_qty = $form->{"qty_$i"} - $ship_qty; my $ship_missing_amount = $form->round_amount($ship_missing_qty * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2); @@ -374,8 +381,9 @@ sub display_row { } } - my $edit_prices = $main::auth->assert('edit_prices', 1) && (!$::form->{"active_price_source_$i"} || !$price || $price->editable); - my $edit_discounts = $main::auth->assert('edit_prices', 1) && !$::form->{"active_discount_source_$i"}; + my $right_to_edit_prices = (!$is_purchase && $main::auth->assert('sales_edit_prices', 1)) || ($is_purchase && $main::auth->assert('purchase_edit_prices', 1)); + my $edit_prices = $right_to_edit_prices && (!$::form->{"active_price_source_$i"} || !$price || $price->editable); + my $edit_discounts = $right_to_edit_prices && !$::form->{"active_discount_source_$i"}; $column_data{sellprice} = (!$edit_prices) ? $cgi->hidden( -name => "sellprice_$i", -id => "sellprice_$i", -value => $sellprice_value) . $sellprice_value : $cgi->textfield(-name => "sellprice_$i", -id => "sellprice_$i", -size => 10, -class => "numeric", -value => $sellprice_value); @@ -472,7 +480,7 @@ sub display_row { map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost); push @hidden_vars, grep { defined $form->{"${_}_${i}"} } qw(sellprice discount not_discountable price_factor_id lastcost); push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}"; - push @hidden_vars, qw(delivery_order_items_id converted_from_orderitems_id converted_from_delivery_order_items_id); + push @hidden_vars, qw(delivery_order_items_id converted_from_orderitems_id converted_from_delivery_order_items_id has_sernumber); } my @HIDDENS = map { value => $_}, ( @@ -909,6 +917,55 @@ sub validate_items { sub order { $main::lxdebug->enter_sub(); + _order(); + + if ($::instance_conf->get_feature_experimental_order) { + + # At this point, the record is saved and the exchangerate contains + # an unformatted value. _make_record uses RDBO attributes (i.e. _as_number) + # to assign values and thus expects an formatted value. + $::form->{exchangerate} = $::form->format_amount(\%::myconfig, $::form->{exchangerate}); + + my $order = _make_record(); + + $order->currency(SL::DB::Currency->new(name => $::form->{currency})->load) if $::form->{currency}; + $order->globalproject_id(undef) if !$order->globalproject_id; + $order->payment_id(undef) if !$order->payment_id; + + my $row = 1; + foreach my $item (@{$order->items_sorted}) { + $item->custom_variables([]); + + $item->price_factor_id(undef) if !$item->price_factor_id; + $item->project_id(undef) if !$item->project_id; + + # autovivify all cvars that are not in the form (cvars_by_config can do it). + # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values). + foreach my $var (@{ $item->cvars_by_config }) { + my $key = 'ic_cvar_' . $var->config->name . '_' . $row; + $var->unparsed_value($::form->{$key}); + $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value})); + } + $item->parse_custom_variable_values; + + $row++; + } + + require SL::Controller::Order; + my $c = SL::Controller::Order->new(order => $order); + $c->setup_custom_shipto_from_form($order, $::form); + $c->action_edit(); + + $main::lxdebug->leave_sub(); + $::dispatcher->end_request; + } + + &display_form; + + $main::lxdebug->leave_sub(); +} + +sub _order { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; @@ -982,9 +1039,6 @@ sub order { } &prepare_order; - &display_form; - - $main::lxdebug->leave_sub(); } sub quotation { @@ -1004,7 +1058,7 @@ sub quotation { if ($form->{second_run}) { $form->{print_and_post} = 0; } - delete $form->{$_} foreach (qw(id printed emailed queued)); + delete $form->{$_} foreach (qw(id printed emailed queued quonumber transaction_description)); my $buysell; if ($form->{script} eq 'ir.pl' || $form->{type} eq 'purchase_order') { @@ -1152,6 +1206,15 @@ sub print_form { if ($form->{formname} eq "invoice") { $form->{label} = $locale->text('Invoice'); } + + if ($form->{formname} eq "invoice_for_advance_payment") { + $form->{label} = $locale->text('Invoice for Advance Payment'); + } + + if ($form->{formname} eq "final_invoice") { + $form->{label} = $locale->text('Final Invoice'); + } + if ($form->{formname} eq 'sales_order') { $inv = "ord"; $due = "req"; @@ -1249,10 +1312,14 @@ sub print_form { } $form->{TEMPLATE_DRIVER_OPTIONS} = { }; - if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice request_quotation purchase_order purchase_delivery_order credit_note)) { + if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice invoice_for_advance_payment final_invoice request_quotation purchase_order purchase_delivery_order credit_note)) { $form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types(); } + if ($form->{format} =~ m{pdf}) { + _maybe_attach_zugferd_data($form); + } + $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", @@ -1337,6 +1404,8 @@ sub print_form { $form->get_shipto(\%myconfig); } + $form->set_addition_billing_address_print_variables; + $form->{notes} =~ s/^\s+//g; delete $form->{printer_command}; @@ -1360,7 +1429,7 @@ sub print_form { # Format dates. format_dates($output_dateformat, $output_longdates, - qw(invdate orddate quodate pldate duedate reqdate transdate + qw(invdate orddate quodate pldate duedate reqdate transdate tax_point shippingdate deliverydate validitydate paymentdate datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate employee_startdate employee_enddate @@ -1515,6 +1584,10 @@ sub print_form { today => DateTime->today, }; + if ($defaults->print_interpolate_variables_in_positions) { + $form->substitute_placeholders_in_template_arrays({ field => 'description', type => 'text' }, { field => 'longdescription', type => 'html' }); + } + $form->parse_template(\%myconfig); $form->{callback} = ""; @@ -1619,12 +1692,10 @@ sub relink_accounts { my $form = $main::form; my %myconfig = %main::myconfig; - _check_io_auth(); - $form->{"taxaccounts"} =~ s/\s*$//; $form->{"taxaccounts"} =~ s/^\s*//; foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) { - map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber)); + map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber tax_id)); # add tax_id ? } $form->{"taxaccounts"} = ""; @@ -1681,6 +1752,7 @@ sub _update_part_information { $form->{"weight_$i"} = $info->{weight}; $form->{"part_type_$i"} = $info->{part_type}; $form->{"classification_id_$i"} = $info->{classification_id}; + $form->{"has_sernumber_$i"} = $info->{has_sernumber}; } $main::lxdebug->leave_sub(); @@ -1815,7 +1887,7 @@ sub _remove_billed_or_delivered_rows { # TODO: both of these are makeshift so that price sources can operate on rdbo objects. if # this ever gets rewritten in controller style, throw this out sub _make_record_item { - my ($row) = @_; + my ($row, %params) = @_; my $class = { sales_order => 'OrderItem', @@ -1823,6 +1895,8 @@ sub _make_record_item { sales_quotation => 'OrderItem', request_quotation => 'OrderItem', invoice => 'InvoiceItem', + invoice_for_advance_payment => 'InvoiceItem', + final_invoice => 'InvoiceItem', credit_note => 'InvoiceItem', purchase_invoice => 'InvoiceItem', purchase_delivery_order => 'DeliveryOrderItem', @@ -1863,12 +1937,19 @@ sub _make_record_item { if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) { $obj->${\"$method\_as_date"}($value); } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) { - $obj->${\"$method\_as_number"}($value); + $obj->${\"$method\_as_number"}(($value // '') eq '' ? undef : $value); } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) { $obj->$method(!!$value); + } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) { + $obj->$method(($value // '') eq '' ? undef : $value * 1); } else { $obj->$method($value); } + + if ($method eq 'discount') { + $obj->discount($obj->discount / 100.0); + } + } else { $obj->{__additional_form_attributes}{$method} = $value; } @@ -1878,6 +1959,11 @@ sub _make_record_item { $obj->part(SL::DB::Part->load_cached($::form->{"id_$row"})); } + if ($obj->can('qty')) { + $obj->qty( $obj->qty * $params{factor}); + $obj->base_qty($obj->base_qty * $params{factor}); + } + return $obj; } @@ -1897,6 +1983,8 @@ sub _make_record { : do { die 'unknown invoice type' }; } + my $factor = $::form->{type} =~ m{credit_note} ? -1 : 1; + return unless $class; $class = 'SL::DB::' . $class; @@ -1914,9 +2002,11 @@ sub _make_record { if ($obj->meta->column($method)->isa('Rose::DB::Object::Metadata::Column::Date')) { $obj->${\"$method\_as_date"}($::form->{$method}); } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) { - $obj->${\"$method\_as_number"}($::form->{$method}); + $obj->${\"$method\_as_number"}(($::form->{$method} // '') eq '' ? undef : $::form->{$method}); } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) { $obj->$method(!!$::form->{$method}); + } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) { + $obj->$method(($::form->{$method} // '') eq '' ? undef : $::form->{$method} * 1); } else { $obj->$method($::form->{$method}); } @@ -1925,11 +2015,23 @@ sub _make_record { my @items; for my $i (1 .. $::form->{rowcount}) { next unless $::form->{"id_$i"}; - push @items, _make_record_item($i); + push @items, _make_record_item($i, factor => $factor); } $obj->items(@items) if @items; - $obj->is_sales(!!$obj->customer_id) if $class eq 'SL::DB::DeliveryOrder'; + + if ($class eq 'SL::DB::DeliveryOrder' && !$obj->order_type) { + $obj->order_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type})); + } + + if ($class eq 'SL::DB::Invoice') { + my $paid = $factor * + sum + map { $::form->parse_amount(\%::myconfig, $::form->{$_}) } + grep { m{^paid_\d+$} } + keys %{ $::form }; + $obj->paid($paid); + } return $obj; } @@ -1937,9 +2039,8 @@ sub _make_record { sub setup_sales_purchase_print_options { my $print_form = Form->new(''); $print_form->{printers} = SL::DB::Manager::Printer->get_all_sorted; - $print_form->{languages} = SL::DB::Manager::Language->get_all_sorted; - $print_form->{$_} = $::form->{$_} for qw(type media language_id printer_id storno); + $print_form->{$_} = $::form->{$_} for qw(type media printer_id storno formname groupitems); return SL::Helper::PrintOptions->get_print_options( form => $print_form, @@ -1950,7 +2051,7 @@ sub setup_sales_purchase_print_options { } sub _get_files_for_email_dialog { - my %files = map { ($_ => []) } qw(versions files vc_files part_files); + my %files = map { ($_ => []) } qw(versions files vc_files part_files project_files); return %files if !$::instance_conf->get_doc_storage; @@ -1959,6 +2060,8 @@ sub _get_files_for_email_dialog { $files{files} = [ SL::File->get_all( object_id => $::form->{id}, object_type => $::form->{type}, file_type => 'attachment') ]; $files{vc_files} = [ SL::File->get_all( object_id => $::form->{vc_id}, object_type => $::form->{vc}, file_type => 'attachment') ] if $::form->{vc} && $::form->{"vc_id"}; + $files{project_files} = [ SL::File->get_all(object_id => $::form->{project_id}, object_type => 'project',file_type => 'attachment') ] + if $::form->{project_id}; } my @parts = @@ -1984,10 +2087,33 @@ sub _get_files_for_email_dialog { sub show_sales_purchase_email_dialog { my $email = ''; + my $email_cc = ''; + my $record_email; if ($::form->{cp_id}) { $email = SL::DB::Contact->load_cached($::form->{cp_id})->cp_email; } - + # write a dispatch table if a third type enters + # check record mail for sales_invoice + if ($::form->{type} eq 'invoice' && (!$email || $::instance_conf->get_invoice_mail_settings ne 'cp')) { + # check for invoice_mail if defined (vc.invoice_email) + $record_email = SL::DB::Customer->load_cached($::form->{vc_id})->invoice_mail; + if ($record_email) { + # check if cc for contact is also wanted + $email_cc = $email if ($::instance_conf->get_invoice_mail_settings eq 'invoice_mail_cc_cp'); + $email = $record_email; + } + } + # check record mail for sales_delivery_order + if ($::form->{type} eq 'sales_delivery_order') { + # check for deliver_order_mail if defined (vc.delivery_order_mail) + $record_email = SL::DB::Customer->load_cached($::form->{vc_id})->delivery_order_mail; + if ($record_email) { + # check if cc for contact is also wanted + $email_cc = $email; # always cc to cp + $email = $record_email; + } + } + # still no email? use general mail (vc.email) if (!$email && $::form->{vc} && $::form->{vc_id}) { $email = SL::DB::Customer->load_cached($::form->{vc_id})->email if 'customer' eq $::form->{vc}; $email = SL::DB::Vendor ->load_cached($::form->{vc_id})->email if 'vendor' eq $::form->{vc}; @@ -1995,20 +2121,43 @@ sub show_sales_purchase_email_dialog { $email = '' if $::form->{type} eq 'purchase_delivery_order'; + $::form->{language} = $::form->get_template_language(\%::myconfig); + $::form->{language} = "_" . $::form->{language}; + + my %body_params = (record_email => $record_email); + if (($::form->{type} eq 'invoice') && $::form->{direct_debit}) { + $body_params{translation_type} = "preset_text_invoice_direct_debit"; + $body_params{fallback_translation_type} = "preset_text_invoice"; + } + + my @employees_with_email = grep { + my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login); + $user && !!trim($user->get_config_value('email')); + } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) }; + my $email_form = { to => $email, + cc => $email_cc, subject => $::form->generate_email_subject, - message => $::form->generate_email_body, + message => $::form->generate_email_body(%body_params), attachment_filename => $::form->generate_attachment_filename, js_send_function => 'kivi.SalesPurchase.send_email()', }; my %files = _get_files_for_email_dialog(); + + my $all_partner_email_addresses; + $all_partner_email_addresses = SL::DB::Customer->load_cached($::form->{vc_id})->get_all_email_addresses() if 'customer' eq $::form->{vc}; + $all_partner_email_addresses = SL::DB::Vendor ->load_cached($::form->{vc_id})->get_all_email_addresses() if 'vendor' eq $::form->{vc}; + my $html = $::form->parse_html_template("common/_send_email_dialog", { - email_form => $email_form, - show_bcc => $::auth->assert('email_bcc', 'may fail'), - FILES => \%files, - is_customer => $::form->{vc} eq 'customer', + email_form => $email_form, + show_bcc => $::auth->assert('email_bcc', 'may fail'), + FILES => \%files, + is_customer => $::form->{vc} eq 'customer', + is_invoice_mail => ($record_email && $::form->{type} eq 'invoice'), + ALL_EMPLOYEES => \@employees_with_email, + ALL_PARTNER_EMAIL_ADDRESSES => $all_partner_email_addresses, }); print $::form->ajax_response_header, $html; @@ -2022,13 +2171,30 @@ sub send_sales_purchase_email { : 'is.pl'; my $email_form = delete $::form->{email_form}; + + if ($email_form->{additional_to}) { + $email_form->{to} = join ', ', grep { $_ } $email_form->{to}, @{$email_form->{additional_to}}; + delete $email_form->{additional_to}; + } + my %field_names = (to => 'email'); $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form }; $::form->{media} = 'email'; - if (($::form->{attachment_policy} // '') =~ m{^(?:old_file|no_file)$}) { + $::form->{attachment_policy} //= ''; + + # Is an old file version available? + my $attfile; + if ($::form->{attachment_policy} eq 'old_file') { + $attfile = SL::File->get_all(object_id => $id, + object_type => $type, + file_type => 'document', + print_variant => $::form->{formname},); + } + + if ($::form->{attachment_policy} eq 'no_file' || ($::form->{attachment_policy} eq 'old_file' && $attfile)) { $::form->send_email(\%::myconfig, 'pdf'); } else { @@ -2040,3 +2206,68 @@ sub send_sales_purchase_email { print $::form->redirect_header($script . '?action=edit&id=' . $::form->escape($id) . '&type=' . $::form->escape($type)); } + +sub _maybe_attach_zugferd_data { + my ($form) = @_; + + my $record = _make_record(); + + return if !$record + || !$record->can('customer') + || !$record->customer + || !$record->can('create_pdf_a_print_options') + || !$record->can('create_zugferd_data') + || !$record->customer->create_zugferd_invoices_for_this_customer; + + eval { + my $xmlfile = File::Temp->new; + $xmlfile->print($record->create_zugferd_data); + $xmlfile->close; + + $form->{TEMPLATE_DRIVER_OPTIONS}->{pdf_a} = $record->create_pdf_a_print_options(zugferd_xmp_data => $record->create_zugferd_xmp_data); + $form->{TEMPLATE_DRIVER_OPTIONS}->{pdf_attachments} = [ + { source => $xmlfile, + name => 'factur-x.xml', + description => $::locale->text('Factur-X/ZUGFeRD invoice'), + relationship => '/Alternative', + mime_type => 'text/xml', + } + ]; + }; + + if (my $e = SL::X::ZUGFeRDValidation->caught) { + $::form->error($e->message); + } +} + +sub download_factur_x_xml { + my ($form) = @_; + + my $record = _make_record(); + + die if !$record + || !$record->can('customer') + || !$record->customer + || !$record->can('create_pdf_a_print_options') + || !$record->can('create_zugferd_data') + || !$record->customer->create_zugferd_invoices_for_this_customer; + + my $xml_content = eval { $record->create_zugferd_data }; + + if (my $e = SL::X::ZUGFeRDValidation->caught) { + $::form->error($e->message); + } + + my $attachment_filename = $::form->generate_attachment_filename; + $attachment_filename =~ s{\.[^.]+$}{.xml}; + my %headers = ( + '-type' => 'application/xml', + '-connection' => 'close', + '-attachment' => $attachment_filename, + '-content-length' => length($xml_content), + ); + + print $::request->cgi->header(%headers); + + $::locale->with_raw_io(\*STDOUT, sub { print $xml_content }); +}