Commit Graph

8413 Commits

Author SHA1 Message Date
Bernat Exposito 44d3cf748b change id in ticketLastState model
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:44:41 +01:00
Bernat Exposito c673f2130a fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 11:33:01 +01:00
Bernat Exposito e4e4f37609 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-10 08:46:37 +01:00
Bernat Exposito 4ea5993dcc user image 2020-11-10 08:39:34 +01:00
Bernat Exposito c3b5987a1e Merge pull request 'fixed collection tests pollution' (#446) from 2495-updateCollectionSale_test_pollution_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #446
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-09 14:06:59 +00:00
Carlos Jimenez Ruiz 54d31f15bb fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good Details
2020-11-09 14:53:26 +01:00
Javi Gallego 53f69ae8e5 Merge pull request 'stowaway test included + supplier contact refactor' (#444) from 2581-e2e_misc_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #444
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-11-05 15:00:22 +00:00
Carlos Jimenez Ruiz 223c8a8528 stowaway test included + supplier contact refactor
gitea/salix/pipeline/head Build started... Details
2020-11-05 15:58:02 +01:00
Carlos Jimenez Ruiz e72869df6b Merge pull request 'supplier basicData + e2e' (#438) from 2544-supplier_basicData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #438
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-05 13:35:18 +00:00
Carlos Jimenez Ruiz 9b7edb0830 updated path for log records
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 14:18:48 +01:00
Carlos Jimenez Ruiz a4ad852390 translations refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 13:59:24 +01:00
Carlos Jimenez Ruiz 18ed685c75 e2e path for supplier basic data
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 13:53:19 +01:00
Bernat Exposito 8765a18bbb fix supplier routes
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 11:46:15 +01:00
Bernat Exposito 0e3d636845 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 10:50:21 +01:00
Bernat Exposito 2c1b89db38 Merge pull request 'waitForState minor refactor' (#442) from 2568-ticket_basic_data_e2e_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #442
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-11-05 09:40:45 +00: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
Carlos Jimenez Ruiz 01ccef4786 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2568-ticket_basic_data_e2e_fix 2020-11-05 09:08:35 +01:00
Carlos Jimenez Ruiz a8e7d12e99 Merge pull request '2563-supplier_fiscalData + e2e' (#439) from 2563-supplier_fiscalData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #439
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-11-05 08:07:45 +00:00
Carlos Jimenez Ruiz 840da5e6bc e2e path for supplier.fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 18:14:08 +01:00
Carlos Jimenez Ruiz cd04ad8518 Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 15:21:23 +01:00
Carlos Jimenez Ruiz 07d610ad7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 15:21:00 +01:00
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
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 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
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
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
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