Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 82a9544a

Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt

  • ID 82a9544a39aba6a691653c379c92b390c0733edb
  • Vorgänger ffd3148f
  • Nachfolger e7127ad0

Die Margen nur bei Verkaufsmasken anzeigen, und auch nur in Zeilen, in denen schon ein Artikel ausgewählt wurde.

Unterschiede anzeigen:

bin/mozilla/io.pl
91 91
  $lxdebug->enter_sub();
92 92
  my $numrows = shift;
93 93

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

  
94 99
  if ($lizenzen && $form->{vc} eq "customer") {
95 100
    if ($form->{type} =~ /sales_order/) {
96 101
      @column_index = (runningnumber, partnumber, description, ship, qty);
......
525 530
          <b>|.$locale->text('Subtotal').qq|</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" "$subtotalchecked">
526 531
|;
527 532

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

  
528 540
    print qq|
529
          ${marge_font_start}<b>|.$locale->text('Ertrag').qq|</b>&nbsp;$form->{"marge_absolut_$i"} &nbsp;$form->{"marge_percent_$i"} % ${marge_font_end}
530
          &nbsp;<b>|.$locale->text('LP').qq|</b>&nbsp;|.$form->format_amount(\%myconfig,$form->{"listprice_$i"},2).qq|
531
          &nbsp;<b>|.$locale->text('EK').qq|</b>&nbsp;|.$form->format_amount(\%myconfig,$form->{"lastcost_$i"},2).qq|
532 541
	  </td>
533 542
	</tr>
534 543
|;
bin/mozilla/oe.pl
1012 1012
	  </td>
1013 1013
          <td>
1014 1014
            <table>
1015
|;
1016

  
1017
  if ($form->{type} =~ /^sales_/) {
1018
    print qq|
1015 1019
            <tr>
1016 1020
              <th  align=left>| . $locale->text('Ertrag') . qq|</th>
1017 1021
              <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
......
1020 1024
              <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
1021 1025
              <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
1022 1026
            </tr>
1027
|;
1028
  }
1029

  
1030
  print qq|
1023 1031
            <input type=hidden name="marge_total" value="$form->{"marge_total"}">
1024 1032
            <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
1025 1033
            </table>

Auch abrufbar als: Unified diff