Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e237aa22

Von Cem Aydin vor fast 4 Jahren hinzugefügt

  • ID e237aa22514e7631d0ceae4d447532873c2279ed
  • Vorgänger 2daecdf1
  • Nachfolger 3440aa9b

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.

Unterschiede anzeigen:

SL/Controller/Order.pm
1347 1347 

  		




  1348
  1348
  
    
  my $rows_as_html;


  		




  1349
  1349
  
    
  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {


  		




  1350
  
  
    
    $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);


  		




  
  1350
  
    
    $rows_as_html .= $self->p->render(


  		




  
  1351
  
    
      'order/tabs/_tax_row',


  		




  
  1352
  
    
      TAX => $tax,


  		




  
  1353
  
    
      TAXINCLUDED => $self->order->taxincluded,


  		




  
  1354
  
    
      QUOTATION => $self->order->quotation


  		




  
  1355
  
    
    );


  		




  1351
  1356
  
    
  }


  		




  1352
  1357
  
    
  return $rows_as_html;


  		




  1353
  1358
  
    
}


  		












  

    
      templates/webpages/order/tabs/_tax_row.html
    
  





  3
  3
  
    
[% USE LxERP %]


  		




  4
  4
  
    
[% USE L %]


  		




  5
  5
  
    

  		




  
  6
  
    
[% IF QUOTATION %]


  		




  
  7
  
    
  [% SET n_col = 10 %]


  		




  
  8
  
    
[% ELSE %]


  		




  
  9
  
    
  [% SET n_col = 11 %]


  		




  
  10
  
    
[% END %]


  		




  
  11
  
    

  		




  6
  12
  
    
<tr class="tax_row">


  		




  7
  
  
    
  <td colspan="11"></td>


  		




  
  13
  
    
  <td colspan="[%- n_col %]"></td>


  		




  8
  14
  
    
  <th colspan="3">[% IF TAXINCLUDED %][% 'Including' | $T8 %]&nbsp;[% END %][% TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>


  		




  9
  15
  
    
  <td class="numeric">[% LxERP.format_amount(TAX.amount, 2, 0) %]</td>


  		




  10
  16
  
    
</tr>


  		




  11
  17
  
    
[% IF TAXINCLUDED %]


  		




  12
  18
  
    
<tr class="tax_row">


  		




  13
  
  
    
  <td colspan="11"></td>


  		




  
  19
  
    
  <td colspan="[%- n_col %]"></td>


  		




  14
  20
  
    
  <th colspan="3">[% 'Net amount' | $T8 %]</th>


  		




  15
  21
  
    
  <td class="numeric">[% LxERP.format_amount(TAX.netamount, 2, 0) %]</td>


  		




  16
  22
  
    
</tr>


  		












  

    
      templates/webpages/order/tabs/basic_data.html
    
  





  317
  317
  
    
    [% 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 %]


  		




  318
  318
  
    
  [% END %]


  		




  319
  319
  
    
  <tfoot>


  		




  
  320
  
    
    [% IF (SELF.type == "sales_quotation") || (SELF.type == "request_quotation") %]


  		




  
  321
  
    
      [% SET add_col = 0 %]


  		




  
  322
  
    
    [% ELSE %]


  		




  
  323
  
    
      [% SET add_col = 1 %]


  		




  
  324
  
    
    [% END %]


  		




  320
  325
  
    
    <tr id="subtotal_row_id">


  		




  321
  
  
    
      <td colspan="11"></td>


  		




  
  326
  
    
      <td colspan="[%- 10 + add_col %]"></td>


  		




  322
  327
  
    
      <th colspan="3">[% IF SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>


  		




  323
  328
  
    
      <td>[% IF SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>


  		




  324
  329
  
    
    </tr>


  		




  325
  330
  
    
    [% FOREACH tax = SELF.taxes %]


  		




  326
  
  
    
      [% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %]


  		




  
  331
  
    
      [% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]


  		




  327
  332
  
    
    [% END %]


  		




  328
  333
  
    
    <tr id="amount_row_id">


  		




  329
  334
  
    
      [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]


  		




  ......




  333
  338
  
    
      <th colspan="2">[% 'Ertrag prozentual' | $T8 %]</th>


  		




  334
  339
  
    
      <td class="numeric">[%- LxERP.format_amount(SELF.order.marge_percent, 2) %] %</td>


  		




  335
  340
  
    
      [%- ELSE -%]


  		




  336
  
  
    
      <td colspan="7">


  		




  
  341
  
    
      <td colspan="7"></td>


  		




  337
  342
  
    
      [%- END -%]


  		




  338
  
  
    
      <td colspan="4">


  		




  
  343
  
    
      <td colspan="[%- 3 + add_col %]"></td>


  		




  339
  344
  
    
      <th colspan="3">[% 'Total' | $T8 %]</th>


  		




  340
  345
  
    
      <td class="numeric">[% L.div_tag(SELF.order.amount_as_number, id='amount_id') %]</td>


  		




  341
  346
  
    
    </tr>


  		












Auch abrufbar als:  Unified diff