Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9bb62875

Von Sven Schöling vor mehr als 15 Jahren hinzugefügt

  • ID 9bb62875bf8b1f19b5a68d080806a09fc82ecc97
  • Vorgänger 8b962718
  • Nachfolger d367e9f2

Whitespace Purge

Unterschiede anzeigen:

SL/IR.pm
344 344
    $expensediff += $paiddiff;
345 345

  
346 346
    ######## this only applies to tax included
347
    
347

  
348 348
    $form->{amount}{ $form->{id} }{$lastinventoryaccno} -= $invoicediff if $lastinventoryaccno;
349 349
    $form->{amount}{ $form->{id} }{$lastexpenseaccno}   -= $expensediff if $lastexpenseaccno;
350 350

  
......
365 365

  
366 366
  $form->{amount}{ $form->{id} }{ $form->{AP} } = $netamount + $tax;
367 367

  
368
  
368

  
369 369
  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $paiddiff, 2) if $form->{paid} != 0;
370 370

  
371 371
  # update exchangerate
372
  
372

  
373 373
  $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, 0, $form->{exchangerate})
374 374
    if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
375 375

  
......
398 398
  }
399 399

  
400 400
  # force AP entry if 0
401
  
401

  
402 402
  $form->{amount}{ $form->{id} }{ $form->{AP} } = $form->{paid} if $form->{amount}{$form->{id}}{$form->{AP}} == 0;
403 403

  
404 404
  # record payments and offsetting AP
......
500 500
                netamount    = ?, paid        = ?, duedate       = ?, datepaid    = ?,
501 501
                invoice      = ?, taxzone_id  = ?, notes         = ?, taxincluded = ?,
502 502
                intnotes     = ?, curr        = ?, storno_id     = ?, storno      = ?,
503
                cp_id        = ?, employee_id = ?, department_id = ?, 
503
                cp_id        = ?, employee_id = ?, department_id = ?,
504 504
                globalproject_id = ?
505 505
              WHERE id = ?|;
506 506
  @values = (
......
509 509
                $netamount,                  $form->{paid},      conv_date($form->{duedate}),       $form->{paid} ? conv_date($form->{datepaid}) : undef,
510 510
            '1',                             $taxzone_id,                  $form->{notes},          $form->{taxincluded} ? 't' : 'f',
511 511
                $form->{intnotes},           $form->{currency},     conv_i($form->{storno_id}),     $form->{storno}      ? 't' : 'f',
512
         conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}), 
512
         conv_i($form->{cp_id}),      conv_i($form->{employee_id}), conv_i($form->{department_id}),
513 513
         conv_i($form->{globalproject_id}),
514 514
         conv_i($form->{id})
515 515
  );

Auch abrufbar als: Unified diff