 Sergio De la torre
|
268c0a984c
|
feat isScanned refs #7276
|
2024-06-06 12:28:34 +02:00 |
 Javier Segarra
|
149aeac54e
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-04 09:26:15 +02:00 |
 Jorge Penadés
|
dc8696b422
|
feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 16:31:36 +02:00 |
|
Jorge Penadés
|
836cfcbd07
|
refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-31 13:58:26 +02:00 |
|
Jorge Penadés
|
a32db7840e
|
feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 16:54:24 +02:00 |
|
Jorge Penadés
|
fc606f7e36
|
fix: refs #6889 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 10:22:22 +02:00 |
|
Jorge Penadés
|
885aa5208a
|
feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-28 17:23:58 +02:00 |
|
Jorge Penadés
|
9ecba10446
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 13:57:35 +02:00 |
|
Javier Segarra
|
8366cfa348
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-24 11:12:52 +02:00 |
 Robert Ferrús
|
34f48e46e7
|
feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 13:19:01 +02:00 |
|
Jorge Penadés
|
40762ba4aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 12:34:37 +02:00 |
|
Robert Ferrús
|
996f14341d
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 10:31:13 +00:00 |
|
Robert Ferrús
|
62ca4885c4
|
feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 12:28:27 +02:00 |
 Carlos Satorres
|
6d66c0f71f
|
hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-20 11:14:30 +02:00 |
|
Jorge Penadés
|
1f1a49d0a5
|
refactor: refs #6889 use addSale
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:20:33 +02:00 |
|
Robert Ferrús
|
11a0b98495
|
feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-05-16 10:20:08 +02:00 |
|
Javier Segarra
|
befc128950
|
feat(salix): refs #6321 Sale_itemReplace
|
2024-05-15 08:36:13 +02:00 |
|
Jorge Penadés
|
74b04d98f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 16:38:56 +02:00 |
|
Javier Segarra
|
63d07cb082
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-02 12:47:59 +02:00 |
 Jon Elias
|
6706974784
|
fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 10:31:26 +02:00 |
|
Javier Segarra
|
68158f341d
|
feat(salix): refs #6321 #6331 publish negativeOrigin model
|
2024-04-22 14:09:27 +02:00 |
|
Javier Segarra
|
5a5032f6e6
|
Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets
|
2024-04-22 13:34:06 +02:00 |
|
Sergio De la torre
|
32e2827287
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:55:07 +02:00 |
|
Jorge Penadés
|
c161c122d0
|
feat: refs #6449 add column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 15:56:17 +02:00 |
|
Javier Segarra
|
2cff160c6a
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-28 23:50:51 +00:00 |
|
Javier Segarra
|
e6fe245b27
|
refs #6321 feat: new split method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-27 14:09:25 +01:00 |
|
Sergio De la torre
|
483345666e
|
refs #3520 feat:back WarehouseFk
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-27 11:01:32 +01:00 |
|
Javier Segarra
|
d8d0ced918
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-03-27 09:54:02 +01:00 |
|
Sergio De la torre
|
b805a5de0a
|
refs #3520 feat:uncheckedTicket
|
2024-03-26 12:40:44 +01:00 |
|
Sergio De la torre
|
dc5f588c8e
|
refs #3520 feat: backWarehouse in Salix
|
2024-03-26 10:13:57 +01:00 |
|
Javier Segarra
|
a943e39ba7
|
refs #6321 feat: negativeOrigin
|
2024-03-22 22:44:37 +01:00 |
|
Jorge Penadés
|
e8d1967e11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 15:14:12 +01:00 |
 Pablo Natek
|
f7b458d368
|
feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-20 20:54:24 +01:00 |
|
Jorge Penadés
|
f044809f30
|
feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 15:45:47 +01:00 |
|
Javier Segarra
|
44c4e6a16e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-15 09:47:10 +01:00 |
|
Javier Segarra
|
f83f7808c8
|
refs #6321 feat: negativeOrigin method
|
2024-03-15 09:32:36 +01:00 |
|
Carlos Satorres
|
33bd21d40b
|
refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-13 16:29:05 +01:00 |
|
Carlos Satorres
|
64d82d92d6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
|
2024-03-07 09:28:32 +01:00 |
|
Javier Segarra
|
7c8fa52da0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
|
2024-03-06 14:30:02 +01:00 |
|
Carlos Satorres
|
1b3a8ddbdd
|
refs #6755 fix restore
|
2024-03-06 12:03:35 +01:00 |
|
Carlos Satorres
|
893320b114
|
refs #6755 model ticketlog, restore
|
2024-03-04 15:00:43 +01:00 |
|
Jorge Penadés
|
70c400c5f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-23 12:51:22 +01:00 |
 Ivan Mas
|
03fc7cfb4e
|
Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-23 08:24:12 +00:00 |
|
Ivan Mas
|
a0cb32ea10
|
refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-22 14:01:19 +01:00 |
|
Ivan Mas
|
f592045925
|
refs #6784 Delete clientType.id and modify relationships in json and js
|
2024-02-21 11:49:27 +01:00 |
|
Ivan Mas
|
3813dbb9fd
|
refs #6784 Delete clientTypeFk
|
2024-02-20 13:10:03 +01:00 |
|
Jorge Penadés
|
072280cc9c
|
fix: refs #6776 method names
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-20 08:48:47 +01:00 |
|
Jorge Penadés
|
e9f7fbed86
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-19 14:46:56 +01:00 |
|
Sergio De la torre
|
5b541aa804
|
refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-19 09:13:03 +01:00 |
|
Sergio De la torre
|
15de4f0b73
|
refs #6531 feat:showLastTickets
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-16 15:56:40 +01:00 |
|
Jorge Penadés
|
63c615655b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-16 08:34:05 +01:00 |
|
Jorge Penadés
|
2fb68e81c9
|
fix: refs #6276 rollback sale
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-15 15:17:39 +01:00 |
|
Jorge Penadés
|
2940c68516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-08 08:36:05 +01:00 |
 Guillermo Bonet
|
d6ae1fd1f8
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-06 06:39:51 +01:00 |
|
Jorge Penadés
|
9f194f4f63
|
fix: refs #6276 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-02 10:28:13 +01:00 |
|
Jorge Penadés
|
21cf05ddd0
|
fix: refs #6276 fix tests & errors
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-02-02 09:23:29 +01:00 |
|
Jorge Penadés
|
ec7a88c6dd
|
fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-01 12:56:11 +01:00 |
|
Jorge Penadés
|
8f5a5d9cba
|
fix: refs #6703 tests & backs
|
2024-01-31 13:11:15 +01:00 |
|
Jorge Penadés
|
d43976192a
|
fix: refs #6703 fix conflicts
|
2024-01-31 09:16:26 +01:00 |
|
Jorge Penadés
|
2a6abffef9
|
fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 16:07:33 +01:00 |
|
Jorge Penadés
|
e17fc91415
|
fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 14:58:11 +01:00 |
|
Jorge Penadés
|
88dfdb157f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 11:25:17 +01:00 |
|
Guillermo Bonet
|
13b8964e3d
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 07:27:34 +00:00 |
|
Javier Segarra
|
bc09ad7da7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
|
2024-01-29 11:07:31 +01:00 |
|
Javier Segarra
|
1a21dda00b
|
refs #6321 feat itemLackDetail
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-01-29 09:55:44 +01:00 |
|
Guillermo Bonet
|
49a08a96da
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 11:56:43 +00:00 |
|
Javier Segarra
|
f1cbb6aab3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
|
2024-01-26 08:48:05 +01:00 |
|
Jorge Penadés
|
e5d466b697
|
fix: refs #6703 drop & replace sale refund by clone
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 08:30:43 +01:00 |
|
Jorge Penadés
|
01340408c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-25 08:14:02 +01:00 |
|
Jorge Penadés
|
89d18e29f0
|
feat: refs #6276 test saleTrackingReplace (updateTracking)
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 07:49:21 +01:00 |
|
Javier Segarra
|
91f5ee3b93
|
refs #6321 feat: new remoteMethod
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-20 12:29:41 +01:00 |
|
Guillermo Bonet
|
f1b84ee7a0
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:44:00 +01:00 |
|
Javier Segarra
|
21ce57d217
|
refs #6174 feat: update back to separate invoice and pdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:31:07 +01:00 |
|
Carlos Satorres
|
b3e1c58918
|
refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 14:50:08 +01:00 |
|
Jorge Penadés
|
ddcecb8f22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-11 16:52:54 +01:00 |
 Javi Gallego
|
c98baf21bf
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 12:17:59 +00:00 |
|
Jorge Penadés
|
c61f5a67b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-11 09:28:24 +01:00 |
|
Guillermo Bonet
|
81ffc122fc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 14:09:47 +01:00 |
|
Javi Gallego
|
406cf7335b
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-05 07:12:12 +00:00 |
|
Jorge Penadés
|
8a5da43503
|
refactor: sectorCollection_getSale refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 16:00:25 +01:00 |
|
Jorge Penadés
|
7a64b57a2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:07:33 +01:00 |
|
Javi Gallego
|
767c6a6ac8
|
test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 15:01:56 +01:00 |
|
Jorge Penadés
|
6d0e1cc47c
|
refactor: fix conficts refs #6276
|
2024-01-04 08:51:18 +01:00 |
|
Javier Segarra
|
4d7f0329ee
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 12:46:26 +00:00 |
 David Domenech
|
3c1237f727
|
refs #6456
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:37:18 +01:00 |
|
Guillermo Bonet
|
f73a447391
|
refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 11:57:49 +01:00 |
|
Jorge Penadés
|
767894b128
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-02 09:41:47 +01:00 |
|
Javier Segarra
|
6b37f23349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 13:06:52 +01:00 |
|
David Domenech
|
d60f2a7f88
|
fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 09:43:09 +01:00 |
|
Jorge Penadés
|
1f2d475f05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 08:41:45 +01:00 |
|
Sergio De la torre
|
af83519ee6
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:12:39 +00:00 |
|
Jorge Penadés
|
36a9b0eee4
|
refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 16:00:07 +01:00 |
|
Jorge Penadés
|
3109f7722e
|
refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:24:18 +01:00 |
|
Jorge Penadés
|
8acd03f115
|
refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 13:01:34 +01:00 |
|
Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
David Domenech
|
eb0766bafd
|
Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 14:08:47 +00:00 |
|
David Domenech
|
8ab981907d
|
refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:25:00 +01:00 |
|
Jorge Penadés
|
133fe1065a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:44:09 +01:00 |
|
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00:00 |