Commit Graph

750 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz c4f673e089 relocated sql code
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 11:28:47 +01:00
Carlos Jimenez Ruiz 0cf3f198ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 11:50:32 +01:00
Jorge Padawan 6acb5c221e Changes folder of ACL
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:55:21 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 09:23:58 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-20 09:17:55 +01:00
Joan Sanchez a67c8e4fbd Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:22:23 +01:00
Joan Sanchez 94b8fa7c4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-20 08:22:05 +01:00
Joan Sanchez 24982ba030 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:12:40 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +01:00
Bernat Exposito 975e158ebb itemTag trigger 2021-01-13 08:17:41 +01:00
Jorge Padawan 4e1b9b911b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:05:35 +01:00
Bernat Exposito 8b3af8851c fix trigger itemTag 2021-01-11 11:29:47 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-08 16:45:20 +01:00
Bernat Exposito a2550ce128 export table payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:24:41 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Bernat Exposito 779b229dfc refactor tag fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 12:11:14 +01:00
Bernat Exposito 6179921978 export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:37:56 +01:00
Carlos Jimenez Ruiz e356dd9e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-30 14:55:14 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez 910caf5689 2661 - Added clone options
gitea/salix/pipeline/head This commit looks good Details
2020-12-28 14:53:26 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Jorge Padawan 3517bdea41 Añadido a las foreignKeys el valor UNIQUE 2020-12-23 13:31:55 +01: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 a19064cb1b Nueva tabla entryObservation y he juntado la consulta de 1260-navidad con 1260-holydays 2020-12-23 12:23:37 +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
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 177d3cd35b fixtures amended for calendar testing
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 13:16:44 +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
Bernat Exposito 0b5a98c2fe export production
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 15:17:03 +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
Joan Sanchez 5ecd589106 Updated delivery note
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 09:24:11 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Bernat Exposito 6605e5ae4c zoneLog 2020-12-02 12:05:47 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 13:54:47 +00:00
Joan Sanchez 359dcc904d Version merge
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 08:48:42 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00