Completed
Pull Request — master (#24)
by Lars
12:05
created
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.
src/Intraface/modules/accounting/Controller/templates/state/payment.tpl.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,10 +10,12 @@
 block discarded – undo
10 10
     <p>Gå til <a href="<?php e($accounting_module->getPath().'years'); ?>">regnskabet</a></p>
11 11
 <?php elseif ($payment->isStated()) : ?>
12 12
     <p><?php e(t('the payment is alredy stated')); ?>. <a href="<?php e($context->getKernel()->useModule('accounting')->getPath()).'voucher/'.$payment->get('voucher_id'); ?>"><?php e(t('see the voucher')); ?></a>.</p>
13
-<?php else : ?>
13
+<?php else {
14
+    : ?>
14 15
     <?php
15 16
     // need to be executed to generate errors!
16 17
     $payment->readyForState();
18
+}
17 19
     echo $payment->error->view();
18 20
     ?>
19 21
 
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.
Intraface/modules/accounting/Controller/templates/state/procurement.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,9 +152,12 @@
 block discarded – undo
152 152
     </div>
153 153
     <?php if (empty($value['debet_account'])) : ?>
154 154
          <p class="warning"><?php e(t('Cannot state procurement with no items.')); ?> <a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></p>
155
-    <?php else : ?>
155
+    <?php else {
156
+    : ?>
156 157
     <div>
157
-         <input type="submit" name="state" value="<?php e(t('State')); ?>" />
158
+         <input type="submit" name="state" value="<?php e(t('State'));
159
+}
160
+?>" />
158 161
          <a href="<?php url('../'); ?>"><?php e(t('Cancel')); ?></a>
159 162
     </div>
160 163
     <?php endif; ?>
Please login to merge, or discard this patch.
modules/accounting/Controller/templates/state/depreciation.tpl.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,10 +9,12 @@
 block discarded – undo
9 9
     <p>Gå til <a href="<?php e($accounting_module->getPath().'years.php'); ?>">regnskabet</a></p>
10 10
 <?php elseif ($depreciation->isStated()) : ?>
11 11
     <p><?php e(t('the depreciation is alredy stated')); ?>. <a href="<?php e($accounting_module->getPath().'voucher/'.$depreciation->get('voucher_id')); ?>"><?php e(t('see the voucher')); ?></a>.</p>
12
-<?php else : ?>
12
+<?php else {
13
+    : ?>
13 14
     <?php
14 15
     // need to be executed to generate errors!
15 16
     $depreciation->readyForState();
17
+}
16 18
     echo $depreciation->error->view();
17 19
     ?>
18 20
 
Please login to merge, or discard this patch.
src/Intraface/modules/procurement/Controller/templates/index.tpl.php 1 patch
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,9 +13,12 @@  discard block
 block discarded – undo
13 13
 
14 14
 <?php if (!$gateway->any()) : ?>
15 15
     <p><?php e(t('No procurements has been created')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create procurement')); ?></a>.</p>
16
-<?php else : ?>
16
+<?php else {
17
+    : ?>
17 18
 
18
-    <form method="get" action="<?php e(url()); ?>">
19
+    <form method="get" action="<?php e(url());
20
+}
21
+?>">
19 22
     <fieldset>
20 23
         <legend><?php e(t('Search')); ?></legend>
21 24
         <label><?php e(t('Text')); ?>
@@ -78,8 +81,11 @@  discard block
 block discarded – undo
78 81
                         <?php if ($context->getKernel()->user->hasModuleAccess('contact') && $procurement["contact_id"] != 0) : ?>
79 82
                             <?php $ModuleContact = $context->getKernel()->getModule('contact'); ?>
80 83
                             <a href="<?php e($ModuleContact->getPath().$procurement["contact_id"]); ?>"><?php e($procurement["contact"]); ?></a>
81
-                        <?php else : ?>
82
-                            <?php e($procurement["vendor"]); ?>
84
+                        <?php else {
85
+    : ?>
86
+                            <?php e($procurement["vendor"]);
87
+}
88
+?>
83 89
                         <?php endif; ?>
84 90
                     </td>
85 91
                     <td><?php e($procurement["dk_invoice_date"]); ?></td>
@@ -88,8 +94,11 @@  discard block
 block discarded – undo
88 94
                             <?php e(t(ucfirst($procurement["status"]))); ?> <?php e($procurement["dk_delivery_date"]); ?>
89 95
                         <?php elseif ($procurement["delivery_date"] != "0000-00-00") : ?>
90 96
                             <?php e($procurement["dk_delivery_date"]); ?>
91
-                        <?php else : ?>
92
-                            <?php e(t('Not given')); ?>
97
+                        <?php else {
98
+    : ?>
99
+                            <?php e(t('Not given'));
100
+}
101
+?>
93 102
                         <?php endif; ?>
94 103
                     </td>
95 104
                     <td>
@@ -99,8 +108,11 @@  discard block
 block discarded – undo
99 108
                             <?php e(t('Paid')); ?> <?php e($procurement['dk_paid_date']); ?>
100 109
                         <?php elseif ($procurement["payment_date"] != "0000-00-00") : ?>
101 110
                             <?php e($procurement["dk_payment_date"]); ?>
102
-                        <?php else : ?>
103
-                            <?php e(t('Not given')); ?>
111
+                        <?php else {
112
+    : ?>
113
+                            <?php e(t('Not given'));
114
+}
115
+?>
104 116
                         <?php endif; ?>
105 117
                     </td>
106 118
                     <td>
Please login to merge, or discard this patch.