gerard
|
8cbe02a1b6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-17 15:37:20 +02:00 |
|
gerard
|
bbfa066640
|
Bug #307 CR JOAN
|
2018-05-17 15:37:09 +02:00 |
Bernat
|
665d819c34
|
new model itemTypeTag
|
2018-05-17 14:28:15 +02:00 |
|
gerard
|
983e66d7ee
|
Bug #307 Modificar changeState en ticket.sale
|
2018-05-17 13:29:18 +02:00 |
|
gerard
|
595d878f93
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-17 13:19:44 +02:00 |
|
gerard
|
5203755fd1
|
Bug #310 Error en client.credit
|
2018-05-17 13:18:16 +02:00 |
|
Bernat
|
b49b4ce5a8
|
update ACL
|
2018-05-17 09:10:56 +02:00 |
 Joan Sanchez
|
026a5b7dea
|
Change address when client is selected on ticket basic data
|
2018-05-17 08:44:34 +02:00 |
 Javi Gallego
|
7aa2d04d00
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-16 13:28:59 +02:00 |
|
Javi Gallego
|
5779e47197
|
buy de item.tax no se mostraba al rol buyer
|
2018-05-16 13:28:54 +02:00 |
|
Joan Sanchez
|
fe60481b1f
|
Disabled unused services
|
2018-05-16 13:26:36 +02:00 |
|
Joan Sanchez
|
f0e8b90316
|
Added description field on item basic data #303
|
2018-05-16 13:02:19 +02:00 |
|
Joan Sanchez
|
11b7c133a4
|
Added package & dropdown replaced search regexp with like
|
2018-05-16 13:01:14 +02:00 |
|
gerard
|
0fdb4a4785
|
Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL
|
2018-05-16 12:56:46 +02:00 |
|
Bernat
|
e6b7cd8516
|
update tbl tickets
|
2018-05-16 10:47:25 +02:00 |
|
Joan Sanchez
|
3557a08d2c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-16 08:19:06 +02:00 |
|
Joan Sanchez
|
8f9f7c1fe6
|
Ticket basic data and date-picker refactor
|
2018-05-16 08:13:39 +02:00 |
|
Javi Gallego
|
d5c21c046e
|
traduccion Order
|
2018-05-16 08:10:43 +02:00 |
|
Javi Gallego
|
63cd55cd66
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-15 14:02:20 +02:00 |
|
Javi Gallego
|
8cffc556d0
|
bug: al clonar item no clonaba su iva
|
2018-05-15 14:02:16 +02:00 |
|
Joan Sanchez
|
5e2e898151
|
Shipped with datetime
|
2018-05-15 09:43:45 +02:00 |
|
Bernat
|
d9b43ce84d
|
update fixtures tbl:ticket and ticketTracking
|
2018-05-14 14:32:58 +02:00 |
|
gerard
|
b5cfbf1246
|
Bug #253 Actualizar los estilos para que concuerden con la paleta
|
2018-05-14 12:54:17 +02:00 |
|
Joan Sanchez
|
325aae7ebd
|
Changed ticket summary service path
|
2018-05-14 10:07:22 +02:00 |
|
Bernat
|
fa222ab398
|
refactor fixtures
|
2018-05-14 07:50:33 +02:00 |
|
Bernat
|
b301d07cd6
|
delete deprecated files
|
2018-05-11 15:06:31 +02:00 |
|
Bernat
|
d89fdbcdd1
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 14:09:37 +02:00 |
|
Bernat
|
4191c97beb
|
update views sale and componenTypeRate
|
2018-05-11 14:09:24 +02:00 |
|
Joan Sanchez
|
ebc7b5b95a
|
docker-compose without volumes
|
2018-05-11 13:23:41 +02:00 |
|
Bernat
|
0dbba4e159
|
add model deliveryMethod
|
2018-05-11 13:08:01 +02:00 |
|
Joan Sanchez
|
f1de516a78
|
Edit address agencyMode combobox fix
|
2018-05-11 11:44:47 +02:00 |
|
Joan Sanchez
|
35735c15a3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 11:34:20 +02:00 |
|
Joan Sanchez
|
a990a950a1
|
Keep SQL comments on docker dump
|
2018-05-11 11:34:05 +02:00 |
|
gerard
|
f841e25b7f
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:30:05 +02:00 |
|
gerard
|
23a7dec92d
|
Tarea #289 e2e fixed
|
2018-05-11 11:22:04 +02:00 |
|
gerard
|
7a60211023
|
Unhandled errors fixed CR JUAN
|
2018-05-11 11:20:37 +02:00 |
|
gerard
|
85aa3b0156
|
Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta""
This reverts commit d9862b8922.
|
2018-05-11 11:16:16 +02:00 |
|
gerard
|
d9862b8922
|
Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"
This reverts commit 9b07cd444c.
|
2018-05-11 11:10:15 +02:00 |
|
gerard
|
9b07cd444c
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:09:07 +02:00 |
|
gerard
|
b0d5e2958e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 09:04:09 +02:00 |
|
Joan Sanchez
|
bd069a1f39
|
Rolling back to old pagination
|
2018-05-11 08:35:28 +02:00 |
Juan
|
3a62f25c70
|
Merge
|
2018-05-10 19:09:42 +02:00 |
|
Juan
|
92a5679ff6
|
Jenkinsfile
|
2018-05-10 17:50:42 +02:00 |
|
Juan
|
40f3c57da9
|
Jenkinsfile fixes
|
2018-05-10 17:41:03 +02:00 |
|
Juan
|
74f441900d
|
Jenkinsfile linting
|
2018-05-10 17:33:43 +02:00 |
|
gerard
|
19223a6013
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-10 14:56:51 +02:00 |
|
Joan Sanchez
|
700fea1d54
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-10 14:07:28 +02:00 |
|
Joan Sanchez
|
b14154b4e2
|
Prevent container shutdown forcing SQL import
|
2018-05-10 14:07:25 +02:00 |
|
gerard
|
aa7dbaeccb
|
Initial work Handle unhandled exceptions CR JUAN
|
2018-05-10 13:48:48 +02:00 |
|
gerard
|
4ebca3f3cb
|
pequeño refactor CR JOAN
|
2018-05-10 13:39:11 +02:00 |