Commit Graph

848 Commits

Author SHA1 Message Date
Ivan Mas 671290b9a0 refs #7313 delete vn.itemPackaging.workerFk 2024-06-17 16:45:51 +02:00
Carlos Satorres 3e25fff90f refs #7409 acl 2024-06-17 15:50:58 +02:00
Carlos Satorres fa8c1b3879 acls, fixtures, models 2024-06-17 13:50:07 +02:00
Guillermo Bonet 1d0b89ed52 refs #7519 Requested changes 2024-06-17 09:42:16 +02:00
Pablo Natek c3d64b2358 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine 2024-06-17 08:49:26 +02:00
Pablo Natek a30ff44837 fix: refs #6404 fix notification 2024-06-14 17:40:08 +02:00
Jorge Penadés 202884fdce feat: refs #6238 add travelKgPercentage table and model 2024-06-14 14:25:15 +02:00
Jorge Penadés 784bd91e04 fix: refs #6286 update WorkerTimeControl permissions 2024-06-13 13:43:28 +02:00
Guillermo Bonet cfc5e32715 feat: refs #6701 Fix error 2024-06-13 13:11:50 +02:00
Alex Moreno 671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas 2024-06-12 10:21:36 +00:00
Guillermo Bonet dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column 2024-06-12 11:48:01 +02:00
Alex Moreno 60d4372996 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation 2024-06-12 07:51:01 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-12 07:47:56 +02:00
Alex Moreno 3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation 2024-06-11 12:56:56 +02:00
Jorge Penadés 1cefe817f5 feat: add editZone ACL for buyer 2024-06-11 12:06:44 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection 2024-06-10 15:36:34 +02:00
Pablo Natek 65fae086aa Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine 2024-06-10 12:29:42 +02:00
Pablo Natek c5227d6cf6 feat: refs #6404 add mail notification 2024-06-10 12:24:23 +02:00
Javi Gallego b4046de190 Merge branch 'dev' into 4560-GastosReparto 2024-06-10 08:17:17 +00:00
Sergio De la torre cac1278c08 feat hsItemOlder refs $6964 2024-06-07 16:29:51 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned 2024-06-07 13:44:24 +00:00
Jorge Penadés 521f3f1446 feat: refs #6243 update ACL 2024-06-07 11:52:24 +02:00
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto 2024-06-07 09:03:24 +00:00
Jorge Penadés 44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev
Reviewed-on: #2558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-07 07:19:31 +00:00
Jorge Penadés 99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl 2024-06-07 07:11:07 +00:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev 2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test 2024-06-07 08:29:04 +02:00
Guillermo Bonet 70eddb6ce2 refactor: refs #7419 Added index ticketLog 2024-06-07 08:18:07 +02:00
Robert Ferrús f7c2fd824f feat: refs #7496 changesRequested 2024-06-07 07:05:22 +02:00
Jorge Penadés 5a6e2a2b31 fix: refs #6942 create invoiceIn acl 2024-06-06 15:45:39 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled 2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Robert Ferrús fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry 2024-06-05 06:48:20 +00:00
Guillermo Bonet 3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev
Reviewed-on: #2536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 06:17:10 +00:00
Javi Gallego 8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 14:24:55 +02:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Javi Gallego 4230d46fe5 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 09:47:58 +02:00
Robert Ferrús 3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop 2024-06-04 06:57:29 +00:00
Juan Ferrer 1ec55c8850 Merge branch 'test' into dev 2024-06-03 17:38:39 +02:00
Guillermo Bonet 5ab8e79dde Merge branch 'dev' into 6701-clientRate 2024-06-03 10:11:56 +00:00
Guillermo Bonet 85d68890b8 refactor: refs #6701 New table clientRate 2024-06-03 12:11:26 +02:00
Carlos Satorres 7a92963886 fix acls 2024-06-03 10:21:25 +02:00
Jorge Penadés ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-06-03 10:13:59 +02:00
Jorge Penadés 72630d613b fix: refs #6600 rollback 2024-06-03 09:32:03 +02:00
Jorge Penadés 790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table 2024-06-03 09:25:48 +02:00
Jorge Penadés 084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment 2024-06-03 08:34:10 +02:00
Robert Ferrús ecd34e080d feat: refs #7039 deleteVirtualColumnCountry 2024-06-03 07:59:57 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-31 12:58:05 +02:00
Jorge Penadés 4772509b67 fix: refs #6889 e2e tests 2024-05-31 12:51:06 +02:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev 2024-05-31 12:29:32 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Jorge Penadés 38bea60776 refactor: refs #6889 script sql 2024-05-31 09:49:58 +02:00
Jorge Penadés eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-31 08:37:28 +02:00
Robert Ferrús fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop 2024-05-31 05:09:16 +00:00
Pablo Natek d901584c3f feat: refs #6404 add deadline field 2024-05-30 18:39:06 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer 2024-05-30 11:47:12 +02:00
Robert Ferrús 467383d7f4 feat: refs #6477 productionConfig add column 2024-05-30 10:32:17 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests 2024-05-30 10:04:34 +02:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Jorge Penadés d866ec6417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-29 16:59:19 +02:00
Pako Natek a2029f7934 Merge branch 'dev' into 6021-floranet_beta 2024-05-29 09:39:31 +00:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode 2024-05-29 09:16:25 +02:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn 2024-05-29 07:00:17 +00:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta 2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm 2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev 2024-05-29 08:09:53 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner 2024-05-28 17:23:58 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight 2024-05-28 10:08:15 +02:00
Carlos Satorres eb2dd5ba5b refs #7406 acls 2024-05-27 16:17:44 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-27 14:36:18 +02:00
Carlos Satorres 578b8a2c71 refs #7406 changes sql, modelconfig model 2024-05-27 14:28:13 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Jorge Penadés 1af24e8473 fix : refs #6942 remove grafana update priv 2024-05-27 13:34:00 +02:00
Jorge Penadés 1671423d23 fix: refs #6942 add deleteById acl 2024-05-27 12:53:25 +02:00
Jorge Penadés c136f2783a refactor: refs #6942 toUnbook & drop buyer acls 2024-05-27 12:34:27 +02:00
Robert Ferrús 7559875aff feat: refs #7296 roadmapStopFk 2024-05-27 12:08:14 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation 2024-05-27 11:33:04 +02:00
Jorge Penadés dc90ad6595 fix: refs #6942 acls & back 2024-05-27 10:48:32 +02:00
Robert Ferrús 941438efd0 Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop 2024-05-27 09:41:30 +02:00
Robert Ferrús aaea0c95f7 feat: refs #7296 roadmapStopFk 2024-05-27 09:41:28 +02:00
Jorge Penadés f209718383 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-05-27 09:03:34 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas 2024-05-27 07:46:21 +02:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Pako Natek ab3b58ec3c modificacion recipe y element 2024-05-24 13:41:02 +02:00
Pako Natek 49a2e6fc84 tickets y email 2024-05-24 11:44:58 +02:00
Pako Natek 257de96743 Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta 2024-05-24 07:44:12 +02:00
Jorge Penadés cddc034adf fix: refs #6942 revoke update isBooked 2024-05-23 17:53:08 +02:00
Carlos Satorres 1fa5a22bb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList 2024-05-23 09:17:19 +02:00
Sergio De la torre d1affb1191 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder 2024-05-23 07:49:11 +02:00
Carlos Satorres 4c5f46eb9b Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev
Reviewed-on: #2480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 13:55:53 +00:00
Carlos Satorres 4dee90ff57 refs #6820 fix pr 2024-05-22 14:56:46 +02:00
Sergio De la torre 49fed4e51e refs #6964 feat: hasItemOlder 2024-05-22 12:23:33 +02:00
Guillermo Bonet 35e892a90c refs #7422 Fix 2024-05-21 10:07:51 +02:00
Guillermo Bonet 030106f06d refactor: refs #7422 Deprecated column 2024-05-21 08:13:06 +02:00
Guillermo Bonet b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev
Reviewed-on: #2471
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-21 06:11:24 +00:00
Guillermo Bonet ac2ed0956b refs #7422 Fixed all problems 2024-05-21 08:04:28 +02:00
Guillermo Bonet cbf9a4c4e9 refs #7422 Fixed all problems 2024-05-21 07:58:51 +02:00
Guillermo Bonet 93314d67b6 refs #7422 Fix 2024-05-21 07:31:24 +02:00