X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=c62e694a3e3c266afe0265757df2a745d913950d;hb=b50425978983c8680e2cd93f7bb49408f2c46d45;hp=884a5b5bc4d0ec0a15eadaf69ffbb15884201358;hpb=2d44a547200a198e1c544c41152aa7c2df910e51;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 884a5b5bc..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|<textarea name="notes" class="texteditor" wrap="soft" style="width: 350px; height: 150px">| . H($form->{notes}) . qq|</textarea>|;
-  $TMPL_VAR->{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
-
   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};
@@ -1953,7 +1948,8 @@ sub poso {
   $form->{old_salesman_id}     = $form->{salesman_id};
 
   # reset
-  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber);
+  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber
+                                taxzone_id currency);
   # this converted variable is also used for sales_order to purchase order and vice versa
   $form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
 
@@ -2170,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};
@@ -2236,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;