Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-14 03:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new form layout and other tpl fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-04-18 22:29:46 +02:00
parent c6a3320aed
commit f8c7ef95d3
6 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,7 +13,6 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
<<<<<<< HEAD
'Article' => 'Article', 'Article' => 'Article',
'Analyze' => 'Analyze', 'Analyze' => 'Analyze',
'Attributes' => 'Attributes', 'Attributes' => 'Attributes',
@ -21,13 +20,5 @@ return ['Navigation' => [
'Values' => 'Values', 'Values' => 'Values',
'Create' => 'Create', 'Create' => 'Create',
'List' => 'List', 'List' => 'List',
=======
'Analyze' => 'Analyze',
'Attributes' => 'Attributes',
'Types' => 'Types',
'Values' => 'Values',
'Create' => 'Create',
'List' => 'List',
>>>>>>> 48bc5fa4026129886716af1344890676e9c02540
'ItemManagement' => 'Item Management', 'ItemManagement' => 'Item Management',
]]; ]];

2
Theme/Backend/attribute-type-list.tpl.php
View File

@ -23,7 +23,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('AttributeTypes'); ?><i class="fa fa-download floatRight download btn"></i></div> <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> <thead>
<tr> <tr>
<td><?= $this->getHtml('ID', '0', '0'); ?> <td><?= $this->getHtml('ID', '0', '0'); ?>

2
Theme/Backend/purchase-item-list.tpl.php
View File

@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div> <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> <thead>
<tr> <tr>
<td> <td>

2
Theme/Backend/sales-item-list.tpl.php
View File

@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div> <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> <thead>
<tr> <tr>
<td> <td>

2
Theme/Backend/sales-item-profile.tpl.php
View File

@ -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-10"><?= $this->getHtml('Stock'); ?></label></li>
<li><label for="c-tab-11"><?= $this->getHtml('Disposal'); ?></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-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> <li><label for="c-tab-14"><?= $this->getHtml('Logs'); ?></label></li>
</ul> </ul>
</div> </div>

2
Theme/Backend/stock-list.tpl.php
View File

@ -24,7 +24,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Items'); ?><i class="fa fa-download floatRight download btn"></i></div> <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> <thead>
<tr> <tr>
<td> <td>