From 9dad06ea46732fd062a5f4b436f5a9a520e6a6e1 Mon Sep 17 00:00:00 2001
From: Edwin Betancourt <EdwinBetanc0urt@outlook.com>
Date: Tue, 2 Apr 2024 10:53:19 -0400
Subject: [PATCH] fix: Product search table columns. (#2058)

---
 .../PanelForm/QueryCriteria/index.vue         |   6 +-
 .../ProductInfo/PanelForm/tableRecords.vue    | 171 +++++++++---------
 2 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/index.vue
index 9767f53ee5..725b655373 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/index.vue
@@ -51,7 +51,8 @@
               :label="$t('field.product.name')"
             />
           </el-col>
-          <!-- <el-col :span="6">
+          <!--
+          <el-col :span="6">
             <text-field
               :uuid-form="uuidForm"
               attribute-key="upc"
@@ -64,7 +65,8 @@
               attribute-key="sku"
               :label="$t('field.product.sku')"
             />
-          </el-col> -->
+          </el-col>
+          -->
           <el-col :span="8">
             <warehouse-field
               :uuid-form="uuidForm"
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
index ca13340028..cc8ba65b95 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
@@ -55,6 +55,7 @@
         header-align="center"
         width="220"
       />
+
       <template v-if="isPriceAmounts">
         <el-table-column
           prop="standard_price"
@@ -68,6 +69,42 @@
           </span>
         </el-table-column>
 
+        <!--
+        <el-table-column
+          prop="list_price"
+          :label="$t('field.product.listPrice')"
+          sortable
+          header-align="center"
+          width="122"
+        >
+          <span slot-scope="scope" class="cell-align-right">
+            {{ formatQuantity({ value: scope.row.list_price }) }}
+          </span>
+        </el-table-column>
+
+        <el-table-column
+          prop="limit_price"
+          :label="$t('field.product.limitPrice')"
+          sortable
+          header-align="center"
+          width="118"
+        >
+          <span slot-scope="scope" class="cell-align-right">
+            {{ formatQuantity({ value: scope.row.limit_price }) }}
+          </span>
+        </el-table-column>
+        <el-table-column
+          prop="margin"
+          :label="$t('field.product.margin')"
+          sortable
+          header-align="center"
+          width="110"
+        >
+          <span slot-scope="scope" class="cell-align-right">
+            {{ formatQuantity({ value: scope.row.margin }) }}
+          </span>
+        </el-table-column>
+        -->
       </template>
 
       <el-table-column
@@ -88,6 +125,7 @@
           {{ convertBooleanToTranslationLang(scope.row.is_stocked) }}
         </span>
       </el-table-column>
+
       <template v-if="isStockQuantities">
         <el-table-column
           prop="available_quantity"
@@ -100,8 +138,6 @@
             {{ formatQuantity({ value: scope.row.available_quantity }) }}
           </span>
         </el-table-column>
-      </template>
-      <template v-if="isStockQuantities">
         <el-table-column
           prop="on_hand_quantity"
           :label="$t('field.product.onHandQuantity')"
@@ -113,89 +149,8 @@
             {{ formatQuantity({ value: scope.row.on_hand_quantity }) }}
           </span>
         </el-table-column>
-      </template>
 
-      <el-table-column
-        prop="product_category"
-        :label="$t('field.product.productCategory')"
-        sortable
-        header-align="center"
-        width="165"
-      />
-      <el-table-column
-        prop="product_group"
-        :label="$t('field.product.productGroup')"
-        sortable
-        header-align="center"
-        width="150"
-      />
-      <el-table-column
-        prop="product_class"
-        :label="$t('field.product.productClass')"
-        sortable
-        header-align="center"
-        width="150"
-      />
-      <el-table-column
-        prop="vendor"
-        :label="$t('field.product.vendor')"
-        sortable
-        header-align="center"
-        width="170"
-      />
-      <!-- <el-table-column
-        prop="upc"
-        :label="$t('field.product.upcEan')"
-        sortable
-        header-align="center"
-        width="170"
-      />
-      <el-table-column
-        prop="sku"
-        :label="$t('field.product.sku')"
-        sortable
-        header-align="center"
-        width="170"
-      /> -->
-
-      <!-- <template v-if="isPriceAmounts"> -->
-      <!-- <el-table-column
-          prop="list_price"
-          :label="$t('field.product.listPrice')"
-          sortable
-          header-align="center"
-          width="122"
-        >
-          <span slot-scope="scope" class="cell-align-right">
-            {{ formatQuantity({ value: scope.row.list_price }) }}
-          </span>
-        </el-table-column> -->
-
-      <!-- <el-table-column
-          prop="limit_price"
-          :label="$t('field.product.limitPrice')"
-          sortable
-          header-align="center"
-          width="118"
-        >
-          <span slot-scope="scope" class="cell-align-right">
-            {{ formatQuantity({ value: scope.row.limit_price }) }}
-          </span>
-        </el-table-column>
-        <el-table-column
-          prop="margin"
-          :label="$t('field.product.margin')"
-          sortable
-          header-align="center"
-          width="110"
-        >
-          <span slot-scope="scope" class="cell-align-right">
-            {{ formatQuantity({ value: scope.row.margin }) }}
-          </span>
-        </el-table-column> -->
-      <!-- </template> -->
-
-      <template v-if="isStockQuantities">
+        <!--
         <el-table-column
           prop="reserved_quantity"
           :label="$t('field.product.reservedQuantity')"
@@ -240,8 +195,10 @@
             {{ formatQuantity({ value: scope.row.unconfirmed_move_quantity }) }}
           </span>
         </el-table-column>
+      -->
       </template>
 
+      <!--
       <el-table-column
         prop="is_instance_attribute"
         :label="$t('field.product.instanceAttribute')"
@@ -253,6 +210,52 @@
           {{ convertBooleanToTranslationLang(scope.row.is_instance_attribute) }}
         </span>
       </el-table-column>
+      -->
+
+      <el-table-column
+        prop="product_category"
+        :label="$t('field.product.productCategory')"
+        sortable
+        header-align="center"
+        width="165"
+      />
+      <el-table-column
+        prop="product_group"
+        :label="$t('field.product.productGroup')"
+        sortable
+        header-align="center"
+        width="150"
+      />
+      <el-table-column
+        prop="product_class"
+        :label="$t('field.product.productClass')"
+        sortable
+        header-align="center"
+        width="150"
+      />
+      <el-table-column
+        prop="vendor"
+        :label="$t('field.product.vendor')"
+        sortable
+        header-align="center"
+        width="170"
+      />
+      <!--
+      <el-table-column
+        prop="upc"
+        :label="$t('field.product.upcEan')"
+        sortable
+        header-align="center"
+        width="170"
+      />
+      <el-table-column
+        prop="sku"
+        :label="$t('field.product.sku')"
+        sortable
+        header-align="center"
+        width="170"
+      />
+    -->
 
     </el-table>
   </div>