intraface / intraface.dk

src/Intraface/modules/newsletter/Controller/Subscribers.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 
         }*/
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/subscribers');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/subscribers');
         return $smarty->render($this);
     }
 

src/Intraface/modules/newsletter/Controller/Send.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         $module = $this->getKernel()->module("newsletter");
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/send');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/send');
         return $smarty->render($this);
     }
 

src/Intraface/modules/accounting/VatPeriodGateway.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 
     public function __construct($year_object)
     {
-        $this->year  = $year_object;
+        $this->year = $year_object;
     }
 
     /**
@@ -19,7 +19,7 @@ 
     public function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE year_id = " . $this->year->get('id') . " AND intranet_id=" . $this->year->kernel->intranet->get('id') . " AND active = 1 ORDER BY date_start ASC");
+        $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE year_id = ".$this->year->get('id')." AND intranet_id=".$this->year->kernel->intranet->get('id')." AND active = 1 ORDER BY date_start ASC");
         $i   = 0;
         $vat = array();
         while ($db->nextRecord()) {
@@ -41,7 +41,7 @@ 
     public function arePeriodsCreated()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM accounting_vat_period WHERE year_id = " . $this->year->get('id') . " AND intranet_id=" . $this->year->kernel->intranet->get('id'). " AND active=1");
+        $db->query("SELECT id FROM accounting_vat_period WHERE year_id = ".$this->year->get('id')." AND intranet_id=".$this->year->kernel->intranet->get('id')." AND active=1");
         return $db->numRows();
     }
 
@@ -119,8 +119,8 @@ 
         foreach ($periods['periods'] as $key => $value) {
             $input = array(
                 'label'      => $value['name'],
-                'date_start' => $this->year->get('year') . '-' . $value['date_from'],
-                'date_end'   => $this->year->get('year') . '-' . $value['date_to'],
+                'date_start' => $this->year->get('year').'-'.$value['date_from'],
+                'date_end'   => $this->year->get('year').'-'.$value['date_to'],
             );
             $vatperiod = $this->findFromId();
             $vatperiod->save($input, 'insert');
@@ -131,7 +131,7 @@ 
 
     function findFromId($id = 0)
     {
-        require_once dirname(__FILE__) . '/VatPeriod.php';
+        require_once dirname(__FILE__).'/VatPeriod.php';
         return new VatPeriod($this->year);
     }
 }

src/Intraface/modules/accounting/standardaccounts.php

Spacing +109 added lines, -109 removed lines

@@ -23,52 +23,52 @@ 
 
 $i++;
 
-$standardaccounts[$i]['number']     = '1110';
-$standardaccounts[$i]['name']           = 'Salg med moms';
+$standardaccounts[$i]['number'] = '1110';
+$standardaccounts[$i]['name'] = 'Salg med moms';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '2';
-$standardaccounts[$i]['vat_key']    = '2';
+$standardaccounts[$i]['vat_key'] = '2';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '1120';
-$standardaccounts[$i]['name']           = 'Salg uden moms';
+$standardaccounts[$i]['number'] = '1120';
+$standardaccounts[$i]['name'] = 'Salg uden moms';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '2';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
 $standardaccounts[$i]['number']     = '1990';
-$standardaccounts[$i]['name']           = 'Nettoomsætning';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Nettoomsætning';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '2';
 $standardaccounts[$i]['sum_to']     = '1989';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
 /**********************************************/
 
-$standardaccounts[$i]['number']     = '2000';
-$standardaccounts[$i]['name']           = 'Udgifter';
+$standardaccounts[$i]['number'] = '2000';
+$standardaccounts[$i]['name'] = 'Udgifter';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '2100';
-$standardaccounts[$i]['name']           = 'Vareforbrug fra varelager';
+$standardaccounts[$i]['number'] = '2100';
+$standardaccounts[$i]['name'] = 'Vareforbrug fra varelager';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '4100';
-$standardaccounts[$i]['name']           = 'EU-purchases';
+$standardaccounts[$i]['number'] = '4100';
+$standardaccounts[$i]['name'] = 'EU-purchases';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
 $standardaccounts[$i]['vat_key']    = '0';
@@ -76,154 +76,154 @@ 
 
 $i++;
 
-$standardaccounts[$i]['number']     = '4700';
-$standardaccounts[$i]['name']           = 'Varekøb uden for EU';
+$standardaccounts[$i]['number'] = '4700';
+$standardaccounts[$i]['name'] = 'Varekøb uden for EU';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '0';
-$standardaccounts[$i]['buy_abroad']     = 1;
+$standardaccounts[$i]['vat_key'] = '0';
+$standardaccounts[$i]['buy_abroad'] = 1;
 
 $i++;
 
 $standardaccounts[$i]['number']     = '4990';
-$standardaccounts[$i]['name']           = 'Dækningsbidrag';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Dækningsbidrag';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '1';
 $standardaccounts[$i]['sum_to']     = '4989';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
 $standardaccounts[$i]['number']     = '7000';
-$standardaccounts[$i]['name']           = 'Kontorartikler';
+$standardaccounts[$i]['name'] = 'Kontorartikler';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['vat_key']    = '1';
 $standardaccounts[$i]['use_key']            = '3';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7200';
-$standardaccounts[$i]['name']           = 'Porto';
+$standardaccounts[$i]['number'] = '7200';
+$standardaccounts[$i]['name'] = 'Porto';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7400';
-$standardaccounts[$i]['name']           = 'Småanskaffelser';
+$standardaccounts[$i]['number'] = '7400';
+$standardaccounts[$i]['name'] = 'Småanskaffelser';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '1';
+$standardaccounts[$i]['vat_key'] = '1';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7600';
-$standardaccounts[$i]['name']           = 'Telefon';
+$standardaccounts[$i]['number'] = '7600';
+$standardaccounts[$i]['name'] = 'Telefon';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '1';
+$standardaccounts[$i]['vat_key'] = '1';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7650';
-$standardaccounts[$i]['name']           = 'Internet og webhotel';
+$standardaccounts[$i]['number'] = '7650';
+$standardaccounts[$i]['name'] = 'Internet og webhotel';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '1';
+$standardaccounts[$i]['vat_key'] = '1';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7800';
-$standardaccounts[$i]['name']           = 'Diverse incl. moms';
+$standardaccounts[$i]['number'] = '7800';
+$standardaccounts[$i]['name'] = 'Diverse incl. moms';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '1';
+$standardaccounts[$i]['vat_key'] = '1';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '7900';
-$standardaccounts[$i]['name']           = 'Diverse excl. moms';
+$standardaccounts[$i]['number'] = '7900';
+$standardaccounts[$i]['name'] = 'Diverse excl. moms';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '3';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
 
 $standardaccounts[$i]['number']     = '39990';
-$standardaccounts[$i]['name']           = 'Resultat før renter';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Resultat før renter';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '1';
 $standardaccounts[$i]['sum_to']     = '39989';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
 /**********************************************/
 
-$standardaccounts[$i]['number']     = '40000';
-$standardaccounts[$i]['name']           = 'Finansieringsindtægter';
+$standardaccounts[$i]['number'] = '40000';
+$standardaccounts[$i]['name'] = 'Finansieringsindtægter';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 
 $i++;
 
-$standardaccounts[$i]['number']     = '41000';
-$standardaccounts[$i]['name']           = 'Renteindtægter';
+$standardaccounts[$i]['number'] = '41000';
+$standardaccounts[$i]['name'] = 'Renteindtægter';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '43000';
-$standardaccounts[$i]['name']           = 'Finansieringsudgifter';
+$standardaccounts[$i]['number'] = '43000';
+$standardaccounts[$i]['name'] = 'Finansieringsudgifter';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
-$standardaccounts[$i]['number']     = '43100';
-$standardaccounts[$i]['name']           = 'Renteudgifter';
+$standardaccounts[$i]['number'] = '43100';
+$standardaccounts[$i]['name'] = 'Renteudgifter';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
 
-$standardaccounts[$i]['number']     = '43850';
-$standardaccounts[$i]['name']           = 'Bankgebyr';
+$standardaccounts[$i]['number'] = '43850';
+$standardaccounts[$i]['name'] = 'Bankgebyr';
 $standardaccounts[$i]['type_key']           = '2';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['vat_key']    = '0';
+$standardaccounts[$i]['vat_key'] = '0';
 
 $i++;
 
 $standardaccounts[$i]['number']     = '43990';
-$standardaccounts[$i]['name']           = 'Finansieringsudgifter';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Finansieringsudgifter';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '43000';
 $standardaccounts[$i]['sum_to']     = '43995';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
 $standardaccounts[$i]['number']     = '49990';
-$standardaccounts[$i]['name']           = 'Periodens resultat';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Periodens resultat';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '1';
 $standardaccounts[$i]['sum_to']     = '43989';
-$standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['result_account_id_end']          = true;
+$standardaccounts[$i]['use_key'] = '1';
+$standardaccounts[$i]['result_account_id_end'] = true;
 
 
 $i++;
@@ -231,18 +231,18 @@ 
 /**********************************************/
 
 $standardaccounts[$i]['number']     = '50000';
-$standardaccounts[$i]['name']           = 'Balance';
+$standardaccounts[$i]['name'] = 'Balance';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['balance_account_id_start']           = true;
+$standardaccounts[$i]['balance_account_id_start'] = true;
 
 $i++;
 
 /**********************************************/
 
 $standardaccounts[$i]['number']     = '50010';
-$standardaccounts[$i]['name']           = 'Aktiver';
+$standardaccounts[$i]['name'] = 'Aktiver';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -251,7 +251,7 @@ 
 
 
 $standardaccounts[$i]['number']     = '50800';
-$standardaccounts[$i]['name']           = 'Driftssmidler';
+$standardaccounts[$i]['name'] = 'Driftssmidler';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '1';
 $standardaccounts[$i]['use_key']            = '1';
@@ -259,7 +259,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '50810';
-$standardaccounts[$i]['name']           = 'Tilgang i årets løb';
+$standardaccounts[$i]['name'] = 'Tilgang i årets løb';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '1';
 $standardaccounts[$i]['use_key']            = '1';
@@ -267,7 +267,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '50820';
-$standardaccounts[$i]['name']           = 'Afgang i året';
+$standardaccounts[$i]['name'] = 'Afgang i året';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '2';
 $standardaccounts[$i]['use_key']            = '1';
@@ -275,7 +275,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '50830';
-$standardaccounts[$i]['name']           = 'Akkumulerede afskrivning på driftssmidler';
+$standardaccounts[$i]['name'] = 'Akkumulerede afskrivning på driftssmidler';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -284,7 +284,7 @@ 
 
 
 $standardaccounts[$i]['number']     = '55100';
-$standardaccounts[$i]['name']           = 'Varelager';
+$standardaccounts[$i]['name'] = 'Varelager';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '1';
 $standardaccounts[$i]['use_key']            = '1';
@@ -292,7 +292,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '56100';
-$standardaccounts[$i]['name']           = 'Debitor';
+$standardaccounts[$i]['name'] = 'Debitor';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '4';
@@ -302,40 +302,40 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '58000';
-$standardaccounts[$i]['name']           = 'Bank, folio';
+$standardaccounts[$i]['name'] = 'Bank, folio';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '4';
-$standardaccounts[$i]['balance_account']            = 1;
+$standardaccounts[$i]['balance_account'] = 1;
 
 $i++;
 
 $standardaccounts[$i]['number']     = '58200';
-$standardaccounts[$i]['name']           = 'Kassen';
+$standardaccounts[$i]['name'] = 'Kassen';
 $standardaccounts[$i]['type_key']           = '3';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '4';
-$standardaccounts[$i]['balance_account']            = 1;
+$standardaccounts[$i]['balance_account'] = 1;
 
 $i++;
 
 $standardaccounts[$i]['number']     = '58990';
-$standardaccounts[$i]['name']           = 'Likvide beholdninger';
-$standardaccounts[$i]['type_key']           = '3';
+$standardaccounts[$i]['name'] = 'Likvide beholdninger';
+$standardaccounts[$i]['type_key'] = '3';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '58000';
 $standardaccounts[$i]['sum_to']     = '58995';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
 $standardaccounts[$i]['number']     = '58995';
-$standardaccounts[$i]['name']           = 'Aktiver i alt';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Aktiver i alt';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '50000';
 $standardaccounts[$i]['sum_to']     = '58995';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;
 
@@ -343,7 +343,7 @@ 
 /**********************************************/
 
 $standardaccounts[$i]['number']     = '60000';
-$standardaccounts[$i]['name']           = 'Passiver';
+$standardaccounts[$i]['name'] = 'Passiver';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -351,7 +351,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '60500';
-$standardaccounts[$i]['name']           = 'Kapitalkonto';
+$standardaccounts[$i]['name'] = 'Kapitalkonto';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -360,7 +360,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '60800';
-$standardaccounts[$i]['name']           = 'Årets resultat';
+$standardaccounts[$i]['name'] = 'Årets resultat';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -369,7 +369,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '61000';
-$standardaccounts[$i]['name']           = 'Privatkonto';
+$standardaccounts[$i]['name'] = 'Privatkonto';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -378,7 +378,7 @@ 
 
 
 $standardaccounts[$i]['number']     = '63100';
-$standardaccounts[$i]['name']           = 'Kortfristet gæld';
+$standardaccounts[$i]['name'] = 'Kortfristet gæld';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -386,7 +386,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '65100';
-$standardaccounts[$i]['name']           = 'Langfristet gæld';
+$standardaccounts[$i]['name'] = 'Langfristet gæld';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -397,7 +397,7 @@ 
 /**********************************************/
 
 $standardaccounts[$i]['number']     = '66000';
-$standardaccounts[$i]['name']           = 'Momskonti';
+$standardaccounts[$i]['name'] = 'Momskonti';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -405,7 +405,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '66100';
-$standardaccounts[$i]['name']           = 'Moms, indgående, køb';
+$standardaccounts[$i]['name'] = 'Moms, indgående, køb';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -414,7 +414,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '66150';
-$standardaccounts[$i]['name']           = 'Moms af varekøb i udlandet';
+$standardaccounts[$i]['name'] = 'Moms af varekøb i udlandet';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -423,7 +423,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '66200';
-$standardaccounts[$i]['name']           = 'Moms, udgående, salg';
+$standardaccounts[$i]['name'] = 'Moms, udgående, salg';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -432,7 +432,7 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '66900';
-$standardaccounts[$i]['name']           = 'Moms, tilsvar';
+$standardaccounts[$i]['name'] = 'Moms, tilsvar';
 $standardaccounts[$i]['type_key']           = '4';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -441,30 +441,30 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '66990';
-$standardaccounts[$i]['name']           = 'Passiver i alt';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Passiver i alt';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '60000';
 $standardaccounts[$i]['sum_to']     = '70000';
-$standardaccounts[$i]['use_key']            = '1';
-$standardaccounts[$i]['balance_account_id_end']             = true;
+$standardaccounts[$i]['use_key'] = '1';
+$standardaccounts[$i]['balance_account_id_end'] = true;
 
 
 $i++;
 
 $standardaccounts[$i]['number']     = '98000';
-$standardaccounts[$i]['name']           = 'Balancen i alt';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Balancen i alt';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '50000';
 $standardaccounts[$i]['sum_to']     = '97999';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 
 $i++;
 
 $standardaccounts[$i]['number']     = '99000';
-$standardaccounts[$i]['name']           = 'Kontrol';
+$standardaccounts[$i]['name'] = 'Kontrol';
 $standardaccounts[$i]['type_key']           = '1';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['use_key']            = '1';
@@ -473,11 +473,11 @@ 
 $i++;
 
 $standardaccounts[$i]['number']     = '99990';
-$standardaccounts[$i]['name']           = 'Balancekontrol';
-$standardaccounts[$i]['type_key']           = '5';
+$standardaccounts[$i]['name'] = 'Balancekontrol';
+$standardaccounts[$i]['type_key'] = '5';
 $standardaccounts[$i]['vat_key']    = '0';
 $standardaccounts[$i]['sum_from']   = '1';
 $standardaccounts[$i]['sum_to']     = '99990';
-$standardaccounts[$i]['use_key']            = '1';
+$standardaccounts[$i]['use_key'] = '1';
 
 $i++;

src/Intraface/modules/accounting/VatPeriod.php

Indentation +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
         $var['amount'] = abs(round($this->get('saldo_vat_in')));
 
         if (!$voucher->saveInDaybook($var, $skip_daybook)) {
-             $this->error->set('Systemet kunne ikke opdatere indgående moms');
+                $this->error->set('Systemet kunne ikke opdatere indgående moms');
         }
 
         if ($this->error->isError()) {

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
     public function __construct($year_object, $id = 0)
     {
         $this->year  = $year_object;
-        $this->id    = (int) $id;
+        $this->id    = (int)$id;
         $this->error = new Intraface_Error;
         if ($this->id > 0) {
             $this->load();
@@ -27,7 +27,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE id = " . $this->id . " AND intranet_id = " . $this->year->kernel->intranet->get('id'));
+        $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id'));
 
         if (!$db->nextRecord()) {
             return false;
@@ -51,7 +51,7 @@ 
     public function isStated()
     {
         $db = new DB_Sql;
-        $db->query("SELECT status FROM accounting_vat_period WHERE status = 2 AND id = " . $this->id . " AND intranet_id=" . $this->year->kernel->intranet->get('id'). " AND active = 1");
+        $db->query("SELECT status FROM accounting_vat_period WHERE status = 2 AND id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id')." AND active = 1");
         if ($db->nextRecord()) {
             return $db->numRows();
         }
@@ -84,15 +84,15 @@ 
             return 0;
         }
         $db = new DB_Sql;
-        if ($this->id == 0 or $type=='insert') {
+        if ($this->id == 0 or $type == 'insert') {
             $sql_type = "INSERT INTO ";
             $sql_end  = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end  = " WHERE id = " . $this->id;
+            $sql_end  = " WHERE id = ".$this->id;
         }
 
-        $sql = $sql_type . "accounting_vat_period SET user_id = ".$this->year->kernel->user->get('id').", label = '".$input['label']."', date_start = '".$input['date_start']."', date_end='".$input['date_end']."', date_updated=NOW(), intranet_id=".$this->year->kernel->intranet->get('id').", year_id=".$this->year->get('id')."" . $sql_end;
+        $sql = $sql_type."accounting_vat_period SET user_id = ".$this->year->kernel->user->get('id').", label = '".$input['label']."', date_start = '".$input['date_start']."', date_end='".$input['date_end']."', date_updated=NOW(), intranet_id=".$this->year->kernel->intranet->get('id').", year_id=".$this->year->get('id')."".$sql_end;
 
         $db->query($sql);
 
@@ -112,7 +112,7 @@ 
     protected function setStated($voucher_id)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_vat_period SET voucher_id = '".(int)$voucher_id."', status = 2 WHERE id = ".$this->id." AND intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id=". $this->year->get('id'));
+        $db->query("UPDATE accounting_vat_period SET voucher_id = '".(int)$voucher_id."', status = 2 WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id=".$this->year->get('id'));
         return true;
     }
 
@@ -126,7 +126,7 @@ 
             $this->error->set('Du kan ikke slette en periode, der er bogf�rt');
             return false;
         }
-        $db->query("UPDATE accounting_vat_period SET active = 0, date_updated = NOW() WHERE id = " . $this->id . " AND intranet_id = " . $this->year->kernel->intranet->get('id'));
+        $db->query("UPDATE accounting_vat_period SET active = 0, date_updated = NOW() WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id'));
         return true;
     }
 
@@ -147,7 +147,7 @@ 
 
         // ganges med -1 for at få rigtigt fortegn til udregning
         $this->value['saldo_vat_out'] = $account_vat_in->get('saldo');
-        $saldo_total += -1 * $this->value['saldo_vat_out']; // total
+        $saldo_total += -1*$this->value['saldo_vat_out']; // total
 
         // Moms af varekøb i udlandet
         // Dette beløb er et udregnet beløb, som udregnes under bogføringen
@@ -157,7 +157,7 @@ 
 
         // ganges med -1 for at få rigtigt fortegn til udregning
         $this->value['saldo_vat_abroad'] = $account_vat_abroad->get('saldo');
-        $saldo_total += -1 * $this->value['saldo_vat_abroad'];
+        $saldo_total += -1*$this->value['saldo_vat_abroad'];
 
         // Købsmoms
         // Købsmomsen inkluderer også den udregnede moms af moms af varekøb i udlandet.
@@ -288,7 +288,7 @@ 
 
         $voucher_file = new VoucherFile($voucher);
         if (!$voucher_file->save(array(
-            'description' => 'Momsafregning ' . $this->get('date_start_dk') . ' til ' . $this->get('date_end_dk'),
+            'description' => 'Momsafregning '.$this->get('date_start_dk').' til '.$this->get('date_end_dk'),
             'belong_to' => 'vat',
             'belong_to_id' => $this->getId()))) {
             $this->error->merge($voucher_file->error->getMessage());

src/Intraface/modules/accounting/include_frontpage.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 if (count($year->getList()) == 0) :
     $_advice[] = array(
         'msg' => 'no accounting year has been created',
-        'link' => $year_module->getPath() . 'year?create',
+        'link' => $year_module->getPath().'year?create',
         'module' => $year_module->getName()
     );
 endif;

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/Controller/templates/vat/period.tpl.php

Braces +5 added lines, -2 removed lines

@@ -28,9 +28,12 @@
             <input type="submit" value="Opret perioder" name="create_periods" />
         </fieldset>
     </form>
-<?php else : ?>
+<?php else {
+    : ?>
     <table>
-    <caption>Momsperioder i perioden <?php e($context->getYear()->get('from_date_dk')); ?> til <?php e($context->getYear()->get('to_date_dk')); ?></caption>
+    <caption>Momsperioder i perioden <?php e($context->getYear()->get('from_date_dk'));
+}
+?> til <?php e($context->getYear()->get('to_date_dk')); ?></caption>
     <thead>
         <tr>
             <th>Periode</th>

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>

Braces +10 added lines, -4 removed lines

@@ -6,9 +6,12 @@ 
 
 <?php if (!$context->getYear()->vatAccountIsSet()) : ?>
     <p class="message-dependent">Der er ikke angivet nogen momskonti. Du kan angive momskonti under <a href="<?php e(url('../../settings')); ?>">indstillingerne</a>.</p>
-<?php else : ?>
+<?php else {
+    : ?>
 
-    <?php echo $context->getError()->view(); ?>
+    <?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>
@@ -108,9 +111,12 @@ 
                 <?php if ($context->getVatPeriod()->get('status') == 'stated') : ?>
                     <label for="voucher_number">Bilagsnummer</label> <input type="text" name="voucher_number" id="voucher_number" value="<?php e($context->getVatPeriod()->get('voucher_number')); ?>" /> Perioden er tidligere bogført på dette bilag
                 </div>
-                <?php else : ?>
+                <?php else {
+    : ?>
                 <div class="formrow">
-                    <label for="voucher_number">Bilagsnummer</label> <input type="text" name="voucher_number" id="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1); ?>" />
+                    <label for="voucher_number">Bilagsnummer</label> <input type="text" name="voucher_number" id="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1);
+}
+?>" />
                 </div>
                 <?php endif; ?>
                 <div style="clear:both;">