Merge branch 'fronkdev' into 'master'

Fixed not showing linked credits in Contract/Cancelform

See merge request fronk/thetool!552

Layout/default/Contract/CancelForm.php

@@ -118,7 +118,7 @@
                                                     <th>Fertigstellung</th>
                                                     <th>Kündigung</th>
                                                 </tr>
-                                                <?php foreach($contract->links as $link): ?>
+                                                <?php foreach($contract->linksWithCredit as $link): ?>
                                                     <?php
 
                                                     if($link->contract_id == $contract->id) {

application/Contractqueue/ContractqueueController.php

@@ -9,7 +9,7 @@ class ContractqueueController extends mfBaseController {
     $this->me = $me;
     $this->layout()->set("me",$me);
     
-    if(!$me->is(["Admin"])) {
+    if(!$me->is(["Admin"]) && !$me->is("Billing")) {
       $this->redirect("Dashboard");
     }
   }