Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index f81435e716b2cd375d428de95979898419e0d639..3f5cdebba38a25453e622d741dabd2dd3a65f7ab 100644 (file)
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -204,8 +204,11 @@ sub set_custom_headers {
 sub get_attachment_basename {
   my $self     = shift;
   my $filename =  $self->{options}->{attachment_basename} || 'report';
+
+  # FIXME: this is bonkers. add a real sluggify method somewhere or import one.
   $filename    =~ s|.*\\||;
   $filename    =~ s|.*/||;
+  $filename    =~ s| |_|g;
 
   return $filename;
 }
@@ -228,6 +231,7 @@ sub generate_with_headers {
     print $self->generate_html_content();
 
   } elsif ($format eq 'csv') {
+    # FIXME: don't do mini http in here
     my $filename = $self->get_attachment_basename();
     print qq|content-type: text/csv\n|;
     print qq|content-disposition: attachment; filename=${filename}.csv\n\n|;

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 2ada087cbbe7450bde9645d1f19e28006a76feba..0b607da1d5a95f789fe7bb337b18dc97b3368ef9 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1844,7 +1844,7 @@ sub save {
         qw(weight listprice sellprice rop);
 
       $form->{assembly_rows}--;
-      $i = $newform{rowcount};
+      $i = $form->{assembly_rows};
       $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
 
       $form->{sellprice} -= $form->{"sellprice_$i"} * $form->{"qty_$i"};

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index b9fbcdaf02a52a2c0a2d551dde273443ca94a989..be94243928e1214bbeaf41d179885cb0af9eb847 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -13,7 +13,7 @@ table.menunew {
   border-spacing: 0;
 }
 
-table.menunew > td {
+table.menunew td {
   padding: 0;
   color:white;
   font-family: Verdana, Arial, sans-serif;

diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index ed67b02e3ed29d6098df52854e63ca326b193e8e..2c5d801fff68a61a89f67bc87b7e0d77950efbce 100644 (file)
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -6,7 +6,6 @@
 
   <form method="post" name="oe" action="[% script %]">
 
-    <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
     <script type="text/javascript" src="js/vendor_selection.js"></script>
     <script type="text/javascript" src="js/calculate_qty.js"></script>