Vicent Llopis
|
65e32f5e7f
|
feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 12:40:13 +02:00 |
Vicent Llopis
|
350c516bb1
|
feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 10:36:41 +02:00 |
Vicent Llopis
|
3110172c54
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice
|
2022-10-26 08:39:58 +02:00 |
Alex Moreno
|
f65d06fc7d
|
fixes #4073
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 08:27:28 +02:00 |
Vicent Llopis
|
5e0f976ad2
|
Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 06:25:18 +00:00 |
Vicent Llopis
|
07a18dc736
|
delete sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 08:05:11 +02:00 |
Alex Moreno
|
f07f0679d8
|
fix fixture
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 15:03:20 +02:00 |
Alex Moreno
|
342832c475
|
try
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 15:02:22 +02:00 |
Alex Moreno
|
607e9010e6
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 12:36:35 +00:00 |
Joan Sanchez
|
4334907d91
|
fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 14:09:21 +02:00 |
Pau
|
e72d57150a
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:40:57 +00:00 |
Alex Moreno
|
ac8c4b8ef0
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:39:50 +00:00 |
Pau
|
7b04464848
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:00:13 +00:00 |
Joan Sanchez
|
1196125350
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 11:58:47 +02:00 |
Alex Moreno
|
e1e13468a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 11:58:43 +02:00 |
Alex Moreno
|
3fd10dfc64
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:58:17 +00:00 |
Pau
|
76d248131c
|
Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:45:25 +00:00 |
Pau
|
9089ba7346
|
requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 10:42:16 +02:00 |
Pau
|
23598c993b
|
Change ACL from employee to hr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 09:25:15 +02:00 |
Joan Sanchez
|
8f0b566935
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-25 07:25:07 +00:00 |
Vicent Llopis
|
7f1dd801a5
|
refactor: change ACLs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 07:56:17 +02:00 |
Alex Moreno
|
7cb8175b73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-10-25 07:36:21 +02:00 |
Vicent Llopis
|
d18b22bb05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 07:05:26 +02:00 |
Joan Sanchez
|
e80754f280
|
Added new SQL version
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-24 18:37:38 +02:00 |
Alex Moreno
|
9e0eab5a77
|
feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 15:15:23 +02:00 |
Vicent Llopis
|
c77999871e
|
refs #3951
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-24 14:34:17 +02:00 |
Alex Moreno
|
a66c5e6798
|
acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-24 11:30:17 +02:00 |
Vicent Llopis
|
888f612dbb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-21 11:41:53 +02:00 |
Vicent Llopis
|
18c119c62a
|
change acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-21 09:20:27 +02:00 |
Vicent Llopis
|
6f31bea21f
|
feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 08:00:48 +02:00 |
Vicent Llopis
|
6891190c72
|
refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-20 15:05:46 +02:00 |
Vicent Llopis
|
39f4445172
|
refator: endpoint name
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 07:23:57 +02:00 |
Alex Moreno
|
4b12405586
|
feat: report invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-19 15:15:54 +02:00 |
Vicent Llopis
|
6f7ec12cb2
|
feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-19 10:35:41 +02:00 |
Pau
|
8b07180890
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 11:56:56 +00:00 |
Pau
|
470b4485d5
|
Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 12:58:44 +02:00 |
Pau
|
a204c6e2b0
|
Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 12:29:04 +02:00 |
Alex Moreno
|
a5ceee07e9
|
use loopback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 11:50:16 +02:00 |
Pau
|
81088bc495
|
Fixed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 10:46:14 +02:00 |
Pau
|
f481cc3c97
|
Capitalizar
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 10:38:40 +02:00 |
Pau
|
c9e9e3545d
|
Added ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 10:33:48 +02:00 |
Alex Moreno
|
0bc018ec02
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 14:06:31 +02:00 |
Pau
|
9290cd6fb6
|
Finished back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 14:02:18 +02:00 |
Pau
|
70c9c3d788
|
initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 12:07:34 +02:00 |
Alex Moreno
|
991893837c
|
correct fixutures from dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:34:22 +02:00 |
Alex Moreno
|
2b060a1437
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:32:32 +02:00 |
Pau
|
dc6c8f924d
|
feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:25:25 +02:00 |
Alex Moreno
|
c637f2c879
|
feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-14 13:22:53 +02:00 |
Joan Sanchez
|
e81c39d8dc
|
Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-13 09:30:31 +02:00 |
Alex Moreno
|
24cb8e00bb
|
creates notification sql in changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-11 13:20:25 +02:00 |
Alex Moreno
|
c78e222ee0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-11 10:09:57 +02:00 |
Vicent Llopis
|
9c52508a88
|
feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 08:40:22 +02:00 |
Vicent Llopis
|
7b7e01f49e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 07:09:20 +02:00 |
Alex Moreno
|
376d46b67e
|
feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 13:06:49 +02:00 |
Vicent Llopis
|
8130cf9e6a
|
feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 12:40:10 +02:00 |
Pau
|
51d3063849
|
Drop expedition itemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 10:53:15 +02:00 |
Vicent Llopis
|
2e91698c1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 08:19:08 +02:00 |
Alex Moreno
|
e7bafb1386
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-07 07:47:46 +02:00 |
Alex Moreno
|
c29625f079
|
fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-06 15:04:27 +02:00 |
Joan Sanchez
|
4fadc7e2a4
|
Added subversion
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 13:56:10 +02:00 |
Joan Sanchez
|
8ccb47d741
|
Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-10-06 11:54:16 +00:00 |
Pau
|
dde5eed9e2
|
DB fixtures
|
2022-10-06 13:34:06 +02:00 |
Javi Gallego
|
d73dab3454
|
Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 13:01:56 +02:00 |
Vicent Llopis
|
ddbe1057ad
|
feat: add new section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 09:47:53 +02:00 |
Joan Sanchez
|
1bf090b6ee
|
Pass network name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 09:09:49 +02:00 |
Alex Moreno
|
9d482f7dfd
|
test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 15:13:36 +02:00 |
Joan Sanchez
|
3d36c0339a
|
Merge branch 'dev' into 4592-jenkins_tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 12:05:10 +00:00 |
Alex Moreno
|
8b636497a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 13:47:25 +02:00 |
Joan Sanchez
|
8468eda05a
|
run with network
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-05 12:47:37 +02:00 |
Joan Sanchez
|
627f0d762e
|
attach to network
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 12:33:06 +02:00 |
Joan Sanchez
|
1cafbdab6e
|
Connect to docker network
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-05 12:26:42 +02:00 |
Joan Sanchez
|
e6512d00a1
|
Use port 3306
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-05 12:16:59 +02:00 |
Joan Sanchez
|
0502f9ebf0
|
Log port
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 11:19:07 +02:00 |
Joan Sanchez
|
0ad583f22f
|
Log host & port
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 11:14:49 +02:00 |
Joan Sanchez
|
0fccae0113
|
Network ip address
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 11:06:23 +02:00 |
Joan Sanchez
|
239c324eff
|
Log network settings
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 11:03:48 +02:00 |
Joan Sanchez
|
ee0938d7d6
|
Test
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 10:36:05 +02:00 |
Joan Sanchez
|
80d0b415ec
|
Host log
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 10:28:07 +02:00 |
Joan Sanchez
|
b0dac6c12d
|
Use jenkins network
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 10:23:24 +02:00 |
Joan Sanchez
|
1534bdd188
|
Syntax error
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 10:16:17 +02:00 |
Joan Sanchez
|
13bfed6955
|
use jenkins network
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 10:06:11 +02:00 |
Joan Sanchez
|
98a2f79691
|
Run container on jenkins network
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 10:05:01 +02:00 |
Joan Sanchez
|
377a0f7228
|
Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-04 13:41:37 +02:00 |
Alex Moreno
|
fe8ae164eb
|
refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-04 13:22:11 +02:00 |
Pau
|
9b202b7a84
|
refactor: isBox to freightItemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-04 11:46:04 +02:00 |
Pau
|
3caf89bddb
|
refactor: Replaced isBox with freightItemFk
|
2022-10-04 09:27:31 +02:00 |
Alex Moreno
|
7a690dd880
|
feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good
Details
test(user):back and e2e
|
2022-10-03 15:11:29 +02:00 |
Joan Sanchez
|
c177c0366d
|
Item PDF
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-03 13:35:49 +02:00 |
Joan Sanchez
|
3b0f1efbf4
|
ACL's
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-30 13:54:20 +02:00 |
Alex Moreno
|
f81b2775a0
|
add fixture
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-30 09:36:51 +02:00 |
Alex Moreno
|
e931414bb7
|
unnecessary code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-30 08:59:49 +02:00 |
Joan Sanchez
|
1ac35c0b68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 14:52:31 +02:00 |
Joan Sanchez
|
3601881026
|
Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 14:43:27 +02:00 |
Joan Sanchez
|
7a7ad6ac5f
|
InvoiceOut_sendQueued
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 13:09:44 +02:00 |
Joan Sanchez
|
5aec280adb
|
Closure migration
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 09:07:18 +02:00 |
Alex Moreno
|
203b223cc6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-28 12:24:40 +02:00 |
Joan Sanchez
|
660842ca31
|
Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 14:20:57 +02:00 |
Pau
|
2dd6de1d47
|
Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 13:46:23 +02:00 |
Alex Moreno
|
2c691eb796
|
feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 14:49:11 +02:00 |
Joan Sanchez
|
7f78286d6b
|
Reports refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 13:33:27 +02:00 |
Alex Moreno
|
f698a22fcf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 09:25:43 +02:00 |
Joan Sanchez
|
85698410db
|
Templates refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:07:45 +02:00 |
Pau
|
26a16bf846
|
ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-23 13:53:33 +02:00 |
Joan Sanchez
|
664fd444cc
|
Sample refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-22 15:44:35 +02:00 |
Joan Sanchez
|
68f3544477
|
Claim pickup order
|
2022-09-22 09:17:14 +02:00 |
Joan Sanchez
|
8105c12a18
|
Campaign metrics
|
2022-09-22 08:48:29 +02:00 |
Joan Sanchez
|
71f8e73e55
|
Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1056
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-21 06:46:24 +00:00 |
Joan Sanchez
|
5d6459d565
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-21 08:37:20 +02:00 |
Alex Moreno
|
b3aaa493d5
|
fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-19 09:45:28 +02:00 |
Vicent Llopis
|
a330e9d64a
|
refactor: change acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 12:02:04 +02:00 |
Vicent Llopis
|
6367f1ef05
|
refator: delete sensitive info
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 11:46:55 +02:00 |
Vicent Llopis
|
afeed9757c
|
refactor: change acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 10:39:59 +02:00 |
Vicent Llopis
|
a695468bb7
|
refator: deleted sensitive information
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 10:32:37 +02:00 |
Vicent Llopis
|
cfe5c66fe4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 09:23:56 +02:00 |
Vicent Llopis
|
503e78d4f0
|
fix: rollback mariadb version
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 09:07:43 +02:00 |
Joan Sanchez
|
793705413e
|
#452 - Dumped db
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-09-16 07:05:27 +00:00 |
Joan Sanchez
|
9d5351c84c
|
Updated db image
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-09-15 07:31:49 +00:00 |
Vicent Llopis
|
28bf7bd747
|
feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-15 08:34:42 +02:00 |
Joan Sanchez
|
5cff983d4c
|
Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-13 10:33:04 +00:00 |
Vicent Llopis
|
1fd97f167c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 11:35:15 +02:00 |
Alex Moreno
|
43df1e7e10
|
refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-05 12:06:14 +02:00 |
Alex Moreno
|
4a058faaf8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
|
2022-09-05 08:12:07 +02:00 |
Javi Gallego
|
9fe32788fc
|
regularizado
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-24 14:38:05 +02:00 |
Joan Sanchez
|
6b6d00cf95
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:23:28 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
31aafc0719
|
feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 09:11:38 +02:00 |
Alex Moreno
|
062806b3f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-05 13:19:43 +02:00 |
Joan Sanchez
|
69ca28ae14
|
Added SQL version
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-05 11:42:36 +02:00 |
Joan Sanchez
|
cabc30ef87
|
Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-08-05 09:18:53 +00:00 |
Joan Sanchez
|
624428212b
|
Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-08-04 12:51:41 +00:00 |
Vicent Llopis
|
a82bc7a8e8
|
delete: old versions of db changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-08-04 13:55:30 +02:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
Vicent Llopis
|
020990dadc
|
fix: backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 09:53:22 +02:00 |
Vicent Llopis
|
998176f03c
|
fix: fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 08:23:39 +02:00 |
Vicent Llopis
|
82f2ef768f
|
fix: fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 08:15:20 +02:00 |
Vicent Llopis
|
ede6da1a15
|
fix: db fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-03 15:14:02 +02:00 |
Juan Ferrer
|
539d9617e6
|
export
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-03 09:40:48 +02:00 |
Joan Sanchez
|
eed0ac66c6
|
Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1023
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2022-08-03 07:09:08 +00:00 |
Joan Sanchez
|
0de2c08739
|
Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-08-03 06:45:58 +00:00 |
Joan Sanchez
|
1b9de5cc95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-03 08:44:43 +02:00 |
Joan Sanchez
|
185ce60bef
|
Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2022-08-03 06:41:22 +00:00 |
Alex Moreno
|
8a08b6f399
|
feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-02 15:15:05 +02:00 |
Alex Moreno
|
7d4dd7bb52
|
feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-01 15:03:17 +02:00 |
Alex Moreno
|
d040ecb743
|
feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-01 07:59:04 +02:00 |
Carlos Andrés
|
6f825ee3bc
|
#3530 Eliminar uso de person
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 17:03:31 +02:00 |
Carlos Andrés
|
67feac7c6c
|
#3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 16:04:18 +02:00 |
Carlos Andrés
|
918a09ad5c
|
#3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 15:17:00 +02:00 |
Vicent Llopis
|
537c383cd2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:38:23 +02:00 |
Vicent Llopis
|
cd78afb539
|
fix: db changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 12:03:59 +02:00 |
Vicent Llopis
|
538c04e8c5
|
feat: db connection and query
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 11:59:03 +02:00 |
Vicent Llopis
|
3bf7efea16
|
feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-27 12:16:41 +02:00 |
Joan Sanchez
|
468da0c5a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-27 08:12:06 +02:00 |
Joan Sanchez
|
882c4cc3d7
|
fix(insurance): force script execution
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-26 13:19:57 +02:00 |
Vicent Llopis
|
3fd289ff51
|
update chat
gitea/salix/pipeline/head Build queued...
Details
|
2022-07-26 13:03:03 +02:00 |
Alex Moreno
|
3fd34e0861
|
feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-25 14:49:39 +02:00 |
Alex Moreno
|
8048d4ce90
|
feat(notification): basic functionality and test
|
2022-07-25 08:25:10 +02:00 |
Alex Moreno
|
f432d64f56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
|
2022-07-25 07:45:26 +02:00 |
Carlos Jimenez Ruiz
|
b8183748ce
|
Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-22 13:58:52 +00:00 |
Carlos Jimenez Ruiz
|
f3766edbb7
|
Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-22 13:56:19 +00:00 |
Vicent Llopis
|
7ad555c73f
|
restart backTest Jenkins
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-22 13:59:36 +02:00 |
Vicent Llopis
|
7809d9dd7e
|
fix: typo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-22 13:41:18 +02:00 |
Vicent Llopis
|
fc6e51e91f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4091-dms_clean
|
2022-07-22 13:41:02 +02:00 |
Vicent Llopis
|
465a5e4d73
|
refactor: mo ve folder of sql chagues
|
2022-07-22 13:12:54 +02:00 |
Carlos Jimenez Ruiz
|
7d7365c4f3
|
Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-22 11:07:08 +00:00 |
Vicent Llopis
|
8ea09a0449
|
jenkins testBack
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-21 14:08:18 +02:00 |
Vicent Llopis
|
eccbd942f7
|
feat: can close a ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-21 13:11:24 +02:00 |
Vicent Llopis
|
9035123c53
|
feat: update structure
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-21 10:36:21 +02:00 |
Alex Moreno
|
9b48cbb078
|
feat(notification): send
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-20 14:54:50 +02:00 |
Vicent Llopis
|
26f8996936
|
refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-20 14:02:15 +02:00 |
Vicent Llopis
|
771c86ba4b
|
fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-20 12:40:30 +02:00 |
Alex Moreno
|
7895decf4e
|
feat(notification): create models
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-19 15:17:22 +02:00 |
Vicent Llopis
|
a0ea3b4c03
|
delete unnecessary sql
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-19 14:47:05 +02:00 |
Vicent Llopis
|
b4408dc080
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-19 14:42:43 +02:00 |
Vicent Llopis
|
c56ac1c192
|
feat: add log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-19 13:35:17 +02:00 |
Vicent Llopis
|
2a41c1bb93
|
update foreign key
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-19 12:44:55 +02:00 |
Carlos Jimenez Ruiz
|
7437da92a5
|
Merge branch 'dev' into 4294-zone_getEventsFiltered
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-15 12:43:50 +00:00 |
Carlos Jimenez Ruiz
|
bbfab8d0bd
|
Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-15 12:22:15 +00:00 |
Carlos Jimenez Ruiz
|
333828c583
|
Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-14 13:40:50 +02:00 |
Vicent Llopis
|
ac344d6edd
|
refactor: add column id PK and updated column code UQ
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-14 09:54:28 +02:00 |
Vicent Llopis
|
762ec3045f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving
|
2022-07-14 09:11:43 +02:00 |
Vicent Llopis
|
fdf6e04233
|
change travel.agencyFk by agencyModeFk
|
2022-07-13 14:36:03 +02:00 |
Vicent Llopis
|
48d4d4e964
|
try jenkins backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 14:26:28 +02:00 |
Vicent Llopis
|
f73012486c
|
try jenckins backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 13:43:13 +02:00 |
Vicent Llopis
|
7bf9a8c100
|
delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 11:52:47 +02:00 |
Alex Moreno
|
051a849a21
|
fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 08:10:29 +02:00 |
Vicent Llopis
|
1eb6ee69cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 08:09:02 +02:00 |
Vicent Llopis
|
d9a12fd203
|
feat: update commissionWorkCenterFk where is not calculated
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-07 07:39:46 +02:00 |
Vicent Llopis
|
189d0a27bc
|
refactor: delete unnecessary sql
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-05 11:44:03 +02:00 |
Vicent Llopis
|
5f2f5b9b25
|
feat: add sql changes
|
2022-07-05 10:18:26 +02:00 |
Vicent Llopis
|
e441c658fd
|
feat: set daysInFuture value
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-04 08:31:53 +02:00 |
Joan Sanchez
|
fc87039571
|
Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable
Details
Reviewed-on: #1011
|
2022-07-01 09:25:07 +00:00 |
Carlos Jimenez Ruiz
|
d0e06a46d0
|
removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-01 09:15:07 +02:00 |
Alex Moreno
|
c02433faab
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:24:26 +02:00 |
Alex Moreno
|
c88df46b4f
|
typo
gitea/salix/pipeline/head Build queued...
Details
|
2022-06-30 13:23:57 +02:00 |
Alex Moreno
|
ca767b84f0
|
fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:21:07 +02:00 |
Vicent Llopis
|
24159cd3e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued...
Details
|
2022-06-29 14:28:54 +02:00 |
Vicent Llopis
|
d49a2666f1
|
refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-29 14:28:23 +02:00 |
Alex Moreno
|
f6b9327fb5
|
try
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-29 08:43:43 +02:00 |
Carlos Jimenez Ruiz
|
1981232df4
|
Merge branch 'dev' into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-28 10:45:16 +00:00 |
Alex Moreno
|
22fd0e91b0
|
title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-28 12:10:37 +02:00 |