Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4d8a6515

Von Philip Reetz vor mehr als 17 Jahren hinzugefügt

  • ID 4d8a65151cff0399654ea47c196ab38361a976e8
  • Vorgänger e8a42733
  • Nachfolger 18da4a96

Erweiterung um Anzeige des Ertrages im Verkauf

Unterschiede anzeigen:

bin/mozilla/ar.pl
1340 1340
		<td align=right><input name="l_shipvia" class=checkbox type=checkbox value=Y></td>
1341 1341
		<td nowrap>| . $locale->text('Ship via') . qq|</td>
1342 1342
	      </tr>
1343
	      <tr>
1344
		<td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td><td> |
1345
    .             $locale->text('Ertrag') . qq|</td>
1346
		<td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td><td> |
1347
    .             $locale->text('Ertrag prozentual') . qq|</td>
1348
	      </tr>
1343 1349
	      <tr>
1344 1350
		<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
1345 1351
		<td nowrap>| . $locale->text('Subtotal') . qq|</td>
......
1417 1423
  @columns =
1418 1424
    qw(transdate id type invnumber ordnumber name netamount tax amount paid
1419 1425
       datepaid due duedate transaction_description notes employee shippingpoint shipvia
1420
       globalprojectnumber);
1426
       marge_total marge_percent globalprojectnumber);
1421 1427

  
1422 1428
  my @hidden_variables = map { "l_${_}" } @columns;
1423 1429
  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
......
1444 1450
    'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
1445 1451
    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
1446 1452
    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
1453
    'marge_total'             => { 'text' => $locale->text('Ertrag'), },
1454
    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
1447 1455
  );
1448 1456

  
1449 1457
  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
......
1510 1518
  # escape callback for href
1511 1519
  $callback = $form->escape($href);
1512 1520

  
1513
  my @subtotal_columns = qw(netamount amount paid due);
1521
  my @subtotal_columns = qw(netamount amount paid due marge_total);
1514 1522

  
1515 1523
  my %totals    = map { $_ => 0 } @subtotal_columns;
1516 1524
  my %subtotals = map { $_ => 0 } @subtotal_columns;
......
1524 1532
    map { $subtotals{$_} += $ar->{$_};
1525 1533
          $totals{$_}    += $ar->{$_} } @subtotal_columns;
1526 1534

  
1527
    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due);
1535
    map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
1528 1536

  
1529 1537
    my $is_storno  = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
1530 1538
    my $has_storno = $ar->{storno} && !$is_storno;

Auch abrufbar als: Unified diff