Completed
Pull Request — master (#21)
by Lars
14:31
created
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.
src/Intraface/modules/accounting/Controller/templates/voucher/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,8 @@  discard block
 block discarded – undo
6 6
 
7 7
 <?php if (count($context->getPosts()) == 0) : ?>
8 8
     <p>Der er ikke nogen bilag.</p>
9
-<?php else : ?>
9
+<?php else {
10
+    : ?>
10 11
     <table>
11 12
         <caption>Bilag</caption>
12 13
         <thead>
@@ -18,7 +19,9 @@  discard block
 block discarded – undo
18 19
         </thead>
19 20
     <?php foreach ($context->getPosts() as $post) : ?>
20 21
         <tr>
21
-            <td><a href="<?php e(url($post['id'])); ?>"><?php e($post['number']); ?></a></td>
22
+            <td><a href="<?php e(url($post['id']));
23
+}
24
+?>"><?php e($post['number']); ?></a></td>
22 25
             <td><?php e($post['date_dk']); ?></td>
23 26
             <td><?php e($post['text']); ?></td>
24 27
         </tr>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/daybook/posts.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,6 +32,9 @@
 block discarded – undo
32 32
 
33 33
 <?php if (round($context->getPost()->get('list_saldo'), 2) == 0.00) : // this is a hack - can be removed when the database uses mindste enhed ?>
34 34
     <p class="advice"><a href="<?php e(url('state')); ?>">Bogfør posterne</a></p>
35
-<?php else : ?>
36
-    <p class="error">Kassekladden stemmer ikke. Der er en difference på <?php e(amountToOutput($post->get('list_saldo'))); ?>.</p>
35
+<?php else {
36
+    : ?>
37
+    <p class="error">Kassekladden stemmer ikke. Der er en difference på <?php e(amountToOutput($post->get('list_saldo')));
38
+}
39
+?>.</p>
37 40
 <?php endif; ?>
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/state/creditnote.tpl.php 1 patch
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,11 +12,14 @@  discard block
 block discarded – undo
12 12
 <?php if (!$context->getYear()->readyForState($context->getModel()->get('this_date'))) : ?>
13 13
     <?php echo $context->getYear()->error->view(); ?>
14 14
     <p>Gå til <a href="<?php e($this->url('../../../../../accounting/')); ?>">regnskabet</a></p>
15
-<?php else : ?>
15
+<?php else {
16
+    : ?>
16 17
 
17 18
     <p class="message">Når du bogfører en kreditnota vil beløbet bliver trukket fra debitorkontoen.</p>
18 19
 
19
-    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products'); ?>
20
+    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products');
21
+}
22
+?>
20 23
     <?php echo $context->getModel()->error->view(); ?>
21 24
 
22 25
     <form action="<?php e(url()); ?>" method="post">
@@ -43,8 +46,11 @@  discard block
 block discarded – undo
43 46
                     <td>
44 47
                         <?php if (!$context->getModel()->isStated()) : ?>
45 48
                         <input type="text" name="voucher_number" value="<?php e($context->getVoucher()->getMaxNumber() + 1); ?>" />
46
-                        <?php else : ?>
47
-                        <a href="<?php e($accounting_module->getPath()); ?>voucher.php?id=<?php e($context->getModel()->get("voucher_id")); ?>">Se bilag</a>
49
+                        <?php else {
50
+    : ?>
51
+                        <a href="<?php e($accounting_module->getPath());
52
+}
53
+?>voucher.php?id=<?php e($context->getModel()->get("voucher_id")); ?>">Se bilag</a>
48 54
                         <?php endif; ?>
49 55
                     </td>
50 56
                 </tr>
@@ -55,11 +61,14 @@  discard block
 block discarded – undo
55 61
                                 <?php e($context->getModel()->get("dk_date_stated")); ?>
56 62
                         </td>
57 63
                     </tr>
58
-                <?php else : ?>
64
+                <?php else {
65
+    : ?>
59 66
                     <tr>
60 67
                         <th>Bogfør på dato</th>
61 68
                         <td>
62
-                            <input type="text" name="date_state" value="<?php e($context->getModel()->get("dk_this_date")); ?>" />
69
+                            <input type="text" name="date_state" value="<?php e($context->getModel()->get("dk_this_date"));
70
+}
71
+?>" />
63 72
                         </td>
64 73
                     </tr>
65 74
                 <?php endif; ?>
@@ -127,8 +136,11 @@  discard block
 block discarded – undo
127 136
                                     endforeach;
128 137
                                     ?>
129 138
                                 </select>
130
-                            <?php else : ?>
131
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
139
+                            <?php else {
140
+    : ?>
141
+                                <?php e($account->get('number') . ' ' . $account->get('name'));
142
+}
143
+?>
132 144
                             <?php endif; ?>
133 145
                         </td>
134 146
                     </tr>
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/templates/state/invoice.tpl.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,14 @@  discard block
 block discarded – undo
13 13
 <?php if (!$context->getYear()->readyForState($context->getModel()->get('this_date'))) : ?>
14 14
     <?php echo $context->getYear()->error->view(); ?>
15 15
     <p>Gå til <a href="<?php e($this->url('../../../../../accounting/')); ?>">regnskabet</a></p>
16
-<?php else : ?>
16
+<?php else {
17
+    : ?>
17 18
 
18 19
     <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>
19 20
 
20
-    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products'); ?>
21
+    <?php $context->getModel()->readyForState($context->getYear(), 'skip_check_products');
22
+}
23
+?>
21 24
     <?php echo $context->getModel()->error->view(); ?>
22 25
 
23 26
     <form action="<?php e(url()); ?>" method="post">
@@ -111,8 +114,11 @@  discard block
 block discarded – undo
111 114
                                     endforeach;
112 115
                                     ?>
113 116
                                 </select>
114
-                            <?php else : ?>
115
-                                <?php e($account->get('number') . ' ' . $account->get('name')); ?>
117
+                            <?php else {
118
+    : ?>
119
+                                <?php e($account->get('number') . ' ' . $account->get('name'));
120
+}
121
+?>
116 122
                             <?php endif; ?>
117 123
                         </td>
118 124
                     </tr>
Please login to merge, or discard this patch.
modules/accounting/Controller/templates/state/year-not-ready.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,9 +8,12 @@
 block discarded – undo
8 8
 
9 9
     <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>
10 10
 
11
-<?php else : ?>
11
+<?php else {
12
+    : ?>
12 13
 
13
-<form action="<?php e(url(null)); ?>" method="post">
14
+<form action="<?php e(url(null));
15
+}
16
+?>" method="post">
14 17
     <input type="hidden" name="_method" value="put" />
15 18
 
16 19
     <p><?php e(t('You have to choose the year, you want the invoice stated in.')); ?>
Please login to merge, or discard this patch.
Intraface/modules/accounting/Controller/templates/state/reminder.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,9 +7,12 @@
 block discarded – undo
7 7
 <?php if (!$year->readyForState($reminder->get('this_date'))) : ?>
8 8
     <?php echo $year->error->view(); ?>
9 9
     <p><?php e(t('go to the')); ?> <a href="<?php e($accounting_module->getPath().'years.php'); ?>"><?php e(t('accounts')); ?></a></p>
10
-<?php else : ?>
10
+<?php else {
11
+    : ?>
11 12
 
12
-    <p class="message"><?php e(t('This function will only state the reminder fee on this reminder. all invoices and earlier reminder fees on the reminder should be stated on the corresponding invoices and reminders.')); ?></p>
13
+    <p class="message"><?php e(t('This function will only state the reminder fee on this reminder. all invoices and earlier reminder fees on the reminder should be stated on the corresponding invoices and reminders.'));
14
+}
15
+?></p>
13 16
 
14 17
     <?php $reminder->readyForState($year); ?>
15 18
     <?php echo $reminder->error->view(); ?>
Please login to merge, or discard this patch.