Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
Alex Moreno
|
b2e7ea3089
|
refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 15:16:41 +01:00 |
David Domenech
|
eb0766bafd
|
Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 14:08:47 +00:00 |
David Domenech
|
8ab981907d
|
refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:25:00 +01:00 |
Javi Gallego
|
2fa56cce4b
|
fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 09:22:00 +01:00 |
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00:00 |
Alex Moreno
|
824ca1d70a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 07:42:50 +01:00 |
Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 12:42:25 +01:00 |
Jorge Penadés
|
8ac3887d80
|
refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 10:53:38 +01:00 |
Javi Gallego
|
aa0794e136
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 06:31:25 +01:00 |
Jorge Penadés
|
db15285858
|
refs #5811 test updated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:21:56 +01:00 |
Jorge Penadés
|
2e67ef4f5d
|
refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:32:07 +01:00 |
Jorge Penadés
|
900dffbbba
|
refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:26:28 +01:00 |
Jorge Penadés
|
26a8cc6a2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:41:24 +01:00 |
Jorge Penadés
|
3f8d1ff617
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:17:31 +01:00 |
Alex Moreno
|
02e8b90926
|
refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:12:07 +01:00 |
Alex Moreno
|
ee1a0c15ee
|
refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 15:09:55 +01:00 |
Alex Moreno
|
0ddfb28327
|
refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 07:56:15 +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 |
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 |
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 |
Javi Gallego
|
3f7663da97
|
feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:09:04 +01:00 |
Pablo Natek
|
2a57f7e98a
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 14:02:27 +00:00 |
Pablo Natek
|
0a5e8e1902
|
refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 14:49:54 +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
|
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 |
Guillermo Bonet
|
2792efa9cd
|
perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 08:36:05 +01: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
|
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 |
Guillermo Bonet
|
05a7498219
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:14:21 +00:00 |
Guillermo Bonet
|
0771548ef1
|
refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 14:14:09 +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 |
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 |
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 |
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 |
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
|
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 |
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
|
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 |
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
|
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 |
Jorge Penadés
|
1231d6dd1d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-24 08:34:42 +02:00 |
Alex Moreno
|
247aa5af2a
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:52:06 +02:00 |
Alex Moreno
|
cf856a585b
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:50:00 +02:00 |
Alex Moreno
|
dc00b85bec
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-23 08:31:37 +02:00 |
Pablo Natek
|
0237517f0c
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:55:30 +00:00 |
Alex Moreno
|
1eabad7f4b
|
refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 12:37:44 +02:00 |
Pablo Natek
|
75cfea4a2e
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:18:43 +00:00 |
Alex Moreno
|
ef1ddfd484
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:28:37 +02:00 |
Alex Moreno
|
84aed7ca21
|
refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:26:56 +02:00 |
Alex Moreno
|
d5f98700e7
|
refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 08:32:35 +02:00 |
Pablo Natek
|
9cb4e57951
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 05:31:12 +00:00 |
Carlos Andrés
|
16f20cea70
|
refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 15:12:06 +02:00 |
Alex Moreno
|
a0e32cf455
|
Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:05:25 +00:00 |
Guillermo Bonet
|
5c51d7fb04
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:22:33 +02:00 |
Alex Moreno
|
d9ab607126
|
refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:03:11 +02:00 |
Jorge Penadés
|
e680a6a080
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 10:00:43 +02:00 |
Pablo Natek
|
f1b11fdca2
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 06:51:50 +00:00 |
Pablo Natek
|
488181e1b6
|
feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:37:28 +02:00 |
Alex Moreno
|
da20697052
|
refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 15:19:26 +02:00 |
Javi Gallego
|
44ce0a8730
|
refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:46:41 +02:00 |
Pablo Natek
|
44bc30adf7
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:35:53 +00:00 |
Pablo Natek
|
2bb4300e1b
|
remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:35:45 +02:00 |
Alex Moreno
|
a84f6fe1da
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:05:04 +02:00 |
Alex Moreno
|
d4770c525e
|
refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 11:00:41 +02:00 |
Pablo Natek
|
4f911e644c
|
fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:43:03 +02:00 |
Pablo Natek
|
033c02750b
|
refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:24:58 +02:00 |
Alex Moreno
|
093431ecdf
|
refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 15:27:10 +02:00 |
Alex Moreno
|
f79e711617
|
refs #6199 test: updateQuantity refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 10:19:33 +02:00 |
Alex Moreno
|
b769fa9bcf
|
refs #6199
gitea/salix/pipeline/head This commit looks good
Details
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
|
2023-10-16 10:10:57 +02:00 |
Jorge Penadés
|
ab6c58cd12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 08:18:00 +02:00 |
Pablo Natek
|
f832c1d9ec
|
refs #5979 getUrl
|
2023-10-15 11:08:33 +02:00 |
Alex Moreno
|
ab1cc34015
|
refs #6199 feat(sale): best quantity restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 15:14:48 +02:00 |
Carlos Andrés
|
9c0334619d
|
refs #6199
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:56:50 +02:00 |
Sergio De la torre
|
35c0ec0d04
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 15:14:13 +00:00 |
Guillermo Bonet
|
3e70cb07e0
|
refs #6184 Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:20:35 +02:00 |
Guillermo Bonet
|
c0089b1fa0
|
refs #6184 Added cmrFk in ticket model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:20:30 +02:00 |
Guillermo Bonet
|
d9339af87e
|
refs #6184 Insert in ticketCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:46:56 +02:00 |
Guillermo Bonet
|
3e522b08b6
|
refs #6184 Added saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:43:21 +02:00 |
Jorge Penadés
|
179d8ab87d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 11:30:53 +02:00 |
Carlos Satorres
|
1adfa33a9a
|
hotfix length sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 14:52:30 +02:00 |
Carlos Satorres
|
62c7dc9db5
|
hotfix-change minus
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:16:42 +02:00 |
Alex Moreno
|
ca86b3cc2f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:27:35 +02:00 |
Alex Moreno
|
7cd2e290ce
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:22:41 +02:00 |
Pablo Natek
|
99d65804e8
|
refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 13:29:39 +02:00 |
Sergio De la torre
|
3ba349b74a
|
refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:14:30 +02:00 |
Alex Moreno
|
542119983b
|
refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:28:23 +02:00 |
Alex Moreno
|
f3c55cdee9
|
refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 16:00:09 +02:00 |
Jorge Penadés
|
4b213c1c9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:31:45 +02:00 |
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
Sergio De la torre
|
2ea2943eca
|
refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 13:12:18 +02:00 |
Jorge Penadés
|
e1e225a1ef
|
Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 12:42:47 +02:00 |
Jorge Penadés
|
50543963c1
|
ref #5914 refactor createTicketRefund
|
2023-09-26 12:42:45 +02:00 |
Jorge Penadés
|
45fbe6f174
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 06:36:44 +00:00 |
Jorge Penadés
|
db8dc8487b
|
ref #6246 replace name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:28:08 +02:00 |
Jorge Penadés
|
474399b383
|
ref #5914 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:23:51 +02:00 |
Jorge Penadés
|
f4ce5db93b
|
Merge branch 'dev' into 6246-checkTicketSales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 11:49:18 +00:00 |
Jorge Penadés
|
c8c06f498c
|
ref #5914 fixed tests e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 10:49:47 +02:00 |
Jorge Penadés
|
731bad5981
|
ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 14:52:56 +02:00 |
Jorge Penadés
|
f64f7a975d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:51:20 +02:00 |
Jorge Penadés
|
6fe52ba3e8
|
ref #6246 check sales and update test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 12:48:54 +02:00 |
Sergio De la torre
|
ed1d8ca94f
|
refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 12:29:56 +02:00 |
Jorge Penadés
|
82f14e62ad
|
ref #5914 tests fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 16:08:55 +02:00 |
Jorge Penadés
|
ac4aea7d38
|
ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 09:14:46 +02:00 |
Carlos Satorres
|
cd20a2d06d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 07:32:19 +02:00 |
Carlos Satorres
|
f60b6b84fe
|
refs #5843 fix back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 11:58:36 +02:00 |
Jorge Penadés
|
4870b0830b
|
ref #5914 fix refund and change method name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 11:06:30 +02:00 |
Pablo Natek
|
d29c37693d
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-20 08:53:53 +00:00 |
Jorge Penadés
|
87cee57e56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 10:47:53 +02:00 |
Javi Gallego
|
29a186fa18
|
Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-09-20 08:18:46 +02:00 |
Javi Gallego
|
45cf1b1ff3
|
fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-20 08:12:07 +02:00 |
Carlos Satorres
|
daf5b343fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-19 13:58:13 +02:00 |
Alex Moreno
|
2dbd711104
|
Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 05:24:05 +00:00 |
Sergio De la torre
|
881a1ee0b8
|
refs #5652 modify: solved Tests
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-15 11:24:17 +02:00 |
Pablo Natek
|
66e851b5ea
|
refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:48:58 +02:00 |
Carlos Satorres
|
c2f73eb548
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-09-07 13:38:38 +02:00 |
Carlos Satorres
|
4918e3ccc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 14:02:53 +02:00 |
Javi Gallego
|
6a4d8fbfbf
|
Merge branch 'dev' into 6173-dump-BBDD
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-05 13:48:35 +02:00 |
Javi Gallego
|
734b948aac
|
refs #6173 back test fixed and fixtures refactored
|
2023-09-01 11:52:48 +02:00 |
Sergio De la torre
|
7d8828e604
|
refs #6132 fix: saveSign without route
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 13:50:31 +02:00 |
Carlos Satorres
|
017e0dd948
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-31 13:29:34 +02:00 |
Javi Gallego
|
ea5e10faed
|
Merge pull request 'test' (!1730) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1730
|
2023-08-31 07:58:48 +00:00 |
Juan Ferrer
|
d60e35d817
|
Merge pull request 'refs #6153 master into test' (!1726) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1726
|
2023-08-29 06:50:27 +00:00 |
Jorge Penadés
|
5fe12d9281
|
Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 12:43:26 +00:00 |
Jorge Penadés
|
ca28d2d78f
|
ref #5216 myOptions added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 14:37:32 +02:00 |
Vicent Llopis
|
f3e43686a3
|
refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 14:59:28 +02:00 |
Jorge Penadés
|
386de69bce
|
refs #5216 fix error handling
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 12:47:10 +02:00 |
Alex Moreno
|
4c1d9cd767
|
hotFix(priceDifference): import UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 11:32:20 +02:00 |
Jorge Penadés
|
3d4a99b07e
|
refs 5914 transferInvoice created
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 10:51:34 +02:00 |
Jorge Penadés
|
bda3937417
|
refs #5216 path replaced and test created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 10:01:07 +02:00 |
Jorge Penadés
|
0f3b633de4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 08:03:01 +02:00 |
Vicent Llopis
|
3cffdca0c7
|
Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 05:39:48 +00:00 |
Alex Moreno
|
3eacb4dbd9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:05:04 +02:00 |
Alex Moreno
|
508a4b2d34
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 12:04:27 +02:00 |
Jorge Penadés
|
82d08261e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
|
2023-08-23 10:25:48 +02:00 |
Vicent Llopis
|
dd1dbcbd4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 13:39:09 +02:00 |
Vicent Llopis
|
2f2611a705
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:31:17 +00:00 |
Carlos Satorres
|
b1b6bd13ea
|
refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:45:41 +02:00 |
Alex Moreno
|
a26652045c
|
refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:17:46 +02:00 |
Guillermo Bonet
|
6d60592fb9
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-21 09:34:32 +02:00 |
Alex Moreno
|
518d5111e4
|
refs #6127 hotFix(ticketRefund): get ticketFk front ticketService
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-17 08:42:04 +02:00 |
Alex Moreno
|
1ec51d94cf
|
refs #5134 feat: correct sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:53:43 +02:00 |
Sergio De la torre
|
a6047d257b
|
refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:45:18 +02:00 |
Alex Moreno
|
9ef4ba9bef
|
refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:32:49 +02:00 |
Sergio De la torre
|
6eb88f8ab7
|
refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-11 11:58:30 +02:00 |
Jorge Penadés
|
27ab6639c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-08-10 13:26:42 +02:00 |
Carlos Satorres
|
f70b767506
|
Merge branch 'dev' into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 08:05:46 +00:00 |
Jorge Penadés
|
132640cddf
|
Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-08 15:10:40 +02:00 |
Jorge Penadés
|
7ca6c6b96d
|
refs #5914 fix merge
|
2023-08-08 15:10:15 +02:00 |
Alex Moreno
|
ce78fc8e5d
|
refs #5986 feat: state model add classColor properties
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 15:06:28 +02:00 |
Alex Moreno
|
19c09d60a2
|
refs #5986 feat(ticket_filter): add classColor column
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 15:04:21 +02:00 |
Alex Moreno
|
0d5c6ffdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-08 07:10:25 +02:00 |
Alex Moreno
|
e85cddec3c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 10:19:27 +02:00 |
Alex Moreno
|
26d6bbff4c
|
refs #5929 hotFix: add UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 10:04:46 +02:00 |
Guillermo Bonet
|
eeb68e1ad9
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-04 08:54:41 +00:00 |
Alex Moreno
|
700ba4a7b1
|
refs #5914 feat(transferInvoiceOut): optimization
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-04 08:22:43 +02:00 |
Carlos Satorres
|
1308efb98d
|
Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-04 01:21:52 +00:00 |
Jorge Penadés
|
725fe674c0
|
refs #5914 WIP fixing transacticions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-03 14:01:50 +02:00 |
Guillermo Bonet
|
602f57bca9
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 08:54:32 +00:00 |
Guillermo Bonet
|
aab0771e6e
|
refs #5995 Removed my code in closure.js
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 14:37:38 +02:00 |
Alex Moreno
|
fd9b842e6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-08-02 13:58:40 +02:00 |
Guillermo Bonet
|
16353dfddc
|
refs #5995 First commit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 07:35:40 +02:00 |
Jorge Penadés
|
bd122e6327
|
refs #5014 WIP trasactions added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-01 16:13:24 +02:00 |
Carlos Satorres
|
2bde94a667
|
Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 11:40:29 +00:00 |
Jorge Penadés
|
3ef74cab5c
|
refs #5914 WIP created transferInvoiceOut
|
2023-08-01 12:45:57 +02:00 |
Alex Moreno
|
30c5e8d8cc
|
hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 11:11:29 +02:00 |
Carlos Satorres
|
12acda0b1c
|
refs #4764 ticketSerivce refund add
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-31 11:06:19 +02:00 |
Jorge Penadés
|
22f76ec6a9
|
refs #5914 WIP clone method created
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-31 10:33:51 +02:00 |
Jorge Penadés
|
e63efa4f0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-31 10:32:41 +02:00 |
Jorge Penadés
|
50155cea8d
|
refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 15:21:43 +02:00 |
Vicent Llopis
|
1d4ce2c703
|
refs #5804 fix: delete transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 12:24:24 +02:00 |
Vicent Llopis
|
65b9cadd9e
|
refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-27 12:51:14 +02:00 |
Vicent Llopis
|
777426aa05
|
refs #5561 add backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-27 07:58:55 +02:00 |
Jorge Penadés
|
10361ba78e
|
refs #5216 addExpeditionState refactored
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 13:33:56 +02:00 |
Carlos Satorres
|
118f41c898
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 13:12:01 +02:00 |
Jorge Penadés
|
bbc26d8ba4
|
WIP refs #5216 addExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 12:36:30 +02:00 |
Jorge Penadés
|
0b88194f09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 10:27:01 +02:00 |
Jorge Penadés
|
05eff94217
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 10:22:32 +02:00 |