Commit Graph

8601 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 074e10d4ca translations file was corrupted on merge fix 2020-11-04 15:20:07 +01:00
Carlos Jimenez Ruiz c826c1ccc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 15:19:07 +01:00
Joan Sanchez c77cd696c7 Test fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 14:38:15 +01:00
Joan Sanchez b65f48f0d9 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 14:35:27 +01:00
Joan Sanchez 2a0d2f4394 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor 2020-11-04 14:34:59 +01:00
Carlos Jimenez Ruiz 47b845da46 Merge pull request '2534 - Fill sage data before enable taxDataChecked' (#432) from 2534-sage_taxDataChecked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #432
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-04 12:54:13 +00:00
Joan Sanchez c5421ee543 Merge branch 'dev' into 2534-sage_taxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 12:39:30 +00:00
Joan Sanchez 0570d83a6d Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 13:38:09 +01:00
Joan Sanchez 16b774d585 Catalog tag selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 13:19:43 +01:00
Joan Sanchez 2b6048ca4d Removed comment block
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 12:45:02 +01:00
Carlos Jimenez Ruiz d933568745 Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 11:49:11 +01:00
Joan Sanchez fd05455027 Postcode auto-fill fix
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 11:37:54 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +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 8976034bb0 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-03 08:15:49 +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
Carlos Jimenez Ruiz b95de5d788 waitForState minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 17:42:46 +01:00
Javi Gallego 65f4a432aa Merge pull request '2565-address_fixtures' (#440) from 2565-address_fixtures into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #440
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-02 14:44:16 +00: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
Bernat Exposito b2d69127cb Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:31:36 +00:00
Carlos Jimenez Ruiz 4235055274 Merge pull request '2538-supplier_contact + e2e' (#437) from 2538-supplier_contact into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #437
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-02 14:12:18 +00: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
Carlos Jimenez Ruiz 7ac1807495 removed focus from html template
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:04:11 +01:00
Carlos Jimenez Ruiz 0e7c294f46 e2e path for supplier contacts 2020-11-02 13:23:03 +01:00
Carlos Jimenez Ruiz 71b7d27623 Merge branch '2538-supplier_contact' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:28:09 +01:00
Bernat Exposito a42d24ebb4 Merge branch '2538-supplier_contact' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:15:07 +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
Carlos Jimenez Ruiz ffaf93ab83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 11:14:20 +01:00
Bernat Exposito 7e2555ddf1 export production 2020-11-02 10:58:27 +01:00
Juan Ferrer c33aef2407 Package lock 2020-11-02 10:45:44 +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
Bernat Exposito d6c5e0ef0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 09:27:35 +01:00
Carlos Jimenez Ruiz 117270e3fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 09:19:23 +01:00
Javi Gallego e81aef74a9 Merge pull request '2510-client-address-create-test' (#418) from 2510-client-address-create-test into dev
Reviewed-on: #418
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-02 07:53:53 +00:00
Joan Sanchez 61e63cdd48 Updated unit tests 2020-11-02 08:53:28 +01:00
Joan Sanchez 565bd013bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 08:32:46 +01:00
Bernat Exposito e68453c047 fix test 2020-11-02 08:26:53 +01:00
Joan Sanchez 9e3186c0df Updated unit tests 2020-11-02 08:16:42 +01:00
Juan Ferrer e25a978b19 Merge branch 'test' into dev 2020-11-01 00:03:05 +01:00
Juan Ferrer 414c0931eb Sync management UI 2020-10-31 22:56:02 +01:00
Juan Ferrer 9b4f8697b9 User sync fixes 2020-10-31 21:16:58 +01:00
Bernat Exposito c1125916f6 supplier basicData
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:22:56 +01:00
Bernat Exposito 459f4068ab fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:05:16 +01:00
Juan Ferrer 937d5beefe User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 03:13:17 +01:00