prepare_parts_for_printing: weight nicht hier in TEMPLATE_ARRAYS eintragen, …

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index a61a6c8bb9518244e01c0cf6e1374ebdcf9e19f7..e597786ecf6395747e426e28824f4ed34dd5e639 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -467,7 +467,7 @@ sub header {
   # standard css for all
   # this should gradually move to the layouts that need it
   $layout->use_stylesheet("$_.css") for qw(
-    main menu list_accounts jquery.autocomplete
+    main menu common list_accounts jquery.autocomplete
     jquery.multiselect2side
     ui-lightness/jquery-ui
     jquery-ui.custom
@@ -476,7 +476,7 @@ sub header {
   $layout->use_javascript("$_.js") for (qw(
     jquery jquery-ui jquery.cookie jquery.checkall jquery.download
     jquery/jquery.form jquery/fixes client_js
-    common part_selection switchmenuframe autocomplete_part
+    common part_selection switchmenuframe
   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
 
   $self->{favicon} ||= "favicon.ico";
@@ -947,6 +947,10 @@ sub parse_amount {
 
   # Make sure no code wich is not a math expression ends up in eval().
   return 0 unless $amount =~ /^ [\s \d \( \) \- \+ \* \/ \. ]* $/x;
+
+  # Prevent numbers from being parsed as octals;
+  $amount =~ s{ (?<! [\d.] ) 0+ (?= [1-9] ) }{}gx;
+
   return scalar(eval($amount)) * 1 ;
 }
 
@@ -1137,7 +1141,7 @@ sub parse_template {
       $full_signature         =~ s/\n/<br>\n/g;
       $mail->{message}       .=  $full_signature;
 
-      open(IN, "<", $self->{tmpfile})
+      open(IN, "<:encoding(UTF-8)", $self->{tmpfile})
         or $self->error($self->cleanup . "$self->{tmpfile} : $!");
       $mail->{message} .= $_ while <IN>;
       close(IN);
@@ -1235,6 +1239,7 @@ sub get_formname_translation {
     sales_delivery_order    => $main::locale->text('Delivery Order'),
     purchase_delivery_order => $main::locale->text('Delivery Order'),
     dunning                 => $main::locale->text('Dunning'),
+    letter                  => $main::locale->text('Letter')
   );
 
   $main::lxdebug->leave_sub();
@@ -1249,8 +1254,13 @@ sub get_number_prefix_for_type {
       (first { $self->{type} eq $_ } qw(invoice credit_note)) ? 'inv'
     : ($self->{type} =~ /_quotation$/)                        ? 'quo'
     : ($self->{type} =~ /_delivery_order$/)                   ? 'do'
+    : ($self->{type} =~ /letter/)                             ? 'letter'
     :                                                           'ord';
 
+  # better default like this?
+  # : ($self->{type} =~ /(sales|purcharse)_order/           :  'ord';
+  # :                                                           'prefix_undefined';
+
   $main::lxdebug->leave_sub();
   return $prefix;
 }
@@ -1326,7 +1336,7 @@ sub cleanup {
     push @err, $::locale->text('The application "#1" was not found on the system.', $application || 'pdflatex') . ' ' . $::locale->text('Please contact your administrator.');
 
   } elsif (-f "$self->{tmpfile}.err") {
-    open(FH, "$self->{tmpfile}.err");
+    open(FH, "<:encoding(UTF-8)", "$self->{tmpfile}.err");
     @err = <FH>;
     close(FH);
   }
@@ -2387,7 +2397,7 @@ sub get_lists {
   if ($params{contacts} || $params{shipto}) {
     $vc = 'customer' if $self->{"vc"} eq "customer";
     $vc = 'vendor'   if $self->{"vc"} eq "vendor";
-    die "invalid use of get_lists, need 'vc'";
+    die "invalid use of get_lists, need 'vc'" unless $vc;
     $vc_id = $self->{"${vc}_id"};
   }
 
@@ -2430,7 +2440,7 @@ sub get_lists {
   }
 
   if ($params{"salesmen"}) {
-    $self->_get_employees($dbh, "all_salesmen", $params{"salesmen"});
+    $self->_get_employees($dbh, $params{"salesmen"});
   }
 
   if ($params{"business_types"}) {