From f8c7ef95d331a76d3c93965748afcadcd6ef0bfa Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 18 Apr 2021 22:29:46 +0200
Subject: [PATCH] new form layout and other tpl fixes

---
 Theme/Backend/Lang/Navigation.en.lang.php | 9 ---------
 Theme/Backend/attribute-type-list.tpl.php | 2 +-
 Theme/Backend/purchase-item-list.tpl.php  | 2 +-
 Theme/Backend/sales-item-list.tpl.php     | 2 +-
 Theme/Backend/sales-item-profile.tpl.php  | 2 +-
 Theme/Backend/stock-list.tpl.php          | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 5e82cc5..05d97f6 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -13,7 +13,6 @@
 declare(strict_types=1);
 
 return ['Navigation' => [
-<<<<<<< HEAD
     'Article' => 'Article',
     'Analyze' => 'Analyze',
     'Attributes' => 'Attributes',
@@ -21,13 +20,5 @@ return ['Navigation' => [
     'Values' => 'Values',
     'Create'  => 'Create',
     'List'    => 'List',
-=======
-    'Analyze'           => 'Analyze',
-    'Attributes'        => 'Attributes',
-    'Types'             => 'Types',
-    'Values'            => 'Values',
-    'Create'            => 'Create',
-    'List'              => 'List',
->>>>>>> 48bc5fa4026129886716af1344890676e9c02540
     'ItemManagement'    => 'Item Management',
 ]];
diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php
index b015614..7904040 100644
--- a/Theme/Backend/attribute-type-list.tpl.php
+++ b/Theme/Backend/attribute-type-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('AttributeTypes'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table id="iAttributeTypeList" class="default">
+            <table id="iAttributeTypeList" class="default sticky">
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
diff --git a/Theme/Backend/purchase-item-list.tpl.php b/Theme/Backend/purchase-item-list.tpl.php
index 3b837af..fb74d6d 100755
--- a/Theme/Backend/purchase-item-list.tpl.php
+++ b/Theme/Backend/purchase-item-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table id="iPurchaseItemList" class="default">
+            <table id="iPurchaseItemList" class="default sticky">
                 <thead>
                 <tr>
                     <td>
diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php
index 0a0b590..94b30e9 100755
--- a/Theme/Backend/sales-item-list.tpl.php
+++ b/Theme/Backend/sales-item-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table id="iSalesItemList" class="default">
+            <table id="iSalesItemList" class="default sticky">
                 <thead>
                 <tr>
                     <td>
diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php
index fc63cea..f6155c1 100755
--- a/Theme/Backend/sales-item-profile.tpl.php
+++ b/Theme/Backend/sales-item-profile.tpl.php
@@ -57,7 +57,7 @@ echo $this->getData('nav')->render();
             <li><label for="c-tab-10"><?= $this->getHtml('Stock'); ?></label></li>
             <li><label for="c-tab-11"><?= $this->getHtml('Disposal'); ?></label></li>
             <li><label for="c-tab-12"><?= $this->getHtml('Media'); ?></label></li>
-            <li><label for="c-tab-13"><?= $this->getHtml('SalesInvoices'); ?></label></li>
+            <li><label for="c-tab-13"><?= $this->getHtml('Bills'); ?></label></li>
             <li><label for="c-tab-14"><?= $this->getHtml('Logs'); ?></label></li>
         </ul>
     </div>
diff --git a/Theme/Backend/stock-list.tpl.php b/Theme/Backend/stock-list.tpl.php
index c36a03d..ef8688c 100755
--- a/Theme/Backend/stock-list.tpl.php
+++ b/Theme/Backend/stock-list.tpl.php
@@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table id="iWarehouseItemList" class="default">
+            <table id="iWarehouseItemList" class="default sticky">
                 <thead>
                 <tr>
                     <td>