 Bernat Exposito
|
2dc51e6125
|
update acl
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-03 09:34:50 +01:00 |
|
Bernat Exposito
|
61c3d2233b
|
delete old sqls
|
2020-11-03 09:34:35 +01:00 |
 Carlos Jimenez Ruiz
|
d533e9da2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-03 09:22:07 +01:00 |
|
Bernat Exposito
|
f2ee122778
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
|
2020-11-03 07:51:25 +01:00 |
 Juan Ferrer
|
fc957eda6c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:45 +01:00 |
|
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:07 +01:00 |
 Joan Sanchez
|
413283288f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 15:38:23 +01:00 |
|
Joan Sanchez
|
15b7280222
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 14:31:39 +01:00 |
|
Joan Sanchez
|
590de622f5
|
Added model validations
|
2020-11-02 14:30:33 +01:00 |
|
Bernat Exposito
|
d07e95a7e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-11-02 11:14:42 +01:00 |
|
Bernat Exposito
|
e700f11863
|
acls
|
2020-11-02 11:14:21 +01:00 |
|
Bernat Exposito
|
7e2555ddf1
|
export production
|
2020-11-02 10:58:27 +01:00 |
|
Juan Ferrer
|
b6da896fe7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-02 10:11:34 +01:00 |
|
Juan Ferrer
|
e25a978b19
|
Merge branch 'test' into dev
|
2020-11-01 00:03:05 +01:00 |
|
Juan Ferrer
|
9b4f8697b9
|
User sync fixes
|
2020-10-31 21:16:58 +01:00 |
|
Juan Ferrer
|
15c39f93ca
|
root id changed from 0 to 100 due to loopback join problems with id 0
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 01:10:32 +01:00 |
|
Juan Ferrer
|
9b563cb8bf
|
LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 00:02:27 +01:00 |
 Javi Gallego
|
b50ae7b8ca
|
testback arreglados
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 15:50:59 +01:00 |
|
Bernat Exposito
|
39de960b9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-10-30 10:23:47 +01:00 |
|
Bernat Exposito
|
7200aa3dfc
|
fixtures and sql for supplierContact
|
2020-10-30 10:23:42 +01:00 |
|
Javi Gallego
|
59cbe276f4
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:08:38 +01:00 |
|
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:40:47 +01:00 |
|
Bernat Exposito
|
792b689b58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log
|
2020-10-29 13:40:21 +01:00 |
Bernat Exposito Domenech
|
77bc1b562e
|
create section supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 09:08:27 +01:00 |
|
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 12:16:57 +01:00 |
|
Javi Gallego
|
7dfe7ee379
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-21 12:35:09 +02:00 |
|
Joan Sanchez
|
5daee49382
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 11:52:02 +02:00 |
|
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 10:13:04 +02:00 |
|
Joan Sanchez
|
f7e9372bf0
|
2525 - Change to past date
|
2020-10-20 15:12:00 +02:00 |
|
Javi Gallego
|
4aea284703
|
WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:42:23 +02:00 |
|
Bernat Exposito Domenech
|
7eed2ddd59
|
export structure and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 12:47:37 +02:00 |
|
Joan Sanchez
|
6fa8aae161
|
2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 11:33:42 +02:00 |
|
Joan Sanchez
|
f00828cf57
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 05:44:11 +00:00 |
|
Javi Gallego
|
77064d85a0
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 12:54:02 +00:00 |
|
Javi Gallego
|
531bb6da25
|
quito copy
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 13:22:56 +02:00 |
|
Joan Sanchez
|
86025b88e3
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 09:36:02 +00:00 |
|
Joan Sanchez
|
cef2dc982f
|
Updated sql
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 10:47:12 +02:00 |
|
Joan Sanchez
|
ad11a92c87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar
|
2020-10-05 10:02:44 +02:00 |
|
Joan Sanchez
|
cdde4d95d7
|
Added filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 07:53:03 +02:00 |
|
Joan Sanchez
|
420dfdbdff
|
Send notification by email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-02 12:23:48 +02:00 |
|
Javi Gallego
|
8d1709ea51
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 16:46:33 +02:00 |
|
Juan Ferrer
|
6d8b13423f
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 10:02:19 +02:00 |
|
Javi Gallego
|
2714857227
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-30 14:07:38 +02:00 |
|
Juan Ferrer
|
611aa9cafa
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 10:55:04 +02:00 |
|
Juan Ferrer
|
991bece64a
|
SQL fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 21:25:53 +02:00 |
|
Juan Ferrer
|
5264b615d4
|
Optimización docker salix-db
|
2020-09-28 10:40:50 +02:00 |
|
Javi Gallego
|
c909470f41
|
merge
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-25 08:10:37 +02:00 |
|
Joan Sanchez
|
164f636f3f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:02:16 +02:00 |
|
Joan Sanchez
|
44e23ca560
|
Removed sql version
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:00:42 +02:00 |
|
Bernat Exposito Domenech
|
d4c819ebf7
|
new models and fixtures
|
2020-09-23 07:59:10 +02:00 |
|
Bernat Exposito Domenech
|
ce1c4e6f60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-22 14:00:52 +02:00 |
|
Juan Ferrer
|
3880e21ce3
|
Test fixes
|
2020-09-21 16:09:34 +02:00 |
|
Juan Ferrer
|
fc6a19b60d
|
Merge branch 'dev' into 2177-userModule
|
2020-09-21 14:10:15 +02:00 |
|
Juan Ferrer
|
b9c526c29c
|
LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 13:24:43 +02:00 |
|
Javi Gallego
|
8fb674819a
|
ticket service
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 10:35:39 +02:00 |
Carlos Jimenez Ruiz
|
bf17d428e4
|
entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-11 14:51:58 +02:00 |
|
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
gitea/salix/pipeline/head There was a failure building this commit
Details
LDAP test
RC1
SQL version changed
Tests fixes
Back & front tests fixed
All tests passed
Front and back tests plus some fixes
|
2020-09-11 14:36:16 +02:00 |
|
Bernat Exposito Domenech
|
9ff7232b50
|
export production and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 12:54:10 +02:00 |
|
Bernat Exposito Domenech
|
d90fb3444c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-08 08:30:00 +02:00 |
|
Joan Sanchez
|
3efe14fc53
|
Removed unused vars
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 12:52:27 +02:00 |
|
Joan Sanchez
|
ee52581a06
|
Updated param description
|
2020-09-07 12:52:21 +02:00 |
|
Joan Sanchez
|
8faddef7e8
|
Renamed sql file
|
2020-09-07 12:52:13 +02:00 |
|
Joan Sanchez
|
812847d82e
|
Changed sql folder
|
2020-09-07 12:52:06 +02:00 |
|
Joan Sanchez
|
e6804f6ee3
|
Removed procedures
|
2020-09-07 12:51:58 +02:00 |
|
Joan Sanchez
|
c3e8c0cc58
|
Changes
|
2020-09-07 12:51:49 +02:00 |
|
Joan Sanchez
|
fa634d2dad
|
2285 - Added closure paths
|
2020-09-07 12:51:38 +02:00 |
|
Joan Sanchez
|
bb092b1de9
|
Removed unused vars
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 12:16:20 +02:00 |
|
Joan Sanchez
|
c10e24b7cd
|
Updated param description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 11:50:23 +02:00 |
|
Joan Sanchez
|
173aac0ba6
|
Renamed sql file
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 11:45:54 +02:00 |
|
Joan Sanchez
|
13b3353e9a
|
Changed sql folder
gitea/salix/pipeline/head Build queued...
Details
|
2020-09-07 11:45:29 +02:00 |
|
Joan Sanchez
|
7b42497f88
|
Removed procedures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 11:44:44 +02:00 |
|
Joan Sanchez
|
f3a7fc514a
|
Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 10:54:39 +02:00 |
|
Joan Sanchez
|
66f4674392
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure
|
2020-09-07 10:05:52 +02:00 |
|
Joan Sanchez
|
52cbcf1fa3
|
Updated description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-07 08:34:04 +02:00 |
|
Carlos Jimenez Ruiz
|
9fa3f17a9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-01 17:45:00 +02:00 |
|
Joan Sanchez
|
5a16a10b8f
|
Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 06:55:13 +00:00 |
|
Joan Sanchez
|
8ae7871318
|
Removed procedure
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 07:56:56 +02:00 |
|
Joan Sanchez
|
17542472da
|
2391 - Editable description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 08:24:21 +02:00 |
|
Carlos Jimenez Ruiz
|
3a82ef0e06
|
2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-26 16:33:47 +02:00 |
|
Bernat Exposito Domenech
|
f180b73656
|
delete deprecated sql
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-12 13:18:55 +02:00 |
|
Bernat Exposito Domenech
|
96af9bdcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-11 11:12:52 +02:00 |
|
Bernat Exposito Domenech
|
9a4e20bb31
|
new models and fixtures
|
2020-08-11 11:03:43 +02:00 |
|
Joan Sanchez
|
e2c742c893
|
#2383 - Changed model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-10 14:29:25 +02:00 |
|
Joan Sanchez
|
0348b79f0d
|
Merge branch 'dev' into 1880-refactor_loggable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 12:03:22 +00:00 |
|
Bernat Exposito Domenech
|
8c926a1a7f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable
|
2020-07-16 13:20:41 +02:00 |
|
Joan Sanchez
|
171deeb82c
|
Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 11:12:34 +00:00 |
|
Bernat Exposito Domenech
|
02c82f894a
|
fix e2e errors
|
2020-07-09 14:14:11 +02:00 |
Joan Sánchez
|
01b32d2b89
|
Calendar changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-08 15:05:56 +02:00 |
|
Joan Sánchez
|
dd8e03dd0f
|
Added absence selection
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-07 14:29:57 +02:00 |
|
Bernat Exposito Domenech
|
122dacffb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-06 10:20:59 +02:00 |
|
Bernat Exposito Domenech
|
c42c6c19d6
|
changes in order index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-02 07:46:55 +02:00 |
|
Joan Sanchez
|
b40e09a6cb
|
Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-01 14:28:05 +02:00 |
|
Javi Gallego
|
039eec7d26
|
test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-30 10:16:22 +02:00 |
|
Javi Gallego
|
962436b8bb
|
2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-25 17:12:53 +02:00 |
|
Joan Sanchez
|
5d9ed49451
|
2285 - Added closure paths
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 08:17:01 +02:00 |
|
Javi Gallego
|
b40be5cca9
|
2035
gitea/salix/pipeline/head Build queued...
Details
|
2020-06-05 10:01:21 +02:00 |
|
Joan Sanchez
|
751f79373a
|
Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:28:14 +00:00 |
|
Bernat Exposito Domenech
|
546272cc3f
|
zone delete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 08:59:04 +02:00 |
|
Carlos Jimenez Ruiz
|
9deb518064
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 09:55:05 +02:00 |
|
Carlos Jimenez Ruiz
|
9bf509cd5d
|
customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 09:54:31 +02:00 |
|
Joan Sanchez
|
5c3e8e9465
|
Added insert ignore
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 08:09:12 +02:00 |
|
Joan Sanchez
|
a3e7771295
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix
|
2020-05-28 08:08:00 +02:00 |
|
Carlos Jimenez Ruiz
|
2345a922c8
|
now we can create thermographs for travelThermograph
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 13:11:41 +02:00 |
|
Bernat Exposito Domenech
|
89ce963a4c
|
update db
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 08:35:24 +02:00 |
|
Joan Sanchez
|
d24f04912e
|
2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-26 14:37:34 +02:00 |
|
Bernat Exposito Domenech
|
52241e6f2c
|
update itemLastENtries
|
2020-05-21 15:26:00 +02:00 |
|
Joan Sanchez
|
80a5200281
|
Unified sql
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 17:03:29 +02:00 |
|
Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
|
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
|
Bernat Exposito
|
5f8a2a24f5
|
Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-05-19 06:42:07 +00:00 |
|
Joan Sanchez
|
af0d0f1fbe
|
Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-05-19 06:18:23 +00:00 |
|
Joan Sanchez
|
4aea769797
|
2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 13:46:45 +02:00 |
|
Joan Sanchez
|
53b55468fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 11:45:43 +02:00 |
|
Bernat Exposito Domenech
|
37d5cf5975
|
delete old db changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 10:29:57 +02:00 |
|
Joan Sanchez
|
42bec3a944
|
1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-15 14:47:19 +02:00 |
|
Bernat Exposito Domenech
|
5ceb26c6da
|
update structure and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-15 13:11:23 +02:00 |
|
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
|
Joan Sanchez
|
94a219760c
|
2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-13 15:04:57 +02:00 |
|
Juan Ferrer
|
58be5ef78e
|
Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 10:16:31 +00:00 |
|
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 18:42:50 +02:00 |
|
Javi Gallego
|
ceb3d1f4cf
|
all filters tested
|
2020-04-30 07:20:43 +02:00 |
|
Javi Gallego
|
6dacf20bd9
|
ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-23 17:59:46 +02:00 |
|
Javi Gallego
|
dbb2257430
|
test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-20 13:49:33 +02:00 |
|
Joan Sanchez
|
2ad14230b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-17 14:22:46 +02:00 |
|
Javi Gallego
|
09e425c33c
|
2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 12:33:36 +02:00 |
|
Javi Gallego
|
ea1cc68d29
|
test passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-03 17:52:47 +02:00 |
|
Javi Gallego
|
0b966cbb76
|
Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia
|
2020-04-03 08:28:49 +02:00 |
Ainki
|
42f3bfb86d
|
test, fitxures and changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-30 14:28:29 +02:00 |
|
Javi Gallego
|
0a8272a730
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 17:52:41 +01:00 |
|
Javi Gallego
|
d53cedd5d4
|
preparado para PR
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 17:41:40 +01:00 |
|
Javi Gallego
|
0561f19313
|
version 1
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-24 17:34:23 +01:00 |
|
Javi Gallego
|
a30a4bf961
|
quitado el campo provincia
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-24 17:32:30 +01:00 |
|
Bernat Exposito Domenech
|
423f59dfb0
|
worker log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-24 12:20:53 +01:00 |
|
Javi Gallego
|
7fe9c7babc
|
getWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-20 11:36:14 +01:00 |
|
Joan Sanchez
|
fd91c3061a
|
Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-06 11:19:26 +00:00 |
|
Bernat Exposito Domenech
|
85ac133d00
|
update db test
|
2020-03-05 15:01:03 +01:00 |
|
Bernat Exposito Domenech
|
686382a0e6
|
entryLog section
|
2020-03-02 11:57:09 +01:00 |
|
Bernat Exposito Domenech
|
5e86f67b37
|
dbtest workerTimeControCheck
|
2020-03-02 08:18:41 +01:00 |
|
Joan Sanchez
|
8a4e2620c2
|
Changed sprint
gitea/salix/dev This commit looks good
Details
|
2020-02-27 07:55:21 +01:00 |
|
Joan Sanchez
|
886bc45525
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-02-27 07:54:22 +01:00 |
|
Joan Sanchez
|
a063722fbe
|
Changed SQL sprint
gitea/salix/test There was a failure building this commit
Details
|
2020-02-27 07:53:38 +01:00 |
|
Joan Sanchez
|
21be73b734
|
2127 - Disable preview on sepa core sample
|
2020-02-27 07:40:43 +01:00 |
|
Joan Sanchez
|
d66c53dbf2
|
2127 - Disable preview on sepa core sample
gitea/salix/2127-sample_disable_preview There was a failure building this commit
Details
|
2020-02-26 14:30:30 +01:00 |
|
Joan Sanchez
|
70b0143f0a
|
Renamed sql version
gitea/salix/2138-zone_event_m3 This commit looks good
Details
|
2020-02-25 08:53:09 +01:00 |
|
Joan Sanchez
|
447cdc686e
|
2138 - Added field m3Max to zoneEvent
|
2020-02-25 08:08:13 +01:00 |
|
Javi Gallego
|
4d389176fe
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2020-02-21 08:50:50 +01:00 |
|
Javi Gallego
|
a8137c8a6b
|
zoneClosure 3
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2020-02-20 15:15:50 +01:00 |
|
Joan Sanchez
|
64e4593156
|
Renamed version number
gitea/salix/dev This commit looks good
Details
|
2020-02-20 10:46:43 +01:00 |
|
Joan Sanchez
|
61b3ce184c
|
Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-18 06:32:17 +00:00 |
|
Joan Sanchez
|
fe8a0b4583
|
Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good
Details
|
2020-02-18 07:21:35 +01:00 |
|
Joan Sanchez
|
a9b8fab51d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2020-02-17 14:55:26 +01:00 |
|
Joan Sanchez
|
844b27acb9
|
2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit
Details
|
2020-02-17 12:47:03 +01:00 |
|
Javi Gallego
|
03f0a415f9
|
zoneClosure fase 2
gitea/salix/test This commit looks good
Details
|
2020-02-17 12:01:11 +01:00 |
|
Bernat Exposito Domenech
|
b78858eb7c
|
export structure db
gitea/salix/2105-export_structure_db This commit looks good
Details
|
2020-02-13 09:30:18 +01:00 |
|
Bernat Exposito Domenech
|
1887cc8c60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db
|
2020-02-13 08:44:25 +01:00 |
|
Bernat Exposito Domenech
|
4b48a89eaa
|
ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good
Details
|
2020-02-13 08:31:29 +01:00 |
|
Bernat Exposito Domenech
|
4abf87552d
|
db production exported
|
2020-02-12 14:38:51 +01:00 |
|
Joan Sanchez
|
f2fdce11cd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-10 14:54:59 +01:00 |
|
Bernat Exposito Domenech
|
dd368a8c3f
|
refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good
Details
|
2020-02-07 13:38:32 +01:00 |
|
Javi Gallego
|
5d0f72af4e
|
zoneDoCalc
gitea/salix/test This commit looks good
Details
|
2020-02-06 16:04:23 +01:00 |
|
Joan Sanchez
|
1be640a59d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures
Details
|
2020-01-29 14:51:37 +01:00 |
|
Joan Sanchez
|
c174d0a29e
|
acl fix
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-29 14:50:53 +01:00 |
|
Joan Sanchez
|
a6d94737af
|
changed version
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-29 13:15:24 +01:00 |
|
Joan Sanchez
|
a078898627
|
Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2020-01-29 10:29:35 +00:00 |
|
Bernat Exposito Domenech
|
58717a7c46
|
fix order e2e
gitea/salix/2050-order_lines_e2e This commit looks good
Details
|
2020-01-28 11:59:36 +01:00 |
|
Joan Sanchez
|
35e443a112
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
|
2020-01-28 09:03:33 +01:00 |
|
Bernat Exposito Domenech
|
2bcd0caa06
|
update structure db
|
2020-01-24 12:55:54 +01:00 |
|
Joan Sanchez
|
25ffa839a2
|
added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures
Details
|
2020-01-24 09:47:24 +01:00 |
|
Joan Sanchez
|
deada69ca4
|
Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good
Details
|
2020-01-23 14:59:37 +01:00 |
|
Bernat Exposito Domenech
|
937ddd7880
|
fix table componentType
gitea/salix/2014-remove_bi_from_db This commit has test failures
Details
|
2020-01-23 13:53:39 +01:00 |
|
Bernat Exposito Domenech
|
6700daf0e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-23 12:58:47 +01:00 |
|
Bernat Exposito Domenech
|
64bd721287
|
update structure db
|
2020-01-23 12:58:38 +01:00 |
|
Javi Gallego
|
5bd31eb082
|
zoneClosure
gitea/salix/master This commit looks good
Details
|
2020-01-22 10:41:09 +01:00 |
|
Joan Sanchez
|
77f6333aba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
|
2020-01-21 12:23:10 +01:00 |
|
Joan Sanchez
|
20b4f6ec74
|
updated tests
gitea/salix/dev This commit looks good
Details
|
2020-01-21 09:33:26 +01:00 |
|
Joan Sanchez
|
5e4ab8b128
|
Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit
Details
|
2020-01-21 09:00:42 +01:00 |
|
Joan Sanchez
|
3ff1fb7d2d
|
Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good
Details
|
2020-01-20 11:59:15 +01:00 |
|
Joan Sanchez
|
59d0ecca67
|
send message to worker or channel
gitea/salix/2015-chat_sendCheckingPresence This commit has test failures
Details
|
2020-01-20 07:33:24 +01:00 |
|
Joan Sanchez
|
826dfe8092
|
changes to percentage filter
gitea/salix/master This commit looks good
Details
|
2020-01-17 11:46:45 +01:00 |
|
Joan Sanchez
|
3a4c379033
|
Added waste section
|
2020-01-17 11:44:05 +01:00 |
|
Bernat Exposito Domenech
|
6c4e25bfe3
|
create entry.index
gitea/salix/1990-create_entry_section This commit looks good
Details
|
2020-01-10 11:52:35 +01:00 |
|
Bernat Exposito Domenech
|
d432c32577
|
export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good
Details
|
2020-01-09 10:49:09 +01:00 |
|
Joan Sanchez
|
8f92abe49c
|
fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good
Details
|
2019-12-31 14:01:05 +01:00 |
|
Joan Sanchez
|
0ece53a35e
|
Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good
Details
|
2019-12-27 08:49:51 +01:00 |
|
Bernat Exposito Domenech
|
0827b998a1
|
update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good
Details
|
2019-12-23 15:15:58 +01:00 |
|
Bernat Exposito Domenech
|
e9d416671d
|
update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good
Details
|
2019-12-20 13:51:04 +01:00 |
|
Joan Sanchez
|
472352e24c
|
Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 10:05:38 +00:00 |
|
Joan Sanchez
|
72d591e143
|
sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:59:17 +01:00 |
|
Joan Sanchez
|
b9415c0335
|
updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:40:12 +01:00 |
|
Joan Sanchez
|
61b9646f5b
|
Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-12-19 14:55:09 +01:00 |
|
Joan Sanchez
|
a1c6c0ab39
|
claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-19 11:37:53 +01:00 |
|
Bernat Exposito Domenech
|
aab970e667
|
client.phone section
gitea/salix/1928-client_phone This commit looks good
Details
|
2019-12-17 09:11:28 +01:00 |
|
Joan Sanchez
|
ef95244d07
|
stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 08:38:36 +01:00 |
|
Bernat Exposito Domenech
|
ff117c1811
|
merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good
Details
|
2019-12-13 09:06:39 +01:00 |
|
Bernat Exposito
|
c65364cda4
|
Merge branch '1907manaSpellers' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-13 07:57:36 +00:00 |
|
Bernat Exposito Domenech
|
dd86961542
|
update structure
gitea/salix/1907manaSpellers This commit looks good
Details
|
2019-12-13 08:46:40 +01:00 |
|
Javi Gallego
|
44304e993a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good
Details
|
2019-12-13 08:19:22 +01:00 |
|
Javi Gallego
|
ec081e6a3a
|
campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good
Details
|
2019-12-12 13:53:54 +01:00 |
|
Bernat Exposito Domenech
|
126a02c1b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket
|
2019-12-12 09:11:45 +01:00 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +01:00 |
|
Bernat Exposito Domenech
|
d0a2f4627b
|
1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good
Details
|
2019-12-10 12:42:14 +01:00 |
|
Bernat Exposito Domenech
|
2cc9c5e951
|
create section travel create
gitea/salix/1900travelCreate This commit looks good
Details
|
2019-12-09 12:15:19 +01:00 |
|
Bernat
|
261b9686a0
|
update procedures db
|
2019-12-04 11:10:24 +01:00 |
|
Bernat
|
f38210ddd2
|
udate structure db
|
2019-12-04 11:09:36 +01:00 |
|
Bernat
|
8f4e44aa37
|
update procedures db
gitea/salix/1904delete_vn2008_references This commit looks good
Details
|
2019-11-27 13:37:36 +01:00 |
|
Bernat
|
dcdd4473b1
|
fix structure db
gitea/salix/1904delete_vn2008_references This commit looks good
Details
|
2019-11-27 11:57:09 +01:00 |
|
Bernat
|
18b5342609
|
update fixtures and structure db
|
2019-11-26 14:15:43 +01:00 |
|
Bernat
|
5040d1d4a8
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-22 14:34:28 +01:00 |
|
Bernat Exposito
|
6a153bd69d
|
Merge branch 'timeControl_calculate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-22 09:55:31 +00:00 |
|
Bernat
|
1ce0c63bf2
|
1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good
Details
|
2019-11-22 08:23:31 +01:00 |
|
Carlos Jimenez Ruiz
|
dca7dd5fc7
|
rejected last modifications
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:51:11 +01:00 |
|
Carlos Jimenez Ruiz
|
33e9cf9816
|
Javi validation
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:39:09 +01:00 |
|
Carlos Jimenez Ruiz
|
a45ca84e7f
|
workerTimeControlCalculate procedure refactor
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:23:22 +01:00 |
|
Bernat
|
038ba3edb2
|
1711 update structure db
|
2019-11-21 13:18:30 +01:00 |
|
Carlos Jimenez Ruiz
|
f4a62dfa86
|
Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-21 11:30:00 +00:00 |
|
Juan Ferrer
|
30ac174b1e
|
SQL grouping quoted
gitea/salix/dev This commit looks good
Details
|
2019-11-21 12:01:21 +01:00 |
|
Joan Sanchez
|
fd72f206bc
|
Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 12:00:56 +01:00 |
|
Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |
|
Bernat
|
0473f1de82
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-21 09:09:17 +01:00 |
|
Bernat
|
525e115781
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-21 07:24:31 +01:00 |
|
Bernat
|
a1784470cc
|
update scheme db
|
2019-11-20 12:42:10 +01:00 |
|
Joan Sanchez
|
37618efb58
|
changed userPhone fkeys
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:37:13 +01:00 |
|
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:14:11 +01:00 |
|
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +01:00 |
|
Joan Sanchez
|
e499d44018
|
dont use payMethodId on view #1854
gitea/salix/dev This commit looks good
Details
|
2019-11-19 12:53:25 +01:00 |
|
Carlos Jimenez Ruiz
|
e74cb52867
|
Merge branch '1391-ticket_closure' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
LGTM
|
2019-11-19 07:02:12 +00:00 |
|
Joan Sanchez
|
06e4cbb783
|
renamed view atenderFk to
gitea/salix/dev This commit looks good
Details
|
2019-11-19 07:41:02 +01:00 |
|
Juan Ferrer
|
bdb03729b7
|
zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:36:08 +01:00 |
|
Juan Ferrer
|
4d4e4f31f4
|
vnZoneEvents refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:31:37 +01:00 |
|
Joan Sanchez
|
8643030bf0
|
restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good
Details
|
2019-11-18 15:04:51 +01:00 |
|
Javi Gallego
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Juan Ferrer
|
64124376f0
|
Final fixes
|
2019-11-14 14:37:18 +01:00 |
|
Javi Gallego
|
5da4722bdd
|
No borra warehouse de zone
|
2019-11-14 10:36:21 +01:00 |
|
Joan Sanchez
|
e0ed9072c9
|
unified LCR and CORE #1868
gitea/salix/dev This commit looks good
Details
|
2019-11-14 08:16:52 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Joan Sanchez
|
c3962c3d78
|
updated test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 15:07:37 +01:00 |
|
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-12 14:54:13 +01:00 |
|
Joan Sanchez
|
1b70721b0e
|
#1864 added restrictions, send rocketchat message
|
2019-11-12 14:53:58 +01:00 |
|
Bernat
|
e8862b5b56
|
fix sql userPhone
gitea/salix/dev This commit looks good
Details
|
2019-11-12 08:52:09 +01:00 |
|
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:51:30 +01:00 |
|
Javi Gallego
|
bd630aa562
|
ticketCalculateClon
gitea/salix/dev This commit looks good
Details
|
2019-11-07 11:12:05 +01:00 |
|
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
gitea/salix/dev This commit looks good
Details
|
2019-11-07 07:49:37 +01:00 |
|
Javi Gallego
|
729f6cb767
|
changes to zone
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-06 13:44:58 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Javi Gallego
|
700c092b90
|
merge
|
2019-10-29 12:58:26 +01:00 |
|
Javi Gallego
|
1a56f0af96
|
zoneRefactor
|
2019-10-29 12:29:38 +01:00 |
|
Bernat
|
cb90e86f64
|
#1846 exportar produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-29 11:28:35 +01:00 |
|
Bernat
|
9fd0ab0bd3
|
#1775 travel.log crear sección historial
|
2019-10-25 13:28:12 +02:00 |