Bernat
|
b709930db5
|
cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-07 07:51:29 +01:00 |
Gerard
|
b04dc02c61
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 16:29:15 +01:00 |
|
Gerard
|
af960e5f5f
|
fonts updated to 1.26 version
gitea/salix/test This commit looks good
Details
|
2019-03-06 16:28:09 +01:00 |
|
Gerard
|
1cc196983e
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 14:13:58 +01:00 |
|
Gerard
|
f8d6d2fe98
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-06 14:10:36 +01:00 |
|
Gerard
|
0e3d568743
|
#1218 ticket.new quitar restricciones al crear un ticket abono
gitea/salix/master This commit looks good
Details
|
2019-03-06 14:06:36 +01:00 |
Carlos Jimenez Ruiz
|
bbe8e7988e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 12:37:45 +01:00 |
|
Gerard
|
22abeca53e
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 12:35:37 +01:00 |
|
Gerard
|
175c6ecd03
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-06 12:35:04 +01:00 |
|
Carlos Jimenez Ruiz
|
73f4f80d83
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-06 12:28:52 +01:00 |
|
Carlos Jimenez Ruiz
|
fdfddd260a
|
#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button
|
2019-03-06 12:27:56 +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 |
|
Bernat
|
5efce3699c
|
cau 9994 new procedure ticketCalculateSale
gitea/salix/dev This commit looks good
Details
|
2019-03-06 11:45:05 +01:00 |
|
Carlos Jimenez Ruiz
|
eef85a47db
|
#1210 e2e item.index ocultar columnas
gitea/salix/dev This commit looks good
Details
|
2019-03-06 11:40:52 +01:00 |
|
Carlos Jimenez Ruiz
|
6289978de8
|
increased default timeout for 1 single test which failed constantly
|
2019-03-06 11:40:37 +01:00 |
|
Gerard
|
bdfd7fad22
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-06 11:09:33 +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 |
|
Carlos Jimenez Ruiz
|
c4bcd52d3c
|
#1210 e2e item.index ocultar columnas
gitea/salix/dev This commit looks good
Details
|
2019-03-06 09:50:12 +01:00 |
|
Carlos Jimenez Ruiz
|
7a5aba7fb8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-06 09:26:11 +01:00 |
|
Carlos Jimenez Ruiz
|
49d2a367ea
|
#1210 e2e item.index ocultar columnas selectors
|
2019-03-06 09:26:05 +01:00 |
|
Gerard
|
b2adde4ba3
|
#1176 ticket.sale actualizar descuento
gitea/salix/dev This commit looks good
Details
|
2019-03-06 08:54:56 +01:00 |
|
Gerard
|
80168900fe
|
e2e fixed
|
2019-03-06 08:54:32 +01:00 |
|
Gerard
|
8923970e75
|
e2e fixed
gitea/salix/dev This commit looks good
Details
|
2019-03-06 08:54:04 +01:00 |
|
Gerard
|
1c7d50fc25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-05 15:00:38 +01:00 |
|
Gerard
|
dd7ded018b
|
test fixed
|
2019-03-05 15:00:17 +01:00 |
 Joan Sanchez
|
11603f8d90
|
Add services to deliver-note #1201. Renamed receipt
gitea/salix/dev This commit has test failures
Details
|
2019-03-05 14:59:18 +01:00 |
|
Gerard
|
fbc84f48a1
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-03-05 14:44:38 +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 |
|
Carlos Jimenez Ruiz
|
17654ef71e
|
#1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:37:43 +01:00 |
|
Carlos Jimenez Ruiz
|
d37d314304
|
#1202 refactor del cambio de estado de un ticket
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:01:53 +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 |