|
|
@@ -24,6 +24,7 @@ use App\Helpers\HtmlHelper;
|
|
|
$is_invoice = ($type === DocumentTypes::INVOICE);
|
|
|
$is_goods_in = ($type === DocumentTypes::GOODS_IN);
|
|
|
$is_aru = ($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT);
|
|
|
+$is_delivery_note = ($type === DocumentTypes::DELIVERY_NOTE);
|
|
|
|
|
|
$status_options = [];
|
|
|
$custom_filter_options = [];
|
|
|
@@ -154,7 +155,7 @@ else {
|
|
|
<colgroup>
|
|
|
<col style="width: 1%"/>
|
|
|
<?php
|
|
|
- if($is_goods_in) {
|
|
|
+ if(!$status_options) {
|
|
|
?>
|
|
|
<col style="width: 20%"/>
|
|
|
<?php
|
|
|
@@ -173,9 +174,15 @@ else {
|
|
|
<tr>
|
|
|
<th><?=htmlspecialchars(__("No."))?></th>
|
|
|
<?php
|
|
|
- if($is_goods_in) {
|
|
|
+ if(!$status_options) {
|
|
|
+ if($is_goods_in) {
|
|
|
+ $column_name = __("Location / Supplier");
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $column_name = __("Location");
|
|
|
+ }
|
|
|
?>
|
|
|
- <th><?=htmlspecialchars(__("Location / Supplier"))?></th>
|
|
|
+ <th><?=htmlspecialchars($column_name)?></th>
|
|
|
<?php
|
|
|
}
|
|
|
else {
|
|
|
@@ -219,7 +226,7 @@ else {
|
|
|
?>
|
|
|
</td>
|
|
|
<?php
|
|
|
- if(!$is_goods_in) {
|
|
|
+ if($status_options) {
|
|
|
if($is_invoice) {
|
|
|
?>
|
|
|
<td>
|