intraface / intraface.dk

src/Intraface/modules/accounting/VoucherFileGateway.php

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'])) {
@@ -91,6 +91,6 @@ 
 
     function url($url)
     {
-        return PATH_WWW . 'restricted' . $url;
+        return PATH_WWW.'restricted'.$url;
     }
 }

src/Intraface/modules/accounting/VoucherGateway.php

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);
         }
@@ -93,7 +93,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;

src/Intraface/modules/accounting/Post.php

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,14 +125,14 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO";
             $sql_end = "";
         }
 
         $db = new DB_Sql;
-        $sql = $sql_type . " accounting_post
+        $sql = $sql_type." accounting_post
                  SET
                     voucher_id = '".$this->voucher->get('id')."',
                     intranet_id = ".$this->
@@ -147,7 +147,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();
@@ -174,7 +174,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;
     }
@@ -186,7 +186,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/Voucher.php

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
@@ -374,13 +374,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
@@ -396,7 +396,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);
@@ -455,7 +455,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.');
             }
 
             // tjekker om der har været nogle fejl i bogføringen
@@ -479,7 +479,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()) {
@@ -495,7 +495,7 @@ 
             }
 
             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.');
             }
         }
         // tjekker om der har været nogle fejl i bogføringen
@@ -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;

src/Intraface/modules/accounting/VoucherFile.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
             throw new Exception('VoucherFile:: Voucher ikke gyldig');
         }
         $this->voucher = $voucher;
-        $this->id      = (int) $id;
+        $this->id      = (int)$id;
         $this->error   = new Intraface_Error;
     }
 
@@ -49,10 +49,10 @@ 
 
         $db = new DB_Sql();
         $sql = "SELECT id FROM accounting_voucher_file
-            WHERE intranet_id = " . $this->voucher->year->kernel->intranet->get('id') . "
+            WHERE intranet_id = " . $this->voucher->year->kernel->intranet->get('id')."
                 AND belong_to_key = ".array_search($var['belong_to'], $this->what_can_i_belong_to)."
                 AND belong_to_id = ".$var['belong_to_id']."
-                AND voucher_id = ".$this->voucher->getId() . " AND active = 1";
+                AND voucher_id = ".$this->voucher->getId()." AND active = 1";
         $db->query($sql);
         if ($db->nextRecord()) {
             // hvis filen allerede er tilknyttet lader vi som om alt gik godt, og vi siger go
@@ -62,7 +62,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 ";
             $sql_end = " , date_created = NOW()";
@@ -72,7 +72,7 @@ 
             $var['description'] = '';
         }
 
-        $sql = $sql_type . " accounting_voucher_file SET
+        $sql = $sql_type." accounting_voucher_file SET
             date_updated = NOW(),
             intranet_id = ".$this->voucher->year->kernel->intranet->get('id').",
             voucher_id = ".$this->voucher->get('id').",
@@ -90,14 +90,14 @@ 
     function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_voucher_file SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE accounting_voucher_file SET active = 0 WHERE id = ".$this->id);
         return 1;
     }
 
     function undelete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_voucher_file SET active = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE accounting_voucher_file SET active = 1 WHERE id = ".$this->id);
         return 1;
     }
 

src/Intraface/modules/accounting/YearEnd.php

Spacing +16 added lines, -16 removed lines

@@ -44,7 +44,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM accounting_year_end WHERE year_id = " . $this->year->get('id') . " AND intranet_id =" . $this->year->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM accounting_year_end WHERE year_id = ".$this->year->get('id')." AND intranet_id =".$this->year->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -62,14 +62,14 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = " . $this->year->get('id') . ", intranet_id =" .$this->year->kernel->intranet->get('id'));
+        $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = ".$this->year->get('id').", intranet_id =".$this->year->kernel->intranet->get('id'));
         return true;
     }
 
     function setStep($step)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = " . (int)$step . " WHERE year_id = " . $this->year->get('id'));
+        $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = ".(int)$step." WHERE year_id = ".$this->year->get('id'));
         return true;
     }
 
@@ -80,12 +80,12 @@ 
         switch ($action) {
             // bruges i forbindelse med nulstilling af resultatkontoen
             case 'operating_reset':
-                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id'));
+                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id'));
                 return true;
                 break;
             // bruges i forbindelse med overførelse af kapitalkontoen
             case 'result_account_reset':
-                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id'));
+                $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id'));
                 return true;
                 break;
 
@@ -117,14 +117,14 @@ 
     function deleteStatedAction($id)
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM accounting_year_end_action WHERE id = " . (int)$id);
+        $db->query("DELETE FROM accounting_year_end_action WHERE id = ".(int)$id);
         return true;
     }
 
     function getStatedActions($action)
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = " . $this->year->get('id') . " AND type_key = ".array_search($action, $this->actions)." AND intranet_id = " . $this->year->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = ".$this->year->get('id')." AND type_key = ".array_search($action, $this->actions)." AND intranet_id = ".$this->year->kernel->intranet->get('id'));
         $actions = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -143,7 +143,7 @@ 
     function flushStatement($type)
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = " . $this->year->get('id') . " AND type_key = " . array_search($type, $this->types));
+        $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND type_key = ".array_search($type, $this->types));
         return true;
     }
 
@@ -179,7 +179,7 @@ 
         $db = new DB_Sql;
         $db2 = new DB_Sql;
 
-        $db->query("SELECT id FROM accounting_account WHERE year_id = " .$this->year->get('id'). " AND intranet_id = " . $this->year->kernel->intranet->get('id') . " AND number >= " . $account_start->get('number') . " AND number <= " . $account_end->get('number') . " ORDER BY number ASC");
+        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->year->get('id')." AND intranet_id = ".$this->year->kernel->intranet->get('id')." AND number >= ".$account_start->get('number')." AND number <= ".$account_end->get('number')." ORDER BY number ASC");
 
         while ($db->nextRecord()) {
             $account = new Account($this->year, $db->f('id'));
@@ -187,7 +187,7 @@ 
 
             // vi vender sgu lige fortegnet, så udgifter får negativt fortegn
             // og indtægter positivt fortegn
-            $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = " . $account->get('id') . ", amount = '".-1 * $account->get('saldo')."'");
+            $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = ".$account->get('id').", amount = '".-1*$account->get('saldo')."'");
         }
 
         return true;
@@ -290,7 +290,7 @@ 
                         'debet_account_number' => $debet_account->get('number'),
                         'credit_account_number' => $credit_account->get('number'),
                         'amount' => amountToForm($a['amount']),
-                        'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'),
+                        'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'),
                         'vat_off' => 1
 
                     );
@@ -328,7 +328,7 @@ 
                             'debet_account_number' => $result_account->get('number'),
                             'credit_account_number' => $account->get('number'),
                             'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook
-                            'text' => $account->get('name') . ' til resultatkontoen',
+                            'text' => $account->get('name').' til resultatkontoen',
                             'vat_off' => 1
 
                         );
@@ -340,7 +340,7 @@ 
                             'debet_account_number' => $account->get('number'),
                             'credit_account_number' => $result_account->get('number'),
                             'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook
-                            'text' => $account->get('name') . ' til resultatkontoen',
+                            'text' => $account->get('name').' til resultatkontoen',
                             'vat_off' => 1
                         );
                         $debet_account = $account;
@@ -421,7 +421,7 @@ 
                         'debet_account_number' => $debet_account->get('number'),
                         'credit_account_number' => $credit_account->get('number'),
                         'amount' => amountToForm($a['amount']),
-                        'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'),
+                        'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'),
                         'vat_off' => 1
 
                     );
@@ -456,7 +456,7 @@ 
                         'debet_account_number' => $result_account->get('number'),
                         'credit_account_number' => $capital_account->get('number'),
                         'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook
-                        'text' => $result_account->get('name') . ' nulstilles',
+                        'text' => $result_account->get('name').' nulstilles',
                         'vat_off' => 1
 
                     );
@@ -468,7 +468,7 @@ 
                         'debet_account_number' => $capital_account->get('number'),
                         'credit_account_number' => $result_account->get('number'),
                         'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook
-                        'text' => $result_account->get('name') . ' nulstilles',
+                        'text' => $result_account->get('name').' nulstilles',
                         'vat_off' => 1
                     );
                     $debet_account = $capital_account;

src/Intraface/modules/accounting/Year.php

Spacing +24 added lines, -24 removed lines

@@ -144,7 +144,7 @@ 
                 DATE_FORMAT(to_date, '%d-%m-%Y') AS to_date_dk,
                 last_year_id, from_date, to_date, locked, label, vat
             FROM accounting_year
-            WHERE id = '" . $this->id . "'
+            WHERE id = '" . $this->id."'
                 AND intranet_id = ".$this->kernel->intranet->get('id')."
             LIMIT 1";
 
@@ -212,13 +212,13 @@ 
         }
 
         if ($this->id > 0) {
-            $sql="UPDATE accounting_year ";
-            $sql_after=" WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
+            $sql = "UPDATE accounting_year ";
+            $sql_after = " WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
         } else {
-            $sql="INSERT INTO accounting_year ";
+            $sql = "INSERT INTO accounting_year ";
             $sql_after = ', date_created = NOW()';
         }
-        $sql.=" SET
+        $sql .= " SET
             intranet_id='".$this->kernel->intranet->get('id')."',
             user_id='".$this->kernel->user->get('id')."',
             last_year_id='".$var['last_year_id']."',
@@ -259,7 +259,7 @@ 
     {
         $sql = "SELECT id FROM accounting_year
             WHERE id = ".$this->id."
-                AND intranet_id = ". $this->kernel->intranet->get('id') . " AND active = 1";
+                AND intranet_id = ". $this->kernel->intranet->get('id')." AND active = 1";
 
         $db = new DB_Sql;
         $db->query($sql);
@@ -291,7 +291,7 @@ 
     public function isYearOpen()
     {
         $db = new Db_Sql;
-        $db->query("SELECT locked FROM accounting_year WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id'));
+        $db->query("SELECT locked FROM accounting_year WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             if ($db->f('locked') == 1) {
                 return false;
@@ -316,7 +316,7 @@ 
         $date = safeToDb($date);
 
         $db = new Db_Sql;
-        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . " LIMIT 1");
+        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
         if ($db->nextRecord()) {
             if ($db->f('from_date') <= $date and $date <= $db->f('to_date')) {
                 return true;
@@ -403,7 +403,7 @@ 
 
         if (!empty($balance_accounts) and count($balance_accounts) > 0) {
             foreach ($balance_accounts as $account) {
-                $sql_where .= "id = " . $account . " OR ";
+                $sql_where .= "id = ".$account." OR ";
             }
         }
         // hvis der ikke er nogen balance_accounts skal den ikke v�lge nogen poster
@@ -412,7 +412,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT id FROM accounting_account
             WHERE (".$sql_where.")
-            	AND intranet_id = " . $this->kernel->intranet->get('id') . "
+            	AND intranet_id = " . $this->kernel->intranet->get('id')."
             	AND year_id = " . $this->get('id'));
 
         $accounts = array(); // afstemningskonti
@@ -441,7 +441,7 @@ 
 
     function getSetting($setting)
     {
-        return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
+        return $this->kernel->getSetting()->get('intranet', 'accounting.'.$setting, $this->get('id'));
     }
 
     function createAccounts($type, $last_year_id = 0)
@@ -488,7 +488,7 @@ 
 
                     // settings
                     if (!empty($input['setting'])) {
-                        $this->setSetting($input['setting'] . '_account_id', $id);
+                        $this->setSetting($input['setting'].'_account_id', $id);
                     }
                     if (!empty($input['balance_account']) and $input['balance_account'] == 1) {
                         $balance_accounts[] = $id;
@@ -569,7 +569,7 @@ 
 
                 if (is_array($balance_accounts)) {
                     foreach ($balance_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_balance_accounts[] = $db->f('id');
                         }
@@ -584,7 +584,7 @@ 
 
                 if (is_array($buy_eu_accounts)) {
                     foreach ($buy_eu_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_eu_accounts[] = $db->f('id');
                         }
@@ -599,7 +599,7 @@ 
 
                 if (is_array($buy_abroad_accounts)) {
                     foreach ($buy_abroad_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_abroad_accounts[] = $db->f('id');
                         }
@@ -748,7 +748,7 @@ 
     {
         $account_id = $from_year->getSetting($setting);
         $db = new DB_Sql;
-        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . $account_id);
+        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".$account_id);
         if ($db->nextRecord()) {
             $this->setSetting($setting, $db->f('id'));
         }
@@ -826,9 +826,9 @@ 
         }
         $db = new DB_Sql;
         $sql = "SELECT id FROM debtor
-            WHERE type= " . $type_key . "
-                AND intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (this_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE type= " . $type_key."
+                AND intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (this_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -842,8 +842,8 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM invoice_payment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (payment_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (payment_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0";
         $db->query($sql);
         if ($db->numRows() == 0) {
@@ -856,8 +856,8 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM procurement
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (invoice_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (invoice_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -870,7 +870,7 @@ 
     function lock()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = ".$this->id);
         return true;
     }
 

src/Intraface/modules/accounting/Controller/templates/vat/show.tpl.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
     <?php echo $context->getError()->view(); ?>
 
     <?php if ($context->getVatPeriod()->get('status') == 'stated') : ?>
-        <p class="message">Denne momsopgivelse er bogført. <a href="<?php e(url('../../voucher/' . $context->getVatPeriod()->get('voucher_id'))); ?>">Se bilag</a></p>
+        <p class="message">Denne momsopgivelse er bogført. <a href="<?php e(url('../../voucher/'.$context->getVatPeriod()->get('voucher_id'))); ?>">Se bilag</a></p>
     <?php endif; ?>
 
     <?php if (!$context->getVatPeriod()->compareAmounts() and $context->getVatPeriod()->get('status_key') > 0) : // beløb skal vøre gemt ?>
@@ -45,22 +45,22 @@ 
     </thead>
     <tbody>
         <tr class="vat-sale">
-            <td><a href="<?php e(url('../../account/' . $account_vat_out->get('id'))); ?>"><?php e($account_vat_out->get('number')); ?></a></td>
+            <td><a href="<?php e(url('../../account/'.$account_vat_out->get('id'))); ?>"><?php e($account_vat_out->get('number')); ?></a></td>
             <td><?php e($account_vat_out->get('name')); ?></td>
             <td></td>
-            <td class="amount debet"><?php e(amountToOutput($account_vat_out->get('saldo') * -1)); ?></td>
+            <td class="amount debet"><?php e(amountToOutput($account_vat_out->get('saldo')*-1)); ?></td>
         </tr>
         <tr class="vat-sale">
-            <td><a href="<?php e(url('../../account/' . $account_vat_abroad->get('id'))); ?>"><?php e($account_vat_abroad->get('number')); ?></a></td>
+            <td><a href="<?php e(url('../../account/'.$account_vat_abroad->get('id'))); ?>"><?php e($account_vat_abroad->get('number')); ?></a></td>
             <td><?php e($account_vat_abroad->get('name')); ?></td>
             <td></td>
-            <td class="amount debet"><?php e(amountToOutput($account_vat_abroad->get('saldo') * -1)); ?></td>
+            <td class="amount debet"><?php e(amountToOutput($account_vat_abroad->get('saldo')*-1)); ?></td>
         </tr>
         <tr class="headline">
             <td colspan="6"><h3>Fradrag</h3></td>
         </tr>
         <tr class="vat-buy">
-            <td><a href="<?php e(url('../../account/' . $account_vat_in->get('id'))); ?>"><?php e($account_vat_in->get('number')); ?></a></td>
+            <td><a href="<?php e(url('../../account/'.$account_vat_in->get('id'))); ?>"><?php e($account_vat_in->get('number')); ?></a></td>
             <td><?php e($account_vat_in->get('name')); ?></td>
             <td class="amount debet"><?php e(amountToOutput($account_vat_in->get('saldo'))); ?></td>
             <td></td>

src/Intraface/modules/accounting/Controller/templates/year/end.tpl.php

Spacing +6 added lines, -6 removed lines

@@ -52,9 +52,9 @@ 
         foreach ($vat_periods as $period) {
             $vat_period = new VatPeriod($context->getYear(), $period['id']);
             if (!$vat_period->get('voucher_id')) {
-                echo '<p class="warning">Momsperiode ' . $vat_period->get('label') . ' er ikke bogført. <a href="'.url('../vat/' . $vat_period->get('id')).'">Fix it at the vat period</a>.</p>';
+                echo '<p class="warning">Momsperiode '.$vat_period->get('label').' er ikke bogført. <a href="'.url('../vat/'.$vat_period->get('id')).'">Fix it at the vat period</a>.</p>';
             } elseif (!$context->getVatPeriod()->compareAmounts()) {
-                echo '<p class="warning">Momsperiode ' . $vat_period->get('label') . ' stemmer ikke. <a href="'.url('../vat/' . $vat_period->get('id')).'">Fix it at the vat period</a>.</p>';
+                echo '<p class="warning">Momsperiode '.$vat_period->get('label').' stemmer ikke. <a href="'.url('../vat/'.$vat_period->get('id')).'">Fix it at the vat period</a>.</p>';
             }
         }
         ?>
@@ -105,7 +105,7 @@ 
             <select id="result_account" name="result_account_id">
                 <option value=""><?php e(t('Choose')); ?></option>
                 <?php foreach ($status_accounts as $a) { ?>
-                    <option value="<?php e($a['id']); ?>"<?php if ($context->getYear()->getSetting('result_account_id')==$a['id']) {
+                    <option value="<?php e($a['id']); ?>"<?php if ($context->getYear()->getSetting('result_account_id') == $a['id']) {
                         echo ' selected="selected"';
 } ?>><?php e($a['number']); ?> <?php e($a['name']); ?></option>
                 <?php } ?>
@@ -132,7 +132,7 @@ 
         <tbody>
         <?php foreach ($context->getAccount()->getList('drift', true) as $a) : ?>
             <tr>
-                <td><a href="<?php e(url('../../../../account/' . $a['id'])); ?>"><?php e($a['number']); ?></a></td>
+                <td><a href="<?php e(url('../../../../account/'.$a['id'])); ?>"><?php e($a['number']); ?></a></td>
                 <td><?php e($a['name']); ?></td>
                 <td><?php e(amountToOutput($a['debet'])); ?></td>
                 <td><?php e(amountToOutput($a['credit'])); ?></td>
@@ -181,7 +181,7 @@ 
         </fieldset>
 
         <ul class="options">
-            <li><a class="excel" href="<?php e(url(null) . '.xls'); ?>">Excel</a></li>
+            <li><a class="excel" href="<?php e(url(null).'.xls'); ?>">Excel</a></li>
         </ul>
         <table>
             <caption>Resultatopgørelse</caption>
@@ -339,7 +339,7 @@ 
             <fieldset>
                 <legend>Trin 8: Fyraften</legend>
                 <p>Det er godt arbejde. Nu har du fortjent en pause. Håber ikke det var for vanskeligt. Vi hører naturligvis altid gerne om dine oplevelser med programmet, så vi kan forbedre det mest muligt.</p>
-                <p><a class="excel" href="<?php e(url(null) . '.xls'); ?>">Hent årsregnskabet i et regneark</a></p>
+                <p><a class="excel" href="<?php e(url(null).'.xls'); ?>">Hent årsregnskabet i et regneark</a></p>
                 <input type="submit" value="Forrige" name="previous" />
             </fieldset>
         <?php