 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 |
 Vicent Llopis
|
eaaa860e97
|
Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 07:27:46 +00:00 |
 Alex Moreno
|
cc23fd1337
|
refs #5579 fix mockTimes and remove userLog_add
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 09:23:37 +02:00 |
|
Alex Moreno
|
c9af22780b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export
|
2023-05-17 08:24:23 +02:00 |
|
Alex Moreno
|
7f881409fc
|
refs #5579 fix mockTime
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-16 15:00:31 +02:00 |
|
Alex Moreno
|
3e33030b1d
|
refs #5579 update mariadb version to 10.7.6
gitea/salix/pipeline/head This commit is unstable
Details
|
2023-05-15 15:16:22 +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
|
9ce3e79e00
|
refs #5594 eliminado archivo ducplicado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-15 11:50:51 +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 |
|
Alex Moreno
|
ea6837e33a
|
refs #5579 export structure and data
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 13:07:24 +02:00 |
 Pablo Natek
|
8419c76b12
|
refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 12:51:07 +02:00 |
 Carlos Satorres
|
943e8b09c1
|
refs #5599 DELIMITER
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 11:15:47 +02:00 |
 Alexandre Riera
|
9760e50212
|
refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:46:12 +02:00 |
|
Pablo Natek
|
65082be077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:28:19 +02:00 |
|
Carlos Satorres
|
0dea1dfd9e
|
Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:52:35 +02:00 |
|
Carlos Satorres
|
fd85cd2d98
|
refs #5599 replace
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:48:31 +02:00 |
|
Alex Moreno
|
1d6a541b02
|
test into master
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:07:02 +02:00 |
|
Carlos Satorres
|
43ab07d954
|
refs move reports views
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 11:57:13 +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 |
|
Alex Moreno
|
a345265a89
|
refs #5488 specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 14:09:06 +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 |
|
Alexandre Riera
|
3166a9e420
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
|
2023-05-10 13:23:10 +02:00 |
|
Alexandre Riera
|
ded8e0e141
|
refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 13:22:53 +02:00 |
|
Alex Moreno
|
49e2c38ddd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 12:30:56 +02:00 |
|
Alex Moreno
|
706c62f624
|
typo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 09:26:33 +02:00 |
|
Alex Moreno
|
3b8cafc783
|
fix(ticketConfigSql): correct folder
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-10 09:22:33 +02:00 |
|
Alex Moreno
|
8c0deb6cfa
|
test(e2e_order): fiter optimized
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 09:16:19 +02:00 |
|
Alex Moreno
|
ca8373d7f7
|
feat(acl): add specifics acls to ticket, claim, state and worker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 14:04:39 +02:00 |
|
Vicent Llopis
|
313c641cd7
|
move chages sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 12:26:29 +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 |
|
Alex Moreno
|
3b8d670c5b
|
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-08 13:43:31 +02:00 |
|
Alex Moreno
|
e019ab4160
|
deploy(232001): add changes folder, package and changelog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 12:40:52 +02:00 |
|
Alex Moreno
|
90465c275a
|
correct folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 12:21:20 +02:00 |
|
Alex Moreno
|
ad3c34bd35
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 12:08:00 +02:00 |
|
Carlos Satorres
|
2c6f71b4c4
|
Merge branch 'dev'
|
2023-05-08 10:16:57 +02:00 |
|
Alexandre Riera
|
a2055d35fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 09:48:09 +02:00 |
|
Alexandre Riera
|
d21b949ffb
|
refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 09:18:53 +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 |
|
Alexandre Riera
|
5cdec35ed4
|
refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 14:30:10 +02:00 |
|
Alexandre Riera
|
8ae5a0de0f
|
refs #5513 adding backs and models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 12:03:47 +02:00 |
|
Alex Moreno
|
2e020b5ebb
|
fix(): correct version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 09:02:23 +02:00 |
|
Alexandre Riera
|
a2d3b79246
|
Merge branch 'dev' into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 06:42:39 +00:00 |
|
Alex Moreno
|
a1521f5220
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 09:39:39 +00:00 |
|
Carlos Satorres
|
17425a627c
|
Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-02 11:25:17 +00:00 |
|
Alex Moreno
|
306d73eb69
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-02 09:42:56 +00: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 |
|
Alex Moreno
|
ac55dc4cc7
|
refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 14:17:19 +02:00 |
|
Alex Moreno
|
c3038a4d61
|
fix(imageCollection):
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-28 11:54:11 +02:00 |
|
Pablo Natek
|
8651898a1f
|
Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-28 08:36:47 +00:00 |
|
Alex Moreno
|
42e3c8f29d
|
refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 09:35:15 +02:00 |
|
Carlos Satorres
|
66986d3c21
|
Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-27 12:08:28 +00:00 |
|
Carlos Satorres
|
08c173acf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
|
2023-04-27 12:49:01 +02:00 |
|
Alex Moreno
|
34bb216f17
|
deploy(231601): dev to test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-27 08:53:54 +02: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
|
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 |
|
Alexandre Riera
|
5844da4474
|
refs #4713 updated sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:34:29 +02:00 |
|
Carlos Satorres
|
15df9518ab
|
Merge branch 'dev' into 084200-arreglarChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:31:33 +00:00 |
|
Carlos Satorres
|
09c1d7e393
|
refs #084200 add table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:30:58 +02:00 |
|
Alexandre Riera
|
878f232fda
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:20:23 +02:00 |
|
Carlos Satorres
|
480784ee18
|
refs #084200 cambio nombre
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:48:31 +02:00 |
|
Vicent Llopis
|
c69e038a56
|
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-26 12:45:54 +02:00 |
|
Carlos Satorres
|
a524d7837d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 11:45:20 +02:00 |
|
Carlos Satorres
|
af875dd67e
|
Merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 10:26:54 +02:00 |
|
Carlos Satorres
|
57ec0f8587
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
|
2023-04-26 09:03:37 +02:00 |
|
Alex Moreno
|
73153071d6
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 05:56:46 +00:00 |
|
Pablo Natek
|
e8ce8e42fd
|
refs #5153
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:25:22 +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 |
|
Alexandre Riera
|
83319894b2
|
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-25 11:25:29 +02:00 |
|
Alex Moreno
|
618100b68a
|
refs #5542 eliminados procesos que no se usan
|
2023-04-25 10:40:24 +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 |
|
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 |
|
Alex Moreno
|
8502b74dee
|
feat(): replace hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 11:07:04 +02:00 |
|
Carlos Satorres
|
67db2f0476
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:51:41 +00:00 |
|
Vicent Llopis
|
5b7ca82509
|
Merge branch 'dev' into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 04:58:30 +00:00 |
|
Alex Moreno
|
faee5ccd7d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-04-21 13:53:07 +02:00 |
|
Vicent Llopis
|
ea1035311e
|
Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:30:58 +00: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
|
d8b5659a5d
|
refs #5540 client vies
|
2023-04-21 09:14:30 +02:00 |
|
Alexandre Riera
|
b3a10698af
|
hotfix negativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 08:20:38 +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 |
|
Vicent Llopis
|
bcf7b6ab3d
|
borrado acl innecesario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 15:17:49 +02:00 |
|
Carlos Satorres
|
d6e6dab03b
|
Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 11:55:52 +02:00 |
|
Alex Moreno
|
7df4a2b15d
|
fix(231401): fix tests and fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 08:25:15 +02:00 |
|
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
|
Alexandre Riera
|
aecde484f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-20 07:52:05 +02:00 |
|
Alex Moreno
|
39333a9119
|
refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 15:23:32 +02:00 |
|
Vicent Llopis
|
187ba032d2
|
refs #5128 rol por ACL
|
2023-04-19 14:43:15 +02:00 |
|
Alex Moreno
|
c1d4281b1b
|
refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-19 13:59:26 +02:00 |
|
Vicent Llopis
|
34b360040b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 12:18:45 +02:00 |
|
Vicent Llopis
|
be8a11cafc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 09:52:28 +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
|
32c9e22d96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 11:41:55 +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 |