intraface / intraface.dk

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

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

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@
                 echo ' checked="checked"';
 } ?>/></td>
             <td><a href="<?php e(url($y['id'])); ?>"><?php e($y['label']); ?></a></td>
-            <td><a href="<?php e(url($y['id'] . '/vat')); ?>"><?php e(t('Vat')); ?></a></td>
-            <td><a href="<?php e(url($y['id'] . '/end')); ?>"><?php e(t('End year')); ?></a></td>            
+            <td><a href="<?php e(url($y['id'].'/vat')); ?>"><?php e(t('Vat')); ?></a></td>
+            <td><a href="<?php e(url($y['id'].'/end')); ?>"><?php e(t('End year')); ?></a></td>            
             <td class="options">
-                <a class="edit" href="<?php e(url($y['id'] . '/edit')); ?>"><?php e(t('Edit')); ?></a>
+                <a class="edit" href="<?php e(url($y['id'].'/edit')); ?>"><?php e(t('Edit')); ?></a>
             </td>
         </tr>
         <?php endforeach; ?>

src/Intraface/modules/accounting/Controller/templates/state.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 <tbody>
     <?php foreach ($context->getAccounts() as $account) { ?>
     <tr>
-        <td><a href="<?php e(url('../../account/' . $account['id'])); ?>"><?php e($account['number']); ?></a></td>
+        <td><a href="<?php e(url('../../account/'.$account['id'])); ?>"><?php e($account['number']); ?></a></td>
         <td><?php e($account['name']); ?></td>
         <td class="amount"><?php e(amountToOutput($account['saldo_primo'])); ?></td>
         <td class="amount"><?php e(amountToOutput($account['saldo_draft'])); ?></td>

src/Intraface/modules/accounting/Controller/templates/account/popup.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 <?php else : ?>
                     <tr>
                         <th><?php e($account['number']); ?></th>
-                        <td><?php e($account['name']);  ?></td>
+                        <td><?php e($account['name']); ?></td>
                     </tr>
                 <?php endif; ?>
             <?php endforeach; ?>

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

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
                     e($post['dk_date']);
 } ?></td>
                 <td><?php if (isset($post['voucher_id'])) :
-?><a href="<?php e(url('../../voucher/' . $post['voucher_id'])); ?>"><?php e($post['voucher_number']); ?></a><?php
+?><a href="<?php e(url('../../voucher/'.$post['voucher_id'])); ?>"><?php e($post['voucher_number']); ?></a><?php
 endif; ?></td>
                 <td><?php e($post['text']); ?></td>
                 <td class="amount"><?php e(amountToOutput($post['debet'])); ?></td>

src/Intraface/modules/accounting/Controller/templates/account/index.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 
 <ul class="options">
     <li><a href="<?php e(url(null, array('create'))); ?>">Opret konto</a></li>
-    <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>
     <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
 </ul>
 <?php
@@ -30,7 +30,7 @@ 
 <?php if (count($accounts) == 0) : ?>
     <div class="message-dependent">
         <p>Der er endnu ikke oprettet nogen konti.</p>
-        <p>Du kan oprette en standardkontoplan under <a href="<?php e(url('../year/' . $year->get('id'))); ?>">regnskabsåret</a>, eller du kan taste dem manuelt ind ved at klikke på opret konto ovenfor.</p>
+        <p>Du kan oprette en standardkontoplan under <a href="<?php e(url('../year/'.$year->get('id'))); ?>">regnskabsåret</a>, eller du kan taste dem manuelt ind ved at klikke på opret konto ovenfor.</p>
     </div>
 <?php else : ?>
 <table>
@@ -64,7 +64,7 @@ 
                 <td colspan="4" class="headline"><?php e($account['name']); ?></td>
             <?php elseif ($account['type'] == 'sum') : ?>
                 <td><?php e($account['name']); ?><?php if ($account['type'] == 'sum') {
-                    e(' ('. $account["sum_from"] . ' til ' . $account["sum_to"] . ')');
+                    e(' ('.$account["sum_from"].' til '.$account["sum_to"].')');
 } ?></td>
             <?php else :?>
                 <td><a href="<?php e(url($account['id'])); ?>"><?php e($account['name']); ?></a></td>

src/Intraface/modules/accounting/Controller/templates/search.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -86,8 +86,8 @@
     <?php foreach ($posts as $post) { ?>
     <tr>
         <td><?php e($post['date_dk']); ?></td>
-        <td><a href="<?php e('../voucher/' . $post['voucher_id']); ?>"><?php e($post['voucher_number']); ?></a></td>
-        <td><?php e($post['account_number']) . ' ' . e($post['account_name']); ?></td>
+        <td><a href="<?php e('../voucher/'.$post['voucher_id']); ?>"><?php e($post['voucher_number']); ?></a></td>
+        <td><?php e($post['account_number']).' '.e($post['account_name']); ?></td>
         <td><?php e(amountToOutput($post['debet'])); ?></td>
         <td><?php e(amountToOutput($post['credit'])); ?></td>
     </tr>