 Alex Moreno
|
5163b7b253
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-06-15 15:14:41 +02:00 |
 Juan Ferrer
|
1c666cd48e
|
refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 13:10:44 +02:00 |
 Carlos Satorres
|
8b832c68b3
|
refs #5325 fix back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-15 12:49:53 +02:00 |
|
Alex Moreno
|
71651b96a3
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 11:49:40 +02:00 |
|
Alex Moreno
|
99ad9d3afa
|
refs #5753 fix(change-password)
|
2023-06-15 11:49:39 +02:00 |
 Vicent Llopis
|
5f2c5c5f9d
|
refs #5842 delete console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 09:55:32 +02:00 |
|
Vicent Llopis
|
a50de4e509
|
refs #5842 feat: comprueba que invoiceDate no sea null
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 09:50:46 +02:00 |
|
Alex Moreno
|
a206f64e3c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-06-15 07:27:04 +02:00 |
|
Vicent Llopis
|
14ebcf96c0
|
refs #5842 refactor: change names
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 07:24:17 +02:00 |
 Sergio De la torre
|
1f454e6219
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 07:22:10 +02:00 |
|
Carlos Satorres
|
9cdc914a25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable
|
2023-06-14 17:03:09 +02:00 |
|
Alex Moreno
|
3a5e591cf0
|
refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-14 15:15:00 +02:00 |
|
Vicent Llopis
|
7fa4eabf86
|
refs #5842 fix: recalcula invoiceDate cuando se cambia la company
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 14:59:18 +02:00 |
|
Sergio De la torre
|
e8b98a2daf
|
Merge branch 'dev' into 5651-packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 11:18:24 +00:00 |
|
Vicent Llopis
|
98b270b885
|
refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 13:05:46 +02:00 |
|
Vicent Llopis
|
9e89167d27
|
Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 10:57:58 +00:00 |
|
Vicent Llopis
|
65108943ab
|
refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 12:48:14 +02:00 |
|
Vicent Llopis
|
e62a3ce166
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 12:39:16 +02:00 |
|
Sergio De la torre
|
c62e6fa0eb
|
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 10:51:22 +02:00 |
|
Juan Ferrer
|
961941ecb3
|
refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 20:52:26 +02:00 |
|
Carlos Satorres
|
66c5eda6f2
|
refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 16:08:11 +02:00 |
|
Alex Moreno
|
aeb04efe82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-13 11:49:42 +02:00 |
|
Alex Moreno
|
92953b9aa8
|
refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 11:37:35 +02:00 |
|
Vicent Llopis
|
72b779f5c0
|
refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 10:26:12 +02:00 |
|
Vicent Llopis
|
fa9719de78
|
refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 08:16:37 +02:00 |
|
Vicent Llopis
|
0aae1732bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 07:35:29 +02:00 |
|
Vicent Llopis
|
6f3c28c4a4
|
refs #5468 refactor: eliminado código obsoleto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 07:34:41 +02:00 |
|
Alex Moreno
|
a07ca62476
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware
|
2023-06-13 07:11:39 +02:00 |
|
Juan Ferrer
|
cc788d7e06
|
refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 16:28:47 +02:00 |
|
Juan Ferrer
|
3386af9b17
|
refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 16:27:02 +02:00 |
|
Carlos Satorres
|
59642ab3ca
|
refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 15:44:22 +02:00 |
|
Alex Moreno
|
d3c4a6ba5c
|
refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-12 15:20:46 +02:00 |
|
Alex Moreno
|
f113bfbc95
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 12:32:29 +00:00 |
|
Alex Moreno
|
24b3697ac6
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:31:25 +00:00 |
|
Carlos Satorres
|
c9bf74dcc4
|
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 09:56:34 +00:00 |
|
Alex Moreno
|
1c39ad873c
|
resolve dev conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 11:06:45 +02:00 |
|
Alex Moreno
|
22e69e6e91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-06-12 11:06:27 +02:00 |
|
Alex Moreno
|
5c1b867d05
|
WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:46:21 +02:00 |
 Alexandre Riera
|
f9129afc17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:27:18 +02:00 |
|
Alexandre Riera
|
703c224e91
|
refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:26:50 +02:00 |
|
Alex Moreno
|
051269d646
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 09:11:17 +02:00 |
|
Alex Moreno
|
2c0c0f24b0
|
reactive
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 08:36:19 +02:00 |
|
Alex Moreno
|
1a58424531
|
refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 08:33:31 +02:00 |
|
Alexandre Riera
|
48ee29568d
|
Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 05:26:28 +00:00 |
|
Alex Moreno
|
d735f142a1
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 05:04:28 +00:00 |
|
Carlos Satorres
|
9b4c4496b6
|
Merge branch 'dev' into 5760-changesSMS
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 11:16:02 +00:00 |
|
Alexandre Riera
|
81a96e7d82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 09:03:23 +02:00 |
|
Carlos Satorres
|
ec9dfa90fd
|
refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 08:06:45 +02:00 |
 Pablo Natek
|
ac67a2606f
|
Merge branch 'dev' into 5735-creditFormat
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 07:11:13 +02:00 |
|
Carlos Satorres
|
bdffc0401f
|
refs #5760 update getChanges, traduccion
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-08 15:29:03 +02:00 |
|
Alex Moreno
|
96d88cdf4b
|
refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 14:42:07 +02:00 |
|
Vicent Llopis
|
653c37f048
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
|
2023-06-08 13:12:59 +02:00 |
|
Carlos Satorres
|
7ea7816800
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 12:49:28 +02:00 |
|
Juan Ferrer
|
32a0955c1d
|
refs #5667 Zone translations fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 12:48:14 +02:00 |
|
Alex Moreno
|
3e39564695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 12:39:36 +02:00 |
|
Carlos Satorres
|
0afc26e20c
|
refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 10:30:03 +02:00 |
|
Alex Moreno
|
5ba8a15316
|
refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 10:25:25 +02:00 |
|
Vicent Llopis
|
a88166cdb5
|
Merge branch 'dev' into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 05:15:24 +00:00 |
|
Juan Ferrer
|
9a63ce86aa
|
refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 23:54:27 +02:00 |
|
Juan Ferrer
|
980ea67c24
|
Merge pull request 'test' (!1596) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1596
|
2023-06-07 21:02:22 +00:00 |
|
Vicent Llopis
|
e2c7a38e82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 14:18:36 +02:00 |
|
Alex Moreno
|
1240a6b71a
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 11:44:47 +00:00 |
|
Alex Moreno
|
edc601fd5d
|
refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 13:34:13 +02:00 |
|
Carlos Satorres
|
4e08f51848
|
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 07:16:13 +00:00 |
|
Alexandre Riera
|
7121b1e516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 08:50:53 +02:00 |
|
Alex Moreno
|
abf454496d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-06-07 08:34:55 +02:00 |
|
Alexandre Riera
|
bfd421c188
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 06:30:43 +00:00 |
|
Carlos Satorres
|
d09075d490
|
Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 05:57:05 +00:00 |
|
Vicent Llopis
|
3805812aba
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 07:43:44 +02:00 |
|
Alexandre Riera
|
16ad082967
|
back fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 07:36:30 +02:00 |
|
Alex Moreno
|
ac0e7ae32b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-07 07:08:02 +02:00 |
|
Alex Moreno
|
cb50c617ee
|
refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-06 15:09:01 +02:00 |
|
Carlos Satorres
|
05111c9268
|
hotfix test front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 11:43:14 +02:00 |
|
Carlos Satorres
|
6f3704c365
|
hotfix colors ticket advance ticket future
|
2023-06-06 11:42:35 +02:00 |
|
Alexandre Riera
|
36b0216640
|
refs #5513 changed tests description
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 07:40:38 +02:00 |
|
Alexandre Riera
|
9c9a2d4fe2
|
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 12:25:50 +00:00 |
|
Alexandre Riera
|
15b5f10a93
|
refs #5513 addFromBuy back added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 09:10:19 +02:00 |
|
Juan Ferrer
|
fe32a2af05
|
refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 08:35:07 +02:00 |
|
Alex Moreno
|
91b0e3013a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 08:11:47 +02:00 |
|
Alex Moreno
|
bca7224f74
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 08:09:16 +02:00 |
|
Juan Ferrer
|
47c6ad6a71
|
refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 15:48:27 +02:00 |
|
Juan Ferrer
|
45eba4533a
|
refs #5667 VnUser translation added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 15:47:45 +02:00 |
|
Juan Ferrer
|
5be79bbdef
|
refs #5667 VnUser translations added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 15:31:36 +02:00 |
|
Alex Moreno
|
86cd5f5237
|
refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-02 15:07:02 +02:00 |
|
Vicent Llopis
|
01175a4c6c
|
quitado vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:32:34 +02:00 |
|
Vicent Llopis
|
186ec2ea41
|
fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:22:27 +02:00 |
|
Juan Ferrer
|
c05d6bb9a1
|
refs #5563 WorkerDocument translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 11:43:44 +02:00 |
|
Alexandre Riera
|
37bbc66ca4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 09:39:46 +02:00 |
|
Juan Ferrer
|
95715763a1
|
refs #5667 Worker translations added/fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 08:57:22 +02:00 |
|
Alex Moreno
|
9462ca90a7
|
refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:29:46 +02:00 |
|
Alex Moreno
|
d134ca45f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 14:19:23 +02:00 |
|
Alex Moreno
|
69bf26433d
|
fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 13:19:34 +02:00 |
|
Alexandre Riera
|
f9528b922c
|
refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 08:32:06 +02:00 |
|
Carlos Satorres
|
0ee8811c15
|
refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 07:52:21 +02:00 |
|
Carlos Satorres
|
967e07933d
|
refs #5398 fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 14:46:19 +02:00 |
|
Alex Moreno
|
0aed2c2c08
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 13:10:25 +02:00 |
|
Alexandre Riera
|
eeadd72cc4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 09:53:56 +02:00 |
|
Alex Moreno
|
6d23ef5d1e
|
Merge branch 'master' into 5153---business-type-worker-descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 05:04:57 +00:00 |
|
Juan Ferrer
|
a4d7988591
|
refs #5517 Translations fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 19:39:11 +02:00 |
|
Carlos Satorres
|
d6c588d7eb
|
Merge branch 'dev' into 5398-fixErrorWarehouses
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 14:02:54 +00:00 |