Commit Graph

1545 Commits

Author SHA1 Message Date
Sergio De la torre 85c017431c refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 07:01:43 +02:00
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis 09b00401ec Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 05:56:35 +00:00
Guillermo Bonet 3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 07:32:45 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Vicent Llopis 01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:42:53 +02:00
Vicent Llopis 17b2b02246 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:16:32 +02:00
Alex Moreno 219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:09:58 +02:00
Vicent Llopis a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 11:50:15 +00:00
Alex Moreno 8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-07 12:25:02 +02:00
Vicent Llopis 6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 09:31:26 +02:00
Alex Moreno be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-06 15:15:36 +02:00
Alex Moreno a665b6c060 refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 11:51:04 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 10:42:53 +02:00
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:50:45 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Pablo Natek 2ccf8d5197 refs #5347
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 14:49:21 +02:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 7fe8698b6f refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 10:04:03 +02:00
Alex Moreno d1fb2859be Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 06:59:42 +00:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 11:57:56 +02:00
Alex Moreno ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump 2023-06-30 08:23:00 +02:00
Alex Moreno c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 14:50:06 +02:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +02:00
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Carlos Satorres 3bea23c52a refs #5660 delivery acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:30:45 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00
Alex Moreno e43e52b561 refs #5753 db export and fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 15:21:45 +02:00
Alex Moreno 798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-26 07:53:44 +02:00
Juan Ferrer 47a4a9950f refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:42:30 +02:00
Alex Moreno 6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Carlos Satorres 9870cc7b14 refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:34:27 +02:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Vicent Llopis f6cb1cb130 Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:07:52 +00:00
Alex Moreno dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 13:42:13 +02:00
Vicent Llopis 425118d333 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 13:09:38 +02:00
Carlos Satorres 0eca606de0 Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 07:29:30 +00:00
Sergio De la torre 1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:22:10 +02:00
Alex Moreno 3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 15:15:00 +02:00
Vicent Llopis 0cc5781f3f refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 15:05:37 +02:00
Vicent Llopis 61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:43:23 +02:00
Carlos Satorres 908799adee refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 14:58:28 +02:00
Alex Moreno f113bfbc95 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 12:32:29 +00:00
Alex Moreno 22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-12 11:06:27 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:26:50 +02:00
Alex Moreno a8215e38f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7 2023-06-12 07:31:25 +02:00
Alex Moreno d735f142a1 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 05:04:28 +00:00
Alex Moreno 50ced36338 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7 2023-06-09 08:43:39 +02:00
Carlos Satorres c66feb53f0 refs #5760 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-09 08:29:18 +02:00
Carlos Satorres ec9dfa90fd refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 08:06:45 +02:00
Alex Moreno 96d88cdf4b refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 14:42:07 +02:00
Vicent Llopis cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 09:19:57 +02:00
Alex Moreno 1240a6b71a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 11:44:47 +00:00
Alex Moreno edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 13:34:13 +02:00
Vicent Llopis 7cf85eeef8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 09:03:33 +02:00
Alexandre Riera bfd421c188 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 06:30:43 +00:00
Alex Moreno ac0e7ae32b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 07:08:02 +02:00
Alex Moreno cb50c617ee refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 15:09:01 +02:00
Vicent Llopis b144948dcf conflictos resueltos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 12:31:44 +02:00
Vicent Llopis 98af8ee10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token 2023-06-06 12:31:20 +02:00
Alex Moreno 5d6eaca6b8 refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 15:20:07 +02:00
Alexandre Riera 9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 12:25:50 +00:00
Alex Moreno 91b0e3013a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:11:47 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Alex Moreno 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:29:46 +02:00
Alex Moreno 0263d76021 refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:58:16 +02:00
Vicent Llopis 46b6625527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:06:31 +02:00
Alexandre Riera 30816f7947 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:51:42 +00:00
Alexandre Riera 1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued... Details
2023-05-29 10:56:21 +00:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Alex Moreno 375fdf2a21 fix item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 14:31:28 +02:00
Vicent Llopis 886c4a15b5 refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 10:19:00 +02:00
Vicent Llopis eab329b230 refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:01:59 +02:00
Alexandre Riera 74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:39:01 +02:00
Alexandre Riera 49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:19:45 +02:00
Carlos Satorres af1f92613f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:57:11 +02:00
Alex Moreno 6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-23 08:23:16 +02:00
Alex Moreno 6f06bac0c1 Merge branch 'dev' into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:55:08 +00:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Juan Ferrer 6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI 2023-05-19 10:56:15 +02:00
Alexandre Riera 58c25786a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:52:33 +02:00
Alexandre Riera d70a31bfbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes 2023-05-18 14:49:27 +02:00
Alexandre Riera e8376c00a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:43:20 +02:00
Alexandre Riera 2591d2d115 refs #3628 added check & date-picker
gitea/salix/pipeline/head Build queued... Details
2023-05-18 11:42:22 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Alex Moreno cd34ccad8f refs #5579 use variable
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 13:14:43 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Alex Moreno cc23fd1337 refs #5579 fix mockTimes and remove userLog_add
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 09:23:37 +02:00
Alex Moreno c9af22780b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export 2023-05-17 08:24:23 +02:00
Alex Moreno 7f881409fc refs #5579 fix mockTime
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 15:00:31 +02:00
Alex Moreno 3e33030b1d refs #5579 update mariadb version to 10.7.6
gitea/salix/pipeline/head This commit is unstable Details
2023-05-15 15:16:22 +02:00
Alex Moreno ea6837e33a refs #5579 export structure and data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 13:07:24 +02:00
Alexandre Riera 9760e50212 refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:46:12 +02:00
Pablo Natek 65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:28:19 +02:00
Alexandre Riera ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 13:22:53 +02:00
Alexandre Riera b37bde2ba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 08:14:42 +02:00
Carlos Satorres 2c6f71b4c4 Merge branch 'dev' 2023-05-08 10:16:57 +02:00
Alexandre Riera a2055d35fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:48:09 +02:00
Alexandre Riera d21b949ffb refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:18:53 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alexandre Riera 5cdec35ed4 refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:30:10 +02:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:39:39 +00:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 08:36:47 +00:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:49:08 +02:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Carlos Satorres 57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-04-26 09:03:37 +02:00
Alex Moreno 73153071d6 Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:56:46 +00:00
Pablo Natek e8ce8e42fd refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:25:22 +02:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Carlos Satorres f76727903a update insert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 15:17:05 +02:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Joan Sanchez 6aca23e466 Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:23:29 +00:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 14:29:22 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 05:39:22 +00:00
Vicent Llopis dca760d4e4 Merge branch 'dev' into 4858-chat_realTime
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:02:51 +00:00
Vicent Llopis cbe79a964c refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 10:31:02 +01:00
Vicent Llopis 7e37d7f3f1 refs #5342 actualido el itemType.isFragile para las 'plants'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 09:25:56 +01:00
Alexandre Riera 3fcfc3d640 refs #5056 adding fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 07:53:26 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 4141a97356 refs #4858 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 11:37:26 +01:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:38:04 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Alexandre Riera 6609cce065 refs #5056 minHeightBetweenTrays
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 12:14:58 +01:00
Alexandre Riera f706b66efc refs #5056 added divisible in wagonType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 11:57:09 +01:00
Alexandre Riera 53bca1e8a3 refs #5056 added fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:36:10 +01:00
Vicent Llopis c51e542235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 13:43:59 +01:00
Carlos Andrés 6b375cbaaa refs #5000 InvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:34:41 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:22:36 +00:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Carlos Satorres a48c67aab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-03-09 14:09:37 +01:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Vicent Llopis b85624085a fix backTest: add columns to table tpvTransaction
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:24:21 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Alexandre Riera 9dd242908e .
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 11:43:47 +01:00
Vicent Llopis 78721e7ffa feat: add fixtures 2023-03-08 09:50:47 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-03-07 08:28:13 +00:00
Vicent Llopis 0bda8c0ed6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 09:14:30 +01:00
Vicent Llopis 4830f8489a remove unnecessary fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:12:08 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
gitea/salix/pipeline/head This commit looks good Details
Refs: #5340
2023-03-06 12:37:37 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Javi Gallego e01fa40531 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:51:41 +01:00
Carlos Andrés 6f5e25493d invoicing test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 10:36:38 +01:00
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Alexandre Riera 6eab4bbe94 refs #5149 fixing tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 08:15:58 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Carlos Andrés ffdfd1a7e5 refs #5000 Invoicing change structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 14:48:21 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Joan Sanchez f88c9b904c Updated fixtures 2023-02-21 10:38:23 +01:00
Joan Sanchez c9840f6985 Updated entry structure 2023-02-21 08:32:46 +01:00
Joan Sanchez a04c8ed8d8 Updated structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 08:17:52 +01:00
Joan Sanchez 0a7b3647b8 Updated fixtures 2023-02-21 07:57:35 +01:00
Joan Sanchez 39527cbc50 Updated structure & data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-20 14:46:38 +01:00
Joan Sanchez 251c7b54ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-20 14:36:47 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00
Alexandre Riera 7194e62cae refs #4588 faked observationEditorFk in structure
gitea/salix/pipeline/head Build queued... Details
2023-02-14 13:28:21 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Javi Gallego 4a562c3110 unificado todo a claimState isEditable 2023-02-07 15:40:03 +01:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:24:26 +01:00
Joan Sanchez 8158cb6860 feat(db): export prod structure & data
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: #5192
2023-02-03 15:08:41 +01:00
Alex Moreno 03d7a2908b refactor: only mock vn.time from 2000 to 2002
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 11:25:14 +01:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:52:40 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 11:42:48 +01:00
Pau 99e6ef5a36 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:35:14 +00:00
Alex Moreno 39d4b53872 fix: sql fail in real structure...
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 09:00:49 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Joan Sanchez 0a0cca0585 Set client bcrypt password
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 09:06:23 +01:00
Vicent Llopis f7fa082294 refator: name endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:49:09 +01:00
Pau 3184dcd39d requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 08:41:12 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Pau c13bffcc57 refs #4797 @1h requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:11:16 +01:00
Pau dfa3022949 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-24 08:20:45 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:11:46 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:44:19 +01:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Alex Moreno bd0f4d89f8 Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 08:07:45 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Alexandre Riera b281a51d90 refs #4927 refresh structure
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 10:33:23 +01:00
Alexandre Riera 199fabbb1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:11:52 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:56:39 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Pau ec4c628adf Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 06:43:45 +00:00
Pau cc806cc08f requested changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-18 07:41:10 +01:00
Pau eb4ad206d0 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 06:20:14 +00:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 15:36:39 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 12:50:34 +01:00
Pau f0cc28d698 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:46:55 +00:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Vicent Llopis eef926d09d fix: fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:34:51 +01:00
Vicent Llopis 76fe32924c fix: update url
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:25:20 +01:00
Alexandre Riera c371c2fe92 refs #4930 refresh structure
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:03:13 +01:00
Alex Moreno 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01:00
Alexandre Riera dab94ff535 refs #5061 refresh structure
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 14:48:45 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Vicent Llopis 6a8e7873fa fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +01:00
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:29:45 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head Build queued... Details
2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:29:03 +01:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Pau 24b8b172b9 use notification id 2023-01-05 14:13:42 +01:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 12:48:03 +00:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:33:21 +00:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Alexandre Riera 6185b2f055 refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:04:38 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Pau ea7f4b7c02 remove broken fixture 2022-12-27 10:34:12 +01:00
Pau 3ca1d1f4ee remove error in fixtures 2022-12-27 10:29:15 +01:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Joan Sanchez 39699114e3 Changed version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 10:01:08 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +01:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01:00
Pau fce0352986 add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 10:41:07 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 09:25:52 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:15:50 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Vicent Llopis 1ddaf7ff08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-20 10:52:23 +01:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alex Moreno 0a18c855e7 Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:43:40 +00:00
Vicent Llopis 3642b295b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-16 08:50:51 +01:00
Joan Sanchez dac6b4cb22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 08:41:43 +01:00
Joan Sanchez e7883d1c59 Removed deprecated foreign key 2022-12-16 08:39:59 +01:00
Joan Sanchez 5b23ee6d5a Removed deprecated fields 2022-12-16 08:10:39 +01:00
Vicent Llopis 1b30ee9d2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:32:51 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:26:10 +01:00
Alexandre Riera 0af4f337e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:23:44 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:52:34 +01:00
Vicent Llopis 6793b8e9a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-15 07:13:09 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 13:37:25 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 12:37:56 +01:00
Vicent Llopis e4dbeb0b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-13 09:54:56 +01:00
Alex Moreno 09edb99a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-12 13:48:06 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Vicent Llopis 2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 11:17:15 +00:00
Alexandre Riera 569a0e8cc9 refs #3302 log modified and fixed e2e tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-05 15:30:41 +01:00
Alex Moreno 995fb6a5c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable Details
2022-12-02 13:13:53 +01:00
Joan Sanchez ac447d4981 Updated SQL version nomenclature
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:48:12 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +01:00
Vicent Llopis 68855add59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:53:54 +01:00
Alex Moreno 67cf4ebbea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-30 10:28:21 +01:00
Vicent Llopis 5c1b88fa44 detele: fixtures en español
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:21:53 +01:00
Vicent Llopis f056c26b0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-11-30 08:03:16 +01:00
Vicent Llopis c258587e02 feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 15:06:21 +01:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Carlos Andrés 8a0c810a84 refs #4613
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 17:45:19 +01:00
Alex Moreno 7f1478f2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:48:37 +01:00
Carlos Andrés bc83b9fd1f Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:07:21 +01:00
Carlos Andrés 2b0e6ab5ed test 2022-11-28 10:07:18 +01:00
Alex Moreno e4bbb6e83a Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 08:43:55 +00:00
Alex Moreno 6db1a9e8ae refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 07:19:30 +01:00
Vicent Llopis 7f3265be55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-11-25 12:24:00 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +01:00
Alex Moreno c9347a929a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-25 08:52:11 +01:00
Vicent Llopis d023ec0a13 update fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 08:24:25 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:35:15 +00:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Vicent Llopis 6a2af344aa feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:41:32 +01:00
Vicent Llopis 9cfab2b3f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-23 10:23:17 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Vicent Llopis e148284332 jenkins test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:02:19 +01:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 08:12:07 +00:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Joan Sanchez 1f857d5b10 4859 - Export production database
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:01:21 +01:00
Pau d41269bbbe Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 11:58:46 +01:00
Alexandre Riera a952fc0330 space fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:38:22 +01:00
Alexandre Riera 67f0346980 space fixtures
gitea/salix/pipeline/head Build queued... Details
2022-11-18 09:37:38 +01:00
Alexandre Riera fd58eaf838 drop procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:36:38 +01:00
Alexandre Riera 153cb48ff0 fix test
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:55:35 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alex Moreno cba3c38ba6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 12:55:07 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Alex Moreno 8f4ac8fcc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 10:12:29 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1129
2022-11-11 07:30:01 +00:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:19:20 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:12:16 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Vicent Llopis 04f165d901 solved conflits
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:23:35 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:48:36 +01:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:01:11 +00:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:53:47 +00:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:33:07 +01:00
Vicent Llopis d9107719fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-10-31 15:04:33 +01:00
Alex Moreno 36c0cc1a38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-31 14:12:40 +01:00
Joan Sanchez 231575d23e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:40:07 +01:00
Joan Sanchez d34936015b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:39:54 +01:00
Vicent Llopis 838402f05a add fixtures 2022-10-31 09:55:05 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Alex Moreno e9731c4ac0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-28 09:11:40 +02:00
Vicent Llopis 264b56378a Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 06:31:12 +00:00
Alex Moreno 9eb3b09be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:26:45 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 05:33:45 +00:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Alex Moreno 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Alex Moreno 99fca9834f Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:10:14 +00:00
Vicent Llopis 1d908002e2 feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 14:25:27 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Alex Moreno 991893837c correct fixutures from dev
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:34:22 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 13:22:53 +02:00
Alex Moreno c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 2e91698c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:19:08 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Javi Gallego d73dab3454 Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:01:56 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Pau 9b202b7a84 refactor: isBox to freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 11:46:04 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Alex Moreno f81b2775a0 add fixture
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 09:36:51 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Alex Moreno 203b223cc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:24:40 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:46:23 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:37:20 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 793705413e #452 - Dumped db
gitea/salix/pipeline/head This commit is unstable Details
2022-09-16 07:05:27 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 11:35:15 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 31aafc0719 feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:11:38 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-05 09:18:53 +00:00
Joan Sanchez 624428212b Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-08-04 12:51:41 +00:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Vicent Llopis 998176f03c fix: fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 08:23:39 +02:00
Vicent Llopis 82f2ef768f fix: fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 08:15:20 +02:00
Vicent Llopis ede6da1a15 fix: db fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 15:14:02 +02:00
Juan Ferrer 539d9617e6 export
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 09:40:48 +02:00
Joan Sanchez eed0ac66c6 Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1023
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 07:09:08 +00:00
Joan Sanchez 0de2c08739 Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-03 06:45:58 +00:00
Joan Sanchez 1b9de5cc95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 06:41:22 +00:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Carlos Andrés 6f825ee3bc #3530 Eliminar uso de person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 17:03:31 +02:00
Carlos Andrés 67feac7c6c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 16:04:18 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00