 Sergio De la torre
|
11e13fdb20
|
feat: refs #7922 refs #792 scanOrder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 06:40:06 +02:00 |
 Carlos Andrés
|
1bf900f81b
|
feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-24 12:33:47 +02:00 |
 Guillermo Bonet
|
8569bec34a
|
feat: refs #7266 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-24 12:18:09 +02:00 |
|
Guillermo Bonet
|
4d96b1df68
|
Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-24 07:31:30 +02:00 |
|
Guillermo Bonet
|
4c529da620
|
feat: refs #7266 Requested changes and query optimization
|
2024-10-24 07:31:26 +02:00 |
|
Guillermo Bonet
|
4c9682e107
|
Merge branch 'dev' into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-24 05:16:16 +00:00 |
|
Sergio De la torre
|
5a8f43d0ea
|
Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-23 12:14:36 +00:00 |
|
Guillermo Bonet
|
db4b540958
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-23 12:44:55 +02:00 |
|
Guillermo Bonet
|
fc56dbc5fb
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-23 12:44:35 +02:00 |
|
Guillermo Bonet
|
9eaa5a7585
|
Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 10:38:00 +00:00 |
|
Sergio De la torre
|
3da08e3a23
|
feat: refs #8020 machineWorkerDeprecated
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-23 11:33:45 +02:00 |
|
Guillermo Bonet
|
3cde6b6bc6
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 08:30:21 +02:00 |
|
Guillermo Bonet
|
31c89538bc
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 08:27:07 +02:00 |
|
Guillermo Bonet
|
37050361c2
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 08:26:36 +02:00 |
|
Guillermo Bonet
|
baec188ff5
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 08:23:28 +02:00 |
 Javi Gallego
|
2f5f4ecc7c
|
Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-23 05:53:03 +00:00 |
|
Guillermo Bonet
|
fe3e7342bc
|
fix: refs #7935 version
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-23 07:14:07 +02:00 |
 Alex Moreno
|
f47043cae4
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 15:07:24 +02:00 |
|
Guillermo Bonet
|
6227ef0821
|
Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-22 15:00:17 +02:00 |
|
Guillermo Bonet
|
1afb33c306
|
feat: refs #8119 Requested changes
|
2024-10-22 15:00:16 +02:00 |
|
Guillermo Bonet
|
c3f8da52c6
|
feat: refs #7266 Item label barcode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 13:43:54 +02:00 |
 Jorge Penadés
|
e2b57d695e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-22 12:25:43 +02:00 |
|
Jorge Penadés
|
ee0c0996f6
|
feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-22 12:16:26 +02:00 |
|
Guillermo Bonet
|
0af58b20be
|
feat: refs #7266 Item label QR finished
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 12:02:04 +02:00 |
|
Sergio De la torre
|
29745d0af4
|
Merge pull request 'fix: refs #6861 fixTransactionCommit' (!3139) from 6861-Reservas into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3139
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-10-22 08:13:00 +00:00 |
|
Sergio De la torre
|
6ef7760498
|
fix: refs #6861 fixTransactionCommit
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-22 10:06:59 +02:00 |
|
Guillermo Bonet
|
b4d2c69b37
|
Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-22 06:42:02 +00:00 |
|
Guillermo Bonet
|
5162c2037b
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-22 08:41:46 +02:00 |
|
Guillermo Bonet
|
bf2d7541a5
|
feat: refs #7266 Item label QR
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 14:57:55 +02:00 |
|
Jorge Penadés
|
1efe258ea0
|
fix: refs #7524 filter by department
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-21 14:30:45 +02:00 |
|
Javi Gallego
|
2b05e8c48e
|
feat: refs #7943 quitar lectura en metodos comunes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 13:29:33 +02:00 |
 Pablo Natek
|
e479873547
|
fix: restore cursor
|
2024-10-21 12:19:20 +02:00 |
|
Pablo Natek
|
e38c061deb
|
fix: add date format on insert data
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-21 11:36:44 +02:00 |
|
Guillermo Bonet
|
5d55fb287d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued...
Details
|
2024-10-21 09:25:39 +02:00 |
|
Guillermo Bonet
|
dead904c19
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-21 09:25:29 +02:00 |
|
Guillermo Bonet
|
bbc17d1ff8
|
fix: refs #230926 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-21 08:33:16 +02:00 |
|
Javi Gallego
|
be9f711cc1
|
Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3110
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-21 06:31:17 +00:00 |
|
Javi Gallego
|
da772cf504
|
Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-21 06:29:17 +00:00 |
|
Guillermo Bonet
|
939f083671
|
Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3122
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-10-18 08:27:08 +00:00 |
 Carlos Satorres
|
50a2f6081e
|
Merge branch 'dev' into 7986-workerMoto
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 07:20:06 +00:00 |
 Robert Ferrús
|
7e0f19b368
|
feat: refs #8127 entry_getCommission
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-18 08:21:09 +02:00 |
 Ivan Mas
|
f4b041c9b1
|
Merge branch 'dev' into 7865-deleteClientGestdocFkTPV
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 06:20:38 +00:00 |
|
Guillermo Bonet
|
7e604f1a19
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-18 07:44:28 +02:00 |
|
Guillermo Bonet
|
4bd28c62b9
|
feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-18 07:35:36 +02:00 |
|
Guillermo Bonet
|
865da7bba2
|
refactor: refs #8106 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 07:15:26 +02:00 |
|
Alex Moreno
|
d93653372a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-18 07:12:18 +02:00 |
|
Alex Moreno
|
08e22db950
|
Merge pull request 'master' (!3125) from master into test
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3125
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-18 05:09:32 +00:00 |
|
Robert Ferrús
|
ddf7215084
|
Merge branch 'master' into 8108-itemTags
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-18 04:57:37 +00:00 |
|
Sergio De la torre
|
8df09bc64a
|
Merge branch 'master' into 6861-ReserveSaleTracking
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-17 15:23:05 +00:00 |
|
Sergio De la torre
|
3463036086
|
fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 17:20:21 +02:00 |
|
Ivan Mas
|
7dc35458e8
|
refactor: refs #7865 delete client.gestdocFk from TPV
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-17 17:05:08 +02:00 |
|
Sergio De la torre
|
63c0ec308f
|
fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-17 17:01:44 +02:00 |
|
Guillermo Bonet
|
28e957fecd
|
refactor: refs #8106 refs #1406 Optimized ticket_getTax
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-17 14:46:19 +02:00 |
|
Sergio De la torre
|
cb53962405
|
fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 13:58:21 +02:00 |
|
Robert Ferrús
|
0e2dcbce0c
|
Merge branch 'master' into 8108-itemTags
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-17 11:31:52 +00:00 |
|
Robert Ferrús
|
faecbbb373
|
feat: refs #8108 saltos de linea
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 13:08:58 +02:00 |
|
Sergio De la torre
|
989b68c33a
|
fix: refs #6861 setQuantity
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-17 12:44:05 +02:00 |
|
Guillermo Bonet
|
2bd98b7fb6
|
feat: refs #8119 Minor change
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:29:35 +02:00 |
|
Guillermo Bonet
|
8ca69d3574
|
feat: refs #8119 Minor change
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:21:39 +02:00 |
|
Guillermo Bonet
|
41d078aaf1
|
feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:16:26 +02:00 |
|
Guillermo Bonet
|
3628abd5bf
|
feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:15:45 +02:00 |
|
Guillermo Bonet
|
410c6f2d83
|
Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:09:58 +02:00 |
|
Guillermo Bonet
|
ec13c41be3
|
feat: refs #8119 itemCampaignQuantity
|
2024-10-17 10:09:57 +02:00 |
|
Guillermo Bonet
|
a8525c5ba8
|
Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 08:08:48 +00:00 |
|
Guillermo Bonet
|
999cb2dbb4
|
feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-17 10:08:27 +02:00 |
|
Carlos Satorres
|
37d3ef5f16
|
Merge branch 'dev' into 7986-workerMoto
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 12:10:13 +00:00 |
|
Javi Gallego
|
f78aad0874
|
Merge branch 'dev' into 7744-closeAllTest
|
2024-10-16 09:09:41 +02:00 |
|
Alex Moreno
|
ccaec1a2cf
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth
|
2024-10-16 08:41:50 +02:00 |
|
Javi Gallego
|
c6e764b478
|
feat: refs #7348 hasDailyInvoice from client
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 08:32:10 +02:00 |
|
Sergio De la torre
|
a989bef78c
|
Merge pull request 'master' (!3108) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #3108
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
|
2024-10-16 06:16:36 +00:00 |
|
Sergio De la torre
|
12abca0a2d
|
fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-15 18:12:07 +02:00 |
|
Sergio De la torre
|
2adc424ccb
|
fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-15 17:07:35 +02:00 |
|
Sergio De la torre
|
b592ccc162
|
fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-15 17:01:09 +02:00 |
|
Javi Gallego
|
4a88ba5078
|
feat: refs #7744 closeAll Test
|
2024-10-15 15:43:12 +02:00 |
|
Guillermo Bonet
|
5a2058865d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-15 14:02:39 +02:00 |
|
Ivan Mas
|
536c2fa5b5
|
feat: refs #7994 update sale.originalQuantity
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-15 13:54:02 +02:00 |
|
Robert Ferrús
|
8da005f08a
|
feat: refs #8108 refs #9108
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-15 11:19:08 +02:00 |
|
Robert Ferrús
|
da55fffef0
|
feat: refs #8108 addMoreTablesTag
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-15 11:18:04 +02:00 |
|
Carlos Satorres
|
c73fd51a9c
|
fix: refs #7986 add acl
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-15 09:45:14 +02:00 |
|
Alex Moreno
|
6eab66340f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-15 09:21:31 +02:00 |
|
Alex Moreno
|
cf78a12f3a
|
fix(sql): addClientObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-15 09:18:20 +02:00 |
|
Alex Moreno
|
8ff06d63c5
|
fix(sql): addClientObservationType
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-15 09:16:07 +02:00 |
|
Alex Moreno
|
a2b9a59eb5
|
fix(sql): addClientObservationType
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-15 08:58:57 +02:00 |
|
Robert Ferrús
|
52e573501a
|
feat: refs #8108 create tables itemTag
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-15 08:46:43 +02:00 |
|
Javi Gallego
|
5e2edad6de
|
Merge branch 'dev' into 8098-closureTransation
|
2024-10-15 08:21:40 +02:00 |
|
Alex Moreno
|
63f062a069
|
fix(renewToken): refs #8093 test & fix(sql) addClientObservationType
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-15 08:19:35 +02:00 |
|
Javi Gallego
|
f2d1aa5f16
|
feat: refs #8098 closureDaysAgo
|
2024-10-15 08:17:03 +02:00 |
|
Alex Moreno
|
5b938a6f78
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-15 08:00:39 +02:00 |
|
Alex Moreno
|
3c881d5e48
|
refactor(docuware): refs #8066 use Authorization
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-15 08:00:19 +02:00 |
|
Sergio De la torre
|
f27566ac0f
|
Merge pull request 'master' (!3098) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Reviewed-on: #3098
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
|
2024-10-15 05:18:30 +00:00 |
|
Sergio De la torre
|
13c7b34c98
|
Merge branch 'master' into 6861-ItemShelvingSaleReserve
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-14 14:15:51 +00:00 |
|
Jorge Penadés
|
0549e22720
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 15:38:30 +02:00 |
|
Alex Moreno
|
e0b252e6bb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-14 14:12:16 +02:00 |
|
Alex Moreno
|
0063591089
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-14 14:11:57 +02:00 |
|
Carlos Satorres
|
68469e2ba8
|
Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-14 13:52:08 +02:00 |
|
Sergio De la torre
|
06b7d56837
|
fix: refs #6861 assignCollection&isOnReservationMode
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-14 13:01:30 +02:00 |
|
Alex Moreno
|
394cf0d18b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-14 12:31:20 +02:00 |
|
Guillermo Bonet
|
6c62172633
|
feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 09:31:35 +02:00 |
|
Guillermo Bonet
|
78a9b788bf
|
feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 08:42:54 +02:00 |
|
Jorge Penadés
|
b39a749bee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 08:37:58 +02:00 |
|
Alex Moreno
|
d8e0c1debe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-14 07:27:19 +02:00 |
|
Jorge Penadés
|
295c31a5f0
|
feat: refs #7874 add finance obs type
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-10 11:01:25 +02:00 |
|
Jorge Penadés
|
2b17e6da4c
|
Merge branch 'dev' into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-10 08:16:29 +00:00 |
|
Jorge Penadés
|
f5a43962fd
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-10 07:18:06 +00:00 |
 Pako Natek
|
3347cde109
|
Merge branch 'master' into 8075-master-itemShelvingMoving
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-10 06:33:13 +00:00 |
|
Pako Natek
|
208869bd30
|
fix: refs #8069 removed obsolete variables
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-10 08:20:41 +02:00 |
|
Pako Natek
|
4eab12dd04
|
fix: refs #8069 throw message in spanish
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-09 07:41:43 +02:00 |
|
Pako Natek
|
679773b33e
|
feat: refs #8075 itemShelvingMoving
|
2024-10-09 07:26:22 +02:00 |
|
Pako Natek
|
5eda0af20f
|
feat: refs #8075 itemShelvingMoving
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-09 07:24:34 +02:00 |
|
Pako Natek
|
f0ac12d52e
|
Merge branch 'master' into 8069-hotFix-oversTocking
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-09 05:21:02 +00:00 |
|
Carlos Satorres
|
39e808bca7
|
fix: refs #7986 fix model
|
2024-10-08 16:06:38 +02:00 |
|
Alex Moreno
|
02adc6473a
|
fix: duplicate variable
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-08 12:22:47 +02:00 |
|
Alex Moreno
|
5cdb0b7eb6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-10-08 12:19:10 +02:00 |
|
Alex Moreno
|
f8a3527680
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-08 12:17:02 +02:00 |
|
Alex Moreno
|
9695fea48f
|
feat(Docuware): refs #8066 add username and password
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-08 12:05:19 +02:00 |
|
Carlos Satorres
|
b4dc5276dd
|
fix: refs #7986 create fk
|
2024-10-08 08:36:17 +02:00 |
|
Guillermo Bonet
|
023842ac33
|
feat: refs #7994 comment changes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-08 08:33:04 +02:00 |
|
Sergio De la torre
|
4894cb140e
|
Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-10-08 05:41:54 +00:00 |
|
Pako Natek
|
ff43533b5a
|
Merge branch 'dev' into 8075-itemShelvingMoving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-08 05:33:14 +00:00 |
|
Jorge Penadés
|
330c1f3de6
|
chore: refs #7207 drop transaction
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 17:50:36 +02:00 |
|
Jorge Penadés
|
ebe763dc9b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-07 17:45:07 +02:00 |
|
Ivan Mas
|
0358157b2c
|
Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 14:48:20 +00:00 |
|
Jorge Penadés
|
3755c5a15b
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-07 14:27:09 +00:00 |
|
Sergio De la torre
|
d164cccee5
|
fix: refs #6861 assignCollection
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-07 16:14:16 +02:00 |
|
Pako Natek
|
20836d734c
|
fix: refs #8069 order_confirmWithUser
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-10-07 14:25:46 +02:00 |
|
Pako Natek
|
33a4061058
|
feat: refs #8069 8069-overStocking
|
2024-10-07 14:24:55 +02:00 |
|
Pako Natek
|
22719820fd
|
feat: refs #8069 overStocking protocol
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-07 14:21:18 +02:00 |
|
Pako Natek
|
e105fba227
|
feat: refs #8075 itemShelving
new field movingState
|
2024-10-07 13:46:56 +02:00 |
|
Pako Natek
|
de769efc0f
|
feat: refs #8075 autoupdating
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 09:05:03 +02:00 |
|
Pako Natek
|
3cc31b7779
|
Merge branch 'dev' into 8075-itemShelvingMoving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 06:41:45 +00:00 |
|
Pako Natek
|
542d0dcbd2
|
feat(itemShelving): refs #8075 new field
isMoving indicates the record must be transferred to another sector
Refs: #8075
|
2024-10-07 08:41:07 +02:00 |
|
Jorge Penadés
|
4fb0936399
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 06:39:11 +00:00 |
|
Jorge Penadés
|
53f590af61
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-07 06:31:14 +00:00 |
|
Guillermo Bonet
|
701b8d3c14
|
Merge pull request 'refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale' (!3057) from 6824-itemShelvingSaleNoDelete into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3057
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-07 05:50:48 +00:00 |
|
Guillermo Bonet
|
d6e2200227
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-07 07:48:23 +02:00 |
|
Guillermo Bonet
|
eb5da0f9cc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-07 07:39:23 +02:00 |
|
Guillermo Bonet
|
4da63900a2
|
fix: refs #7760 collection_assing added global handler sqlexception
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-07 07:36:50 +02:00 |
|
Guillermo Bonet
|
7b4d15cb23
|
refactor: refs #6824 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 07:30:36 +02:00 |
|
Guillermo Bonet
|
6b7f161d9a
|
fix: refs #7844 sale_problems llena
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-07 06:39:41 +02:00 |
|
Guillermo Bonet
|
9a327a1c39
|
Merge branch 'dev' into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-06 08:21:07 +00:00 |
|
Guillermo Bonet
|
ba9d0743b5
|
refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-06 10:20:34 +02:00 |
|
Guillermo Bonet
|
12bf7f07c5
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-06 09:13:07 +02:00 |
|
Guillermo Bonet
|
4a17d9ec0e
|
fix: refs #7760 collection_assing
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-06 09:07:48 +02:00 |
|
Jorge Penadés
|
e0d0b66963
|
feat: refs #7207 add transaction
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-04 16:48:38 +02:00 |
|
Pako Natek
|
6766cebd2a
|
fix: refs #8069 call moved upper than transaction start
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 13:56:54 +02:00 |
|
Jorge Penadés
|
3d831e290b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 13:46:41 +02:00 |
|
Jorge Penadés
|
e1133bcc07
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 11:45:21 +00:00 |
|
Jorge Penadés
|
c799a9d894
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 11:32:30 +00:00 |
|
Carlos Andrés
|
5d7d9f8d9e
|
fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 13:07:54 +02:00 |
|
Pako Natek
|
e4d386c65f
|
Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 09:47:49 +00:00 |
|
Sergio De la torre
|
324875ec1f
|
fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 10:42:33 +02:00 |
|
Jorge Penadés
|
c4faac7446
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 07:47:38 +00:00 |
|
Jorge Penadés
|
70a2189e30
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 07:46:18 +00:00 |
|
Guillermo Bonet
|
0b1756ff3a
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-04 09:13:53 +02:00 |
|
Guillermo Bonet
|
7aa8200fca
|
fix: refs #7956 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 09:02:59 +02:00 |
|
Pako Natek
|
a6cc7cd2a5
|
Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 06:35:18 +00:00 |
|
Pablo Natek
|
c203d5d5e7
|
Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 05:52:45 +00:00 |
|
Pablo Natek
|
72bab95be1
|
fix: refs #7781 leave early before any updates on the proc
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 07:52:13 +02:00 |
|
Pablo Natek
|
f019214002
|
Merge branch 'dev' into 7404-roundDetailVolume
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 05:22:07 +00:00 |
|
Carlos Andrés
|
c683925403
|
Actualizar db/routines/vn/procedures/item_getSimilar.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-03 15:19:57 +00:00 |
|
Carlos Andrés
|
197517dfcc
|
fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-10-03 17:02:40 +02:00 |
|
Jorge Penadés
|
3638e9abb6
|
refactor: refs #7207 simplify code
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 16:50:31 +02:00 |
|
Jorge Penadés
|
23d2d2b1ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 15:39:37 +02:00 |
|
Jorge Penadés
|
3f1de126c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 15:13:49 +02:00 |
|
Pablo Natek
|
46e2ffd6c2
|
fix: refs #7404 add fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 14:39:58 +02:00 |
|
Guillermo Bonet
|
9499819eec
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-03 12:43:21 +02:00 |
|
Guillermo Bonet
|
f1bc959a49
|
fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-03 12:40:52 +02:00 |
|
Sergio De la torre
|
32415d3616
|
fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master Build started...
Details
|
2024-10-03 11:56:36 +02:00 |
|
Sergio De la torre
|
82f8e84288
|
fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 11:42:21 +02:00 |
|
Pako Natek
|
57cd6cc882
|
Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 08:47:38 +00:00 |
|
Jorge Penadés
|
1930bc450f
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 07:59:06 +00:00 |
|
Robert Ferrús
|
7a6f1eae94
|
Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 07:58:14 +00:00 |
|
Jorge Penadés
|
530617ce6c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 09:57:53 +02:00 |
|
Alex Moreno
|
cb69ed8a7b
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-03 09:56:53 +02:00 |
|
Guillermo Bonet
|
0c4637030c
|
Merge pull request 'refactor: refs #7886 Deleted proc buy_getVolumeByAgency' (!2965) from 7886-buy_getVolumeByAgency into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2965
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-10-03 07:51:06 +00:00 |
|
Alex Moreno
|
34c4715f6e
|
build: refs #8062 dump db and import ticketCanAdvanceConfig
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 09:49:16 +02:00 |
|
Guillermo Bonet
|
a994f0c1c1
|
Merge pull request 'refactor: refs #7980 Deleted table buyMark' (!3052) from 7980-byeBuyMark into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3052
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-10-03 07:49:07 +00:00 |
|
Robert Ferrús
|
d1c08e68d3
|
Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 07:37:16 +00:00 |
|
Jorge Penadés
|
546bb85484
|
Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 09:27:51 +02:00 |
|
Jorge Penadés
|
0311069f00
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 07:16:55 +00:00 |
|
Pako Natek
|
1b254b138e
|
Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 06:40:03 +00:00 |
|
Pako Natek
|
b34727a436
|
fix: refs #8069 wrong field name
|
2024-10-03 08:39:30 +02:00 |
|
Alex Moreno
|
e870d16cb9
|
build: refs #8062 dump db
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-03 07:54:16 +02:00 |
|
Javi Gallego
|
91d9a6e417
|
Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3060
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-03 05:45:09 +00:00 |
|
Javi Gallego
|
5f695f63b3
|
Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2882
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-03 05:34:44 +00:00 |
|
Javi Gallego
|
ee52c8b45f
|
fix: refs #7346 findByid con fields
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 15:34:53 +02:00 |
|
Javi Gallego
|
43df98598c
|
feat: refs #7346 manual invoice with address
|
2024-10-02 15:27:09 +02:00 |
|
Pako Natek
|
abb39ec0e7
|
Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 12:32:45 +00:00 |
|
Pako Natek
|
fc1ea280fa
|
fix: refs #8069 new conception
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 14:03:57 +02:00 |
|
Robert Ferrús
|
06296e7bd5
|
feat: refs #8071 travel_weeklyClone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 13:39:10 +02:00 |
|
Guillermo Bonet
|
a49d6aaf12
|
Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-02 11:32:23 +02:00 |
|
Guillermo Bonet
|
2655e20ef6
|
refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale
|
2024-10-02 11:32:20 +02:00 |
|
Guillermo Bonet
|
c4c08934a7
|
Merge branch 'dev' into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-02 09:27:57 +00:00 |
|
Guillermo Bonet
|
62bd2ae03b
|
refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-02 11:27:09 +02:00 |
|
Robert Ferrús
|
47ed9a8f4e
|
Merge pull request 'test' (!3056) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3056
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-10-02 09:22:26 +00:00 |
|
Robert Ferrús
|
e51dd897c3
|
Merge pull request 'master' (!3055) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
Reviewed-on: #3055
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-10-02 09:13:09 +00:00 |
|
Robert Ferrús
|
79adce30b6
|
Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-02 09:12:08 +00:00 |
|
Sergio De la torre
|
bbcf71619c
|
fix: refs #6861 duplicatedTicketsInReserve
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-02 09:56:36 +02:00 |
|
Guillermo Bonet
|
724ddd5fe8
|
refactor: refs #7980 Deleted table buyMark
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 09:26:23 +02:00 |
|
Guillermo Bonet
|
26a9e8ca50
|
Merge branch '7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado' of https://gitea.verdnatura.es/verdnatura/salix into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 09:09:05 +02:00 |