intraface / intraface.dk

src/Intraface/Log.php

Doc Comments +6 added lines

@@ -6,6 +6,9 @@ 
 

 interface Observer

 {

+    /**
+     * @return boolean
+     */
     function update($code, $msg);

 }

 

@@ -47,6 +50,9 @@ 
         }

     }

 

+    /**
+     * @param string $table
+     */
     function tableExists($table)

     {

         $this->db->loadModule('Manager', null, true);

Spacing +2 added lines, -2 removed lines

@@ -64,12 +64,12 @@
         $result = $this->db->createTable($this->table_name, $this->table_definition);

 

         if (PEAR::isError($result)) {

-            throw new Exception('create ' . $result->getMessage());

+            throw new Exception('create '.$result->getMessage());

         }

 

         $result = $this->db->createConstraint($this->table_name, 'PRIMARY', $this->definition);

         if (PEAR::isError($result)) {

-            throw new Exception('primary ' . $result->getMessage());

+            throw new Exception('primary '.$result->getMessage());

         }

     }

 

src/Intraface/ModuleHandler.php

Doc Comments +3 added lines, -2 removed lines

@@ -169,8 +169,6 @@ 
     /**

      * getModule()

      *

-     * @param string $module_name

-     *

      * @return object

      */

     function getModule($name)

@@ -250,6 +248,9 @@ 
         return false;

     }

 

+    /**
+     * @param string $name
+     */
     private static function isValidModuleName($name)

     {

         return preg_match("/^[a-z0-9]+$/", $name);

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
     public function useModule($module_name, $ignore_user_access = false)

     {

         if (!self::isValidModuleName($module_name)) {

-            throw new Exception($module_name . ' is not a valid module name');

+            throw new Exception($module_name.' is not a valid module name');

         }

 

         if (!empty($this->modules[$module_name]) AND is_object($this->modules[$module_name])) {

@@ -116,11 +116,11 @@ 
         }

 

         if ($access !== true) {

-            throw new Exception('You need access to a required module to see this page, maybe it is ' . $module_name);

+            throw new Exception('You need access to a required module to see this page, maybe it is '.$module_name);

         }

 

-        $main_class_name = "Main" . ucfirst($module_name);

-        $main_class_path = PATH_INCLUDE_MODULE . $module_name . "/" . $main_class_name . ".php";

+        $main_class_name = "Main".ucfirst($module_name);

+        $main_class_path = PATH_INCLUDE_MODULE.$module_name."/".$main_class_name.".php";

 

         if (file_exists($main_class_path)) {

             require_once($main_class_path);

@@ -130,7 +130,7 @@ 
             return $object;

         } else {

             // @TODO this should not fail as hard - but what should happen then?

-            throw new Exception('ModuleHandler: ' . $main_class_path . ' does not exist');

+            throw new Exception('ModuleHandler: '.$main_class_path.' does not exist');

         }

     }

 

@@ -144,7 +144,7 @@ 
     public function useShared($shared_name)

     {

         if (!self::isValidModuleName($shared_name)) {

-            throw new Exception($shared_name. ' is not a valid shared module name');

+            throw new Exception($shared_name.' is not a valid shared module name');

         }

 

         // Tjekker om shared allerede er loaded

@@ -152,8 +152,8 @@ 
             return $this->shared[$shared_name];

         }

 

-        $main_shared_name = 'Shared' . ucfirst($shared_name);

-        $main_shared_path = PATH_INCLUDE_SHARED . $shared_name . '/' . $main_shared_name . '.php';

+        $main_shared_name = 'Shared'.ucfirst($shared_name);

+        $main_shared_path = PATH_INCLUDE_SHARED.$shared_name.'/'.$main_shared_name.'.php';

 

         if (file_exists($main_shared_path)) {

             require_once $main_shared_path;

@@ -162,7 +162,7 @@ 
             $this->shared[$shared_name] = $object;

             return $object;

         } else {

-            throw new Exception($shared_name . ' cannot be found on ' . $main_shared_path . ' with PATH_INCLUDE_SHARED: ' . PATH_INCLUDE_SHARED);

+            throw new Exception($shared_name.' cannot be found on '.$main_shared_path.' with PATH_INCLUDE_SHARED: '.PATH_INCLUDE_SHARED);

         }

     }

 

@@ -178,7 +178,7 @@ 
         if (is_object($this->modules[$name])) {

             return($this->modules[$name]);

         } else {

-            throw new Exception('getModule() module ' . $name . ' not loaded');

+            throw new Exception('getModule() module '.$name.' not loaded');

         }

     }

 

src/Intraface/modules/accounting/Account.php

Doc Comments +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      * @deprecated

      * @param integer $account_number

      *

-     * @return object

+     * @return double

      */

     public static function factory($year, $account_number)

     {

@@ -451,7 +451,7 @@ 
      * @param $date_from (date) yyyy-mm-dd Der s�ges jo kun i indev�rende �r

      * @param $date_to (date) yyyy-mm-dd   Der s�ges kun i indev�rende �r

      *

-     * @return (array) med debet, credit og total saldo

+     * @return boolean med debet, credit og total saldo

      *

      *

      *

Indentation +3 added lines, -3 removed lines

@@ -197,7 +197,7 @@ 
                     $this->value['vat_account_id'] = 0;

                 }

                 $this->value['vat_shorthand'] = $this->value['vat'];

-             }

+                }

         }

 

         return $this->get('id');

@@ -236,7 +236,7 @@ 
             $this->error->set('Ikke en tilladt type');

         }

 

-         $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');

+            $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');

 

         if (!array_key_exists($var['use_key'], $this->use)) {

             $this->error->set('Ikke en tilladt brug af kontoen');

@@ -642,6 +642,6 @@ 
 

     public function getNumber()

     {

-    	return $this->get('number');

+        return $this->get('number');

     }

 }

Spacing +29 added lines, -29 removed lines

@@ -94,7 +94,7 @@ 
         $this->db = new DB_Sql;

         $this->mdb2 = MDB2::singleton(DB_DSN);

         if (PEAR::isError($this->mdb2)) {

-            throw new Exception($this->mdb2->getMessage() . $this->mdb2->getUserInfo());

+            throw new Exception($this->mdb2->getMessage().$this->mdb2->getUserInfo());

         }

 

         $this->error = new Intraface_Error;

@@ -150,8 +150,8 @@ 
                 account.active

             FROM

                 accounting_account account

-            WHERE account.id = " . $this->id . "

-                AND account.intranet_id = ".$this->year->kernel->intranet->get('id'). "

+            WHERE account.id = " . $this->id."

+                AND account.intranet_id = ".$this->year->kernel->intranet->get('id')."

                 AND year_id = ".$this->year->get('id')."

             LIMIT 1";

 

@@ -244,8 +244,8 @@ 
 

         $validator->isString($var['name'], 'Kontonavnet kan kune v�re en tekststreng.');

         $validator->isNumeric($var['vat_key'], 'Ugyldig moms', 'allow_empty');

-        $validator->isNumeric($var['sum_to'], 'sum_to' , 'allow_empty');

-        $validator->isNumeric($var['sum_from'], 'sum_from' , 'allow_empty');

+        $validator->isNumeric($var['sum_to'], 'sum_to', 'allow_empty');

+        $validator->isNumeric($var['sum_from'], 'sum_from', 'allow_empty');

 

         settype($var['comment'], 'integer');

         $validator->isString($var['comment'], 'Error in comment', '', 'allow_empty');

@@ -257,26 +257,26 @@ 
 

         if ($this->id > 0) {

             $sql_type = "UPDATE accounting_account ";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

         } else {

             $sql_type = "INSERT INTO accounting_account ";

             $sql_end = ", date_created=NOW()";

         }

 

-        $sql = $sql_type . "SET

+        $sql = $sql_type."SET

             number = '".(int)$var['number']."',

-            intranet_id = " . $this->year->kernel->intranet->get('id') . ",

-            user_id = " . $this->year->kernel->user->get("id") . ",

+            intranet_id = " . $this->year->kernel->intranet->get('id').",

+            user_id = " . $this->year->kernel->user->get("id").",

             type_key='" . $var['type_key']."',

             year_id = " . $this->year->get('id').",

             use_key = '" . $var['use_key']."',

             name = '" . $var['name']."',

             comment = '" . $var['comment']."',

-            vat_percent = '" . $var['vat_percent'] . "',

-            sum_to_account_number = " . (int)$var['sum_to'] . ",

-            sum_from_account_number = " . (int)$var['sum_from'] . ",

+            vat_percent = '" . $var['vat_percent']."',

+            sum_to_account_number = " . (int)$var['sum_to'].",

+            sum_from_account_number = " . (int)$var['sum_from'].",

             date_changed = NOW(),

-            vat_key=" . (int)$var['vat_key'] . " " . $sql_end;

+            vat_key=" . (int)$var['vat_key']." ".$sql_end;

 

         $this->db->query($sql);

 

@@ -285,7 +285,7 @@ 
         }

 

         if (!empty($var['created_from_id']) AND is_numeric($var['created_from_id'])) {

-            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = " . $this->id);

+            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = ".$this->id);

         }

 

         $this->load();

@@ -350,7 +350,7 @@ 
             return false;

         }

 

-        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id = ".$this->year->get('id')." AND id = " . $this->id);

+        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND id = ".$this->id);

         $this->value['active'] = 0;

         return true;

     }

@@ -391,10 +391,10 @@ 
         $sql = "SELECT

                 id

             FROM accounting_account

-            WHERE number = " . $account_number . "

-                AND intranet_id = " . $this->year->kernel->intranet->get('id') . "

-                AND year_id = " .$this->year->get('id'). "

-                AND id <> " . $this->id . " AND active = 1";

+            WHERE number = " . $account_number."

+                AND intranet_id = " . $this->year->kernel->intranet->get('id')."

+                AND year_id = " .$this->year->get('id')."

+                AND id <> " . $this->id." AND active = 1";

         $result = $this->mdb2->query($sql);

         if (PEAR::isError($result)) {

             throw new Exception('Error in query: '.$result->getUserInfo());

@@ -419,8 +419,8 @@ 
     {

         $sql = "SELECT primosaldo_debet, primosaldo_credit

             FROM accounting_account

-            WHERE year_id = " . $this->year->get('id') . "

-                AND id = ".$this->id . "

+            WHERE year_id = " . $this->year->get('id')."

+                AND id = ".$this->id."

                 AND active = 1

                 AND intranet_id = ".$this->year->kernel->intranet->get('id');

 

@@ -500,9 +500,9 @@ 
             if ($this->get('type_key') == array_search('sum', $this->types)) {

                 $db2 = new DB_Sql;

                 $sql = "SELECT id FROM accounting_account

-                    WHERE number >= " . $this->get('sum_from') . "

+                    WHERE number >= " . $this->get('sum_from')."

                         AND type_key != ".array_search('sum', $this->types)."

-                        AND number <= " . $this->get('sum_to') . "

+                        AND number <= " . $this->get('sum_to')."

                         AND year_id = ".$this->year->get('id')."

                         AND intranet_id = " . $this->year->kernel->intranet->get('id');

                 $db2->query($sql);

@@ -570,9 +570,9 @@ 
         $this->db->query("SELECT

                 id

             FROM accounting_post post

-            WHERE (post.account_id = ". $this->id . ")

+            WHERE (post.account_id = ". $this->id.")

                 AND intranet_id = ".$this->year->kernel->intranet->get('id')."

-                AND year_id = " . $this->year->get('id') . "

+                AND year_id = " . $this->year->get('id')."

                 LIMIT 1");

         return $this->db->numRows();

     }

@@ -593,9 +593,9 @@ 
                     debet,

                     credit

                 FROM accounting_post post

-                WHERE (post.account_id = ". $this->get('id') . ")

+                WHERE (post.account_id = ". $this->get('id').")

                     AND intranet_id = ".$this->year->kernel->intranet->get('id')."

-                    AND year_id = " . $this->year->get('id') . "

+                    AND year_id = " . $this->year->get('id')."

                     AND stated = 1

                     ORDER BY date ASC, id ASC");

         $i = 1;

@@ -630,9 +630,9 @@ 
     public function calculateVat($amount, $vat_percent)

     {

         $amount = (float)$amount;

-        $vat_percent = (float)$vat_percent / 100;

+        $vat_percent = (float)$vat_percent/100;

 

-        return $amount * ($vat_percent / (1 + $vat_percent));

+        return $amount*($vat_percent/(1 + $vat_percent));

     }

 

     public function getId()

src/Intraface/modules/accounting/AccountGateway.php

Doc Comments +4 added lines, -1 removed lines

@@ -65,7 +65,7 @@ 
     /**
      * @deprecated
      * @param $id
-     * @return unknown_type
+     * @return Account
      */
     function findFromId($id)
     {
@@ -78,6 +78,9 @@ 
     	return new Account($this->year, $id);
     }
 
+    /**
+     * @param string $type
+     */
     function findByType($type, $saldo = false)
     {
         return $this->getList($type, $saldo);

Indentation +3 added lines, -3 removed lines

@@ -26,10 +26,10 @@ 
 
     function __construct($year)
     {
-    	$this->year = $year;
+        $this->year = $year;
     }
 
-   /**
+    /**
      * Denne funktion bruges bl.a. under bogf�ringen, s� man bare taster kontonummer
      * og s� s�ttes den rigtige konto.
      *
@@ -75,7 +75,7 @@ 
     function findById($id)
     {
         require_once dirname (__FILE__) . '/Account.php';
-    	return new Account($this->year, $id);
+        return new Account($this->year, $id);
     }
 
     function findByType($type, $saldo = false)

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 
     function findById($id)
     {
-        require_once dirname (__FILE__) . '/Account.php';
+        require_once dirname(__FILE__).'/Account.php';
     	return new Account($this->year, $id);
     }
 
@@ -110,7 +110,7 @@ 
 
         $db = new DB_Sql;
         if (!empty($type)) {
-            switch($type) {
+            switch ($type) {
                 case 'expenses':
                         $type_sql = " AND use_key = '".array_search('expenses', $this->use)."'";
                     break;
@@ -188,7 +188,7 @@ 
         $db = new DB_Sql;
         $sql = "SELECT id
             FROM accounting_account
-            WHERE intranet_id = " . $this->year->kernel->intranet->get("id") . " AND year_id = ".$this->year->get('id')." AND active = 1";
+            WHERE intranet_id = " . $this->year->kernel->intranet->get("id")." AND year_id = ".$this->year->get('id')." AND active = 1";
         $db->query($sql);
 
         return $db->numRows();

src/Intraface/modules/accounting/Post.php

Doc Comments +10 added lines, -2 removed lines

@@ -36,6 +36,9 @@ 
         }

     }

 

+    /**
+     * @param integer $post_id
+     */
     public function factory($year, $post_id)

     {

         return Intraface_modules_accounting_PostGateway::getFromYearAndPostId($year, $post_id);

@@ -76,6 +79,13 @@ 
         return 1;

     }

 

+    /**
+     * @param string $date
+     * @param integer $account_id
+     * @param string $text
+     * @param double $debet
+     * @param double $credit
+     */
     private function validate($date, $account_id, $text, $debet, $credit)

     {

         $validator = new Intraface_Validator($this->error);

@@ -99,9 +109,7 @@ 
     /**

      * States the posts

      *

-     * @param integer $year_id

      * @param string  $date

-     * @param string  $voucher_number

      * @param string  $text

      * @param integer $account_id

      * @param float   $debet

Indentation +1 added lines, -1 removed lines

@@ -194,6 +194,6 @@
 

     function getId()

     {

-    	return $this->id;

+        return $this->id;

     }

 }

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
     private function load()

     {

         $db = new DB_Sql;

-        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = " . $this->id . " AND intranet_id=" .$this->voucher->year->kernel->intranet->get('id'));

+        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = ".$this->id." AND intranet_id=".$this->voucher->year->kernel->intranet->get('id'));

         if (!$db->nextRecord()) {

             return 0;

         }

@@ -125,7 +125,7 @@ 
 

         if ($this->id > 0) {

             $sql_type = "UPDATE";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

 

         } else {

             $sql_type = "INSERT INTO";

@@ -133,7 +133,7 @@ 
         }

 

         $db = new DB_Sql;

-        $sql = $sql_type . " accounting_post

+        $sql = $sql_type." accounting_post

                  SET

                     voucher_id = '".$this->voucher->get('id')."',

                     intranet_id = ".$this->

@@ -148,7 +148,7 @@ 
                     account_id = '".(int)$account_id."',

                     text = '".(string)$text."',

                     debet = '".$debet."',

-                    credit = '".$credit."'"  . $sql_end;

+                    credit = '".$credit."'".$sql_end;

         $db->query($sql);

 

         $this->id = $db->insertedId();

@@ -175,7 +175,7 @@ 
         }

 

         $db = new DB_Sql;

-        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = " . $this->id . " AND intranet_id =" .$this->voucher->year->kernel->intranet->get('id'));

+        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = ".$this->id." AND intranet_id =".$this->voucher->year->kernel->intranet->get('id'));

 

         return true;

     }

@@ -187,7 +187,7 @@ 
         }

 

         $db = new DB_Sql;

-        $db->query("DELETE FROM accounting_post WHERE id = " . $this->id);

+        $db->query("DELETE FROM accounting_post WHERE id = ".$this->id);

         return true;

 

     }

src/Intraface/modules/accounting/PostGateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      *
      * @param object $voucher
      *
-     * @return void
+     * @return string
      */
     function __construct($voucher)
     {

src/Intraface/modules/accounting/Voucher.php

Doc Comments +1 added lines, -5 removed lines

@@ -22,8 +22,6 @@ 
      * Constructor

      *

      * @param object  $year_object

-     * @param integer $post_id (optional)

-     *

      * @return void

      */

     function __construct($year_object, $id = 0)

@@ -45,7 +43,7 @@ 
      * @param object $year

      * @param string $voucher_number

      *

-     * @return void

+     * @return Voucher

      */

     function factory($year, $voucher_number)

     {

@@ -339,9 +337,7 @@ 
     /**

      * Prepares amounts for stating, e.g. whether the accounts needs vat calculations

      *

-     * @param integer $year_id

      * @param string  $date 

-     * @param string  $voucher_number

      * @param string  $text

      * @param integer $account_id

      * @param float   $debet

Indentation +3 added lines, -3 removed lines

@@ -271,11 +271,11 @@
      * @return array

      */

 

-     function getList($filter = '')

-     {

+        function getList($filter = '')

+        {

         $gateway = new Intraface_modules_accounting_VoucherGateway($this->year);

         return $gateway->getList($filter);

-     }

+        }

 

     /**

      * States voucher

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
                     voucher.date,

                     voucher.reference

             FROM accounting_voucher voucher

-            WHERE voucher.id = " . $this->id. " AND intranet_id = ". $this->year->kernel->intranet->getId();

+            WHERE voucher.id = " . $this->id." AND intranet_id = ".$this->year->kernel->intranet->getId();

 

         $db = new DB_Sql;

         $db->query($sql);

@@ -143,11 +143,11 @@ 
             $sql_end = ", date_created = NOW()";

         } else {

             $sql_type = "UPDATE";

-            $sql_end = " WHERE id = " . (int)$this->id;

+            $sql_end = " WHERE id = ".(int)$this->id;

         }

 

         $db = new DB_Sql;

-        $sql = $sql_type . " accounting_voucher

+        $sql = $sql_type." accounting_voucher

             SET intranet_id = ".$this->year->kernel->intranet->get('id').",

                 year_id = ".$this->year->get('id').",

                 user_id = ".$this->year->kernel->user->get('id').",

@@ -155,7 +155,7 @@ 
                 number = '".$var['voucher_number']."',

                 date = '".$post_date->get()."',

                 reference = '".$var['reference']."',

-                text = '".$var['text']."'" . $sql_end;

+                text = '".$var['text']."'".$sql_end;

 

         $db->query($sql);

 

@@ -309,7 +309,7 @@ 
             $buy_all_abroad = $buy_abroad;

         }

 

-        $amount = $this->get('amount') * ($this->vatpercent / 100);

+        $amount = $this->get('amount')*($this->vatpercent/100);

 

         // I det omfang du har fradragsret for momsen, kan du medregne det beregnede

         // momsbeløb til konto for indgående moms. Det beregnede momsbeløb af EU-varekøb

@@ -373,13 +373,13 @@ 
                             $debet = $debet - $vat_amount;

                             // bogfør momsen

                             $post = new Post($this);

-                            $post->save($date, $vat_account_id, $text . " - købsmoms", $vat_amount, 0, $skip_draft);

+                            $post->save($date, $vat_account_id, $text." - købsmoms", $vat_amount, 0, $skip_draft);

                         } else {

                             $vat_amount = $this->calculateVat($credit, $vat_percent);

                             $credit = $credit - $vat_amount;

                             // bogføre udgående moms

                             $post = new Post($this);

-                            $post->save($date, $vat_account_id, $text . " - tilbageført moms", 0, $vat_amount, $skip_draft);

+                            $post->save($date, $vat_account_id, $text." - tilbageført moms", 0, $vat_amount, $skip_draft);

                         }

 

                         // bogføre selve posten

@@ -395,7 +395,7 @@ 
                             $credit = $credit - $vat_amount;

                             // bogføre udgående moms

                             $post = new Post($this);

-                            $post->save($date, $vat_account_id, $text . " - salgsmoms", 0, $vat_amount, $skip_draft);

+                            $post->save($date, $vat_account_id, $text." - salgsmoms", 0, $vat_amount, $skip_draft);

                         } else {

                             // tilbagefører momsen hvis det er et debet beløb

                             $vat_amount = $this->calculateVat($debet, $vat_percent);

@@ -454,7 +454,7 @@ 
             $post = new Post($this, $p['id']);

 

             if (!$post->setStated()) {

-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');

+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');

 

             }

 

@@ -480,7 +480,7 @@ 
         }

 

         if ($this->get('saldo') <> 0) {

-            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er ' . $this->get('saldo') . '.');

+            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er '.$this->get('saldo').'.');

         }

 

         if ($this->error->isError()) {

@@ -494,7 +494,7 @@ 
             if ($post->get('stated') == 1) continue;

 

             if (!$post->setStated()) {

-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');

+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');

 

             }

         }

@@ -509,7 +509,7 @@ 
     function getPosts()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = " . $this->id . " AND intranet_id=".$this->year->kernel->intranet->get('id'));

+        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id'));

         $list = array();

         $i = 0;

         $this->value['saldo'] = 0;

Braces +3 added lines, -1 removed lines

@@ -491,7 +491,9 @@
 

         foreach ($posts as $p) {

             $post = new Post($this, $p['id']);

-            if ($post->get('stated') == 1) continue;

+            if ($post->get('stated') == 1) {
+                continue;
+            }
 

             if (!$post->setStated()) {

                 $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');

src/Intraface/modules/accounting/VoucherFileGateway.php

Doc Comments +3 added lines

@@ -90,6 +90,9 @@
         return $files;
     }
 
+    /**
+     * @param string $url
+     */
     function url($url)
     {
         return PATH_WWW . 'restricted' . $url;

Spacing +5 added lines, -5 removed lines

@@ -22,14 +22,14 @@ 
 
     function findFromId($id)
     {
-        require_once dirname(__FILE__) . '/VoucherFile.php';
+        require_once dirname(__FILE__).'/VoucherFile.php';
         return new VoucherFile($this->voucher, $id);
     }
 
     function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM accounting_voucher_file WHERE active = 1 AND voucher_id = " . $this->voucher->get('id') . " AND intranet_id=" . $this->voucher->year->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM accounting_voucher_file WHERE active = 1 AND voucher_id = ".$this->voucher->get('id')." AND intranet_id=".$this->voucher->year->kernel->intranet->get('id'));
         $i = 0;
         $files = array();
         while ($db->nextRecord()) {
@@ -49,7 +49,7 @@ 
                         $files[$i]['description'] = 'Momsperiode';
                     }
                     $files[$i]['name'] = 'Momsperiode';
-                    $files[$i]['file_uri'] = $this->url('/module/accounting/year/'.$this->voucher->year->getId().'/vat/' . $db->f('belong_to_id'));
+                    $files[$i]['file_uri'] = $this->url('/module/accounting/year/'.$this->voucher->year->getId().'/vat/'.$db->f('belong_to_id'));
                 break;
                 case 'file':
                     $this->voucher->year->kernel->useModule('filemanager');
@@ -63,7 +63,7 @@ 
                         $files[$i]['description'] = 'Kreditnota';
                     }
                     $files[$i]['name'] = 'Kreditnota';
-                    $files[$i]['file_uri'] = $this->url('/module/debtor/credit_note/' . $db->f('belong_to_id') . '.pdf');
+                    $files[$i]['file_uri'] = $this->url('/module/debtor/credit_note/'.$db->f('belong_to_id').'.pdf');
                 break;
                 case 'reminder':
                     if (empty($files[$i]['description'])) {
@@ -92,6 +92,6 @@ 
 
     function url($url)
     {
-        return PATH_WWW . 'restricted' . $url;
+        return PATH_WWW.'restricted'.$url;
     }
 }
\ No newline at end of file

src/Intraface/modules/accounting/VoucherGateway.php

Doc Comments +2 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
      *
      * @param object  $year_object
      *
-     * @return void
+     * @return string
      */
     public function __construct($year_object)
     {
@@ -32,10 +32,9 @@ 
     /**
      * Creates a voucher
      *
-     * @param object $year
      * @param string $voucher_number
      *
-     * @return void
+     * @return Voucher
      */
     public function findFromVoucherNumber($voucher_number)
     {

Indentation +15 added lines, -15 removed lines

@@ -26,7 +26,7 @@ 
     public function findFromId($id)
     {
         require_once dirname (__FILE__) . '/Voucher.php';
-    	return new Voucher($this->year, $id);
+        return new Voucher($this->year, $id);
     }
 
     /**
@@ -51,8 +51,8 @@ 
     /**
      * @return (array)
      */
-     function getList($filter = '')
-     {
+        function getList($filter = '')
+        {
         $sql = "SELECT *, DATE_FORMAT(voucher.date, '%d-%m-%Y') AS date_dk
             FROM accounting_voucher voucher
             WHERE voucher.active = 1 AND voucher.year_id = ".$this->year->get('id')."
@@ -61,13 +61,13 @@ 
         switch ($filter) {
             case 'lastfive':
                 $sql .= " ORDER BY voucher.number DESC, voucher.id DESC LIMIT 5";
-             break;
+                break;
             default:
                 $sql .= " ORDER BY voucher.number DESC, voucher.id DESC";
                 break;
         }
 
-         $db = new Db_Sql;
+            $db = new Db_Sql;
 
         $db->query($sql);
 
@@ -83,19 +83,19 @@ 
             $i++;
         }
         return $list;
-     }
+        }
 
-     function getMaxNumber()
-     {
-         $db = new DB_Sql;
+        function getMaxNumber()
+        {
+            $db = new DB_Sql;
 
-         $db->query("SELECT MAX(number) AS max_voucher_number
+            $db->query("SELECT MAX(number) AS max_voucher_number
             FROM accounting_voucher
             WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . "
                 AND year_id = " . $this->year->get('id'));
-         if (!$db->nextRecord()) {
-             return 0;
-         }
-         return $db->f('max_voucher_number');
-     }
+            if (!$db->nextRecord()) {
+                return 0;
+            }
+            return $db->f('max_voucher_number');
+        }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 
     public function findFromId($id)
     {
-        require_once dirname (__FILE__) . '/Voucher.php';
+        require_once dirname(__FILE__).'/Voucher.php';
     	return new Voucher($this->year, $id);
     }
 
@@ -40,7 +40,7 @@ 
     public function findFromVoucherNumber($voucher_number)
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM accounting_voucher WHERE number = '".safeToDb($voucher_number)."' AND year_id = '".$this->year->get('id')."' AND intranet_id = " . $this->year->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM accounting_voucher WHERE number = '".safeToDb($voucher_number)."' AND year_id = '".$this->year->get('id')."' AND intranet_id = ".$this->year->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return new Voucher($this->year);
         }
@@ -91,7 +91,7 @@ 
 
          $db->query("SELECT MAX(number) AS max_voucher_number
             FROM accounting_voucher
-            WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . "
+            WHERE intranet_id = " . $this->year->kernel->intranet->get('id')."
                 AND year_id = " . $this->year->get('id'));
          if (!$db->nextRecord()) {
              return 0;