Commit Graph

1809 Commits

Author SHA1 Message Date
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:16:36 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +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 3a33750890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 10:11:37 +01:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:30:17 +00:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 06:38:20 +00:00
Vicent Llopis 799c26796e feat: añadidos chips
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:19:05 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:16:40 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 13:06:06 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:26:10 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:10:33 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:00:46 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 12:37:56 +01:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 18:27:45 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued... Details
2022-12-07 13:53:59 +01:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 09:24:56 +01:00
Alex Moreno b769845a28 hotFix: not transfer all sales if all sales is negatives
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 14:29:44 +01:00
Vicent Llopis c1089c637a fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:43:29 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:29:39 +01:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:16:01 +01:00
Vicent Llopis af87fc2d53 fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +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
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:38:34 +01:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:40:43 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:27:49 +00:00
Pau 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:23:00 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau 88db9c0d80 Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:25:20 +01:00
Pau 4c4e0e109d refactor test to use toBeGreaterThan 2022-11-23 08:25:15 +01:00
Pau b6ff1d99b1 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:20:13 +01:00
Pau 0b6d7eaffc refs #4791 @30min fix broken test 2022-11-23 08:20:12 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Pau bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 13:44:23 +00:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Pau 3b66da20ca Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:01:33 +00:00
Pau 4bd643143b requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:59:18 +01:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:45:28 +00:00
Pau fc08b27fb6 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:42:53 +00:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Pau 0099b42fe3 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:06:38 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Pau 153f5f56fa fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 09:11:17 +01:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Joan Sanchez 813cf78128 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 14:03:09 +00:00
Joan Sanchez d7729654ee fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-17 16:48:31 +01:00
Alexandre Riera c4430b4bca fix acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:56:51 +01:00
Pau a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:36:26 +01:00
Alexandre Riera 66002968f6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:21 +01:00
Alexandre Riera 489df60afc suggested filter added
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:00 +01:00
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Vicent Llopis 46c7aa24b8 fix: corregidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:14:45 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Pau 192d7336a4 change test
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:22:09 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Vicent Llopis dd8117b6a4 feat: añadidas traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:02:31 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alexandre Riera 09d7c450a2 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:36 +01:00
Alexandre Riera 97a6aff499 fix workerFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:06 +01:00
Alexandre Riera 607f61092a Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:06:10 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:03:55 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Pau 4e2741a9cd Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:01:02 +01:00
Pau 31a0aae8e9 Fixed notification not getting inserted 2022-11-15 11:01:00 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Pau f1b706d178 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 10:37:13 +01: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
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:54:05 +00:00
Alex Moreno 6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:43:19 +00:00
Pau 60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 07:59:53 +00:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Vicent Llopis 0637050375 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:11:33 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:29:40 +01:00
Vicent Llopis d6a0580203 feat: traducciones modelo Ticket
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:08:23 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:00:13 +01:00
Alexandre Riera dc06ba7d89 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:58:18 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau c4044ff70d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 07:40:14 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:06:30 +00:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-07 09:51:33 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:27:15 +00:00
Alex Moreno 28edb2e53a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-04 08:09:15 +01:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 06:46:23 +00:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 14:16:11 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:42:35 +00:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +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
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau d937a1b505 Add acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:09 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Pau a43e642ff7 Add transferclient
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:23:46 +02:00
Vicent Llopis f968b19d1e fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:41:00 +02:00
Vicent Llopis 51cad75298 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:17:15 +02:00
Alex Moreno 508decaf0b try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 08:22:36 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:45:46 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:37:06 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Alex Moreno 8985a678d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-18 09:49:06 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:01:21 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Vicent Llopis 787d10aac6 fix: select one result only
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Alex Moreno 99271f275f remove unnecessary isEditable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:26:38 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 843f67919c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:56:03 +02:00