Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 34366eda

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID 34366eda748e1198b8b2ead0c3fffd8edba9f23d
  • Vorgänger c1a32d62
  • Nachfolger 4654d993

Beim Dialogbuchen die Kontensalden zu den jeweils ausgewählten Konten anzeigen. Fix für Bug 548.

Unterschiede anzeigen:

bin/mozilla/gl.pl
780 780
  $form->{totaldebit}  = 0;
781 781
  $form->{totalcredit} = 0;
782 782

  
783
  my @old_project_ids = ();
784
  map({ push(@old_project_ids, $form->{"project_id_$_"})
785
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
786

  
787
  $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
788
                                   "all" => 0,
789
                                   "old_id" => \@old_project_ids },
790
                   "charts" => { "key" => "ALL_CHARTS",
791
                                 "transdate" => $form->{transdate} },
792
                   "taxcharts" => "ALL_TAXCHARTS");
793

  
794 783
  my %project_labels = ();
795 784
  my @project_values = ("");
796 785
  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
......
822 811
  }
823 812

  
824 813
  for $i (1 .. $form->{rowcount}) {
825

  
826 814
    if ($form->{show_details}) {
827 815
      $source = qq|
828 816
      <td><input name="source_$i" value="$form->{"source_$i"}" size="16"></td>|;
......
939 927

  
940 928
    print qq|<tr valign=top>
941 929
    $accno
930
    <td id="chart_balance_$i" align="right">&nbsp;</td>
942 931
    $fx_transaction
943 932
    <td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
944 933
    <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
......
971 960

  
972 961
  $auth->assert('general_ledger');
973 962

  
963
  my @old_project_ids = ();
964
  map({ push(@old_project_ids, $form->{"project_id_$_"})
965
          if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
966

  
967
  $form->get_lists("projects"  => { "key"       => "ALL_PROJECTS",
968
                                    "all"       => 0,
969
                                    "old_id"    => \@old_project_ids },
970
                   "charts"    => { "key"       => "ALL_CHARTS",
971
                                    "transdate" => $form->{transdate} },
972
                   "taxcharts" => "ALL_TAXCHARTS");
973

  
974
  GL->get_chart_balances('charts' => $form->{ALL_CHARTS});
975

  
974 976
  $title         = $form->{title};
975 977
  $form->{title} = $locale->text("$title General Ledger Transaction");
976 978
  $readonly      = ($form->{id}) ? "readonly" : "";
......
1008 1010
    var txt = document.getElementsByName('debit_1')[0].value;
1009 1011
    document.getElementsByName('credit_2')[0].value = txt;
1010 1012
  };
1011

  
1012 1013
  //-->
1013
  </script>|;
1014
  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
1014
  </script>
1015
  <script type="text/javascript" src="js/show_form_details.js"></script>
1016
  <script type="text/javascript" src="js/jquery.js"></script>
1017
|;
1015 1018

  
1016 1019
  $form->{selectdepartment} =~ s/ selected//;
1017 1020
  $form->{selectdepartment} =~
......
1069 1072
  $form->{previous_id}     ||= "--";
1070 1073
  $form->{previous_gldate} ||= "--";
1071 1074

  
1075
  $jsscript .= $form->parse_html_template('gl/form_header_chart_balances_js');
1076

  
1072 1077
  $form->header;
1073 1078

  
1074 1079
  print qq|
......
1194 1199
	   <tr class=listheading>
1195 1200
	  <th class=listheading style="width:15%">|
1196 1201
    . $locale->text('Account') . qq|</th>
1202
	  <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
1197 1203
	  <th class=listheading style="width:10%">|
1198 1204
    . $locale->text('Debit') . qq|</th>
1199 1205
	  <th class=listheading style="width:10%">|
......
1246 1252

  
1247 1253
  print qq|
1248 1254
    <tr class=listtotal>
1249
    <td></td>
1250
    <th align=right class=listtotal> $form->{totaldebit}</th>
1255
    <th colspan="3" align=right class=listtotal> $form->{totaldebit}</th>
1251 1256
    <th align=right class=listtotal> $form->{totalcredit}</th>
1252 1257
    <td colspan=6></td>
1253 1258
    </tr>

Auch abrufbar als: Unified diff