@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | function renderHtml() |
18 | 18 | { |
19 | - $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment'); |
|
19 | + $smarty = $this->template->create(dirname(__FILE__).'/templates/payment'); |
|
20 | 20 | return $smarty->render($this); |
21 | 21 | } |
22 | 22 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $payment = $this->getModel(); |
26 | 26 | if ($id = $payment->update($_POST)) { |
27 | 27 | if ($this->getKernel()->user->hasModuleAccess('accounting')) { |
28 | - return new k_SeeOther($this->url($id . '/state')); |
|
28 | + return new k_SeeOther($this->url($id.'/state')); |
|
29 | 29 | } else { |
30 | 30 | return new k_SeeOther($this->url('../')); |
31 | 31 | } |
@@ -48,14 +48,14 @@ discard block |
||
48 | 48 | <?php else : ?> |
49 | 49 | <?php if (isset($variation) && isset($product)) : ?> |
50 | 50 | <?php $module_product = $context->getKernel()->useModule('product'); ?> |
51 | - <li><a href="<?php e(url($module_product->getPath().$product->get('id').'/variation/'.$variation->getId())); ?>"><?php e(t('Show product')); ?></a></li> |
|
51 | + <li><a href="<?php e(url($module_product->getPath().$product->get('id').'/variation/'.$variation->getId())); ?>"><?php e(t('Show product')); ?></a></li> |
|
52 | 52 | <?php elseif (isset($product)) : ?> |
53 | 53 | <?php $module_product = $context->getKernel()->useModule('product'); ?> |
54 | - <li><a href="<?php e(url($module_product->getPath().$product->get('id'))); ?>"><?php e(t('Show product')); ?></a></li> |
|
54 | + <li><a href="<?php e(url($module_product->getPath().$product->get('id'))); ?>"><?php e(t('Show product')); ?></a></li> |
|
55 | 55 | <?php endif; ?> |
56 | 56 | <li><a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create')); ?></a></li> |
57 | 57 | <?php endif; ?> |
58 | - <li><a class="excel" href="<?php e(url(null . '.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a> (<a href="<?php e(url(null . '.xls', array('use_stored' => 'true', 'simple' => 'true'))); ?>"><?php e(t('Simple')); ?></a>)</li> |
|
58 | + <li><a class="excel" href="<?php e(url(null.'.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a> (<a href="<?php e(url(null.'.xls', array('use_stored' => 'true', 'simple' => 'true'))); ?>"><?php e(t('Simple')); ?></a>)</li> |
|
59 | 59 | </ul> |
60 | 60 | |
61 | 61 | |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | <tr id="i<?php e($post["id"]); ?>"> |
205 | 205 | <td><?php e($post["number"]); ?></td> |
206 | 206 | <td class="number"><?php e($post['contact']['number']); ?></td> |
207 | - <td><a href="<?php // e($contact_module->getPath()); ?><?php e(url('../../../contact/' . $post["contact_id"])); ?>"><?php e($post["name"]); ?></a></td> |
|
207 | + <td><a href="<?php // e($contact_module->getPath()); ?><?php e(url('../../../contact/'.$post["contact_id"])); ?>"><?php e($post["name"]); ?></a></td> |
|
208 | 208 | <td><a href="<?php e(url($post["id"])); ?>"><?php ($post["description"] != "") ? e($post["description"]) : e("[Ingen beskrivelse]"); ?></a></td> |
209 | 209 | <td class="amount"><?php e(number_format($post["total"], 2, ",", ".")); ?> </td> |
210 | 210 |
@@ -24,8 +24,11 @@ discard block |
||
24 | 24 | $module_administration = $context->getKernel()->useModule('administration'); |
25 | 25 | ?> |
26 | 26 | <a href="<?php e(url('../../../administration/intranet', array('edit'))); ?>"><?php e(t('Fill in address')); ?></a>. |
27 | - <?php else : ?> |
|
28 | - <?php e(t('You do not have access to edit the address information. Please ask your administrator to do that.')); ?> |
|
27 | + <?php else { |
|
28 | + : ?> |
|
29 | + <?php e(t('You do not have access to edit the address information. Please ask your administrator to do that.')); |
|
30 | +} |
|
31 | +?> |
|
29 | 32 | <?php e(strtolower(t($debtor->getType()))); ?>. |
30 | 33 | <?php endif; ?> |
31 | 34 | </p> |
@@ -35,19 +38,28 @@ discard block |
||
35 | 38 | <p> |
36 | 39 | <?php e(t('You have not created any. Credit notes are created from invoices.')); ?> |
37 | 40 | </p> |
38 | - <?php else : ?> |
|
41 | + <?php else { |
|
42 | + : ?> |
|
39 | 43 | |
40 | - <p><?php e(t('None has been created yet')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create '.$context->getType())); ?></a>.</p> |
|
44 | + <p><?php e(t('None has been created yet')); |
|
45 | +} |
|
46 | +?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create '.$context->getType())); ?></a>.</p> |
|
41 | 47 | |
42 | 48 | <?php endif; ?> |
43 | -<?php else : ?> |
|
49 | +<?php else { |
|
50 | + : ?> |
|
44 | 51 | |
45 | 52 | <ul class="options"> |
46 | 53 | <?php if (!empty($contact) and is_object($contact) and $debtor->getType() != "credit_note") : ?> |
47 | - <li><a href="<?php e(url(null, array('create', 'contact_id' => $contact->get("id")))); ?>"><?php e(t('Create')); ?></a></li> |
|
48 | - <?php else : ?> |
|
54 | + <li><a href="<?php e(url(null, array('create', 'contact_id' => $contact->get("id")))); |
|
55 | +} |
|
56 | +?>"><?php e(t('Create')); ?></a></li> |
|
57 | + <?php else { |
|
58 | + : ?> |
|
49 | 59 | <?php if (isset($variation) && isset($product)) : ?> |
50 | - <?php $module_product = $context->getKernel()->useModule('product'); ?> |
|
60 | + <?php $module_product = $context->getKernel()->useModule('product'); |
|
61 | +} |
|
62 | +?> |
|
51 | 63 | <li><a href="<?php e(url($module_product->getPath().$product->get('id').'/variation/'.$variation->getId())); ?>"><?php e(t('Show product')); ?></a></li> |
52 | 64 | <?php elseif (isset($product)) : ?> |
53 | 65 | <?php $module_product = $context->getKernel()->useModule('product'); ?> |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | <?php if ($contact_id) : ?> |
10 | 10 | <ul class="options"> |
11 | 11 | <li><a href="<?php e(url(null, array('create', 'contact_id' => $contact_id))); ?>"><?php e(t('Create')); ?></a></li> |
12 | - <li><a href="<?php e(url('../../contact/' . $contact_id)); ?>"><?php e(t('Go to contact')); ?></a> |
|
12 | + <li><a href="<?php e(url('../../contact/'.$contact_id)); ?>"><?php e(t('Go to contact')); ?></a> |
|
13 | 13 | </ul> |
14 | 14 | <?php endif; ?> |
15 | 15 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | print(" class=\"fade\""); |
80 | 80 | } ?>> |
81 | 81 | <td class="number"><?php e($r["number"]); ?></td> |
82 | - <td><a href="<?php e(url('../../contact/' . $r["contact_id"])); ?>"><?php e($r["name"]); ?></a></td> |
|
82 | + <td><a href="<?php e(url('../../contact/'.$r["contact_id"])); ?>"><?php e($r["name"]); ?></a></td> |
|
83 | 83 | <td><a href="<?php e(url($r["id"])); ?>"><?php (trim($r["description"] != "")) ? e($r["description"]) : e('['.t("No description").']'); ?></a></td> |
84 | 84 | <td class="date"> |
85 | 85 | <?php |
@@ -9,10 +9,12 @@ |
||
9 | 9 | <p>Gå til <a href="<?php e($accounting_module->getPath().'years.php'); ?>">regnskabet</a></p> |
10 | 10 | <?php elseif ($depreciation->isStated()) : ?> |
11 | 11 | <p><?php e(t('the depreciation is alredy stated')); ?>. <a href="<?php e($accounting_module->getPath().'voucher/'.$depreciation->get('voucher_id')); ?>"><?php e(t('see the voucher')); ?></a>.</p> |
12 | -<?php else : ?> |
|
12 | +<?php else { |
|
13 | + : ?> |
|
13 | 14 | <?php |
14 | 15 | // need to be executed to generate errors! |
15 | 16 | $depreciation->readyForState(); |
17 | +} |
|
16 | 18 | echo $depreciation->error->view(); |
17 | 19 | ?> |
18 | 20 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | <form method="post" action="<?php e(url()); ?>"> |
40 | 40 | <input type="hidden" name="id" value="<?php e($context->getDebtor()->get('id')); ?>" /> |
41 | - <?php if ($context->getDebtor()->contact->get('preferred_invoice') == 2 and $context->getDebtor()->get('status') == 'created' and $context->isValidSender()) : ?> |
|
41 | + <?php if ($context->getDebtor()->contact->get('preferred_invoice') == 2 and $context->getDebtor()->get('status') == 'created' and $context->isValidSender()) : ?> |
|
42 | 42 | <input type="submit" value="<?php e(t('Send on email')); ?>" name="send_email" title="<?php e(t('Are you sure?')); ?>" /> |
43 | 43 | <?php elseif ($context->getDebtor()->contact->get('preferred_invoice') == 2 and $context->getDebtor()->get('status') == 'sent' and $context->isValidSender()) : ?> |
44 | 44 | <input type="submit" value="<?php e(t('Resend on email')); ?>" name="send_email" title="<?php e(t('Are you sure?')); ?>" /> |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | <th><?php e(t($context->getDebtor()->get('type').' due date')); ?></th> |
130 | 130 | <td> |
131 | 131 | <?php e($context->getDebtor()->get("dk_due_date")); ?> |
132 | - <?php if ($context->getDebtor()->get('type')=='invoice' && count($context->getDebtor()->anyDue($context->getDebtor()->contact->get('id'))) > 0 && $context->getDebtor()->get("status") != 'executed') { |
|
132 | + <?php if ($context->getDebtor()->get('type') == 'invoice' && count($context->getDebtor()->anyDue($context->getDebtor()->contact->get('id'))) > 0 && $context->getDebtor()->get("status") != 'executed') { |
|
133 | 133 | echo '<a href="'.url('../../../reminders', array('create', 'contact_id' => intval($context->getDebtor()->contact->get('id')))).'">'.t('Create reminder').'</a>'; |
134 | 134 | } ?> |
135 | 135 | </td> |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | <?php |
143 | 143 | switch ($context->getKernel()->getSetting()->get('intranet', 'debtor.sender')) { |
144 | 144 | case 'user': |
145 | - e($context->getKernel()->user->getAddress()->get('name'). ' <'.$context->getKernel()->user->getAddress()->get('email').'>'); |
|
145 | + e($context->getKernel()->user->getAddress()->get('name').' <'.$context->getKernel()->user->getAddress()->get('email').'>'); |
|
146 | 146 | break; |
147 | 147 | case 'defined': |
148 | 148 | e($context->getKernel()->getSetting()->get('intranet', 'debtor.sender.name').' <'.$context->getKernel()->getSetting()->get('intranet', 'debtor.sender.email').'>'); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | <th><?php e(t('Where from')); ?></th> |
190 | 190 | <td> |
191 | 191 | <?php if (($context->getDebtor()->get('where_from') == 'quotation' || $context->getDebtor()->get('where_from') == 'order' || $context->getDebtor()->get('where_from') == 'invoice') && $context->getDebtor()->get("where_from_id") > 0) { ?> |
192 | - <a href="<?php e(url('../' . $context->getDebtor()->get("where_from_id"))); ?>"><?php e(t($context->getDebtor()->get("where_from"))); ?></a> |
|
192 | + <a href="<?php e(url('../'.$context->getDebtor()->get("where_from_id"))); ?>"><?php e(t($context->getDebtor()->get("where_from"))); ?></a> |
|
193 | 193 | <?php } else { ?> |
194 | 194 | <?php e(t($context->getDebtor()->get('where_from'))); ?> |
195 | 195 | <?php } ?> |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | <?php if ($context->getDebtor()->get('where_to') and $context->getDebtor()->get('where_to_id')) : ?> |
199 | 199 | <tr> |
200 | 200 | <th><?php e(t('Where to')); ?></th> |
201 | - <td><a href="<?php e(url('../' . $context->getDebtor()->get('where_to_id'))); ?>"><?php e(t($context->getDebtor()->get('where_to'))); ?></a></td> |
|
201 | + <td><a href="<?php e(url('../'.$context->getDebtor()->get('where_to_id'))); ?>"><?php e(t($context->getDebtor()->get('where_to'))); ?></a></td> |
|
202 | 202 | </tr> |
203 | 203 | <?php endif; ?> |
204 | 204 | <?php if (($context->getDebtor()->get("type") == 'credit_note' || $context->getDebtor()->get("type") == 'invoice') and $context->getKernel()->user->hasModuleAccess('accounting')) : ?> |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | </tr> |
255 | 255 | <tr> |
256 | 256 | <th><?php e(t('Contact')); ?></th> |
257 | - <td><a href="<?php //e($contact_module->getPath()); ?><?php e(url('../../../../contact/'. $context->getDebtor()->contact->get('id'))); ?>"><?php e($context->getDebtor()->contact->address->get("name")); ?></a></td> |
|
257 | + <td><a href="<?php //e($contact_module->getPath()); ?><?php e(url('../../../../contact/'.$context->getDebtor()->contact->get('id'))); ?>"><?php e($context->getDebtor()->contact->address->get("name")); ?></a></td> |
|
258 | 258 | </tr> |
259 | 259 | <tr> |
260 | 260 | <th><?php e(t('Address')); ?></th> |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | <?php |
378 | 378 | if ($payment["type"] == "credit_note") { |
379 | 379 | ?> |
380 | - <a href="<?php e(url('../' . $payment["id"])); ?>"><?php e($payment["description"]); ?></a> |
|
380 | + <a href="<?php e(url('../'.$payment["id"])); ?>"><?php e($payment["description"]); ?></a> |
|
381 | 381 | <?php |
382 | 382 | } else { |
383 | 383 | e($payment['description']); |
@@ -390,11 +390,11 @@ discard block |
||
390 | 390 | <?php if ($payment['is_stated']) : ?> |
391 | 391 | <a href="<?php e(url('../../../../accounting/search', array('voucher_id' => $payment['voucher_id']))); ?>"><?php e(t('voucher')); ?></a> |
392 | 392 | <?php elseif ($payment['type'] == 'credit_note') : ?> |
393 | - <a href="<?php e(url('../' . $payment['id'] . '/state')); ?>"><?php e(t('state credit note')); ?></a> |
|
393 | + <a href="<?php e(url('../'.$payment['id'].'/state')); ?>"><?php e(t('state credit note')); ?></a> |
|
394 | 394 | <?php elseif ($payment['type'] == 'depreciation') : ?> |
395 | - <a href="<?php e(url('../' . $context->getDebtor()->get('id') . '/depreciation/'.$payment['id'].'/state')); ?>"><?php e(t('state depreciation')); ?></a> |
|
395 | + <a href="<?php e(url('../'.$context->getDebtor()->get('id').'/depreciation/'.$payment['id'].'/state')); ?>"><?php e(t('state depreciation')); ?></a> |
|
396 | 396 | <?php else : ?> |
397 | - <a href="<?php e(url('../' . $context->getDebtor()->get('id') . '/payment/' . $payment['id'] . '/state')); ?>"><?php e(t('state payment')); ?></a> |
|
397 | + <a href="<?php e(url('../'.$context->getDebtor()->get('id').'/payment/'.$payment['id'].'/state')); ?>"><?php e(t('state payment')); ?></a> |
|
398 | 398 | <?php endif; ?> |
399 | 399 | </td> |
400 | 400 | <?php endif; ?> |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | ?> |
499 | 499 | <?php endif; ?> |
500 | 500 | <?php if ($p['status'] == 'authorized') : ?> |
501 | - <a href="<?php e(url('onlinepayment/' . $p['id'])); ?>" class="edit"><?php e(t('Edit payment')); ?></a> |
|
501 | + <a href="<?php e(url('onlinepayment/'.$p['id'])); ?>" class="edit"><?php e(t('Edit payment')); ?></a> |
|
502 | 502 | <?php endif; ?> |
503 | 503 | </td> |
504 | 504 | </tr> |
@@ -571,8 +571,8 @@ discard block |
||
571 | 571 | $vat = 0; |
572 | 572 | } |
573 | 573 | |
574 | - for ($i = 0, $max = count($items); $i<$max; $i++) { |
|
575 | - $total += $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2); |
|
574 | + for ($i = 0, $max = count($items); $i < $max; $i++) { |
|
575 | + $total += $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2); |
|
576 | 576 | $vat = $items[$i]["vat"]; |
577 | 577 | ?> |
578 | 578 | <tr id="i<?php e($items[$i]["id"]); ?>" <?php if (isset($_GET['item_id']) && $_GET['item_id'] == $items[$i]['id']) { |
@@ -584,10 +584,10 @@ discard block |
||
584 | 584 | if ($items[$i]["description"] != "") { |
585 | 585 | autohtml($items[$i]["description"]); |
586 | 586 | if ($context->getDebtor()->get("locked") == false) { |
587 | - echo '<br /> <a href="'.url('item/' . intval($items[$i]["id"]), array('edit')).'">'.t('Edit text').'</a>'; |
|
587 | + echo '<br /> <a href="'.url('item/'.intval($items[$i]["id"]), array('edit')).'">'.t('Edit text').'</a>'; |
|
588 | 588 | } |
589 | 589 | } elseif ($context->getDebtor()->get("locked") == false) { |
590 | - echo ' <a href="'.url('item/' . intval($items[$i]["id"]), array('edit')).'">'.t('Add text').'</a>'; |
|
590 | + echo ' <a href="'.url('item/'.intval($items[$i]["id"]), array('edit')).'">'.t('Add text').'</a>'; |
|
591 | 591 | } |
592 | 592 | |
593 | 593 | ?> |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | <?php |
608 | 608 | } |
609 | 609 | ?> |
610 | - <?php $price = new Ilib_Variable_Float($items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2)); ?> |
|
610 | + <?php $price = new Ilib_Variable_Float($items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2)); ?> |
|
611 | 611 | <td class="amount"><?php e($price->getAsLocal('da_dk', 2)); ?></td> |
612 | 612 | <?php if ($context->getDebtor()->getCurrency()) : ?> |
613 | 613 | <?php |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | ?> |
623 | 623 | <a class="moveup" href="<?php e(url(null, array('action' => 'moveup', 'item_id' => $items[$i]["id"]))); ?>"><?php e(t('Up')); ?></a> |
624 | 624 | <a class="movedown" href="<?php e(url(null, array('action' => 'movedown', 'item_id' => $items[$i]["id"]))); ?>"><?php e(t('Down')); ?></a> |
625 | - <a class="edit" href="<?php e(url('item/' . $items[$i]["id"], array('edit'))); ?>"><?php e(t('Edit')); ?></a> |
|
625 | + <a class="edit" href="<?php e(url('item/'.$items[$i]["id"], array('edit'))); ?>"><?php e(t('Edit')); ?></a> |
|
626 | 626 | <a class="delete" title="Dette vil slette varen!" href="<?php e(url(null, array('action' => 'delete_item', 'item_id' => $items[$i]["id"]))); ?>"><?php e(t('Delete')); ?></a> |
627 | 627 | <?php |
628 | 628 | } |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | </tr> |
632 | 632 | <?php |
633 | 633 | |
634 | - if (($vat == 1 && isset($items[$i+1]["vat"]) && $items[$i+1]["vat"] == 0) || ($vat == 1 && $i+1 >= $max)) { |
|
634 | + if (($vat == 1 && isset($items[$i + 1]["vat"]) && $items[$i + 1]["vat"] == 0) || ($vat == 1 && $i + 1 >= $max)) { |
|
635 | 635 | // Hvis der er moms p� nuv�rende produkt, men n�ste produkt ikke har moms, eller hvis vi har moms og det er sidste produkt |
636 | 636 | ?> |
637 | 637 | <tr> |
@@ -640,16 +640,16 @@ discard block |
||
640 | 640 | <td> </td> |
641 | 641 | <td> </td> |
642 | 642 | <td> </td> |
643 | - <td class="amount"><b><?php e(number_format($total * 0.25, 2, ",", ".")); ?></b></td> |
|
643 | + <td class="amount"><b><?php e(number_format($total*0.25, 2, ",", ".")); ?></b></td> |
|
644 | 644 | <?php if ($context->getDebtor()->getCurrency()) : ?> |
645 | - <td class="amount"><b><?php e(number_format($total_currency * 0.25, 2, ",", ".")); ?></b></td> |
|
645 | + <td class="amount"><b><?php e(number_format($total_currency*0.25, 2, ",", ".")); ?></b></td> |
|
646 | 646 | <?php $total_currency *= 1.25; ?> |
647 | 647 | <?php endif; ?> |
648 | 648 | |
649 | 649 | <td> </td> |
650 | 650 | </tr> |
651 | 651 | <?php |
652 | - $total = $total * 1.25; |
|
652 | + $total = $total*1.25; |
|
653 | 653 | } |
654 | 654 | } |
655 | 655 | ?> |
@@ -714,7 +714,7 @@ discard block |
||
714 | 714 | } ?>> |
715 | 715 | <td class="number"><?php e($reminder["number"]); ?></td> |
716 | 716 | <td><a href="<?php e(url('../../../reminders', array('contact_id' => $reminder["contact_id"]))); ?>"><?php e($reminder["name"]); ?></a></td> |
717 | - <td><a href="<?php e(url('../../../reminders/' . $reminder["id"])); ?>"><?php (trim($reminder["description"] != "")) ? e($reminder["description"]) : e('['.t("No description").']'); ?></a></td> |
|
717 | + <td><a href="<?php e(url('../../../reminders/'.$reminder["id"])); ?>"><?php (trim($reminder["description"] != "")) ? e($reminder["description"]) : e('['.t("No description").']'); ?></a></td> |
|
718 | 718 | <td class="date"> |
719 | 719 | <?php |
720 | 720 | if ($reminder["status"] != "created") { |
@@ -741,9 +741,9 @@ discard block |
||
741 | 741 | <?php |
742 | 742 | if ($reminder["locked"] == 0) { |
743 | 743 | ?> |
744 | - <a class="edit" href="<?php e(url('../../../reminders/' . $reminder["id"], array('edit'))); ?>"><?php e(t('Edit')); ?></a> |
|
744 | + <a class="edit" href="<?php e(url('../../../reminders/'.$reminder["id"], array('edit'))); ?>"><?php e(t('Edit')); ?></a> |
|
745 | 745 | <?php if ($reminder["status"] == "created") : ?> |
746 | - <a class="delete" href="<?php e(url('../../../reminders/' . $reminder["id"], array('delete'))); ?>"><?php e(t('Delete')); ?></a> |
|
746 | + <a class="delete" href="<?php e(url('../../../reminders/'.$reminder["id"], array('delete'))); ?>"><?php e(t('Delete')); ?></a> |
|
747 | 747 | <?php endif; ?> |
748 | 748 | <?php |
749 | 749 | } |
@@ -393,8 +393,11 @@ discard block |
||
393 | 393 | <a href="<?php e(url('../' . $payment['id'] . '/state')); ?>"><?php e(t('state credit note')); ?></a> |
394 | 394 | <?php elseif ($payment['type'] == 'depreciation') : ?> |
395 | 395 | <a href="<?php e(url('../' . $context->getDebtor()->get('id') . '/depreciation/'.$payment['id'].'/state')); ?>"><?php e(t('state depreciation')); ?></a> |
396 | - <?php else : ?> |
|
397 | - <a href="<?php e(url('../' . $context->getDebtor()->get('id') . '/payment/' . $payment['id'] . '/state')); ?>"><?php e(t('state payment')); ?></a> |
|
396 | + <?php else { |
|
397 | + : ?> |
|
398 | + <a href="<?php e(url('../' . $context->getDebtor()->get('id') . '/payment/' . $payment['id'] . '/state')); |
|
399 | +} |
|
400 | +?>"><?php e(t('state payment')); ?></a> |
|
398 | 401 | <?php endif; ?> |
399 | 402 | </td> |
400 | 403 | <?php endif; ?> |
@@ -526,9 +529,12 @@ discard block |
||
526 | 529 | <div class="warning"> |
527 | 530 | <?php e(t('An online payment should be present. However it has not been created from the shop. If you want to make it possible to pay online, you should create the order from your shop, edit it, and then return to this page and send the payment link to the customer')); ?>. |
528 | 531 | </div> |
529 | - <?php else : ?> |
|
532 | + <?php else { |
|
533 | + : ?> |
|
530 | 534 | <div class="warning"> |
531 | - <?php e(t('An onlinepayment should be present. You can supply a payment link from the shop. Supplying a link would make it possible to automatically writing an email to the contact with the payment link')); ?>. |
|
535 | + <?php e(t('An onlinepayment should be present. You can supply a payment link from the shop. Supplying a link would make it possible to automatically writing an email to the contact with the payment link')); |
|
536 | +} |
|
537 | +?>. |
|
532 | 538 | </div> |
533 | 539 | <?php endif; |
534 | 540 | } |
@@ -58,7 +58,7 @@ |
||
58 | 58 | <input type="hidden" name="product_variation_detail_id" value="<?php e($context->getDebtor()->item->get('product_variation_detail_id')); ?>" /> |
59 | 59 | |
60 | 60 | <input type="submit" name="submit" value="<?php e(t('Save')); ?>" class="save" /> |
61 | - <a href="<?php e(url('../../')); ?>"><?php e(t('Cancel')); ?></a> |
|
61 | + <a href="<?php e(url('../../')); ?>"><?php e(t('Cancel')); ?></a> |
|
62 | 62 | |
63 | 63 | </div> |
64 | 64 | </form> |
@@ -14,8 +14,10 @@ |
||
14 | 14 | <div> |
15 | 15 | <input type="submit" value="<?php e(t('Switch')); ?>" /> <a href="<?php if (isset($_SERVER['HTTP_REFERER'])) : |
16 | 16 | e($_SERVER['HTTP_REFERER']); |
17 | -else : |
|
17 | +else { |
|
18 | + : |
|
18 | 19 | echo 'index.php'; |
20 | +} |
|
19 | 21 | endif; ?>"><?php e(t('Cancel')); ?></a> |
20 | 22 | </div> |
21 | 23 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | } |
15 | 15 | ?> |
16 | 16 | |
17 | - <li><a class="pdf" href="<?php e(url(null . '.pdf')); ?>" target="_blank"><?php e(t('Print pdf')); ?></a></li> |
|
17 | + <li><a class="pdf" href="<?php e(url(null.'.pdf')); ?>" target="_blank"><?php e(t('Print pdf')); ?></a></li> |
|
18 | 18 | <?php |
19 | 19 | if ($reminder->get("send_as") == "email" and $reminder->get('status_key') < 1) { |
20 | 20 | ?> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | <?php if ($context->query('flare')) : ?> |
36 | 36 | <p class="message"><?php e($context->query('flare')); ?></p> |
37 | - <?php endif;?> |
|
37 | + <?php endif; ?> |
|
38 | 38 | |
39 | 39 | <form method="post" action="<?php e(url(null)); ?>"> |
40 | 40 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | <?php |
153 | 153 | $contact_module = $context->getKernel()->getModule('contact'); |
154 | 154 | ?> |
155 | - <td><?php e($reminder->contact->get("number")); ?> <a href="<?php e(url('../../../contact/' . $reminder->contact->get('id'), array('edit'))); ?>" class="edit">Ret</a></td> |
|
155 | + <td><?php e($reminder->contact->get("number")); ?> <a href="<?php e(url('../../../contact/'.$reminder->contact->get('id'), array('edit'))); ?>" class="edit">Ret</a></td> |
|
156 | 156 | </tr> |
157 | 157 | <tr> |
158 | 158 | <th><?php e(t('Contact')); ?></th> |
@@ -283,9 +283,9 @@ discard block |
||
283 | 283 | <?php $module_accounting = $context->getKernel()->useModule('accounting'); ?> |
284 | 284 | <a href="<?php e(url('../../../accounting/search', array('voucher_id' => $payments[$i]['voucher_id']))); ?>"><?php e(t('voucher')); ?></a> |
285 | 285 | <?php elseif ($payments[$i]['type'] == 'depreciation') : ?> |
286 | - <a href="<?php e(url('depreciation/' . $payments[$i]['id'] . '/state')); ?>"><?php e(t('state depreciation')); ?></a> |
|
286 | + <a href="<?php e(url('depreciation/'.$payments[$i]['id'].'/state')); ?>"><?php e(t('state depreciation')); ?></a> |
|
287 | 287 | <?php else : ?> |
288 | - <a href="<?php e(url('payment/' . $payments[$i]['id'] . '/state')); ?>"><?php e(t('state payment')); ?></a> |
|
288 | + <a href="<?php e(url('payment/'.$payments[$i]['id'].'/state')); ?>"><?php e(t('state payment')); ?></a> |
|
289 | 289 | <?php endif; ?> |
290 | 290 | </td> |
291 | 291 | <?php endif; ?> |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | ?> |
346 | 346 | <tr> |
347 | 347 | <td class="number"><?php e($items[$i]["number"]); ?></td> |
348 | - <td><a href="<?php e(url('../../invoice/list/' . intval($items[$i]['invoice_id']))); ?>"><?php e($items[$i]["description"]); ?></a></td> |
|
348 | + <td><a href="<?php e(url('../../invoice/list/'.intval($items[$i]['invoice_id']))); ?>"><?php e($items[$i]["description"]); ?></a></td> |
|
349 | 349 | <td class="date"><?php e($items[$i]["dk_due_date"]); ?></td> |
350 | 350 | <td class="amount"><?php e(number_format($items[$i]["arrears"], 2, ",", ".")); ?></td> |
351 | 351 | </tr> |
@@ -284,8 +284,11 @@ |
||
284 | 284 | <a href="<?php e(url('../../../accounting/search', array('voucher_id' => $payments[$i]['voucher_id']))); ?>"><?php e(t('voucher')); ?></a> |
285 | 285 | <?php elseif ($payments[$i]['type'] == 'depreciation') : ?> |
286 | 286 | <a href="<?php e(url('depreciation/' . $payments[$i]['id'] . '/state')); ?>"><?php e(t('state depreciation')); ?></a> |
287 | - <?php else : ?> |
|
288 | - <a href="<?php e(url('payment/' . $payments[$i]['id'] . '/state')); ?>"><?php e(t('state payment')); ?></a> |
|
287 | + <?php else { |
|
288 | + : ?> |
|
289 | + <a href="<?php e(url('payment/' . $payments[$i]['id'] . '/state')); |
|
290 | +} |
|
291 | +?>"><?php e(t('state payment')); ?></a> |
|
289 | 292 | <?php endif; ?> |
290 | 293 | </td> |
291 | 294 | <?php endif; ?> |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | <?php |
95 | 95 | } |
96 | 96 | ?> |
97 | - <option value="-1"><?php e(t('Create new') . ' >>'); ?></option> |
|
97 | + <option value="-1"><?php e(t('Create new').' >>'); ?></option> |
|
98 | 98 | </select> |
99 | 99 | </div> |
100 | 100 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | <?php if ($reminder->get('id') > 0) : ?> |
285 | 285 | <a href="<?php e(url()); ?>"><?php e(t('Cancel')); ?></a> |
286 | 286 | <?php else : ?> |
287 | -<a href="<?php e(url('../../contact/' . $contact->get('id'))); ?>"><?php e(t('Cancel')); ?></a> |
|
287 | +<a href="<?php e(url('../../contact/'.$contact->get('id'))); ?>"><?php e(t('Cancel')); ?></a> |
|
288 | 288 | <?php endif; ?> |
289 | 289 | |
290 | 290 | <input type="hidden" name="id" value="<?php e($reminder->get("id")); ?>" /> |
@@ -283,8 +283,11 @@ |
||
283 | 283 | <input type="submit" name="submit" value="<?php e(t('Save')); ?>" class="save" /> |
284 | 284 | <?php if ($reminder->get('id') > 0) : ?> |
285 | 285 | <a href="<?php e(url()); ?>"><?php e(t('Cancel')); ?></a> |
286 | -<?php else : ?> |
|
287 | -<a href="<?php e(url('../../contact/' . $contact->get('id'))); ?>"><?php e(t('Cancel')); ?></a> |
|
286 | +<?php else { |
|
287 | + : ?> |
|
288 | +<a href="<?php e(url('../../contact/' . $contact->get('id'))); |
|
289 | +} |
|
290 | +?>"><?php e(t('Cancel')); ?></a> |
|
288 | 291 | <?php endif; ?> |
289 | 292 | |
290 | 293 | <input type="hidden" name="id" value="<?php e($reminder->get("id")); ?>" /> |
@@ -78,7 +78,7 @@ |
||
78 | 78 | <?php elseif (empty($scan_in_contact) or !is_object($scan_in_contact)) : ?> |
79 | 79 | <input type="submit" name="add_scan_in_contact" value="<?php e(t('Choose contact')); ?>" /> |
80 | 80 | <?php else : ?> |
81 | - <strong>Kontakt</strong>: <?php e($scan_in_contact->get('name') . ' <'.$scan_in_contact->address->get('email').'>'); ?> <input type="submit" name="delete_scan_in_contact" value="Slet kontakt" /> |
|
81 | + <strong>Kontakt</strong>: <?php e($scan_in_contact->get('name').' <'.$scan_in_contact->address->get('email').'>'); ?> <input type="submit" name="delete_scan_in_contact" value="Slet kontakt" /> |
|
82 | 82 | <?php endif; ?> |
83 | 83 | </fieldset> |
84 | 84 |
@@ -77,8 +77,11 @@ |
||
77 | 77 | <input type="hidden" name="scan_in_contact" value="<?php e($scan_in_contact->get('id')); ?>" /> |
78 | 78 | <?php elseif (empty($scan_in_contact) or !is_object($scan_in_contact)) : ?> |
79 | 79 | <input type="submit" name="add_scan_in_contact" value="<?php e(t('Choose contact')); ?>" /> |
80 | - <?php else : ?> |
|
81 | - <strong>Kontakt</strong>: <?php e($scan_in_contact->get('name') . ' <'.$scan_in_contact->address->get('email').'>'); ?> <input type="submit" name="delete_scan_in_contact" value="Slet kontakt" /> |
|
80 | + <?php else { |
|
81 | + : ?> |
|
82 | + <strong>Kontakt</strong>: <?php e($scan_in_contact->get('name') . ' <'.$scan_in_contact->address->get('email').'>'); |
|
83 | +} |
|
84 | +?> <input type="submit" name="delete_scan_in_contact" value="Slet kontakt" /> |
|
82 | 85 | <?php endif; ?> |
83 | 86 | </fieldset> |
84 | 87 |
@@ -108,7 +108,7 @@ |
||
108 | 108 | <?php |
109 | 109 | } |
110 | 110 | ?> |
111 | - <option value="-1"><?php e(t('Create new', 'debtor') . ' >>'); ?></option> |
|
111 | + <option value="-1"><?php e(t('Create new', 'debtor').' >>'); ?></option> |
|
112 | 112 | </select> |
113 | 113 | </div> |
114 | 114 | <fieldset id="contactperson"> |
@@ -10,14 +10,20 @@ |
||
10 | 10 | $module_administration = $context->getKernel()->useModule('administration'); |
11 | 11 | ?> |
12 | 12 | <a href="<?php e($module_administration->getPath().'intranet_edit.php'); ?>"><?php e(t('Fill out address')); ?></a>. |
13 | - <?php else : ?> |
|
14 | - <?php e(t('You do not have access to fill out an adress. Please ask an administrator to do that.')); ?> |
|
13 | + <?php else { |
|
14 | + : ?> |
|
15 | + <?php e(t('You do not have access to fill out an adress. Please ask an administrator to do that.')); |
|
16 | +} |
|
17 | +?> |
|
15 | 18 | <?php endif; ?> |
16 | 19 | </p> |
17 | -<?php else : ?> |
|
20 | +<?php else { |
|
21 | + : ?> |
|
18 | 22 | |
19 | 23 | |
20 | -<?php echo $context->getDebtor()->error->view(); ?> |
|
24 | +<?php echo $context->getDebtor()->error->view(); |
|
25 | +} |
|
26 | +?> |
|
21 | 27 | |
22 | 28 | <form action="<?php e(url(null, array($context->subview(), 'contact_id' => $context->getContact()->get('id')))); ?>" method="post"> |
23 | 29 |