@@ -23,52 +23,52 @@ discard block |
||
23 | 23 | |
24 | 24 | $i++; |
25 | 25 | |
26 | -$standardaccounts[$i]['number'] = '1110'; |
|
27 | -$standardaccounts[$i]['name'] = 'Salg med moms'; |
|
26 | +$standardaccounts[$i]['number'] = '1110'; |
|
27 | +$standardaccounts[$i]['name'] = 'Salg med moms'; |
|
28 | 28 | $standardaccounts[$i]['type_key'] = '2'; |
29 | 29 | $standardaccounts[$i]['use_key'] = '2'; |
30 | -$standardaccounts[$i]['vat_key'] = '2'; |
|
30 | +$standardaccounts[$i]['vat_key'] = '2'; |
|
31 | 31 | |
32 | 32 | $i++; |
33 | 33 | |
34 | -$standardaccounts[$i]['number'] = '1120'; |
|
35 | -$standardaccounts[$i]['name'] = 'Salg uden moms'; |
|
34 | +$standardaccounts[$i]['number'] = '1120'; |
|
35 | +$standardaccounts[$i]['name'] = 'Salg uden moms'; |
|
36 | 36 | $standardaccounts[$i]['type_key'] = '2'; |
37 | 37 | $standardaccounts[$i]['use_key'] = '2'; |
38 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
38 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
39 | 39 | |
40 | 40 | $i++; |
41 | 41 | |
42 | 42 | $standardaccounts[$i]['number'] = '1990'; |
43 | -$standardaccounts[$i]['name'] = 'Nettoomsætning'; |
|
44 | -$standardaccounts[$i]['type_key'] = '5'; |
|
43 | +$standardaccounts[$i]['name'] = 'Nettoomsætning'; |
|
44 | +$standardaccounts[$i]['type_key'] = '5'; |
|
45 | 45 | $standardaccounts[$i]['vat_key'] = '0'; |
46 | 46 | $standardaccounts[$i]['sum_from'] = '2'; |
47 | 47 | $standardaccounts[$i]['sum_to'] = '1989'; |
48 | -$standardaccounts[$i]['use_key'] = '1'; |
|
48 | +$standardaccounts[$i]['use_key'] = '1'; |
|
49 | 49 | |
50 | 50 | $i++; |
51 | 51 | |
52 | 52 | /**********************************************/ |
53 | 53 | |
54 | -$standardaccounts[$i]['number'] = '2000'; |
|
55 | -$standardaccounts[$i]['name'] = 'Udgifter'; |
|
54 | +$standardaccounts[$i]['number'] = '2000'; |
|
55 | +$standardaccounts[$i]['name'] = 'Udgifter'; |
|
56 | 56 | $standardaccounts[$i]['type_key'] = '1'; |
57 | 57 | $standardaccounts[$i]['use_key'] = '1'; |
58 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
58 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
59 | 59 | |
60 | 60 | $i++; |
61 | 61 | |
62 | -$standardaccounts[$i]['number'] = '2100'; |
|
63 | -$standardaccounts[$i]['name'] = 'Vareforbrug fra varelager'; |
|
62 | +$standardaccounts[$i]['number'] = '2100'; |
|
63 | +$standardaccounts[$i]['name'] = 'Vareforbrug fra varelager'; |
|
64 | 64 | $standardaccounts[$i]['type_key'] = '2'; |
65 | 65 | $standardaccounts[$i]['use_key'] = '3'; |
66 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
66 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
67 | 67 | |
68 | 68 | $i++; |
69 | 69 | |
70 | -$standardaccounts[$i]['number'] = '4100'; |
|
71 | -$standardaccounts[$i]['name'] = 'EU-purchases'; |
|
70 | +$standardaccounts[$i]['number'] = '4100'; |
|
71 | +$standardaccounts[$i]['name'] = 'EU-purchases'; |
|
72 | 72 | $standardaccounts[$i]['type_key'] = '2'; |
73 | 73 | $standardaccounts[$i]['use_key'] = '3'; |
74 | 74 | $standardaccounts[$i]['vat_key'] = '0'; |
@@ -76,154 +76,154 @@ discard block |
||
76 | 76 | |
77 | 77 | $i++; |
78 | 78 | |
79 | -$standardaccounts[$i]['number'] = '4700'; |
|
80 | -$standardaccounts[$i]['name'] = 'Varekøb uden for EU'; |
|
79 | +$standardaccounts[$i]['number'] = '4700'; |
|
80 | +$standardaccounts[$i]['name'] = 'Varekøb uden for EU'; |
|
81 | 81 | $standardaccounts[$i]['type_key'] = '2'; |
82 | 82 | $standardaccounts[$i]['use_key'] = '3'; |
83 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
84 | -$standardaccounts[$i]['buy_abroad'] = 1; |
|
83 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
84 | +$standardaccounts[$i]['buy_abroad'] = 1; |
|
85 | 85 | |
86 | 86 | $i++; |
87 | 87 | |
88 | 88 | $standardaccounts[$i]['number'] = '4990'; |
89 | -$standardaccounts[$i]['name'] = 'Dækningsbidrag'; |
|
90 | -$standardaccounts[$i]['type_key'] = '5'; |
|
89 | +$standardaccounts[$i]['name'] = 'Dækningsbidrag'; |
|
90 | +$standardaccounts[$i]['type_key'] = '5'; |
|
91 | 91 | $standardaccounts[$i]['vat_key'] = '0'; |
92 | 92 | $standardaccounts[$i]['sum_from'] = '1'; |
93 | 93 | $standardaccounts[$i]['sum_to'] = '4989'; |
94 | -$standardaccounts[$i]['use_key'] = '1'; |
|
94 | +$standardaccounts[$i]['use_key'] = '1'; |
|
95 | 95 | |
96 | 96 | $i++; |
97 | 97 | |
98 | 98 | $standardaccounts[$i]['number'] = '7000'; |
99 | -$standardaccounts[$i]['name'] = 'Kontorartikler'; |
|
99 | +$standardaccounts[$i]['name'] = 'Kontorartikler'; |
|
100 | 100 | $standardaccounts[$i]['type_key'] = '2'; |
101 | 101 | $standardaccounts[$i]['vat_key'] = '1'; |
102 | 102 | $standardaccounts[$i]['use_key'] = '3'; |
103 | 103 | |
104 | 104 | $i++; |
105 | 105 | |
106 | -$standardaccounts[$i]['number'] = '7200'; |
|
107 | -$standardaccounts[$i]['name'] = 'Porto'; |
|
106 | +$standardaccounts[$i]['number'] = '7200'; |
|
107 | +$standardaccounts[$i]['name'] = 'Porto'; |
|
108 | 108 | $standardaccounts[$i]['type_key'] = '2'; |
109 | 109 | $standardaccounts[$i]['use_key'] = '3'; |
110 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
110 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
111 | 111 | |
112 | 112 | $i++; |
113 | 113 | |
114 | -$standardaccounts[$i]['number'] = '7400'; |
|
115 | -$standardaccounts[$i]['name'] = 'Småanskaffelser'; |
|
114 | +$standardaccounts[$i]['number'] = '7400'; |
|
115 | +$standardaccounts[$i]['name'] = 'Småanskaffelser'; |
|
116 | 116 | $standardaccounts[$i]['type_key'] = '2'; |
117 | 117 | $standardaccounts[$i]['use_key'] = '3'; |
118 | -$standardaccounts[$i]['vat_key'] = '1'; |
|
118 | +$standardaccounts[$i]['vat_key'] = '1'; |
|
119 | 119 | |
120 | 120 | $i++; |
121 | 121 | |
122 | -$standardaccounts[$i]['number'] = '7600'; |
|
123 | -$standardaccounts[$i]['name'] = 'Telefon'; |
|
122 | +$standardaccounts[$i]['number'] = '7600'; |
|
123 | +$standardaccounts[$i]['name'] = 'Telefon'; |
|
124 | 124 | $standardaccounts[$i]['type_key'] = '2'; |
125 | 125 | $standardaccounts[$i]['use_key'] = '3'; |
126 | -$standardaccounts[$i]['vat_key'] = '1'; |
|
126 | +$standardaccounts[$i]['vat_key'] = '1'; |
|
127 | 127 | |
128 | 128 | $i++; |
129 | 129 | |
130 | -$standardaccounts[$i]['number'] = '7650'; |
|
131 | -$standardaccounts[$i]['name'] = 'Internet og webhotel'; |
|
130 | +$standardaccounts[$i]['number'] = '7650'; |
|
131 | +$standardaccounts[$i]['name'] = 'Internet og webhotel'; |
|
132 | 132 | $standardaccounts[$i]['type_key'] = '2'; |
133 | 133 | $standardaccounts[$i]['use_key'] = '3'; |
134 | -$standardaccounts[$i]['vat_key'] = '1'; |
|
134 | +$standardaccounts[$i]['vat_key'] = '1'; |
|
135 | 135 | |
136 | 136 | $i++; |
137 | 137 | |
138 | -$standardaccounts[$i]['number'] = '7800'; |
|
139 | -$standardaccounts[$i]['name'] = 'Diverse incl. moms'; |
|
138 | +$standardaccounts[$i]['number'] = '7800'; |
|
139 | +$standardaccounts[$i]['name'] = 'Diverse incl. moms'; |
|
140 | 140 | $standardaccounts[$i]['type_key'] = '2'; |
141 | 141 | $standardaccounts[$i]['use_key'] = '3'; |
142 | -$standardaccounts[$i]['vat_key'] = '1'; |
|
142 | +$standardaccounts[$i]['vat_key'] = '1'; |
|
143 | 143 | |
144 | 144 | $i++; |
145 | 145 | |
146 | -$standardaccounts[$i]['number'] = '7900'; |
|
147 | -$standardaccounts[$i]['name'] = 'Diverse excl. moms'; |
|
146 | +$standardaccounts[$i]['number'] = '7900'; |
|
147 | +$standardaccounts[$i]['name'] = 'Diverse excl. moms'; |
|
148 | 148 | $standardaccounts[$i]['type_key'] = '2'; |
149 | 149 | $standardaccounts[$i]['use_key'] = '3'; |
150 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
150 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
151 | 151 | |
152 | 152 | $i++; |
153 | 153 | |
154 | 154 | |
155 | 155 | $standardaccounts[$i]['number'] = '39990'; |
156 | -$standardaccounts[$i]['name'] = 'Resultat før renter'; |
|
157 | -$standardaccounts[$i]['type_key'] = '5'; |
|
156 | +$standardaccounts[$i]['name'] = 'Resultat før renter'; |
|
157 | +$standardaccounts[$i]['type_key'] = '5'; |
|
158 | 158 | $standardaccounts[$i]['vat_key'] = '0'; |
159 | 159 | $standardaccounts[$i]['sum_from'] = '1'; |
160 | 160 | $standardaccounts[$i]['sum_to'] = '39989'; |
161 | -$standardaccounts[$i]['use_key'] = '1'; |
|
161 | +$standardaccounts[$i]['use_key'] = '1'; |
|
162 | 162 | |
163 | 163 | $i++; |
164 | 164 | |
165 | 165 | /**********************************************/ |
166 | 166 | |
167 | -$standardaccounts[$i]['number'] = '40000'; |
|
168 | -$standardaccounts[$i]['name'] = 'Finansieringsindtægter'; |
|
167 | +$standardaccounts[$i]['number'] = '40000'; |
|
168 | +$standardaccounts[$i]['name'] = 'Finansieringsindtægter'; |
|
169 | 169 | $standardaccounts[$i]['type_key'] = '1'; |
170 | 170 | $standardaccounts[$i]['use_key'] = '1'; |
171 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
171 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
172 | 172 | |
173 | 173 | |
174 | 174 | $i++; |
175 | 175 | |
176 | -$standardaccounts[$i]['number'] = '41000'; |
|
177 | -$standardaccounts[$i]['name'] = 'Renteindtægter'; |
|
176 | +$standardaccounts[$i]['number'] = '41000'; |
|
177 | +$standardaccounts[$i]['name'] = 'Renteindtægter'; |
|
178 | 178 | $standardaccounts[$i]['type_key'] = '2'; |
179 | 179 | $standardaccounts[$i]['use_key'] = '1'; |
180 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
180 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
181 | 181 | |
182 | 182 | $i++; |
183 | 183 | |
184 | -$standardaccounts[$i]['number'] = '43000'; |
|
185 | -$standardaccounts[$i]['name'] = 'Finansieringsudgifter'; |
|
184 | +$standardaccounts[$i]['number'] = '43000'; |
|
185 | +$standardaccounts[$i]['name'] = 'Finansieringsudgifter'; |
|
186 | 186 | $standardaccounts[$i]['type_key'] = '1'; |
187 | 187 | $standardaccounts[$i]['use_key'] = '1'; |
188 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
188 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
189 | 189 | |
190 | 190 | $i++; |
191 | 191 | |
192 | -$standardaccounts[$i]['number'] = '43100'; |
|
193 | -$standardaccounts[$i]['name'] = 'Renteudgifter'; |
|
192 | +$standardaccounts[$i]['number'] = '43100'; |
|
193 | +$standardaccounts[$i]['name'] = 'Renteudgifter'; |
|
194 | 194 | $standardaccounts[$i]['type_key'] = '2'; |
195 | 195 | $standardaccounts[$i]['use_key'] = '1'; |
196 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
196 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
197 | 197 | |
198 | 198 | $i++; |
199 | 199 | |
200 | 200 | |
201 | -$standardaccounts[$i]['number'] = '43850'; |
|
202 | -$standardaccounts[$i]['name'] = 'Bankgebyr'; |
|
201 | +$standardaccounts[$i]['number'] = '43850'; |
|
202 | +$standardaccounts[$i]['name'] = 'Bankgebyr'; |
|
203 | 203 | $standardaccounts[$i]['type_key'] = '2'; |
204 | 204 | $standardaccounts[$i]['use_key'] = '1'; |
205 | -$standardaccounts[$i]['vat_key'] = '0'; |
|
205 | +$standardaccounts[$i]['vat_key'] = '0'; |
|
206 | 206 | |
207 | 207 | $i++; |
208 | 208 | |
209 | 209 | $standardaccounts[$i]['number'] = '43990'; |
210 | -$standardaccounts[$i]['name'] = 'Finansieringsudgifter'; |
|
211 | -$standardaccounts[$i]['type_key'] = '5'; |
|
210 | +$standardaccounts[$i]['name'] = 'Finansieringsudgifter'; |
|
211 | +$standardaccounts[$i]['type_key'] = '5'; |
|
212 | 212 | $standardaccounts[$i]['vat_key'] = '0'; |
213 | 213 | $standardaccounts[$i]['sum_from'] = '43000'; |
214 | 214 | $standardaccounts[$i]['sum_to'] = '43995'; |
215 | -$standardaccounts[$i]['use_key'] = '1'; |
|
215 | +$standardaccounts[$i]['use_key'] = '1'; |
|
216 | 216 | |
217 | 217 | $i++; |
218 | 218 | |
219 | 219 | $standardaccounts[$i]['number'] = '49990'; |
220 | -$standardaccounts[$i]['name'] = 'Periodens resultat'; |
|
221 | -$standardaccounts[$i]['type_key'] = '5'; |
|
220 | +$standardaccounts[$i]['name'] = 'Periodens resultat'; |
|
221 | +$standardaccounts[$i]['type_key'] = '5'; |
|
222 | 222 | $standardaccounts[$i]['vat_key'] = '0'; |
223 | 223 | $standardaccounts[$i]['sum_from'] = '1'; |
224 | 224 | $standardaccounts[$i]['sum_to'] = '43989'; |
225 | -$standardaccounts[$i]['use_key'] = '1'; |
|
226 | -$standardaccounts[$i]['result_account_id_end'] = true; |
|
225 | +$standardaccounts[$i]['use_key'] = '1'; |
|
226 | +$standardaccounts[$i]['result_account_id_end'] = true; |
|
227 | 227 | |
228 | 228 | |
229 | 229 | $i++; |
@@ -231,18 +231,18 @@ discard block |
||
231 | 231 | /**********************************************/ |
232 | 232 | |
233 | 233 | $standardaccounts[$i]['number'] = '50000'; |
234 | -$standardaccounts[$i]['name'] = 'Balance'; |
|
234 | +$standardaccounts[$i]['name'] = 'Balance'; |
|
235 | 235 | $standardaccounts[$i]['type_key'] = '1'; |
236 | 236 | $standardaccounts[$i]['vat_key'] = '0'; |
237 | 237 | $standardaccounts[$i]['use_key'] = '1'; |
238 | -$standardaccounts[$i]['balance_account_id_start'] = true; |
|
238 | +$standardaccounts[$i]['balance_account_id_start'] = true; |
|
239 | 239 | |
240 | 240 | $i++; |
241 | 241 | |
242 | 242 | /**********************************************/ |
243 | 243 | |
244 | 244 | $standardaccounts[$i]['number'] = '50010'; |
245 | -$standardaccounts[$i]['name'] = 'Aktiver'; |
|
245 | +$standardaccounts[$i]['name'] = 'Aktiver'; |
|
246 | 246 | $standardaccounts[$i]['type_key'] = '1'; |
247 | 247 | $standardaccounts[$i]['vat_key'] = '0'; |
248 | 248 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | |
252 | 252 | |
253 | 253 | $standardaccounts[$i]['number'] = '50800'; |
254 | -$standardaccounts[$i]['name'] = 'Driftssmidler'; |
|
254 | +$standardaccounts[$i]['name'] = 'Driftssmidler'; |
|
255 | 255 | $standardaccounts[$i]['type_key'] = '3'; |
256 | 256 | $standardaccounts[$i]['vat_key'] = '1'; |
257 | 257 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $i++; |
260 | 260 | |
261 | 261 | $standardaccounts[$i]['number'] = '50810'; |
262 | -$standardaccounts[$i]['name'] = 'Tilgang i årets løb'; |
|
262 | +$standardaccounts[$i]['name'] = 'Tilgang i årets løb'; |
|
263 | 263 | $standardaccounts[$i]['type_key'] = '3'; |
264 | 264 | $standardaccounts[$i]['vat_key'] = '1'; |
265 | 265 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | $i++; |
268 | 268 | |
269 | 269 | $standardaccounts[$i]['number'] = '50820'; |
270 | -$standardaccounts[$i]['name'] = 'Afgang i året'; |
|
270 | +$standardaccounts[$i]['name'] = 'Afgang i året'; |
|
271 | 271 | $standardaccounts[$i]['type_key'] = '3'; |
272 | 272 | $standardaccounts[$i]['vat_key'] = '2'; |
273 | 273 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | $i++; |
276 | 276 | |
277 | 277 | $standardaccounts[$i]['number'] = '50830'; |
278 | -$standardaccounts[$i]['name'] = 'Akkumulerede afskrivning på driftssmidler'; |
|
278 | +$standardaccounts[$i]['name'] = 'Akkumulerede afskrivning på driftssmidler'; |
|
279 | 279 | $standardaccounts[$i]['type_key'] = '3'; |
280 | 280 | $standardaccounts[$i]['vat_key'] = '0'; |
281 | 281 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | |
285 | 285 | |
286 | 286 | $standardaccounts[$i]['number'] = '55100'; |
287 | -$standardaccounts[$i]['name'] = 'Varelager'; |
|
287 | +$standardaccounts[$i]['name'] = 'Varelager'; |
|
288 | 288 | $standardaccounts[$i]['type_key'] = '3'; |
289 | 289 | $standardaccounts[$i]['vat_key'] = '1'; |
290 | 290 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $i++; |
293 | 293 | |
294 | 294 | $standardaccounts[$i]['number'] = '56100'; |
295 | -$standardaccounts[$i]['name'] = 'Debitor'; |
|
295 | +$standardaccounts[$i]['name'] = 'Debitor'; |
|
296 | 296 | $standardaccounts[$i]['type_key'] = '3'; |
297 | 297 | $standardaccounts[$i]['vat_key'] = '0'; |
298 | 298 | $standardaccounts[$i]['use_key'] = '4'; |
@@ -302,40 +302,40 @@ discard block |
||
302 | 302 | $i++; |
303 | 303 | |
304 | 304 | $standardaccounts[$i]['number'] = '58000'; |
305 | -$standardaccounts[$i]['name'] = 'Bank, folio'; |
|
305 | +$standardaccounts[$i]['name'] = 'Bank, folio'; |
|
306 | 306 | $standardaccounts[$i]['type_key'] = '3'; |
307 | 307 | $standardaccounts[$i]['vat_key'] = '0'; |
308 | 308 | $standardaccounts[$i]['use_key'] = '4'; |
309 | -$standardaccounts[$i]['balance_account'] = 1; |
|
309 | +$standardaccounts[$i]['balance_account'] = 1; |
|
310 | 310 | |
311 | 311 | $i++; |
312 | 312 | |
313 | 313 | $standardaccounts[$i]['number'] = '58200'; |
314 | -$standardaccounts[$i]['name'] = 'Kassen'; |
|
314 | +$standardaccounts[$i]['name'] = 'Kassen'; |
|
315 | 315 | $standardaccounts[$i]['type_key'] = '3'; |
316 | 316 | $standardaccounts[$i]['vat_key'] = '0'; |
317 | 317 | $standardaccounts[$i]['use_key'] = '4'; |
318 | -$standardaccounts[$i]['balance_account'] = 1; |
|
318 | +$standardaccounts[$i]['balance_account'] = 1; |
|
319 | 319 | |
320 | 320 | $i++; |
321 | 321 | |
322 | 322 | $standardaccounts[$i]['number'] = '58990'; |
323 | -$standardaccounts[$i]['name'] = 'Likvide beholdninger'; |
|
324 | -$standardaccounts[$i]['type_key'] = '3'; |
|
323 | +$standardaccounts[$i]['name'] = 'Likvide beholdninger'; |
|
324 | +$standardaccounts[$i]['type_key'] = '3'; |
|
325 | 325 | $standardaccounts[$i]['vat_key'] = '0'; |
326 | 326 | $standardaccounts[$i]['sum_from'] = '58000'; |
327 | 327 | $standardaccounts[$i]['sum_to'] = '58995'; |
328 | -$standardaccounts[$i]['use_key'] = '1'; |
|
328 | +$standardaccounts[$i]['use_key'] = '1'; |
|
329 | 329 | |
330 | 330 | $i++; |
331 | 331 | |
332 | 332 | $standardaccounts[$i]['number'] = '58995'; |
333 | -$standardaccounts[$i]['name'] = 'Aktiver i alt'; |
|
334 | -$standardaccounts[$i]['type_key'] = '5'; |
|
333 | +$standardaccounts[$i]['name'] = 'Aktiver i alt'; |
|
334 | +$standardaccounts[$i]['type_key'] = '5'; |
|
335 | 335 | $standardaccounts[$i]['vat_key'] = '0'; |
336 | 336 | $standardaccounts[$i]['sum_from'] = '50000'; |
337 | 337 | $standardaccounts[$i]['sum_to'] = '58995'; |
338 | -$standardaccounts[$i]['use_key'] = '1'; |
|
338 | +$standardaccounts[$i]['use_key'] = '1'; |
|
339 | 339 | |
340 | 340 | $i++; |
341 | 341 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | /**********************************************/ |
344 | 344 | |
345 | 345 | $standardaccounts[$i]['number'] = '60000'; |
346 | -$standardaccounts[$i]['name'] = 'Passiver'; |
|
346 | +$standardaccounts[$i]['name'] = 'Passiver'; |
|
347 | 347 | $standardaccounts[$i]['type_key'] = '1'; |
348 | 348 | $standardaccounts[$i]['vat_key'] = '0'; |
349 | 349 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | $i++; |
352 | 352 | |
353 | 353 | $standardaccounts[$i]['number'] = '60500'; |
354 | -$standardaccounts[$i]['name'] = 'Kapitalkonto'; |
|
354 | +$standardaccounts[$i]['name'] = 'Kapitalkonto'; |
|
355 | 355 | $standardaccounts[$i]['type_key'] = '4'; |
356 | 356 | $standardaccounts[$i]['vat_key'] = '0'; |
357 | 357 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | $i++; |
361 | 361 | |
362 | 362 | $standardaccounts[$i]['number'] = '60800'; |
363 | -$standardaccounts[$i]['name'] = 'Årets resultat'; |
|
363 | +$standardaccounts[$i]['name'] = 'Årets resultat'; |
|
364 | 364 | $standardaccounts[$i]['type_key'] = '4'; |
365 | 365 | $standardaccounts[$i]['vat_key'] = '0'; |
366 | 366 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | $i++; |
370 | 370 | |
371 | 371 | $standardaccounts[$i]['number'] = '61000'; |
372 | -$standardaccounts[$i]['name'] = 'Privatkonto'; |
|
372 | +$standardaccounts[$i]['name'] = 'Privatkonto'; |
|
373 | 373 | $standardaccounts[$i]['type_key'] = '4'; |
374 | 374 | $standardaccounts[$i]['vat_key'] = '0'; |
375 | 375 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | |
380 | 380 | $standardaccounts[$i]['number'] = '63100'; |
381 | -$standardaccounts[$i]['name'] = 'Kortfristet gæld'; |
|
381 | +$standardaccounts[$i]['name'] = 'Kortfristet gæld'; |
|
382 | 382 | $standardaccounts[$i]['type_key'] = '4'; |
383 | 383 | $standardaccounts[$i]['vat_key'] = '0'; |
384 | 384 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | $i++; |
387 | 387 | |
388 | 388 | $standardaccounts[$i]['number'] = '65100'; |
389 | -$standardaccounts[$i]['name'] = 'Langfristet gæld'; |
|
389 | +$standardaccounts[$i]['name'] = 'Langfristet gæld'; |
|
390 | 390 | $standardaccounts[$i]['type_key'] = '4'; |
391 | 391 | $standardaccounts[$i]['vat_key'] = '0'; |
392 | 392 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | /**********************************************/ |
398 | 398 | |
399 | 399 | $standardaccounts[$i]['number'] = '66000'; |
400 | -$standardaccounts[$i]['name'] = 'Momskonti'; |
|
400 | +$standardaccounts[$i]['name'] = 'Momskonti'; |
|
401 | 401 | $standardaccounts[$i]['type_key'] = '1'; |
402 | 402 | $standardaccounts[$i]['vat_key'] = '0'; |
403 | 403 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $i++; |
406 | 406 | |
407 | 407 | $standardaccounts[$i]['number'] = '66100'; |
408 | -$standardaccounts[$i]['name'] = 'Moms, indgående, køb'; |
|
408 | +$standardaccounts[$i]['name'] = 'Moms, indgående, køb'; |
|
409 | 409 | $standardaccounts[$i]['type_key'] = '4'; |
410 | 410 | $standardaccounts[$i]['vat_key'] = '0'; |
411 | 411 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | $i++; |
415 | 415 | |
416 | 416 | $standardaccounts[$i]['number'] = '66150'; |
417 | -$standardaccounts[$i]['name'] = 'Moms af varekøb i udlandet'; |
|
417 | +$standardaccounts[$i]['name'] = 'Moms af varekøb i udlandet'; |
|
418 | 418 | $standardaccounts[$i]['type_key'] = '4'; |
419 | 419 | $standardaccounts[$i]['vat_key'] = '0'; |
420 | 420 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | $i++; |
424 | 424 | |
425 | 425 | $standardaccounts[$i]['number'] = '66200'; |
426 | -$standardaccounts[$i]['name'] = 'Moms, udgående, salg'; |
|
426 | +$standardaccounts[$i]['name'] = 'Moms, udgående, salg'; |
|
427 | 427 | $standardaccounts[$i]['type_key'] = '4'; |
428 | 428 | $standardaccounts[$i]['vat_key'] = '0'; |
429 | 429 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | $i++; |
433 | 433 | |
434 | 434 | $standardaccounts[$i]['number'] = '66900'; |
435 | -$standardaccounts[$i]['name'] = 'Moms, tilsvar'; |
|
435 | +$standardaccounts[$i]['name'] = 'Moms, tilsvar'; |
|
436 | 436 | $standardaccounts[$i]['type_key'] = '4'; |
437 | 437 | $standardaccounts[$i]['vat_key'] = '0'; |
438 | 438 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -441,30 +441,30 @@ discard block |
||
441 | 441 | $i++; |
442 | 442 | |
443 | 443 | $standardaccounts[$i]['number'] = '66990'; |
444 | -$standardaccounts[$i]['name'] = 'Passiver i alt'; |
|
445 | -$standardaccounts[$i]['type_key'] = '5'; |
|
444 | +$standardaccounts[$i]['name'] = 'Passiver i alt'; |
|
445 | +$standardaccounts[$i]['type_key'] = '5'; |
|
446 | 446 | $standardaccounts[$i]['vat_key'] = '0'; |
447 | 447 | $standardaccounts[$i]['sum_from'] = '60000'; |
448 | 448 | $standardaccounts[$i]['sum_to'] = '70000'; |
449 | -$standardaccounts[$i]['use_key'] = '1'; |
|
450 | -$standardaccounts[$i]['balance_account_id_end'] = true; |
|
449 | +$standardaccounts[$i]['use_key'] = '1'; |
|
450 | +$standardaccounts[$i]['balance_account_id_end'] = true; |
|
451 | 451 | |
452 | 452 | |
453 | 453 | $i++; |
454 | 454 | |
455 | 455 | $standardaccounts[$i]['number'] = '98000'; |
456 | -$standardaccounts[$i]['name'] = 'Balancen i alt'; |
|
457 | -$standardaccounts[$i]['type_key'] = '5'; |
|
456 | +$standardaccounts[$i]['name'] = 'Balancen i alt'; |
|
457 | +$standardaccounts[$i]['type_key'] = '5'; |
|
458 | 458 | $standardaccounts[$i]['vat_key'] = '0'; |
459 | 459 | $standardaccounts[$i]['sum_from'] = '50000'; |
460 | 460 | $standardaccounts[$i]['sum_to'] = '97999'; |
461 | -$standardaccounts[$i]['use_key'] = '1'; |
|
461 | +$standardaccounts[$i]['use_key'] = '1'; |
|
462 | 462 | |
463 | 463 | |
464 | 464 | $i++; |
465 | 465 | |
466 | 466 | $standardaccounts[$i]['number'] = '99000'; |
467 | -$standardaccounts[$i]['name'] = 'Kontrol'; |
|
467 | +$standardaccounts[$i]['name'] = 'Kontrol'; |
|
468 | 468 | $standardaccounts[$i]['type_key'] = '1'; |
469 | 469 | $standardaccounts[$i]['vat_key'] = '0'; |
470 | 470 | $standardaccounts[$i]['use_key'] = '1'; |
@@ -473,11 +473,11 @@ discard block |
||
473 | 473 | $i++; |
474 | 474 | |
475 | 475 | $standardaccounts[$i]['number'] = '99990'; |
476 | -$standardaccounts[$i]['name'] = 'Balancekontrol'; |
|
477 | -$standardaccounts[$i]['type_key'] = '5'; |
|
476 | +$standardaccounts[$i]['name'] = 'Balancekontrol'; |
|
477 | +$standardaccounts[$i]['type_key'] = '5'; |
|
478 | 478 | $standardaccounts[$i]['vat_key'] = '0'; |
479 | 479 | $standardaccounts[$i]['sum_from'] = '1'; |
480 | 480 | $standardaccounts[$i]['sum_to'] = '99990'; |
481 | -$standardaccounts[$i]['use_key'] = '1'; |
|
481 | +$standardaccounts[$i]['use_key'] = '1'; |
|
482 | 482 | |
483 | 483 | $i++; |
@@ -277,7 +277,7 @@ |
||
277 | 277 | $var['amount'] = abs(round($this->get('saldo_vat_in'))); |
278 | 278 | |
279 | 279 | if (!$voucher->saveInDaybook($var, $skip_daybook)) { |
280 | - $this->error->set('Systemet kunne ikke opdatere indgående moms'); |
|
280 | + $this->error->set('Systemet kunne ikke opdatere indgående moms'); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | if ($this->error->isError()) { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public function __construct($year_object, $id = 0) |
18 | 18 | { |
19 | 19 | $this->year = $year_object; |
20 | - $this->id = (int) $id; |
|
20 | + $this->id = (int)$id; |
|
21 | 21 | $this->error = new Intraface_Error; |
22 | 22 | if ($this->id > 0) { |
23 | 23 | $this->load(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | private function load() |
28 | 28 | { |
29 | 29 | $db = new DB_Sql; |
30 | - $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE id = " . $this->id . " AND intranet_id = " . $this->year->kernel->intranet->get('id')); |
|
30 | + $db->query("SELECT *, DATE_FORMAT(date_start, '%d-%m-%Y') AS date_start_dk, DATE_FORMAT(date_end, '%d-%m-%Y') AS date_end_dk FROM accounting_vat_period WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id')); |
|
31 | 31 | |
32 | 32 | if (!$db->nextRecord()) { |
33 | 33 | return false; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | public function isStated() |
52 | 52 | { |
53 | 53 | $db = new DB_Sql; |
54 | - $db->query("SELECT status FROM accounting_vat_period WHERE status = 2 AND id = " . $this->id . " AND intranet_id=" . $this->year->kernel->intranet->get('id'). " AND active = 1"); |
|
54 | + $db->query("SELECT status FROM accounting_vat_period WHERE status = 2 AND id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id')." AND active = 1"); |
|
55 | 55 | if ($db->nextRecord()) { |
56 | 56 | return $db->numRows(); |
57 | 57 | } |
@@ -84,15 +84,15 @@ discard block |
||
84 | 84 | return 0; |
85 | 85 | } |
86 | 86 | $db = new DB_Sql; |
87 | - if ($this->id == 0 or $type=='insert') { |
|
87 | + if ($this->id == 0 or $type == 'insert') { |
|
88 | 88 | $sql_type = "INSERT INTO "; |
89 | 89 | $sql_end = ", date_created = NOW()"; |
90 | 90 | } else { |
91 | 91 | $sql_type = "UPDATE "; |
92 | - $sql_end = " WHERE id = " . $this->id; |
|
92 | + $sql_end = " WHERE id = ".$this->id; |
|
93 | 93 | } |
94 | 94 | |
95 | - $sql = $sql_type . "accounting_vat_period SET user_id = ".$this->year->kernel->user->get('id').", label = '".$input['label']."', date_start = '".$input['date_start']."', date_end='".$input['date_end']."', date_updated=NOW(), intranet_id=".$this->year->kernel->intranet->get('id').", year_id=".$this->year->get('id')."" . $sql_end; |
|
95 | + $sql = $sql_type."accounting_vat_period SET user_id = ".$this->year->kernel->user->get('id').", label = '".$input['label']."', date_start = '".$input['date_start']."', date_end='".$input['date_end']."', date_updated=NOW(), intranet_id=".$this->year->kernel->intranet->get('id').", year_id=".$this->year->get('id')."".$sql_end; |
|
96 | 96 | |
97 | 97 | $db->query($sql); |
98 | 98 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | protected function setStated($voucher_id) |
113 | 113 | { |
114 | 114 | $db = new DB_Sql; |
115 | - $db->query("UPDATE accounting_vat_period SET voucher_id = '".(int)$voucher_id."', status = 2 WHERE id = ".$this->id." AND intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id=". $this->year->get('id')); |
|
115 | + $db->query("UPDATE accounting_vat_period SET voucher_id = '".(int)$voucher_id."', status = 2 WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id=".$this->year->get('id')); |
|
116 | 116 | return true; |
117 | 117 | } |
118 | 118 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | $this->error->set('Du kan ikke slette en periode, der er bogf�rt'); |
127 | 127 | return false; |
128 | 128 | } |
129 | - $db->query("UPDATE accounting_vat_period SET active = 0, date_updated = NOW() WHERE id = " . $this->id . " AND intranet_id = " . $this->year->kernel->intranet->get('id')); |
|
129 | + $db->query("UPDATE accounting_vat_period SET active = 0, date_updated = NOW() WHERE id = ".$this->id." AND intranet_id = ".$this->year->kernel->intranet->get('id')); |
|
130 | 130 | return true; |
131 | 131 | } |
132 | 132 | |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | // ganges med -1 for at få rigtigt fortegn til udregning |
149 | 149 | $this->value['saldo_vat_out'] = $account_vat_in->get('saldo'); |
150 | - $saldo_total += -1 * $this->value['saldo_vat_out']; // total |
|
150 | + $saldo_total += -1*$this->value['saldo_vat_out']; // total |
|
151 | 151 | |
152 | 152 | // Moms af varekøb i udlandet |
153 | 153 | // Dette beløb er et udregnet beløb, som udregnes under bogføringen |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | // ganges med -1 for at få rigtigt fortegn til udregning |
159 | 159 | $this->value['saldo_vat_abroad'] = $account_vat_abroad->get('saldo'); |
160 | - $saldo_total += -1 * $this->value['saldo_vat_abroad']; |
|
160 | + $saldo_total += -1*$this->value['saldo_vat_abroad']; |
|
161 | 161 | |
162 | 162 | // Købsmoms |
163 | 163 | // Købsmomsen inkluderer også den udregnede moms af moms af varekøb i udlandet. |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | $voucher_file = new VoucherFile($voucher); |
290 | 290 | if (!$voucher_file->save(array( |
291 | - 'description' => 'Momsafregning ' . $this->get('date_start_dk') . ' til ' . $this->get('date_end_dk'), |
|
291 | + 'description' => 'Momsafregning '.$this->get('date_start_dk').' til '.$this->get('date_end_dk'), |
|
292 | 292 | 'belong_to' => 'vat', |
293 | 293 | 'belong_to_id' => $this->getId()))) { |
294 | 294 | $this->error->merge($voucher_file->error->getMessage()); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | if (count($year->getList()) == 0) : |
16 | 16 | $_advice[] = array( |
17 | 17 | 'msg' => 'no accounting year has been created', |
18 | - 'link' => $year_module->getPath() . 'year?create', |
|
18 | + 'link' => $year_module->getPath().'year?create', |
|
19 | 19 | 'module' => $year_module->getName() |
20 | 20 | ); |
21 | 21 | endif; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | throw new Exception('VoucherFile:: Voucher ikke gyldig'); |
24 | 24 | } |
25 | 25 | $this->voucher = $voucher; |
26 | - $this->id = (int) $id; |
|
26 | + $this->id = (int)$id; |
|
27 | 27 | $this->error = new Intraface_Error; |
28 | 28 | } |
29 | 29 | |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | |
50 | 50 | $db = new DB_Sql(); |
51 | 51 | $sql = "SELECT id FROM accounting_voucher_file |
52 | - WHERE intranet_id = " . $this->voucher->year->kernel->intranet->get('id') . " |
|
52 | + WHERE intranet_id = " . $this->voucher->year->kernel->intranet->get('id')." |
|
53 | 53 | AND belong_to_key = ".array_search($var['belong_to'], $this->what_can_i_belong_to)." |
54 | 54 | AND belong_to_id = ".$var['belong_to_id']." |
55 | - AND voucher_id = ".$this->voucher->getId() . " AND active = 1"; |
|
55 | + AND voucher_id = ".$this->voucher->getId()." AND active = 1"; |
|
56 | 56 | $db->query($sql); |
57 | 57 | if ($db->nextRecord()) { |
58 | 58 | // hvis filen allerede er tilknyttet lader vi som om alt gik godt, og vi siger go |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | if ($this->id > 0) { |
64 | 64 | $sql_type = "UPDATE "; |
65 | - $sql_end = " WHERE id = " . $this->id; |
|
65 | + $sql_end = " WHERE id = ".$this->id; |
|
66 | 66 | } else { |
67 | 67 | $sql_type = "INSERT INTO "; |
68 | 68 | $sql_end = " , date_created = NOW()"; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $var['description'] = ''; |
73 | 73 | } |
74 | 74 | |
75 | - $sql = $sql_type . " accounting_voucher_file SET |
|
75 | + $sql = $sql_type." accounting_voucher_file SET |
|
76 | 76 | date_updated = NOW(), |
77 | 77 | intranet_id = ".$this->voucher->year->kernel->intranet->get('id').", |
78 | 78 | voucher_id = ".$this->voucher->get('id').", |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | function delete() |
91 | 91 | { |
92 | 92 | $db = new DB_Sql; |
93 | - $db->query("UPDATE accounting_voucher_file SET active = 0 WHERE id = " . $this->id); |
|
93 | + $db->query("UPDATE accounting_voucher_file SET active = 0 WHERE id = ".$this->id); |
|
94 | 94 | return 1; |
95 | 95 | } |
96 | 96 | |
97 | 97 | function undelete() |
98 | 98 | { |
99 | 99 | $db = new DB_Sql; |
100 | - $db->query("UPDATE accounting_voucher_file SET active = 1 WHERE id = " . $this->id); |
|
100 | + $db->query("UPDATE accounting_voucher_file SET active = 1 WHERE id = ".$this->id); |
|
101 | 101 | return 1; |
102 | 102 | } |
103 | 103 |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | private function load() |
45 | 45 | { |
46 | 46 | $db = new DB_Sql; |
47 | - $db->query("SELECT * FROM accounting_year_end WHERE year_id = " . $this->year->get('id') . " AND intranet_id =" . $this->year->kernel->intranet->get('id')); |
|
47 | + $db->query("SELECT * FROM accounting_year_end WHERE year_id = ".$this->year->get('id')." AND intranet_id =".$this->year->kernel->intranet->get('id')); |
|
48 | 48 | if (!$db->nextRecord()) { |
49 | 49 | return 0; |
50 | 50 | } |
@@ -62,14 +62,14 @@ discard block |
||
62 | 62 | return false; |
63 | 63 | } |
64 | 64 | $db = new DB_Sql; |
65 | - $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = " . $this->year->get('id') . ", intranet_id =" .$this->year->kernel->intranet->get('id')); |
|
65 | + $db->query("INSERT INTO accounting_year_end SET date_created=NOW(), year_id = ".$this->year->get('id').", intranet_id =".$this->year->kernel->intranet->get('id')); |
|
66 | 66 | return true; |
67 | 67 | } |
68 | 68 | |
69 | 69 | function setStep($step) |
70 | 70 | { |
71 | 71 | $db = new DB_Sql; |
72 | - $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = " . (int)$step . " WHERE year_id = " . $this->year->get('id')); |
|
72 | + $db->query("UPDATE accounting_year_end SET date_updated=NOW(), step_key = ".(int)$step." WHERE year_id = ".$this->year->get('id')); |
|
73 | 73 | return true; |
74 | 74 | } |
75 | 75 | |
@@ -80,12 +80,12 @@ discard block |
||
80 | 80 | switch ($action) { |
81 | 81 | // bruges i forbindelse med nulstilling af resultatkontoen |
82 | 82 | case 'operating_reset': |
83 | - $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id')); |
|
83 | + $db->query("UPDATE accounting_year_end SET date_updated=NOW(), operating_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id')); |
|
84 | 84 | return true; |
85 | 85 | break; |
86 | 86 | // bruges i forbindelse med overførelse af kapitalkontoen |
87 | 87 | case 'result_account_reset': |
88 | - $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = " . (int)$voucher_id . " WHERE year_id = " . $this->year->get('id')); |
|
88 | + $db->query("UPDATE accounting_year_end SET date_updated=NOW(), result_account_reset_voucher_id = ".(int)$voucher_id." WHERE year_id = ".$this->year->get('id')); |
|
89 | 89 | return true; |
90 | 90 | break; |
91 | 91 | |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | function deleteStatedAction($id) |
118 | 118 | { |
119 | 119 | $db = new DB_Sql; |
120 | - $db->query("DELETE FROM accounting_year_end_action WHERE id = " . (int)$id); |
|
120 | + $db->query("DELETE FROM accounting_year_end_action WHERE id = ".(int)$id); |
|
121 | 121 | return true; |
122 | 122 | } |
123 | 123 | |
124 | 124 | function getStatedActions($action) |
125 | 125 | { |
126 | 126 | $db = new DB_Sql; |
127 | - $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = " . $this->year->get('id') . " AND type_key = ".array_search($action, $this->actions)." AND intranet_id = " . $this->year->kernel->intranet->get('id')); |
|
127 | + $db->query("SELECT * FROM accounting_year_end_action WHERE year_id = ".$this->year->get('id')." AND type_key = ".array_search($action, $this->actions)." AND intranet_id = ".$this->year->kernel->intranet->get('id')); |
|
128 | 128 | $actions = array(); |
129 | 129 | $i = 0; |
130 | 130 | while ($db->nextRecord()) { |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | function flushStatement($type) |
144 | 144 | { |
145 | 145 | $db = new DB_Sql; |
146 | - $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = " . $this->year->get('id') . " AND type_key = " . array_search($type, $this->types)); |
|
146 | + $db->query("DELETE FROM accounting_year_end_statement WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND type_key = ".array_search($type, $this->types)); |
|
147 | 147 | return true; |
148 | 148 | } |
149 | 149 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $db = new DB_Sql; |
180 | 180 | $db2 = new DB_Sql; |
181 | 181 | |
182 | - $db->query("SELECT id FROM accounting_account WHERE year_id = " .$this->year->get('id'). " AND intranet_id = " . $this->year->kernel->intranet->get('id') . " AND number >= " . $account_start->get('number') . " AND number <= " . $account_end->get('number') . " ORDER BY number ASC"); |
|
182 | + $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->year->get('id')." AND intranet_id = ".$this->year->kernel->intranet->get('id')." AND number >= ".$account_start->get('number')." AND number <= ".$account_end->get('number')." ORDER BY number ASC"); |
|
183 | 183 | |
184 | 184 | while ($db->nextRecord()) { |
185 | 185 | $account = new Account($this->year, $db->f('id')); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | // vi vender sgu lige fortegnet, så udgifter får negativt fortegn |
189 | 189 | // og indtægter positivt fortegn |
190 | - $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = " . $account->get('id') . ", amount = '".-1 * $account->get('saldo')."'"); |
|
190 | + $db2->query("INSERT INTO accounting_year_end_statement SET type_key = ".array_search($type, $this->types).", intranet_id = ".$this->year->kernel->intranet->get('id').", year_id = ".$this->year->get('id').", account_id = ".$account->get('id').", amount = '".-1*$account->get('saldo')."'"); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | return true; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | 'debet_account_number' => $debet_account->get('number'), |
291 | 291 | 'credit_account_number' => $credit_account->get('number'), |
292 | 292 | 'amount' => amountToForm($a['amount']), |
293 | - 'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'), |
|
293 | + 'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'), |
|
294 | 294 | 'vat_off' => 1 |
295 | 295 | |
296 | 296 | ); |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | 'debet_account_number' => $result_account->get('number'), |
329 | 329 | 'credit_account_number' => $account->get('number'), |
330 | 330 | 'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook |
331 | - 'text' => $account->get('name') . ' til resultatkontoen', |
|
331 | + 'text' => $account->get('name').' til resultatkontoen', |
|
332 | 332 | 'vat_off' => 1 |
333 | 333 | |
334 | 334 | ); |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | 'debet_account_number' => $account->get('number'), |
341 | 341 | 'credit_account_number' => $result_account->get('number'), |
342 | 342 | 'amount' => amountToForm(abs($account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook |
343 | - 'text' => $account->get('name') . ' til resultatkontoen', |
|
343 | + 'text' => $account->get('name').' til resultatkontoen', |
|
344 | 344 | 'vat_off' => 1 |
345 | 345 | ); |
346 | 346 | $debet_account = $account; |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | 'debet_account_number' => $debet_account->get('number'), |
422 | 422 | 'credit_account_number' => $credit_account->get('number'), |
423 | 423 | 'amount' => amountToForm($a['amount']), |
424 | - 'text' => 'Modpostering: ' . $debet_account->get('name') . ' og ' . $credit_account->get('name'), |
|
424 | + 'text' => 'Modpostering: '.$debet_account->get('name').' og '.$credit_account->get('name'), |
|
425 | 425 | 'vat_off' => 1 |
426 | 426 | |
427 | 427 | ); |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | 'debet_account_number' => $result_account->get('number'), |
457 | 457 | 'credit_account_number' => $capital_account->get('number'), |
458 | 458 | 'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook |
459 | - 'text' => $result_account->get('name') . ' nulstilles', |
|
459 | + 'text' => $result_account->get('name').' nulstilles', |
|
460 | 460 | 'vat_off' => 1 |
461 | 461 | |
462 | 462 | ); |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | 'debet_account_number' => $capital_account->get('number'), |
469 | 469 | 'credit_account_number' => $result_account->get('number'), |
470 | 470 | 'amount' => abs(amountToForm($result_account->get('saldo'))), // amountToFrom necessary to get the correct format for daybook |
471 | - 'text' => $result_account->get('name') . ' nulstilles', |
|
471 | + 'text' => $result_account->get('name').' nulstilles', |
|
472 | 472 | 'vat_off' => 1 |
473 | 473 | ); |
474 | 474 | $debet_account = $capital_account; |
@@ -73,6 +73,9 @@ discard block |
||
73 | 73 | return true; |
74 | 74 | } |
75 | 75 | |
76 | + /** |
|
77 | + * @param string $action |
|
78 | + */ |
|
76 | 79 | function setStated($action, $voucher_id) |
77 | 80 | { |
78 | 81 | $db = new DB_Sql; |
@@ -106,6 +109,7 @@ discard block |
||
106 | 109 | * credit-konto |
107 | 110 | * amount |
108 | 111 | * |
112 | + * @param string $action |
|
109 | 113 | */ |
110 | 114 | function saveStatedAction($action, $voucher_id, $debet_account_id, $credit_account_id, $amount) |
111 | 115 | { |
@@ -121,6 +125,9 @@ discard block |
||
121 | 125 | return true; |
122 | 126 | } |
123 | 127 | |
128 | + /** |
|
129 | + * @param string $action |
|
130 | + */ |
|
124 | 131 | function getStatedActions($action) |
125 | 132 | { |
126 | 133 | $db = new DB_Sql; |
@@ -154,6 +161,7 @@ discard block |
||
154 | 161 | * bør vel egentlig ikke være muligt! Måske kan man forestille sig, at den så bare |
155 | 162 | * gemmer videre og at den ved get lægger tallene i amount sammen? |
156 | 163 | * |
164 | + * @param string $type |
|
157 | 165 | */ |
158 | 166 | function saveStatement($type) |
159 | 167 | { |
@@ -198,6 +206,9 @@ discard block |
||
198 | 206 | return new Account($this->year, $id); |
199 | 207 | } |
200 | 208 | |
209 | + /** |
|
210 | + * @param string $type |
|
211 | + */ |
|
201 | 212 | function getStatement($type) |
202 | 213 | { |
203 | 214 |
@@ -28,9 +28,12 @@ |
||
28 | 28 | <input type="submit" value="Opret perioder" name="create_periods" /> |
29 | 29 | </fieldset> |
30 | 30 | </form> |
31 | -<?php else : ?> |
|
31 | +<?php else { |
|
32 | + : ?> |
|
32 | 33 | <table> |
33 | - <caption>Momsperioder i perioden <?php e($context->getYear()->get('from_date_dk')); ?> til <?php e($context->getYear()->get('to_date_dk')); ?></caption> |
|
34 | + <caption>Momsperioder i perioden <?php e($context->getYear()->get('from_date_dk')); |
|
35 | +} |
|
36 | +?> til <?php e($context->getYear()->get('to_date_dk')); ?></caption> |
|
34 | 37 | <thead> |
35 | 38 | <tr> |
36 | 39 | <th>Periode</th> |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <?php echo $context->getError()->view(); ?> |
12 | 12 | |
13 | 13 | <?php if ($context->getVatPeriod()->get('status') == 'stated') : ?> |
14 | - <p class="message">Denne momsopgivelse er bogført. <a href="<?php e(url('../../voucher/' . $context->getVatPeriod()->get('voucher_id'))); ?>">Se bilag</a></p> |
|
14 | + <p class="message">Denne momsopgivelse er bogført. <a href="<?php e(url('../../voucher/'.$context->getVatPeriod()->get('voucher_id'))); ?>">Se bilag</a></p> |
|
15 | 15 | <?php endif; ?> |
16 | 16 | |
17 | 17 | <?php if (!$context->getVatPeriod()->compareAmounts() and $context->getVatPeriod()->get('status_key') > 0) : // beløb skal vøre gemt ?> |
@@ -45,22 +45,22 @@ discard block |
||
45 | 45 | </thead> |
46 | 46 | <tbody> |
47 | 47 | <tr class="vat-sale"> |
48 | - <td><a href="<?php e(url('../../account/' . $account_vat_out->get('id'))); ?>"><?php e($account_vat_out->get('number')); ?></a></td> |
|
48 | + <td><a href="<?php e(url('../../account/'.$account_vat_out->get('id'))); ?>"><?php e($account_vat_out->get('number')); ?></a></td> |
|
49 | 49 | <td><?php e($account_vat_out->get('name')); ?></td> |
50 | 50 | <td></td> |
51 | - <td class="amount debet"><?php e(amountToOutput($account_vat_out->get('saldo') * -1)); ?></td> |
|
51 | + <td class="amount debet"><?php e(amountToOutput($account_vat_out->get('saldo')*-1)); ?></td> |
|
52 | 52 | </tr> |
53 | 53 | <tr class="vat-sale"> |
54 | - <td><a href="<?php e(url('../../account/' . $account_vat_abroad->get('id'))); ?>"><?php e($account_vat_abroad->get('number')); ?></a></td> |
|
54 | + <td><a href="<?php e(url('../../account/'.$account_vat_abroad->get('id'))); ?>"><?php e($account_vat_abroad->get('number')); ?></a></td> |
|
55 | 55 | <td><?php e($account_vat_abroad->get('name')); ?></td> |
56 | 56 | <td></td> |
57 | - <td class="amount debet"><?php e(amountToOutput($account_vat_abroad->get('saldo') * -1)); ?></td> |
|
57 | + <td class="amount debet"><?php e(amountToOutput($account_vat_abroad->get('saldo')*-1)); ?></td> |
|
58 | 58 | </tr> |
59 | 59 | <tr class="headline"> |
60 | 60 | <td colspan="6"><h3>Fradrag</h3></td> |
61 | 61 | </tr> |
62 | 62 | <tr class="vat-buy"> |
63 | - <td><a href="<?php e(url('../../account/' . $account_vat_in->get('id'))); ?>"><?php e($account_vat_in->get('number')); ?></a></td> |
|
63 | + <td><a href="<?php e(url('../../account/'.$account_vat_in->get('id'))); ?>"><?php e($account_vat_in->get('number')); ?></a></td> |
|
64 | 64 | <td><?php e($account_vat_in->get('name')); ?></td> |
65 | 65 | <td class="amount debet"><?php e(amountToOutput($account_vat_in->get('saldo'))); ?></td> |
66 | 66 | <td></td> |
@@ -6,9 +6,12 @@ discard block |
||
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 |
||
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;"> |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | foreach ($vat_periods as $period) { |
53 | 53 | $vat_period = new VatPeriod($context->getYear(), $period['id']); |
54 | 54 | if (!$vat_period->get('voucher_id')) { |
55 | - echo '<p class="warning">Momsperiode ' . $vat_period->get('label') . ' er ikke bogført. <a href="'.url('../vat/' . $vat_period->get('id')).'">Fix it at the vat period</a>.</p>'; |
|
55 | + echo '<p class="warning">Momsperiode '.$vat_period->get('label').' er ikke bogført. <a href="'.url('../vat/'.$vat_period->get('id')).'">Fix it at the vat period</a>.</p>'; |
|
56 | 56 | } elseif (!$context->getVatPeriod()->compareAmounts()) { |
57 | - echo '<p class="warning">Momsperiode ' . $vat_period->get('label') . ' stemmer ikke. <a href="'.url('../vat/' . $vat_period->get('id')).'">Fix it at the vat period</a>.</p>'; |
|
57 | + echo '<p class="warning">Momsperiode '.$vat_period->get('label').' stemmer ikke. <a href="'.url('../vat/'.$vat_period->get('id')).'">Fix it at the vat period</a>.</p>'; |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | ?> |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | <select id="result_account" name="result_account_id"> |
106 | 106 | <option value=""><?php e(t('Choose')); ?></option> |
107 | 107 | <?php foreach ($status_accounts as $a) { ?> |
108 | - <option value="<?php e($a['id']); ?>"<?php if ($context->getYear()->getSetting('result_account_id')==$a['id']) { |
|
108 | + <option value="<?php e($a['id']); ?>"<?php if ($context->getYear()->getSetting('result_account_id') == $a['id']) { |
|
109 | 109 | echo ' selected="selected"'; |
110 | 110 | } ?>><?php e($a['number']); ?> <?php e($a['name']); ?></option> |
111 | 111 | <?php } ?> |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | <tbody> |
133 | 133 | <?php foreach ($context->getAccount()->getList('drift', true) as $a) : ?> |
134 | 134 | <tr> |
135 | - <td><a href="<?php e(url('../../../../account/' . $a['id'])); ?>"><?php e($a['number']); ?></a></td> |
|
135 | + <td><a href="<?php e(url('../../../../account/'.$a['id'])); ?>"><?php e($a['number']); ?></a></td> |
|
136 | 136 | <td><?php e($a['name']); ?></td> |
137 | 137 | <td><?php e(amountToOutput($a['debet'])); ?></td> |
138 | 138 | <td><?php e(amountToOutput($a['credit'])); ?></td> |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | </fieldset> |
182 | 182 | |
183 | 183 | <ul class="options"> |
184 | - <li><a class="excel" href="<?php e(url(null) . '.xls'); ?>">Excel</a></li> |
|
184 | + <li><a class="excel" href="<?php e(url(null).'.xls'); ?>">Excel</a></li> |
|
185 | 185 | </ul> |
186 | 186 | <table> |
187 | 187 | <caption>Resultatopgørelse</caption> |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | <fieldset> |
340 | 340 | <legend>Trin 8: Fyraften</legend> |
341 | 341 | <p>Det er godt arbejde. Nu har du fortjent en pause. Håber ikke det var for vanskeligt. Vi hører naturligvis altid gerne om dine oplevelser med programmet, så vi kan forbedre det mest muligt.</p> |
342 | - <p><a class="excel" href="<?php e(url(null) . '.xls'); ?>">Hent årsregnskabet i et regneark</a></p> |
|
342 | + <p><a class="excel" href="<?php e(url(null).'.xls'); ?>">Hent årsregnskabet i et regneark</a></p> |
|
343 | 343 | <input type="submit" value="Forrige" name="previous" /> |
344 | 344 | </fieldset> |
345 | 345 | <?php |
@@ -11,10 +11,13 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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> |
@@ -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 |