Commit Graph

242 Commits

Author SHA1 Message Date
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Alexandre Riera c4430b4bca fix acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:56:51 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:29:40 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +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
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
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
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
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +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
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
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +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
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
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
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 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 d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02: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
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
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
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
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
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
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
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
Alex Moreno d34a8629f7 fix(setSaleQuantity): save originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 13:09:37 +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
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:26:53 +02:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:43:53 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-15 15:24:45 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:16 +01:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Javi Gallego 4a7a4f6dcf test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-22 09:06:08 +02:00
Joan Sanchez 6210e60896 2669 - Changes to the translate values function
gitea/salix/pipeline/head This commit looks good Details
2021-03-19 19:20:19 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez 5bd7e4a67f Translation fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 08:05:57 +01:00
Javi Gallego 7bdfb36f25 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 14:30:46 +01:00
Javi Gallego 3dc50e8a16 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 13:39:40 +01:00
Javi Gallego 4cdbb85e30 primer comit
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:53:49 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 15:03:35 +01:00
Jorge Padawan 259842c22d Retirado el parametro required por no utilizarse
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 13:32:58 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Bernat Exposito 44d3cf748b change id in ticketLastState model
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:44:41 +01:00
Carlos Jimenez Ruiz 54d31f15bb fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good Details
2020-11-09 14:53:26 +01:00
Bernat Exposito Domenech 42d16d0258 ticket component refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 11:09:58 +01:00
Carlos Jimenez Ruiz c622175192 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 355f95ae40 2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 13:42:20 +02:00
Javi Gallego 8fb674819a ticket service
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:35:39 +02:00
Javi Gallego 1b13e58e10 item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:58:00 +02:00
Bernat Exposito Domenech d4b6d7cd96 cr changes 2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Bernat Exposito Domenech b972353bb4 create method getComponentSum 2020-07-21 11:11:09 +02:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00