Completed
Pull Request — master (#24)
by Lars
12:05
created
src/Intraface/modules/accounting/Controller/templates/vat/show.tpl.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,9 +6,12 @@  discard block
 block discarded – undo
6 6
 
7 7
 <?php if (!$context->getYear()->vatAccountIsSet()) : ?>
8 8
     <p class="message-dependent">Der er ikke angivet nogen momskonti. Du kan angive momskonti under <a href="<?php e(url('../../settings')); ?>">indstillingerne</a>.</p>
9
-<?php else : ?>
9
+<?php else {
10
+    : ?>
10 11
 
11
-    <?php echo $context->getError()->view(); ?>
12
+    <?php echo $context->getError()->view();
13
+}
14
+?>
12 15
 
13 16
     <?php if ($context->getVatPeriod()->get('status') == 'stated') : ?>
14 17
         <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 @@  discard block
 block discarded – undo
108 111
                 <?php if ($context->getVatPeriod()->get('status') == 'stated') : ?>
109 112
                     <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
110 113
                 </div>
111
-                <?php else : ?>
114
+                <?php else {
115
+    : ?>
112 116
                 <div class="formrow">
113
-                    <label for="voucher_number">Bilagsnummer</label> <input type="text" name="voucher_number" id="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1); ?>" />
117
+                    <label for="voucher_number">Bilagsnummer</label> <input type="text" name="voucher_number" id="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1);
118
+}
119
+?>" />
114 120
                 </div>
115 121
                 <?php endif; ?>
116 122
                 <div style="clear:both;">
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/year/end.tpl.php 1 patch
Braces   +23 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,10 +11,13 @@  discard block
 block discarded – undo
11 11
     <p class="warning">Du har ikke oprettet nogen momsperioder. <a href="<?php e(url('../vat')); ?>">Opret perioder</a>.</p>
12 12
 <?php elseif (!$context->getYear()->isBalanced()) : ?>
13 13
     <p class="error">Balancen for året er <?php e(amountToOutput($context->getYear()->get('year_saldo'))); ?>. I et dobbelt bogholderi skal saldoen altid være 0, for ellers er der ikke er bogført lige meget på debet og credit. Du kan først lave årsafslutning når regnskabet stemmer. <a href="<?php e(url('../../../daybook')); ?>">Gå til kassekladden</a>.</p>
14
-<?php else : ?>
14
+<?php else {
15
+    : ?>
15 16
 
16 17
 
17
-<form action="<?php e(url()); ?>" method="post">
18
+<form action="<?php e(url());
19
+}
20
+?>" method="post">
18 21
     <input type="hidden" name="step" value="<?php e($context->getYearEnd()->get('step') + 1); ?>" />
19 22
 
20 23
 <?php
@@ -71,11 +74,14 @@  discard block
 block discarded – undo
71 74
             <?php if (count($context->getYearEnd()->getStatedActions('operating_reset')) == 0) : ?>
72 75
             <input type="submit" name="previous" value="Forrige" />
73 76
             <input type="submit" name="step_save_result" value="Gem resultatopgørelsen" class="confirm" />
74
-            <?php else : ?>
77
+            <?php else {
78
+    : ?>
75 79
                 <p>Resultatopgørelsen er allerede gemt. Du kan føre posterne tilbage, hvis du vil gemme igen.</p>
76 80
                 <input type="submit" name="previous" value="Forrige" />
77 81
                 <input type="submit" name="step_reverse_result_reset" value="Tilbagefør posterne" class="confirm" />
78
-                <input type="submit" name="next" value="<?php e(t('Next')); ?>" class="confirm" />
82
+                <input type="submit" name="next" value="<?php e(t('Next'));
83
+}
84
+?>" class="confirm" />
79 85
             <?php endif; ?>
80 86
         </fieldset>
81 87
 
@@ -92,9 +98,11 @@  discard block
 block discarded – undo
92 98
             <p class="warning">Du er endnu ikke helt klar til dette trin, for resultatopgørelsen er ikke gemt.</p>
93 99
             <input type="submit" value="Forrige" name="previous" />
94 100
             </fieldset>
95
-        <?php else : ?>
101
+        <?php else {
102
+    : ?>
96 103
         <?php
97 104
         $status_accounts = $context->getAccount()->getList('status');
105
+}
98 106
         ?>
99 107
 
100 108
         <fieldset>
@@ -171,13 +179,16 @@  discard block
 block discarded – undo
171 179
             </fieldset>
172 180
 
173 181
         <?php
174
-        else :
182
+        else {
183
+            :
175 184
         ?>
176 185
         <fieldset>
177 186
             <legend>Trin 5: Årsregnskabet</legend>
178 187
             <p>Årsregnskabet er færdig. Du kan se det nedenunder - og du kan skrive det ud som et excel-ark. God fornøjelse.</p>
179 188
             <input name="previous" type="submit" value="Forrige" />
180
-            <input name="next" type="submit" value="<?php e(t('Next')); ?>" />
189
+            <input name="next" type="submit" value="<?php e(t('Next'));
190
+        }
191
+        ?>" />
181 192
         </fieldset>
182 193
 
183 194
         <ul class="options">
@@ -303,12 +314,15 @@  discard block
 block discarded – undo
303 314
                 <p>Årets resultat skal overføres til kapitalkontoen, så dine konti er klar til <?php e(t('Next')); ?> års regnskab.</p>
304 315
                 <input type="submit" value="Forrige" name="previous" />
305 316
                 <input type="submit" value="Gem" name="step_transfer_result" class="confirm" />
306
-            <?php else : ?>
317
+            <?php else {
318
+    : ?>
307 319
                 <p>Årets resultat er allerede nulstillet. Du kan føre posterne tilbage, hvis du vil gemme igen.</p>
308 320
                 <input type="submit" value="Forrige" name="previous" />
309 321
                 <input type="submit" name="step_reverse_result_account_reset" value="Tilbagefør posterne" />
310 322
 
311
-                <input type="submit" name="next" value="<?php e(t('Next')); ?>" />
323
+                <input type="submit" name="next" value="<?php e(t('Next'));
324
+}
325
+?>" />
312 326
             <?php endif; ?>
313 327
 
314 328
             </fieldset>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/year/show.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,9 +112,12 @@
 block discarded – undo
112 112
         </div>
113 113
         <?php endif; ?>
114 114
     </fieldset>
115
-<?php else : ?>
115
+<?php else {
116
+    : ?>
116 117
     <h2>Kontoplan</h2>
117
-    <p>Du kan finde dine konti under <a href="<?php e(url('account')); ?>">kontoplanen</a>.</p>
118
+    <p>Du kan finde dine konti under <a href="<?php e(url('account'));
119
+}
120
+?>">kontoplanen</a>.</p>
118 121
 
119 122
     <?php if (!$context->getYear()->vatAccountIsSet()) : ?>
120 123
 
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/year/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,11 @@
 block discarded – undo
10 10
 
11 11
 <?php if (!$context->getYearGateway()->getList()) : ?>
12 12
     <p>Der er ikke oprettet nogen regnskabsår. Du kan oprette et ved at klikke på knappen ovenover.</p>
13
-<?php else : ?>
14
-    <form action="<?php e(url('./')); ?>" method="post">
13
+<?php else {
14
+    : ?>
15
+    <form action="<?php e(url('./'));
16
+}
17
+?>" method="post">
15 18
     <input type="hidden" name="_method" value="put" />
16 19
     <table>
17 20
         <caption>Regnskabsår</caption>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/state.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,6 +69,9 @@
 block discarded – undo
69 69
         <div><input type="submit" value="Bogfør" name="state" onclick="return confirm('Er du sikker på, at du vil bogføre?');" /></div>
70 70
     </fieldset>
71 71
 </form>
72
-<?php else : ?>
73
-    <p class="message-dependent">Der er ingen poster i kassekladden. Du skal <a href="<?php e($context->url('../')); ?>">indtaste poster i kassekladden</a>, inden du kan bogføre.</p>
72
+<?php else {
73
+    : ?>
74
+    <p class="message-dependent">Der er ingen poster i kassekladden. Du skal <a href="<?php e($context->url('../'));
75
+}
76
+?>">indtaste poster i kassekladden</a>, inden du kan bogføre.</p>
74 77
 <?php endif; ?>
75 78
\ No newline at end of file
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/account/popup.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,9 +93,12 @@
 block discarded – undo
93 93
                     <tr class="headline">
94 94
                         <td colspan="2"><?php e($account['name']); ?></td>
95 95
                     </tr>
96
-                <?php else : ?>
96
+                <?php else {
97
+    : ?>
97 98
                     <tr>
98
-                        <th><?php e($account['number']); ?></th>
99
+                        <th><?php e($account['number']);
100
+}
101
+?></th>
99 102
                         <td><?php e($account['name']);  ?></td>
100 103
                     </tr>
101 104
                 <?php endif; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/account/index.tpl.php 1 patch
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,7 +32,8 @@  discard block
 block discarded – undo
32 32
         <p>Der er endnu ikke oprettet nogen konti.</p>
33 33
         <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>
34 34
     </div>
35
-<?php else : ?>
35
+<?php else {
36
+    : ?>
36 37
 <table>
37 38
     <caption>Kontoplan</caption>
38 39
     <thead>
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
 
51 52
         <tr<?php if ($account['type'] == 'headline') {
52 53
             echo ' class="headline"';
54
+}
53 55
 } elseif ($account['type'] == 'sum') {
54 56
     echo ' class="sum"';
55 57
 } ?><?php if (!empty($_GET['from_account_id']) and $_GET['from_account_id'] == $account['id']) {
@@ -57,8 +59,11 @@  discard block
 block discarded – undo
57 59
 } ?>>
58 60
             <?php if ($account['type'] != 'headline' and $account['type'] != 'sum') : ?>
59 61
                 <td><a href="<?php e(url($account['id'])); ?>"><?php e($account['number']); ?></a></td>
60
-            <?php else : ?>
61
-                <td><?php e($account['number']); ?></td>
62
+            <?php else {
63
+    : ?>
64
+                <td><?php e($account['number']);
65
+}
66
+?></td>
62 67
             <?php endif; ?>
63 68
             <?php if ($account['type'] == 'headline') : ?>
64 69
                 <td colspan="4" class="headline"><?php e($account['name']); ?></td>
@@ -66,8 +71,11 @@  discard block
 block discarded – undo
66 71
                 <td><?php e($account['name']); ?><?php if ($account['type'] == 'sum') {
67 72
                     e(' ('. $account["sum_from"] . ' til ' . $account["sum_to"] . ')');
68 73
 } ?></td>
69
-            <?php else :?>
70
-                <td><a href="<?php e(url($account['id'])); ?>"><?php e($account['name']); ?></a></td>
74
+            <?php else {
75
+    :?>
76
+                <td><a href="<?php e(url($account['id']));
77
+}
78
+?>"><?php e($account['name']); ?></a></td>
71 79
             <?php endif; ?>
72 80
 
73 81
             <?php if ($account['type'] != 'headline') { ?>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@
 block discarded – undo
6 6
 
7 7
 <?php if (count($context->getYear()->getList()) == 0) : ?>
8 8
     <p>Du skal <a href="<?php e($context->url('year', array('create'))); ?>">oprette et regnskab</a> for at komme i gang med at bruge regnskabsmodulet.</p>
9
-<?php else : ?>
10
-    <p><a href="<?php e($context->url('year')); ?>">Vælg et regnskab</a> du vil se eller ændre i.</p>
9
+<?php else {
10
+    : ?>
11
+    <p><a href="<?php e($context->url('year'));
12
+}
13
+?>">Vælg et regnskab</a> du vil se eller ændre i.</p>
11 14
 <?php endif; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/voucher/show.tpl.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,8 +13,11 @@  discard block
 block discarded – undo
13 13
 
14 14
 <?php if (count($context->getPosts()) == 0) : ?>
15 15
     <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>
16
-<?php else : ?>
17
-    <form action="<?php e(url(null)); ?>" method="post">
16
+<?php else {
17
+    : ?>
18
+    <form action="<?php e(url(null));
19
+}
20
+?>" method="post">
18 21
     <table>
19 22
         <caption>Poster</caption>
20 23
         <thead>
@@ -41,9 +44,12 @@  discard block
 block discarded – undo
41 44
                     $not_all_stated = true; ?>
42 45
                 <a class="edit" href="<?php e(url('post/'. $post['id'], array('edit'))); ?>">Ret</a>
43 46
                 <a class="delete" href="<?php e(url('post/'.$post['id'], array('delete'))); ?>">Slet</a>
44
-                <?php else : ?>
47
+                <?php else {
48
+    : ?>
45 49
                 Bogført
46
-                <?php endif; ?>
50
+                <?php endif;
51
+}
52
+?>
47 53
             </td>
48 54
         </tr>
49 55
 
Please login to merge, or discard this patch.