 Alex Moreno
|
7895a51e33
|
hotFix(closeAll): fix debug
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-20 12:15:41 +01:00 |
 Carlos Andrés
|
913b261f86
|
Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-18 17:55:54 +01:00 |
 Jorge Penadés
|
3c3dd64da1
|
feat: refs #6951 test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-18 09:39:56 +01:00 |
|
Jorge Penadés
|
f044809f30
|
feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 15:45:47 +01:00 |
|
Alex Moreno
|
8119106e69
|
hotFix: try to debug closeAll
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-15 15:40:54 +01:00 |
|
Alex Moreno
|
0ad052c34a
|
refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-03-14 08:36:19 +01:00 |
 Carlos Satorres
|
1315bfda88
|
refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-13 14:18:53 +01:00 |
|
Carlos Andrés
|
ff459ea3be
|
fix: closeTicket idem salix refs #6549
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-13 12:18:43 +01:00 |
|
Carlos Satorres
|
106296be7b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-12 12:55:56 +01:00 |
|
Carlos Satorres
|
ed57212618
|
refs #6755 fix restore
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-12 12:55:14 +01:00 |
|
Alex Moreno
|
8cda12a9da
|
feat: refs #6925 check incoterms in closure and makeInvoice
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-08 07:49:00 +01:00 |
|
Alex Moreno
|
c2ecedca71
|
feat: refs #6925 check incoterms in closure and makeInvoice
|
2024-03-08 07:48:55 +01:00 |
|
Carlos Satorres
|
d4d3fdceb5
|
refs #6755 fix canRestoreTicket
|
2024-03-07 11:36:30 +01:00 |
|
Carlos Satorres
|
64d82d92d6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
|
2024-03-07 09:28:32 +01:00 |
|
Carlos Satorres
|
2e4a5029b8
|
refs #6755 fix restore
|
2024-03-06 14:52:49 +01:00 |
|
Alex Moreno
|
9ab0228714
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction
|
2024-03-06 13:58:10 +01:00 |
|
Carlos Satorres
|
1b3a8ddbdd
|
refs #6755 fix restore
|
2024-03-06 12:03:35 +01:00 |
|
Jorge Penadés
|
f600a99708
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-03-06 10:55:05 +01:00 |
|
Carlos Satorres
|
70096e7a76
|
refs #6755 fix restore
|
2024-03-05 14:24:32 +01:00 |
 Guillermo Bonet
|
85d3508848
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-05 12:37:06 +01:00 |
|
Carlos Satorres
|
16fc446b85
|
refs #6755 fix method
|
2024-03-05 10:46:15 +01:00 |
|
Carlos Satorres
|
cac388f986
|
refs #6755 fix ticket
|
2024-03-05 09:43:07 +01:00 |
|
Carlos Satorres
|
893320b114
|
refs #6755 model ticketlog, restore
|
2024-03-04 15:00:43 +01:00 |
|
Jorge Penadés
|
854a9b62af
|
fix: refs #6276 refactor updateInTime & changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-04 09:21:41 +01:00 |
|
Jorge Penadés
|
7d8d31022b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-01 12:29:55 +01:00 |
|
Alex Moreno
|
e844a3f8fb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test Build started...
Details
|
2024-02-29 09:45:07 +01:00 |
|
Alex Moreno
|
3f6ec13fa5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-29 09:43:44 +01:00 |
 Javier Segarra
|
599e8761c1
|
hotfix fix: replace pdf with csv
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-29 06:26:21 +00:00 |
|
Jorge Penadés
|
cbb7bd0028
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-27 15:50:47 +01:00 |
|
Alex Moreno
|
7874762da9
|
Merge pull request 'master' (!2102) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-02-27 11:38:02 +00:00 |
 Sergio De la torre
|
699af5b9b7
|
refs #6531_hotFix_lastTickets
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-27 11:53:55 +01:00 |
|
Guillermo Bonet
|
89ebd36b9b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-27 11:50:23 +01:00 |
|
Guillermo Bonet
|
6339a59de0
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-27 11:49:58 +01:00 |
|
Guillermo Bonet
|
a8065ab1a4
|
fix: refs #6184 hasFile false in saveSign and saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-27 09:43:53 +01:00 |
|
Jorge Penadés
|
c875abf5e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-27 09:42:14 +01:00 |
|
Guillermo Bonet
|
554f6c4695
|
Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-26 14:28:46 +01:00 |
|
Guillermo Bonet
|
3579c94268
|
fix: refs #6184 saveSign
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-26 14:09:53 +01:00 |
|
Guillermo Bonet
|
096987040e
|
fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-26 14:00:04 +01:00 |
|
Guillermo Bonet
|
a4419a2542
|
fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-26 13:57:07 +01:00 |
|
Guillermo Bonet
|
c1c64d0f89
|
fix: refs #6184 saveSign
|
2024-02-26 13:39:57 +01:00 |
|
Guillermo Bonet
|
817f685621
|
fix: refs #6184 saveSign
|
2024-02-26 13:00:35 +01:00 |
|
Guillermo Bonet
|
a359ace1b8
|
fix: refs #6184 saveSign
|
2024-02-26 12:57:49 +01:00 |
|
Guillermo Bonet
|
413f7eb8c8
|
fix: refs #6184 saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-26 12:45:38 +01:00 |
|
Alex Moreno
|
b1a8fcf968
|
refs #6925 fix(invoice): incoterms error
|
2024-02-26 11:50:46 +01:00 |
|
Jorge Penadés
|
70c400c5f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-23 12:51:22 +01:00 |
 Ivan Mas
|
03fc7cfb4e
|
Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-23 08:24:12 +00:00 |
|
Alex Moreno
|
c7dd81e53d
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev Build started...
Details
|
2024-02-23 07:12:24 +01:00 |
|
Guillermo Bonet
|
df5e9bc830
|
fix: refs #6184 Rollback saveSign.js
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-22 14:46:10 +01:00 |
|
Guillermo Bonet
|
80fc9e4472
|
fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-22 10:16:29 +01:00 |
|
Alex Moreno
|
60dfe8ec05
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-21 15:12:48 +01:00 |
|
Alex Moreno
|
01f1bd0088
|
Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good
Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
|
2024-02-21 14:44:34 +01:00 |
|
Ivan Mas
|
f592045925
|
refs #6784 Delete clientType.id and modify relationships in json and js
|
2024-02-21 11:49:27 +01:00 |
|
Jorge Penadés
|
9ce162da71
|
fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-20 10:59:13 +01:00 |
|
Jorge Penadés
|
55b490160b
|
fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-20 09:27:37 +01:00 |
|
Jorge Penadés
|
072280cc9c
|
fix: refs #6776 method names
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-20 08:48:47 +01:00 |
|
Jorge Penadés
|
e9f7fbed86
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-19 14:46:56 +01:00 |
|
Jorge Penadés
|
d5a3413307
|
fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-19 14:46:42 +01:00 |
 Pablo Natek
|
011880eb72
|
fix(spec): refs #6879 remove f from describe
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-19 14:15:44 +01:00 |
|
Pablo Natek
|
7b0dd6975d
|
fix(usesMana): refs #6879 add mana excluded worker
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-02-19 14:13:36 +01:00 |
|
Sergio De la torre
|
7a0320270a
|
Merge pull request 'test' (!2048) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2048
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-02-19 10:25:33 +00:00 |
|
Sergio De la torre
|
adeca2bb22
|
refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-19 09:17:57 +01:00 |
|
Sergio De la torre
|
5b541aa804
|
refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-19 09:13:03 +01:00 |
|
Sergio De la torre
|
15de4f0b73
|
refs #6531 feat:showLastTickets
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-02-16 15:56:40 +01:00 |
|
Jorge Penadés
|
030f42d03f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-16 13:11:02 +01:00 |
|
Jorge Penadés
|
1767ce426a
|
fix: refs #6276 collection_addItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-16 11:54:59 +01:00 |
|
Jorge Penadés
|
89970e39d0
|
fix: refs #6276 back tests
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-16 10:47:41 +01:00 |
|
Jorge Penadés
|
63c615655b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-16 08:34:05 +01:00 |
|
Jorge Penadés
|
78583751ec
|
refactor: refs #6760 ticketsIds improved
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-15 16:22:13 +01:00 |
|
Jorge Penadés
|
32f8d13359
|
fix: refs #6760 back modified & revoke update on ticket.clientFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-14 13:15:31 +01:00 |
|
Guillermo Bonet
|
744171dd4c
|
fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-13 09:41:26 +01:00 |
|
Guillermo Bonet
|
e08fb3d229
|
fix: refs #6184 Minor change
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-13 08:59:58 +01:00 |
|
Jorge Penadés
|
8ad69a62b9
|
fix: refs #6276 loggable & userId
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-08 10:08:16 +01:00 |
|
Jorge Penadés
|
2940c68516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-08 08:36:05 +01:00 |
|
Guillermo Bonet
|
ffa9212861
|
fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-07 10:29:42 +01:00 |
|
Guillermo Bonet
|
2cab007f57
|
fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-06 12:12:45 +01:00 |
|
Guillermo Bonet
|
f2946e4168
|
fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-06 08:04:19 +01:00 |
|
Guillermo Bonet
|
d6ae1fd1f8
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-06 06:39:51 +01:00 |
|
Jorge Penadés
|
99fbb95669
|
fix: refs #6703 test back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-05 09:35:20 +01:00 |
|
Jorge Penadés
|
0c356938fc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-05 08:43:56 +01:00 |
|
Guillermo Bonet
|
eec36300ad
|
refactor: refs #6184 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-02 12:25:48 +01:00 |
|
Guillermo Bonet
|
1d596b63a0
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-02 12:24:28 +01:00 |
|
Alex Moreno
|
9ac0ffb85a
|
Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-02 07:30:59 +00:00 |
|
Jorge Penadés
|
7d01449518
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-02 08:11:48 +01:00 |
|
Jorge Penadés
|
bda23a2139
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-01 14:33:51 +01:00 |
|
Jorge Penadés
|
ec7a88c6dd
|
fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-01 12:56:11 +01:00 |
|
Carlos Satorres
|
ffbe0e1261
|
Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-01 11:27:08 +00:00 |
|
Alex Moreno
|
a9a1f97366
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-01 12:17:48 +01:00 |
|
Jorge Penadés
|
8f5a5d9cba
|
fix: refs #6703 tests & backs
|
2024-01-31 13:11:15 +01:00 |
|
Jorge Penadés
|
e6eac54709
|
fix: refs #6703 tests & front
|
2024-01-31 09:59:32 +01:00 |
|
Jorge Penadés
|
d43976192a
|
fix: refs #6703 fix conflicts
|
2024-01-31 09:16:26 +01:00 |
|
Carlos Satorres
|
5d2f3d1a4b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack
|
2024-01-30 16:42:00 +01:00 |
|
Jorge Penadés
|
2a6abffef9
|
fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 16:07:33 +01:00 |
|
Carlos Satorres
|
509d5cea14
|
refs #6270 fix back
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-30 15:54:03 +01:00 |
|
Jorge Penadés
|
e17fc91415
|
fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 14:58:11 +01:00 |
|
Carlos Satorres
|
2fc39d54a0
|
refs #6318 fix code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 13:09:15 +01:00 |
|
Jorge Penadés
|
88dfdb157f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 11:25:17 +01:00 |
|
Guillermo Bonet
|
13b8964e3d
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 07:27:34 +00:00 |
|
Sergio De la torre
|
0f3ffcfa61
|
fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-30 08:11:33 +01:00 |
|
Guillermo Bonet
|
1fe6818a0f
|
fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-30 07:42:58 +01:00 |
|
Guillermo Bonet
|
65268487b9
|
fix: #6184 Now creates only one dms in saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-30 07:32:26 +01:00 |