 Guillermo Bonet
|
badb4d69a2
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 06:15:40 +00:00 |
 Pablo Natek
|
e2a2454d4e
|
Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 10:31:35 +00:00 |
|
Pablo Natek
|
dc100f7959
|
fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 11:29:57 +01:00 |
 Juan Ferrer
|
bb6f3b4cfd
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 08:56:25 +01:00 |
|
Guillermo Bonet
|
500eb22dc6
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 06:43:58 +00:00 |
|
Guillermo Bonet
|
8da36569f7
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-17 07:44:43 +01:00 |
|
Guillermo Bonet
|
3d1c69be56
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 07:43:32 +01:00 |
|
Guillermo Bonet
|
2f611391b9
|
Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good
Details
This reverts commit bfd6e1f398.
|
2023-11-17 07:17:29 +01:00 |
|
Juan Ferrer
|
c2e295f777
|
fix: refs #6432 account sync fixes
|
2023-11-17 00:08:29 +01:00 |
|
Juan Ferrer
|
ea5a881d1f
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:10:30 +01:00 |
|
Juan Ferrer
|
1937560118
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:07:30 +01:00 |
|
Juan Ferrer
|
4f5242e3ae
|
fix: refs #6432 account sync fixes
|
2023-11-16 23:07:26 +01:00 |
 Javier Segarra
|
9e64939810
|
refs #6434 feat: add Id property in model
|
2023-11-16 11:56:48 +01:00 |
 Alex Moreno
|
b8d256e4e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:58:51 +01:00 |
|
Alex Moreno
|
f677382f96
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:29:53 +01:00 |
|
Javier Segarra
|
e4f7790843
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 09:15:01 +01:00 |
|
Javier Segarra
|
c6b5d7f5a4
|
refs #6434 feat: rename id key by token
|
2023-11-16 08:30:01 +01:00 |
|
Guillermo Bonet
|
bfd6e1f398
|
refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 08:29:00 +01:00 |
|
Alex Moreno
|
5bdf6a7338
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 07:56:23 +01:00 |
|
Javier Segarra
|
13720291b2
|
refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 15:18:02 +01:00 |
|
Alex Moreno
|
ac3d23579a
|
Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 13:50:21 +00:00 |
 Carlos Satorres
|
5b587b3449
|
Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:56:45 +00:00 |
|
Javier Segarra
|
e0f6d08a1e
|
refs #6434 feat: create signInLog table
|
2023-11-15 13:49:41 +01:00 |
 Sergio De la torre
|
a5d94b3a26
|
Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:43:58 +00:00 |
|
Alex Moreno
|
89967b8538
|
fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 13:16:31 +01:00 |
|
Sergio De la torre
|
692c5eb164
|
refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 12:38:08 +01:00 |
|
Guillermo Bonet
|
2847b993d3
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:30:23 +00:00 |
|
Javier Segarra
|
f7b0882978
|
refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:50:56 +01:00 |
 Javi Gallego
|
a4328e607e
|
Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:11:05 +01:00 |
|
Javier Segarra
|
4061241650
|
refs #6434 feat: create signInLog table
|
2023-11-15 09:37:03 +01:00 |
|
Alex Moreno
|
2a67048594
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:54:47 +01:00 |
|
Alex Moreno
|
88ec0f24c3
|
ref #5914 rename table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:45:52 +01:00 |
|
Carlos Satorres
|
f3faf37e1a
|
hotfix addressFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 12:34:00 +01:00 |
|
Alex Moreno
|
2cd9c9c688
|
Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:36:47 +00:00 |
|
Alex Moreno
|
bc6389fd66
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:00:12 +00:00 |
|
Alex Moreno
|
aec1c9d447
|
fix: correct align
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 09:54:07 +01:00 |
|
Javier Segarra
|
384b5eb7c7
|
refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:56:16 +01:00 |
|
Javier Segarra
|
aab88dc7de
|
refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-13 09:54:12 +01:00 |
|
Javier Segarra
|
3c5af184bb
|
refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 15:12:49 +01:00 |
|
Guillermo Bonet
|
a4cbc33ee1
|
Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-10 11:55:38 +01:00 |
|
Guillermo Bonet
|
b7da144967
|
feat: refs #6023 Added SELECT FOR UPDATE
|
2023-11-10 11:55:37 +01:00 |
|
Guillermo Bonet
|
eb98de71b1
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 10:49:38 +00:00 |
|
Carlos Satorres
|
a1c8bba4a5
|
hotfix addressId
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 11:29:18 +01:00 |
|
Alex Moreno
|
0fed5c1ab4
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 09:59:24 +00:00 |
|
Alex Moreno
|
2eacf7391e
|
refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 08:46:49 +01:00 |
|
Alex Moreno
|
e9666a5930
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-11-10 08:11:52 +01:00 |
 Jorge Penadés
|
40b9a83606
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:59:12 +01:00 |
|
Jorge Penadés
|
8d94a94e14
|
ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:56:50 +01:00 |
|
Jorge Penadés
|
513562955b
|
ref #5835 test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:53:41 +01:00 |
|
Jorge Penadés
|
52f1843580
|
ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:00:49 +01:00 |
|
Jorge Penadés
|
0baa9c5a98
|
ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:34:53 +01:00 |
|
Jorge Penadés
|
b07858fddb
|
ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:33:46 +01:00 |
|
Guillermo Bonet
|
9668468f94
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:06:55 +00:00 |
|
Jorge Penadés
|
01d3c23cf0
|
ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 11:57:52 +01:00 |
|
Alex Moreno
|
52f419d4cf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
|
2023-11-09 09:33:22 +01:00 |
|
Sergio De la torre
|
4258015c07
|
refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 08:04:38 +01:00 |
|
Javi Gallego
|
9d54618620
|
fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-08 10:01:02 +01:00 |
|
Sergio De la torre
|
d30c4e4463
|
refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-07 16:13:21 +01:00 |
|
Pablo Natek
|
1c6618d494
|
fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-06 14:56:48 +01:00 |
|
Pablo Natek
|
aa800b1fd3
|
Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-06 14:23:38 +01:00 |
|
Pablo Natek
|
a75565f2ce
|
feat(client.create): refs #6150 clientCredit update fix
|
2023-11-06 14:23:36 +01:00 |
|
Juan Ferrer
|
99c88e6f5d
|
fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-05 09:33:18 +01:00 |
|
Alex Moreno
|
d06810b1b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-03 14:58:55 +01:00 |
|
Alex Moreno
|
a523e32373
|
refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-03 07:57:53 +01:00 |
|
Sergio De la torre
|
728838334c
|
hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 14:42:22 +01:00 |
|
Pablo Natek
|
2d3ee4a16e
|
Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 13:05:31 +00:00 |
|
Pablo Natek
|
175e73e565
|
fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 14:05:14 +01:00 |
|
Alex Moreno
|
740d2fb976
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-11-02 08:48:03 +01:00 |
|
Alex Moreno
|
83b9ef72fc
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 08:47:44 +01:00 |
|
Alex Moreno
|
742d6de986
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 07:28:41 +01:00 |
 Carlos Andrés
|
8c1ff26de7
|
Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 11:12:40 +00:00 |
 Robert Ferrús
|
6112c7ba5f
|
refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 09:59:34 +01:00 |
|
Pablo Natek
|
a47d31cec9
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 06:48:53 +00:00 |
|
Alex Moreno
|
37dce99447
|
refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-30 15:00:05 +01:00 |
|
Pablo Natek
|
e504ad313c
|
remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-30 14:56:33 +01:00 |
|
Alex Moreno
|
a80715583c
|
refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-30 14:16:25 +01:00 |
|
Jorge Penadés
|
ab0640291b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-30 08:25:41 +01:00 |
|
Alex Moreno
|
bd8cc897c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-10-30 07:21:31 +01:00 |
|
Pablo Natek
|
14753212bb
|
fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 18:07:17 +02:00 |
|
Pablo Natek
|
65a1d052dc
|
feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 18:03:40 +02:00 |
|
Sergio De la torre
|
7ae12327f5
|
refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 16:16:22 +02:00 |
|
Alex Moreno
|
ae160890a8
|
refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-27 15:06:20 +02:00 |
|
Pablo Natek
|
42bbdf9814
|
feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 13:41:32 +02:00 |
|
Pablo Natek
|
524ac4d99d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges
|
2023-10-26 22:16:06 +02:00 |
|
Pablo Natek
|
3584b15c19
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
|
2023-10-26 22:10:35 +02:00 |
|
Alex Moreno
|
55d80458cc
|
refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 14:37:42 +02:00 |
|
Alex Moreno
|
30895f444f
|
Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 12:14:31 +00:00 |
|
Alex Moreno
|
6b94ea7d11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-10-26 09:48:35 +02:00 |
|
Jorge Penadés
|
3a1227bdc2
|
ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 09:20:25 +02:00 |
|
Jorge Penadés
|
da2bc416f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 08:26:35 +02:00 |
|
Alex Moreno
|
013b010c22
|
refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 07:56:57 +02:00 |
|
Alex Moreno
|
26bdbabff5
|
refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-25 15:48:19 +02:00 |
|
Alex Moreno
|
a501d577f8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:23:00 +02:00 |
|
Alex Moreno
|
efa9f16452
|
fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:22:44 +02:00 |
|
Carlos Andrés
|
001d7cd574
|
Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 15:03:38 +00:00 |
|
Jorge Penadés
|
9f141238bc
|
ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 11:47:54 +02:00 |
|
Alex Moreno
|
5442476f05
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-10-24 10:35:11 +02:00 |
|
Jorge Penadés
|
35bb949fcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 10:13:38 +02:00 |
|
Jorge Penadés
|
f1deeb69ca
|
ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:34:04 +02:00 |
|
Alex Moreno
|
22b7c59812
|
refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:23:03 +02:00 |