Revision ecd52c70
Von Cem Aydin vor etwa 4 Jahren hinzugefügt
| SL/Controller/Order.pm | ||
|---|---|---|
|
|
||
|
my $rows_as_html;
|
||
|
foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {
|
||
|
$rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);
|
||
|
$rows_as_html .= $self->p->render(
|
||
|
'order/tabs/_tax_row',
|
||
|
TAX => $tax,
|
||
|
TAXINCLUDED => $self->order->taxincluded,
|
||
|
QUOTATION => $self->order->quotation
|
||
|
);
|
||
|
}
|
||
|
return $rows_as_html;
|
||
|
}
|
||
| templates/webpages/order/tabs/_tax_row.html | ||
|---|---|---|
|
[% USE LxERP %]
|
||
|
[% USE L %]
|
||
|
|
||
|
[% IF QUOTATION %]
|
||
|
[% SET n_col = 10 %]
|
||
|
[% ELSE %]
|
||
|
[% SET n_col = 11 %]
|
||
|
[% END %]
|
||
|
|
||
|
<tr class="tax_row">
|
||
|
<td colspan="11"></td>
|
||
|
<td colspan="[%- n_col %]"></td>
|
||
|
<th colspan="3">[% IF TAXINCLUDED %][% 'Including' | $T8 %] [% END %][% TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
|
||
|
<td class="numeric">[% LxERP.format_amount(TAX.amount, 2, 0) %]</td>
|
||
|
</tr>
|
||
|
[% IF TAXINCLUDED %]
|
||
|
<tr class="tax_row">
|
||
|
<td colspan="11"></td>
|
||
|
<td colspan="[%- n_col %]"></td>
|
||
|
<th colspan="3">[% 'Net amount' | $T8 %]</th>
|
||
|
<td class="numeric">[% LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
|
||
|
</tr>
|
||
| templates/webpages/order/tabs/basic_data.html | ||
|---|---|---|
|
[% PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id) TYPE=SELF.type ALL_PRICE_FACTORS=SELF.all_price_factors SEARCH_CVPARTNUMBER=SELF.search_cvpartnumber %]
|
||
|
[% END %]
|
||
|
<tfoot>
|
||
|
[% IF (SELF.type == "sales_quotation") || (SELF.type == "request_quotation") %]
|
||
|
[% SET add_col = 0 %]
|
||
|
[% ELSE %]
|
||
|
[% SET add_col = 1 %]
|
||
|
[% END %]
|
||
|
<tr id="subtotal_row_id">
|
||
|
<td colspan="11"></td>
|
||
|
<td colspan="[%- 10 + add_col %]"></td>
|
||
|
<th colspan="3">[% IF SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
|
||
|
<td>[% IF SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
|
||
|
</tr>
|
||
|
[% FOREACH tax = SELF.taxes %]
|
||
|
[% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %]
|
||
|
[% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]
|
||
|
[% END %]
|
||
|
<tr id="amount_row_id">
|
||
|
[%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
|
||
| ... | ... | |
|
<th colspan="2">[% 'Ertrag prozentual' | $T8 %]</th>
|
||
|
<td class="numeric">[%- LxERP.format_amount(SELF.order.marge_percent, 2) %] %</td>
|
||
|
[%- ELSE -%]
|
||
|
<td colspan="7">
|
||
|
<td colspan="7"></td>
|
||
|
[%- END -%]
|
||
|
<td colspan="4">
|
||
|
<td colspan="[%- 3 + add_col %]"></td>
|
||
|
<th colspan="3">[% 'Total' | $T8 %]</th>
|
||
|
<td class="numeric">[% L.div_tag(SELF.order.amount_as_number, id='amount_id') %]</td>
|
||
|
</tr>
|
||
Auch abrufbar als: Unified diff
Neues Design Bugfix: Anzahl Spalten Positionstabellen Angebot/Auftrag korrigiert
Wenn Umsatzsteuer aktiv müssen die Zeilen Steuern und Summen, bei
Auftrag und Lieferantenauftrag, weiter eingerückt werden.