Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a304d5fa

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

  • ID a304d5faac8b7cb752c8510e3bcdc8b359d9ddf8
  • Vorgänger de46c704
  • Nachfolger c9fe9e1c

Whitespace Purge für Bugfixes

Unterschiede anzeigen:

SL/RP.pm
642 642
         WHERE $where $dpt_where
643 643
           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
644 644
           $project
645
         GROUP BY c.$category 
645
         GROUP BY c.$category
646 646

  
647 647
         UNION
648 648

  
......
654 654
         WHERE $where $dpt_where
655 655
           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
656 656
           $project
657
         GROUP BY c.$category 
657
         GROUP BY c.$category
658 658

  
659 659
         UNION
660 660

  
......
663 663
         JOIN chart c ON (c.id = ac.chart_id)
664 664
         JOIN gl a ON (a.id = ac.trans_id)
665 665
         $dpt_join
666
         WHERE $where $dpt_where $glwhere 
666
         WHERE $where $dpt_where $glwhere
667 667
           AND NOT ((c.link = 'AR') OR (c.link = 'AP'))
668 668
           $project
669 669
         GROUP BY c.$category
......
682 682
         WHERE (c.category = 'I') $prwhere $dpt_where
683 683
           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere)
684 684
           $project
685
         GROUP BY c.$category 
685
         GROUP BY c.$category
686 686

  
687 687
         UNION
688 688

  
......
695 695
         WHERE (c.category = 'E') $prwhere $dpt_where
696 696
           AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere)
697 697
         $project
698
         GROUP BY c.$category 
698
         GROUP BY c.$category
699 699
         |;
700 700
    }
701 701

  
......
829 829
    if ($ref->{amount} != 0 || $form->{all_accounts}) {
830 830
      $trb{ $ref->{accno} }{description} = $ref->{description};
831 831
      $trb{ $ref->{accno} }{charttype}   = 'A';
832
   
832

  
833 833
      if ($ref->{amount} > 0) {
834 834
        $trb{ $ref->{accno} }{haben_eb}   = $ref->{amount};
835 835
      } else {
......
918 918
               (ac.trans_id in (SELECT id from gl)
919 919
                $glwhere)
920 920
              )|;
921
    $saldowhere .=       
921
    $saldowhere .=
922 922
qq| AND ((ac.trans_id IN (SELECT id from ar) AND
923 923
                ac.trans_id IN
924 924
                  (
......
944 944
               (ac.trans_id in (SELECT id from gl)
945 945
                $glsaldowhere)
946 946
              )|;
947
    $sumwhere .=       
947
    $sumwhere .=
948 948
qq| AND ((ac.trans_id IN (SELECT id from ar) AND
949 949
                ac.trans_id IN
950 950
                  (
bin/mozilla/rp.pl
464 464
         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
465 465
             <td><input name=decimalplaces size=3 value="2"></td>
466 466
         </tr>
467
                                    
467

  
468 468
$jsscript
469 469
|;
470 470
  }
......
601 601
         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
602 602
             <td><input name=decimalplaces size=3 value="2"></td>
603 603
         </tr>
604
                                    
604

  
605 605
$jsscript
606 606
|;
607 607
  }
......
1167 1167
  my $edit_url = build_std_url('action=edit', 'type', 'vc');
1168 1168

  
1169 1169
#   foreach $accno (@{ $form->{TB} }) {
1170
# 
1170
#
1171 1171
#     $accno->{soll} = $accno->{debit};
1172 1172
#     $accno->{haben} = $accno->{credit};
1173 1173
#     map { $totals{$_}    += $accno->{$_} } @subtotal_columns;
1174
# 
1174
#
1175 1175
#     map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
1176
# 
1176
#
1177 1177
#     map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
1178
# 
1178
#
1179 1179
#     my $row = { };
1180
# 
1180
#
1181 1181
#     foreach my $column (@columns) {
1182 1182
#       $row->{$column} = {
1183 1183
#         'data'  => $accno->{$column},
1184 1184
#         'align' => $column_alignment{$column},
1185 1185
#       };
1186 1186
#     }
1187
# 
1188
# 
1187
#
1188
#
1189 1189
#     $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
1190
# 
1190
#
1191 1191
#     my $row_set = [ $row ];
1192
# 
1193
# 
1192
#
1193
#
1194 1194
#     $report->add_data($row_set);
1195
# 
1195
#
1196 1196
#     $idx++;
1197 1197
#   }
1198
# 
1198
#
1199 1199
#   $report->add_separator();
1200
# 
1200
#
1201 1201
#   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
1202 1202

  
1203 1203
  $report->generate_with_headers();
......
2063 2063
  	$form->{what_done} = $form->{type};
2064 2064
  	$form->save_history($form->dbconnect(\%myconfig));
2065 2065
  }
2066
  # /saving the history 
2066
  # /saving the history
2067 2067
  $lxdebug->leave_sub();
2068 2068
}
2069 2069

  

Auch abrufbar als: Unified diff