@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | <select id="result_account" name="result_account_id"> |
23 | 23 | <option value=""><?php e(t('Choose')); ?></option> |
24 | 24 | <?php foreach ($status_accounts as $account) { ?> |
25 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id']==$account['id']) { |
|
25 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id'] == $account['id']) { |
|
26 | 26 | echo ' selected="selected"'; |
27 | 27 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
28 | 28 | <?php } ?> |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | <select id="capital_account" name="capital_account_id"> |
38 | 38 | <option value=""><?php e(t('Choose')); ?></option> |
39 | 39 | <?php foreach ($status_accounts as $account) { ?> |
40 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['capital_account_id']==$account['id']) { |
|
40 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['capital_account_id'] == $account['id']) { |
|
41 | 41 | echo ' selected="selected"'; |
42 | 42 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
43 | 43 | <?php } ?> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | <select id="result_account_id_start" name="result_account_id_start"> |
54 | 54 | <option value=""><?php e(t('Choose')); ?></option> |
55 | 55 | <?php foreach ($accounts as $account) { ?> |
56 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id_start']==$account['id']) { |
|
56 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id_start'] == $account['id']) { |
|
57 | 57 | echo ' selected="selected"'; |
58 | 58 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
59 | 59 | <?php } ?> |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | <select id="result_account_id_end" name="result_account_id_end"> |
65 | 65 | <option value=""><?php e(t('Choose')); ?></option> |
66 | 66 | <?php foreach ($accounts as $account) { ?> |
67 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id_end']==$account['id']) { |
|
67 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['result_account_id_end'] == $account['id']) { |
|
68 | 68 | echo ' selected="selected"'; |
69 | 69 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
70 | 70 | <?php } ?> |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | <select id="balance_account_id_start" name="balance_account_id_start"> |
76 | 76 | <option value=""><?php e(t('Choose')); ?></option> |
77 | 77 | <?php foreach ($accounts as $account) { ?> |
78 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['balance_account_id_start']==$account['id']) { |
|
78 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['balance_account_id_start'] == $account['id']) { |
|
79 | 79 | echo ' selected="selected"'; |
80 | 80 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
81 | 81 | <?php } ?> |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | <select id="balance_account_id_end" name="balance_account_id_end"> |
87 | 87 | <option value=""><?php e(t('Choose')); ?></option> |
88 | 88 | <?php foreach ($accounts as $account) { ?> |
89 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['balance_account_id_end']==$account['id']) { |
|
89 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['balance_account_id_end'] == $account['id']) { |
|
90 | 90 | echo ' selected="selected"'; |
91 | 91 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
92 | 92 | <?php } ?> |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | <select id="debtor_account" name="debtor_account_id"> |
103 | 103 | <option value=""><?php e(t('Choose')); ?></option> |
104 | 104 | <?php foreach ($status_accounts as $account) { ?> |
105 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['debtor_account_id']==$account['id']) { |
|
105 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['debtor_account_id'] == $account['id']) { |
|
106 | 106 | echo ' selected="selected"'; |
107 | 107 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
108 | 108 | <?php } ?> |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | <select id="credit_account" name="credit_account_id"> |
118 | 118 | <option value=""><?php e(t('Choose')); ?></option> |
119 | 119 | <?php foreach ($status_accounts as $account) { ?> |
120 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['credit_account_id']==$account['id']) { |
|
120 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['credit_account_id'] == $account['id']) { |
|
121 | 121 | echo ' selected="selected"'; |
122 | 122 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
123 | 123 | <?php } ?> |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | <select id="vat_in" name="vat_in_account_id"> |
136 | 136 | <option value=""><?php e(t('Choose')); ?></option> |
137 | 137 | <?php foreach ($status_accounts as $account) { ?> |
138 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_in_account_id']==$account['id']) { |
|
138 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_in_account_id'] == $account['id']) { |
|
139 | 139 | echo ' selected="selected"'; |
140 | 140 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
141 | 141 | <?php } ?> |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | <select id="vat_out" name="vat_out_account_id"> |
147 | 147 | <option value=""><?php e(t('Choose')); ?></option> |
148 | 148 | <?php foreach ($status_accounts as $account) { ?> |
149 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_out_account_id']==$account['id']) { |
|
149 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_out_account_id'] == $account['id']) { |
|
150 | 150 | echo ' selected="selected"'; |
151 | 151 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
152 | 152 | <?php } ?> |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | <select id="vat_abroad" name="vat_abroad_account_id"> |
158 | 158 | <option value=""><?php e(t('Choose')); ?></option> |
159 | 159 | <?php foreach ($status_accounts as $account) { ?> |
160 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_abroad_account_id']==$account['id']) { |
|
160 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_abroad_account_id'] == $account['id']) { |
|
161 | 161 | echo ' selected="selected"'; |
162 | 162 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
163 | 163 | <?php } ?> |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | <select id="vat_balance" name="vat_balance_account_id"> |
169 | 169 | <option value=""><?php e(t('Choose')); ?></option> |
170 | 170 | <?php foreach ($status_accounts as $account) { ?> |
171 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_balance_account_id']==$account['id']) { |
|
171 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_balance_account_id'] == $account['id']) { |
|
172 | 172 | echo ' selected="selected"'; |
173 | 173 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
174 | 174 | <?php } ?> |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | <select id="vat_free" name="vat_free_account_id"> |
181 | 181 | <option value=""><?php e(t('Choose')); ?></option> |
182 | 182 | <?php foreach ($drift_accounts as $account) { ?> |
183 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_free_account_id']==$account['id']) { |
|
183 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['vat_free_account_id'] == $account['id']) { |
|
184 | 184 | echo ' selected="selected"'; |
185 | 185 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
186 | 186 | <?php } ?> |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | <select id="eu_buy" name="eu_buy_account_id"> |
201 | 201 | <option value=""><?php e(t('Choose')); ?></option> |
202 | 202 | <?php foreach ($drift_accounts as $account) { ?> |
203 | - <option value="<?php e($account['id']); ?>"<?php if (!empty($setting['eu_buy_account_id']) and $setting['eu_buy_account_id']==$account['id']) { |
|
203 | + <option value="<?php e($account['id']); ?>"<?php if (!empty($setting['eu_buy_account_id']) and $setting['eu_buy_account_id'] == $account['id']) { |
|
204 | 204 | echo ' selected="selected"'; |
205 | 205 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
206 | 206 | <?php } ?> |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | <select id="eu_sale" name="eu_sale_account_id"> |
214 | 214 | <option value=""><?php e(t('Choose')); ?></option> |
215 | 215 | <?php foreach ($drift_accounts as $account) { ?> |
216 | - <option value="<?php e($account['id']); ?>"<?php if ($setting['eu_sale_account_id']==$account['id']) { |
|
216 | + <option value="<?php e($account['id']); ?>"<?php if ($setting['eu_sale_account_id'] == $account['id']) { |
|
217 | 217 | echo ' selected="selected"'; |
218 | 218 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
219 | 219 | <?php } ?> |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | <select id="abroad_buy" name="abroad_buy_account_id"> |
227 | 227 | <option value=""><?php e(t('Choose')); ?></option> |
228 | 228 | <?php foreach ($drift_accounts as $account) { ?> |
229 | - <option value="<?php e($account['id']); ?>"<?php if (!empty($setting['abroad_buy_account_id']) and $setting['abroad_buy_account_id']==$account['id']) { |
|
229 | + <option value="<?php e($account['id']); ?>"<?php if (!empty($setting['abroad_buy_account_id']) and $setting['abroad_buy_account_id'] == $account['id']) { |
|
230 | 230 | echo ' selected="selected"'; |
231 | 231 | } ?>><?php e($account['number']); ?> <?php e($account['name']); ?></option> |
232 | 232 | <?php } ?> |
@@ -33,13 +33,13 @@ |
||
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 |
@@ -13,8 +13,11 @@ discard block |
||
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 |
||
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 |
@@ -1,7 +1,7 @@ |
||
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) : ?> |
@@ -6,7 +6,8 @@ discard block |
||
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 |
||
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> |
@@ -22,7 +22,7 @@ |
||
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']); ?>" /> |
@@ -20,7 +20,7 @@ |
||
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']); ?>" /> |
@@ -18,7 +18,7 @@ discard block |
||
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 |
||
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"> </div> |
33 | 33 | </td> |
@@ -20,7 +20,7 @@ |
||
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']); ?>" /> |
@@ -16,15 +16,15 @@ |
||
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> |
@@ -32,6 +32,9 @@ |
||
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; ?> |
@@ -84,11 +84,11 @@ discard block |
||
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 |
||
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 |
||
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> </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 |
||
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 |
@@ -12,11 +12,14 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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> |