Commit Graph

5777 Commits

Author SHA1 Message Date
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau 89bbf35a87 Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 08:30:32 +00:00
Pau 1d8fb25325 Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:25:54 +02:00
Vicent Llopis f95f977b69 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:04:53 +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
Vicent Llopis 9f70a1d513 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 08:17:16 +02:00
Pau 047076f189 changed tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 07:14:40 +02:00
Alex Moreno eb58839839 feat(invoiceIn): invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 15:13:27 +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
Pau 9290cd6fb6 Finished back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:02:18 +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
Vicent Llopis 8ab6a50c73 try to fix frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 13:02:19 +02:00
Vicent Llopis 86d24ffede refactor code 2022-10-17 13:02:03 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +02:00
Vicent Llopis 2d1b48280c fix: backTest 2022-10-17 11:53:29 +02:00
Alex Moreno 57b2ae770d fix(e2e)
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 11:44:29 +02:00
Vicent Llopis dd10b79441 delete: throw error 2022-10-17 11:43:26 +02:00
Vicent Llopis e5fd6adfe5 fix: delete throw error 2022-10-17 11:43:01 +02:00
Vicent Llopis 33092acee7 refactor: delete unnecessary code 2022-10-17 11:42:05 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 11:22:27 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:41:39 +00:00
Vicent Llopis 6924b05c8a feat: add radio button
gitea/salix/pipeline/head Build queued... Details
2022-10-17 10:19:07 +02:00
Pau a4243e14c5 Created Back test for newSupplier 2022-10-17 10:17:56 +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 15ba6681af refator: code unified
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 09:49:47 +02:00
Pau dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:32:50 +00:00
Pau f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:22:50 +02:00
Pau 0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:20:45 +02: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
Pau 1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:38:54 +02:00
Pau 594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:35:02 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +02:00
Alex Moreno 6bfd54fc71 feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:22:22 +02:00
Alex Moreno 3e746ceb7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-14 14:47:42 +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
Vicent Llopis 5918b3e0df refactor: juan changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 09:30:09 +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
Vicent Llopis 50ec41dece refator: cancel request
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 15:01:15 +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
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:22:53 +02:00
Vicent Llopis 0d785695fe feat: invoicing by (clientFk, addressFk)
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 12:24:06 +02:00
Pau 012cd68c89 Added menu to create a new supplier, not working
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 11:43:01 +02:00
Vicent Llopis 53f78a98d2 feat: update message while globalInvoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:04:13 +02:00
Vicent Llopis 4f5abb709a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 09:14:14 +02:00
Vicent Llopis bfefec397e feat: add testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 09:13:29 +02:00
Vicent Llopis 1a38fc307f delete: duplicated keybinding
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:42:59 +02:00
Vicent Llopis 9c52508a88 feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:40:22 +02:00
Alex Moreno c29b8c99d0 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 05:43:15 +00:00
Alex Moreno e80197bd6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:22:10 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +02:00
Vicent Llopis dbfc3d335d 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-11 07:06:45 +02:00
Joan Sanchez e3606c7273 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:46:06 +02:00
Alex Moreno 5c4daee35e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:20:22 +02:00
Alex Moreno c7a06baa63 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 11:47:09 +00: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
Alex Moreno a6c171d00a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 13:05:00 +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
Vicent Llopis 8130cf9e6a feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 12:40:10 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:23:40 +02:00
Joan Sanchez 990a1b3c67 250 nodes
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:33:08 +02:00
Joan Sanchez 31d1b84bb9 Unfold when there's less than 100 nodes to show
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:25:59 +02:00
Alex Moreno 3ac8e1d3bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 09:57:21 +02:00
Alex Moreno e497ddd664 fix: add td-editable
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 09:21:14 +02:00
Alex Moreno 18cd34bccb fix(travel_extraCommunity): css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 08:57:41 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-10 07:49:08 +02:00
Alex Moreno 9befa2531b Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:29:26 +02:00
Joan Sanchez 934c0d0169 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:28:10 +02:00
Alex Moreno 49e82156cf Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css 2022-10-10 07:10:25 +02:00
Joan Sanchez 3dee50a796 Updated method accessType
gitea/salix/pipeline/head This commit looks good Details
2022-10-09 20:14:14 +02:00
Alex Moreno 00d5876f88 hotFix(travel_extraCommunity): fix css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 14:35:16 +02:00
Vicent Llopis bb26fa6502 feat: add tFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 13:49:42 +02:00
Joan Sanchez 587da840c0 Fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:16:30 +02:00
Joan Sanchez 6c5acc75eb Consumption fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:00:06 +02:00
Alex Moreno 94a51db3d5 hotFix(ticket_request): autocomplete buyer
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:56:12 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +02:00
Vicent Llopis 1894492a2c 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-07 09:26:51 +02:00
Vicent Llopis 3da948f3f9 refactor: delete unnecessary lines
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 09:17:14 +02:00
Pau 4f25961988 Created checkbox and logic, package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:33:45 +02:00
Vicent Llopis 2e91698c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:19:08 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Javi Gallego d5592d6a0f sin toClientId
gitea/salix/pipeline/head This commit looks good Details
2022-10-06 15:19:55 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Joan Sanchez dd9b517883 Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1061
2022-10-06 11:30:49 +00:00
Javi Gallego d73dab3454 Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:01:56 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 11:54:14 +02:00
Vicent Llopis c8d270499b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:50:11 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:48:31 +02:00
Vicent Llopis 37601934f5 feat: first option to delete and update
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:40:46 +02:00
Joan Sanchez 8f3e09b88f Merge branch 'dev' into 4033-route
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 08:23:19 +00:00
Vicent Llopis a3a432c753 fix: delete one or more expeditions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:19 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:08 +02:00
Vicent Llopis 26d04ce2d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 10:08:29 +02:00
Vicent Llopis ddbe1057ad feat: add new section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:47:53 +02:00
Joan Sanchez f2eaa9d0e5 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 06:28:00 +00:00
Vicent Llopis 434db10ac9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 07:22:16 +02:00
Joan Sanchez fd219f853f Merge branch 'dev' into 4581-client.web-access
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 14:26:03 +00:00
Joan Sanchez b134aeb0ea Mock report pdf
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 16:19:07 +02:00
Vicent Llopis 2f17257e46 feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 15:13:48 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Joan Sanchez 3d36c0339a Merge branch 'dev' into 4592-jenkins_tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:05:10 +00:00
Pau 940b431059 feat(model) Created the model for packagingMistake
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 14:04:30 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Vicent Llopis 761563edc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 13:38:17 +02:00
Vicent Llopis 26d655075e fix: bad pull
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 13:28:08 +02:00
Joan Sanchez 726b2d5eb2 Exit on completion
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 13:26:18 +02:00
Vicent Llopis aa51fa1722 feat: check the client to edit is in vn.client and not in account.account
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:36:36 +02:00
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Vicent Llopis 994cf7ccf0 fix: '==' by '='
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 15:04:27 +02:00
Alex Moreno 5f39249edb fix(ticket): canEdit use aclFunc
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 15:02:00 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Joan Sanchez eadff3fff9 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:46:44 +02:00
Joan Sanchez 1598b6c703 Back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:39:42 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Joan Sanchez 3dbd304217 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:21:24 +02:00
Vicent Llopis 68e4f3a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 09:10:15 +02:00
Vicent Llopis 6e9909400b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 08:19:38 +02:00
Vicent Llopis 5c76437498 refator: delete unnecessary transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 08:19:09 +02:00
Vicent Llopis f510e26141 refactor: translation
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:55:30 +02:00
Vicent Llopis 000655fe1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head Build queued... Details
2022-10-04 07:51:24 +02:00
Vicent Llopis 197bbf392b refator: updates translations
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:50:37 +02:00
Joan Sanchez c8bad23621 Tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 07:41:40 +02:00
Vicent Llopis 11484edd10 feat: create new ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 15:18:07 +02:00
Alex Moreno cca2878716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4073-user_privileges
gitea/salix/pipeline/head This commit looks good Details
2022-10-03 15:16:33 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +02:00
Joan Sanchez e4b61f81a9 Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-03 07:41:58 +00:00
Pau 5ca39c9dd3 Modified TextField to have a insertable option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:48:04 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Javi Gallego eb48685484 selectores reparados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:55:31 +02:00
Joan Sanchez 7fd4728c33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:13:16 +02:00
Joan Sanchez 4005d6f82a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 13:55:53 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Alex Moreno eec1d6df4a add translation
gitea/salix/pipeline/head This commit is unstable Details
2022-09-30 09:06:43 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez ccec38ef97 Renamed table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:49:08 +02:00
Joan Sanchez 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 13:09:44 +02:00
Joan Sanchez 4172229051 Closure hotfix
gitea/salix/pipeline/head This commit looks good Details
2022-09-29 09:35:57 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Pau 7ac7189a8a added maxlength binding, finished logic on insert
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 08:08:49 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Alex Moreno 203b223cc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:24:40 +02:00
Alex Moreno 840140c40f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:20:35 +02:00
Joan Sanchez ae2bc91cb5 Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1067
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:38:46 +00:00
Joan Sanchez 93f5bf089d Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1031
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:10:55 +00:00
Joan Sanchez d7ab95fcc8 closure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:00:12 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Pau 901007d34b change test case to expect the image to be defined
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:58:27 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:46:23 +02:00
Pau d30065f90a Add vn-input-account tag and logic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 12:12:25 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Joan Sanchez 410e651edd Buyer waste
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 07:24:45 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Alex Moreno d2cbaa565e add translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:48:46 +02:00
Alex Moreno dc605387ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:23:10 +02:00
Alex Moreno fc5460dc9e feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:21:58 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Pau 620162aec7 Añadido el modelo de sector a shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-23 12:24:11 +02:00
Vicent Llopis c4649352a9 feat: add totalChecked
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 08:50:11 +02:00
Joan Sanchez 664fd444cc Sample refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-22 15:44:35 +02:00
Vicent Llopis 2a64fde57c feat: add option "move expedition"
gitea/salix/pipeline/head This commit is unstable Details
2022-09-22 14:58:38 +02:00
Vicent Llopis a486b1593b fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 13:55:09 +02:00
Vicent Llopis 95e5b1a970 fix: code for search-function 2022-09-22 13:54:58 +02:00
Alex Moreno c79f884526 feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 09:22:24 +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
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 08:32:18 +02:00
Vicent Llopis fae1516b33 refactor: correct bleeding
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:55:43 +02:00
Vicent Llopis 65e15ada69 refator: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:53:02 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Joan Sanchez 284524e3fa Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1054
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:49:44 +00:00
Joan Sanchez fcce73086e Merge pull request '2805-fix(entry_latestBuys): save chekeds when crudModel load more data' (#1045) from 2805-entry_latestBuy_saveChekeds into dev
Reviewed-on: #1045
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:47:29 +00:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:37:20 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +02:00
Joan Sanchez fe71e485aa Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1055
2022-09-16 07:15:41 +00:00
Joan Sanchez 9f9581c722 Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev
Reviewed-on: #1048
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:12:41 +00:00
Joan Sanchez 1b09f3bf7f Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1052
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:11:59 +00:00
Joan Sanchez f9f09440ec Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:10:48 +00:00
Alex Moreno 54b41faf12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss
gitea/salix/pipeline/head This commit is unstable Details
2022-09-16 08:55:39 +02:00
Vicent Llopis f5bbe3a9ac fix: scope updated
gitea/salix/pipeline/head This commit is unstable Details
2022-09-15 11:55:07 +02:00
Joan 90229112e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 06:35:03 +00:00
Vicent Llopis eb7bd3dc59 update brach
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 14:03:15 +02:00
Alex Moreno e72c0ae919 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 13:09:00 +02:00
Alex Moreno 06eab58b3d is agency
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:45:40 +02:00
Alex Moreno 8c984b5ebe refactor(client): change rol manager to financialBoss
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:32:19 +02:00
Alex Moreno 6b252f7e33 refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 10:13:30 +02:00
Alex Moreno 49a7a05310 feat(travel_extra-community): add vn-anchor
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 08:08:07 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 15:11:14 +02:00
Vicent Llopis a6a5a84add fix: incorrect name of function
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 14:42:15 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Vicent Llopis 3bf5f5f86e fix: tfront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-13 13:47:54 +02:00
Vicent Llopis bddc998b86 feat: allow update route.isOk field
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:34:32 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 6e31865add Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:17:30 +02:00
Vicent Llopis cc6ba8712c feat: log when a day is excluded
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:15:28 +02:00
Joan Sanchez 1f850d13e9 Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1035
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:00:36 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 11:35:15 +02:00
Vicent Llopis b02aa8466c fix: tfront
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 10:27:17 +02:00
Vicent Llopis 8c6c7345cd fix: change GET by POST, to solve "Request Header Fields Too Large" 2022-09-13 10:27:08 +02:00
Joan Sanchez 3210f91bf7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 12:20:49 +02:00
Joan Sanchez de3e14e739 4514 - Write permissions for rrhh
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 10:23:17 +02:00
Joan Sanchez faa3865da1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-09 11:53:57 +02:00
Alex Moreno 8da24a56b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-09-09 07:52:17 +02:00
Alex Moreno c9721f4c7f fix(entry_latestBuys): save chekeds when crudModel load more data
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 14:52:43 +02:00
Alex Moreno a15c051098 fix(monitor_salesFilter): mariadb not optimize query
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 08:07:46 +02:00
Alex Moreno c06d2970ae test(boxing): getVideoList
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 13:58:39 +02:00
Javi Gallego f0a9441e1f Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head This commit is unstable Details
2022-09-07 11:31:47 +02:00
Alex Moreno 886abfd897 fix(monitor): fix left join salesFilter
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 08:49:24 +02:00
Alex Moreno 8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 15:08:28 +02:00
Alex Moreno 6fcb1e54b4 refactor(claim_action): set translations
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 09:35:01 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Joan Sanchez cceb456209 Filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-08-12 15:31:59 +02:00
Joan Sanchez d0185017b7 Removed translate from grouping and packing
gitea/salix/pipeline/head This commit looks good Details
2022-08-11 08:29:24 +02:00
Vicent Llopis f3df373f70 delete: unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-08-10 13:23:50 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 8f54365350 refator: parametrizardo con ?
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:19:23 +02:00
Vicent Llopis 31aafc0719 feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:11:38 +02:00
Joan Sanchez d2b901d47f Relative path for master versions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-08-09 11:49:28 +02:00
Alex Moreno 6054e0bef3 fix(mdb): use relative path
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:24:48 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-05 09:18:53 +00:00
Joan Sanchez 624428212b Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-08-04 12:51:41 +00:00
Joan Sanchez 1dda78c438 Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1036
2022-08-04 12:23:27 +00:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Juan Ferrer 22503375b3 Hotfix: User synchronization
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 08:53:31 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 14:57:39 +02:00
Joan Sanchez eed0ac66c6 Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1023
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 07:09:08 +00:00
Joan Sanchez 0de2c08739 Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-03 06:45:58 +00:00
Joan Sanchez 1b9de5cc95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 06:41:22 +00:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Vicent Llopis 1e521f1a8b feat: delete link
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 14:12:53 +02:00
Vicent Llopis d1e273d1d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 13:56:01 +02:00
Vicent Llopis 83e5a01649 fix: correct translation
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:47:42 +02:00
Vicent Llopis 990fe17f48 fix: correct transalte
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:42:59 +02:00
Vicent Llopis 84036d582f fic: delete unnecessary acl 2022-07-29 13:42:52 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00
Vicent Llopis 224ea61a62 fix: delete warehouseFk from itemType model
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:07:25 +02:00
Vicent Llopis 840e792d13 fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:52:53 +02:00
Vicent Llopis 605da52286 fix: replace it.warehouseFk by userConfig.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:22:03 +02:00
Vicent Llopis 21701601e3 fix: update frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 13:01:03 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 12:16:41 +02:00
Alex Moreno 4c60303968 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit is unstable Details
2022-07-27 11:17:35 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-27 08:12:06 +02:00
Joan Sanchez f4825488c6 refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:47:43 +02:00
Alex Moreno d3852bac5d fix(vnInputTime): quit new date(null)
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:45:12 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-25 14:49:39 +02:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:56:19 +00:00
Vicent Llopis 9bd3daf71c feat: add translate 2022-07-22 13:36:44 +02:00
Vicent Llopis 4076f2908e refactor: change type of params in endpoints
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:35:18 +02:00
Carlos Jimenez Ruiz 7d7365c4f3 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 11:07:08 +00:00
Vicent Llopis 5446c960fb fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 10:11:31 +02:00
Vicent Llopis 699f19b0d4 refactor: change invoice id by refFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 10:05:37 +02:00
Vicent Llopis cb3e488df9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:12:08 +02:00
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:02:15 +02:00
Vicent Llopis af4e7be229 feat: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 13:41:33 +02:00
Vicent Llopis 771c86ba4b fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-20 12:40:30 +02:00
Vicent Llopis b4408dc080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:42:43 +02:00
Vicent Llopis 318b688b67 fix: typo errors
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:40:41 +02:00
Vicent Llopis 28deb34047 refactor: update translation 2022-07-19 14:40:23 +02:00
Vicent Llopis 7434532636 feat: add translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:38:06 +02:00
Vicent Llopis c56ac1c192 feat: add log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:35:17 +02:00
Carlos Jimenez Ruiz 7437da92a5 Merge branch 'dev' into 4294-zone_getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz bbfab8d0bd Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz c883f45653 Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:18:33 +00:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Vicent Llopis ac344d6edd refactor: add column id PK and updated column code UQ
gitea/salix/pipeline/head There was a failure building this commit Details
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 dd46a974cc fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-12 11:57:01 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 11:52:47 +02:00
Vicent Llopis 6f3d4792d5 update backTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 10:03:58 +02:00
Vicent Llopis eaa7658b23 delete it.warehouseFk 2022-07-12 10:03:50 +02:00
Vicent Llopis 25dab78ca2 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 06:20:07 +00:00
Alex Moreno 051a849a21 fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 08:10:29 +02:00
Vicent Llopis 2d57b3bd54 Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 06:10:20 +00:00
Vicent Llopis 1eb6ee69cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 08:09:02 +02:00
Vicent Llopis e4b04fadbc fix: set editMode = 'include' by default
gitea/salix/pipeline/head Build queued... Details
2022-07-12 08:00:17 +02:00
Vicent Llopis 2b5550bc6e feat: add testFront
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 07:57:28 +02:00
Carlos Jimenez Ruiz 136dcee214 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds 2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz 44c29aa489 updated file as per convention 2022-07-11 11:25:31 +02:00
Alex Moreno b3d001bb9d fix(timeEntry): fix back test
gitea/salix/pipeline/head This commit looks good Details
2022-07-11 08:17:32 +02:00
Vicent Llopis 4b65b531fd feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 10:09:03 +02:00
Vicent Llopis eb586643ca refactor: change name of endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 09:47:11 +02:00
Vicent Llopis 94872f8493 fix: show geos checked onSearch
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-07 13:37:36 +02:00
Vicent Llopis 6f7a4fc5ff refactor title of test
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 12:08:16 +02:00
Vicent Llopis 979ee1d956 feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 10:19:22 +02:00
Vicent Llopis 51bd18ac37 feat: update commissionWorkCenterFk when create a route 2022-07-05 10:19:06 +02:00
Joan Sanchez fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1011
2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Joan Sanchez d810b3712b Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1017
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-06-30 12:22:41 +00:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:21:07 +02:00
Joan Sanchez ae79163048 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:17:04 +02:00
Joan Sanchez 140af7e808 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:14:08 +02:00
Joan Sanchez ad021265c7 Deprecated field taxTypeFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz dab8c60f77 Merge branch 'dev' into 4268-client_list_scroll
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz 14350358d6 added max width to email of 400px + title to overflowing content
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 15:21:30 +02:00
Vicent Llopis 748dc1b37e fix: delete engine memory to pass backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-29 14:36:17 +02:00
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued... Details
2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable Details
2022-06-29 14:28:23 +02:00
Vicent Llopis 459a1fe518 feat: update instrastat.sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 14:15:22 +02:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 12:55:11 +02:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good Details
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 bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00
Javi Gallego 4c5c51a319 claim basic-data minor bug
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 18:20:26 +02:00
Alex Moreno 8e2ed4e182 fix(worker_getWorkedHours): fix fixtures and test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-27 15:09:43 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:03:24 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:01:42 +02:00
Vicent Llopis fcf79a507c Merge branch 'dev' into 4213-item.summary
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable Details
2022-06-25 15:22:47 +02:00
Vicent Llopis 3e43bf2024 feat(route.index): can edit fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:14:13 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz 3c963b5ab2 refactor(routes json): fixed indentation 2022-06-22 16:42:59 +02:00
Vicent Llopis 2c721867fc feat(item.summary): add description
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 14:30:25 +02:00
Joan Sanchez 2381a5d09a Updated e2e tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 12:40:11 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-22 08:58:51 +02:00
Joan Sanchez e7bf88c703 Fix order
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 14:26:34 +02:00
Alex Moreno 20f886e933 change email and text info in email field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 13:58:47 +02:00
Alex Moreno 17fd50ee33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email 2022-06-21 13:40:24 +02:00
Joan Sanchez 9751514b10 Merge branch 'dev' into 4138-ticket_create_address_isActive
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 11:15:33 +00:00
Joan Sanchez e5b1bfeec2 Merge branch 'dev' into 4231-worker.calendar_payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 10:59:46 +00:00
Vicent Llopis ec852b898c fix: check if services exists
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:44:19 +02:00
Joan Sanchez 16d677528a FIX: Sort by id as last field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:18:33 +02:00
Alex Moreno 8d9d64b49d feat(client_web-access): add email field
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz 7c580da6b8 refactor(ticket.create): display only active addresses
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz ba0975fe0e Merge branch 'dev' into 4081-ticket.setDeleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz c22e36ff1e Merge branch 'dev' into 4081-ticket.setDeleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:45:13 +00:00
Vicent Llopis 6611fcb40e fix: show correct payedHolidays
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 12:34:33 +02:00
Joan Sanchez 9250cc78ff Merge branch 'dev' into 4197-entry.lastetBuysFilter
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:34:00 +00:00
Vicent Llopis 44e95a00c3 refactor: delete duplicated code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 08:54:40 +02:00
Vicent Llopis 1bd4b02a62 refactor: code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 08:18:23 +02:00
Carlos Jimenez Ruiz 1e504b6b9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor 2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz e151e35f7e replaced isActive by active as per it's model and updated original data in controller
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 16:25:21 +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 00e48f5257 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 10:59:31 +02:00
Vicent Llopis 84ffe3f594 feat: delete from ticketCollection and sectorCollection when a ticket is deleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 09:58:15 +02:00
Vicent Llopis f41b9b0b57 refator: delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:25:31 +02:00
Vicent Llopis f3cca1c930 fix: warehouse changed from 'silla' to 'algemesi'
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:24:35 +02:00
Vicent Llopis 980ac50ba9 feat: add frontTets
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:03:58 +02:00
Vicent Llopis f69fb45b90 feat: it only sets the highest priority, in case that ticket doesn't already have the highest priority.
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-15 12:53:13 +02:00
Vicent Llopis cc23913c9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 09:40:02 +02:00
Alex Moreno 8474fb5692 Merge branch 'dev' into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 07:15:34 +00:00
Vicent Llopis e61784b6ba refactor: undo chages about drag&drop
gitea/salix/pipeline/head This commit looks good Details
2022-06-14 13:52:32 +02:00
Vicent Llopis 52e78db9ee feat: group by address in buscaman, delete priority by checked, show notes of tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 12:36:08 +02:00
Vicent Llopis 189e8dbab3 feat: order by column enabled 2022-06-14 12:34:32 +02:00
Vicent Llopis 931c4fb259 refactor: translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 08:03:46 +02:00
Vicent Llopis c26b09ead3 refactor: create endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 14:33:22 +02:00
Vicent Llopis dd65f4a468 refator: rewrite conditionals
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 13:17:56 +02:00
Vicent Llopis 8d4c735744 refactor: delete duplicated code
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 12:26:40 +02:00
Vicent Llopis 363c5f349a fix: solved bug to create temporary table
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 10:04:12 +02:00
Alex Moreno 5e586bf1d0 test(client_defaulter): getBalanceDueTotal tested
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 07:44:21 +02:00
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz 096f225656 Merge branch 'dev' into 4024-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 07:21:54 +00:00
Vicent Llopis 06f181e913 feat: add frontTest for calendar
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 08:29:10 +02:00
Vicent Llopis f6ab9d8a31 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 08:15:54 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 05:32:58 +00:00
Alex Moreno f74c7a6999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 15:13:04 +02:00
Vicent Llopis a9badfc1ba feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 14:59:17 +02:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Vicent Llopis afd95872c8 feat: drag and drop
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-09 13:48:57 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz 92088c00f7 Merge branch 'dev' into 4163-supplier.account
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz ad8eace5cb Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:52:52 +00:00
Vicent Llopis fb7f26216c feat: update combo "Banck entity" 2022-06-09 08:43:33 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:13:54 +02:00
Vicent Llopis 409e935cc7 feat: add fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-08 15:17:45 +02:00
Vicent Llopis aa99424476 deleted unnecessary 'await'
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 12:50:32 +02:00
Joan Sanchez c92f444776 Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 27e8c99604 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz 6ebcf4bc02 Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:35:31 +00:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:27:12 +00:00
Vicent Llopis eba6c149ba refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 13:26:55 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:28:39 +02:00
Alex Moreno 4e3380cf65 hotFix(ticket_expedition): delete e.checked in filter
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 15:28:11 +02:00
Vicent Llopis 5e01ea58e3 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 13:41:51 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:38:27 +02:00
Vicent Llopis 3da9a775bd feat: add frontTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:36:57 +02:00
Vicent Llopis 8dcd430178 fix: events frontTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:11:26 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 11:52:53 +02:00
Vicent Llopis b5fa360960 feat: edit excluded selecetion with specificLocations
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 10:40:02 +02:00
Juan Ferrer ea0a43d0fb Merge branch 'dev' into 4108-mdb_backend
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 06:45:50 +00:00
Joan Sanchez b6d0d9f210 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 14:26:20 +02:00
Joan Sanchez fab4705618 Rollback
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 14:01:19 +02:00
Vicent Llopis 1235affe2d fix: show correct css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:47:46 +02:00
Joan Sanchez 4ecffc2448 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 11:45:02 +00:00
Joan Sanchez a4a9ea45b7 Removed front unit test
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:44:07 +02:00
Joan Sanchez 571e2f03d3 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:47 +02:00
Joan Sanchez 0faabeb145 Added back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:28 +02:00
Joan Sanchez 0bc48dc27b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 09:39:53 +02:00
Joan Sanchez 4ac26895ba fix(regularizeClaim): refound with negative quantity
gitea/salix/pipeline/head This commit looks good Details
Refs: #4148
2022-06-01 09:36:47 +02:00
Alex Moreno 8340041b33 throw userError and maxFileSize
gitea/salix/pipeline/head This commit is unstable Details
2022-06-01 07:57:32 +02:00
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Vicent Llopis 0c996f7915 fix: excluded backTest fixed
gitea/salix/pipeline/head This commit looks good Details
2022-05-31 12:23:56 +02:00
Vicent Llopis c7471fdac4 refator: variable names changed
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 12:21:04 +02:00
Alex Moreno 7c7c64415d fix(monitor_ticket): add isTooLittle problem
gitea/salix/pipeline/head This commit looks good Details
2022-05-31 12:00:15 +02:00
Alex Moreno cac4e74793 refactor
gitea/salix/pipeline/head This commit is unstable Details
2022-05-31 09:06:15 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Vicent Llopis da1e188983 fix: put requests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 13:54:35 +02:00
Alex Moreno 1e2f827233 fix
gitea/salix/pipeline/head This commit is unstable Details
2022-05-27 13:39:33 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +02:00
Alex Moreno 2b10abbe24 typo
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 10:08:40 +02:00
Alex Moreno ff264ab930 hotFix(client): fiscal-data edit by salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 09:45:08 +02:00
Alex Moreno aa7074f303 test(mdb): back test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 08:23:52 +02:00
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +02:00
Vicent Llopis 6359c9e5bf feat: add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 15:08:23 +02:00
Vicent Llopis 456f167513 feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 11:09:03 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Vicent Llopis 4baf1afb83 fix: show videos in claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:51:47 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Vicent Llopis 5880efe966 refator: commented code deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:51:00 +02:00
Vicent Llopis f00fb0dc3f feat: add new module shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:50:22 +02:00
Vicent Llopis 99c7ad1c1b refactor: delete section shelving from client 2022-05-24 12:50:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:33:08 +00:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:45:20 +02:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +02:00
Vicent Llopis 1b3f0ee026 refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable Details
2022-05-23 12:40:11 +02:00
Vicent Llopis 9736a68dd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:58 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz d86ac41b70 Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:54:08 +00:00
Vicent Llopis f4b080243c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:23 +02:00
Vicent Llopis fd80fc58fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:23 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Joan Sanchez 4d093d37bd Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz b3c0aa7933 Merge branch 'dev' into 4082-zone.basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:19:00 +00:00
Vicent Llopis c125fd54eb refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:08: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 69e12e0dd8 refactor: 'bonus' can be a negative value
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 09:21:33 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Carlos Jimenez Ruiz ed4718922e prevented logs on non-existent clients 2022-05-17 15:37:52 +02:00
Alex Moreno 4a9c5742c0 fix(entry_latest-buys): fix multi_check
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 13:50:06 +02:00
Vicent Llopis 605ab2ec62 refactor: delete sms.detinationFk
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:37:54 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Vicent Llopis 76515bdd3f add: search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 09:54:49 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
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
Alex Moreno a37be3e5fe refactor(client_defaulter): search in smart-table
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 14:30:48 +02:00
Alex Moreno 8bcdf96aad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter 2022-05-16 14:15:37 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:16 +02:00
Vicent Llopis ab13c16948 feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 13:05:08 +00:00
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 12:59:30 +00:00
Joan Sanchez f8db3c31df Proper test result
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-13 10:02:34 +02:00
Joan Sanchez 6b18432f87 Force test to fail
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-13 09:53:47 +02:00
Vicent Llopis 06e9a22f40 added search
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 15:02:07 +02:00
Alex Moreno ec49dd67be refactor(client_defaulter)
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 14:18:16 +02:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 11:43:41 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Vicent Llopis 6441393249 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:47:17 +02:00
Vicent Llopis 568579f461 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:27:04 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Alex Moreno af1fa8051f refactor(clientCredit): refactor test 2022-05-12 08:06:30 +02:00
Vicent Llopis 16fdf982c8 feat(item.itemtype): add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Vicent Llopis 05b0a5342f feat(zone.events): new dialog when choose 'exclude'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 14:53:52 +02:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Vicent Llopis 734f9cb60d feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 07:28:17 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz a47c0dbaea Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz 0e65f382f9 Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:36:35 +00:00
Alex Moreno 5919c42df2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 11:42:35 +02:00
Joan Sanchez 7f19f0bebe Merge pull request '3795-client_administraive' (#938) from 3795-client_administraive into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #938
2022-05-10 08:26:38 +00:00
Joan Sanchez 866834d1d7 Merge pull request '3948-invoceIn.index' (#956) from 3948-invoceIn.index into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #956
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-05-10 08:25:47 +00:00
Joan Sanchez aa431bbe0f Merge branch 'dev' into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:24:32 +00:00
Joan Sanchez 93829eeff5 Merge branch 'dev' into 3948-invoceIn.index
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:22:06 +00:00
Joan Sanchez c0f2b9dca9 Merge branch 'dev' into 3996-entry_summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:09:31 +00:00
Alex Moreno fde73b35e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 08:57:28 +02:00
Alex Moreno 5bad0592a5 change errors
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 08:48:51 +02:00
Alex Moreno 263d0e3f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive 2022-05-10 07:55:41 +02:00
Vicent Llopis bb4dbb60b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 07:11:26 +02:00
Carlos Jimenez Ruiz 5c55caaec6 Merge branch 'dev' into 3978-invoiceIn.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:59:32 +00:00
Carlos Jimenez Ruiz e71003778a Merge branch 'dev' into 3950-invoiceIn.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:41:33 +00:00
Carlos Jimenez Ruiz 6fb83f5c65 Merge branch 'dev' into 3941-order.index
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:21:24 +00:00
Carlos Jimenez Ruiz 9c085fa653 Merge branch 'dev' into 3927-monitor_ticket
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 14:14:01 +00:00
Joan Sanchez 7365143eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 16:09:17 +02:00
Carlos Jimenez Ruiz 93d29bb202 Merge branch 'dev' into 3900-client_credit
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:16:04 +00:00
Vicent Llopis f08a384a7c fix: e2e test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:49:37 +02:00
Alex Moreno d9055abca9 fix(entry_summary): get entry.id
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:44:30 +02:00
Carlos Jimenez Ruiz efc43c9611 Merge branch 'dev' into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 12:36:27 +00:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:34:20 +02:00
Alex Moreno a00728384f Merge branch '3409-clientCredit_maxRows' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:19:38 +02:00
Alex Moreno 54fdc4b6e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows 2022-05-09 13:19:20 +02:00
Joan Sanchez f806a598ea Updated method path
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 13:15:48 +02:00
Vicent Llopis bd7eb67aeb fix: add CAST DECIMAL(10,2)
gitea/salix/pipeline/head This commit looks good Details
2022-05-09 12:31:38 +02:00
Joan Sanchez f380d5fd28 Merge pull request '3942-ticket.volume' (#953) from 3942-ticket.volume into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #953
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-05-09 08:29:23 +00:00
Alex Moreno d34a8629f7 fix(setSaleQuantity): save originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 13:09:37 +02:00
Alex Moreno 798147ea99 jenkins error
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 13:25:57 +02:00
Vicent Llopis 93e3ea103a added frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:05:46 +02:00
Vicent Llopis 9862960c99 comment frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:00:39 +02:00
Vicent Llopis 38f5541ef4 execute jenkins test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 11:27:03 +02:00
Alex Moreno ac4d4e6db1 test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:59:37 +02:00
Javi Gallego dcd5d07a28 menu order
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:43:40 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Alex Moreno b5a73ec3a2 fix(monitor_client): clientsFilter refactor
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:32:14 +02:00
Alex Moreno 0cae852dea refactor
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:28:17 +02:00
Alex Moreno 1cc199e26b refactor(client-credit)
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:26:13 +02:00
Alex Moreno 800b4984ff fix(test): use ctx.options
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:46:47 +02:00
Alex Moreno e140c9d1f4 console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 15:17:34 +02:00
Alex Moreno f364c19c70 fix(monitor_client): fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 14:08:46 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +02:00
Joan Sanchez c6e554c608 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 14:52:02 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 11:18:39 +02:00
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Alex Moreno d27a45522b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:49:42 +02:00
Vicent Llopis fec9554d5b feat(invoceIn.index): added 'file' and deleted 'account'
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 12:13:02 +02:00
Vicent Llopis 48f10c4e53 feat(invoceIn.create): added nif and deleted currency
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:50:43 +02:00
Carlos Jimenez Ruiz b2f930911f fixed problems in two spec files
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 09:18:06 +02:00
Vicent Llopis 11a7f48bd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 08:32:02 +02:00
Vicent Llopis c10e4c04b6 refactor: delete file
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 08:23:35 +02:00
Javi Gallego 9973eeddb9 Merge remote-tracking branch 'origin/3750-claim_photo' into 3851-dms_delete 2022-04-29 07:51:17 +02:00
Joan Sanchez fea7df269c Added invoice schedule method
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 14:59:29 +02:00
Vicent Llopis 32ec755a35 fix: check if value.length
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:26:38 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:14:33 +02:00
Vicent Llopis ab0aba6cfb refactor: translate
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:13:43 +02:00
Vicent Llopis a7b519994d refactor: updated shrink-datetime
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:56:14 +02:00
Vicent Llopis 6d4f803cbe refactor: changed 'expand'
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:53:06 +02:00
Joan Sanchez b06b9718dc Merge branch 'dev' into 3862-ticket_problemItemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 12:58:40 +00:00
Vicent Llopis bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 14:17:41 +02:00
Vicent Llopis 24fa818cb3 fix(monitor_ticket): filter shipped without time
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 09:48:31 +02:00
Vicent Llopis 1766222c12 refactor: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:25:12 +02:00
Vicent Llopis b246a119cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-04-26 13:15:45 +02:00
Vicent Llopis 7abceb8564 refactor: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:08:06 +02:00
Vicent Llopis 5e35783a38 fix: javi's requested 2022-04-26 13:07:50 +02:00
Alex Moreno 165af44d85 fix(zone_delivery-days): await zone.Events.show()
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 09:49:18 +02:00
Vicent Llopis 39f4c4a6e8 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:36:05 +02:00
Vicent Llopis 76ff6330f9 feat(supllier.summary): add two fields
gitea/salix/pipeline/head This commit looks good Details
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
Alex Moreno e7cb9cf2da fix
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 10:30:44 +02:00
Vicent Llopis 6d35200607 updated front test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 10:10:59 +02:00
Vicent Llopis 789365799e refactor: changed name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 08:45:50 +02:00
Alex Moreno 42f02c3b9e fix(client): socialName unique check client.fi 2022-04-25 08:09:58 +02:00
Vicent Llopis 2b9c656d21 feat(invoiceOut): add refund option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-22 11:46:28 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Carlos Jimenez Ruiz 9d46b4c79c refactor(SuggestedTickets): added translations and descriptors
gitea/salix/pipeline/head This commit looks good Details
2022-04-22 11:26:16 +02:00
Alex Moreno a46b2113dc models
gitea/salix/pipeline/head This commit looks good Details
2022-04-22 07:39:47 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 14:59:41 +02:00
Vicent Llopis 4a6873a0fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:37 +02:00
Vicent Llopis 0ec51202e0 pull request changed
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:13 +02:00
Vicent Llopis 579ff3aa4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 07:13:34 +02:00
Vicent Llopis 5db20ee3e2 refactor: deleteOldFiles in claim
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:46:37 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:30:23 +02:00
Alex Moreno 62f7b80ed4 quit $
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:55:43 +02:00
Alex Moreno ea2e38af4e support front filter and front test for component
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 08:24:12 +02:00
Alex Moreno 433afb8fe8 change tooltip client descriptor btnFive
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-19 15:21:28 +02:00
Alex Moreno 69530d3019 fix filter
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 14:12:31 +02:00
Alex Moreno 7cecf1584b feat(ticket): change isAvailable to itemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 12:04:06 +02:00
Alex Moreno 8432815cb7 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 14:58:46 +02:00
Alex Moreno 04f993e227 fix
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 13:55:18 +02:00
Alex Moreno 3d7beba822 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-04-13 13:07:07 +02:00
Alex Moreno b7931278be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive 2022-04-13 13:03:07 +02:00
Joan Sanchez 91f111f609 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 11:33:49 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Joan Sanchez c2271b6071 Merge branch 'dev' into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:00:28 +00:00
Vicent Llopis 804f5f4b2f fix: delete vn-focus and duplicated pagination
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 10:37:52 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Alex Moreno f2ee987dec fix multi-check
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-13 08:15:47 +02:00
Alex Moreno 8e87ab62a8 feat(entry_latest-buys): add multi-check-dummy
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 14:40:25 +02:00
Alex Moreno 73ee790f8d removed isFarmer property 2022-04-12 14:27:06 +02:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Vicent Llopis c1edb8206e refactor
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:46:26 +02:00
Vicent Llopis 9a171d5202 refactor
gitea/salix/pipeline/head Build queued... Details
2022-04-12 12:45:07 +02:00
Vicent Llopis ad3b3c44d6 refactor: replace let for const
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:44:46 +02:00
Vicent Llopis 1e11191e79 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:32:48 +02:00
Vicent Llopis 5921891161 refactor: updated css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 12:20:36 +02:00
Vicent Llopis 4872407723 fix test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 11:57:56 +02:00
Vicent Llopis e1de41f801 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:36 +02:00
Vicent Llopis 313e911940 fix(claim_action): smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:00 +02:00
Alex Moreno ad149b3024 intro
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:58:37 +02:00
Alex Moreno 4a714a4b6f feat(client): add privileges to administrative role
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:56:03 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz 018047b6be Merge branch 'dev' into 3347-worker_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz b087d275dc Merge branch 'dev' into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:29:01 +00:00
Vicent Llopis 6e999302bf refactor: replace let for const
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:09:54 +02:00
Vicent Llopis fefff80af4 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:01:15 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis a348762153 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:09:05 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Vicent Llopis d8a1bd1b1c fix: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:23:54 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis ddd6d61d9e fix(claim_photos): consider other image types in html
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 07:58:23 +02:00
Vicent Llopis 5431dbdc3e refactor: resize vide0s
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 14:33:00 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Vicent Llopis 90b079a0ac refactor: description back routes
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:25:06 +02:00
Vicent Llopis ea4266ef8c feat: add deleteOldFiles
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:20:39 +02:00
Alex Moreno c7b8b61a08 feat(item): add model itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 10:34:36 +02:00
Vicent Llopis 5567e07773 feat(claim_photo): can upload videos
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 09:34:46 +02:00
Joan Sanchez b93f44b220 Merge branch 'dev' into 3756-client_address_isLogifloraAllowed
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:29:00 +00:00
Joan Sanchez d2ecbe898e Merge branch 'dev' into 3863-client_name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:03:23 +00:00
Alex Moreno 90a19d52fb use variable
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 09:02:27 +02:00
Alex Moreno 8c2bc76b88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3756-client_address_isLogifloraAllowed 2022-04-08 09:01:38 +02:00
Alex Moreno 238a9fd5da feat(client.defaulter&claim): change socialName to name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 08:52:21 +02:00
Joan Sanchez a11bcd3669 Merge branch 'dev' into 3832-client_balance_create
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:48:46 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:31:16 +00:00
Vicent Llopis 5ddce43dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo 2022-04-08 07:57:02 +02:00
Vicent Llopis df26a40e63 feat(claim_action): add smart-table and 'change destinantion' to all rows
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:37:17 +02:00
Alex Moreno 574729b7c5 test(client_unpaid): add front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 15:05:10 +02:00
Vicent Llopis 1915850a09 feat(claim_photo): added videos
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 14:12:56 +02:00
Joan Sanchez fa1fb37795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-04-07 12:24:41 +02:00
Alex Moreno c312eff12e fix(claim_search-panel): filter
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 12:09:11 +02:00
Alex Moreno b8a954caec feat(client): section unpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-07 11:41:35 +02:00