Commit Graph

9446 Commits

Author SHA1 Message Date
Juan Ferrer ba5a03c980 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 01:56:19 +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 76ee8e6f38 User sync fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:40:54 +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 a472ce9a81 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 17:24:20 +01:00
Javi Gallego 0825042a6b Merge pull request 'refactor to catch wrong strings' (#430) from 2482-fix_worker_timeControl_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #430
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-30 16:23:13 +00:00
Carlos Jimenez Ruiz 22ba4a3e4f removed code obfuscation
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 17:09:11 +01:00
Javi Gallego b50ae7b8ca testback arreglados
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 15:50:59 +01:00
Joan Sanchez 245b32a47f Added section
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-30 15:11:45 +01:00
Bernat Exposito 89c9a1e858 add title in notes.contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 13:26:56 +01:00
Bernat Exposito 18ebbe80d7 supplier contact
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 11:40:12 +01:00
Javi Gallego 71fe677a7e fix getSummary
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:50:13 +01:00
Carlos Jimenez Ruiz 28ec55b440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz 2f6b3f0c38 small refactors for #2512 2020-10-30 10:45:55 +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 31b5a140d4 test completados 2020-10-30 10:07:53 +01:00
Carlos Jimenez Ruiz 66a77f395f Merge pull request 'create section supplier log' (#429) from 2539-supplier_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #429
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-30 08:29:45 +00: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 ea8d9e70b0 supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:27:02 +01:00
Bernat Exposito e75c275409 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log 2020-10-30 08:24:13 +01:00
Joan Sanchez ea6fc0fb04 Card fix
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 07:23:21 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 13:46:36 +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 bda8875584 Merge pull request 'ticket component refactor' (#435) from 2522-ticket_component into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #435
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-29 10:52:05 +00:00
Carlos Jimenez Ruiz 26c9e54663 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e 2020-10-29 11:47:34 +01:00
Bernat Exposito Domenech ea03d06a62 Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 11:46:57 +01:00
Bernat Exposito Domenech 551feed16f fix translate 2020-10-29 11:46:37 +01:00
Bernat Exposito 361af260a5 Merge branch 'dev' into 2522-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 10:11:24 +00:00
Bernat Exposito Domenech 42d16d0258 ticket component refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 11:09:58 +01:00
Joan Sanchez a76b2525d4 Merge pull request '2502-supplier_summary + e2e' (#425) from 2502-supplier_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #425
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-10-29 07:55:36 +00:00
Bernat Exposito Domenech 403d4b9118 cr changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 08:17:06 +01:00
Bernat Exposito Domenech a4bf680ca5 Merge branch '2502-supplier_summary' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 08:07:58 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech 8d32f93512 cr changes 2020-10-29 07:44:04 +01:00
Joan Sanchez 146b4f5bcd 2534 - Fill sage data before enable taxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 14:12:57 +01:00
Carlos Jimenez Ruiz b3d9b1b6c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e 2020-10-28 14:04:06 +01:00
Carlos Jimenez Ruiz a4c57d7618 e2e path for supplier summary and descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 12:29:50 +01:00
Carlos Jimenez Ruiz 687d9618cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-28 12:16:18 +01:00
Bernat Exposito cb1d48734a Merge pull request '2532 - Added icon taxDataChecked on ticket index' (#431) from 2532-icon_taxDataChecked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #431
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-10-28 10:21:03 +00:00
Joan Sanchez 109fcb3ca4 2532 - Added icon taxDataChecked on ticket index
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 09:57:39 +01:00
Carlos Jimenez Ruiz 8dba3fbb93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-28 09:54:26 +01:00
Carlos Jimenez Ruiz 5bfa6e5939 refactor to catch wrong strings
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 09:44:33 +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 8faf7d97fd Merge pull request '2511-claim_claimManager' (#426) from 2511-claim_claimManager into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #426
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-27 13:57:14 +00:00
Joan Sanchez 4a8eadfc6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2511-claim_claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-10-27 14:43:05 +01:00
Joan Sanchez 343358c231 Updated translations 2020-10-27 14:42:43 +01:00
Joan Sanchez faea343e41 Merge pull request '2540-entry_descriptorPopover' (#428) from 2540-entry_descriptorPopover into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #428
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-10-27 13:41:05 +00:00
Joan Sanchez 770b6a30bb Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-27 14:35:04 +01:00