Commit Graph

3668 Commits

Author SHA1 Message Date
Alex Moreno ad3c34bd35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test 2023-05-08 12:08:00 +02:00
Alex Moreno 73fb940c63 refs #5472 try change-password 2023-05-08 10:55:16 +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 2023-05-08 09:48:09 +02:00
Alexandre Riera d21b949ffb refs #5513 fix getItemsPackaging 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
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method 2023-05-05 13:58:11 +02:00
Alexandre Riera 5cdec35ed4 refs #5513 addFromPackaging.spec.js 2023-05-04 14:30:10 +02:00
Alexandre Riera 8ae5a0de0f refs #5513 adding backs and models 2023-05-04 12:03:47 +02:00
Alex Moreno a22a8a6bd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-04 11:34:19 +02:00
Alex Moreno 2e020b5ebb fix(): correct version 2023-05-04 09:02:23 +02:00
Alexandre Riera a2d3b79246 Merge branch 'dev' into 4713-saleTracking 2023-05-04 06:42:39 +00:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice 2023-05-03 09:39:39 +00:00
Alex Moreno bf3aac70f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-03 11:37:07 +02:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes 2023-05-02 11:25:17 +00:00
Alex Moreno 306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice 2023-05-02 09:42:56 +00:00
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-02 11:38:07 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice 2023-05-02 08:41:18 +00:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section 2023-05-02 07:28:59 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod 2023-04-28 14:17:19 +02:00
Alex Moreno c3038a4d61 fix(imageCollection): 2023-04-28 11:54:11 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr 2023-04-28 08:36:47 +00:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole 2023-04-28 09:35:15 +02:00
Alex Moreno 42fc0b62d8 refs #5472 feat(user): add passExpired 2023-04-27 15:18:27 +02:00
Carlos Satorres 95602895df refs #5525 update changes 2023-04-27 14:40:02 +02:00
Carlos Satorres 26872c28e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE 2023-04-27 14:19:20 +02:00
Carlos Satorres 66986d3c21 Merge branch 'dev' into 5316-kkeoEntryNotes 2023-04-27 12:08:28 +00:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Alex Moreno 34bb216f17 deploy(231601): dev to test 2023-04-27 08:53:54 +02:00
Alex Moreno 9b13e3fd2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-04-27 07:23:25 +02:00
Vicent Llopis 2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice 2023-04-26 14:58:34 +02:00
Vicent Llopis 09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados 2023-04-26 14:46:16 +02:00
Alexandre Riera 5844da4474 refs #4713 updated sql 2023-04-26 14:34:29 +02:00
Carlos Satorres 15df9518ab Merge branch 'dev' into 084200-arreglarChanges 2023-04-26 12:31:33 +00:00
Carlos Satorres 09c1d7e393 refs #084200 add table 2023-04-26 14:30:58 +02:00
Alexandre Riera 878f232fda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking 2023-04-26 14:20:23 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality 2023-04-26 13:49:08 +02:00
Carlos Satorres 480784ee18 refs #084200 cambio nombre 2023-04-26 13:48:31 +02:00
Vicent Llopis c69e038a56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor 2023-04-26 12:45:54 +02:00
Vicent Llopis c580be2790 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-04-26 12:07:34 +02:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-26 11:45:20 +02:00
Vicent Llopis 2e5a43af68 refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser 2023-04-26 11:40:21 +02:00
Carlos Satorres af875dd67e Merge 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 2023-04-26 05:56:46 +00:00
Alex Moreno af0523a155 refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior 2023-04-25 15:17:45 +02:00
Pablo Natek e8ce8e42fd refs #5153 2023-04-25 14:25:22 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl 2023-04-25 14:17:36 +02:00
Alexandre Riera 83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev 2023-04-25 11:25:29 +02:00
Alex Moreno 618100b68a refs #5542 eliminados procesos que no se usan 2023-04-25 10:40:24 +02:00
Alex Moreno 4cb231759f feat(State/Supplier): replace hasRole to acls 2023-04-25 09:15:05 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance 2023-04-24 15:33:28 +00:00
Alex Moreno 8502b74dee feat(): replace hasRole to checkAccessAcl 2023-04-24 11:07:04 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies 2023-04-24 06:51:41 +00:00
Vicent Llopis 5b7ca82509 Merge branch 'dev' into 5318-deviceProductionLog_toSalix 2023-04-24 04:58:30 +00:00
Alex Moreno faee5ccd7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:53:07 +02:00
Vicent Llopis ea1035311e Merge branch 'dev' into 5128-client.credit-management 2023-04-21 11:30:58 +00: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
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases 2023-04-21 08:20:38 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance 2023-04-21 05:54:00 +00:00
Vicent Llopis bcf7b6ab3d borrado acl innecesario 2023-04-20 15:17:49 +02:00
Carlos Satorres d6e6dab03b Merge branch 'dev' 2023-04-20 11:55:52 +02:00
Alex Moreno 7df4a2b15d fix(231401): fix tests and fixtures 2023-04-20 08:25:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections 2023-04-20 07:52:05 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl 2023-04-19 15:23:32 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole 2023-04-19 13:59:26 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-19 12:18:45 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix 2023-04-19 09:52:28 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role ==' 2023-04-18 15:03:23 +02:00
Joan Sanchez c2af40edb5 changes 2023-04-18 13:15:04 +02:00
Joan Sanchez d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 13:14:57 +02:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 11:41:55 +02:00
Joan Sanchez a0d8ed1433 E2e fixes 2023-04-18 11:33:36 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price 2023-04-18 08:33:15 +00:00
Alexandre Riera 28a7722bb6 Merge branch 'dev' into 5518-log-user-role 2023-04-18 08:01:42 +00:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Carlos Satorres 8b60e9f5fd sql arreglado 2023-04-18 08:07:35 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance 2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL 2023-04-18 07:26:35 +02:00
Carlos Satorres f76727903a update insert 2023-04-17 15:17:05 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice 2023-04-17 14:23:02 +02:00
Joan Sanchez 06a845e7f0 Cambios SQL 2023-04-17 14:15:39 +02:00
Alex Moreno b5434c5e4e tab 2023-04-17 12:58:55 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role 2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account 2023-04-17 11:52:52 +02:00
Alex Moreno f97d169cbf observationEmail 2023-04-17 11:52:31 +02:00
Alexandre Riera 2bc190b01e Merge branch 'dev' into 5293-claim-sections 2023-04-17 08:49:41 +00:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium 2023-04-17 10:46:26 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-04-17 08:59:49 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +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 2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-17 06:44:17 +00:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing 2023-04-15 14:24:50 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Alexandre Riera ad3836552e refs #5518 sections added 2023-04-14 14:16:29 +02:00
Vicent Llopis 4c18efa589 refs #5128 creado método setRating 2023-04-14 13:05:57 +02:00
Vicent Llopis 83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-14 10:39:16 +02:00
Alexandre Riera b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price 2023-04-14 07:08:02 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket 2023-04-13 14:18:01 +02:00
Joan Sanchez 7a02a3213a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-04-13 13:47:34 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-04-13 13:47:18 +02:00
Alexandre Riera ac4772e44e refs #5418 mistake doing git pull origin dev 2023-04-13 13:46:29 +02:00
Joan Sanchez 9aaea7e8ed Changed to new SQL version 2023-04-13 12:01:51 +02:00
Joan Sanchez f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-13 12:00:22 +02:00
Joan Sanchez b5f2cf3711 Added unit test & translation fixes 2023-04-13 11:54:56 +02:00
Carlos Satorres 44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo 2023-04-13 08:44:56 +02:00
Carlos Satorres ad267c933c refs #5540 country.code 2023-04-13 08:30:33 +02:00
Joan Sanchez eb1798100f Added version 23.16 2023-04-13 08:16:06 +02:00
Carlos Satorres 747efc4342 refs #5540 sql mod 2023-04-12 14:52:59 +02:00
Carlos Satorres 117849f093 refs #5540 supplier js 2023-04-12 12:03:55 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix 2023-04-12 10:02:06 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance 2023-04-11 13:19:54 +00:00
Vicent Llopis d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito" 2023-04-11 14:57:56 +02:00
Alexandre Riera 245b0e70f4 hotfix rollback delivery.sql 2023-04-11 14:51:39 +02:00
Alexandre Riera 3ee08e0300 changed folder 2023-04-11 12:34:26 +02:00
Alexandre Riera c6db5f1a4b hotfix apply changes procedure 2023-04-11 12:29:09 +02:00
Alexandre Riera d5d18d5376 hotfix apply SQL delivery.sql 2023-04-11 11:02:08 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo 2023-04-11 10:32:21 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock 2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert 2023-04-11 09:48:31 +02:00
Joan Sanchez b9e48f2102 Added translations & enable through departments 2023-04-11 07:39:43 +02:00
Carlos Satorres 9f4d027014 refs #5316 sql 2023-04-06 15:36:14 +02:00
Joan Sanchez 2e0325e567 Validate code 2023-04-06 14:59:25 +02:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker 2023-04-06 08:32:05 +00:00
Alexandre Riera 05912610f8 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk 2023-04-06 07:47:06 +00:00
Carlos Satorres f307f79dc2 refs #5250 cambio a ult version de changes 2023-04-06 09:34:46 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Joan Sanchez 213766afdf Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev
Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:27:13 +00:00
Joan Sanchez 641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-06 09:26:55 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk 2023-04-06 07:16:00 +00:00
Joan Sanchez 902709d61b Added authCode table 2023-04-05 15:22:09 +02:00
Alexandre Riera 8f4de7e7e9 refs #5259 undo delete, update trigger 2023-04-04 15:27:10 +02:00
Alexandre Riera 589e996b69 refs #5259 minor fix 2023-04-04 15:17:19 +02:00
Joan Sanchez 0d6b248f76 feat(2fa): email 2fa
Refs #5475
2023-04-04 14:59:33 +02:00
Alexandre Riera 81cf35f2d3 refs #5259 drop procedure invoiceOut_afterInsert 2023-04-04 14:55:37 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified 2023-04-04 14:47:13 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-04-04 13:40:12 +02:00
Alexandre Riera 32df51ecca refs #5092 moved sql 2023-04-04 08:40:51 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-04-04 08:40:03 +02:00
Carlos Satorres b51710fb31 refs #5525 mod yml y sql 2023-04-03 15:44:12 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-30 14:57:00 +02:00
Joan Sanchez 6ff6004627 Added version 2314.01 2023-03-30 08:35:04 +02:00
Carlos Satorres 60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-03-30 08:26:45 +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
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:23:29 +00:00
Joan Sanchez 3bab90f9e5 Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev
Reviewed-on: #1411
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:07 +00:00
Carlos Satorres 71220c58f7 refs #084200 inserts 2023-03-29 12:00:01 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance 2023-03-28 13:26:17 +02:00
Alexandre Riera 05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-28 08:26:11 +02:00
Alexandre Riera 87d0dc3cec refs #5092 changed name to negative bases 2023-03-28 08:25:41 +02:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel 2023-03-27 14:29:22 +02:00
Carlos Satorres aad8fb0a66 refs #084200 i18n 2023-03-27 13:11:38 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones 2023-03-27 05:39:22 +00:00
Carlos Satorres b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker 2023-03-24 11:48:31 +00:00
Vicent Llopis c65f01b689 refs #5416 delete: supplierAccount triggers 2023-03-24 12:30:18 +01:00
Vicent Llopis 871618b122 fix: faltaba el esquema 2023-03-24 12:29:58 +01:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv 2023-03-24 12:11:42 +01:00
Vicent Llopis dca760d4e4 Merge branch 'dev' into 4858-chat_realTime 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 2023-03-24 10:31:02 +01:00
Vicent Llopis 6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-24 09:43:13 +01:00
Alexandre Riera 74312a3cdf refs #5056 changed acl 2023-03-24 07:30:35 +01:00
Vicent Llopis 7e37d7f3f1 refs #5342 actualido el itemType.isFragile para las 'plants' 2023-03-23 09:25:56 +01:00
Alexandre Riera 3fcfc3d640 refs #5056 adding fixtures 2023-03-23 07:53:26 +01:00
Carlos Satorres d05ddef5fa refs #084200 primer commit companyI18n 2023-03-22 14:54:59 +01:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings 2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes 2023-03-22 10:21:15 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest 2023-03-22 10:13:59 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones 2023-03-22 07:21:20 +01:00
Vicent Llopis 4141a97356 refs #4858 fix: backTest 2023-03-21 11:37:26 +01:00
Vicent Llopis 32e2d1c0fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime 2023-03-21 11:26:41 +01:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test 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 2023-03-21 08:51:30 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-20 09:54:02 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model 2023-03-17 08:46:01 +01:00
Juan Ferrer f61c205a7b Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-16 09:53:16 +00:00
Alexandre Riera 1cd768f7b8 refs #5056 moved sql 2023-03-16 10:39:02 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones 2023-03-16 10:38:04 +01:00
Vicent Llopis 2f2d65bfd6 refs #5342 feat: añadido icono en los tickets que tengan sales fragiles 2023-03-16 10:33:24 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name 2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-16 09:16:50 +01:00
Joan Sanchez 1a79bb586c Added version 2312.01 2023-03-16 09:07:59 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-16 08:06:17 +00:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket 2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos 2023-03-16 06:42:39 +00:00
Alexandre Riera 6609cce065 refs #5056 minHeightBetweenTrays 2023-03-15 12:14:58 +01:00
Alexandre Riera f706b66efc refs #5056 added divisible in wagonType 2023-03-15 11:57:09 +01:00
Alexandre Riera 53bca1e8a3 refs #5056 added fixtures 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 2023-03-14 13:43:59 +01:00
Carlos Andrés 6b375cbaaa refs #5000 InvoiceOut 2023-03-14 09:34:41 +01:00
Carlos Andrés 2a6848c09a refs #5000 invoiceOutGlobal 2023-03-14 09:17:39 +01:00
Carlos Andrés 6d3fa34624 refs #5000 invoiceOutGlobal 2023-03-14 09:14:04 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-14 09:04:45 +01:00
Vicent Llopis c5eef959ee refs #4856 delete unnessary sql 2023-03-14 07:45:00 +01:00
Carlos Satorres b5394d3925 refs #084200 footer finalizado, web personalizado 2023-03-13 12:52:41 +01:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control 2023-03-13 09:22:36 +00:00
Alexandre Riera 0248c3c9e0 refs #5056 models and tables added 2023-03-13 07:34:49 +01:00
Alexandre Riera efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar 2023-03-10 11:50:11 +00:00
Alexandre Riera c4d6a19666 refs #5092 download as csv button 2023-03-10 12:49:20 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos 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 2023-03-09 13:41:05 +01:00
Alexandre Riera 4f78eaa14c Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-09 08:29:43 +00:00
Vicent Llopis b85624085a fix backTest: add columns to table tpvTransaction 2023-03-09 08:24:21 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated 2023-03-08 12:29:09 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-08 12:22:29 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Alexandre Riera 106f96b9a6 refs #4713 fixed front test 2023-03-08 12:10:08 +01:00
Alexandre Riera ed6edfed45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking 2023-03-08 11:50:29 +01:00
Alexandre Riera 9dd242908e . 2023-03-08 11:43:47 +01:00
Vicent Llopis 78721e7ffa feat: add fixtures 2023-03-08 09:50:47 +01:00
Joan Sanchez 23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar 2023-03-08 06:50:16 +00:00
Carlos Satorres 955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim 2023-03-07 15:43:48 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
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 2023-03-07 09:14:30 +01:00
Vicent Llopis 4830f8489a remove unnecessary fixtures 2023-03-07 08:12:08 +01:00
Javi Gallego 4a32c164a6 template string 2023-03-07 07:34:08 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
Refs: #5340
2023-03-06 12:37:37 +01:00
Vicent Llopis 9e9807c4b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-06 11:55:30 +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
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section 2023-03-06 09:27:53 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-03 07:44:31 +01:00
Alexandre Riera 8679aefb48 refs #4713 procs deprecated, originalQuantity deleted 2023-03-03 07:36:04 +01:00
Javi Gallego e01fa40531 Merge branch 'dev' into 5187-error-permisos 2023-03-02 11:51:41 +01:00
Joan Sanchez e785c34d90 Added next version 2023-03-02 07:52:07 +01:00
Joan Sanchez 84dc95621d Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:30:17 +00:00
Vicent Llopis 3051768781 WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros 2023-03-01 14:50:23 +01:00
Guillermo Bonet 707ae232a7 refs #5193 ticketCreateWithUser to ticket_add 2023-03-01 12:24:36 +01:00
Carlos Andrés 6f5e25493d invoicing test 2023-03-01 10:36:38 +01:00
Alexandre Riera 915c598c0c fixed tests 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 2023-03-01 08:29:58 +01:00
Alexandre Riera 6eab4bbe94 refs #5149 fixing tests 2023-03-01 08:15:58 +01:00
Vicent Llopis da6e29056e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies 2023-03-01 08:08:23 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e 2023-02-28 14:29:31 +01:00
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos 2023-02-28 12:46:48 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added 2023-02-28 07:49:34 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added 2023-02-27 08:39:46 +01:00
Alexandre Riera 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed 2023-02-24 14:41:02 +01:00
Carlos Andrés ffdfd1a7e5 refs #5000 Invoicing change structure 2023-02-23 14:48:21 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC 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 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 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 2023-02-20 14:36:47 +01:00
Vicent Llopis 3ef0b3a68b feat: add acl 2023-02-20 12:42:42 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-17 13:33:34 +01:00
Joan Sanchez 46fdaab649 Merge pull request 'test -> dev' (!1335) from test into dev
Reviewed-on: #1335
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:23:11 +00:00
Vicent Llopis c6304898b4 refactor: borrado insert, se ha hecho directamente sobre produccion 2023-02-17 13:00:02 +01:00
Vicent Llopis 7883723b8c move changes sql 2023-02-17 12:54:59 +01:00
Vicent Llopis 77c454f953 move sql changes and add changelog 2023-02-17 10:45:08 +01:00
Vicent Llopis 373be40986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies 2023-02-17 10:42:50 +01:00
Vicent Llopis 5285ad9242 move sql changes 2023-02-17 10:19:12 +01:00
Joan Sanchez a59dac2b9f Added version 230801 2023-02-17 10:12:29 +01:00
Vicent Llopis d25ebaec0b Merge branch 'dev' into 5097-item.summary_available 2023-02-17 08:47:56 +00:00
Alexandre Riera 4cae4448f6 refs #5194 moved invoiceOut to 230402 2023-02-16 14:45:11 +01:00
Alexandre Riera 8b088e831a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance 2023-02-16 14:43:51 +01:00
Alexandre Riera ec16a0d66c Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance 2023-02-16 14:35:33 +01:00
Alexandre Riera 457fd3f5f9 refs #5194 sql moved to 230404 2023-02-16 14:35:03 +01:00
Joan Sanchez 3031ae2511 Updated version 2023-02-16 14:28:33 +01:00
Vicent Llopis 76f2030125 feat: add update sql 2023-02-16 09:50:25 +01:00
Vicent Llopis 3dd870f7df fix: test e2e 2023-02-16 09:44:20 +01:00
Vicent Llopis dc2ab50f65 fix: test e2e 2023-02-16 09:44:06 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available 2023-02-15 15:08:58 +01:00
Alexandre Riera e68afa3169 refs #5223 moved sql 2023-02-15 12:59:19 +01:00
Vicent Llopis fda428d73e refactor: change user 2023-02-15 09:52:35 +01:00
Vicent Llopis 5ecf55a1e7 movida sql a carpeta changes actual 2023-02-15 09:51:27 +01:00
Vicent Llopis 7439b12d98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies 2023-02-15 09:31:20 +01:00
Alexandre Riera 7194e62cae refs #4588 faked observationEditorFk in structure 2023-02-14 13:28:21 +01:00
Alexandre Riera 7876d4611c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado 2023-02-14 12:44:03 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text 2023-02-14 12:41:36 +01:00
Alexandre Riera 7d5591462d refs #4588 entry sql 2023-02-14 09:08:49 +01:00
Alexandre Riera 54ad373c5e Merge branch 'master' into 5194-cambios-ticketFutureAdvance 2023-02-13 09:30:47 +00:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests 2023-02-13 10:16:28 +01:00
Alexandre Riera a7e9e52ad4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario 2023-02-13 07:34:13 +01:00
Vicent Llopis ac3faddac1 fix: actulizada sql intrastat y se muestra solamente cuando toca 2023-02-10 12:09:51 +01:00
Alexandre Riera 6cb815faaf . 2023-02-10 10:13:41 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance 2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e 2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Vicent Llopis 4754dc7bda feat: actualizada sql intrastat 2023-02-09 11:03:22 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data 2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-02-09 08:56:30 +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
Vicent Llopis b70311999d refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción 2023-02-08 09:41:09 +01:00
Alexandre Riera 549d530690 . 2023-02-08 07:35:52 +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 2023-02-07 13:44:53 +01:00
Alexandre Riera c397757762 sql version updated 2023-02-06 12:26:54 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez 2023-02-06 12:24:26 +01:00
Alexandre Riera 68b4d269ff Merge branch 'dev' into 4588-campo-nota-ultimo-usuario 2023-02-06 09:18:13 +00:00
Alex Moreno 7ad9e2cb5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime 2023-02-06 10:05:17 +01:00
Alexandre Riera 0a9d37ca08 hotfix itemConfig 2023-02-06 09:01:13 +01:00
Joan Sanchez 8158cb6860 feat(db): export prod structure & data
Refs: #5192
2023-02-03 15:08:41 +01:00
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto 2023-02-03 14:31:50 +01:00
Alex Moreno 03d7a2908b refactor: only mock vn.time from 2000 to 2002 2023-02-03 11:25:14 +01:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew() 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 2023-02-02 11:42:48 +01:00
Pau 99e6ef5a36 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-02-02 08:35:14 +00:00
Joan Sanchez 4d8af54b1e Added version 23.06.01 2023-02-02 09:21:12 +01:00
Joan Sanchez d45c0cb99a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:59:39 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Alexandre Riera 5f656a894f buscador 2023-02-02 08:52:38 +01:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-02-02 08:40:49 +01:00
Joan Sanchez d0e65b9539 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-02-02 07:38:12 +00:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-02-02 08:23:17 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes 2023-02-02 07:32:38 +01:00
Alex Moreno 39d4b53872 fix: sql fail in real structure... 2023-02-01 09:00:49 +01:00
Alex Moreno 56f7794d87 typo 2023-02-01 08:48:47 +01:00
Pau 9ece9d8625 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications 2023-02-01 08:42:21 +01:00
Pau 650cc68f4a requested changes 2023-02-01 08:42:20 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket 2023-01-31 15:09:16 +01:00
Joan Sanchez e34d64361b Account refactor 2023-01-31 14:57:24 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon 2023-01-31 14:20:08 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin 2023-01-31 13:21:51 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination 2023-01-31 13:00:25 +01:00
Alex Moreno a74fb31b5b fix: vn.time 2023-01-30 15:15:27 +01:00
Vicent Llopis 903a42683d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-30 12:45:17 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Pau 29b5c7cc5a Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-30 08:03:54 +00:00
Alexandre Riera fbf252b634 refs #5072 template strings 2023-01-30 08:31:56 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added 2023-01-30 08:30:39 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 07:56:12 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser 2023-01-27 08:20:32 +00:00
Joan Sanchez 0a0cca0585 Set client bcrypt password 2023-01-27 09:06:23 +01:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags 2023-01-27 08:21:30 +01:00
Alexandre Riera 956b3e05f8 hotfix delete saleChecked from vnClean 2023-01-27 07:56:51 +01:00
Vicent Llopis f7fa082294 refator: name endpoint 2023-01-26 13:49:09 +01:00
Pau 3184dcd39d requested changes 2023-01-26 08:41:12 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter 2023-01-25 15:29:01 +01:00
Pau c13bffcc57 refs #4797 @1h requested changes 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 2023-01-24 08:11:46 +01:00
Pau 4228c1e49c change c.fi to s.nif 2023-01-24 08:02:42 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor 2023-01-23 15:24:00 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e 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 2023-01-23 13:44:19 +01:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker 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 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 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 2023-01-20 10:11:52 +01:00
Alexandre Riera 89700f71f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 10:05:42 +01:00
Alex Moreno ace7a5939e move to changes 230401 2023-01-20 08:33:59 +01:00
Vicent Llopis c77f1b17a6 movida sql a nueva carpeta changes 2023-01-20 08:32:18 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-20 08:30:30 +01:00
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags 2023-01-20 08:29:42 +01:00
Alexandre Riera a3b580e27d refs #4945 item.relevancy comment 2023-01-20 08:01:19 +01:00
Joan Sanchez fbbca1dc2e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-01-20 07:42:51 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-01-20 07:42:36 +01:00
Joan Sanchez a5decd3166 Updated version 2023-01-20 07:42:15 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail 2023-01-19 08:56:39 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal 2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig 2023-01-18 13:14:49 +01:00
Pau 5e198b8541 Merge branch 'dev' into 4732-previa-label 2023-01-18 08:15:45 +00:00
Alexandre Riera 4aaa5b2687 refs #5020 isActive Not Null 2023-01-18 09:08:09 +01:00
Pau 10c70f5388 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications 2023-01-18 09:06:18 +01:00
Pau a5f83021db requested changes 2023-01-18 09:06:17 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT 2023-01-18 08:00:20 +01:00
Pau ec4c628adf Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-18 06:43:45 +00:00
Pau cc806cc08f requested changes 2023-01-18 07:41:10 +01:00
Pau eb4ad206d0 Merge branch 'dev' into 4732-previa-label 2023-01-18 06:20:14 +00:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates 2023-01-17 15:36:39 +01:00
Vicent Llopis adc2c32ac4 feat: add changes sql 2023-01-17 12:51:04 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-17 12:50:34 +01:00
Joan Sanchez 1597c40a16 Merge branch 'dev' into 4930-add-zone 2023-01-17 11:33:56 +00:00
Pau f0cc28d698 Merge branch 'dev' into 4732-previa-label 2023-01-17 10:46:55 +00:00
Alex Moreno bc9510a317 Merge branch 'dev' into 4523-item_fixed-price_rate2 2023-01-17 09:46:16 +00:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label 2023-01-17 10:37:07 +01:00
Vicent Llopis eef926d09d fix: fixtures 2023-01-17 09:34:51 +01:00
Vicent Llopis 76fe32924c fix: update url 2023-01-17 09:25:20 +01:00
Alexandre Riera c371c2fe92 refs #4930 refresh structure 2023-01-17 09:03:13 +01:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front 2023-01-17 08:54:26 +01:00
Alexandre Riera ba3335b9a2 Merge branch 'dev' into 4951-longitud-cuentaContables 2023-01-17 06:59:33 +00:00
Alex Moreno ff39a81b8c Merge branch 'dev' into 4523-item_fixed-price_rate2 2023-01-17 06:07:14 +00:00
Alex Moreno e27a559416 refactor: replace all Date 2023-01-16 15:18:24 +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 2023-01-16 14:48:45 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType 2023-01-16 12:19:03 +01:00
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-16 10:33:35 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 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 2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 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'º 2023-01-12 15:07:48 +01:00
Alexandre Riera f01b729a61 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-12 14:09:39 +01:00
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label 2023-01-12 13:29:45 +01:00
Vicent Llopis ed90957ab5 fix: corregida primaryKey de mdbApp 2023-01-12 11:45:11 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags 2023-01-12 07:59:43 +00:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig 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 2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all 2023-01-11 15:19:09 +01:00
Vicent Llopis b801ac676c feat: updated production db 2023-01-11 12:41:02 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures 2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas 2023-01-11 12:29:03 +01:00
Alexandre Riera a42723210f refs #4951 delete function 2023-01-11 09:13:18 +01:00
Alexandre Riera 14ca5cc599 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4951-longitud-cuentaContables 2023-01-11 08:48:46 +01:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked 2023-01-10 13:11:06 +00:00
Vicent Llopis 984a3294f9 Merge branch 'dev' into 4846-claim.search-panel 2023-01-10 11:58:00 +00:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf 2023-01-09 15:11:53 +01:00
Pau 24b8b172b9 use notification id 2023-01-05 14:13:42 +01:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label 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
Joan Sanchez 030c474e06 Fixed update module 2023-01-04 13:18:55 +01:00
Alexandre Riera e82035606f refs #4984 autoincrement added 2023-01-04 11:31:09 +01:00
Alex Moreno d85717ca04 feat: chat in real time 2023-01-04 11:23:06 +01:00
Alexandre Riera a4e591c5f5 refs #4951 triggers modified 2023-01-04 10:37:59 +01:00
Alex Moreno 8184749626 change db version folder 2023-01-04 09:40:27 +01:00
Alex Moreno 021c475de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2023-01-04 09:39:26 +01:00
Alex Moreno 9b98249398 test: front test and e2e 2023-01-04 09:23:18 +01:00
Alexandre Riera f499311a16 refs #4951 changed triggers and added checkLength 2023-01-04 08:36:55 +01:00
Alexandre Riera 6ff17f0af0 Merge branch 'dev' into 4588-campo-nota-ultimo-usuario 2023-01-03 13:51:28 +00:00
Alex Moreno ef437f2fee test: e2e and backTest 2023-01-03 14:50:29 +01:00
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-03 12:33:21 +00:00
Vicent Llopis ddfee57470 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags 2023-01-03 13:09:02 +01: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 2023-01-03 12:04:38 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 09:13:47 +01:00
Vicent Llopis fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel 2023-01-03 08:07:31 +00:00
Pau a55d007655 requested changes 2023-01-03 08:12:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests 2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures 2023-01-02 13:35:33 +01:00
Alexandre Riera 7d61933a3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-02 07:07:09 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags 2022-12-29 14:24:32 +01:00
Pau 21cd2e2a63 Merge branch 'dev' into 4732-previa-label 2022-12-29 09:03:05 +00:00
Pau 45d4ab80d5 Merge branch 'dev' into 4797-lilium-worker-notifications 2022-12-29 06:37:21 +00:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-28 11:49:16 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Pau ee0cd2174f requested changes refs #4797 @2h 2022-12-27 14:32:19 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted 2022-12-27 11:50:58 +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
Alexandre Riera 5eda1388ef refs #4927 unique key added 2022-12-27 10:26:56 +01:00
Pau ada3e6f175 update sql folder 2022-12-27 10:10:37 +01:00
Pau c9468990b7 Merge branch 'dev' into 4797-lilium-worker-notifications 2022-12-27 10:08:39 +01:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 7aeeddcf18 removed the sql 2022-12-27 07:23:15 +01:00
Pau 8696d554d6 Change SQL folder 2022-12-26 07:22:59 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label 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 2022-12-23 12:34:51 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup 2022-12-23 12:08:16 +01:00
Joan Sanchez c13b49c7cd Added next version & changelog 2022-12-23 10:07:19 +01:00
Vicent Llopis 9468f604ff move sql changes 2022-12-23 10:02:21 +01:00
Vicent Llopis 906d8c5df7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat 2022-12-23 10:01:44 +01:00
Joan Sanchez 39699114e3 Changed version 2022-12-23 10:01:08 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +01:00
Alexandre Riera cf527dd8be refs #4588 hook added 2022-12-23 09:37:19 +01:00
Vicent Llopis c98b5a969d feat: actualizada consulta intrastat 2022-12-23 09:16:26 +01:00
Pau fc86e913c4 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-23 08:09:38 +00: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 e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev
Reviewed-on: #1151
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 12:44:01 +00:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
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 2022-12-22 10:49:41 +01:00
Pau fce0352986 add fixtures 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 2022-12-22 09:30:35 +01:00
Pau aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix 2022-12-22 08:30:36 +01:00
Pau ea6d399cf1 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-22 07:25:38 +00:00
Pau c0d285856b move sql files 2022-12-22 08:24:54 +01:00
Pau f57201c8c3 add requested changes 2022-12-22 08:20:59 +01:00
Pau fed4cc8534 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-22 08:07:25 +01:00
Pau a713cf92cf Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label 2022-12-22 08:00:33 +01:00
Pau f6f6d0866d requested changes refs #4732 @1h 2022-12-22 08:00:18 +01:00
Pau 05f4db7924 Add requested changes to the fixtures 2022-12-22 07:16:22 +01:00
Alex Moreno 7e6cdc9152 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-21 13:47:54 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e 2022-12-21 12:55:11 +01:00
Vicent Llopis a45ef27e3f move changes sql 2022-12-21 12:15:33 +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 2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification 2022-12-21 09:25:52 +01:00
Alex Moreno b4b7b8e204 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-21 09:08:39 +01:00
Vicent Llopis b0595dd0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-21 08:12:59 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-21 08:05:19 +01:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label 2022-12-21 07:02:02 +00:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-20 12:15:50 +01:00
Alexandre Riera 9291f4a380 refs #3963 sql moved 2022-12-20 12:10:02 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket 2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour 2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed 2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Vicent Llopis d178800c14 movidos change sql 2022-12-20 10:53:13 +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
Joan Sanchez 73ea928b33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-12-20 10:40:23 +01:00
Joan Sanchez 47e1c05e47 Renamed version 2022-12-20 10:39:39 +01:00
Joan Sanchez 70b1854cc5 Added version 2022-12-20 10:20:31 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future 2022-12-20 09:54:28 +01:00
Alexandre Riera cd71a59dfe Merge branch 'dev' into 4928-supplier-payMethod-notify 2022-12-20 07:01:45 +00:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item 2022-12-19 14:39:38 +01:00
Pau 6b3876b200 Merge branch 'dev' into 4732-previa-label 2022-12-19 12:26:52 +00:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label 2022-12-19 07:47:08 +01:00
Pau d356e5352b delete old files 2022-12-19 07:41:15 +01:00
Pau 055a479aba Merge branch 'dev' into #288-traducir-state-i18n 2022-12-19 07:40:56 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-16 13:45:25 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour 2022-12-16 13:06:06 +01:00
Alex Moreno 0a18c855e7 Merge branch 'dev' into 4928-supplier-payMethod-notify 2022-12-16 10:43:40 +00:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn 2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance 2022-12-16 09:51:40 +01:00
Vicent Llopis 85148ab929 refactor: movidos changes sql 2022-12-16 08:59:06 +01: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 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
Alex Moreno b8a0d179f1 Merge branch 'dev' into 4928-supplier-payMethod-notify 2022-12-16 07:08:39 +00:00
Vicent Llopis 1b30ee9d2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 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 2022-12-15 14:26:10 +01:00
Alexandre Riera 0af4f337e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-15 14:23:44 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures 2022-12-15 09:52:34 +01:00
Alexandre Riera 5a975d0b05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify 2022-12-15 09:22:36 +01:00
Alex Moreno 279456b377 Merge branch 'dev' into 4919-module_code 2022-12-15 07:58:18 +00:00
Alexandre Riera 33196acac6 refs #4928 fixture notification, fix test supplier 2022-12-15 08:31:47 +01:00
Vicent Llopis 859c084430 refactor: movidos changes sql 2022-12-15 07:17:13 +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
Joan Sanchez a86636bee4 Use proper module codes 2022-12-14 13:49:49 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alexandre Riera f00fdcff7c refactor sql 2022-12-14 08:06:02 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections 2022-12-13 14:00:46 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure 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 2022-12-13 12:37:56 +01:00
Alexandre Riera 95967a29db refs #4928 email template added and proc modified 2022-12-13 11:50:17 +01:00
Vicent Llopis 91f955ccf5 refactor: move sql changes 2022-12-13 09:56:05 +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
Joan Sanchez dc777ea69f Added version after merging to test 2022-12-12 14:23:40 +01:00
Joan Sanchez e000103ca4 Deleted version 2022-12-12 14:22:32 +01:00
Vicent Llopis 3d47ee1cd9 feat: inseet in notificationSubscription 2022-12-12 13:53:21 +01:00
Alex Moreno 7822a6cac8 change folder 2022-12-12 13:48:20 +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 158a71a326 restrictions 2022-12-12 13:37:14 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another 2022-12-12 13:11:45 +01:00
Vicent Llopis 2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel 2022-12-12 11:17:15 +00:00
Alexandre Riera 569a0e8cc9 refs #3302 log modified and fixed e2e tests 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 2022-12-02 13:13:53 +01:00
Joan Sanchez ac447d4981 Updated SQL version nomenclature 2022-12-02 12:48:12 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label 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 2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref 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 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 2022-11-30 08:21:53 +01:00
Vicent Llopis 89e9722027 refactor: cambiados varchar por text, para q no falle en local 2022-11-30 08:14:38 +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
Pau a676351e5b Merge branch 'dev' into 3681-move-sign_save-to-salix 2022-11-30 07:24:26 +01:00
Vicent Llopis c258587e02 feat: plantilla email para asientos contables importados incorrectamente 2022-11-29 15:06:21 +01:00
Pau cc87565190 Merge branch 'dev' into 4732-previa-label 2022-11-29 14:16:15 +01:00
Alexandre Riera cd8d5efa88 corrections 2022-11-29 10:29:18 +01:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-29 08:50:48 +01:00
Carlos Andrés 8a0c810a84 refs #4613 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 2022-11-28 14:48:37 +01:00
Carlos Andrés 2a4e8cdde9 Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio 2022-11-28 12:19:58 +00: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 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 2022-11-28 08:43:55 +00:00
Pau aee7cd113e add template strings to sql 2022-11-28 09:33:14 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Alex Moreno 6db1a9e8ae refs #4859 fix: fixtures db exportation 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
Vicent Llopis 5415338f55 refactor: movidos changes sql 2022-11-25 12:17:16 +01:00
Vicent Llopis 4ef2e3dfcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-25 12:16:40 +01:00
Pau 074763f633 rename files 2022-11-25 11:47:23 +01:00
Alexandre Riera 9f10129152 sql moved to 10510 2022-11-25 10:27:45 +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
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms 2022-11-25 09:38:34 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio 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 2022-11-25 08:24:25 +01:00
Joan Sanchez 92557ea22d Added version 10510 2022-11-25 07:43:34 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-25 07:41:43 +01:00
Joan Sanchez 4e7ef47b88 SQL fixes 2022-11-25 07:41:08 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label 2022-11-25 06:35:15 +00:00
Pau 9252fc896f Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n 2022-11-25 07:08:57 +01:00
Pau 724c1e6e8a remove unnecessary index 2022-11-25 07:08:54 +01:00
Pau 3e08650b6f acls for the notifications 2022-11-25 07:06:04 +01:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido 2022-11-24 15:04:15 +01:00
Pau 0b15236129 Merge branch 'dev' into #288-traducir-state-i18n 2022-11-24 13:18:40 +00:00
Pau 15f14062ca Requested changes 2022-11-24 14:06:52 +01:00
Vicent Llopis d233286a3f Merge branch 'dev' into DEV_fix_closeTicket 2022-11-24 12:44:37 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation 2022-11-24 10:54:40 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-24 09:27:49 +00:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation 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 2022-11-24 09:59:59 +01:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation 2022-11-24 08:42:09 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation 2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas 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 7f89899d6c fix: closeTicket 2022-11-23 12:54:52 +01:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones 2022-11-23 10:56:55 +01:00
Vicent Llopis 6a2af344aa feat: antes de bloquear comprobar que no existe un bloqueo previo 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 a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-23 08:28:07 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente 2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-22 13:45:03 +00:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb 2022-11-22 14:29:42 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation 2022-11-22 10:48:11 +00:00
Vicent Llopis e148284332 jenkins test 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 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 2022-11-22 10:15:31 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation 2022-11-22 08:12:07 +00:00
Alexandre Riera 8e1505d5ee Merge branch 'dev' into 3557-back-missingTrash 2022-11-22 07:02:56 +00:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-21 13:45:28 +00:00
Pau 3003290e61 refs #4551 @20min requested changes 2022-11-21 14:38:51 +01:00
Pau 52630f0a25 add collections with sectorFk 2022-11-21 13:38:53 +01:00
Alex Moreno 26be27c2ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-21 13:13:25 +01:00
Alexandre Riera 6ddd2d95a5 insert acl 2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections 2022-11-21 11:41:17 +01:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests 2022-11-21 10:49:19 +01:00
Pau cb0735d136 Merge branch 'dev' into 4507-greuge-add-userFk 2022-11-21 08:34:18 +00:00
Pau 7475aa8389 Merge branch 'dev' into 3681-move-sign_save-to-salix 2022-11-21 08:33:51 +00:00
Vicent Llopis 3fde11c3ed Merge branch 'dev' into 4793-models_translation 2022-11-21 08:06:39 +00:00
Alex Moreno 7e98a255b8 refs #4849 SQL 2022-11-21 08:11:01 +01:00
Joan Sanchez 1f857d5b10 4859 - Export production database 2022-11-21 08:01:21 +01:00
Pau d41269bbbe Change fixtures so the provider is present in the label 2022-11-18 11:58:46 +01:00
Alexandre Riera a952fc0330 space fixtures 2022-11-18 09:38:22 +01:00
Alexandre Riera 67f0346980 space fixtures 2022-11-18 09:37:38 +01:00
Alexandre Riera fd58eaf838 drop procedure 2022-11-18 09:36:38 +01:00
Alex Moreno ef6af87d89 feat: add supplier.isVies funcionality 2022-11-18 09:21:21 +01:00
Alexandre Riera 153cb48ff0 fix test 2022-11-17 08:55:35 +01:00
Pau 8059e54a26 Merge branch 'dev' into #288-traducir-state-i18n 2022-11-16 12:54:47 +00:00
Alexandre Riera 566d384483 Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash 2022-11-16 13:46:20 +01:00
Alexandre Riera e4a6585b6a fix test back 2022-11-16 13:46:16 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix 2022-11-16 12:26:59 +01:00
Pau 6ab28678c5 Removed unused require and insert statement 2022-11-16 11:56:03 +01:00
Pau 0f0c4c0554 feat(save-sign implemented in salix back, refs 3681 @2h 2022-11-16 10:28:13 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones 2022-11-16 09:46:35 +01:00
Pau 7b3a1bfb22 requested changes 2022-11-16 08:28:12 +01:00
Pau 8e7e7901af Implement needed functions refs #3681 @1h 2022-11-16 08:11:29 +01:00
Alexandre Riera 7c8178b423 Merge branch 'dev' into 3557-back-missingTrash 2022-11-16 07:07:20 +00:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk 2022-11-16 06:08:01 +00:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed 2022-11-15 15:30:00 +01:00
Vicent Llopis c200e1af32 refactor: optimizado select 2022-11-15 15:09:41 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min 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 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-15 13:20:52 +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 2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos 2022-11-15 11:41:57 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-15 09:39:03 +00:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit 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 72400ebf02 change folder db 2022-11-15 09:37:14 +01:00
Alexandre Riera 5acbaf036a refs #3557 back and test done 2022-11-15 09:30:36 +01:00
Pau 9d0cd36afe Merge branch 'dev' into 4457' 2022-11-15 08:49:21 +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
Pau 29b299f36a Merge branch 'dev' into 4507-greuge-add-userFk 2022-11-15 06:10:31 +00:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done 2022-11-14 14:30:35 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance 2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e 2022-11-11 15:58:11 +01:00
Pau 58c90b3bbc refs #288 2022-11-11 13:41:22 +01:00
Vicent Llopis 7e50f23563 refacor code 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 163f7fd284 Added version 10503 2022-11-11 08:31:45 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
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 2022-11-11 07:47:29 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e 2022-11-10 15:54:00 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-10 14:41:12 +01:00
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-10 14:40:55 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test 2022-11-10 14:38:37 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes 2022-11-10 14:19:20 +01:00
Pau 56201f4c1a Start implementing method refs #3681 @3h 2022-11-10 13:37:16 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-10 13:34:43 +01:00
Alex Moreno 517422be8c refactor: not use axios 2022-11-10 13:32:07 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h 2022-11-10 08:18:05 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer 2022-11-09 16:55:29 +01:00
Vicent Llopis 79e9edcee9 delete: old code 2022-11-09 09:26:28 +01:00
Vicent Llopis 9bcfebcae6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-09 07:26:56 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures 2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label 2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL 2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m 2022-11-08 12:26:01 +01:00
Pau f21907855f Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-08 10:04:47 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h 2022-11-08 09:45:56 +01:00
Pau d1be14605b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk 2022-11-08 09:32:09 +01:00
Pau 78e6c8da15 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-08 09:08:06 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 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 2022-11-08 07:40:31 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones 2022-11-07 15:55:17 +01:00
Vicent Llopis ffa0ff650e feat: add time control 2022-11-07 12:21:14 +01:00
Joan Sanchez 92a2367db2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-11-07 10:52:53 +01:00
Joan be1fbc4d68 Added version 10502 2022-11-07 10:49:17 +01:00
Joan 17d6308126 Already on prod 2022-11-07 10:48:38 +01:00
Alex Moreno c3ee9da6c6 hotFix: force apply changes 2022-11-07 10:18:32 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly 2022-11-07 09:19:20 +01:00
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Joan Sanchez 1bcde47ab1 Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev
Reviewed-on: #1110
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-04 10:42:32 +00:00
Joan Sanchez 2afb47fe14 Added version 10501 - November 2022-11-04 10:01:23 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-04 09:12:16 +01:00
Vicent Llopis b6d3a08871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs 2022-11-03 10:17:46 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit 2022-11-03 08:39:10 +00:00
Alex Moreno 67697784cd Merge branch 'dev' into 4548-invoiceIn-pdf 2022-11-03 06:48:38 +00:00
Pau 30fb8b1bd2 Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js 2022-11-03 06:30:47 +00:00
Vicent Llopis 35c50cb314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs 2022-11-03 07:11:54 +01:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2 2022-11-02 14:13:41 +00:00
Vicent Llopis 8c4e70c11d Merge branch 'dev' into 3095-item.shelving 2022-11-02 14:06:06 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice 2022-11-02 13:55:07 +00:00
Alex Moreno 943103c254 Merge branch 'dev' into 4548-invoiceIn-pdf 2022-11-02 13:33:45 +00:00
Vicent Llopis 04f165d901 solved conflits 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 c1ed0f2226 Merge branch 'dev' into changesInCorrectFolder 2022-11-02 12:58:32 +00:00
Alex Moreno 2c3b735650 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-11-02 13:49:09 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-02 13:48:36 +01:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order 2022-11-02 12:01:11 +00:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice 2022-11-02 11:55:47 +00:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2 2022-11-02 11:53:47 +00:00
Joan Sanchez 2fba17ab15 Merge branch 'dev' into 4548-invoiceIn-pdf 2022-11-02 09:33:27 +00:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving 2022-11-02 06:43:43 +00:00
Joan Sanchez 33c92a0f24 Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:34:49 +00:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-11-02 07:33:07 +01:00
Alex Moreno a7b1ee85fe fix changes folder 2022-11-02 07:27:57 +01:00
Alex Moreno e7047e982f fix e2e 2022-10-31 15:07:22 +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 b37c257885 feat(canEdit): use checkAccess 2022-10-31 14:13:06 +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 2022-10-31 12:40:07 +01:00
Joan Sanchez d34936015b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2022-10-31 12:39:54 +01:00
Vicent Llopis 838402f05a add fixtures 2022-10-31 09:55:05 +01:00
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic 2022-10-31 07:57:50 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores 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 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 2022-10-28 08:26:45 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue 2022-10-28 05:33:45 +00:00
Alex Moreno 9225e8f176 fix tests 2022-10-27 15:11:57 +02:00
Pau 736de00e77 deleted the test as requested on #1885 2022-10-27 09:18:00 +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 3ffc098b56 feat(privileges): check if user has role from userToUpdate 2022-10-27 09:01:09 +02:00
Alex Moreno 99fca9834f Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-27 06:10:14 +00:00
Vicent Llopis 1d908002e2 feat: add backTest 2022-10-26 14:25:27 +02:00
Vicent Llopis fa89d1f944 fix: comentario corregido 2022-10-26 13:10:50 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone 2022-10-26 12:40:13 +02:00
Vicent Llopis 350c516bb1 feat: cancelar petición cuando esta calculando el packaging 2022-10-26 10:36:41 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Alex Moreno f65d06fc7d fixes #4073 2022-10-26 08:27:28 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2 2022-10-26 06:25:18 +00:00
Vicent Llopis 07a18dc736 delete sql 2022-10-26 08:05:11 +02:00
Alex Moreno f07f0679d8 fix fixture 2022-10-25 15:03:20 +02:00
Alex Moreno 342832c475 try 2022-10-25 15:02:22 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files 2022-10-25 14:09:21 +02:00
Pau e72d57150a Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-25 10:40:57 +00:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 10:39:50 +00:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier 2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-10-25 11:58:47 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing 2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier 2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes 2022-10-25 10:42:16 +02:00
Pau 23598c993b Change ACL from employee to hr 2022-10-25 09:25:15 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-25 07:25:07 +00:00
Vicent Llopis 7f1dd801a5 refactor: change ACLs 2022-10-25 07:56:17 +02:00
Alex Moreno 7cb8175b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-25 07:36:21 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version 2022-10-24 18:37:38 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email 2022-10-24 15:15:23 +02:00
Vicent Llopis c77999871e refs #3951 2022-10-24 14:34:17 +02:00
Alex Moreno a66c5e6798 acl 2022-10-24 11:30:17 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-21 11:41:53 +02:00
Vicent Llopis 18c119c62a change acl 2022-10-21 09:20:27 +02:00
Vicent Llopis 6f31bea21f feat: update testBack 2022-10-21 08:00:48 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code 2022-10-20 15:05:46 +02:00
Vicent Llopis 39f4445172 refator: endpoint name 2022-10-20 07:23:57 +02:00
Alex Moreno 4b12405586 feat: report invoiceInPdf 2022-10-19 15:15:54 +02:00
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote' 2022-10-19 10:35:41 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk 2022-10-18 11:56:56 +00:00
Pau 470b4485d5 Fixed test and DB structure 2022-10-18 12:58:44 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing 2022-10-18 12:29:04 +02:00
Alex Moreno a5ceee07e9 use loopback 2022-10-18 11:50:16 +02:00
Pau 81088bc495 Fixed ACL 2022-10-18 10:46:14 +02:00
Pau f481cc3c97 Capitalizar 2022-10-18 10:38:40 +02:00
Pau c9e9e3545d Added ACL 2022-10-18 10:33:48 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-10-17 14:06:31 +02:00
Pau 9290cd6fb6 Finished back tests 2022-10-17 14:02:18 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments 2022-10-17 12:07:34 +02:00
Alex Moreno 991893837c correct fixutures from dev 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 2022-10-17 07:32:32 +02:00
Pau dc6c8f924d feat: Create new Supplier 2022-10-17 07:25:25 +02:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test 2022-10-14 13:22:53 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets 2022-10-13 09:30:31 +02:00
Alex Moreno 24cb8e00bb creates notification sql in changes 2022-10-11 13:20:25 +02:00
Alex Moreno c78e222ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-11 10:09:57 +02:00
Vicent Llopis 9c52508a88 feat: add total labels 2022-10-11 08:40:22 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving 2022-10-11 07:09:20 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e 2022-10-10 13:06:49 +02:00
Vicent Llopis 8130cf9e6a feat: separate globalInvoicing in 2 parts 2022-10-10 12:40:10 +02:00
Pau 51d3063849 Drop expedition itemFk 2022-10-10 10:53:15 +02:00
Vicent Llopis 2e91698c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 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 2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl 2022-10-06 15:04:27 +02:00
Joan Sanchez 4fadc7e2a4 Added subversion 2022-10-06 13:56:10 +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
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Pau dde5eed9e2 DB fixtures 2022-10-06 13:34:06 +02:00
Javi Gallego d73dab3454 Merge branch 'dev' into 4090-global_invoincing 2022-10-06 13:01:56 +02:00
Vicent Llopis ddbe1057ad feat: add new section 2022-10-06 09:47:53 +02:00
Joan Sanchez 1bf090b6ee Pass network name 2022-10-06 09:09:49 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl 2022-10-05 15:13:36 +02:00
Joan Sanchez 3d36c0339a Merge branch 'dev' into 4592-jenkins_tests 2022-10-05 12:05:10 +00:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-05 13:47:25 +02:00
Joan Sanchez 8468eda05a run with network 2022-10-05 12:47:37 +02:00
Joan Sanchez 627f0d762e attach to network 2022-10-05 12:33:06 +02:00
Joan Sanchez 1cafbdab6e Connect to docker network 2022-10-05 12:26:42 +02:00
Joan Sanchez e6512d00a1 Use port 3306 2022-10-05 12:16:59 +02:00
Joan Sanchez 0502f9ebf0 Log port 2022-10-05 11:19:07 +02:00
Joan Sanchez 0ad583f22f Log host & port 2022-10-05 11:14:49 +02:00
Joan Sanchez 0fccae0113 Network ip address 2022-10-05 11:06:23 +02:00
Joan Sanchez 239c324eff Log network settings 2022-10-05 11:03:48 +02:00
Joan Sanchez ee0938d7d6 Test 2022-10-05 10:36:05 +02:00
Joan Sanchez 80d0b415ec Host log 2022-10-05 10:28:07 +02:00
Joan Sanchez b0dac6c12d Use jenkins network 2022-10-05 10:23:24 +02:00
Joan Sanchez 1534bdd188 Syntax error 2022-10-05 10:16:17 +02:00
Joan Sanchez 13bfed6955 use jenkins network 2022-10-05 10:06:11 +02:00
Joan Sanchez 98a2f79691 Run container on jenkins network 2022-10-05 10:05:01 +02:00
Joan Sanchez 377a0f7228 Attachments refactor 2022-10-04 13:41:37 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit 2022-10-04 13:22:11 +02:00
Pau 9b202b7a84 refactor: isBox to freightItemFk 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
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez c177c0366d Item PDF 2022-10-03 13:35:49 +02:00
Joan Sanchez 3b0f1efbf4 ACL's 2022-09-30 13:54:20 +02:00
Alex Moreno f81b2775a0 add fixture 2022-09-30 09:36:51 +02:00
Alex Moreno e931414bb7 unnecessary code 2022-09-30 08:59:49 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2 2022-09-29 14:52:31 +02:00
Joan Sanchez 3601881026 Client consumption queue 2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued 2022-09-29 13:09:44 +02:00
Joan Sanchez 5aec280adb Closure migration 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 2022-09-28 12:24:40 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor 2022-09-27 14:20:57 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model 2022-09-27 13:46:23 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList 2022-09-26 14:49:11 +02:00
Joan Sanchez 7f78286d6b Reports refactor 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 2022-09-26 09:25:43 +02:00
Joan Sanchez 85698410db Templates refactor 2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config 2022-09-23 13:53:33 +02:00
Joan Sanchez 664fd444cc Sample refactor 2022-09-22 15:44:35 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Joan Sanchez 71f8e73e55 Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev
Reviewed-on: #1056
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:46:24 +00:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-09-21 08:37:20 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure 2022-09-19 09:45:28 +02:00
Vicent Llopis a330e9d64a refactor: change acl 2022-09-16 12:02:04 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info 2022-09-16 11:46:55 +02:00
Vicent Llopis afeed9757c refactor: change acl 2022-09-16 10:39:59 +02:00
Vicent Llopis a695468bb7 refator: deleted sensitive information 2022-09-16 10:32:37 +02:00
Vicent Llopis cfe5c66fe4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets 2022-09-16 09:23:56 +02:00
Vicent Llopis 503e78d4f0 fix: rollback mariadb version 2022-09-16 09:07:43 +02:00
Joan Sanchez 793705413e #452 - Dumped db 2022-09-16 07:05:27 +00:00
Joan Sanchez 9d5351c84c Updated db image 2022-09-15 07:31:49 +00:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket 2022-09-15 08:34:42 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk 2022-09-13 11:35:15 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo 2022-09-05 12:06:14 +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
Javi Gallego 9fe32788fc regularizado 2022-08-24 14:38:05 +02:00
Joan Sanchez 6b6d00cf95 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-08-10 12:23:28 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis 31aafc0719 feat: add inserts in printQueue 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 2022-08-05 13:19:43 +02:00
Joan Sanchez 69ca28ae14 Added SQL version 2022-08-05 11:42:36 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
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
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-08-04 12:51:41 +00:00
Vicent Llopis a82bc7a8e8 delete: old versions of db changes 2022-08-04 13:55:30 +02:00
Vicent Llopis c3d396b042 fix: test e2e 2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest 2022-08-04 09:53:22 +02:00
Vicent Llopis 998176f03c fix: fixtures 2022-08-04 08:23:39 +02:00
Vicent Llopis 82f2ef768f fix: fixtures 2022-08-04 08:15:20 +02:00
Vicent Llopis ede6da1a15 fix: db fixtures 2022-08-03 15:14:02 +02:00
Juan Ferrer 539d9617e6 export 2022-08-03 09:40:48 +02:00
Joan Sanchez eed0ac66c6 Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
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
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 2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
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 2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video 2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi 2022-08-01 07:59:04 +02:00
Carlos Andrés 6f825ee3bc #3530 Eliminar uso de person 2022-07-29 17:03:31 +02:00
Carlos Andrés 67feac7c6c #3530 Eliminar uso tabla person 2022-07-29 16:04:18 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person 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 2022-07-29 13:38:23 +02:00
Vicent Llopis cd78afb539 fix: db changes 2022-07-29 12:03:59 +02:00
Vicent Llopis 538c04e8c5 feat: db connection and query 2022-07-29 11:59:03 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone 2022-07-27 12:16:41 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-07-27 08:12:06 +02:00
Joan Sanchez 882c4cc3d7 fix(insurance): force script execution 2022-07-26 13:19:57 +02:00
Vicent Llopis 3fd289ff51 update chat 2022-07-26 13:03:03 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email 2022-07-25 14:49:39 +02:00
Alex Moreno 8048d4ce90 feat(notification): basic functionality and test 2022-07-25 08:25:10 +02:00
Alex Moreno f432d64f56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-07-25 07:45:26 +02:00
Carlos Jimenez Ruiz b8183748ce Merge branch 'dev' into 1781-zoneHoliday 2022-07-22 13:58:52 +00:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday 2022-07-22 13:56:19 +00:00
Vicent Llopis 7ad555c73f restart backTest Jenkins 2022-07-22 13:59:36 +02:00
Vicent Llopis 7809d9dd7e fix: typo 2022-07-22 13:41:18 +02:00
Vicent Llopis fc6e51e91f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4091-dms_clean 2022-07-22 13:41:02 +02:00
Vicent Llopis 465a5e4d73 refactor: mo ve folder of sql chagues 2022-07-22 13:12:54 +02:00
Carlos Jimenez Ruiz 7d7365c4f3 Merge branch 'dev' into 4270-route.create 2022-07-22 11:07:08 +00:00
Vicent Llopis 8ea09a0449 jenkins testBack 2022-07-21 14:08:18 +02:00
Vicent Llopis eccbd942f7 feat: can close a ticket 2022-07-21 13:11:24 +02:00
Vicent Llopis 9035123c53 feat: update structure 2022-07-21 10:36:21 +02:00
Alex Moreno 9b48cbb078 feat(notification): send 2022-07-20 14:54:50 +02:00
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder 2022-07-20 14:02:15 +02:00
Vicent Llopis 771c86ba4b fix: shelving log 2022-07-20 12:40:30 +02:00
Alex Moreno 7895decf4e feat(notification): create models 2022-07-19 15:17:22 +02:00
Vicent Llopis a0ea3b4c03 delete unnecessary sql 2022-07-19 14:47:05 +02:00
Vicent Llopis b4408dc080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create 2022-07-19 14:42:43 +02:00
Vicent Llopis c56ac1c192 feat: add log 2022-07-19 13:35:17 +02:00
Vicent Llopis 2a41c1bb93 update foreign key 2022-07-19 12:44:55 +02:00
Carlos Jimenez Ruiz 7437da92a5 Merge branch 'dev' into 4294-zone_getEventsFiltered 2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz bbfab8d0bd Merge branch 'dev' into 4270-route.create 2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests 2022-07-14 13:40:50 +02:00
Vicent Llopis ac344d6edd refactor: add column id PK and updated column code UQ 2022-07-14 09:54:28 +02:00
Vicent Llopis 762ec3045f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving 2022-07-14 09:11:43 +02:00
Vicent Llopis fdf6e04233 change travel.agencyFk by agencyModeFk 2022-07-13 14:36:03 +02:00
Vicent Llopis 48d4d4e964 try jenkins backTest 2022-07-12 14:26:28 +02:00
Vicent Llopis f73012486c try jenckins backTest 2022-07-12 13:43:13 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk 2022-07-12 11:52:47 +02:00
Alex Moreno 051a849a21 fix(zone): fix getEventsFiltered 2022-07-12 08:10:29 +02:00
Vicent Llopis 1eb6ee69cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday 2022-07-12 08:09:02 +02:00
Vicent Llopis d9a12fd203 feat: update commissionWorkCenterFk where is not calculated 2022-07-07 07:39:46 +02:00
Vicent Llopis 189d0a27bc refactor: delete unnecessary sql 2022-07-05 11:44:03 +02:00
Vicent Llopis 5f2f5b9b25 feat: add sql changes 2022-07-05 10:18:26 +02:00
Vicent Llopis e441c658fd feat: set daysInFuture value 2022-07-04 08:31:53 +02:00
Joan Sanchez fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
Reviewed-on: #1011
2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages 2022-07-01 09:15:07 +02:00
Alex Moreno c02433faab typo 2022-06-30 13:24:26 +02:00
Alex Moreno c88df46b4f typo 2022-06-30 13:23:57 +02:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable 2022-06-30 13:21:07 +02:00
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary 2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty 2022-06-29 14:28:23 +02:00
Alex Moreno f6b9327fb5 try 2022-06-29 08:43:43 +02:00
Carlos Jimenez Ruiz 1981232df4 Merge branch 'dev' into 4217-worker_time-control_tests 2022-06-28 10:45:16 +00:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test 2022-06-28 12:10:37 +02:00
Alex Moreno a3f1c36226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz a52748348b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4098-rename_procedures 2022-06-28 11:09:24 +02:00
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations 2022-06-28 07:03:44 +00:00
Alex Moreno 8e2ed4e182 fix(worker_getWorkedHours): fix fixtures and test 2022-06-27 15:09:43 +02:00
Alex Moreno 0197f08c48 typo 2022-06-27 14:13:50 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-27 14:03:24 +02:00
Alex Moreno 212c351064 fix(item_create): fixtures and test 2022-06-27 13:17:22 +02:00
Carlos Jimenez Ruiz 57fd528e9b removed fixtures from deprecated column 2022-06-27 12:20:17 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail 2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz 6370471bd5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations 2022-06-27 11:01:42 +02:00
Carlos Jimenez Ruiz f1cb5a958c data migration from claim.observation to claimObservations 2022-06-27 11:01:29 +02:00
Vicent Llopis fcf79a507c Merge branch 'dev' into 4213-item.summary 2022-06-27 05:32:21 +00:00
Alex Moreno 4155b45785 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-27 07:22:43 +02:00
Alex Moreno 9acd98e7b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4233-export-database 2022-06-27 07:15:43 +02:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors 2022-06-25 15:22:47 +02:00
Joan Sanchez e3cb89b0a6 Moved SQL files from version 2022-06-23 15:19:02 +02:00
Alex Moreno 86eb31ce65 fix(db_structure): change vn.VN_ to util.VN_ 2022-06-23 14:22:28 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn 2022-06-23 14:07:53 +02:00
Juan Ferrer 7d67ca0e89 DB structure & data export, DB Dockerfile version changed to 10.7.3 2022-06-23 12:14:16 +02:00
Vicent Llopis 2c721867fc feat(item.summary): add description 2022-06-22 14:30:25 +02:00
Joan Sanchez 2a758fd12a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization 2022-06-22 11:38:01 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-06-22 08:59:06 +02:00
Joan Sanchez e5b1bfeec2 Merge branch 'dev' into 4231-worker.calendar_payedHolidays 2022-06-21 10:59:46 +00:00
Carlos Jimenez Ruiz e4883afc7c removed deprecated procedures and functions from Account 2022-06-20 13:28:49 +02:00
Carlos Jimenez Ruiz a5f53364c3 Merge branch 'dev' into renameDbChangesFolder 2022-06-17 11:30:33 +00:00
Carlos Jimenez Ruiz c22e36ff1e Merge branch 'dev' into 4081-ticket.setDeleted 2022-06-17 10:45:13 +00:00
Vicent Llopis 6611fcb40e fix: show correct payedHolidays 2022-06-17 12:34:33 +02:00
Alex Moreno e775c67b1b rename 2022-06-17 09:44:59 +02:00
Alex Moreno fd6b688382 fix(changes): prevent sql errors when test to master 2022-06-17 09:40:33 +02:00
Carlos Jimenez Ruiz aa6ec3f770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes 2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz 0f44f072ee refactor(client): added updateUser and setPassword methods to client module 2022-06-16 11:32:42 +02:00
Vicent Llopis c49f563299 feat: add fixtures 2022-06-16 10:59:17 +02:00
Alex Moreno 8474fb5692 Merge branch 'dev' into 3498-staticDate 2022-06-15 07:15:34 +00:00
Joan Sanchez 0e89616089 incoterms report refactor 2022-06-13 11:03:11 +02:00
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization 2022-06-10 13:16:27 +02:00
Joan Sanchez 2f082ece34 Added SQL version 2022-06-10 10:18:56 +02:00
Alex Moreno 7dffe4edcb quit vn_curdate of sql in print 2022-06-10 07:58:56 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance 2022-06-10 05:32:58 +00:00
Vicent Llopis a9badfc1ba feat: add backTest 2022-06-09 14:59:17 +02:00
Alex Moreno 417c798afd add schema 2022-06-09 14:52:01 +02:00
Alex Moreno f786cdd33d fix pass dates 2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates 2022-06-09 13:33:01 +02:00
Juan Ferrer 86605c3d67 Merge branch 'dev' into 4164-edi_updateData 2022-06-09 10:18:03 +00:00
Carlos Jimenez Ruiz cd5dba6fcb Merge branch 'dev' into 4040-chat_sendQueued 2022-06-09 08:44:22 +00:00
Joan Sanchez 7fe7fb2e8f Replaced fs sync functions 2022-06-09 10:13:45 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-06-09 07:47:03 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk 2022-06-09 07:13:54 +02:00
Carlos Jimenez Ruiz a824da3908 Merge branch 'dev' into 4164-edi_updateData 2022-06-08 09:17:24 +00:00
Alex Moreno 81f42985e4 sql 2022-06-07 15:15:25 +02:00
Joan Sanchez c92f444776 Ammends 2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 27e8c99604 Merge branch 'dev' into 4067-client_detail 2022-06-07 12:50:37 +00:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary 2022-06-07 12:27:12 +00:00
Joan Sanchez 33e9dacf60 Merge branch 'dev' into 4164-edi_updateData 2022-06-07 11:07:19 +00:00
Joan Sanchez f77f5cee58 4164 - Endpoint refactor 2022-06-07 13:06:42 +02:00
Vicent Llopis aab484ad41 refactor code 2022-06-07 10:28:39 +02:00
Vicent Llopis 3eac002fb4 feat: add queue to send rocket messages 2022-06-03 12:22:07 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded 2022-06-02 14:55:39 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday 2022-06-02 13:38:27 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures 2022-06-02 11:52:53 +02:00
Vicent Llopis 7de0fd6634 feat: create table chat 2022-06-01 13:49:45 +02:00
Alex Moreno 8340041b33 throw userError and maxFileSize 2022-06-01 07:57:32 +02:00
Joan Sanchez c369453bfc Added model fields 2022-05-31 13:36:27 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table 2022-05-31 07:56:17 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +02:00
Alex Moreno aa7074f303 test(mdb): back test 2022-05-27 08:23:52 +02:00
Joan Sanchez a5f3580b17 derp 2022-05-26 16:14:10 +02:00
Vicent Llopis 6359c9e5bf feat: add fixtures 2022-05-26 15:08:23 +02:00
Vicent Llopis 456f167513 feat: fix editExclusion mode 2022-05-26 11:09:03 +02:00
Vicent Llopis 47ef3d0b46 Merge branch '1781-zoneHoliday' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday 2022-05-26 08:33:47 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Vicent Llopis dbb44e228d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday 2022-05-26 07:47:49 +02:00
Vicent Llopis b5db025106 refactor: move sql to new folder 2022-05-26 07:41:00 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section 2022-05-25 14:59:28 +02:00
Carlos Jimenez Ruiz 402aa567dd Merge branch 'dev' into 4109-duplicated_folder 2022-05-25 07:39:42 +00:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday 2022-05-25 09:03:52 +02:00
Joan Sanchez 0cf8ee3edf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-05-24 15:06:32 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-05-24 14:54:06 +02:00
Alex Moreno 47ab4fc2c1 intro 2022-05-24 14:52:26 +02:00
Alex Moreno 7a69d53642 fix(changes): add reference table 2022-05-24 14:50:33 +02:00
Vicent Llopis 880f3ce647 refactor: move acl to new folder 2022-05-24 14:44:18 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create 2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models 2022-05-23 12:33:08 +00:00
Vicent Llopis ab6a0425f5 refactor: translate fixtures 2022-05-23 12:47:43 +02:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-23 12:41:01 +02:00
Vicent Llopis 875e9503c3 refactor: request changes 2022-05-20 13:16:47 +02:00
Vicent Llopis c9bfbe990a refactor: request changues 2022-05-20 12:53:10 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes 2022-05-20 12:33:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving 2022-05-20 09:17:18 +02:00
Joan Sanchez 6586595976 feat(closure): send incoterms authorization 2022-05-19 07:31:00 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType 2022-05-17 12:24:35 +02:00
Vicent Llopis 9eae1f479c add table vn.printer 2022-05-17 10:39:46 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models 2022-05-17 10:13:05 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields 2022-05-17 08:32:45 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Joan Sanchez bf8e7eed57 Added SQL version 10470 2022-05-16 11:37:43 +02:00
Joan Sanchez 576cad16ad SQL fixes 2022-05-16 11:34:29 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows 2022-05-16 07:23:08 +00:00
Joan Sanchez c88fe629cd Removed duplicated version 2022-05-16 08:21:12 +02:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data 2022-05-16 07:22:16 +02:00
Vicent Llopis 40bcc56758 refactor: change acl 2022-05-16 07:22:01 +02:00
Vicent Llopis ab13c16948 feat: add dialog 2022-05-16 07:17:29 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Joan Sanchez 9cbee7a38a Merge branch 'dev' into 3771-ticket.expedition 2022-05-13 13:05:08 +00:00
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax 2022-05-13 12:59:30 +00:00
Joan Sanchez f7077aaa3f Show build status 2022-05-12 15:56:34 +02:00
Joan Sanchez ad4bee7a16 Show build status 2022-05-12 15:44:11 +02:00
Carlos Jimenez Ruiz 9778783dfa removed unused console logs 2022-05-12 14:02:50 +02:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog 2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz 9a47bdafbe debuging conection errors on CI db 2022-05-12 13:24:19 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete 2022-05-12 11:13:34 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows 2022-05-12 08:06:39 +02:00
Carlos Jimenez Ruiz c749438f32 Merge branch 'dev' into 3977-invoiceIn.tax 2022-05-11 13:37:29 +00:00
Carlos Jimenez Ruiz 442644d3f1 Merge branch 'dev' into 3940-export_database 2022-05-11 12:57:29 +00:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType 2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition 2022-05-11 12:47:33 +00:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax 2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz 86ee110b78 Merge branch 'dev' into 3327-global_invoicing 2022-05-10 12:55:00 +00:00
Joan Sanchez e0c0663e41 Renamed folder 2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing 2022-05-10 12:19:31 +00:00
Joan Sanchez d9c8ed96e4 Added SQL version 2022-05-10 09:46:56 +02:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence 2022-05-09 14:34:20 +02:00
Alex Moreno 55574919d2 rename 2022-05-09 13:19:34 +02:00
Vicent Llopis a0af774837 fix: test 2022-05-06 09:02:52 +02:00
Juan Ferrer bfd8c8d47a DB export 2022-05-04 15:58:36 +02:00
Alex Moreno ac4d4e6db1 test and fixtures 2022-05-04 10:59:37 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover 2022-05-04 10:35:31 +02:00
Juan Ferrer 6d5d9ca0e4 DB export 2022-05-04 07:54:45 +02:00
Vicent Llopis d0f9613b4e delete hedera fixtures 2022-05-04 07:19:45 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles 2022-05-03 11:16:56 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows 2022-05-02 11:18:39 +02:00
Juan Ferrer 6bdcdbb13c DB structure & data export
Hedera tables added to data export
2022-05-02 10:57:13 +02:00
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Joan Sanchez fea7df269c Added invoice schedule method 2022-04-28 14:59:29 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue 2022-04-28 08:14:33 +02:00
Vicent Llopis ad80d0501c add fixtures 2022-04-28 07:48:09 +02:00
Vicent Llopis 39f4c4a6e8 feat: updated backTest 2022-04-25 12:36:05 +02:00
Vicent Llopis 76ff6330f9 feat(supllier.summary): add two fields 2022-04-25 12:23:03 +02:00
Vicent Llopis 5211a0d9d7 feat(supplier.fiscal-data): add two fields 2022-04-25 11:51:34 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund 2022-04-21 14:59:41 +02:00
Vicent Llopis 579ff3aa4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo 2022-04-21 07:13:34 +02:00
Alex Moreno 8b68fcf088 change new code 2022-04-20 14:40:29 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz 8efcb6233f feat(user): added userConfig.darkMode relation towards account.user 2022-04-20 10:25:01 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale 2022-04-13 09:19:50 +00:00
Vicent Llopis a47349646f change versions db 2022-04-13 09:50:29 +02:00
Alex Moreno 88d91d8b47 change db changes folder 2022-04-13 08:19:33 +02:00
Alex Moreno 14933d13cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid 2022-04-13 08:17:44 +02:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale 2022-04-12 12:49:34 +02:00
Joan Sanchez 3d8f851de8 Added version 2022-04-12 11:46:14 +02:00
Joan Sanchez 2bc7b2db0c Removed keep file 2022-04-12 10:15:30 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid 2022-04-12 07:08:55 +02:00
Joan Sanchez 7228394393 Merge branch 'dev' into 3837-edi_import 2022-04-11 12:43:52 +00:00
Carlos Jimenez Ruiz 018047b6be Merge branch 'dev' into 3347-worker_basic-data 2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana 2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz b087d275dc Merge branch 'dev' into 3605-invoiceIn_intrastat3 2022-04-11 10:29:01 +00:00
Joan Sanchez 39d18093eb Updated SQL files 2022-04-11 12:04:34 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service 2022-04-11 11:58:40 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes 2022-04-11 09:04:05 +02:00
Vicent Llopis d8a1bd1b1c fix: pull request changes 2022-04-11 08:23:54 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Joan Sanchez 8414f94cf6 Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev
Reviewed-on: #926
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:49:39 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel 2022-04-08 06:31:16 +00:00
Alex Moreno b8a954caec feat(client): section unpaid 2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz a72b1cd591 Merge branch 'dev' into 3467-travelThermograph 2022-04-07 08:36:39 +00:00
Joan Sanchez 0a4b7bd000 Added new version folder 2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz 6216d6fa9b Merge branch 'dev' into 3467-travelThermograph 2022-04-07 08:29:26 +00:00
Joan Sanchez f5a6521f20 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-04-06 14:34:23 +02:00
Alex Moreno 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-04-06 12:43:12 +02:00
Alex Moreno dd9a38d1bf feat(client_search-panel): filter by province 2022-04-06 12:29:00 +02:00
Joan Sanchez 7a8dbdfb16 Updated SQL files 2022-04-05 09:56:39 +02:00
Alex Moreno d616367714 fix(test): use static dates 2022-04-05 07:46:49 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu 2022-04-04 13:26:53 +02:00
Vicent Llopis fdf285dd5f fix(worker_timeControl): corrected db procedure 2022-04-04 10:31:28 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time 2022-04-01 13:55:45 +02:00
Alex Moreno d86f4da425 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-01 07:37:29 +02:00
Vicent Llopis 5f29b272e1 feat: add fixtures 2022-03-31 11:38:08 +02:00
Vicent Llopis fe32b81d9e sql update 2022-03-31 10:50:05 +02:00
Vicent Llopis bb267dad16 feat: add fixtures 2022-03-31 09:17:27 +02:00
Vicent Llopis 1f826e1214 sql code for production 2022-03-31 09:16:55 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates 2022-03-30 12:45:01 +02:00
Vicent Llopis 3bf2b46689 feat(ticket_line): update workerMana if check claimMana option 2022-03-30 10:09:01 +02:00
Vicent Llopis e29f820e60 feat(ticket_line): new table ticketRefund and update proc ticket_doRefund 2022-03-30 08:56:35 +02:00
Vicent Llopis e0244f388c refator: single quotes in sql files 2022-03-30 07:39:42 +02:00
Vicent Llopis d06b2e8bb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3 2022-03-30 07:30:39 +02:00
Vicent Llopis 8e27ab612d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana 2022-03-29 15:08:48 +02:00
Vicent Llopis a5ca116571 feat(ticket_sale): add mana options 2022-03-29 13:42:37 +02:00
Joan Sanchez bbbb0df1cd Merge branch 'dev' into 3781-export_database 2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar 2022-03-29 08:18:13 +00:00
Alex Moreno fd02038c8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar 2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz 407fe2850b Merge branch 'dev' into 3408-worker_calendar 2022-03-29 08:06:25 +00:00
Vicent Llopis 889dcf8763 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database 2022-03-29 08:56:59 +02:00
Vicent Llopis 2ab45fe2eb delete jenkins changes 2022-03-29 07:34:35 +02:00
Vicent Llopis 9faf9d8688 test Jenkins NOT PUSH 2022-03-28 15:01:58 +02:00
Alex Moreno f853696d03 change fixture name 2022-03-28 13:59:39 +02:00
Vicent Llopis f4d53c4040 pull request changes required 2022-03-28 13:35:36 +02:00
Carlos Jimenez Ruiz 23c473de89 Merge branch 'dev' into 3408-worker_calendar 2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz 8d70bac5c6 Merge branch 'dev' into 3621-worker_calendar 2022-03-28 10:13:21 +00:00
Alex Moreno 7cd33619e3 change db version 2022-03-28 11:47:20 +02:00
Alex Moreno 89d7d27061 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-03-28 11:47:09 +02:00
Carlos Jimenez Ruiz 39694b31b8 Merge branch 'dev' into 3607-supplier_agencyTerm 2022-03-28 08:40:32 +00:00
Juan Ferrer 85de742630 Export data & structure 2022-03-28 09:44:29 +02:00
Alex Moreno 79c74d92b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-03-25 13:22:04 +01:00
Vicent Llopis e02ab9dd2d feat: add fixtures 2022-03-24 11:39:19 +01:00
Vicent Llopis 67a90c356f updated FK for production db 2022-03-24 10:58:04 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures 2022-03-23 14:02:48 +01:00
Vicent Llopis fd7afc962f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm 2022-03-23 12:53:33 +01:00
Vicent Llopis 1056060957 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data 2022-03-23 12:37:34 +01:00
Alex Moreno f6ff8ea081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-23 12:17:14 +01:00
Joan Sanchez 0099b48865 Merge pull request '3704-feat(print_claim-pickup-order): add claimConfig' (#902) from 3704-print_claim-pickup-order into dev
Reviewed-on: #902
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 11:09:18 +00:00
Alex Moreno dc03a66c6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-23 12:01:50 +01:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Alex Moreno 9a1c0a07fd Merge branch 'dev' into 3680-claim_basic-data_packages 2022-03-23 08:42:52 +00:00
Vicent Llopis 31a5e19151 move db changes to correct folder 2022-03-21 13:19:19 +01:00
Vicent Llopis 35312911b0 move db changes to correct folder 2022-03-21 13:16:42 +01:00
Vicent Llopis 84ebeed8ef add fixtures 2022-03-21 13:04:25 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled 2022-03-21 10:02:56 +01:00
Alex Moreno a2b06e7248 feat(print_claim-pickup-order): add claimConfig 2022-03-18 13:22:39 +01:00
Vicent Llopis f501d20c65 update sql 2022-03-18 12:41:15 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e 2022-03-18 10:30:30 +01:00
Vicent Llopis c660786e45 refactor chaneg name 2022-03-17 14:52:06 +01:00
Vicent Llopis a32f7b5ef1 add new row 2022-03-17 14:27:55 +01:00
Vicent Llopis 644c24fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm 2022-03-17 11:55:07 +01:00
Vicent Llopis afa7345d22 delete old db changes 2022-03-17 09:00:13 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Carlos Jimenez Ruiz 3098fc36fb Merge branch 'dev' into 3604-route_agencyTerm 2022-03-15 14:14:16 +00:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button 2022-03-15 12:51:33 +01:00
Vicent Llopis 6742d7aa43 upload db changes 2022-03-15 07:22:15 +01:00
Alex Moreno 31eb22c1b4 feat(db): update users to role deliveryBoss 2022-03-14 11:34:09 +01:00
Vicent Llopis 189fe2ed41 update acl 2022-03-10 08:14:50 +01:00
Vicent Llopis a32ebc37da add supplier autonomous 2022-03-09 23:54:23 +01:00
Juan Ferrer d49d1b437c User.login() error fixed 2022-03-09 15:34:26 +01:00
Vicent Llopis 91a23088c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm 2022-03-09 08:40:55 +01:00
Vicent Llopis 97f2341ae0 pull request changes 2022-03-08 13:42:44 +01:00
Vicent Llopis 527387aad5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data 2022-03-08 08:45:40 +01:00
Alex Moreno efa32a3dc7 export structure 2022-03-04 13:04:28 +01:00
Alex Moreno 138e2ee9b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 12:25:05 +01:00
Vicent Llopis f972afb13e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm 2022-03-04 09:38:33 +01:00
Carlos Jimenez Ruiz 63fc58b6ba Merge branch 'dev' into 3649-claim_log 2022-03-03 12:00:02 +00:00
Vicent Llopis 5ea8c5b06c delete vendedores_updatePortfolio.sql 2022-03-03 11:38:32 +01:00
Vicent Llopis 4811254ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm 2022-03-02 15:07:38 +01:00
Vicent Llopis ade34c1e0a add section Autonomous 2022-03-02 14:59:30 +01:00
Alex Moreno 5efb678a53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:32:18 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary 2022-03-02 09:17:19 +00:00
Alex Moreno 44318903e7 feat(claim): add log section 2022-03-01 15:15:58 +01:00
Joan Sanchez cb21a51065 Added SQL version 10430-ash 2022-03-01 12:12:40 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware 2022-02-28 13:14:34 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 72bfc1ef6e export db 2022-02-25 08:21:53 +01:00
Vicent Llopis 19887bdd16 feat: add section autonomous 2022-02-24 14:52:32 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests 2022-02-24 13:52:26 +01:00
Vicent Llopis b3263fb97e add fixtures 2022-02-23 12:58:09 +01:00
Vicent Llopis dedecb492e sql modify 2022-02-23 12:58:01 +01:00
Alex Moreno 52cf79516a refactor(claim_summary): move responsability and improve fixtures 2022-02-23 12:23:47 +01:00
Vicent Llopis 591194d710 export db 2022-02-23 09:05:31 +01:00
Alex Moreno f3ff64c44d refactor(docuware): name for code 2022-02-23 08:11:54 +01:00
Alex Moreno 4606b0d7ea change name for code 2022-02-22 15:23:23 +01:00
Alex Moreno 8bbb5d5c27 variable name 2022-02-21 11:28:00 +01:00
Alex Moreno 0f4649c50f feat(ticket_descriptor-menu): docuware implemented 2022-02-21 08:48:53 +01:00
Vicent Llopis a152e22f6e update sql changes 2022-02-18 12:26:16 +01:00
Alex Moreno 89eee042b5 refactor(ticket_basic-data): zeroFill and move getMovable 2022-02-17 08:02:02 +01:00
Alex Moreno 3aeb2adb56 feat(ticket): docuware pdf 2022-02-16 14:57:47 +01:00
Vicent Llopis d7f252a57d feat(invoiceIn): add section intrastat 2022-02-16 10:30:56 +01:00
Alex Moreno 651c92698f feat(docuware): start download docuware 2022-02-15 16:48:37 +01:00
Alex Moreno 135aff27a4 fix(getMovable): show correct movable 2022-02-10 09:13:48 +01:00
Alex Moreno b4bed608ab refactor(ticket): getMovable 2022-02-09 15:01:02 +01:00
Alex Moreno e09e84c36b refactor(setSaleQuantity): rename, remove transaction 2022-02-08 12:41:55 +01:00
Alex Moreno dc78cd2dc5 feat(collection): setQuantitySale 2022-02-07 08:05:05 +01:00
Carlos Jimenez Ruiz e9189509c2 Merge branch 'dev' into 3552-monitor_ticket_state 2022-02-03 09:50:01 +00:00
Alex Moreno c004ee638c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer 2022-02-03 10:34:48 +01:00
Alex Moreno e5548fe2a0 remove delete.keep 2022-02-02 07:24:15 +01:00
Alex Moreno cb5c4146cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state 2022-02-02 07:23:17 +01:00
Joan Sanchez d6ba1247d4 Added version 10420-valentines 2022-02-01 14:37:34 +01:00
Alex Moreno 13230a2fe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer 2022-02-01 12:40:04 +01:00
Alex Moreno f90607c8c7 change changes folder name 2022-02-01 12:39:58 +01:00
Alex Moreno a012740742 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state 2022-02-01 12:38:22 +01:00
Alex Moreno 128612a5ab Merge branch '3552-monitor_ticket_state' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state 2022-02-01 12:38:09 +01:00
Alex Moreno 90ed2fdfac change changes folder name 2022-02-01 12:38:05 +01:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter 2022-02-01 09:03:47 +00:00
Alex Moreno 56331da20b feat(item_index): add column producer 2022-02-01 09:37:11 +01:00
Alex Moreno 7cf252a8f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-02-01 07:29:38 +01:00
Alex Moreno 3d2f661bf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-02-01 07:20:21 +01:00
Joan Sanchez 9878780006 Merge branch 'dev' into 3552-monitor_ticket_state 2022-01-31 15:41:20 +00:00
Alex Moreno 78b3df0b6a feat(monitor_ticket): classColor in db 2022-01-31 13:15:37 +01:00
Joan Sanchez d30e8d9bcc Removed already uploaded changes 2022-01-28 14:50:19 +01:00
Joan Sanchez 26f980998a renamed folder 2022-01-28 14:49:11 +01:00
Alex Moreno 8936e02cd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 14:23:22 +01:00
Joan Sanchez 2480f37e24 Renamed version number (olrder version already applied on production) 2022-01-28 14:20:54 +01:00
Vicent Llopis 44e6219df5 update table companyGroup 2022-01-28 09:30:54 +01:00
Alex Moreno 072ac5fb6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 09:28:13 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket 2022-01-28 09:15:41 +01:00
Alex Moreno 74916c182a Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:22:39 +01:00
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Alex Moreno f8a0094321 word movible 2022-01-26 08:54:48 +01:00
Alex Moreno 57e4b400c9 Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:12:57 +01:00
Alex Moreno 442d58f59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:11:22 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test 2022-01-25 14:27:30 +01:00
Juan Ferrer 022c2cde3c Merge branch 'dev' into 3536-DbUserSync 2022-01-25 11:18:50 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking 2022-01-24 15:40:37 +01:00
Joan Sanchez 6de82caf0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-01-21 16:17:53 +01:00
Joan Sanchez ddf62d2496 Updated back unit test 2022-01-21 16:16:39 +01:00
Joan Sanchez 5ff950d078 refactor(invoice): hide report logo for non group companies #3519 2022-01-21 10:33:40 +01:00
Juan Ferrer 997b7990d4 Docker connectTimeout && MySQL/MariaDB user sync 2022-01-20 15:33:53 +01:00
Javi Gallego 6d66ab7bea getTotals without transaction 2022-01-20 10:05:24 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking 2022-01-19 14:19:29 +01:00
Joan Sanchez 352c3205bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor 2022-01-18 13:57:26 +01:00
Alex Moreno 8e1c3e107c refactor(ticket): advanceable code 2022-01-18 12:48:39 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz dc0a498b4d Merge branch 'dev' into 3513-export_database 2022-01-17 13:02:32 +00:00
Alex Moreno 4b2153d638 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-17 13:37:25 +01:00
Joan Sanchez 7d16d7aaf2 Closure refactor 2022-01-17 12:33:11 +01:00
Alex Moreno b05f464517 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume 2022-01-17 10:14:58 +01:00
Carlos Jimenez Ruiz 941d43b9a2 Merge branch 'dev' into 3448-worker_calendar-payedHolidays 2022-01-17 09:06:27 +00:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable 2022-01-17 07:14:29 +01:00
Alex Moreno bf6d196414 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-01-13 08:33:27 +01:00
Alex Moreno 245161375c update database 2022-01-13 08:27:56 +01:00
Alex Moreno c90a2b6e5c update folder changes 2022-01-13 07:24:46 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-13 07:20:23 +01:00
Alex Moreno 6f7c1b6a46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary 2022-01-12 14:56:34 +01:00
Alex Moreno 757fe73ecd test(ticket_volume): backTest 2022-01-12 14:55:20 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType 2022-01-12 14:02:58 +01:00
Vicent Llopis f387551835 add sql 2022-01-12 12:27:12 +01:00
Alex Moreno 9e491082e7 test(send): backTest and fixtures 2022-01-11 08:39:06 +01:00
Alex Moreno ebac06e4fc refactor(send): update got sms 2022-01-10 15:14:05 +01:00
Alex Moreno fc69151f7f update sms 2022-01-10 13:20:57 +01:00
Alex Moreno 1983eb012b refactor(sms): got and apiKey 2022-01-10 12:28:39 +01:00
Alex Moreno e4db123672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary 2022-01-04 13:55:36 +01:00
Alex Moreno 2a9cc2f465 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary 2022-01-03 09:54:11 +01:00
Alex Moreno db609c1713 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database 2022-01-03 08:39:06 +01:00
Alex Moreno e8a4a9cd8c update today 2022-01-03 08:38:46 +01:00
Carlos Jimenez Ruiz ea4fc5c262 updated fixtured to amend failing test 2021-12-30 12:08:05 +01:00
Alex Moreno a57999aaad unnecessary space 2021-12-29 11:55:48 +01:00
Alex Moreno e9f77bb9b4 feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk 2021-12-29 11:51:56 +01:00
Alex Moreno 5401c1ebf6 export database and fixture train 2021-12-24 12:29:47 +01:00
Alex Moreno 8e274f4f17 refactor(travel): deprecated travelThermograph.temperature 2021-12-24 10:10:28 +01:00
Alex Moreno 1e6355cdde fixtures 2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e 2021-12-22 08:11:33 +01:00
Alex Moreno e609994efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures 2021-12-21 20:58:58 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono 2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name 2021-12-21 14:43:53 +01:00
Vicent Llopis e30fb0fb37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono 2021-12-21 07:10:19 +01:00
Alex Moreno 412acfbff2 refactor(payment_afterInsert): email 2021-12-20 14:46:09 +01:00
Alex Moreno f67edffcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-20 13:51:44 +01:00
Alex Moreno 50db693e51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2021-12-20 13:50:50 +01:00
Alex Moreno b0019d09ad feat(ticket_basic-data_step-two): adapted for available and transfer sales in back 2021-12-20 13:50:31 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures 2021-12-20 09:40:34 +00:00
Alex Moreno 9247bc98f1 feat(db): sql for supplier isPayMethodChecked 2021-12-20 08:01:13 +01:00
Alex Moreno 0ea1dea8b5 refactor sqls 2021-12-17 12:52:37 +01:00
Alex Moreno 850ea2ef39 getVisible sql 2021-12-17 12:38:56 +01:00
Alex Moreno 7c17250919 trigger payment_beforeInsert sql 2021-12-16 15:19:56 +01:00
Alex Moreno f4a07cab70 sql update supplier 2021-12-16 12:21:47 +01:00
Alex Moreno 138f2110e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-16 12:15:47 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale 2021-12-15 15:24:45 +01:00
Joan Sanchez 15b78787df Added version 10400-christmas 2021-12-14 10:46:05 +01:00
Joan Sanchez b45263af30 Merge branch 'dev' into export_production 2021-12-14 09:23:15 +00:00
Vicent Llopis 9de1d59d98 fix: deleted repeated tickets 2021-12-14 09:56:38 +01:00
Javi Gallego a99174e42a Merge branch 'dev' into 2883-invoiceIn-Booking 2021-12-14 09:50:39 +01:00
Alex Moreno 6465a5c460 feat(supplier): payMethodChecked for financial 2021-12-14 08:23:11 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test 2021-12-01 12:49:53 +01:00
Vicent Llopis b9893220cd export database 2021-12-01 08:19:28 +01:00
Alex Moreno c7e5c25a28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-11-30 15:13:38 +01:00
Alex Moreno decd4b5a95 separate sql procedures 2021-11-30 15:13:20 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures 2021-11-30 13:57:17 +01:00
Alex Moreno d5c0be5a9d refactor(ticket_sale): logic and tests 2021-11-30 13:47:16 +01:00
Carlos Jimenez Ruiz 51a608cb5a Merge branch 'dev' into 3325-notify_absence 2021-11-29 09:49:58 +00:00
Vicent Llopis 2f7295020c update column notificationEmail 2021-11-26 13:30:40 +01:00
Alex Moreno 771100ccab remove unnecessary intro and comment 2021-11-26 08:40:20 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model 2021-11-26 08:34:32 +01:00
Alex Moreno 9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data 2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz 5914e8e1ac fixed e2e by adding acls where needed 2021-11-25 11:30:55 +01:00
Carlos Jimenez Ruiz 09c2b813b5 ACL update 2021-11-24 15:27:09 +01:00
Alex Moreno c03fe359b1 add acl 2021-11-24 14:36:12 +01:00
Alex Moreno fc2e81826d export database 2021-11-24 13:02:58 +01:00
Alex Moreno 00072a7dd1 landing searchable false 2021-11-24 10:02:52 +01:00
Alex Moreno 5931692fac test(item_basic-data): add genericFk e2e 2021-11-24 09:21:41 +01:00
Alex Moreno b460579834 feat(entry_latest-buys): add from and to in search-panel 2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys 2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz cbcfdd33ec Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz 9fdfe64909 Merge branch 'dev' into 3381-item_diary-claim 2021-11-22 13:51:51 +00:00
Carlos Jimenez Ruiz ff0a3acd6e Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 2021-11-22 13:18:53 +00:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo 2021-11-22 11:49:30 +01:00
Carlos Jimenez Ruiz ca0c3be843 Merge branch 'dev' into 3381-item_diary-claim 2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz e5977be502 Merge branch 'dev' into 3374-itemPackingType 2021-11-19 11:47:37 +00:00
Vicent Llopis 8f2e29787b fix(payMethod): alter colums name 2021-11-19 10:07:33 +01:00
Alex Moreno ac9ed90f4a feat(item): modify item_getBalance and do test 2021-11-19 10:02:40 +01:00
Javi Gallego fe97b9472c db changes en el sprint actual 2021-11-19 07:46:08 +01:00