X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4341dfafb3e017d00a843496a4c671fe5601db74..8a47996aaf3e91db6b21ee147c2cc269ee1d3e6d:/bin/mozilla/oe.pl diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 1d358d960..c62e694a3 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -44,6 +44,7 @@ use SL::IR; use SL::IS; use SL::MoreCommon qw(ary_diff restore_form save_form); use SL::ReportGenerator; +use SL::YAML; use List::MoreUtils qw(uniq any none); use List::Util qw(min max reduce sum); use Data::Dumper; @@ -330,7 +331,6 @@ sub setup_oe_action_bar { t8('Update'), submit => [ '#form', { action => "update" } ], id => 'update_button', - checks => [ 'kivi.validate_form' ], accesskey => 'enter', ], @@ -614,7 +614,7 @@ sub form_header { $form->{periodic_invoices_status} = $locale->text('not configured'); } else { - my $config = YAML::Load($form->{periodic_invoices_config}); + my $config = SL::YAML::Load($form->{periodic_invoices_config}); $form->{periodic_invoices_status} = $config->{active} ? $locale->text('active') : $locale->text('inactive'); } } @@ -680,13 +680,8 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; - my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8); - my $TMPL_VAR = $::request->cache('tmpl_var', {}); - $TMPL_VAR->{notes} = qq||; - $TMPL_VAR->{intnotes} = qq||; - 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}; @@ -2171,7 +2166,7 @@ sub edit_periodic_invoices_config { check_oe_access(); my $config; - $config = YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config}; + $config = SL::YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config}; if ('HASH' ne ref $config) { my $lang_id = $::form->{language_id}; @@ -2237,7 +2232,7 @@ sub save_periodic_invoices_config { email_body => $::form->{email_body}, }; - $::form->{periodic_invoices_config} = YAML::Dump($config); + $::form->{periodic_invoices_config} = SL::YAML::Dump($config); $::form->{title} = $::locale->text('Edit the configuration for periodic invoices'); $::form->header;