Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

CHANGELOG.md

@@ -22,6 +22,7 @@
 - feat: refs #7438 Added volume to item_valuateInventory  by:guillermo
 - feat: refs #7438 Requested changes and little changes  by:guillermo
 - refs #6281 feat:buyFk in itemShelving  by:sergiodt
+- feat: refs #6449 item ID is displayed in the sale line  by:jorgep
 
 ### Changed 📦
 

back/models/warehouse.json

@@ -34,9 +34,7 @@
       "type": "belongsTo",
       "model": "Country",
       "foreignKey": "countryFk"
-    }
-  },
-  "relations": {
+    },
     "address": {
       "type": "belongsTo",
       "model": "Address",
@@ -58,4 +56,4 @@
       }
     }
   }
-}
+}

db/versions/10986-pinkChrysanthemum/00-addSummaryId.sql

@@ -0,0 +1,22 @@
+ALTER TABLE vn.claimLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.clientLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.deviceProductionLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.entryLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.invoiceInLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.itemLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.packingSiteDeviceLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.parkingLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.rateLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.routeLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.shelvingLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.supplierLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.ticketLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.travelLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.userLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.workerLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.zoneLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+
+ALTER TABLE account.userLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.signInLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.roleLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.accountLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);

db/versions/11128-turquoiseCymbidium/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.calendar ADD created timestamp DEFAULT current_timestamp() NOT NULL AFTER dated;

modules/entry/back/methods/entry/filter.js

@@ -180,6 +180,7 @@ module.exports = Self => {
                     cu.code currencyCode,
                     t.shipped,
                     t.landed,
+                    t.ref AS travelRef,
                     t.warehouseInFk,
                     w.name warehouseInName
                 FROM vn.entry e

modules/route/back/methods/roadmapStop/getPalletMatchState.js

@@ -33,9 +33,9 @@ module.exports = Self => {
         const result = await Self.rawSql(`
                         WITH tPallet AS(
                             SELECT ep.id pallet, e.id expedition, e.stateTypeFk
-                                FROM vn.expeditionPallet ep 
+                                FROM vn.expeditionPallet ep
                                     JOIN vn.expeditionScan es ON es.palletFk = ep.id
-                                    JOIN expedition e ON e.id = es.expeditionFk 
+                                    JOIN expedition e ON e.id = es.expeditionFk
                                 WHERE ep.truckFk = ?
                         ),totalPalletExpedition AS(
                                 SELECT t.*, COUNT(expedition) totalPalletExpedition
@@ -44,11 +44,11 @@ module.exports = Self => {
                         ),totalPalletExpeditionCode AS(
                                 SELECT t.*, COUNT(expedition) totalPalletExpeditionCode
                                     FROM tPallet t
-                                        JOIN vn.expeditionStateType est ON est.id = t.stateTypeFk 
+                                        JOIN vn.expeditionStateType est ON est.id = t.stateTypeFk
                                     WHERE code = ?
                                     GROUP BY expedition
                             )
-                        SELECT  t.pallet, 
+                        SELECT  t.pallet,
                                 tpe.totalPalletExpedition = tpec.totalPalletExpeditionCode hasMatchStateCode
                             FROM tPallet t
                                 LEFT JOIN totalPalletExpedition tpe ON tpe.expedition = t.expedition

modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js

@@ -1,4 +1,3 @@
-
 const {models} = require('vn-loopback/server/server');
 
 describe('roadMapStop getPalletMatchState()', () => {

modules/route/back/models/roadmap.json

@@ -69,7 +69,7 @@
         "roadmapStop": {
             "type": "hasMany",
             "model": "RoadmapStop",
-            "foreignKey": "roadMapFk"
+            "foreignKey": "roadmapFk"
         }
     }
-}
+}

modules/route/back/models/roadmapStop.json

@@ -40,4 +40,4 @@
             "foreignKey": "addressFk"
         }
     }
-}
+}

modules/ticket/back/models/ticket-log.json

@@ -40,6 +40,9 @@
         },
         "changedModelValue": {
             "type": "string"
+        },
+        "summaryId": {
+            "type":"string"
         }
     }
 }