Revision 4d8a6515
Von Philip Reetz vor mehr als 17 Jahren hinzugefügt
| bin/mozilla/oe.pl | ||
|---|---|---|
| 1010 | 1010 |
</tr> |
| 1011 | 1011 |
</table> |
| 1012 | 1012 |
</td> |
| 1013 |
<td align=right width=100%> |
|
| 1013 |
<td> |
|
| 1014 |
<table> |
|
| 1015 |
<tr> |
|
| 1016 |
<th align=left>| . $locale->text('Ertrag') . qq|</th>
|
|
| 1017 |
<td>| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
|
|
| 1018 |
</tr> |
|
| 1019 |
<tr> |
|
| 1020 |
<th align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
|
|
| 1021 |
<td>| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
|
|
| 1022 |
</tr> |
|
| 1023 |
<input type=hidden name="marge_total" value="$form->{"marge_total"}">
|
|
| 1024 |
<input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
|
|
| 1025 |
</table> |
|
| 1026 |
</td> |
|
| 1027 |
<td align=right> |
|
| 1014 | 1028 |
$taxincluded |
| 1015 |
<table width=100%>
|
|
| 1029 |
<table> |
|
| 1016 | 1030 |
$subtotal |
| 1017 | 1031 |
$tax |
| 1018 | 1032 |
<tr> |
| ... | ... | |
| 1534 | 1548 |
. $locale->text('Total') . qq|</td>
|
| 1535 | 1549 |
</tr> |
| 1536 | 1550 |
<tr> |
| 1551 |
<td><input name="l_marge_total" class=checkbox type=checkbox value=Y> | |
|
| 1552 |
. $locale->text('Ertrag') . qq|</td>
|
|
| 1553 |
<td><input name="l_marge_percent" class=checkbox type=checkbox value=Y> | |
|
| 1554 |
. $locale->text('Ertrag prozentual') . qq|</td>
|
|
| 1555 |
</tr> |
|
| 1556 |
<tr> |
|
| 1537 | 1557 |
<td><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y> | |
| 1538 | 1558 |
. $locale->text('Project Number') . qq|</td>
|
| 1539 | 1559 |
<td><input name="l_transaction_description" class=checkbox type=checkbox value=Y> | |
| ... | ... | |
| 1611 | 1631 |
"curr", "employee", |
| 1612 | 1632 |
"shipvia", "globalprojectnumber", |
| 1613 | 1633 |
"transaction_description", "open", |
| 1614 |
"delivered" |
|
| 1634 |
"delivered", "marge_total", "marge_percent"
|
|
| 1615 | 1635 |
); |
| 1616 | 1636 |
|
| 1617 | 1637 |
# only show checkboxes if gotten here via sales_order form. |
| ... | ... | |
| 1669 | 1689 |
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
|
| 1670 | 1690 |
'open' => { 'text' => $locale->text('Open'), },
|
| 1671 | 1691 |
'delivered' => { 'text' => $locale->text('Delivered'), },
|
| 1692 |
'marge_total' => { 'text' => $locale->text('Ertrag'), },
|
|
| 1693 |
'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }
|
|
| 1672 | 1694 |
); |
| 1673 | 1695 |
|
| 1674 | 1696 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee shipvia)) {
|
| ... | ... | |
| 1742 | 1764 |
# escape callback for href |
| 1743 | 1765 |
$callback = $form->escape($href); |
| 1744 | 1766 |
|
| 1745 |
my @subtotal_columns = qw(netamount amount); |
|
| 1767 |
my @subtotal_columns = qw(netamount amount marge_total);
|
|
| 1746 | 1768 |
|
| 1747 | 1769 |
my %totals = map { $_ => 0 } @subtotal_columns;
|
| 1748 | 1770 |
my %subtotals = map { $_ => 0 } @subtotal_columns;
|
| ... | ... | |
| 1761 | 1783 |
map { $subtotals{$_} += $oe->{$_};
|
| 1762 | 1784 |
$totals{$_} += $oe->{$_} } @subtotal_columns;
|
| 1763 | 1785 |
|
| 1764 |
map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount);
|
|
| 1786 |
map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent);
|
|
| 1765 | 1787 |
|
| 1766 | 1788 |
my $row = { };
|
| 1767 | 1789 |
|
Auch abrufbar als: Unified diff
Erweiterung um Anzeige des Ertrages im Verkauf