@@ -112,9 +112,12 @@ |
||
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 |
@@ -31,10 +31,10 @@ |
||
31 | 31 | echo ' checked="checked"'; |
32 | 32 | } ?>/></td> |
33 | 33 | <td><a href="<?php e(url($y['id'])); ?>"><?php e($y['label']); ?></a></td> |
34 | - <td><a href="<?php e(url($y['id'] . '/vat')); ?>"><?php e(t('Vat')); ?></a></td> |
|
35 | - <td><a href="<?php e(url($y['id'] . '/end')); ?>"><?php e(t('End year')); ?></a></td> |
|
34 | + <td><a href="<?php e(url($y['id'].'/vat')); ?>"><?php e(t('Vat')); ?></a></td> |
|
35 | + <td><a href="<?php e(url($y['id'].'/end')); ?>"><?php e(t('End year')); ?></a></td> |
|
36 | 36 | <td class="options"> |
37 | - <a class="edit" href="<?php e(url($y['id'] . '/edit')); ?>"><?php e(t('Edit')); ?></a> |
|
37 | + <a class="edit" href="<?php e(url($y['id'].'/edit')); ?>"><?php e(t('Edit')); ?></a> |
|
38 | 38 | </td> |
39 | 39 | </tr> |
40 | 40 | <?php endforeach; ?> |
@@ -10,8 +10,11 @@ |
||
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> |
@@ -38,7 +38,7 @@ |
||
38 | 38 | <tbody> |
39 | 39 | <?php foreach ($context->getAccounts() as $account) { ?> |
40 | 40 | <tr> |
41 | - <td><a href="<?php e(url('../../account/' . $account['id'])); ?>"><?php e($account['number']); ?></a></td> |
|
41 | + <td><a href="<?php e(url('../../account/'.$account['id'])); ?>"><?php e($account['number']); ?></a></td> |
|
42 | 42 | <td><?php e($account['name']); ?></td> |
43 | 43 | <td class="amount"><?php e(amountToOutput($account['saldo_primo'])); ?></td> |
44 | 44 | <td class="amount"><?php e(amountToOutput($account['saldo_draft'])); ?></td> |
@@ -69,6 +69,9 @@ |
||
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 |
@@ -96,7 +96,7 @@ |
||
96 | 96 | <?php else : ?> |
97 | 97 | <tr> |
98 | 98 | <th><?php e($account['number']); ?></th> |
99 | - <td><?php e($account['name']); ?></td> |
|
99 | + <td><?php e($account['name']); ?></td> |
|
100 | 100 | </tr> |
101 | 101 | <?php endif; ?> |
102 | 102 | <?php endforeach; ?> |
@@ -93,9 +93,12 @@ |
||
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; ?> |
@@ -46,7 +46,7 @@ |
||
46 | 46 | e($post['dk_date']); |
47 | 47 | } ?></td> |
48 | 48 | <td><?php if (isset($post['voucher_id'])) : |
49 | -?><a href="<?php e(url('../../voucher/' . $post['voucher_id'])); ?>"><?php e($post['voucher_number']); ?></a><?php |
|
49 | +?><a href="<?php e(url('../../voucher/'.$post['voucher_id'])); ?>"><?php e($post['voucher_number']); ?></a><?php |
|
50 | 50 | endif; ?></td> |
51 | 51 | <td><?php e($post['text']); ?></td> |
52 | 52 | <td class="amount"><?php e(amountToOutput($post['debet'])); ?></td> |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | |
7 | 7 | <ul class="options"> |
8 | 8 | <li><a href="<?php e(url(null, array('create'))); ?>">Opret konto</a></li> |
9 | - <li><a class="excel" href="<?php e(url(null . '.xls')); ?>">Excel</a></li> |
|
9 | + <li><a class="excel" href="<?php e(url(null.'.xls')); ?>">Excel</a></li> |
|
10 | 10 | <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li> |
11 | 11 | </ul> |
12 | 12 | <?php |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | <?php if (count($accounts) == 0) : ?> |
31 | 31 | <div class="message-dependent"> |
32 | 32 | <p>Der er endnu ikke oprettet nogen konti.</p> |
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> |
|
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 | 35 | <?php else : ?> |
36 | 36 | <table> |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | <td colspan="4" class="headline"><?php e($account['name']); ?></td> |
65 | 65 | <?php elseif ($account['type'] == 'sum') : ?> |
66 | 66 | <td><?php e($account['name']); ?><?php if ($account['type'] == 'sum') { |
67 | - e(' ('. $account["sum_from"] . ' til ' . $account["sum_to"] . ')'); |
|
67 | + e(' ('.$account["sum_from"].' til '.$account["sum_to"].')'); |
|
68 | 68 | } ?></td> |
69 | 69 | <?php else :?> |
70 | 70 | <td><a href="<?php e(url($account['id'])); ?>"><?php e($account['name']); ?></a></td> |
@@ -32,7 +32,8 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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') { ?> |
@@ -6,6 +6,9 @@ |
||
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; ?> |
@@ -86,8 +86,8 @@ |
||
86 | 86 | <?php foreach ($posts as $post) { ?> |
87 | 87 | <tr> |
88 | 88 | <td><?php e($post['date_dk']); ?></td> |
89 | - <td><a href="<?php e('../voucher/' . $post['voucher_id']); ?>"><?php e($post['voucher_number']); ?></a></td> |
|
90 | - <td><?php e($post['account_number']) . ' ' . e($post['account_name']); ?></td> |
|
89 | + <td><a href="<?php e('../voucher/'.$post['voucher_id']); ?>"><?php e($post['voucher_number']); ?></a></td> |
|
90 | + <td><?php e($post['account_number']).' '.e($post['account_name']); ?></td> |
|
91 | 91 | <td><?php e(amountToOutput($post['debet'])); ?></td> |
92 | 92 | <td><?php e(amountToOutput($post['credit'])); ?></td> |
93 | 93 | </tr> |
@@ -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 } ?> |