Commit Graph

367 Commits

Author SHA1 Message Date
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
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:22:12 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00
Bernat Exposito 5be616ad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 08:04:38 +01:00
Joan Sanchez db4f226f6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 12:39:15 +01:00
Juan Ferrer 2628faa9d0 Sync hotfixes
gitea/salix/pipeline/head This commit looks good Details
2020-11-06 22:55:47 +01:00
Carlos Jimenez Ruiz ead0994032 timeControlCalculate procedure updated
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 10:33:02 +01:00
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