From 3ebeebc15913babada444ec73ec095dd7545d032 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 16 Jan 2024 11:47:45 +0100
Subject: [PATCH 1/2] refs #6230 remove basic-data columns

---
 db/changes/240401/00-revokeItem.sql      |   4 +
 modules/item/front/basic-data/index.html | 115 ++++++++---------------
 2 files changed, 41 insertions(+), 78 deletions(-)
 create mode 100644 db/changes/240401/00-revokeItem.sql

diff --git a/db/changes/240401/00-revokeItem.sql b/db/changes/240401/00-revokeItem.sql
new file mode 100644
index 0000000000..2b75d67cf0
--- /dev/null
+++ b/db/changes/240401/00-revokeItem.sql
@@ -0,0 +1,4 @@
+REVOKE UPDATE ON TABLE `vn`.`item` FROM `employee`;
+
+
+GRANT UPDATE(id, equivalent, stems, minPrice, isToPrint, family, box, category, doPhoto, image, inkFk, intrastatFk, hasMinPrice, created, comment, typeFk, generic, producerFk, description, density, relevancy, expenseFk, isActive, subName, tag5, value5, tag6, value6, tag7, value7, tag8, value8, tag9, value9, tag10, value10, minimum, upToDown, supplyResponseFk, hasKgPrice, isFloramondo, isFragile, numberOfItemsPerCask, embalageCode, quality, stemMultiplier, itemPackingTypeFk, packingOut, genericFk, packingShelve, isLaid, lastUsed, weightByPiece, weightByPiece, editorFk, recycledPlastic, nonRecycledPlastic, minQuantity) ON TABLE vn.item TO employee;
diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html
index 3e47faa5fd..bcb78c48e9 100644
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@@ -18,22 +18,6 @@
 </vn-crud-model>
 <form name="form" ng-submit="watcher.submit()" ng-cloak class="vn-w-md">
     <vn-card class="vn-pa-lg">
-        <vn-horizontal>
-            <vn-textfield
-                label="Name"
-                ng-model="$ctrl.item.name"
-                vn-name="name"
-                rule
-                vn-focus>
-            </vn-textfield>
-            <vn-textfield
-                label="Full name"
-                ng-model="$ctrl.item.longName"
-                vn-name="longName"
-                rule
-                info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
-            </vn-textfield>
-        </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete
                 url="ItemTypes"
@@ -52,6 +36,34 @@
                     </div>
                 </tpl-item>
             </vn-autocomplete>
+            <vn-textfield
+                label="Reference"
+                ng-model="$ctrl.item.comment"
+                vn-name="comment"
+                rule>
+            </vn-textfield>
+            <vn-input-number
+                min="0"
+                label="Relevancy"
+                ng-model="$ctrl.item.relevancy"
+                vn-name="relevancy"
+                rule>
+            </vn-input-number>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-input-number
+                min="0"
+                label="stems"
+                ng-model="$ctrl.item.stems"
+                vn-name="stems"
+                rule>
+            </vn-input-number>
+            <vn-input-number
+                min="0"
+                label="Multiplier"
+                ng-model="$ctrl.item.stemMultiplier"
+                vn-name="stemMultiplier">
+            </vn-input-number>
             <vn-autocomplete
                 label="Generic"
                 url="Items/withName"
@@ -105,63 +117,10 @@
                 url="Expenses"
                 label="Expense"
                 ng-model="$ctrl.item.expenseFk"
-                vn-name="expense"
+                vn-name="expence"
                 initial-data="$ctrl.item.expense">
             </vn-autocomplete>
         </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete
-                data="originsData"
-                label="Origin"
-                show-field="name"
-                value-field="id"
-                ng-model="$ctrl.item.originFk"
-                vn-name="origin"
-                initial-data="$ctrl.item.origin">
-            </vn-autocomplete>
-            <vn-input-number
-                min="0"
-                label="Size"
-                ng-model="$ctrl.item.size"
-                vn-name="size"
-                rule>
-            </vn-input-number>
-            <vn-textfield
-                label="Reference"
-                ng-model="$ctrl.item.comment"
-                vn-name="comment"
-                rule>
-            </vn-textfield>
-            <vn-input-number
-                min="0"
-                label="Relevancy"
-                ng-model="$ctrl.item.relevancy"
-                vn-name="relevancy"
-                rule>
-            </vn-input-number>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-input-number
-                min="0"
-                label="stems"
-                ng-model="$ctrl.item.stems"
-                vn-name="stems"
-                rule>
-            </vn-input-number>
-            <vn-input-number
-                min="0"
-                label="Multiplier"
-                ng-model="$ctrl.item.stemMultiplier"
-                vn-name="stemMultiplier">
-            </vn-input-number>
-            <vn-input-number
-                min="1"
-                label="Minimum sales quantity"
-                ng-model="$ctrl.item.minQuantity"
-                vn-name="minQuantity"
-                rule>
-            </vn-input-number>
-        </vn-horizontal>
         <vn-horizontal>
             <vn-input-number
                 min="0"
@@ -192,14 +151,6 @@
                 rule>
             </vn-input-number>
         </vn-horizontal>
-        <vn-horizontal>
-            <vn-textarea
-                label="Description"
-                ng-model="$ctrl.item.description"
-                vn-name="description"
-                rule>
-            </vn-textarea>
-        </vn-horizontal>
         <vn-horizontal>
             <vn-check
                 label="Active"
@@ -224,6 +175,14 @@
                 info="This item does need a photo">
             </vn-check>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textarea
+                label="Description"
+                ng-model="$ctrl.item.description"
+                vn-name="description"
+                rule>
+            </vn-textarea>
+        </vn-horizontal>
     </vn-card>
     <vn-button-bar>
         <vn-submit

From 037a17871722da8278c9f8c3d0cb8531c370cb06 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 16 Jan 2024 12:14:47 +0100
Subject: [PATCH 2/2] refs #6230 fix test back

---
 e2e/paths/04-item/02_basic_data.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js
index f177a98df2..3bad183037 100644
--- a/e2e/paths/04-item/02_basic_data.spec.js
+++ b/e2e/paths/04-item/02_basic_data.spec.js
@@ -27,11 +27,8 @@ describe('Item Edit basic data path', () => {
 
     it(`should edit the item basic data and confirm the item data was edited`, async() => {
         const values = {
-            name: 'Rose of Purity',
-            longName: 'RS Rose of Purity',
             type: 'Anthurium',
             intrastat: 'Coral y materiales similares',
-            origin: 'Spain',
             relevancy: 1,
             generic: 'Pallet',
             isActive: false,