Jorge Padawan
|
3517bdea41
|
Añadido a las foreignKeys el valor UNIQUE
|
2020-12-23 13:31:55 +01:00 |
Joan Sanchez
|
87f9a39e50
|
Merge branch 'dev' into 2666-closure_invalid_email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:29:36 +00:00 |
Joan Sanchez
|
c740767599
|
Merge pull request 'fix searchbar index' (#491) from 2625-travel_index into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #491
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-23 11:51:10 +00:00 |
Bernat Exposito
|
a21476e3df
|
fix searchbar index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:42:41 +01:00 |
Jorge Padawan
|
2948747da3
|
Seccion nueva, "Note" mas campo entryObservation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:25:12 +01:00 |
Jorge Padawan
|
a19064cb1b
|
Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays
|
2020-12-23 12:23:37 +01:00 |
Juan Ferrer
|
d064bc0417
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 00:00:38 +01:00 |
Joan Sanchez
|
6416b0ad79
|
2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-22 14:56:21 +01:00 |
Javi Gallego
|
0c7ddd863d
|
xdiario test ok
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-22 10:08:11 +01:00 |
Javi Gallego
|
36bace2a94
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-22 07:42:28 +01:00 |
Carlos Jimenez Ruiz
|
e70b8a80e1
|
Merge pull request '2663 - Drag & drop ticket to route index' (#488) from 2663-route_dragdrop into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #488
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-21 14:06:02 +00:00 |
Carlos Jimenez Ruiz
|
be1a317df8
|
Merge branch 'dev' into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:02:05 +00:00 |
Joan Sanchez
|
2ed7fdd367
|
Merge pull request 'years previous to contract error corrected' (#487) from 2675-worker_time_control_year_error into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #487
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-21 13:58:40 +00:00 |
Joan Sanchez
|
35dc2a533b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:52:08 +01:00 |
Joan Sanchez
|
1419acb8a7
|
2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:48:47 +01:00 |
Carlos Jimenez Ruiz
|
ec0ae8f07c
|
years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 13:52:37 +01:00 |
Carlos Jimenez Ruiz
|
564ca3a511
|
Merge pull request '2622-route_tickets_refactor' (#486) from 2622-route_tickets_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #486
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-21 11:50:19 +00:00 |
Carlos Jimenez Ruiz
|
482cbd7195
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:39:26 +01:00 |
Carlos Jimenez Ruiz
|
369a79b79f
|
route.tickets refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:37:36 +01:00 |
Carlos Jimenez Ruiz
|
ffc9b8dba9
|
Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-21 09:55:45 +00:00 |
Joan Sanchez
|
027a37bdad
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 10:14:15 +01:00 |
Javi Gallego
|
340927799c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 09:53:00 +01:00 |
Javi Gallego
|
3a6d62ac7d
|
xdiario
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 09:52:27 +01:00 |
Bernat Exposito
|
d4ab25f974
|
Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #480
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-21 07:08:12 +00:00 |
Bernat Exposito
|
1a641d1d4b
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 22:31:46 +01:00 |
Joan Sanchez
|
6717853efb
|
Updated front tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 18:02:41 +01:00 |
Joan Sanchez
|
95df28fc35
|
Keep file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:29:04 +01:00 |
Joan Sanchez
|
2d31752bdf
|
Updated gitignore
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:25:08 +01:00 |
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
Joan Sanchez
|
c24f19a38b
|
Merge pull request 'filter vehicles by worehouse' (#485) from 2662-show_vehicles_from_warehouse into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #485
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-18 16:05:46 +00:00 |
Jorge Padawan
|
2fe22efe36
|
filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 15:12:52 +01:00 |
Bernat Exposito
|
2115ff7fa6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 13:33:29 +01:00 |
Bernat Exposito
|
d1793351fb
|
Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #484
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-12-18 12:33:18 +00:00 |
Carlos Jimenez Ruiz
|
d0e6a8a582
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
|
2020-12-18 13:17:04 +01:00 |
Carlos Jimenez Ruiz
|
177d3cd35b
|
fixtures amended for calendar testing
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 13:16:44 +01:00 |
Bernat Exposito
|
ac6d97c026
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 10:10:09 +01:00 |
Bernat Exposito
|
b9344832d6
|
cr changes
|
2020-12-18 10:08:51 +01:00 |
Jorge Benedito
|
29ec268113
|
Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2020-12-18 08:34:00 +00:00 |
Javi Gallego
|
87adbbfa3c
|
Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 08:21:36 +01:00 |
Carlos Jimenez Ruiz
|
d347fcb997
|
Merge pull request 'Remove manager restriction to edit client credits' (#483) from 2679-client_credit_change into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #483
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-17 15:54:43 +00:00 |
Carlos Jimenez Ruiz
|
2c444a9b5b
|
Merge pull request 'export production' (#481) from 2645-export-production into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #481
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-17 14:27:03 +00:00 |
Bernat Exposito
|
0b5a98c2fe
|
export production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 15:17:03 +01:00 |
Carlos Jimenez Ruiz
|
172a4638cd
|
removed focus on describe
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:38:50 +01:00 |
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:29:37 +01:00 |
Jorge Benedito Llopis
|
7b3128d646
|
Remove manager restriction to edit client credits
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 10:07:17 +01:00 |
Carlos Jimenez Ruiz
|
7afd738a90
|
e2e for the supplier billing data path
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 16:37:53 +01:00 |
Javi Gallego
|
9abf23072a
|
frontTest
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 16:25:19 +01:00 |
Carlos Jimenez Ruiz
|
aae83336a3
|
supplier billing data e2e 1st steps
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 16:16:56 +01:00 |
Carlos Jimenez Ruiz
|
9df29b8be3
|
supplier.billingData buttons css update
|
2020-12-16 15:44:35 +01:00 |