/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 86f876b6

Von Udo Spallek vor mehr als 17 Jahren hinzugefügt

ID 86f876b61346bf14a4369b2739fc48ac8a7e02be
Vorgänger 296b4f44
Nachfolger 76c2ea0b

open, print, close: Lokale Namensraeume (aus r2391, r2393) auf private eingeschraenkt, weitere PerlBestPractices Aenderungen.
$category, $dpt_*, $project* Variablen entfernt, Weil USTVA nie Abteilungsweit, Projektweit oder bez. BWA anders dargestellt wird.
BWA wird geregelt duch get_accounts_g.

       #  return unless (-f $filename);
       local *FH;
       open(FH, "$filename") or $form->error("$filename : $!\n");
       open my $FH, "<", "$filename" or $form->error("$filename : $!\n");
       my $query = "";
       my $sth;
       my @quote_chars;
       while (<FH>) {
       while (<$FH>) {
         # Remove DOS and Unix style line endings.
         s/[\r\n]//g;
-...
+        }
+      }
       close FH;
       close $FH;
       $main::lxdebug->leave_sub();
+    }
-...
       my ($dbh, $last_period, $fromdate, $todate, $form, $category) = @_;
       my ($null, $department_id) = split /--/, $form->{department};
       my $query;
       my $dpt_where;
       my $dpt_join;
       my $project;
       my $where    = "";
       my $glwhere  = "";
       my $subwhere = "";
-...
         $ARwhere  .= " AND acc.transdate <= '$todate'";
+      }
       if ($department_id) {
         $dpt_join = qq|
                    JOIN department t ON (a.department_id = t.id)
     		  |;
         $dpt_where = qq|
                    AND t.id = $department_id
     	           |;
+      }
       if ($form->{project_id}) {
         $project = qq|
                      AND ac.project_id = $form->{project_id}
     		 |;
+      }
       ############################################
       # Method eq 'cash' = IST Versteuerung
       ############################################
-...
         # Method eq 'accrual' = Soll Versteuerung
         #########################################
         if ($department_id) {
           $dpt_join = qq|
     	      JOIN dpt_trans t ON (t.trans_id = ac.trans_id)
     	      |;
           $dpt_where = qq|
                    AND t.department_id = $department_id
     	      |;
+        }
         $query = qq|
            -- Alle Einnahmen AR und pos_ustva erfassen
            SELECT
-...
            $dpt_join
            WHERE 1 = 1
            $where
            $dpt_where
            $project
            GROUP BY tk.pos_ustva
       |;
-...
            WHERE
 =1
            $where
            $dpt_where
            $project
            GROUP BY tk.pos_ustva
          UNION -- Einnahmen direkter gl Buchungen erfassen
-...
            $dpt_join
            WHERE 1 = 1
            $where
            $dpt_where
            $project
            GROUP BY tk.pos_ustva
-...
            $dpt_join
            WHERE 1 = 1
            $where
            $dpt_where
            $project
            GROUP BY tk.pos_ustva
       |;
-...
       $sth->execute || $form->dberror($query);
       while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
       while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
         # Bug 365 solved?!
         $ref->{amount} *= -1;
         if ($category eq "pos_bwa") {
           if ($last_period) {
             $form->{ $ref->{$category} }{kumm} += $ref->{amount};
           } else {
             $form->{ $ref->{$category} }{jetzt} += $ref->{amount};
+          }
         } else {
           $form->{ $ref->{$category} } += $ref->{amount};
+        }
         $form->{ $ref->{$category} } += $ref->{amount};
+      }
       $sth->finish;
-...
     sub get_config {
       $main::lxdebug->enter_sub();
       my ($self, $userpath, $filename) = @_;
       my ($self, $userspath, $filename) = @_;
       local (*FACONF, *FANEW);
       $form->error("Missing Parameter: @_") if !$userspath || !$filename;
       my $form = $main::form;
       $filename = "$form->{login}_$filename";
       $filename =~ s|.*/||;
       $filename = "$userspath/$filename";
       open my $FACONF, "<", $filename or sub {# Annon Sub
         # catch open error
         # create file if file does not exist
         open my $FANEW, ">", $filename  or $form->error("CREATE: $filename : $!");
         close $FANEW                    or $form->error("CLOSE: $filename : $!");
         #try again open file
         open my $FACONF, "<", $filename or $form->error("OPEN: $filename : $!");
       };
       if (!open(FACONF, "<", $filename)) {
         open(FANEW, ">", $filename) || $form->error("$filename : $!");
         close(FANEW);
         open(FACONF, "<", $filename) || $form->error("$filename : $!");
+      }
       while (<FACONF>) {
       while (<$FACONF>) {
         last if (/^\[/);
         next if (/^(\#|\s)/);
-...
+      }
       close(FACONF);
       close $FACONF;
       $main::lxdebug->leave_sub();
+    }

       # Hier kommt dann die Plausibilit?tspr?fung der ELSTERSteuernummer
       if ($form->{elstersteuernummer} ne '000000000') {
         $form->{elster} = '1';
         open(CONF, ">$userspath/$filename") or $form->error("$filename : $!");
         open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
         # create the config file
         print CONF qq|# Configuration file for USTVA\n\n|;
         print {$ustvaconfig} qq|# Configuration file for USTVA\n\n|;
         my $key = '';
         foreach $key (sort @config) {
           $form->{$key} =~ s/\\/\\\\/g;
           # strip M
           $form->{$key} =~ s/\r\n/\n/g;
           print CONF qq|$key=|;
           print {$ustvaconfig} qq|$key=|;
           if ($form->{$key} ne 'Y') {
             print CONF qq|$form->{$key}\n|;
             print {$ustvaconfig} qq|$form->{$key}\n|;
+          }
           if ($form->{$key} eq 'Y') {
             print CONF qq|checked \n|;
             print {$ustvaconfig} qq|checked \n|;
+          }
+        }
         print CONF qq|\n\n|;
         close CONF;
         print {$ustvaconfig} qq|\n\n|;
         close $ustvaconfig;
         $form->{saved} = $locale->text('saved');
       } else {

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 86f876b6

Von Udo Spallek vor mehr als 17 Jahren hinzugefügt