Changeset 874 for trunk/Modules/Finance

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

Location:

trunk/Modules/Finance

Files:

• Bill.php (modified) (5 diffs)
• Finance.php (modified) (14 diffs)
• Import.php (modified) (4 diffs)
• Manage.php (modified) (10 diffs)
• Trade.php (modified) (4 diffs)
• UserState.php (modified) (6 diffs)

trunk/Modules/Finance/Bill.php

@@ -8 +8 @@
   function GenerateHTML()
   {
-    return ('');
+    return '';
   }
 
@@ -29 +29 @@
     $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
       '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
-    return ($Output);
+    return $Output;
   }
 }
@@ -47 +47 @@
     if ($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';
     if ($Subject['PayVAT'] != '') $Output .= 'Plátce DPH: '.$BooleanText[$Subject['PayVAT']].'<br>';
-    return ($Output);
+    return $Output;
   }
 
@@ -146 +146 @@
       '</table>';
 
-    return ($Output);
+    return $Output;
   }
 }
@@ -215 +215 @@
       '<tr><td>&nbsp;</td><td><br><br>'.$Desc['Signature'].':</td></tr>';
     $Output .= '</table>';
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Finance.php

@@ -80 +80 @@
   function W2Kc($Spotreba)
   {
-    return (round($Spotreba * 0.72 * $this->kWh));
+    return round($Spotreba * 0.72 * $this->kWh);
   }
 
@@ -138 +138 @@
     $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
       'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
-    return ($Result);
+    return $Result;
   }
 
@@ -153 +153 @@
     if ($DbResult->num_rows == 1) {
       $Group = $DbResult->fetch_assoc();
-      return ($Group);
+      return $Group;
     } else die('Finance group id '.$Id.' not found in table '.$Table);
   }
@@ -204 +204 @@
     }
     $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');
-    return ($Output);
+    return $Output;
   }
 
@@ -214 +214 @@
       TimeToMysqlDate($Time).'") OR (ValidTo IS NULL)) LIMIT 1');
     $Row = $DbResult->fetch_array();
-    return ($Row[0]);
+    return $Row[0];
   }
 }
@@ -669 +669 @@
     $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -677 +677 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -685 +685 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Form->Values['ValueUser'] * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -695 +695 @@
     $Group = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -707 +707 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -718 +718 @@
     $this->Database->query('UPDATE `'.$Form->Definition['Table'].'` SET `Value`= '.
       ($Sum * $FinanceGroup['ValueSign']).' WHERE `Id`='.$Id);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -727 +727 @@
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->AfterInsertFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -736 +736 @@
     $ParentForm->LoadValuesFromDatabase($Form->Values['FinanceInvoice']);
     $this->BeforeModifyFinanceInvoice($ParentForm, $Form->Values['FinanceInvoice']);
-    return ($Form->Values);
+    return $Form->Values;
   }
 
@@ -744 +744 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Form->Values['DocumentLine'], $Year);
-    return ($Form->Values);
+    return $Form->Values;
   }
 }

trunk/Modules/Finance/Import.php

@@ -9 +9 @@
   function Show()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return 'Nemáte oprávnění';
     if (array_key_exists('Operation', $_GET))
     {
-      if ($_GET['Operation'] == 'prepare') return ($this->Prepare());
-      else if ($_GET['Operation'] == 'insert') return ($this->Insert());
+      if ($_GET['Operation'] == 'prepare') return $this->Prepare();
+      else if ($_GET['Operation'] == 'insert') return $this->Insert();
       else echo('Neplatná akce');
     } else
@@ -22 +22 @@
       $Output .= '<input type="submit" value="Analyzovat"/>';
       $Output .= '</form>';
-      return ($Output);
+      return $Output;
     }
   }
@@ -121 +121 @@
       $Output .= '<input type="submit" value="Zpracovat"/></form>';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -156 +156 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
     }
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Manage.php

@@ -11 +11 @@
     $Output = '';
     if (!$this->System->User->CheckPermission('Finance', 'Manage'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     if (array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation'];
@@ -42 +42 @@
         $Output .= '<a href="'.$this->System->Link('/finance/import/').'">Import plateb</a><br />';
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -52 +52 @@
 
     $MonthCount = $this->System->Modules['Finance']->BillingPeriods[$Period]['MonthCount'];
-    if ($MonthCount <= 0) return (array('From' => NULL, 'To' => NULL, 'MonthCount' => 0));
+    if ($MonthCount <= 0) return array('From' => NULL, 'To' => NULL, 'MonthCount' => 0);
     $MonthCurrent = date('n', $Time);
 
@@ -67 +67 @@
     $PeriodTo = mktime(0, 0, 0, $MonthTo, date('t', mktime(0, 0, 0, $MonthTo, 1, $Year)), $Year);
 
-    return (array('From' => $PeriodFrom, 'To' => $PeriodTo, 'MonthCount' => $MonthCount));
+    return array('From' => $PeriodFrom, 'To' => $PeriodTo, 'MonthCount' => $MonthCount);
   }
 
   function ShowMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $SQL = 'SELECT `Member`.*, `MemberPayment`.`MonthlyTotal` AS `Monthly`, '.
       '`MemberPayment`.`Cash` AS `Cash`, '.
@@ -120 +120 @@
     $Output .= $PageList['Output'];
     $Output .= '<a href="?Operation=ProcessMonthlyPayment">Generovat faktury</a>';
-    return ($Output);
+    return $Output;
   }
 
@@ -149 +149 @@
     //$LastInsertTime = $Time;
     //$this->CheckAdvancesAndLiabilities($Subject);
-    return ($InvoiceId);
+    return $InvoiceId;
   }
 
@@ -217 +217 @@
       $Output .= "\n";
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -270 +270 @@
     $this->TableUpdateChanges('ServiceCustomerRel');
 
-    return ($Output);
+    return $Output;
   }
 
   function ProcessMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $Output = '';
 
@@ -335 +335 @@
     }
     $Output = str_replace("\n", '<br/>', $Output);
-    return ($Output);
+    return $Output;
   }
 
@@ -478 +478 @@
     $Output .= $this->GenerateInvoice(' AND (`File` IS NULL)');
     $Output .= $this->GenerateOperation(' AND (`File` IS NULL)');
-    return ($Output);
+    return $Output;
   }
 }

trunk/Modules/Finance/Trade.php

@@ -65 +65 @@
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
-    return ($Balance);
+    return $Balance;
   }
 
@@ -427 +427 @@
   {
     if (!$this->System->User->CheckPermission('Finance', 'TradingStatus'))
-      return ('Nemáte oprávnění');
+      return 'Nemáte oprávnění';
 
     $Finance = &$this->System->Modules['Finance'];
@@ -478 +478 @@
         $Output = $this->ShowDefault();
     }
-    return ($Output);
+    return $Output;
   }
 
@@ -488 +488 @@
       $Output .= '<a href="?year='.$DbRow['Id'].'">'.$DbRow['Year'].'</a> ';
     $Output .= '<br/>';
-    return ($Output);
+    return $Output;
   }
 

trunk/Modules/Finance/UserState.php

@@ -66 +66 @@
     $Output .= '</table>';
     $Output .= $PageList['Output'];
-    return ($Output);
+    return $Output;
   }
 
@@ -77 +77 @@
     if (array_key_exists('i', $_GET))
     {
-      if (!$this->System->User->CheckPermission('Finance', 'Manage')) return ('Nemáte oprávnění');
+      if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
       $CustomerId = $_GET['i'];
     } else
     {
-      if (!$this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) return ('Nemáte oprávnění');
+      if (!$this->System->User->CheckPermission('Finance', 'DisplaySubjectState')) return 'Nemáte oprávnění';
       $UserId = $this->System->User->User['Id'];
       $DbResult = $this->Database->query('SELECT `Customer` FROM `UserCustomerRel` WHERE `User`='.$UserId.' LIMIT 1');
@@ -88 +88 @@
         $CustomerUserRel = $DbResult->fetch_assoc();
         $CustomerId = $CustomerUserRel['Customer'];
-      } else return ($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
+      } else return $this->SystemMessage('Chyba', 'Nejste zákazníkem');
     }
 
@@ -96 +96 @@
     {
       $Customer = $DbResult->fetch_assoc();
-    } else return ($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
+    } else return $this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen');
 
 
@@ -104 +104 @@
     {
       $Subject = $DbResult->fetch_assoc();
-    } else return ($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
+    } else return $this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen');
 
 
@@ -152 +152 @@
 
     $Output .= '</td></tr></table>';
-    return ($Output);
+    return $Output;
   }
 }