modules/entry/back/model-config.json

@@ -22,5 +22,8 @@
     },
     "EntryObservation": {
         "dataSource": "vn"
+    },
+    "EntryType": {
+        "dataSource": "vn"
     }
 }

modules/entry/back/models/entry-type.json

@@ -0,0 +1,25 @@
+{
+    "name": "EntryType",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
+    "options": {
+        "mysql": {
+            "table": "entryType"
+        }
+    },
+    "properties": {
+        "code": {
+            "type": "string",
+            "id": true,
+            "description": "Identifier"
+        },
+        "description": {
+            "type": "string"
+        },
+        "isInformal": {
+            "type": "boolean"
+        }
+    }
+}

modules/entry/back/models/entry.json

@@ -101,6 +101,11 @@
             "type": "belongsTo",
             "model": "Account",
             "foreignKey": "observationEditorFk"
+        },
+        "entryType": {
+            "type": "belongsTo",
+            "model": "EntryType",
+            "foreignKey": "typeFk"
         }
     }
 }

modules/supplier/back/methods/supplier/getItemsPackaging.js

@@ -33,7 +33,7 @@ module.exports = Self => {
                         JOIN vn.item i ON i.id = b.itemFk
                     WHERE e.id = ?  AND e.supplierFk = ?
                     GROUP BY i.id
-            ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers
+            ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers, ic.url
                 FROM vn.buy b
                     JOIN vn.item i ON i.id = b.itemFk
                     JOIN vn.entry e ON e.id = b.entryFk
@@ -41,6 +41,7 @@ module.exports = Self => {
                     JOIN vn.buyConfig bc ON bc.monthsAgo
                     JOIN vn.travel t ON t.id = e.travelFk
                     LEFT JOIN entryTmp et ON et.id = i.id
+                    JOIN hedera.imageConfig ic
                 WHERE e.supplierFk = ?
                     AND i.family IN ('EMB', 'CONT')
                     AND b.created > (util.VN_CURDATE() - INTERVAL bc.monthsAgo MONTH)