 Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +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 |
|
Sergio De la torre
|
318f7e3c0d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:20:55 +01:00 |
 Javier Segarra
|
7a63e527a5
|
refs #5666 perf: remove comments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:50:52 +01:00 |
|
Javier Segarra
|
6f32a588bb
|
refs #5666 feat: add role relation to RoleMapping
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:49:10 +01:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
Javier Segarra
|
b4f4714c0a
|
refs #5666 feat: remove loggable.json
|
2023-12-05 07:47:38 +01:00 |
|
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
|
Javier Segarra
|
2fe631f078
|
refs #5666 feat: change models permissions
|
2023-12-05 07:15:22 +01:00 |
 Jorge Penadés
|
8cb97e2477
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 15:09:44 +01:00 |
|
Javier Segarra
|
a8b0a7a5b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 14:46:21 +01:00 |
|
Javier Segarra
|
5656ed7a2b
|
refs #6264 perf: use functions extracted previously
|
2023-12-04 14:46:05 +01:00 |
|
Javier Segarra
|
b9671c0b67
|
refs #6264 perf: remove files related to token
|
2023-12-04 14:44:50 +01:00 |
|
Carlos Satorres
|
62b2e23620
|
Merge branch 'dev' into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 09:01:45 +00:00 |
|
Carlos Satorres
|
051c93a42c
|
remove fdescribe
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 09:41:24 +01:00 |
|
Carlos Satorres
|
c0ce7e542f
|
refs #6085 solve testback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 09:40:57 +01:00 |
|
Javier Segarra
|
e3379b42a1
|
refs #5858 test: bad test calls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 14:06:28 +01:00 |
|
Carlos Satorres
|
6d486fbec9
|
refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:58:45 +01:00 |
|
Jorge Penadés
|
1dfdd94584
|
refs #6276 fix getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:56:43 +01:00 |
|
Jorge Penadés
|
4690dca4f9
|
refs #6276 getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:54:09 +01:00 |
 Pablo Natek
|
303b6f5240
|
fix(expencefk): refs #6398 expenceFk to expenseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 13:48:56 +01:00 |
|
Pablo Natek
|
bec1ff71ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
|
2023-12-01 13:43:27 +01:00 |
|
Jorge Penadés
|
660e77be55
|
refs #6276 updateFromSale refactored
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 12:48:21 +01:00 |
|
Jorge Penadés
|
7e57640758
|
refs #6276 itemShelving_updateFromSale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 11:43:07 +01:00 |
|
Jorge Penadés
|
d2769f4c21
|
refs #6276 return fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 11:38:30 +01:00 |
 Robert Ferrús
|
2a93dcf5b8
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 10:20:08 +00:00 |
|
Jorge Penadés
|
f2ab44bb8f
|
refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 10:14:32 +01:00 |
|
Jorge Penadés
|
30b63f577f
|
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-01 09:49:49 +01:00 |
|
Jorge Penadés
|
d5f09c2f75
|
refs #6276 saleTrackingDel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:44:49 +01:00 |
|
Javier Segarra
|
db06620d7c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:39:47 +01:00 |
|
Javier Segarra
|
60fbb1d56e
|
refs #5858 feat: update procedure zoneIncluded_getCollisions
|
2023-12-01 09:39:21 +01:00 |
|
Jorge Penadés
|
0b1bbbaaa6
|
Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1865
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-01 07:22:26 +00:00 |
|
Pablo Natek
|
758b468c68
|
Merge pull request 'test' (!1873) from test into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1873
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-12-01 06:11:22 +00:00 |
|
Jorge Penadés
|
3333c83702
|
refs #6276 WIP itemShelving_return
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 16:25:13 +01:00 |
|
Jorge Penadés
|
611b45bae0
|
Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 15:16:18 +00:00 |
 Alex Moreno
|
b2e7ea3089
|
refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 15:16:41 +01:00 |
|
Alex Moreno
|
e634a5e213
|
refs #5914 feat: create getTaxBases and use in negatives and positives procedures
|
2023-11-30 15:15:40 +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 |
|
Alex Moreno
|
6699f5d5a6
|
Merge pull request 'fix(getFiltered): refs #3271 fix to event filter' (!1872) from 3271-zoneGetFilterdFix into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1872
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-30 13:49:55 +00:00 |
|
Pablo Natek
|
72283005b8
|
remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:43:14 +01: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 |
|
Pablo Natek
|
c457b5c4d2
|
Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:39:26 +00:00 |
|
Jorge Penadés
|
40236fdb7b
|
refs #6276 itemShelvingMake_multi
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 13:23:10 +01:00 |
|
Alex Moreno
|
ee7dd66ce9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:49:42 +01:00 |
|
Alex Moreno
|
35e74a7635
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:48:27 +01:00 |
|
Alex Moreno
|
ab69dcd4fe
|
refs #6524 fix: fixtures and feat: new changelog format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:32:41 +01:00 |
|
Javier Segarra
|
b241efc961
|
Merge pull request 'refs #6434 feat: improve signIn method' (!1867) from 6434-signInLog_improve_test into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1867
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-30 11:20:57 +00:00 |
|
Alex Moreno
|
016e4ae37c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-11-30 12:20:50 +01:00 |
|
Javier Segarra
|
01e7135224
|
refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 12:20:05 +01:00 |
|
Javier Segarra
|
16001099b6
|
refs #5666 feat: update ACLs for role and vnRole
|
2023-11-30 12:15:48 +01:00 |