e2e/helpers/selectors.js

@@ -391,7 +391,7 @@ export default {
         intrastadCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Intrastat"]',
         originCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Origin"]',
         buyerCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Buyer"]',
-        densityCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Density"]',
+        weightByPieceCheckbox: '.vn-popover.shown vn-horizontal:nth-child(3) > vn-check[label="Weight/Piece"]',
         saveFieldsButton: '.vn-popover.shown vn-button[label="Save"] > button'
     },
     itemFixedPrice: {

e2e/paths/04-item/09_index.spec.js

@@ -31,7 +31,7 @@ describe('Item index path', () => {
         await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
         await page.waitToClick(selectors.itemsIndex.originCheckbox);
         await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.densityCheckbox);
+        await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
         await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
         const message = await page.waitForSnackbar();
 
@@ -64,7 +64,7 @@ describe('Item index path', () => {
         await page.waitToClick(selectors.itemsIndex.intrastadCheckbox);
         await page.waitToClick(selectors.itemsIndex.originCheckbox);
         await page.waitToClick(selectors.itemsIndex.buyerCheckbox);
-        await page.waitToClick(selectors.itemsIndex.densityCheckbox);
+        await page.waitToClick(selectors.itemsIndex.weightByPieceCheckbox);
         await page.waitToClick(selectors.itemsIndex.saveFieldsButton);
         const message = await page.waitForSnackbar();
 

modules/entry/back/methods/entry/editLatestBuys.js

@@ -52,7 +52,7 @@ module.exports = Self => {
 
         switch (field) {
         case 'size':
-        case 'density':
+        case 'weightByPiece':
         case 'description':
         case 'packingOut':
             modelName = 'Item';

modules/entry/back/methods/entry/latestBuysFilter.js

@@ -157,7 +157,7 @@ module.exports = Self => {
                 i.image,
                 i.id AS itemFk,
                 i.size,
-                i.density,
+                i.weightByPiece,
                 it.code,
                 i.typeFk,
                 i.family,

modules/entry/front/latest-buys/index.html

@@ -68,8 +68,8 @@
                         <th field="origin">
                             <span translate>Origin</span>
                         </th>
-                        <th field="density">
+                        <th field="weightByPiece">
-                            <span translate>Density</span>
+                            <span translate>Weight/Piece</span>
                         </th>
                         <th field="isActive">
                             <span translate>Active</span>
@@ -183,7 +183,7 @@
                             {{::buy.intrastat}}
                         </td>
                         <td>{{::buy.origin}}</td>
-                        <td>{{::buy.density}}</td>
+                        <td>{{::buy.weightByPiece}}</td>
                         <td>
                             <vn-check
                                 disabled="true"

modules/entry/front/latest-buys/index.js

@@ -80,7 +80,7 @@ export default class Controller extends Section {
             {field: 'weight', displayName: this.$t('Weight')},
             {field: 'description', displayName: this.$t('Description')},
             {field: 'size', displayName: this.$t('Size')},
-            {field: 'density', displayName: this.$t('Density')},
+            {field: 'weightByPiece', displayName: this.$t('weight/Piece')},
             {field: 'packingOut', displayName: this.$t('PackingOut')},
             {field: 'landing', displayName: this.$t('Landing')}
         ];
@@ -103,7 +103,7 @@ export default class Controller extends Section {
         switch (param) {
         case 'id':
         case 'size':
-        case 'density':
+        case 'weightByPiece':
         case 'isActive':
         case 'family':
         case 'minPrice':

modules/item/back/methods/item/filter.js

@@ -160,7 +160,7 @@ module.exports = Self => {
                     i.subName,
                     i.isActive,
                     i.stems,
-                    i.density,
+                    i.weightByPiece,
                     i.stemMultiplier,
                     i.typeFk,
                     i.isFloramondo,

modules/item/back/models/item.json

@@ -53,9 +53,9 @@
             "type": "number",
             "description": "Relevancy"
         },
-        "density": {
+        "weightByPiece": {
             "type": "number",
-            "description": "Density"
+            "description": "WeightByPiece"
         },
         "stemMultiplier": {
             "type": "number",

modules/item/front/basic-data/index.html

@@ -124,9 +124,8 @@
             <vn-input-number
                 vn-one
                 min="0"
-                step="0.01"
+                label="Weight/Piece" 
-                label="Density" 
+                ng-model="$ctrl.item.weightByPiece"
-                ng-model="$ctrl.item.density"
                 rule>
             </vn-input-number>
             <vn-autocomplete

modules/item/front/index/index.html

@@ -45,8 +45,8 @@
                         <th field="buyerFk">
                             <span translate>Buyer</span>
                         </th>
-                        <th field="density">
+                        <th field="weightByPiece">
-                            <span translate>Density</span>
+                            <span translate>Weight/Piece</span>
                         </th>
                         <th field="stemMultiplier">
                             <span translate>Multiplier</span>
@@ -117,7 +117,7 @@
                                 {{::item.userName}}
                             </span>
                         </td>
-                        <td>{{::item.density}}</td>
+                        <td>{{::item.weightByPiece}}</td>
                         <td>{{::item.stemMultiplier}}</td>
                         <td>
                             <vn-check

modules/item/front/index/index.js

@@ -87,7 +87,7 @@ class Controller extends Section {
         case 'size':
         case 'subname':
         case 'isActive':
-        case 'density':
+        case 'weightByPiece':
         case 'stemMultiplier':
         case 'stems':
             return {[`i.${param}`]: value};

modules/item/front/locale/es.yml

@@ -40,7 +40,7 @@ Create: Crear
 Client card: Ficha del cliente
 Shipped: F. envío
 stems: Tallos
-Density: Densidad
+Weight/Piece: Peso/tallo
 Search items by id, name or barcode: Buscar articulos por identificador, nombre o codigo de barras
 SalesPerson: Comercial
 Concept: Concepto

modules/item/front/summary/index.html

@@ -91,8 +91,8 @@
             <vn-label-value label="Relevancy" 
                 value="{{$ctrl.summary.item.relevancy}}">
             </vn-label-value>
-            <vn-label-value label="Density" 
+            <vn-label-value label="Weight/Piece" 
-                value="{{$ctrl.summary.item.density}}">
+                value="{{$ctrl.summary.item.weightByPiece}}">
             </vn-label-value>
             <vn-label-value label="Expense" 
                 value="{{$ctrl.summary.item.expense.name}}">

modules/travel/back/methods/travel/extraCommunityFilter.js

@@ -130,8 +130,8 @@ module.exports = Self => {
                     SUM(b.stickers) AS stickers,
                     s.id AS cargoSupplierFk,
                     s.nickname AS cargoSupplierNickname,
-                    CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as loadedKg,
+                    CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
-                    CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as volumeKg
+                    CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
                 FROM travel t
                     LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
                     LEFT JOIN entry e ON e.travelFk = t.id
@@ -143,7 +143,8 @@ module.exports = Self => {
                     JOIN warehouse wo ON wo.id = t.warehouseOutFk
                     JOIN country c ON c.id = wo.countryFk
                     LEFT JOIN continent cnt ON cnt.id = c.continentFk
-                    JOIN agencyMode am ON am.id = t.agencyModeFk`
+                    JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN vn.volumeConfig vc`
         );
 
         stmt.merge(conn.makeWhere(filter.where));
@@ -165,15 +166,16 @@ module.exports = Self => {
                     SUM(b.stickers) AS stickers,
                     e.evaNotes,
                     e.notes,
-                    CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as loadedkg,
+                    CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
-                    CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as volumeKg
+                    CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
                 FROM tmp.travel tr 
                     JOIN entry e ON e.travelFk = tr.id
                     JOIN buy b ON b.entryFk = e.id
                     JOIN packaging pkg ON pkg.id = b.packageFk
                     JOIN item i ON i.id = b.itemFk
                     JOIN itemType it ON it.id = i.typeFk
-                    JOIN supplier s ON s.id = e.supplierFk`
+                    JOIN supplier s ON s.id = e.supplierFk
+                    JOIN vn.volumeConfig vc`
         );
 
         stmt.merge(conn.makeGroupBy('e.id'));

print/templates/reports/extra-community/sql/entries.sql

@@ -4,8 +4,8 @@ SELECT
         e.ref,
         s.name AS supplierName,
         SUM(b.stickers) AS stickers,
-    CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as loadedKg,
+        CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
-    CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as volumeKg
+        CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
     FROM travel t
         JOIN entry e ON e.travelFk = t.id
         JOIN buy b ON b.entryFk = e.id
@@ -13,5 +13,6 @@ FROM travel t
         JOIN item i ON i.id = b.itemFk
         JOIN itemType it ON it.id = i.typeFk
         JOIN supplier s ON s.id = e.supplierFk
+        JOIN vn.volumeConfig vc
         WHERE t.id IN(?)
     GROUP BY e.id

print/templates/reports/extra-community/sql/travels.sql

@@ -6,9 +6,10 @@ SELECT
     t.kg,
     am.id AS agencyModeFk,
     SUM(b.stickers) AS stickers,
-    CAST(SUM(i.density * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as loadedKg,
+    CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
-    CAST(SUM(167.5 * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000  ) as DECIMAL(10,0)) as volumeKg
+    CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
 FROM travel t
+    JOIN volumeConfig vc
     LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
     LEFT JOIN entry e ON e.travelFk = t.id
     LEFT JOIN buy b ON b.entryFk = e.id