Merge branch 'fronkdev' into 'master'

moved AR Fibu Merge Button from Address to Invoice

See merge request fronk/thetool!593

Layout/default/Address/Index.php

@@ -38,7 +38,6 @@
           <div class="card-body">
             <div class="row">
               <div class="col">
-                <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> AR-Merge / Fibu Konten Import</a>
                 <a href="#" class="ml-2 btn btn-outline-primary" onclick="startBmdExport(event, 'inc')"><i class="fas fa-down-from-dotted-line fa-fw"></i> Inkrementellen BMD-Export starten</a>
                 <?php if($last_bmd_export): ?><small>Letzter Export: <?=date("d.m.Y H:i", $last_bmd_export)?></small><?php endif; ?>
                 

Layout/default/Invoice/Index.php

@@ -25,6 +25,16 @@ $pagination_entity_name = "Rechnungen";
     <div class="row">
         <div class="col-lg-12">
 
+            <div class="card">
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col">
+                            <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> AR-Merge / Fibu Konten Import</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="row">
                 <div class="col-8">