intraface / intraface.dk

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

Spacing +2 added lines, -2 removed lines

@@ -33,13 +33,13 @@
             <td><input type="checkbox" name="selected[]" value="<?php e($post['id']); ?>" /></td>
             <td><?php e($post['date_dk']); ?></td>
             <td><?php e($post['text']); ?></td>
-            <td><a href="<?php e(url('../../accounts/' . $post['account_id'])); ?>"><?php e($post['account_name']); ?></a></td>
+            <td><a href="<?php e(url('../../accounts/'.$post['account_id'])); ?>"><?php e($post['account_name']); ?></a></td>
             <td class="amount"><?php e(amountToOutput($post['debet'])); ?></td>
             <td class="amount"><?php e(amountToOutput($post['credit'])); ?></td>
             <td class="options">
                 <?php if ($post['stated'] == 0) :
                     $not_all_stated = true; ?>
-                <a class="edit" href="<?php e(url('post/'. $post['id'], array('edit'))); ?>">Ret</a>
+                <a class="edit" href="<?php e(url('post/'.$post['id'], array('edit'))); ?>">Ret</a>
                 <a class="delete" href="<?php e(url('post/'.$post['id'], array('delete'))); ?>">Slet</a>
                 <?php else : ?>
                 Bogført

Braces +10 added lines, -4 removed lines

@@ -13,8 +13,11 @@ 
 
 <?php if (count($context->getPosts()) == 0) : ?>
     <p class="warning">Der er ikke nogen poster på bilaget. <a href="<?php e(url('../post?create', array('voucher_id' => $context->getVoucher()->get('id')))); ?>">Indtast poster</a>.</p>
-<?php else : ?>
-    <form action="<?php e(url(null)); ?>" method="post">
+<?php else {
+    : ?>
+    <form action="<?php e(url(null));
+}
+?>" method="post">
     <table>
         <caption>Poster</caption>
         <thead>
@@ -41,9 +44,12 @@ 
                     $not_all_stated = true; ?>
                 <a class="edit" href="<?php e(url('post/'. $post['id'], array('edit'))); ?>">Ret</a>
                 <a class="delete" href="<?php e(url('post/'.$post['id'], array('delete'))); ?>">Slet</a>
-                <?php else : ?>
+                <?php else {
+    : ?>
                 Bogført
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             </td>
         </tr>
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <h1>Bilag</h1>
 
 <ul class="options">
-    <li><a class="excel" href="<?php e(url(null) . '.xls'); ?>" class="new">Poster som excel</a></li>
+    <li><a class="excel" href="<?php e(url(null).'.xls'); ?>" class="new">Poster som excel</a></li>
 </ul>
 
 <?php if (count($context->getPosts()) == 0) : ?>

Braces +5 added lines, -2 removed lines

@@ -6,7 +6,8 @@ 
 
 <?php if (count($context->getPosts()) == 0) : ?>
     <p>Der er ikke nogen bilag.</p>
-<?php else : ?>
+<?php else {
+    : ?>
     <table>
         <caption>Bilag</caption>
         <thead>
@@ -18,7 +19,9 @@ 
         </thead>
     <?php foreach ($context->getPosts() as $post) : ?>
         <tr>
-            <td><a href="<?php e(url($post['id'])); ?>"><?php e($post['number']); ?></a></td>
+            <td><a href="<?php e(url($post['id']));
+}
+?>"><?php e($post['number']); ?></a></td>
             <td><?php e($post['date_dk']); ?></td>
             <td><?php e($post['text']); ?></td>
         </tr>

src/Intraface/modules/accounting/Controller/templates/daybook/income.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
+                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']); ?>" />
                     </td>
                     <td>
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value = "<?php e($values['voucher_number']); ?>" />

src/Intraface/modules/accounting/Controller/templates/daybook/default.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
             <tbody>
                 <tr>
                     <td>
-                        <input tabindex="1" accesskey="1" name="date" id="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
+                        <input tabindex="1" accesskey="1" name="date" id="date" type="text" size="7" value="<?php e($values['date']); ?>" />
                     </td>
                     <td>
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value = "<?php e($values['voucher_number']); ?>" />
@@ -27,7 +27,7 @@ 
                         <input tabindex="3" type="text" name="text" id="text" value="<?php e($values['text']); ?>" size="20" />
                     </td>
                     <td>
-                        <input tabindex="4" type="text" name="debet_account_number" id="debet_account_number" value="<?php e($values['debet_account_number']);  ?>" size="8" />
+                        <input tabindex="4" type="text" name="debet_account_number" id="debet_account_number" value="<?php e($values['debet_account_number']); ?>" size="8" />
                         <a href="<?php e($context->url('../account/popup')); ?>" id="debet_account_open">+</a>
                         <div id="debet_account_name">&nbsp;</div>
                     </td>

src/Intraface/modules/accounting/Controller/templates/daybook/expenses.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <input tabindex="1" name="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
+                        <input tabindex="1" name="date" type="text" size="7" value="<?php e($values['date']); ?>" />
                     </td>
                     <td>
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value="<?php e($values['voucher_number']); ?>" />

src/Intraface/modules/accounting/Controller/templates/daybook/posts.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -16,15 +16,15 @@
     <?php foreach ($context->getPostsInDraft() as $p) : ?>
     <tr>
         <td><?php e($p['date_dk']); ?></td>
-        <td><a href="<?php e(url('../voucher/' . $p['voucher_id'])); ?>"><?php e($p['voucher_number']); ?></a></td>
+        <td><a href="<?php e(url('../voucher/'.$p['voucher_id'])); ?>"><?php e($p['voucher_number']); ?></a></td>
         <td><?php e($p['text']); ?></td>
-        <td><a href="<?php e(url('../account/' . $p['account_id'])); ?>"><?php e($p['account_number']); ?> <?php e($p['account_name']); ?></a></td>
+        <td><a href="<?php e(url('../account/'.$p['account_id'])); ?>"><?php e($p['account_number']); ?> <?php e($p['account_name']); ?></a></td>
         <td class="amount"><?php e(amountToOutput($p['debet'])); ?></td>
         <td class="amount"><?php e(amountToOutput($p['credit'])); ?></td>
         <td><?php if (!empty($p['reference'])) {
             e($p['reference']);
 } ?></td>
-        <td><a href="<?php e(url('../voucher/' . $p['voucher_id'])); ?>"><?php e(t('See voucher')); ?></a></td>
+        <td><a href="<?php e(url('../voucher/'.$p['voucher_id'])); ?>"><?php e(t('See voucher')); ?></a></td>
     </tr>
     <?php endforeach; ?>
 </tbody>

Braces +5 added lines, -2 removed lines

@@ -32,6 +32,9 @@
 
 <?php if (round($context->getPost()->get('list_saldo'), 2) == 0.00) : // this is a hack - can be removed when the database uses mindste enhed ?>
     <p class="advice"><a href="<?php e(url('state')); ?>">Bogfør posterne</a></p>
-<?php else : ?>
-    <p class="error">Kassekladden stemmer ikke. Der er en difference på <?php e(amountToOutput($post->get('list_saldo'))); ?>.</p>
+<?php else {
+    : ?>
+    <p class="error">Kassekladden stemmer ikke. Der er en difference på <?php e(amountToOutput($post->get('list_saldo')));
+}
+?>.</p>
 <?php endif; ?>

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

Spacing +9 added lines, -9 removed lines

@@ -84,11 +84,11 @@ 
                     $vat = 0;
                 }
 
-                for ($i = 0, $max = count($items); $i<$max; $i++) {
+                for ($i = 0, $max = count($items); $i < $max; $i++) {
                     $product = new Product($context->getKernel(), $items[$i]['product_id']);
                     $account = Account::factory($context->getYear(), $product->get('state_account_id'));
 
-                    $total += $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
+                    $total += $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
                     $vat = $items[$i]["vat"];
                     ?>
                     <tr>
@@ -99,7 +99,7 @@ 
                             <?php if (!$context->getModel()->isStated()) :
                                 $year = new Year($context->getKernel());
                                 $year->loadActiveYear();
-                                $accounts =  $account->getList('sale');
+                                $accounts = $account->getList('sale');
                                 ?>
                                 <select id="state_account" name="state_account_id[<?php e($product->get('id')); ?>]">
                                     <option value=""><?php e(t('Choose')); ?></option>
@@ -128,26 +128,26 @@ 
                                     ?>
                                 </select>
                             <?php else : ?>
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
+                                <?php e($account->get('number').' '.$account->get('name')); ?>
                             <?php endif; ?>
                         </td>
                     </tr>
                     <?php
-                    if ($vat == 1 && (!isset($items[$i+1]["vat"]) || $items[$i+1]["vat"] == 0)) {
+                    if ($vat == 1 && (!isset($items[$i + 1]["vat"]) || $items[$i + 1]["vat"] == 0)) {
                         ?>
                         <tr>
                             <td>&nbsp;</td>
                             <td><b>25% moms af <?php e(amountToOutput($total)); ?></b></td>
-                            <td><b><?php e(amountToOutput($total * 0.25, 2)); ?></b></td>
+                            <td><b><?php e(amountToOutput($total*0.25, 2)); ?></b></td>
                             <td>
                                 <?php
                                     $account = new Account($context->getYear(), $context->getYear()->getSetting('vat_out_account_id'));
-                                    e($account->get('number') . ' ' . $account->get('name'));
+                                    e($account->get('number').' '.$account->get('name'));
                                 ?>
                             </td>
                         </tr>
                         <?php
-                        $total = $total * 1.25;
+                        $total = $total*1.25;
                     }
                 }
                 ?>
@@ -158,6 +158,6 @@ 
             <input type="submit" value="<?php e(t('State')); ?>" />
             <a href="<?php e(url('../')); ?>"><?php e(t('Cancel')); ?></a>
         </div>
-    <?php endif;  ?>
+    <?php endif; ?>
     </form>
 <?php endif; ?>
\ No newline at end of file

Braces +20 added lines, -8 removed lines

@@ -12,11 +12,14 @@ 
 <?php if (!$context->getYear()->readyForState($context->getModel()->get('this_date'))) : ?>
     <?php echo $context->getYear()->error->view(); ?>
     <p>Gå til <a href="<?php e($this->url('../../../../../accounting/')); ?>">regnskabet</a></p>
-<?php else : ?>
+<?php else {
+    : ?>
 
     <p class="message">Når du bogfører en kreditnota vil beløbet bliver trukket fra debitorkontoen.</p>
 
-    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products'); ?>
+    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products');
+}
+?>
     <?php echo $context->getModel()->error->view(); ?>
 
     <form action="<?php e(url()); ?>" method="post">
@@ -43,8 +46,11 @@ 
                     <td>
                         <?php if (!$context->getModel()->isStated()) : ?>
                         <input type="text" name="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1); ?>" />
-                        <?php else : ?>
-                        <a href="<?php e($accounting_module->getPath()); ?>voucher.php?id=<?php e($context->getModel()->get("voucher_id")); ?>">Se bilag</a>
+                        <?php else {
+    : ?>
+                        <a href="<?php e($accounting_module->getPath());
+}
+?>voucher.php?id=<?php e($context->getModel()->get("voucher_id")); ?>">Se bilag</a>
                         <?php endif; ?>
                     </td>
                 </tr>
@@ -55,11 +61,14 @@ 
                                 <?php e($context->getModel()->get("dk_date_stated")); ?>
                         </td>
                     </tr>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <tr>
                         <th>Bogfør på dato</th>
                         <td>
-                            <input type="text" name="date_state" value="<?php e($context->getModel()->get("dk_this_date")); ?>" />
+                            <input type="text" name="date_state" value="<?php e($context->getModel()->get("dk_this_date"));
+}
+?>" />
                         </td>
                     </tr>
                 <?php endif; ?>
@@ -127,8 +136,11 @@ 
                                     endforeach;
                                     ?>
                                 </select>
-                            <?php else : ?>
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
+                            <?php else {
+    : ?>
+                                <?php e($account->get('number') . ' ' . $account->get('name'));
+}
+?>
                             <?php endif; ?>
                         </td>
                     </tr>

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

Spacing +9 added lines, -9 removed lines

@@ -68,11 +68,11 @@ 
                     $vat = 0;
                 }
 
-                for ($i = 0, $max = count($items); $i<$max; $i++) {
+                for ($i = 0, $max = count($items); $i < $max; $i++) {
                     $product = new Product($context->getKernel(), $items[$i]['product_id']);
                     $account = Account::factory($context->getYear(), $product->get('state_account_id'));
 
-                    $total += $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
+                    $total += $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
                     $vat = $items[$i]["vat"];
                     ?>
                     <tr>
@@ -83,7 +83,7 @@ 
                             <?php if (!$context->getModel()->isStated()) :
                                 $year = new Year($context->getKernel());
                                 $context->getYear()->loadActiveYear();
-                                $accounts =  $account->getList('sale');
+                                $accounts = $account->getList('sale');
                                 ?>
                                 <select id="state_account" name="state_account_id[<?php e($product->get('id')); ?>]">
                                     <option value=""><?php e(t('Choose')); ?></option>
@@ -112,26 +112,26 @@ 
                                     ?>
                                 </select>
                             <?php else : ?>
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
+                                <?php e($account->get('number').' '.$account->get('name')); ?>
                             <?php endif; ?>
                         </td>
                     </tr>
                     <?php
-                    if ($vat == 1 && (!isset($items[$i+1]["vat"]) || $items[$i+1]["vat"] == 0)) {
+                    if ($vat == 1 && (!isset($items[$i + 1]["vat"]) || $items[$i + 1]["vat"] == 0)) {
                         ?>
                         <tr>
                             <td>&nbsp;</td>
                             <td><b>25% moms af <?php e(amountToOutput($total)); ?></b></td>
-                            <td><b><?php e(amountToOutput($total * 0.25, 2)); ?></b></td>
+                            <td><b><?php e(amountToOutput($total*0.25, 2)); ?></b></td>
                             <td>
                                 <?php
                                     $account = new Account($context->getYear(), $context->getYear()->getSetting('vat_out_account_id'));
-                                    e($account->get('number') . ' ' . $account->get('name'));
+                                    e($account->get('number').' '.$account->get('name'));
                                 ?>
                             </td>
                         </tr>
                         <?php
-                        $total = $total * 1.25;
+                        $total = $total*1.25;
                     }
                 }
                 ?>
@@ -142,6 +142,6 @@ 
             <input type="submit" value="<?php e(t('State')); ?>" />
             <a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a>
         </div>
-    <?php endif;  ?>
+    <?php endif; ?>
     </form>
 <?php endif; ?>

Braces +10 added lines, -4 removed lines

@@ -13,11 +13,14 @@ 
 <?php if (!$context->getYear()->readyForState($context->getModel()->get('this_date'))) : ?>
     <?php echo $context->getYear()->error->view(); ?>
     <p>Gå til <a href="<?php e($this->url('../../../../../accounting/')); ?>">regnskabet</a></p>
-<?php else : ?>
+<?php else {
+    : ?>
 
     <p class="message">Når du bogfører fakturaerne vil det skyldige beløb blive sat på debitorkontoen. Når kunden har betalt, skal betalingen bogføres for at overføre beløbet fra debitorkontoen til din indkomst konto (fx Bankkonto).</p>
 
-    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products'); ?>
+    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products');
+}
+?>
     <?php echo $context->getModel()->error->view(); ?>
 
     <form action="<?php e(url()); ?>" method="post">
@@ -111,8 +114,11 @@ 
                                     endforeach;
                                     ?>
                                 </select>
-                            <?php else : ?>
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
+                            <?php else {
+    : ?>
+                                <?php e($account->get('number') . ' ' . $account->get('name'));
+}
+?>
                             <?php endif; ?>
                         </td>
                     </tr>

src/Intraface/modules/accounting/Controller/templates/state/year-not-ready.tpl.php

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 
     <p><?php e(t('You have to create a year, you can state in')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create year')); ?></a>.</p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
-<form action="<?php e(url(null)); ?>" method="post">
+<form action="<?php e(url(null));
+}
+?>" method="post">
     <input type="hidden" name="_method" value="put" />
 
     <p><?php e(t('You have to choose the year, you want the invoice stated in.')); ?>