Commit Graph

1322 Commits

Author SHA1 Message Date
Javi Gallego 4b51d607f7 error getLanded con drop temporary table
gitea/salix/dev This commit looks good Details
2019-11-15 15:42:00 +01:00
Joan Sanchez c83a97d7ec holidays fix #1853
gitea/salix/dev This commit looks good Details
2019-11-15 10:44:11 +01:00
Joan Sanchez ddb19cb198 added event
gitea/salix/dev This commit looks good Details
2019-11-15 10:03:46 +01:00
Joan Sanchez 6e5f460fab #1867 show warehouses on summary
gitea/salix/dev This commit looks good Details
2019-11-15 07:35:51 +01:00
Juan Ferrer 4f5c1404d7 E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-14 15:24:08 +01:00
Juan Ferrer 09a187ecfe Merge 2019-11-14 15:05:49 +01:00
Juan Ferrer 2621da8dce Hour formating fix
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-14 14:40:19 +01:00
Juan Ferrer 64124376f0 Final fixes 2019-11-14 14:37:18 +01:00
Joan Sanchez c028233012 ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good Details
2019-11-14 14:19:39 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Joan Sanchez 5561ff169e deprecated worker.sendMessage() 2019-11-14 11:21:08 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good Details
2019-11-13 13:22:39 +01:00
Joan Sanchez c166067888 updated tests & email compatibility with phone
gitea/salix/dev This commit looks good Details
2019-11-13 12:18:30 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Joan Sanchez 603bb034a1 Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good Details
2019-11-13 07:56:09 +01:00
Joan Sanchez 7f2af116bc updated translation
gitea/salix/dev This commit looks good Details
2019-11-13 07:04:47 +01:00
Joan Sanchez c3962c3d78 updated test
gitea/salix/dev This commit looks good Details
2019-11-12 15:07:37 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Joan Sanchez 05c4c9e96a ticket.weekly removed create section already on ticket descriptor #1841 2019-11-12 14:48:03 +01:00
Juan Ferrer 1c035ca045 All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-12 14:18:46 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +01:00
Juan Ferrer a4f6c64e59 Merge 2019-11-12 09:24:08 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Juan Ferrer 95d943e515 E2E fixes 2019-11-11 16:32:03 +01:00
Juan Ferrer efa6ddc0f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-11 16:25:00 +01:00
Joan Sanchez 6cedfceddd Show ticket state #1836
gitea/salix/dev This commit looks good Details
2019-11-11 13:51:30 +01:00
Joan Sanchez 42524c7f1d increased width to expand class #1845
gitea/salix/dev This commit looks good Details
2019-11-11 13:22:25 +01:00
Joan Sanchez 5b2e407870 dialog styles
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 12:26:22 +01:00
Joan Sanchez 6f7962935d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-11 11:24:26 +01:00
Joan Sanchez 115156f89d updated unit tests
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-11 11:23:39 +01:00
Joan Sanchez 0838540789 template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-11 11:04:49 +01:00
Juan Ferrer cf6961f5c5 E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures Details
2019-11-10 14:13:55 +01:00
Juan Ferrer 976782738e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-10 13:27:31 +01:00
Juan Ferrer bee50a6b03 Front tests passed 2019-11-10 13:10:52 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Bernat 84ccfe0422 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-07 07:51:21 +01:00
Javi Gallego eaa2ef4570 zone warehouse error
gitea/salix/dev This commit looks good Details
2019-11-07 07:49:37 +01:00
Bernat 4220c995a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-06 14:02:26 +01:00
Javi Gallego 729f6cb767 changes to zone
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-06 13:44:58 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 10:55:04 +01:00
Joan Sanchez 3d701f534a updated tests
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-06 09:32:54 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Joan Sanchez cac8cb6a6a dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-05 09:16:16 +01:00
Bernat 1be61b16d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-05 08:56:59 +01:00
Joan Sanchez 5d83849e2b unknown provider
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-05 07:19:16 +01:00
Joan Sanchez 14cb32d1c8 updated reports
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-04 13:55:20 +01:00
Joan Sanchez fc2abdc0ab change log columns size
gitea/salix/dev This commit looks good Details
2019-11-04 08:05:00 +01:00