Completed
Pull Request — master (#27)
by Lars
11:31 queued 01:30
created
src/Intraface/modules/accounting/Controller/templates/voucher/show.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@
 block discarded – undo
33 33
             <td><input type="checkbox" name="selected[]" value="<?php e($post['id']); ?>" /></td>
34 34
             <td><?php e($post['date_dk']); ?></td>
35 35
             <td><?php e($post['text']); ?></td>
36
-            <td><a href="<?php e(url('../../accounts/' . $post['account_id'])); ?>"><?php e($post['account_name']); ?></a></td>
36
+            <td><a href="<?php e(url('../../accounts/'.$post['account_id'])); ?>"><?php e($post['account_name']); ?></a></td>
37 37
             <td class="amount"><?php e(amountToOutput($post['debet'])); ?></td>
38 38
             <td class="amount"><?php e(amountToOutput($post['credit'])); ?></td>
39 39
             <td class="options">
40 40
                 <?php if ($post['stated'] == 0) :
41 41
                     $not_all_stated = true; ?>
42
-                <a class="edit" href="<?php e(url('post/'. $post['id'], array('edit'))); ?>">Ret</a>
42
+                <a class="edit" href="<?php e(url('post/'.$post['id'], array('edit'))); ?>">Ret</a>
43 43
                 <a class="delete" href="<?php e(url('post/'.$post['id'], array('delete'))); ?>">Slet</a>
44 44
                 <?php else : ?>
45 45
                 Bogført
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/voucher/index.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <h1>Bilag</h1>
2 2
 
3 3
 <ul class="options">
4
-    <li><a class="excel" href="<?php e(url(null) . '.xls'); ?>" class="new">Poster som excel</a></li>
4
+    <li><a class="excel" href="<?php e(url(null).'.xls'); ?>" class="new">Poster som excel</a></li>
5 5
 </ul>
6 6
 
7 7
 <?php if (count($context->getPosts()) == 0) : ?>
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/daybook/debtor.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
             <tbody>
23 23
                 <tr>
24 24
                     <td>
25
-                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
25
+                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']); ?>" />
26 26
                     </td>
27 27
                     <td>
28 28
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value="<?php e($values['voucher_number']); ?>" />
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/daybook/income.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
             <tbody>
21 21
                 <tr>
22 22
                     <td>
23
-                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
23
+                        <input tabindex="1" accesskey="1" name="date" type="text" size="7" value="<?php e($values['date']); ?>" />
24 24
                     </td>
25 25
                     <td>
26 26
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value = "<?php e($values['voucher_number']); ?>" />
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/daybook/default.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
             <tbody>
19 19
                 <tr>
20 20
                     <td>
21
-                        <input tabindex="1" accesskey="1" name="date" id="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
21
+                        <input tabindex="1" accesskey="1" name="date" id="date" type="text" size="7" value="<?php e($values['date']); ?>" />
22 22
                     </td>
23 23
                     <td>
24 24
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value = "<?php e($values['voucher_number']); ?>" />
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
                         <input tabindex="3" type="text" name="text" id="text" value="<?php e($values['text']); ?>" size="20" />
28 28
                     </td>
29 29
                     <td>
30
-                        <input tabindex="4" type="text" name="debet_account_number" id="debet_account_number" value="<?php e($values['debet_account_number']);  ?>" size="8" />
30
+                        <input tabindex="4" type="text" name="debet_account_number" id="debet_account_number" value="<?php e($values['debet_account_number']); ?>" size="8" />
31 31
                         <a href="<?php e($context->url('../account/popup')); ?>" id="debet_account_open">+</a>
32 32
                         <div id="debet_account_name">&nbsp;</div>
33 33
                     </td>
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/daybook/expenses.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
             <tbody>
21 21
                 <tr>
22 22
                     <td>
23
-                        <input tabindex="1" name="date" type="text" size="7" value="<?php e($values['date']);  ?>" />
23
+                        <input tabindex="1" name="date" type="text" size="7" value="<?php e($values['date']); ?>" />
24 24
                     </td>
25 25
                     <td>
26 26
                         <input tabindex="2" name="voucher_number" id="voucher_number" type="text" size="5" value="<?php e($values['voucher_number']); ?>" />
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/daybook/posts.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,15 +16,15 @@
 block discarded – undo
16 16
     <?php foreach ($context->getPostsInDraft() as $p) : ?>
17 17
     <tr>
18 18
         <td><?php e($p['date_dk']); ?></td>
19
-        <td><a href="<?php e(url('../voucher/' . $p['voucher_id'])); ?>"><?php e($p['voucher_number']); ?></a></td>
19
+        <td><a href="<?php e(url('../voucher/'.$p['voucher_id'])); ?>"><?php e($p['voucher_number']); ?></a></td>
20 20
         <td><?php e($p['text']); ?></td>
21
-        <td><a href="<?php e(url('../account/' . $p['account_id'])); ?>"><?php e($p['account_number']); ?> <?php e($p['account_name']); ?></a></td>
21
+        <td><a href="<?php e(url('../account/'.$p['account_id'])); ?>"><?php e($p['account_number']); ?> <?php e($p['account_name']); ?></a></td>
22 22
         <td class="amount"><?php e(amountToOutput($p['debet'])); ?></td>
23 23
         <td class="amount"><?php e(amountToOutput($p['credit'])); ?></td>
24 24
         <td><?php if (!empty($p['reference'])) {
25 25
             e($p['reference']);
26 26
 } ?></td>
27
-        <td><a href="<?php e(url('../voucher/' . $p['voucher_id'])); ?>"><?php e(t('See voucher')); ?></a></td>
27
+        <td><a href="<?php e(url('../voucher/'.$p['voucher_id'])); ?>"><?php e(t('See voucher')); ?></a></td>
28 28
     </tr>
29 29
     <?php endforeach; ?>
30 30
 </tbody>
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/state/creditnote.tpl.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
                     $vat = 0;
85 85
                 }
86 86
 
87
-                for ($i = 0, $max = count($items); $i<$max; $i++) {
87
+                for ($i = 0, $max = count($items); $i < $max; $i++) {
88 88
                     $product = new Product($context->getKernel(), $items[$i]['product_id']);
89 89
                     $account = Account::factory($context->getYear(), $product->get('state_account_id'));
90 90
 
91
-                    $total += $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
91
+                    $total += $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
92 92
                     $vat = $items[$i]["vat"];
93 93
                     ?>
94 94
                     <tr>
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
                             <?php if (!$context->getModel()->isStated()) :
100 100
                                 $year = new Year($context->getKernel());
101 101
                                 $year->loadActiveYear();
102
-                                $accounts =  $account->getList('sale');
102
+                                $accounts = $account->getList('sale');
103 103
                                 ?>
104 104
                                 <select id="state_account" name="state_account_id[<?php e($product->get('id')); ?>]">
105 105
                                     <option value=""><?php e(t('Choose')); ?></option>
@@ -128,26 +128,26 @@  discard block
 block discarded – undo
128 128
                                     ?>
129 129
                                 </select>
130 130
                             <?php else : ?>
131
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
131
+                                <?php e($account->get('number').' '.$account->get('name')); ?>
132 132
                             <?php endif; ?>
133 133
                         </td>
134 134
                     </tr>
135 135
                     <?php
136
-                    if ($vat == 1 && (!isset($items[$i+1]["vat"]) || $items[$i+1]["vat"] == 0)) {
136
+                    if ($vat == 1 && (!isset($items[$i + 1]["vat"]) || $items[$i + 1]["vat"] == 0)) {
137 137
                         ?>
138 138
                         <tr>
139 139
                             <td>&nbsp;</td>
140 140
                             <td><b>25% moms af <?php e(amountToOutput($total)); ?></b></td>
141
-                            <td><b><?php e(amountToOutput($total * 0.25, 2)); ?></b></td>
141
+                            <td><b><?php e(amountToOutput($total*0.25, 2)); ?></b></td>
142 142
                             <td>
143 143
                                 <?php
144 144
                                     $account = new Account($context->getYear(), $context->getYear()->getSetting('vat_out_account_id'));
145
-                                    e($account->get('number') . ' ' . $account->get('name'));
145
+                                    e($account->get('number').' '.$account->get('name'));
146 146
                                 ?>
147 147
                             </td>
148 148
                         </tr>
149 149
                         <?php
150
-                        $total = $total * 1.25;
150
+                        $total = $total*1.25;
151 151
                     }
152 152
                 }
153 153
                 ?>
@@ -158,6 +158,6 @@  discard block
 block discarded – undo
158 158
             <input type="submit" value="<?php e(t('State')); ?>" />
159 159
             <a href="<?php e(url('../')); ?>"><?php e(t('Cancel')); ?></a>
160 160
         </div>
161
-    <?php endif;  ?>
161
+    <?php endif; ?>
162 162
     </form>
163 163
 <?php endif; ?>
164 164
\ No newline at end of file
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/state/invoice.tpl.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
                     $vat = 0;
69 69
                 }
70 70
 
71
-                for ($i = 0, $max = count($items); $i<$max; $i++) {
71
+                for ($i = 0, $max = count($items); $i < $max; $i++) {
72 72
                     $product = new Product($context->getKernel(), $items[$i]['product_id']);
73 73
                     $account = Account::factory($context->getYear(), $product->get('state_account_id'));
74 74
 
75
-                    $total += $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
75
+                    $total += $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
76 76
                     $vat = $items[$i]["vat"];
77 77
                     ?>
78 78
                     <tr>
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                             <?php if (!$context->getModel()->isStated()) :
84 84
                                 $year = new Year($context->getKernel());
85 85
                                 $context->getYear()->loadActiveYear();
86
-                                $accounts =  $account->getList('sale');
86
+                                $accounts = $account->getList('sale');
87 87
                                 ?>
88 88
                                 <select id="state_account" name="state_account_id[<?php e($product->get('id')); ?>]">
89 89
                                     <option value=""><?php e(t('Choose')); ?></option>
@@ -112,26 +112,26 @@  discard block
 block discarded – undo
112 112
                                     ?>
113 113
                                 </select>
114 114
                             <?php else : ?>
115
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
115
+                                <?php e($account->get('number').' '.$account->get('name')); ?>
116 116
                             <?php endif; ?>
117 117
                         </td>
118 118
                     </tr>
119 119
                     <?php
120
-                    if ($vat == 1 && (!isset($items[$i+1]["vat"]) || $items[$i+1]["vat"] == 0)) {
120
+                    if ($vat == 1 && (!isset($items[$i + 1]["vat"]) || $items[$i + 1]["vat"] == 0)) {
121 121
                         ?>
122 122
                         <tr>
123 123
                             <td>&nbsp;</td>
124 124
                             <td><b>25% moms af <?php e(amountToOutput($total)); ?></b></td>
125
-                            <td><b><?php e(amountToOutput($total * 0.25, 2)); ?></b></td>
125
+                            <td><b><?php e(amountToOutput($total*0.25, 2)); ?></b></td>
126 126
                             <td>
127 127
                                 <?php
128 128
                                     $account = new Account($context->getYear(), $context->getYear()->getSetting('vat_out_account_id'));
129
-                                    e($account->get('number') . ' ' . $account->get('name'));
129
+                                    e($account->get('number').' '.$account->get('name'));
130 130
                                 ?>
131 131
                             </td>
132 132
                         </tr>
133 133
                         <?php
134
-                        $total = $total * 1.25;
134
+                        $total = $total*1.25;
135 135
                     }
136 136
                 }
137 137
                 ?>
@@ -142,6 +142,6 @@  discard block
 block discarded – undo
142 142
             <input type="submit" value="<?php e(t('State')); ?>" />
143 143
             <a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a>
144 144
         </div>
145
-    <?php endif;  ?>
145
+    <?php endif; ?>
146 146
     </form>
147 147
 <?php endif; ?>
Please login to merge, or discard this patch.