Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c0cc8bb2

Von Rolf Fluehmann vor mehr als 8 Jahren hinzugefügt

  • ID c0cc8bb220b76219934bee9ac5dd5e8e971ddc65
  • Vorgänger fbbfd3ce
  • Nachfolger 030d9691

added roundings on prints

Unterschiede anzeigen:

SL/IS.pm
519 519 
  $form->{nodiscount}          = $form->format_amount($myconfig, $nodiscount, 2);
520 520 
  $form->{yesdiscount}         = $form->format_amount($myconfig, $form->{nodiscount_total} - $nodiscount, 2);
521 521 

  		




  522
  
  
    
  $form->{invtotal} = ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;


  		




  523
  
  
    
  $form->{total}    = $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);


  		




  
  522
  
    
  my $grossamount = ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;


  		




  
  523
  
    
  $form->{invtotal} = $form->round_amount($grossamount, 2, 1);


  		




  
  524
  
    
  $form->{rounding} = $form->round_amount(


  		




  
  525
  
    
    $form->{invtotal} - $form->round_amount($grossamount, 2),


  		




  
  526
  
    
    2


  		




  
  527
  
    
  );


  		




  524
  528
  
    

  		




  
  529
  
    
  $form->{rounding} = $form->format_amount($myconfig, $form->{rounding}, 2);


  		




  
  530
  
    
  $form->{total}    = $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);


  		




  525
  531
  
    
  $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);


  		




  526
  532
  
    
  $form->{paid}     = $form->format_amount($myconfig, $form->{paid}, 2);


  		




  527
  533
  
    

  		












  

    
      SL/OE.pm
    
  





  1576
  1576
  
    
    $form->{subtotal_nofmt} = $form->{ordtotal};


  		




  1577
  1577
  
    
  }


  		




  1578
  1578
  
    

  		




  1579
  
  
    
  $form->{ordtotal} = ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;


  		




  
  1579
  
    
  my $grossamount = ($form->{taxincluded}) ? $form->{ordtotal} : $form->{ordtotal} + $tax;


  		




  
  1580
  
    
  $form->{ordtotal} = $form->round_amount( $grossamount, 2, 1);


  		




  
  1581
  
    
  $form->{rounding} = $form->round_amount(


  		




  
  1582
  
    
    $form->{ordtotal} - $form->round_amount($grossamount, 2),


  		




  
  1583
  
    
    2


  		




  
  1584
  
    
  );


  		




  1580
  1585
  
    

  		




  1581
  1586
  
    
  # format amounts


  		




  
  1587
  
    
  $form->{rounding} = $form->format_amount($myconfig, $form->{rounding}, 2);


  		




  1582
  1588
  
    
  $form->{quototal} = $form->{ordtotal} = $form->format_amount($myconfig, $form->{ordtotal}, 2);


  		




  1583
  1589
  
    

  		




  1584
  1590
  
    
  $form->set_payment_options($myconfig, $form->{$form->{type} =~ /_quotation/ ? 'quodate' : 'orddate'}, $form->{type});


  		












  

    
      templates/print/RB/invoice.html
    
  





  5
  5
  
    
<tr valign=bottom>


  		




  6
  6
  
    
  <td width=10>&nbsp;</td>


  		




  7
  7
  
    
  <td>


  		




  8
  
  
    
  


  		




  
  8
  
    

  		




  9
  9
  
    
  <table width=100%>


  		




  10
  10
  
    
  <tr>


  		




  11
  11
  
    
    <td>


  		




  ......




  33
  33
  
    

  		




  34
  34
  
    

  		




  35
  35
  
    
  <table width=100% callspacing=0 cellpadding=0>


  		




  36
  
  
    
    


  		




  
  36
  
    

  		




  37
  37
  
    
  <tr>


  		




  38
  38
  
    
    <td align=right>


  		




  39
  39
  
    
    <table>


  		




  40
  40
  
    
    <tr>


  		




  41
  41
  
    
      <th align=right>Ausgestellt am</th><td width=10>&nbsp;</td><td><%invdate%></td>


  		




  42
  42
  
    
    </tr>


  		




  43
  
  
    
  


  		




  
  43
  
    

  		




  44
  44
  
    
    <tr>


  		




  45
  45
  
    
      <th align=right>Bezahlbar bis</th><td width=10>&nbsp;</td><td><%duedate%></td>


  		




  46
  46
  
    
    </tr>


  		




  ......




  48
  48
  
    
    <tr>


  		




  49
  49
  
    
      <th align=right>Nummer</th><td>&nbsp;</td><td><%invnumber%></td></tr>


  		




  50
  50
  
    
    </tr>


  		




  51
  
  
    
  


  		




  
  51
  
    

  		




  52
  52
  
    
    <tr>


  		




  53
  53
  
    
      <th align=right>Lieferdatum</th><td>&nbsp;</td><td><%deliverydate%></td></tr>


  		




  54
  54
  
    
    </tr>


  		




  ......




  85
  85
  
    
      <br><%city%>


  		




  86
  86
  
    
      <br><%country%>


  		




  87
  87
  
    
      </td>


  		




  88
  
  
    
      


  		




  
  88
  
    

  		




  89
  89
  
    
      <td><%shiptoname%>


  		




  90
  90
  
    
      <br><%shiptostreet%>


  		




  91
  91
  
    
      <br><%shiptozipcode%>


  		




  ......




  100
  100
  
    
  <tr>


  		




  101
  101
  
    
    <td>&nbsp;</td>


  		




  102
  102
  
    
  </tr>


  		




  103
  
  
    
  


  		




  
  103
  
    

  		




  104
  104
  
    
  <tr>


  		




  105
  105
  
    
    <td>


  		




  106
  106
  
    
    <table width=100%>


  		




  ......




  139
  139
  
    
    <tr>


  		




  140
  140
  
    
      <td colspan=7><hr noshade></td>


  		




  141
  141
  
    
    </tr>


  		




  142
  
  
    
    


  		




  
  142
  
    

  		




  143
  143
  
    
<%if taxincluded%>


  		




  144
  144
  
    
    <tr>


  		




  145
  145
  
    
      <th colspan=5 align=right>Total</th>


  		




  ......




  160
  160
  
    
    </tr>


  		




  161
  161
  
    
<%end tax%>


  		




  162
  162
  
    

  		




  
  163
  
    
<%if rounding%>


  		




  
  164
  
    
    <tr>


  		




  
  165
  
    
      <th colspan=5 align=right>Rundung</th>


  		




  
  166
  
    
      <td colspan=2 align=right><%rounding%></td>


  		




  
  167
  
    
    </tr>


  		




  
  168
  
    
<%end rounding%>


  		




  
  169
  
    

  		




  163
  170
  
    
<%if paid%>


  		




  164
  171
  
    
    <tr>


  		




  165
  172
  
    
      <th colspan=5 align=right>Bezahlt</th>


  		




  ......




  207
  214
  
    
</tr>


  		




  208
  215
  
    

  		




  209
  216
  
    
<tr><td>&nbsp;</td></tr>


  		




  210
  
  
    
  


  		




  
  217
  
    

  		




  211
  218
  
    
<tr>


  		




  212
  219
  
    
  <td>


  		




  213
  220
  
    
  <table width=100%>


  		












  

    
      templates/print/RB/sales_order.html
    
  





  5
  5
  
    
<tr valign=bottom>


  		




  6
  6
  
    
  <td width=10>&nbsp;</td>


  		




  7
  7
  
    
  <td>


  		




  8
  
  
    
  


  		




  
  8
  
    

  		




  9
  9
  
    
  <table width=100%>


  		




  10
  10
  
    
  <tr>


  		




  11
  11
  
    
    <td>


  		




  ......




  33
  33
  
    

  		




  34
  34
  
    

  		




  35
  35
  
    
  <table width=100% callspacing=0 cellpadding=0>


  		




  36
  
  
    
    


  		




  
  36
  
    

  		




  37
  37
  
    
  <tr>


  		




  38
  38
  
    
    <td align=right>


  		




  39
  39
  
    
    <table>


  		




  40
  40
  
    
    <tr>


  		




  41
  41
  
    
      <th align=right>Bestelldatum</th><td width=10>&nbsp;</td><td><%orddate%></td>


  		




  42
  42
  
    
    </tr>


  		




  43
  
  
    
  


  		




  
  43
  
    

  		




  44
  44
  
    
    <tr>


  		




  45
  45
  
    
      <th align=right>Lieferbar bei</th><td width=10>&nbsp;</td><td><%reqdate%></td>


  		




  46
  46
  
    
    </tr>


  		




  ......




  48
  48
  
    
    <tr>


  		




  49
  49
  
    
      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>


  		




  50
  50
  
    
    </tr>


  		




  51
  
  
    
  


  		




  
  51
  
    

  		




  52
  52
  
    
    <tr>


  		




  53
  53
  
    
      <td>&nbsp;</td>


  		




  54
  54
  
    
    </tr>


  		




  ......




  86
  86
  
    
  <tr>


  		




  87
  87
  
    
    <td>&nbsp;</td>


  		




  88
  88
  
    
  </tr>


  		




  89
  
  
    
  


  		




  
  89
  
    

  		




  90
  90
  
    
  <tr>


  		




  91
  91
  
    
    <td>


  		




  92
  92
  
    
    <table width=100%>


  		




  ......




  119
  119
  
    
    <tr>


  		




  120
  120
  
    
      <td colspan=7><hr noshade></td>


  		




  121
  121
  
    
    </tr>


  		




  122
  
  
    
    


  		




  
  122
  
    

  		




  123
  123
  
    
<%if taxincluded%>


  		




  124
  124
  
    
    <tr>


  		




  125
  125
  
    
      <th colspan=5 align=right>Total</th>


  		




  ......




  141
  141
  
    
    </tr>


  		




  142
  142
  
    
<%end tax%>


  		




  143
  143
  
    

  		




  
  144
  
    
<%if rounding%>


  		




  
  145
  
    
      <th colspan=5 align=right>Rundung</th>


  		




  
  146
  
    
      <td colspan=2 align=right><%rounding%></td>


  		




  
  147
  
    
<%end rounding%>


  		




  
  148
  
    

  		




  144
  149
  
    
    <tr>


  		




  145
  150
  
    
      <td colspan=2>&nbsp;</td>


  		




  146
  151
  
    
      <td colspan=5><hr noshade></td>


  		




  ......




  184
  189
  
    
</tr>


  		




  185
  190
  
    

  		




  186
  191
  
    
<tr><td>&nbsp;</td></tr>


  		




  187
  
  
    
  


  		




  
  192
  
    

  		




  188
  193
  
    
<tr>


  		




  189
  194
  
    
  <td>


  		




  190
  195
  
    
  <table width=100%>


  		












  

    
      templates/print/RB/sales_quotation.html
    
  





  5
  5
  
    
<tr valign=bottom>


  		




  6
  6
  
    
  <td width=10>&nbsp;</td>


  		




  7
  7
  
    
  <td>


  		




  8
  
  
    
  


  		




  
  8
  
    

  		




  9
  9
  
    
  <table width=100%>


  		




  10
  10
  
    
  <tr valign=top>


  		




  11
  11
  
    
    <td>


  		




  ......




  76
  76
  
    
    <td colspan=2>


  		




  77
  77
  
    
      <table width=100% border=1>


  		




  78
  78
  
    
        <tr>


  		




  79
  
  
    
	  <th width=17% align=left nowrap>Nummer</th>


  		




  80
  
  
    
	  <th width=17% align=left>Datum</th>


  		




  81
  
  
    
	  <th width=17% align=left>G?ltig bis</th>


  		




  82
  
  
    
	  <th width=17% align=left nowrap>Kontakt</th>


  		




  83
  
  
    
	  <th width=17% align=left nowrap>Lagerplatz</th>


  		




  84
  
  
    
	  <th width=15% align=left nowrap>Lieferung mit</th>


  		




  85
  
  
    
	</tr>


  		




  86
  
  
    

  		




  87
  
  
    
	<tr>


  		




  88
  
  
    
	  <td><%quonumber%></td>


  		




  89
  
  
    
	  <td><%quodate%></td>


  		




  90
  
  
    
	  <td><%reqdate%></td>


  		




  91
  
  
    
	  <td><%employee%></td>


  		




  92
  
  
    
	  <td><%shippingpoint%></td>


  		




  93
  
  
    
	  <td><%shipvia%></td>


  		




  94
  
  
    
	</tr>


  		




  
  79
  
    
    <th width=17% align=left nowrap>Nummer</th>


  		




  
  80
  
    
    <th width=17% align=left>Datum</th>


  		




  
  81
  
    
    <th width=17% align=left>G?ltig bis</th>


  		




  
  82
  
    
    <th width=17% align=left nowrap>Kontakt</th>


  		




  
  83
  
    
    <th width=17% align=left nowrap>Lagerplatz</th>


  		




  
  84
  
    
    <th width=15% align=left nowrap>Lieferung mit</th>


  		




  
  85
  
    
  </tr>


  		




  
  86
  
    

  		




  
  87
  
    
  <tr>


  		




  
  88
  
    
    <td><%quonumber%></td>


  		




  
  89
  
    
    <td><%quodate%></td>


  		




  
  90
  
    
    <td><%reqdate%></td>


  		




  
  91
  
    
    <td><%employee%></td>


  		




  
  92
  
    
    <td><%shippingpoint%></td>


  		




  
  93
  
    
    <td><%shipvia%></td>


  		




  
  94
  
    
  </tr>


  		




  95
  95
  
    
      </table>


  		




  96
  96
  
    
    </td>


  		




  97
  97
  
    
  </tr>


  		




  ......




  151
  151
  
    
    </tr>


  		




  152
  152
  
    
<%end tax%>


  		




  153
  153
  
    

  		




  
  154
  
    
<%if rounding%>


  		




  
  155
  
    
      <th colspan=6 align=right>Rundung</th>


  		




  
  156
  
    
      <td colspan=2 align=right><%rounding%></td>


  		




  
  157
  
    
<%end rounding%>


  		




  
  158
  
    

  		




  154
  159
  
    
    <tr>


  		




  155
  160
  
    
      <td colspan=4>&nbsp;</td>


  		




  156
  161
  
    
      <td colspan=4><hr noshade></td>


  		












  

    
      templates/webpages/is/form_footer.html
    
  





  107
  107
  
    
       </tr>


  		




  108
  108
  
    
[%- END %]


  		




  109
  109
  
    

  		




  110
  
  
    
[%- IF rounding %]


  		




  111
  
  
    
        <tr>


  		




  112
  
  
    
          <th align='right'>[% 'Rounding' | $T8 %]</th>


  		




  113
  
  
    
          <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>


  		




  114
  
  
    
        </tr>


  		




  115
  
  
    
[%- END %]


  		




  116
  
  
    

  		




  117
  110
  
    
[%# tax %]


  		




  118
  111
  
    
[% FOREACH item = taxaccounts_array %]


  		




  119
  112
  
    
[% SET description_ref = item _ '_description' %]


  		




  ......




  131
  124
  
    
       </tr>


  		




  132
  125
  
    
  [%- END %]


  		




  133
  126
  
    
[%- END %]


  		




  
  127
  
    

  		




  
  128
  
    
[%- IF rounding %]


  		




  
  129
  
    
        <tr>


  		




  
  130
  
    
          <th align='right'>[% 'Rounding' | $T8 %]</th>


  		




  
  131
  
    
          <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>


  		




  
  132
  
    
        </tr>


  		




  
  133
  
    
[%- END %]


  		




  
  134
  
    

  		




  134
  135
  
    
        <tr>


  		




  135
  136
  
    
         <th align="right">[% 'Total' | $T8 %]</th>


  		




  136
  137
  
    
         <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>


  		












  

    
      templates/webpages/oe/form_footer.html
    
  





  108
  108
  
    
                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>


  		




  109
  109
  
    
              </tr>


  		




  110
  110
  
    
[%- END %]


  		




  
  111
  
    
              [% tax %]


  		




  111
  112
  
    
[%- IF rounding %]


  		




  112
  113
  
    
              <tr>


  		




  113
  114
  
    
                <th align='right'>[% 'Rounding' | $T8 %]</th>


  		




  114
  115
  
    
                <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>


  		




  115
  116
  
    
              </tr>


  		




  116
  117
  
    
[%- END %]


  		




  117
  
  
    
              [% tax %]


  		




  118
  118
  
    
              <tr>


  		




  119
  119
  
    
                <th align="right">[% 'Total' | $T8 %]</th>


  		




  120
  120
  
    
                <td align="right">[% LxERP.format_amount(invtotal, 2) %]


  		












Auch abrufbar als:  Unified diff