Pablo Natek
|
1920a1b893
|
merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:23:23 +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 |
Sergio De la torre
|
f6bf36d46a
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:02:25 +00: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 |
Alex Moreno
|
03687cb482
|
hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:56:56 +02:00 |
Jorge Penadés
|
9ba3c9c8bc
|
Merge branch 'dev' into 5914-transferInvoiceOut
|
2023-10-13 11:17:12 +00:00 |
Jorge Penadés
|
6b8a6c7a69
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:15:04 +00:00 |
Javi Gallego
|
0081c55b9e
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 10:56:33 +00: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
|
c79f706cdc
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:23:39 +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 |
Javi Gallego
|
df9d6fd6f8
|
efectue con acento
|
2023-10-11 14:06:28 +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 |
Carlos Satorres
|
0023561acb
|
refs #6293 traducción
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:04:12 +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 |
Pablo Natek
|
f40185c2d4
|
refs #4764 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:24:52 +02:00 |
Alex Moreno
|
7a6022efd4
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 06:31:54 +00:00 |
Jorge Penadés
|
0d39471970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-10-05 08:20:47 +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
|
b33700abc9
|
refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 11:57:25 +02:00 |
Jorge Penadés
|
9536fdba58
|
ref #6119 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:10:58 +02:00 |
Pablo Natek
|
0fa56149d7
|
refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:47:22 +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 |
Jorge Penadés
|
f1dc809147
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 06:22:51 +00: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 |
Jorge Penadés
|
32a0aedf11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-18 08:07:27 +02: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 |
Jorge Penadés
|
48a6bf2969
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-08 08:05:17 +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 |
Jorge Penadés
|
427425a750
|
ref #6119 simplifiy component
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-07 09:50:13 +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 |
Jorge Penadés
|
f46d6355dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-04 08:06:47 +02:00 |
Jorge Penadés
|
9eff7c509f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 12:06:49 +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 |
Jorge Penadés
|
c2a54b8c65
|
ref #6119 vnLinkPhone created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 13:02:56 +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 |
Jorge Penadés
|
05f0f72c73
|
refs #6119 microsip link added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-30 14:14:48 +02:00 |
Carlos Satorres
|
0b9199688e
|
refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-30 12:48:57 +02: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 |
Alex Moreno
|
afc0c98065
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 11:05:37 +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
|
00fcd3a800
|
refs #6083 feat: add lilium ticketSms
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 14:03:07 +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 |
Carlos Satorres
|
79d88facc3
|
refs #4764 add test front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 12:33:56 +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 |
Carlos Satorres
|
d01584bfb3
|
refs #4764 service
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-27 15:15:55 +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 |
Jorge Penadés
|
a0fee6ad50
|
refs #5929 removed useless vars
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-26 09:20:54 +02:00 |
Jorge Penadés
|
fa9dfdf411
|
refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-25 16:32:38 +02:00 |
Jorge Penadés
|
96483a827f
|
Merge branch 'dev' into 5929-editTicketPrice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-25 13:40:08 +00:00 |
Jorge Penadés
|
543fbf3c0a
|
refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-25 15:35:08 +02:00 |
Jorge Penadés
|
9978db9d52
|
refs #5929 WIP test created
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-25 11:33:01 +02:00 |
Jorge Penadés
|
ea4190f15c
|
refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-24 13:32:28 +02:00 |
Jorge Penadés
|
4f80221101
|
refs #5929 added ACL and accurate errors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-24 10:34:44 +02:00 |
Alex Moreno
|
23308d7ae3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
|
2023-07-21 12:40:59 +02:00 |
Vicent Llopis
|
9bf891fcec
|
refs #5561 fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-21 12:20:06 +02:00 |
Vicent Llopis
|
f926c60017
|
remove file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-21 12:02:02 +02:00 |
Vicent Llopis
|
51f9055d23
|
remove file
|
2023-07-21 12:01:57 +02:00 |
Vicent Llopis
|
cf0b6f8c6e
|
refs #5561 fix: saleGroupDetail.saleFk UNIQUE
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-21 12:01:01 +02:00 |
Vicent Llopis
|
f52b398596
|
refs #5561 refactor: sustituidos sql por loopback
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-21 09:50:27 +02:00 |
Alex Moreno
|
eb963ff993
|
refs #5866 fix(transferClient): correct variable name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-21 08:28:19 +02:00 |
Jorge Penadés
|
618989052a
|
refs #5866 fix transferClient and test added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 15:15:33 +02:00 |
Vicent Llopis
|
7d2e98267f
|
refs #5561 eliminados valores a piñon
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 15:09:31 +02:00 |
Jorge Penadés
|
8281dbacd1
|
Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 12:34:16 +00:00 |
Vicent Llopis
|
8f7caa1183
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-20 11:42:10 +02:00 |
Jorge Penadés
|
2fa1c4b6ca
|
Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 08:23:07 +00:00 |
Jorge Penadés
|
9db8ae237f
|
refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 10:19:03 +02:00 |
Vicent Llopis
|
7312ed9cc4
|
refs #5244 fix back test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 09:56:07 +02:00 |
Vicent Llopis
|
04ca5743a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-20 09:40:41 +02:00 |
Vicent Llopis
|
4755c50cd8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved
gitea/salix/pipeline/head Build queued...
Details
|
2023-07-20 07:22:30 +02:00 |
Alex Moreno
|
8c84f006b0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 07:15:30 +02:00 |
Alex Moreno
|
2c79056f34
|
refs #5976 error extended
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-19 13:44:04 +02:00 |
Carlos Satorres
|
36c31af455
|
refs #5690 rounding translate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-19 12:38:13 +02:00 |
Carlos Satorres
|
aaba4e74b8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems
|
2023-07-19 12:00:59 +02:00 |
Alex Moreno
|
f07ac89cb6
|
refs #5976 add custom error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-18 15:01:04 +02:00 |
Vicent Llopis
|
7bd378e9dd
|
refs #
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-18 14:15:56 +02:00 |
Alex Moreno
|
15dee8bef4
|
refs #5976 refactor: transaferSale call setDeleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-17 15:19:36 +02:00 |
Vicent Llopis
|
28eedbfd23
|
Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-14 11:04:06 +00:00 |
Vicent Llopis
|
75a66571ba
|
refs #5244 refactor: modificados todos los url='activeWith...'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 12:59:39 +02:00 |
Vicent Llopis
|
1d7f0e2135
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 11:42:49 +02:00 |
Vicent Llopis
|
392dc5060a
|
refs #4770 delete test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 10:19:12 +02:00 |
Alex Moreno
|
ac4e264d53
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-13 08:43:50 +02:00 |
Vicent Llopis
|
337ce56a60
|
refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-13 08:37:11 +02:00 |
Alex Moreno
|
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
|
2023-07-12 13:09:58 +02:00 |
Alex Moreno
|
9cb29b9166
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-12 13:05:17 +02:00 |
Vicent Llopis
|
bd85cf4e90
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-12 12:29:17 +02:00 |
Vicent Llopis
|
da13f0811c
|
refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-11 09:59:11 +02:00 |
Vicent Llopis
|
93e70e699a
|
refs #5874 feat: refactorizado proceso facturación
|
2023-07-11 09:19:15 +02:00 |
Alex Moreno
|
8922d27f20
|
refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-07 12:25:02 +02:00 |
Alex Moreno
|
8fe9b387ce
|
refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-06 15:16:52 +02:00 |
Alex Moreno
|
be0120728d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
|
2023-07-06 15:15:36 +02:00 |
Carlos Satorres
|
9c9b53917a
|
refs #5334 fix error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-06 08:20:33 +02:00 |
Alex Moreno
|
6530e87508
|
refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 15:20:51 +02:00 |
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:50:45 +02:00 |
Alex Moreno
|
444b08c566
|
refs #5712 test(docuware)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:09:52 +02:00 |
Carlos Satorres
|
f42273006c
|
refs #4764 service ant
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 07:36:01 +02:00 |
Carlos Satorres
|
3b81198a05
|
refs #4764 mod button
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 13:57:52 +02:00 |
Carlos Satorres
|
6b813cb859
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 11:54:19 +02:00 |
Alex Moreno
|
c7b9d0827e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 13:42:54 +02:00 |
Carlos Satorres
|
d03df4c5cc
|
refs #5690 ticketproblems
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 11:38:38 +02:00 |
Vicent Llopis
|
7b4e8570aa
|
refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-30 12:03:26 +02:00 |
Alex Moreno
|
f636c3b1ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 11:57:56 +02:00 |
Alex Moreno
|
5f42ee5f60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-06-30 07:55:47 +02:00 |
Javi Gallego
|
bc4058512a
|
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 12:43:16 +00:00 |
Vicent Llopis
|
011db142d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 12:49:55 +02:00 |
Carlos Andrés
|
1d993c74e5
|
refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 10:39:07 +02:00 |
Carlos Satorres
|
454cf30de7
|
refs #4764 boton save
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 08:27:20 +02:00 |
Carlos Satorres
|
319c6af354
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-06-29 06:37:23 +02:00 |
Vicent Llopis
|
e3e0c7e97a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 14:31:54 +02:00 |
Alex Moreno
|
befa385830
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 14:30:20 +02:00 |
Alex Moreno
|
f8a972c2f2
|
refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-27 14:48:22 +02:00 |
Alex Moreno
|
ecf742959c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-26 11:55:28 +02:00 |
Juan Ferrer
|
e32a29fc09
|
refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-25 19:08:13 +02:00 |
Vicent Llopis
|
a699e2d874
|
refs #5244 feat: añadido 'depatments' como binding
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 14:07:36 +02:00 |
Vicent Llopis
|
dd75302bbb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 13:33:09 +02:00 |
Vicent Llopis
|
e99627c0b2
|
codigo innecesario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 11:28:25 +02:00 |
Vicent Llopis
|
cea6fae649
|
fix: eliminada variable que no estaba definida
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 10:40:57 +02:00 |
Alex Moreno
|
5a6a18c76a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 09:20:54 +02:00 |
Carlos Satorres
|
8dd360bf1e
|
refs #4764 e2e solve
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-19 08:46:15 +02:00 |
Vicent Llopis
|
55e123e795
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-16 11:45:08 +02:00 |
Carlos Satorres
|
fbe4441eda
|
refs #4764 e2e solve
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-16 09:06:25 +02:00 |
Alex Moreno
|
50fe53fbb6
|
Merge branch 'test' into warnFix_ticket_sale_orderBy
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 05:38:14 +00:00 |
Carlos Satorres
|
9b950cd8d2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-06-16 07:23:41 +02:00 |
Alex Moreno
|
5163b7b253
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-06-15 15:14:41 +02:00 |
Carlos Satorres
|
b3022d0ce2
|
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-06-14 17:47:56 +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 |
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 |
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 |
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 |
Carlos Satorres
|
58bcad7b2d
|
refs #4764 validator create
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-12 12:42:30 +02: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
|
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 |
Carlos Satorres
|
06d1334e1f
|
refs #4764 withWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-09 14:30:46 +02:00 |
Carlos Satorres
|
9ca82a2f79
|
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-06-09 14:23:55 +02:00 |
Carlos Satorres
|
61d9e2dcd3
|
refs #4764 remake refund, back front
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 14:19:17 +02: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 |
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 |
Vicent Llopis
|
1e759119db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-06-08 11:13:07 +02:00 |
Vicent Llopis
|
cf559b2ba5
|
refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 09:19:57 +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 |
Carlos Satorres
|
a34519f6d0
|
refs #4764 refundTicket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 14:12:04 +02:00 |
Alex Moreno
|
e5ababb0a9
|
Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-07 11:49:40 +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 |
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
|
391dba6d2c
|
refs #5561 feat: add async functions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 12:15:39 +02:00 |
Vicent Llopis
|
024cb1e3f4
|
refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 11:56:14 +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 |
Carlos Satorres
|
4d333c3a68
|
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-06-05 10:38:59 +02:00 |
Vicent Llopis
|
5eac9d20dc
|
a
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 09:43:39 +02:00 |
Vicent Llopis
|
b253ea8edf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 09:40:23 +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 |
Vicent Llopis
|
67413360c6
|
refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 13:31:41 +02:00 |
Vicent Llopis
|
ba64dbbe46
|
refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:20:29 +02:00 |
Vicent Llopis
|
02d2afcb8b
|
refs #5561 feat: permite coloear todos los circulos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 10:57:28 +02:00 |
Vicent Llopis
|
cf2bf0a17b
|
refs #5561 delete: codigo obsoleto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 08:23:44 +02:00 |
Vicent Llopis
|
d727ea83ab
|
refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:31:16 +02:00 |
Vicent Llopis
|
0d85069e0f
|
refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 15:01:38 +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 |
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 |
Vicent Llopis
|
3b4626ee74
|
a
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 13:01:16 +02:00 |
Vicent Llopis
|
02665ec8e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-05-31 12:28:13 +02:00 |
Alex Moreno
|
9ebac5a3f8
|
Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-31 09:40:32 +00: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 |
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 |
Carlos Satorres
|
2c3869d961
|
refs #5398 capital letters
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 15:48:09 +02:00 |
Alex Moreno
|
c23d8282eb
|
refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-30 15:34:11 +02:00 |
Vicent Llopis
|
daeed312d0
|
refs #5244 fix: añadido vn-drop-down em html
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 15:16:15 +02:00 |
Vicent Llopis
|
6cf1e0953d
|
refs #5244 feat: intento de crear el componente workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 14:49:28 +02:00 |
Alexandre Riera
|
632662c440
|
refs #5595 added userId in makeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 10:49:10 +02:00 |
Alexandre Riera
|
e05d3b0793
|
Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-30 08:27:35 +00:00 |
Alexandre Riera
|
153542d2be
|
refs #5595 taking active connection
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 09:49:39 +02:00 |
Carlos Satorres
|
cb664ecec4
|
Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 09:18:57 +02:00 |
Carlos Satorres
|
ec5a5be9e6
|
refs #5328 remove spaces
|
2023-05-30 09:18:52 +02:00 |
Carlos Satorres
|
3872078507
|
Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 07:16:38 +00:00 |
Vicent Llopis
|
27700bd72c
|
Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 06:14:48 +00:00 |
Vicent Llopis
|
d2355412a0
|
Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 08:59:20 +00:00 |
Carlos Satorres
|
b797f747f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX
|
2023-05-29 10:00:33 +02:00 |
Vicent Llopis
|
d313517e14
|
Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 07:24:28 +00:00 |
Carlos Satorres
|
1593b4b626
|
Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 07:09:08 +00:00 |
Carlos Satorres
|
95c438b73a
|
refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 14:52:47 +02:00 |
Vicent Llopis
|
3ecfbe2052
|
refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 12:03:36 +02:00 |
Vicent Llopis
|
9e8efff016
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 11:55:32 +02:00 |
Alex Moreno
|
c7b8e57d95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 07:41:48 +02:00 |
Juan Ferrer
|
27d4d10472
|
refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 18:32:03 +02:00 |
Vicent Llopis
|
71d8a355bd
|
refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 15:03:22 +02:00 |
Vicent Llopis
|
96feb24f12
|
refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 13:28:44 +02:00 |
Alexandre Riera
|
a584e1ab5e
|
Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 11:22:51 +00:00 |
Vicent Llopis
|
ce211b436d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-25 13:00:11 +02:00 |
Carlos Satorres
|
fa8fd8d5bc
|
refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 11:41:14 +02:00 |
Carlos Satorres
|
d82a7eeeb7
|
Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 08:25:47 +00:00 |
Alex Moreno
|
a0da78700b
|
Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:49:40 +00:00 |
Alex Moreno
|
37a3275b27
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 08:56:10 +02:00 |
Carlos Satorres
|
1f24314ab2
|
refs #5635 fix back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 08:24:01 +02:00 |
Alex Moreno
|
0e6501f306
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master
|
2023-05-25 07:42:58 +02:00 |
Alex Moreno
|
e19ece6119
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:34:54 +02:00 |
Alex Moreno
|
42a39b6778
|
refs #5706 master to test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:22:56 +02:00 |
Alex Moreno
|
03e2b98485
|
hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 15:50:59 +02:00 |
Alex Moreno
|
6b66eb3bb2
|
refs #5679 typo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:59:58 +02:00 |
Carlos Satorres
|
d6d72ed289
|
refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-24 12:35:07 +02:00 |
Alexandre Riera
|
133c5dbca5
|
Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:18:26 +00:00 |
Alexandre Riera
|
05fb0a7203
|
refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:16:19 +02:00 |
Alex Moreno
|
30c896c975
|
refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 11:20:07 +02:00 |
Carlos Satorres
|
9b363bc7a4
|
refs #5635 remove vn, smart-table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:57:51 +02:00 |
Carlos Satorres
|
1bd54765f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition
|
2023-05-24 10:05:38 +02:00 |
Vicent Llopis
|
3caef0c135
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 07:46:08 +02:00 |
Vicent Llopis
|
1ddad7a5ec
|
Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:45:04 +00:00 |
Alex Moreno
|
6a6d28efa0
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:40:11 +00:00 |
Alexandre Riera
|
97653d9b8f
|
Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:07:33 +00:00 |
Vicent Llopis
|
3119ae4471
|
refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 15:12:20 +02:00 |
Vicent Llopis
|
2c7473b064
|
refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 15:06:38 +02:00 |
Vicent Llopis
|
0ab411ddc4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:45:03 +02:00 |
Carlos Satorres
|
d7d94796d6
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:13:47 +00:00 |
Alexandre Riera
|
bf8d82f3c6
|
refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 08:43:31 +02:00 |
Carlos Satorres
|
ee8685329f
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 06:23:19 +00:00 |
Alex Moreno
|
6f503e2a81
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-23 08:23:16 +02:00 |
Carlos Satorres
|
8ee581eb67
|
Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 06:02:17 +00:00 |
Alexandre Riera
|
b9f6dc0a39
|
Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 05:54:12 +00:00 |
Alexandre Riera
|
0e11bfab0b
|
refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:53:25 +02:00 |
Juan Ferrer
|
da0aa57539
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 19:06:20 +02:00 |
Juan Ferrer
|
26c2ab867d
|
Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1546
|
2023-05-22 17:04:32 +00:00 |
Carlos Satorres
|
3994e65040
|
refs #5648 spaces fix2
|
2023-05-22 15:56:14 +02:00 |
Carlos Satorres
|
a7c59f51b9
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 13:51:35 +00:00 |
Carlos Satorres
|
6d147e7af7
|
refs #5648 fix spaces
|
2023-05-22 14:30:04 +02:00 |
Carlos Satorres
|
9bc20493fe
|
#refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 12:02:07 +02:00 |
Carlos Satorres
|
1b19035d8d
|
refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 10:41:02 +02:00 |
Carlos Satorres
|
23287e5ebf
|
refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-22 08:30:23 +02:00 |
Carlos Satorres
|
32ce0c1a1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
|
2023-05-22 08:13:31 +02:00 |
Juan Ferrer
|
69b892f2fd
|
refs #5667 Translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-20 16:59:39 +02:00 |
Vicent Llopis
|
8eedba8a66
|
refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-19 13:34:07 +02:00 |
Juan Ferrer
|
6b0fd99eb8
|
refs #5667 Fixes: Style, translations, fixtures, UI
|
2023-05-19 10:56:15 +02:00 |
Vicent Llopis
|
5ec107188c
|
refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-19 10:30:36 +02:00 |
Vicent Llopis
|
8cf988b7d2
|
refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-19 08:02:17 +02:00 |
Carlos Satorres
|
2b1e951692
|
refs #5635 smart-table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 15:33:54 +02:00 |
Alex Moreno
|
f54d9180b1
|
fix front test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 14:44:05 +02:00 |
Alex Moreno
|
15a1965a53
|
refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-18 14:12:46 +02:00 |
Vicent Llopis
|
ec02972efb
|
refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-18 14:11:29 +02:00 |
Vicent Llopis
|
d33a84c39f
|
refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 09:30:21 +02:00 |
Vicent Llopis
|
463d209d77
|
refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 09:21:30 +02:00 |
Vicent Llopis
|
9263684ec5
|
refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 08:58:13 +02:00 |
Vicent Llopis
|
b66362d313
|
refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 08:33:17 +02:00 |
Alex Moreno
|
2ef922e80c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 08:10:10 +02:00 |
Vicent Llopis
|
a9f71ccbc1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:33:08 +02:00 |
Alex Moreno
|
ba763abc26
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:17:31 +02:00 |
Juan Ferrer
|
48da4b13ff
|
refs #5667 Ticket translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 17:08:20 +02:00 |
Alex Moreno
|
02451818ef
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 14:31:19 +02:00 |
Carlos Satorres
|
69a25d8d03
|
refs #5696 horas a 00
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 14:04:13 +02:00 |
Alex Moreno
|
6ddbd8b8ea
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:43:25 +00:00 |
Carlos Satorres
|
c31eee4906
|
refs #5696 landed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 13:35:55 +02:00 |
Alexandre Riera
|
0d980334b8
|
refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 12:41:00 +02:00 |
Juan Ferrer
|
fa40bd9811
|
refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 10:18:41 +02:00 |
Juan Ferrer
|
30d6f56c39
|
refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-16 20:06:14 +02:00 |
Alex Moreno
|
08fcbebbaf
|
refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-15 14:14:08 +02:00 |
Vicent Llopis
|
d5f5115980
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
|
2023-05-15 11:50:09 +02:00 |
Carlos Satorres
|
8a6881bf73
|
refs #4764 mod tabindex
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 15:50:32 +02:00 |
Carlos Satorres
|
ce62b51b29
|
refs #4764 remove br
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 15:08:04 +02:00 |
Carlos Satorres
|
ece2875b38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 12:30:34 +02:00 |
Carlos Satorres
|
9cbf3006a0
|
refs #5599 futureState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 11:17:51 +02:00 |
Vicent Llopis
|
2ed99426ef
|
eliminado focus
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 10:18:02 +02:00 |
Vicent Llopis
|
90b844062d
|
refs #5327 add frontTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-11 10:17:41 +02:00 |
Vicent Llopis
|
59f4b63db7
|
borrado espacio
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 10:04:59 +02:00 |
Vicent Llopis
|
a7fcd8a1bf
|
changes
|
2023-05-11 10:04:15 +02:00 |
Vicent Llopis
|
f00643505d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-11 10:03:07 +02:00 |
Vicent Llopis
|
8ed17d99c3
|
refs #5327 permite filtrar por columnas (desde el front)
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-11 10:02:45 +02:00 |
Alex Moreno
|
7704256079
|
master to test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 08:00:49 +02:00 |
Carlos Satorres
|
43a91194fd
|
refs #5599 remove e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 15:59:29 +02:00 |
Carlos Satorres
|
2111ca0993
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors
|
2023-05-10 14:49:37 +02:00 |
Carlos Satorres
|
e258e779b3
|
refs #5599 ticketFuture
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 14:49:19 +02:00 |
Carlos Satorres
|
9a813c075c
|
refs #5599 procedure y colorClass
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 14:43:08 +02:00 |
Carlos Satorres
|
c59915f951
|
refs #5599 procedure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 13:55:36 +02:00 |
Alex Moreno
|
29e0562c8b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-10 13:33:52 +02:00 |
Carlos Satorres
|
f4be69c85c
|
refs #5599 select state.classColor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 11:55:56 +02:00 |
Carlos Satorres
|
61d6f47162
|
refs #5599 remove returns
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 11:31:58 +02:00 |
Carlos Satorres
|
65646d3b65
|
refs #4764 validServices
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-09 19:49:16 +02:00 |
Carlos Satorres
|
212b848131
|
refs #4764 check selectedvalidservices
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 19:43:55 +02:00 |
Carlos Satorres
|
aa96f1eb97
|
refs #4764 without checkbox
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 19:42:25 +02:00 |
Carlos Satorres
|
78f337c6d4
|
refs 4764 quit index
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 14:56:32 +02:00 |
Vicent Llopis
|
461966d73e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-09 11:33:28 +02:00 |
Juan Ferrer
|
2aaded4ed4
|
refs #5517 Fix: Show spinner when loading
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2023-05-08 16:30:21 +02:00 |
Carlos Satorres
|
0b2c91466e
|
refs #5648 create vn-confirm
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-08 13:25:42 +02:00 |
Carlos Satorres
|
202544565e
|
refs #4764 mod query post
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-08 11:36:52 +02:00 |
Alex Moreno
|
7273dd4f1e
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 08:56:06 +00:00 |
Carlos Satorres
|
0acb7906cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-05-08 08:33:37 +02:00 |
Carlos Satorres
|
3d195bddb9
|
refs #4764 mod model post
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-05 14:39:46 +02:00 |
Alex Moreno
|
456e1d5912
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-05 14:11:47 +02:00 |
Alex Moreno
|
97da5e6e24
|
refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 13:58:11 +02:00 |
Carlos Satorres
|
c0e13d3339
|
refs #4754 del ticket.card.service
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 12:00:37 +02:00 |
Carlos Satorres
|
80ee73a59b
|
refs #4764 creacion de métodos y back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 10:01:15 +02:00 |
Carlos Satorres
|
8119d38414
|
Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-05 09:35:39 +02:00 |
Juan Ferrer
|
a48e197e46
|
refs #5517 E2E fixes
|
2023-05-05 08:12:38 +02:00 |
Vicent Llopis
|
404acdab6f
|
refs #5638 fix: solucionado problema con el limit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 14:51:47 +02:00 |
Alexandre Riera
|
54eb0fc7a2
|
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-04 09:59:05 +02:00 |
Alexandre Riera
|
ad3c6dcee2
|
wip #5595
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 14:34:36 +02:00 |
Carlos Satorres
|
dbd0e5138b
|
refs #5328 fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 14:12:26 +02:00 |
Carlos Satorres
|
3ac1ce403c
|
refs #5328 myOptions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 14:06:57 +02:00 |
Carlos Satorres
|
566f03c497
|
refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 13:03:14 +02:00 |
Carlos Satorres
|
3b2e1ca8d5
|
ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 12:36:30 +02:00 |
Carlos Satorres
|
eaf425fb51
|
refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-03 12:30:33 +02:00 |
Alex Moreno
|
4a7902ae4d
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-02 08:41:18 +00:00 |
Juan Ferrer
|
2cfd2d9dda
|
Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-27 18:13:24 +02:00 |
Alexandre Riera
|
3bd5582794
|
Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-27 08:42:21 +00:00 |
Vicent Llopis
|
2d181139b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:58:34 +02:00 |
Vicent Llopis
|
22b223038a
|
delete focus
|
2023-04-26 14:56:07 +02:00 |
Vicent Llopis
|
8bb8b8cfba
|
refs #5594 fix backTest
gitea/salix/pipeline/head Build queued...
Details
|
2023-04-26 14:55:37 +02:00 |
Vicent Llopis
|
09dbd29086
|
refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-26 14:46:16 +02:00 |
Alex Moreno
|
c1ea1acc8c
|
refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:49:08 +02:00 |
Alexandre Riera
|
1219cfcc5c
|
refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:03:17 +02:00 |
Alex Moreno
|
28ead70615
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:17:46 +02:00 |
Alex Moreno
|
0c668c6ade
|
refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:17:36 +02:00 |
Alex Moreno
|
11d1900859
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 09:40:36 +02:00 |
Alex Moreno
|
4cb231759f
|
feat(State/Supplier): replace hasRole to acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 09:15:05 +02:00 |
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 19:10:04 +02:00 |
Pablo Natek
|
3e15728db4
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 15:33:28 +00:00 |
Carlos Satorres
|
1088422360
|
refs #4764 boton abonar y datos
|
2023-04-24 13:14:38 +02:00 |
Juan Ferrer
|
081b4af6d6
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-24 10:44:42 +02:00 |
Vicent Llopis
|
4983aa1632
|
refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 09:11:09 +02:00 |
Carlos Satorres
|
5ec0cd962d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
|
2023-04-24 09:04:33 +02:00 |
Vicent Llopis
|
9b432bac85
|
refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:57:10 +02:00 |
Vicent Llopis
|
bf558761a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:45:56 +02:00 |
Alexandre Riera
|
0a1583aa54
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:42:32 +02:00 |
Alexandre Riera
|
bbf1c40987
|
Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:48:06 +00:00 |
Alexandre Riera
|
2975e7fae3
|
hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:46:46 +02:00 |
Vicent Llopis
|
38e5660e61
|
refs #5542 refactorizado "abono" para que siempre cree un único ticket abono
|
2023-04-21 13:59:28 +02:00 |
Alex Moreno
|
294bf2b8a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-04-21 13:30:34 +02:00 |
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
Carlos Satorres
|
a9caa92f5c
|
refs #4764 boton abonar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 12:46:01 +02:00 |
Vicent Llopis
|
5af961ac69
|
fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 09:53:21 +02:00 |
Pablo Natek
|
de3b4f37c2
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 05:54:00 +00:00 |
Juan Ferrer
|
6f1744baff
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-20 16:30:24 +02:00 |
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
Alex Moreno
|
bde81e685f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 07:55:46 +02:00 |
Alex Moreno
|
db19f153fb
|
refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 15:03:23 +02:00 |
Joan Sanchez
|
a0d8ed1433
|
E2e fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 11:33:36 +02:00 |
Alex Moreno
|
560b5b374f
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 05:37:12 +00:00 |
Vicent Llopis
|
d99815356a
|
refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 07:26:35 +02:00 |
Alex Moreno
|
0c475be10b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:23:02 +02:00 |
Joan Sanchez
|
3ee29553b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 09:00:52 +02:00 |
Joan Sanchez
|
610f51aaf8
|
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-04-17 08:59:49 +02:00 |
Joan Sanchez
|
02c573bd23
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 08:57:24 +02:00 |
Alex Moreno
|
0bfdbcb750
|
refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:44:24 +02:00 |
Joan Sanchez
|
51e42e485b
|
Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-17 06:44:17 +00:00 |
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
Juan Ferrer
|
b4ef49cf24
|
Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 16:48:11 +00:00 |
Alexandre Riera
|
8ade602563
|
hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 14:18:01 +02:00 |
Carlos Satorres
|
a2ddbd8a66
|
refs #5284 test update
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 14:04:10 +02:00 |
Joan Sanchez
|
6d5167ab7f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:47:18 +02:00 |