Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d333f237

Von Moritz Bunkus vor fast 18 Jahren hinzugefügt

  • ID d333f237fcd8ef1d9145b7b51072f7088b857301
  • Vorgänger 69da19a7
  • Nachfolger b6569a34

Weitere Vorkommen von GIFI entfernt. GIFI müsste bis auf Spalte chart.gifi_accno und Tabelle chart komplett entfernt sein.

Unterschiede anzeigen:

bin/mozilla/gl.pl
339 339
		    <td>| . $locale->text('Source') . qq|</td>
340 340
		    <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
341 341
		    <td>| . $locale->text('Account') . qq|</td>
342
		    <td align=right><input name="l_gifi_accno" class=checkbox type=checkbox value=Y></td>
343
		    <td>| . $locale->text('GIFI') . qq|</td>
344 342
		  </tr>
345 343
		  <tr>
346 344
		    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
......
412 410
      $locale->text('Account')
413 411
      . " : $form->{accno} $form->{account_description}";
414 412
  }
415
  if ($form->{gifi_accno}) {
416
    $href     .= "&gifi_accno=" . $form->escape($form->{gifi_accno});
417
    $callback .= "&gifi_accno=" . $form->escape($form->{gifi_accno}, 1);
418
    $option   .= "\n<br>" if $option;
419
    $option   .=
420
      $locale->text('GIFI')
421
      . " : $form->{gifi_accno} $form->{gifi_account_description}";
422
  }
423 413
  if ($form->{source}) {
424 414
    $href     .= "&source=" . $form->escape($form->{source});
425 415
    $callback .= "&source=" . $form->escape($form->{source}, 1);
......
482 472
       transdate       id                reference         description  
483 473
       notes           source            debit             debit_accno  
484 474
       credit          credit_accno      debit_tax         debit_tax_accno
485
       credit_tax      credit_tax_accno  accno             gifi_accno
475
       credit_tax      credit_tax_accno  accno
486 476
       projectnumbers  
487 477
       )
488 478
  );
489 479

  
490
  if ($form->{accno} || $form->{gifi_accno}) {
491
    @columns = grep !/(accno|gifi_accno)/, @columns;
480
  if ($form->{accno}) {
481
    @columns = grep !/accno/, @columns;
492 482
    push @columns, "balance";
493 483
    $form->{l_balance} = "Y";
494 484

  
......
569 559
      "<th><a class=listheading href=$href&sort=accno>"
570 560
    . $locale->text('Credit Tax Account')
571 561
    . "</a></th>";
572
  $column_header{gifi_accno} =
573
      "<th><a class=listheading href=$href&sort=gifi_accno>"
574
    . $locale->text('GIFI')
575
    . "</a></th>";
576 562
  $column_header{balance} = "<th>" . $locale->text('Balance') . "</th>";
577 563
  $column_header{projectnumbers} =
578 564
      "<th class=listheading>"  . $locale->text('Project Numbers') . "</th>";
......
617 603
    $sameitem = $form->{GL}->[0]->{ $form->{sort} };
618 604
  }
619 605

  
620
  if (($form->{accno} || $form->{gifi_accno}) && $form->{balance}) {
606
  if ($form->{accno} && $form->{balance}) {
621 607

  
622 608
    map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
623 609
    $column_data{balance} =
......
793 779
      ? "<td align=right>$debittax</td>"
794 780
      : "<td></td>";
795 781
    $column_data{debit_tax_accno} = "<td align=center>$debittaxaccno</td>";
796
    $column_data{gifi_accno}      =
797
      "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
798 782
    $column_data{credit_tax} =
799 783
      ($ref->{credit_tax_accno} ne "")
800 784
      ? "<td align=right>$credittax</td>"
801 785
      : "<td></td>";
802 786
    $column_data{credit_tax_accno} = "<td align=center>$credittaxaccno</td>";
803
    $column_data{gifi_accno}       =
804
      "<td><a href=$href&gifi_accno=$ref->{gifi_accno}&callback=$callback>$ref->{gifi_accno}</a>&nbsp;</td>";
805 787
    $column_data{balance} =
806 788
      "<td align=right>"
807 789
      . $form->format_amount(\%myconfig, $form->{balance}, 2, 0) . "</td>";

Auch abrufbar als: Unified diff