From: G. Richardson <information@lx-office-hosting.de>
Date: Fri, 30 Apr 2010 08:41:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-grichardson@lx-office.linet-services.de/~/lx-offic... 
X-Git-Tag: release-2.6.2beta1~342^2~2^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/37452fcb0ef4537ac851fa3e816148cec345ae0c?ds=sidebyside;hp=-c

Merge branch 'master' of ssh://git-grichardson@lx-office.linet-services.de/~/lx-office-erp
---

37452fcb0ef4537ac851fa3e816148cec345ae0c
diff --combined bin/mozilla/io.pl
index 5666d6352,44ddc1675..46b7c28c0
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@@ -675,7 -675,7 +675,7 @@@ sub item_selected 
    map {
      $form->{"${_}_$i"} =
        $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
 -  } qw(sellprice listprice) if $form->{item} ne 'assembly';
 +  } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly';
  
    # get pricegroups for parts
    IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@@ -1184,7 -1184,9 +1184,9 @@@ sub print_options 
      (!$options{no_html}) ?
        opthash("html", $form->{DF}{html}, "HTML") : undef,
      ($main::opendocument_templates && !$options{no_opendocument}) ?
-       opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef;
+       opthash("opendocument",        $form->{DF}{opendocument},        $locale->text("OpenDocument/OASIS")) : undef,
+     ($main::excel_templates && !$options{no_excel}) ?
+       opthash("excel",               $form->{DF}{excel},               $locale->text("Excel")) : undef;
  
    push @LANGUAGE_ID,
      map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
@@@ -1592,6 -1594,9 +1594,9 @@@ sub print_form 
    } elsif ($form->{"format"} =~ /opendocument/) {
      $form->{opendocument} = 1;
      $extension            = 'odt';
+   } elsif ($form->{"format"} =~ /excel/) {
+     $form->{excel} = 1;
+     $extension            = 'xls';
    }
  
    my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));