Commit Graph

9517 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 6cfb1a226a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-07 09:46:52 +02:00
Joan Sanchez 03a0a22526 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:53:47 +02:00
Joan Sanchez 52b851e75b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-07 08:34:17 +02:00
Joan Sanchez 52cbcf1fa3 Updated description
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:34:04 +02:00
Joan Sanchez f8bb4d86fb State fix & supplier search fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:15:43 +02:00
Joan Sanchez 955de285f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-07 08:01:29 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 07:59:27 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table
gitea/salix/pipeline/head This commit looks good Details
2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz d1e8bd894f e2e path as far as it can go atm
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 17:30:24 +02:00
Carlos Jimenez Ruiz 0116adeddb Merge branch '2402-entry_create' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:59:41 +02:00
Joan Sanchez 5b4a3cd370 Travel autocomplete fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 16:52:35 +02:00
Carlos Jimenez Ruiz a00f64e7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:29:38 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez 637f0e392d Merge pull request '2415-fix_invoiceOut_e2e' (#366) from 2415-fix_invoiceOut_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #366
2020-09-03 10:20:10 +00:00
Carlos Jimenez Ruiz 9739de4f74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2415-fix_invoiceOut_e2e
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 12:02:06 +02:00
Carlos Jimenez Ruiz 8e05915ff4 e2e path now clears days onwards input for search 2020-09-03 12:01:57 +02:00
Joan Sanchez 68f011e53c Added waitFor(500) ms
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 11:53:39 +02:00
Joan Sanchez 5fa9489f9a Added fields as required, added info icon
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 08:09:37 +02:00
Carlos Jimenez Ruiz 31b967e368 Merge pull request 'removed autoLoad from vnTable' (#333) from 1788-remove_autoload_vnTable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #333
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-09-02 14:45:43 +00:00
Carlos Jimenez Ruiz 07d85c519e Merge branch '1788-remove_autoload_vnTable' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 16:31:11 +02:00
Carlos Jimenez Ruiz 13f80cd76c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable 2020-09-02 15:52:44 +02:00
Carlos Jimenez Ruiz 1d73bba204 Merge pull request 'latestsBuys + e2e path' (#340) from 2341-Entry_lastBuy_section into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #340
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-09-02 13:35:42 +00:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 15:20:28 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 13:09:30 +02:00
Joan Sanchez e6790f6120 #2406 - Sort by occurrences
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 10:06:25 +02:00
Carlos Jimenez Ruiz 1c0d5dbd76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz 742a1c9ea8 removed focus on test 2020-09-02 09:42:10 +02:00
Carlos Jimenez Ruiz 11e1a6f845 Merge pull request 'First version of multicheck selection' (#363) from 2427-multicheck_selection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #363
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-02 07:24:15 +00:00
Joan Sanchez 33aec33cba Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 08:12:32 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez 6a065091de First version of multicheck selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-01 15:13:33 +02:00
Joan Sanchez ecb98dfac5 Descriptor fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-01 12:10:32 +02:00
Carlos Jimenez Ruiz a555dea339 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable 2020-09-01 10:51:54 +02:00
Carlos Jimenez Ruiz 79b5ac0c3c Merge branch 'dev' into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:47:41 +00:00
Joan Sanchez 048270711d Merge pull request 'campo packageFk' (#360) from 2411-ticket-expedition-añadir-campo-packagingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #360
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-09-01 07:41:32 +00:00
Joan Sanchez cb4fe1f610 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:37:48 +00:00
Carlos Jimenez Ruiz d33f86c86d Merge pull request '2409 - Added filter by selection' (#362) from 2409-last_entries_contextmenu into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #362
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-01 07:30:12 +00:00
Joan Sanchez 5a16a10b8f Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:55:13 +00:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Javi Gallego a5fbe57159 gulpfile
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:42:31 +02:00
Javi Gallego a567738f2c set addressFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:33:11 +02:00
Joan Sanchez 8ae7871318 Removed procedure
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:56:56 +02:00
Joan Sanchez 0a542a2057 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:38:03 +02:00
Joan Sanchez 156c5de17d Merge pull request '2416 - Item request - Added state filter' (#361) from 2408-item_request into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #361
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-31 13:23:13 +00:00
Joan Sanchez b34545b316 Merge branch 'dev' into 2408-item_request
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 13:11:07 +00:00
Carlos Jimenez Ruiz f797fdce94 Merge pull request '2391 - Editable description(done) + e2e' (#359) from 2391-client_balance_description into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #359
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-08-31 13:05:12 +00:00
Joan Sanchez 8aa9918d84 2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:03:00 +02:00
Carlos Jimenez Ruiz a156a26e19 e2e updated
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:00:11 +02:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00