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

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;