Die Margen nur bei Verkaufsmasken anzeigen, und auch nur in Zeilen, in denen schon...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 19f8113be90dc0bb257b00d390fa2311d0cd86d1..2c44d60c1fbffcc9775bd4a1a0029bd4f4522a78 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -91,6 +91,11 @@ sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;
 
   $lxdebug->enter_sub();
   my $numrows = shift;
 

+  my $is_sales =
+    (substr($form->{type}, 0, 6) eq "sales_")
+    || (($form->{type} eq "invoice") && ($form->{script} eq "is.pl"))
+    || ($form->{type} eq 'credit_note');
+

   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);
   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);


@@ -525,10 +530,14 @@ sub display_row {
           <b>|.$locale->text('Subtotal').qq|</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" "$subtotalchecked">
 |;
 
           <b>|.$locale->text('Subtotal').qq|</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" "$subtotalchecked">
 |;
 

+    if ($form->{"id_$i"} && $is_sales) {
+      print qq|
+          ${marge_font_start}<b>| . $locale->text('Ertrag') . qq|</b>&nbsp;$form->{"marge_absolut_$i"} &nbsp;$form->{"marge_percent_$i"} % ${marge_font_end}
+          &nbsp;<b>| . $locale->text('LP') . qq|</b>&nbsp;| . $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2) . qq|
+          &nbsp;<b>| . $locale->text('EK') . qq|</b>&nbsp;| . $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2);
+    }
+

     print qq|
     print qq|

-          ${marge_font_start}<b>|.$locale->text('Ertrag').qq|</b>&nbsp;$form->{"marge_absolut_$i"} &nbsp;$form->{"marge_percent_$i"} % ${marge_font_end}
-          &nbsp;<b>|.$locale->text('LP').qq|</b>&nbsp;|.$form->format_amount(\%myconfig,$form->{"listprice_$i"},2).qq|
-          &nbsp;<b>|.$locale->text('EK').qq|</b>&nbsp;|.$form->format_amount(\%myconfig,$form->{"lastcost_$i"},2).qq|

          </td>
        </tr>
 |;
          </td>
        </tr>
 |;

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 452613c8f5f24e8282797758acef958b3129daaa..424cf34a6f2f99b87714cb16dbd9b96afacbe8ff 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1012,6 +1012,10 @@ sub form_footer {
          </td>
           <td>
             <table>
          </td>
           <td>
             <table>

+|;
+
+  if ($form->{type} =~ /^sales_/) {
+    print qq|

             <tr>
               <th  align=left>| . $locale->text('Ertrag') . qq|</th>
               <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
             <tr>
               <th  align=left>| . $locale->text('Ertrag') . qq|</th>
               <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>


@@ -1020,6 +1024,10 @@ sub form_footer {
               <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
               <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
             </tr>
               <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
               <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
             </tr>

+|;
+  }
+
+  print qq|

             <input type=hidden name="marge_total" value="$form->{"marge_total"}">
             <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
             </table>
             <input type=hidden name="marge_total" value="$form->{"marge_total"}">
             <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
             </table>