X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=0362e13ae114104f4945a7a8925dc1726dc01b84;hb=2f105e47dc30fc2fc1d5368ea726faa4e6185527;hp=377423d43b539826dc3e260ddc98f47ed0b6005f;hpb=e47236274c273b267417094489eb8ab5ec492c7a;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 377423d43..0362e13ae 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -56,6 +56,7 @@ use SL::PriceSource; use SL::Presenter::Part; use SL::DB::Contact; +use SL::DB::Currency; use SL::DB::Customer; use SL::DB::Default; use SL::DB::Language; @@ -910,16 +911,24 @@ sub order { _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->globalproject_id(undef) if !$order->globalproject_id; - $order->payment_id(undef) if !$order->payment_id; + + $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; - $item->discount($item->discount/100.0); # 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). @@ -935,6 +944,7 @@ sub order { 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(); @@ -1661,7 +1671,7 @@ sub relink_accounts { $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"} = ""; @@ -1999,9 +2009,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 formname groupitems); + $print_form->{$_} = $::form->{$_} for qw(type media printer_id storno formname groupitems); return SL::Helper::PrintOptions->get_print_options( form => $print_form, @@ -2083,11 +2092,17 @@ sub show_sales_purchase_email_dialog { $::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 $email_form = { to => $email, cc => $email_cc, subject => $::form->generate_email_subject, - message => $::form->generate_email_body('record_email' => $record_email), + message => $::form->generate_email_body(%body_params), attachment_filename => $::form->generate_attachment_filename, js_send_function => 'kivi.SalesPurchase.send_email()', };