5561-ticket.sale-tracking_cambiandoCrudModel #1614

Merged
vicent merged 21 commits from 5561-ticket.sale-tracking_cambiandoCrudModel into dev 2023-08-22 10:42:43 +00:00
Contributor
No description provided.
vicent added the
Missing tests
label 2023-06-14 08:34:56 +00:00
vicent added 11 commits 2023-06-14 08:34:56 +00:00
gitea/salix/pipeline/head This commit looks good Details
0d85069e0f
refs #5561 feat: permite colorear
gitea/salix/pipeline/head There was a failure building this commit Details
d727ea83ab
refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head This commit looks good Details
cf2bf0a17b
refs #5561 delete: codigo obsoleto
gitea/salix/pipeline/head This commit looks good Details
02d2afcb8b
refs #5561 feat: permite coloear todos los circulos
gitea/salix/pipeline/head This commit looks good Details
ba64dbbe46
refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good Details
67413360c6
refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good Details
5eac9d20dc
a
gitea/salix/pipeline/head This commit looks good Details
024cb1e3f4
refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good Details
391dba6d2c
refs #5561 feat: add async functions
jgallego requested review from juan 2023-06-14 08:56:59 +00:00
jgallego changed title from 5561-ticket.sale-tracking_cambiandoCrudModel to WIP: 5561-ticket.sale-tracking_cambiandoCrudModel 2023-06-14 08:57:01 +00:00
jgallego changed title from WIP: 5561-ticket.sale-tracking_cambiandoCrudModel to 5561-ticket.sale-tracking_cambiandoCrudModel 2023-06-14 08:57:07 +00:00
jgallego requested review from jgallego 2023-06-14 08:57:14 +00:00
juan approved these changes 2023-07-14 10:52:36 +00:00
Dismissed
vicent added 632 commits 2023-07-14 11:05:34 +00:00
gitea/salix/pipeline/head This commit looks good Details
759a140e61
feat(print): create entry-update-comission template
refs #4586
gitea/salix/pipeline/head This commit looks good Details
31d23f7dd1
feat(print): create entry-update-comission template
refs #5112
gitea/salix/pipeline/head This commit looks good Details
0d6b248f76
feat(2fa): email 2fa
Refs #5475
gitea/salix/pipeline/head There was a failure building this commit Details
902709d61b
Added authCode table
gitea/salix/pipeline/head There was a failure building this commit Details
2e0325e567
Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
b9e48f2102
Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details
b0f1bae33e
Added unit test
gitea/salix/pipeline/head There was a failure building this commit Details
4807fcb394
Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
b5f2cf3711
Added unit test & translation fixes
gitea/salix/pipeline/head There was a failure building this commit Details
9aaea7e8ed
Changed to new SQL version
gitea/salix/pipeline/head There was a failure building this commit Details
ef87dcc0f5
require authentication on every login
gitea/salix/pipeline/head This commit looks good Details
c3443ecc7c
Updated e2e
gitea/salix/pipeline/head This commit looks good Details
61d41fb687
refs #5507
gitea/salix/pipeline/head This commit looks good Details
d6ff61b768
refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head There was a failure building this commit Details
74d543884e
refs #5468 añadido scope al modelo VnUser
gitea/salix/pipeline/head This commit looks good Details
37a7d02006
quitado scope
gitea/salix/pipeline/head This commit looks good Details
8a9e4ccefb
refs #5468 fix e2e
gitea/salix/pipeline/head This commit looks good Details
c1ea1acc8c
refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
87ffd2668e
refs #5468 scope para VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
42fc0b62d8
refs #5472 feat(user): add passExpired
gitea/salix/pipeline/head This commit looks good Details
79e7e7c604
refs #5472 feat: add change-password section
gitea/salix/pipeline/head There was a failure building this commit Details
ad3c6dcee2
wip #5595
gitea/salix/pipeline/head This commit looks good Details
5eca583c62
refs #5472 feat(vnUser): override setPassword
gitea/salix/pipeline/head This commit looks good Details
b3100d2653
refs #5595 remove OkPackets from logIn and logOut
gitea/salix/pipeline/head This commit looks good Details
8ae5a0de0f
refs #5513 adding backs and models
gitea/salix/pipeline/head This commit looks good Details
5cdec35ed4
refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head There was a failure building this commit Details
2da4289695
refs #5472 feat(vn-user): override change-password & set-password
gitea/salix/pipeline/head There was a failure building this commit Details
728ef965c4
refs #5472 feat(out_login): change-password
gitea/salix/pipeline/head This commit looks good Details
d21b949ffb
refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
372b9a2ce2
refs #5513 test getItemsPackaging
gitea/salix/pipeline/head There was a failure building this commit Details
73fb940c63
refs #5472 try change-password
gitea/salix/pipeline/head This commit looks good Details
7021e52705
correct folder
gitea/salix/pipeline/head This commit looks good Details
ded8e0e141
refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
f72c162ca7
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
74ea0ce9fd
refs #5468 actualizados acls
gitea/salix/pipeline/head There was a failure building this commit Details
b10f90fbe1
refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head This commit looks good Details
9760e50212
refs #5513 minor fixes
gitea/salix/pipeline/head There was a failure building this commit Details
3f26072787
refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
87e1caa4eb
refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
598067f757
refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
071849065a
refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
443821b5c2
refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
fd4d04756a
refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
612d0a2dfb
refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
3dcdbe0223
refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
d09889b08a
refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
9f9963af56
refs #5334 descriptor
gitea/salix/pipeline/head This commit looks good Details
62d0af25d3
refs #5642 uncommented tests
gitea/salix/pipeline/head There was a failure building this commit Details
5c9ee21cfc
refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
f63dd0f9a3
refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
adafd7444b
refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
ca9d76db77
refs #5137 moved sql
gitea/salix/pipeline/head This commit looks good Details
37b2920157
refs #5513 moved sql
gitea/salix/pipeline/head This commit looks good Details
2b1e951692
refs #5635 smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
c6c15d7c69
refs #5472 feat: changePassword with passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
ddab59a10c
refs #5472 refactor(changePassword): convert in async
gitea/salix/pipeline/head There was a failure building this commit Details
b65ebc6af3
refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
aea39dd0b7
refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head This commit looks good Details
9426ff204f
refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
4bed88faf5
refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
cd244daf84
refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
96163cb07f
refs #5468 feat: update acls
gitea/salix/pipeline/head There was a failure building this commit Details
191fe4ebf6
refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head This commit looks good Details
db55c3e81b
refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
b7e3e9fa71
refs #5468 feat: add testBack
gitea/salix/pipeline/head This commit looks good Details
91207c5a3c
refs #5468 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
c9b4c68b0c
refs #5468 refactor: actualizada vista
gitea/salix/pipeline/head There was a failure building this commit Details
2c7473b064
refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head This commit looks good Details
c35e2e155f
refs #5472 test(changePassword): back
gitea/salix/pipeline/head This commit looks good Details
9b363bc7a4
refs #5635 remove vn, smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
d6d72ed289
refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head This commit looks good Details
eab329b230
refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good Details
2e69e4eea7
a
gitea/salix/pipeline/head There was a failure building this commit Details
4869d81d11
refs #5635 fix back & e2e
gitea/salix/pipeline/head This commit looks good Details
fdd22ca2d8
refs #5554 codigo eliminado de vnLayout
gitea/salix/pipeline/head This commit looks good Details
1f24314ab2
refs #5635 fix back
gitea/salix/pipeline/head There was a failure building this commit Details
a7363ce2a4
refs #5507 added service
gitea/salix/pipeline/head This commit looks good Details
b95ee6cbfa
refs #5554 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
91700e096e
refs #5554 fix: cambiada extensión de archivos de test, y solucionado test
gitea/salix/pipeline/head There was a failure building this commit Details
06d1de5a63
refs #5554 feat: add back test
gitea/salix/pipeline/head There was a failure building this commit Details
32badef787
delete console.log
gitea/salix/pipeline/head This commit looks good Details
96feb24f12
refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
71d8a355bd
refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
8adc104cf4
refs #5735 fix currency
gitea/salix/pipeline/head There was a failure building this commit Details
10e085ca1b
refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
be06a65a45
refs #5507 fixed e2e
gitea/salix/pipeline/head This commit looks good Details
3ecfbe2052
refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
527116f1ec
refs #5252 fix: te2e
gitea/salix/pipeline/head There was a failure building this commit Details
2b06c62876
refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
0789804352
refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
f74c370446
refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
07e176ae4f
refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
ceaaece007
refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
3aa5ce6208
refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2a78a912eb
refs #5334 worker.department
gitea/salix/pipeline/head This commit looks good Details
1ed8000be9
refs #5642 e2es refactored
gitea/salix/pipeline/head There was a failure building this commit Details
059467a383
refs #5137 sql moved to template
gitea/salix/pipeline/head Build queued... Details
1bb5033729
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
ba850415be
refs #5137 moved sql
gitea/salix/pipeline/head There was a failure building this commit Details
f4e877dada
refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2d6f0bb2ce
refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
d9a64211de
refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head This commit looks good Details
153542d2be
refs #5595 taking active connection
gitea/salix/pipeline/head This commit looks good Details
81a8f383aa
refs #5468 feat: no depender del modulo worker
gitea/salix/pipeline/head There was a failure building this commit Details
107d8d1edd
refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit Details
e05d3b0793
Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head There was a failure building this commit Details
2778858705
refs #5334 search-panel
gitea/salix/pipeline/head This commit looks good Details
632662c440
refs #5595 added userId in makeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
32bdaa640e
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
cf632040e7
refs #5334 workFk, clientFk
gitea/salix/pipeline/head This commit looks good Details
30816f7947
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
e26eedb51c
refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
2b34dd19e8
refs #554 delete: test back que falla
gitea/salix/pipeline/head This commit looks good Details
e7d25a6cf3
refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
45085cccc8
refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good Details
8860c77147
refs #5334 fix descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
576a5f050e
refs #5513 fix back test
gitea/salix/pipeline/head This commit looks good Details
26187898e1
refs #5334 popover
gitea/salix/pipeline/head This commit looks good Details
1dcaba1fdc
refs #5334 department workers list
gitea/salix/pipeline/head This commit looks good Details
0fd7f4183e
refs #5334 fk
gitea/salix/pipeline/head This commit looks good Details
0774a94d8b
refs #5334 params
gitea/salix/pipeline/head This commit looks good Details
e38bf4f1b3
refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
d1a61b3e0d
refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
eb6953a2b6
refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
0263d76021
refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good Details
4f3b6c3035
typo
gitea/salix/pipeline/head This commit looks good Details
f9528b922c
refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
4c7c7f5c96
refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
f37c66304f
refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
bb5247c49b
refs #5334 tree
gitea/salix/pipeline/head There was a failure building this commit Details
9462ca90a7
refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
04780e211d
refs #5334 test front & 1/2 back
gitea/salix/pipeline/head This commit looks good Details
1095a59954
refs #5334 rest back, e2e summary, less e2e basic
gitea/salix/pipeline/head There was a failure building this commit Details
86cd5f5237
refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
5798b28c5e
refs #5334 baicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
9ef51f5600
remove fdescribe puppeter
gitea/salix/pipeline/head There was a failure building this commit Details
c1cda1a3ff
refs #5334 basicData e2e
gitea/salix/pipeline/head This commit looks good Details
fe32a2af05
refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head This commit looks good Details
2545a40087
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
15b5f10a93
refs #5513 addFromBuy back added
gitea/salix/pipeline/head This commit looks good Details
d6cde764d7
refs #5334 changelog
gitea/salix/pipeline/head There was a failure building this commit Details
64abf4bf14
refs #5472 fix req.data.error.code
gitea/salix/pipeline/head This commit looks good Details
9c9a2d4fe2
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head There was a failure building this commit Details
5d6eaca6b8
refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head This commit looks good Details
36b0216640
refs #5513 changed tests description
gitea/salix/pipeline/head There was a failure building this commit Details
a477bb32ad
Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1504) from 5513-backs-embalajes into dev
Reviewed-on: #1504
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6ef7055bc9
refs #5563 Display show values in logs
gitea/salix/pipeline/head This commit looks good Details
05111c9268
hotfix test front
gitea/salix/pipeline/head This commit looks good Details
ab66ffa64a
Merge branch 'master' into hotfixTicketColors
gitea/salix/pipeline/head This commit looks good Details
47fe77efde
Merge pull request 'master' (!1592) from master into test
Reviewed-on: #1592
gitea/salix/pipeline/head There was a failure building this commit Details
b144948dcf
conflictos resueltos
gitea/salix/pipeline/head This commit looks good Details
4ae6b7c739
Merge pull request 'hotfixTicketColors' (!1591) from hotfixTicketColors into master
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
bda1ed41ae
refs #5507 vnConfig moved to core
gitea/salix/pipeline/head There was a failure building this commit Details
7311e79273
fix(vn-model): rewriteMethod
gitea/salix/pipeline/head There was a failure building this commit Details
cb50c617ee
refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit Details
fd1e6122e8
Merge branch 'dev' into 5507-loadConfigAtStart
gitea/salix/pipeline/head This commit looks good Details
16ad082967
back fixed
gitea/salix/pipeline/head This commit looks good Details
3805812aba
fix: backTest
gitea/salix/pipeline/head This commit looks good Details
d09075d490
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
92a8e5f689
Merge pull request 'fix addFromBuy backTest' (!1593) from fix-addFromBuy-backTest into dev
Reviewed-on: #1593
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b036b1f7df
Merge branch 'dev' into 5507-loadConfigAtStart
gitea/salix/pipeline/head This commit looks good Details
46a3faea51
Merge pull request 'fixes #5507 this.vnConfig no tiene datos cargados al inicio de la aplicación' (!1565) from 5507-loadConfigAtStart into dev
Reviewed-on: #1565
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
bfd421c188
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
b14a8d9fec
Merge pull request 'fixes #5137 Avisos impresoras cuando hayan seleccionado una que no es principal' (!1514) from 5137-aviso-impresora into dev
Reviewed-on: #1514
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
0bc4570706
Merge pull request 'fixes #5642 Arreglar e2e ticket Advance y ticket Future' (!1525) from 5642-arreglar-e2e-ticketFuture-ticketAdvance into dev
Reviewed-on: #1525
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
4e08f51848
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
1240a6b71a
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
bd4eee6606
refs #5252 eliminado warehouseFk = 1 por defecto #5252
gitea/salix/pipeline/head This commit looks good Details
0dbd3abd65
refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head This commit looks good Details
2b70bfb3c2
Merge pull request 'master' (!1595) from master into test
Reviewed-on: #1595
gitea/salix/pipeline/head This commit looks good Details
980ea67c24
Merge pull request 'test' (!1596) from test into dev
Reviewed-on: #1596
gitea/salix/pipeline/head This commit looks good Details
8b92b35e29
Merge pull request '5252-canRefund_withOutWarehouse2' (!1567) from 5252-canRefund_withOutWarehouse2 into dev
Reviewed-on: #1567
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5ba8a15316
refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good Details
0afc26e20c
refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good Details
9cdaf2e519
refs #5728 fix e2e buy
gitea/salix/pipeline/head This commit looks good Details
dd72ac9107
refs #5809 version 232601 init
gitea/salix/pipeline/head This commit looks good Details
32a0955c1d
refs #5667 Zone translations fixed
gitea/salix/pipeline/head There was a failure building this commit Details
0ab23477d1
refs #5468 move sql changes
gitea/salix/pipeline/head There was a failure building this commit Details
dfdf948c42
move sql changes
gitea/salix/pipeline/head There was a failure building this commit Details
bdffc0401f
refs #5760 update getChanges, traduccion
gitea/salix/pipeline/head This commit looks good Details
9c007504ea
refs #5667 UI improved, filter by record
gitea/salix/pipeline/head This commit looks good Details
ac67a2606f
Merge branch 'dev' into 5735-creditFormat
gitea/salix/pipeline/head This commit looks good Details
ec9dfa90fd
refs #5760 fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
c66feb53f0
refs #5760 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
f797cc1761
refs #5489 refactor e2e
gitea/salix/pipeline/head There was a failure building this commit Details
d083ba795d
Merge pull request 'refs #5667 UI improved, filter by record' (!1600) from test into dev
Reviewed-on: #1600
gitea/salix/pipeline/head This commit looks good Details
9aadd71356
Merge branch 'dev' into 5735-creditFormat
gitea/salix/pipeline/head This commit looks good Details
a06cd1929f
Merge branch 'dev' into 5760-changesSMS
gitea/salix/pipeline/head This commit looks good Details
74c300fd53
Merge branch 'test' into use_invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
b81b6c7020
Merge pull request 'refs #5735 fix currency' (!1570) from 5735-creditFormat into dev
Reviewed-on: #1570
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9b4c4496b6
Merge branch 'dev' into 5760-changesSMS
gitea/salix/pipeline/head This commit looks good Details
edb06a894a
Merge pull request '5760-changesSMS' (!1601) from 5760-changesSMS into dev
Reviewed-on: #1601
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
fdb9d2ed7f
refs #5701 fix dockerFile and sh's
gitea/salix/pipeline/head This commit looks good Details
decc5e471f
refs #5667 Changes added to changelog
gitea/salix/pipeline/head This commit looks good Details
94ebf50279
Merge pull request 'test' (!1603) from test into dev
Reviewed-on: #1603
gitea/salix/pipeline/head This commit looks good Details
d735f142a1
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
33f2d556fd
refs #5701 fix(db/dockerFile): fix docker-temp-stop
gitea/salix/pipeline/head This commit looks good Details
2c0c0f24b0
reactive
gitea/salix/pipeline/head This commit looks good Details
473dc0e48b
Merge branch 'dev' into 5701-update_to_mariadb10.7.7
gitea/salix/pipeline/head This commit looks good Details
703c224e91
refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
bbdc0d3e7f
Merge pull request '5701-update_to_mariadb10.7.7' (!1581) from 5701-update_to_mariadb10.7.7 into dev
Reviewed-on: #1581
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
1c39ad873c
resolve dev conflicts
gitea/salix/pipeline/head This commit looks good Details
c9bf74dcc4
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
0718a486e7
Merge pull request 'refs #5635 smart-table' (!1542) from 5635-contadotTicketExpedition into dev
Reviewed-on: #1542
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
24b3697ac6
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
80f6c72fee
Merge pull request '5472-user_passExpired' (!1594) from 5472-user_passExpired into dev
Reviewed-on: #1594
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ff6a2daf37
Merge branch 'test' into use_invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
e6c486b19c
Merge pull request 'refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking' (!1599) from use_invoiceIn_booking into test
Reviewed-on: #1599
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f113bfbc95
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
983081a08e
Merge pull request 'test' (!1606) from test into dev
Reviewed-on: #1606
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d3c4a6ba5c
refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head This commit looks good Details
59642ab3ca
refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good Details
3386af9b17
refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good Details
cc788d7e06
refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good Details
7127c5a3a8
refs #5325 e2e 1 smart Table
gitea/salix/pipeline/head This commit looks good Details
b7c8b03a65
refs #5325 e2e 2
gitea/salix/pipeline/head This commit looks good Details
d8b041c734
refs #5472 correcto version folder
gitea/salix/pipeline/head This commit looks good Details
6f3c28c4a4
refs #5468 refactor: eliminado código obsoleto
gitea/salix/pipeline/head This commit looks good Details
fa9719de78
refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head There was a failure building this commit Details
ddd23a9842
refs #5554 refactor: sustiuido window.localStorage por this
gitea/salix/pipeline/head This commit looks good Details
5d3ecfa00e
refs #5554 fix: test front
gitea/salix/pipeline/head This commit looks good Details
92953b9aa8
refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
dd4b62d0a5
description
gitea/salix/pipeline/head This commit looks good Details
61ce25c1e1
refs #5325 all e2e fix smartTable
gitea/salix/pipeline/head This commit looks good Details
3cef6d642d
refs #5325 smartTable e2e fix
gitea/salix/pipeline/head This commit looks good Details
66c5eda6f2
refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good Details
961941ecb3
refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
5288f96836
Merge pull request '5094-ticket_index_docuware' (!1612) from 5094-ticket_index_docuware into dev
Reviewed-on: #1612
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
aa2d3be451
typo
gitea/salix/pipeline/head This commit looks good Details
c62e6fa0eb
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
65108943ab
refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
9e89167d27
Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good Details
9b692e00d4
Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev
Reviewed-on: #1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
98b270b885
refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good Details
e8b98a2daf
Merge branch 'dev' into 5651-packingSiteAdvanced
gitea/salix/pipeline/head There was a failure building this commit Details
3a5e591cf0
refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head This commit looks good Details
14ebcf96c0
refs #5842 refactor: change names
gitea/salix/pipeline/head This commit looks good Details
a50de4e509
refs #5842 feat: comprueba que invoiceDate no sea null
gitea/salix/pipeline/head This commit looks good Details
5f2c5c5f9d
refs #5842 delete console.log
gitea/salix/pipeline/head This commit looks good Details
d9c7d3b8f0
Merge pull request '5842-hotfix_recalcularFechaFactura' (!1617) from 5842-hotfix_recalcularFechaFactura into master
Reviewed-on: #1617
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
8b832c68b3
refs #5325 fix back
gitea/salix/pipeline/head This commit looks good Details
a43792be26
Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev
Reviewed-on: #1615
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b7b6f413ba
refs #5688 feat: no mostrar datos si no tiene workerCenterFk
gitea/salix/pipeline/head There was a failure building this commit Details
55990869e2
refs #5688 ya no muestra mensaje de error
gitea/salix/pipeline/head This commit looks good Details
e8d28ddb02
v232601
gitea/salix/pipeline/head There was a failure building this commit Details
b96f0f22b5
refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head This commit looks good Details
7bff915a7f
refs #5325 back fix correct
gitea/salix/pipeline/head This commit looks good Details
238a6406c5
Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev
Reviewed-on: #1613
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
73133778fc
Merge branch 'dev' into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
a866b92b8c
Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1605) from 5513-back-embalaje into dev
Reviewed-on: #1605
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
50fe53fbb6
Merge branch 'test' into warnFix_ticket_sale_orderBy
gitea/salix/pipeline/head There was a failure building this commit Details
cf01c8d46e
refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head This commit looks good Details
ef0ae335e8
fix: muestra las observaciones de los tickets
gitea/salix/pipeline/head This commit looks good Details
75bb0f8160
refs #5860 fix hash smbhash
gitea/salix/pipeline/head This commit looks good Details
4d957b7593
Merge pull request 'hotfix_ticketObservation' (!1620) from hotfix_ticketObservation into master
Reviewed-on: #1620
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
ee1b901dea
refs #5475 feat(account_changePassword): accessScope
gitea/salix/pipeline/head This commit looks good Details
70413fe0d6
Merge pull request 'refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType' (!1604) from warnFix_ticket_sale_orderBy into test
Reviewed-on: #1604
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
068eca80ab
Merge branch 'dev' into 5112-entryUpdateComission
gitea/salix/pipeline/head There was a failure building this commit Details
b6c8ca20ee
refs #5339 data
gitea/salix/pipeline/head This commit looks good Details
d4cc9cf82a
change log remove
gitea/salix/pipeline/head Build queued... Details
3701acd26e
refs #5334 error getLeaves solve
gitea/salix/pipeline/head There was a failure building this commit Details
168e7f1929
changelog
gitea/salix/pipeline/head This commit looks good Details
63888e2d64
refs #5595 console.log(orderFk, userId) for rawSQL logs
gitea/salix/pipeline/head This commit looks good Details
9fa6e2df71
refs #5595 VnModel.rawSql() bugfix
gitea/salix/pipeline/head There was a failure building this commit Details
092471f74e
refs #5475 feat(account_changePassword): accessScope and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
8a2cab0e62
Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head There was a failure building this commit Details
7f20973650
refs #5334 merge
gitea/salix/pipeline/head There was a failure building this commit Details
4537344790
merge
gitea/salix/pipeline/head This commit looks good Details
503054fe05
refs #5112 modificaciones entry_updateComission
gitea/salix/pipeline/head This commit looks good Details
ffbaa45320
refs #5112 changelog
gitea/salix/pipeline/head This commit looks good Details
a155f846c2
refs #5334 fix ctx
gitea/salix/pipeline/head This commit looks good Details
c63df30e5c
refs #5334 fix back
gitea/salix/pipeline/head This commit looks good Details
dcfb991f94
hotFix(getLeaves): remoteMethodCtx correct defined
gitea/salix/pipeline/head This commit looks good Details
f0f8b112cd
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
a7d9bbc582
refs #5537 change cl c
gitea/salix/pipeline/head This commit looks good Details
cea6fae649
fix: eliminada variable que no estaba definida
gitea/salix/pipeline/head This commit looks good Details
e99627c0b2
codigo innecesario
gitea/salix/pipeline/head This commit looks good Details
62818a9414
Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev
Reviewed-on: #1625
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
a4d3e8efd0
Merge pull request 'hotfix_errorEliminarTicket' (!1626) from hotfix_errorEliminarTicket into master
Reviewed-on: #1626
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
2649db852f
refs #5772 Invoice PDF size reduced
gitea/salix/pipeline/head This commit looks good Details
e83396de11
Merge branch 'dev' into 5112-entryUpdateComission
gitea/salix/pipeline/head This commit looks good Details
f6cb1cb130
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
004bfdbe1e
Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev
Reviewed-on: #1621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
556bdb52ce
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
3462e49d23
Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev
Reviewed-on: #1566
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f37974c835
Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
56917fbfc4
Merge pull request '5468-account_privileges' (!1552) from 5468-account_privileges into dev
Reviewed-on: #1552
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
a8fafacb82
refs #5475 send email force
gitea/salix/pipeline/head There was a failure building this commit Details
e741904250
refs #5347
gitea/salix/pipeline/head This commit looks good Details
2ddf8e5de6
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
38de19f044
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
6f9fd9bb72
refs #5772 mensajes de error
gitea/salix/pipeline/head This commit looks good Details
9ef12d129b
Merge branch 'dev' into 5537-refactorFootnotes
gitea/salix/pipeline/head This commit looks good Details
bb10b831ef
Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev
Reviewed-on: #1627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
168d05a830
refs #5334 fix errors
gitea/salix/pipeline/head This commit looks good Details
d9afdccd9c
fix: acl renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
6ab431f8ef
refs #5475 tests
gitea/salix/pipeline/head This commit looks good Details
ddaed3318d
Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev
Reviewed-on: #1631
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
aea32492e3
Merge branch 'master' into 5339_instance_vs_data
gitea/salix/pipeline/head There was a failure building this commit Details
10a25ff590
refs #5772
gitea/salix/pipeline/head This commit looks good Details
a173cb47f0
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
807596f735
refs #5772
gitea/salix/pipeline/head This commit looks good Details
18a8106461
refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good Details
5f4b62f133
refs #5688 fix: test front
gitea/salix/pipeline/head This commit looks good Details
207dcacf0f
Merge pull request 'refs #5339 data' (!1623) from 5339_instance_vs_data into master
Reviewed-on: #1623
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
7f9d8da7a7
refs #5836 defaulter
gitea/salix/pipeline/head There was a failure building this commit Details
591fc14ffa
refs #5772 refactor: movido codigo para enviar rocket al back
gitea/salix/pipeline/head This commit looks good Details
2d21da1faa
Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev
Reviewed-on: #1611
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b7cd32f4ce
refs #5772 eliminar tags en report invoice
gitea/salix/pipeline/head There was a failure building this commit Details
12aa9c6b4b
Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
d26778e94e
refs #5688 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
389b53ceff
refs #5772 fix: back test
gitea/salix/pipeline/head This commit looks good Details
d4dceac74c
Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev
Reviewed-on: #1632
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
344ba298f8
refs #5832 232801 init
gitea/salix/pipeline/head This commit looks good Details
757360f3d1
Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head There was a failure building this commit Details
d272121258
refs 5688 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
cce837686d
Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev
Reviewed-on: #1598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
27946c0062
Refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
137e01e60c
refs #5334 fix acl, filter
gitea/salix/pipeline/head There was a failure building this commit Details
d9b1f4b8a1
refs #5688 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
beb173f6ce
refs #5334 quit e2e no necesario
gitea/salix/pipeline/head There was a failure building this commit Details
f6cc59eafb
refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
f0fec2cdd6
refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
203e80afa8
refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
16af0c5d6c
Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head This commit looks good Details
47a4a9950f
refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
8c0e8e9e12
refs #5772 Fixes fetching parallelism from front
gitea/salix/pipeline/head This commit looks good Details
2fec5bf2aa
Merge pull request 'refs #5772 test into dev' (!1633) from test into dev
Reviewed-on: #1633
gitea/salix/pipeline/head This commit looks good Details
c9f11830a2
refs #5772 smtp.send() error throw flow fix
gitea/salix/pipeline/head This commit looks good Details
665339c8d2
refs #5772 Fix for unhandled ENOENT error
gitea/salix/pipeline/head This commit looks good Details
7660d76850
refs #5772 Test environment fix
gitea/salix/pipeline/head This commit looks good Details
98301f8e70
refs #5900 Small fixes & code clean
gitea/salix/pipeline/head This commit looks good Details
21988fba8c
refs #5900 Hide PIT button on insert actions
gitea/salix/pipeline/head This commit looks good Details
df049201f1
refs #5900 Optimization: remove unnecessary watcher
gitea/salix/pipeline/head This commit looks good Details
d31d1e5a13
refs #5900 User avatar margin fix
gitea/salix/pipeline/head This commit looks good Details
fd69d69ff0
refs #5900 Style: margin adjustments
gitea/salix/pipeline/head This commit looks good Details
631c0e3121
refs #5900 Log grouping fix
gitea/salix/pipeline/head This commit looks good Details
c15d9a4753
refs #5900 Log order fix
gitea/salix/pipeline/head This commit looks good Details
e32a29fc09
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
d69cbe0ad4
refs #5900 Origin separator style fix
gitea/salix/pipeline/head This commit looks good Details
544445c4ae
refs #5800 Origin separator style more clear
gitea/salix/pipeline/head This commit looks good Details
630ce40ef7
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head There was a failure building this commit Details
cc5021a75f
refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head This commit looks good Details
c42b38c5cc
refs #5900 Code clean, refactor & accurated
gitea/salix/pipeline/head This commit looks good Details
88e845b511
change applyFilters
gitea/salix/pipeline/head There was a failure building this commit Details
e980717d14
refs #5900, #5772 Changelog updated
gitea/salix/pipeline/head This commit looks good Details
ef8e1c4169
refs #5531 refs #5753 fix travelConfig sql
gitea/salix/pipeline/head This commit looks good Details
7d2076ff90
Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev
Reviewed-on: #1637
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
15c45bb544
Merge branch 'test' into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
15e39b5fec
Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test
Reviewed-on: #1636
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
24ea18aeb0
refs #5836 isworker back
gitea/salix/pipeline/head There was a failure building this commit Details
e43e52b561
refs #5753 db export and fix fixtures
gitea/salix/pipeline/head This commit looks good Details
46ffd8d95a
refs #5554 console.log
gitea/salix/pipeline/head This commit looks good Details
1cf5ff9a62
refs #5554 new Date()
gitea/salix/pipeline/head There was a failure building this commit Details
5216f12001
refs #5836 check fix
gitea/salix/pipeline/head This commit looks good Details
8e5a6dbab3
fix warn
gitea/salix/pipeline/head This commit looks good Details
7e542f93a1
Merge branch 'test' into warnFix_travel_summary_entry
gitea/salix/pipeline/head There was a failure building this commit Details
f0b238b62a
refs #5836 fix e2e
gitea/salix/pipeline/head This commit looks good Details
fe53abb24f
Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f8a972c2f2
refs #5094 fix translation
gitea/salix/pipeline/head There was a failure building this commit Details
4b8b7a9d82
refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
06437c9e80
refs #5334 remove other
gitea/salix/pipeline/head This commit looks good Details
89c25c07b6
refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
f02019d64d
refs #5334 fix words
gitea/salix/pipeline/head There was a failure building this commit Details
da50ea1dd0
Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head This commit looks good Details
6894da7e22
refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good Details
65e5c95c07
Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev
Reviewed-on: #1580
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
3128601027
Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
8723cf2958
refs #5753 fix legacy bugs
gitea/salix/pipeline/head There was a failure building this commit Details
a6fba97b7d
Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev
Reviewed-on: #1640
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
33e1d9e3f2
Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev
Reviewed-on: #1597
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
12481b5f3d
refs #5900 CSS fix
gitea/salix/pipeline/head This commit looks good Details
d200a1a695
refs #5900 CSS fixes
gitea/salix/pipeline/head This commit looks good Details
840a88bdc1
refs #5833 remove console.logs
gitea/salix/pipeline/head There was a failure building this commit Details
bbc5ed2683
Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head This commit looks good Details
9dc52b6011
refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
bb4951bbc8
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
1d993c74e5
refs #5590 fix total invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
be1c145d9a
refs #5347
gitea/salix/pipeline/head This commit looks good Details
79823605f6
refs #5554 fix: no te tira al hacer F5
gitea/salix/pipeline/head This commit looks good Details
1093d29fb6
Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test
Reviewed-on: #1645
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
273c06a210
refs #5833 deploy: test to master 232601
gitea/salix/pipeline/head This commit looks good Details
af91630852
refs #5836 e2e fix
gitea/salix/pipeline/head This commit looks good Details
bc4058512a
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head There was a failure building this commit Details
b062cec747
refs #5475 fix setPassword options/cb
gitea/salix/pipeline/head This commit looks good Details
0441bc29b7
refs #5475 correct SQL folder
gitea/salix/pipeline/head This commit looks good Details
82e762ac09
Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test
Reviewed-on: #1634
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
7eb8460ba0
refs #5816 remove unforeseen dev
gitea/salix/pipeline/head This commit looks good Details
fc39b8f692
refs #5816 comment e2e
gitea/salix/pipeline/head This commit looks good Details
e651ddc4a0
refs #5816 unfocus e2e
gitea/salix/pipeline/head This commit looks good Details
6fcbf69f60
refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head This commit looks good Details
e6ed834bf0
refs #5836 remove case
gitea/salix/pipeline/head This commit looks good Details
dc36c6fd9d
refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details
dc10c20fe3
refs #5334 email validate
gitea/salix/pipeline/head There was a failure building this commit Details
d1fb2859be
Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head This commit looks good Details
5e68363312
refs #5334 onsearch postlink
gitea/salix/pipeline/head This commit looks good Details
7fe8698b6f
refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
c3ef642017
refs #5836 fix fk
gitea/salix/pipeline/head This commit looks good Details
3b346d673b
Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev
Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
2d1420e3f8
Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head This commit looks good Details
5612c56aed
Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev
Reviewed-on: #1639
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
8ef6f0dd17
Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head This commit looks good Details
983d028d06
refs #5334 popover y basic data
gitea/salix/pipeline/head This commit looks good Details
2ccf8d5197
refs #5347
gitea/salix/pipeline/head This commit looks good Details
5000e05e05
refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good Details
e58d4e5db3
refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head There was a failure building this commit Details
4369d275f8
refs #4770 feat: add test
gitea/salix/pipeline/head This commit looks good Details
089f1e48ac
Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev
Reviewed-on: #1644
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
59ad603de6
refs #5816 set version
gitea/salix/pipeline/head This commit looks good Details
6530e87508
refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good Details
83467c3b6c
refs #5334 quit es
gitea/salix/pipeline/head This commit looks good Details
9c9b53917a
refs #5334 fix error
gitea/salix/pipeline/head This commit looks good Details
a7ad947168
Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev
Reviewed-on: #1521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
48951cc5a1
Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev
Reviewed-on: #1429
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ea71e980cc
refs #5970 add changelog
gitea/salix/pipeline/head This commit looks good Details
a665b6c060
refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details
d9d4441d59
refs #5970 deploy: 233001 init
gitea/salix/pipeline/head This commit looks good Details
8fe9b387ce
refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good Details
7030be3efa
fix
gitea/salix/pipeline/head This commit looks good Details
6fa6c21cb1
remove fixtures
gitea/salix/pipeline/head This commit looks good Details
0afddb546b
Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test
Reviewed-on: #1650
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d9a5868ce4
refs #5930 fix(claim_updateClaim) options
gitea/salix/pipeline/head There was a failure building this commit Details
8922d27f20
refs #4614 fix e2e
gitea/salix/pipeline/head This commit looks good Details
9f2ef5c2c0
change ref master
gitea/salix/pipeline/head This commit looks good Details
5e6d941f36
Merge branch 'dev' into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
ce8927a714
Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master
Reviewed-on: #1653
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
60f70ac2b4
Merge pull request 'refs #4614 fear(ticket): add 'set weight' funcionality' (!1487) from 4614-ticket_weight into dev
Reviewed-on: #1487
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d1c8f0ff11
refs #5949 itemRecycle
gitea/salix/pipeline/head This commit looks good Details
1bcd3039cd
refs #5475 redesign 2FA email
gitea/salix/pipeline/head This commit looks good Details
43bf7ce707
Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test
Reviewed-on: #1657
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ba109dccc5
refs #5949 trad
gitea/salix/pipeline/head This commit looks good Details
6978339fd3
refs #5475 fix email translations
gitea/salix/pipeline/head This commit looks good Details
7291b793ae
refs #5949 fix traduct
gitea/salix/pipeline/head This commit looks good Details
56247b5012
add acl
gitea/salix/pipeline/head This commit looks good Details
da13f0811c
refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
810021e23a
Merge pull request 'refs #5874 feat: refactorizado proceso facturación' (!1658) from hotfix_makeInvoice-refactor into master
Reviewed-on: #1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
e1f12bea02
a
gitea/salix/pipeline/head This commit looks good Details
5a5a1ed20b
refs #5887 feat: addback test
gitea/salix/pipeline/head There was a failure building this commit Details
a215797390
tranalstion
gitea/salix/pipeline/head Build queued... Details
6655807d80
refs #4770 refactor: change acl
gitea/salix/pipeline/head There was a failure building this commit Details
a831a1534b
Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head This commit looks good Details
808a9976ab
refs #5887 fix: back etst
gitea/salix/pipeline/head This commit looks good Details
83698522ca
Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master
Reviewed-on: #1659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
d7ac20dc6a
hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head There was a failure building this commit Details
219a4fbca9
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
392dc5060a
refs #4770 delete test
gitea/salix/pipeline/head This commit looks good Details
c91db1b429
a
gitea/salix/pipeline/head This commit looks good Details
c88a753865
Merge pull request '4770-routes_roadmap2' (!1647) from 4770-routes_roadmap2 into dev
Reviewed-on: #1647
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
0d308ec8ad
Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev
Reviewed-on: #1656
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
jgallego requested changes 2023-07-20 06:53:37 +00:00
@ -0,0 +20,4 @@
}
});
Self.deleteSaleGroupDetail = async(saleFk, options) => {
Owner

al ejecutar

SELECT * FROM saleGroupDetail sgd GROUP BY saleFk 
HAVING count(*) > 1

aparecen solo unos 100 registro valorar con Pako si es un error y la columna saleFk deberia ser unique

Si es el caso, en la nota de bajo se puede hacer un deleteById en el front.

al ejecutar ``` SELECT * FROM saleGroupDetail sgd GROUP BY saleFk HAVING count(*) > 1 ``` aparecen solo unos 100 registro valorar con Pako si es un error y la columna saleFk deberia ser unique Si es el caso, en la nota de bajo se puede hacer un deleteById en el front.
Author
Contributor

Tras hablar con Pako: columna saleFk deberia ser unique

Tras hablar con Pako: columna saleFk deberia ser unique
vicent marked this conversation as resolved
@ -0,0 +34,4 @@
}
try {
const deletes = await models.SaleGroupDetail.destroyAll({
Owner

valorar mover a Front o crear tests

valorar mover a Front o crear tests
vicent marked this conversation as resolved
@ -0,0 +39,4 @@
const stmts = [];
let stmt;
stmts.push('CALL cache.last_buy_refresh(FALSE)');
Owner

este código esta duplicado en la BBDD (vn.salePreparingList), hay que dejar de usarlo y utilizar el back de Salix.

este código esta duplicado en la BBDD (vn.salePreparingList), hay que dejar de usarlo y utilizar el back de Salix.
Author
Contributor

Solo se utiliza en Access, solo se utiliza en la sección que va a sustituir la nueva sección de Salix.
Cuando se elimine de tpv se debe eliminar tmb el proc.

Solo se utiliza en Access, solo se utiliza en la sección que va a sustituir la nueva sección de Salix. Cuando se elimine de tpv se debe eliminar tmb el proc.
vicent marked this conversation as resolved
@ -0,0 +67,4 @@
JOIN vn.sale s ON s.ticketFk = t.id
JOIN vn.item i ON i.id = s.itemFk
LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk
LEFT JOIN vn.saleTracking stPrevious ON stPrevious.saleFk = s.id AND stPrevious.stateFk = 26
Owner

hacer join con state para enlazar por codigo

hacer join con state para enlazar por codigo
vicent marked this conversation as resolved
@ -0,0 +45,4 @@
myOptions.transaction = tx;
}
try {
const result = await Self.rawSql(`CALL vn.saleTracking_new(?, ?, ?, ?, ?, ?)`,
Owner

Mover a front y hacerlo con loopback

Mover a front y hacerlo con loopback
vicent marked this conversation as resolved
vicent added 103 commits 2023-07-20 09:41:37 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
b45b0ff826
refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
16fdfa00fd
refs #5066 e2e solve
gitea/salix/pipeline/head This commit looks good Details
237c83c6f5
refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
91edc09057
refs #5066 move sql
gitea/salix/pipeline/head This commit looks good Details
d8e7c2700a
refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
3423ce612c
refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
8fff3989e7
Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
813c4ede00
Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
d18137bce0
refs #5066 not dense
gitea/salix/pipeline/head There was a failure building this commit Details
cc27d1fa97
refs #5066 fix vehicle res.data
gitea/salix/pipeline/head This commit looks good Details
dcbe8c5f7a
refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
eff46c1cec
refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head This commit looks good Details
510b78c703
refs #6006 mod dias anteriores
gitea/salix/pipeline/head This commit looks good Details
78108b2ca5
Merge branch 'master' into hotfix-travel
gitea/salix/pipeline/head There was a failure building this commit Details
c0d329edca
a
gitea/salix/pipeline/head There was a failure building this commit Details
ef6a2ae578
refs #5887 fix: delete requires
gitea/salix/pipeline/head There was a failure building this commit Details
7aaaf5492c
refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head This commit looks good Details
12685e045c
tedst
gitea/salix/pipeline/head This commit looks good Details
b228b693cc
Merge pull request 'refs #6006 mod dias anteriores' (!1662) from hotfix-travel into master
Reviewed-on: #1662
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
978224c21c
Merge branch 'master' into hotfix_mailAlias
gitea/salix/pipeline/head There was a failure building this commit Details
3a61bc6052
refs #5887 move changes sql
gitea/salix/pipeline/head This commit looks good Details
337ce56a60
refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good Details
988ff96016
Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master
Reviewed-on: #1664
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
660612cb84
refs #5999 url
gitea/salix/pipeline/head This commit looks good Details
2627cafc22
refs #5999 defaulter country autocomplete
gitea/salix/pipeline/head This commit looks good Details
4632ed298d
Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
173ed251c3
refs #5964 fix supply
gitea/salix/pipeline/head There was a failure building this commit Details
765a84e2eb
refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head This commit looks good Details
29a4c51518
Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
575d7710a6
Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master
Reviewed-on: #1666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
190db79019
Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
5ffa8b8910
Merge pull request '5999-defaultCountry' (!1665) from 5999-defaultCountry into master
Reviewed-on: #1665
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6d8b3e346d
refs #5837 fix filter existingClient France
gitea/salix/pipeline/head This commit looks good Details
765c22df96
refs #5837 new table
gitea/salix/pipeline/head There was a failure building this commit Details
4a7cfe9122
fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
4f183d1c6a
fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head This commit looks good Details
5716acaa3c
fix: test
gitea/salix/pipeline/head There was a failure building this commit Details
93387cae62
refs #5837 if isSocialNameUnique
gitea/salix/pipeline/head This commit looks good Details
6980392ba1
fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
06690ca71e
Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b2b335326e
Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
f24aa2c801
pop vehicle error
gitea/salix/pipeline/head This commit looks good Details
10e726c486
move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
a5d1c68511
change err and traduction
gitea/salix/pipeline/head This commit looks good Details
52f58a92c8
refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
47e8fab8d9
refs remove
gitea/salix/pipeline/head This commit looks good Details
3c013110d3
refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
b285c3e37a
Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev
Reviewed-on: #1667
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
93da129239
refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head There was a failure building this commit Details
b3a7a170f0
refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head This commit looks good Details
3e8775149a
refs #5934 feat: change icon
gitea/salix/pipeline/head This commit looks good Details
9076553070
refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head There was a failure building this commit Details
7bd378e9dd
refs #
gitea/salix/pipeline/head Build queued... Details
4c7f42acb5
a
gitea/salix/pipeline/head This commit looks good Details
d3165fcdc7
refs #5849 fix: tback
gitea/salix/pipeline/head There was a failure building this commit Details
bd723bb7ba
refs #5824 mod ng
gitea/salix/pipeline/head This commit looks good Details
49c656928e
refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2f6c988005
Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
36db2ee883
Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
9c746dd6c2
Merge pull request '5066-vehicleSorted' (!1467) from 5066-vehicleSorted into dev
Reviewed-on: #1467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
25ce685116
Merge branch 'dev' into 5824-fixUpsertFixedPrice
gitea/salix/pipeline/head This commit looks good Details
85c017431c
refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
e2f50d63f6
Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
3d83b7b46d
Merge pull request 'pop vehicle error' (!1672) from hotfix-vehicleError into master
Reviewed-on: #1672
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
4150bdc6c8
Merge pull request 'refs #5824 mod ng' (!1678) from 5824-fixUpsertFixedPrice into dev
Reviewed-on: #1678
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b17de86fb1
refs #6043 add ACL
gitea/salix/pipeline/head This commit looks good Details
dbebd80a68
Merge branch 'dev' into 6043-fixe2eError
gitea/salix/pipeline/head This commit looks good Details
579d6d53d8
Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
1f7f903ec6
Merge pull request 'refs #6043 add ACL' (!1680) from 6043-fixe2eError into dev
Reviewed-on: #1680
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
7cff014988
refs #5983 fix(itemShelving): vn
gitea/salix/pipeline/head This commit looks good Details
6344c11d1e
Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
b23dfaeeb1
Merge pull request '5983_inventory_parking' (!1677) from 5983_inventory_parking into dev
Reviewed-on: #1677
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head Build queued... Details
ab95ef74a9
refs #5934 refactor: nombres variables
gitea/salix/pipeline/head Build queued... Details
6df1ef9d4c
Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head Build started... Details
b13618529a
refs #5849 delete: traducción erronea
gitea/salix/pipeline/head This commit looks good Details
60e75d7825
refs #5837 fix client condition
gitea/salix/pipeline/head This commit looks good Details
aefcb8c49a
Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
c1e578a456
Merge pull request 'refs #5837 fix filter existingClient France' (!1668) from 5837-quitRestrictionFrance into dev
Reviewed-on: #1668
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
5771ccb488
Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head This commit looks good Details
484bcd3fde
Merge pull request '5934-clientSms' (!1675) from 5934-clientSms into dev
Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
0585080303
refs #6011 deploy 2330 version
gitea/salix/pipeline/head This commit looks good Details
071a891d30
refs #6011 add changelog
gitea/salix/pipeline/head This commit looks good Details
75ea594272
refs #6011 deploy(2332): init version
gitea/salix/pipeline/head This commit looks good Details
1215b8cd57
Merge branch 'dev' into 5849-makeInvoice_solved
gitea/salix/pipeline/head This commit looks good Details
c3a897b8c3
Merge pull request '5849-makeInvoice_solved' (!1676) from 5849-makeInvoice_solved into dev
Reviewed-on: #1676
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
vicent reviewed 2023-07-20 10:25:41 +00:00
@ -0,0 +1,38 @@
DELIMITER $$
$$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleTracking_new`(
Author
Contributor

NO modificar el proc. Se hara con loopback.

NO modificar el proc. Se hara con loopback.
Author
Contributor

Si no se hace por loopback, cambiar las llamadas al métedo falta añadirle un parámetro.

Si no se hace por loopback, cambiar las llamadas al métedo falta añadirle un parámetro.
vicent marked this conversation as resolved
@ -0,0 +37,4 @@
}
try {
const result = await Self.rawSql(`CALL vn.saleTracking_del(?, ?)`,
Author
Contributor

Pasar al front y hacerlo con loopback.

Pako: saleTracking_del hace
DELETE FROM itemShelvingSale WHERE saleFk = vSaleFk;
es decir, borra de itemShelvingSale en cualquier estado. Creemos que es un error y solo en el estado 'Preparado' debería borrar el itemShelvingSale.

Pasar al front y hacerlo con loopback. Pako: saleTracking_del hace `DELETE FROM itemShelvingSale WHERE saleFk = vSaleFk;` es decir, borra de itemShelvingSale en cualquier estado. Creemos que es un error y solo en el estado 'Preparado' debería borrar el itemShelvingSale.
Author
Contributor

Tras hablar con Pako: solo en el estado 'Preparado' debería borrar el itemShelvingSale.

Tras hablar con Pako: solo en el estado 'Preparado' debería borrar el itemShelvingSale.
vicent marked this conversation as resolved
vicent added 1 commit 2023-07-20 13:08:47 +00:00
gitea/salix/pipeline/head This commit looks good Details
7d2e98267f
refs #5561 eliminados valores a piñon
vicent added 1 commit 2023-07-21 07:50:35 +00:00
gitea/salix/pipeline/head This commit looks good Details
f52b398596
refs #5561 refactor: sustituidos sql por loopback
vicent added 1 commit 2023-07-21 10:01:09 +00:00
gitea/salix/pipeline/head This commit looks good Details
cf0b6f8c6e
refs #5561 fix: saleGroupDetail.saleFk UNIQUE
vicent added 2 commits 2023-07-21 10:02:14 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f926c60017
remove file
vicent added 1 commit 2023-07-21 10:20:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
9bf891fcec
refs #5561 fixed
vicent added 1 commit 2023-07-27 05:58:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
777426aa05
refs #5561 add backTest
vicent requested review from jgallego 2023-07-27 08:27:25 +00:00
jgallego approved these changes 2023-08-14 06:48:54 +00:00
Dismissed
vicent added 1 commit 2023-08-22 10:31:22 +00:00
vicent dismissed juan’s review 2023-08-22 10:31:23 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

vicent dismissed jgallego’s review 2023-08-22 10:31:23 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jgallego approved these changes 2023-08-22 10:37:20 +00:00
vicent merged commit 9479b1931f into dev 2023-08-22 10:42:43 +00:00
vicent deleted branch 5561-ticket.sale-tracking_cambiandoCrudModel 2023-08-22 10:42:44 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1614
No description provided.