Commit Graph

4643 Commits

Author SHA1 Message Date
Gerard 175c6ecd03 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-06 12:35:04 +01:00
Gerard 9db3275b67 input time not showing icons fixed
gitea/salix/master This commit looks good Details
2019-03-06 12:26:26 +01:00
Gerard c5a2c125fd Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-06 11:08:56 +01:00
Gerard 665f34b67e #1216 uvc now deletes the styles when you change the state
gitea/salix/master This commit looks good Details
2019-03-06 11:05:29 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order
gitea/salix/test This commit looks good Details
2019-03-05 14:43:59 +01:00
Joan Sanchez e7ca55fea3 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-03-05 11:12:44 +01:00
Joan Sanchez 8e45858cd0 Disable & create new mandate when sending a new core sample #1207
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-05 10:10:43 +01:00
Joan Sanchez 596eb8d695 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-05 08:48:26 +01:00
Joan Sanchez ef483bcc12 fixed zone calendar weekday offset
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-03-05 08:24:09 +01:00
Carlos Jimenez Ruiz f8a4ad0f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz d1d11233ad #1039 ticket.summary 2019-03-04 16:34:41 +01:00
Gerard d6683918bb #1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good Details
2019-03-04 16:06:41 +01:00
Gerard 96704cc4df Merge branch 'test' into dev 2019-03-04 14:29:18 +01:00
Gerard b0be963541 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-05 14:12:20 +01:00
Gerard f5262954bc bug with filter giving wrong dates fixed
gitea/salix/test This commit looks good Details
2019-03-05 14:08:00 +01:00
Gerard 2f7c544c52 changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good Details
2019-03-05 12:25:37 +01:00
Gerard 025c0810be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-05 12:13:59 +01:00
Gerard 32893b49c1 #1174 item.index buscador avanzado mostrar comprador 2019-03-05 12:13:46 +01:00
Gerard 00f9754c1e #1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good Details
2019-03-05 12:03:34 +01:00
Gerard 7f10a509e0 #1188 item.index filtering doesnt work for some params
gitea/salix/dev This commit looks good Details
2019-03-05 11:34:05 +01:00
Gerard 80ebf671e8 fonts rollback to version 1.24
gitea/salix/dev This commit looks good Details
2019-03-05 10:45:07 +01:00
Gerard 609d47b79b Merge branch 'master' into test
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-04 14:24:45 +01:00
Gerard 9be6f1351a updated steps
gitea/salix/master This commit looks good Details
2019-03-05 08:42:05 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166
gitea/salix/dev This commit looks good Details
2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz e368e2021b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-04 09:13:20 +01:00
Carlos Jimenez Ruiz dd9eab570e #1200 e2e client fiscal data maintenance 2019-03-04 09:13:02 +01:00
Joan Sanchez 7fd8615157 added comment to sql changes
gitea/salix/dev This commit looks good Details
2019-03-04 08:35:39 +01:00
Carlos Jimenez Ruiz f6e625a1be fixed a date bug
gitea/salix/dev This commit looks good Details
2019-03-04 08:31:33 +01:00
Carlos Jimenez Ruiz e3e20455d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-04 08:13:37 +01:00
Bernat 02f99d3eb2 cau 9995 - 10013 fix test and update structure
gitea/salix/dev This commit looks good Details
2019-03-04 08:13:09 +01:00
Joan Sanchez 7d04404053 fixture isDefaultAddress
gitea/salix/dev This commit looks good Details
2019-03-04 07:57:52 +01:00
Gerard 1b2f851525 #1191 item not available icon added
gitea/salix/dev This commit has test failures Details
2019-03-04 20:00:12 +01:00
Gerard 269a2576b2 fonts updated 2019-03-04 19:47:10 +01:00
Carlos Jimenez Ruiz 0bdc66093c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-01 13:56:30 +01:00
Carlos Jimenez Ruiz ea3328756b #1185 cambiar e2e client log 2019-03-01 13:56:17 +01:00
Bernat 11c6fd2da7 Cau 8402 fix test and update structure
gitea/salix/dev This commit looks good Details
2019-03-01 12:19:12 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good Details
2019-03-01 11:50:26 +01:00
Carlos Jimenez Ruiz ec6364490a removed a task comment for completed #860
gitea/salix/dev This commit looks good Details
2019-03-01 11:31:40 +01:00
Carlos Jimenez Ruiz d5ac428cb7 #860 E2E client/client/src/web-payment/index.js
gitea/salix/dev This commit looks good Details
2019-03-01 11:30:59 +01:00
Carlos Jimenez Ruiz daa65e967f typo corrected
gitea/salix/dev This commit looks good Details
2019-03-01 11:09:20 +01:00
Carlos Jimenez Ruiz 39116d51f4 added wait 100ms to accessToSearchResult extension 2019-03-01 11:08:31 +01:00
Carlos Jimenez Ruiz 443da0c44c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-01 10:51:12 +01:00
Carlos Jimenez Ruiz fc5cf465fc bug fixes for travel dates 2019-03-01 09:31:24 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado
gitea/salix/dev This commit has test failures Details
2019-03-01 09:07:44 +01:00
Carlos Jimenez Ruiz 0762b734fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-01 07:33:31 +01:00
Joan Sanchez d6997a85ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-03-01 07:32:16 +01:00
Gerard b2a84ab82c datestrings deleted
gitea/salix/dev This commit has test failures Details
2019-03-01 07:31:11 +01:00
Gerard 73c4e75ef8 tests excluded due wrong ticket searchs 2019-03-01 07:30:41 +01:00
Joan Sanchez dbc582a410 Merge branch 'test' into dev 2019-03-01 07:30:30 +01:00
Joan Sanchez 4fe4c7886b fixed samples visible scope
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-01 07:27:29 +01:00