Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d2482a05

Von Hans Peter Schlaepfer vor mehr als 5 Jahren hinzugefügt

  • ID d2482a05eb12a3cc7b79c5436d3453d0bb670712
  • Vorgänger 5cdf5329
  • Nachfolger f7df215b

Neues kivitendo Design Aenderungen in bin/mozilla/..

Unterschiede anzeigen:

bin/mozilla/ir.pl
417 417

  
418 418
  setup_ir_action_bar();
419 419

  
420
  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); # moved to here from sub form_footer
421

  
420 422
  $form->header();
421 423

  
422 424
  print $form->parse_html_template("ir/form_header", \%TMPL_VAR);
......
468 470
  foreach my $item (@{ $form->{taxaccounts_array} }) {
469 471
    if ($form->{"${item}_base"}) {
470 472
      if ($form->{taxincluded}) {
471
        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"}
472
                                                                                 / (1 + $form->{"${item}_rate"})), 2);
473
        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);
473 474
        $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
474
      } else {
475
      } 
476
      else {
475 477
        $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
476 478
        $form->{invtotal} += $form->{"${item}_total"};
477 479
      }
......
523 525
    $totalpaid += $form->{"paid_$i"};
524 526
  }
525 527

  
526
  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
528
  # $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted(); # moved to sub form_header
527 529

  
528 530
  print $form->parse_html_template('ir/form_footer', {
529 531
    totalpaid           => $totalpaid,

Auch abrufbar als: Unified diff