Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test

front/salix/components/log/index.html

@@ -66,7 +66,6 @@
                 </vn-tr>
             </vn-tbody>
         </vn-table>
-        <vn-pagination model="model"></vn-pagination>
     </vn-card>
 </vn-data-viewer>
 <vn-worker-descriptor-popover vn-id="workerDescriptor">

modules/monitor/front/index/tickets/index.html

@@ -68,7 +68,9 @@
                         <th field="stateFk">
                             <span translate>State</span>
                         </th>
-                        <th field="isFragile"></th>
+                        <th field="isFragile" number>
+                            <span translate>Fragile</span>
+                        </th>
                         <th field="zoneFk">
                             <span translate>Zone</span>
                         </th>

modules/ticket/back/methods/ticket-log/getChanges.js

@@ -30,35 +30,47 @@ module.exports = Self => {
         const ticketLogs = await models.TicketLog.find(
             {
                 where: {
+                    or: [
+                        {
                             and: [
                                 {originFk: id},
                                 {action: 'update'},
                                 {changedModel: 'Sale'}
                             ]
                         },
+                        {
+                            and: [
+                                {originFk: id},
+                                {action: 'delete'},
+                                {changedModel: 'Sale'}
+                            ]
+                        }
+                    ]
+                },
                 fields: [
                     'oldInstance',
                     'newInstance',
-                    'changedModelId'
+                    'changedModelId',
+                    'changedModelValue'
                 ],
             }, myOptions);
 
         const changes = [];
-        for (const ticketLog of ticketLogs) {
+
-            const oldQuantity = ticketLog.oldInstance.quantity;
+        for (const log of ticketLogs) {
-            const newQuantity = ticketLog.newInstance.quantity;
+            const oldQuantity = log.oldInstance.quantity;
+            const newQuantity = log.newInstance?.quantity || 0;
 
             if (oldQuantity || newQuantity) {
-                const sale = await models.Sale.findById(ticketLog.changedModelId, null, myOptions);
+              const changeMessage = $t('Change quantity', {
-                const message = $t('Change quantity', {
+                concept: log.changedModelValue,
-                    concept: sale.concept,
                 oldQuantity: oldQuantity || 0,
                 newQuantity: newQuantity || 0,
               });
+              changes.push(changeMessage);
+            }
+          }
 
-                changes.push(message);
-            }
-        }
         return changes.join('\n');
     };
 };