Gerard
|
93bca3b3f0
|
merge master
gitea/salix/dev This commit looks good
Details
|
2019-04-04 12:47:02 +02:00 |
|
Gerard
|
4861b789f7
|
Loggable now inserts the correct values for FK values
gitea/salix/master This commit looks good
Details
|
2019-04-04 12:38:54 +02:00 |
 Carlos Jimenez Ruiz
|
971a2ab891
|
#1270
ticket.index advanced search mostrar dias en el futuro
|
2019-04-03 15:16:32 +02:00 |
|
Gerard
|
a23c636c16
|
#1279 loggable rawSql
gitea/salix/dev This commit looks good
Details
|
2019-04-02 14:36:49 +02:00 |
 Javi Gallego
|
0b977d3b0b
|
#1293 ticket.components solo muestra base
gitea/salix/dev This commit looks good
Details
|
2019-04-02 08:00:16 +02:00 |
|
Carlos Jimenez Ruiz
|
056c07b17c
|
#1181 No modificar ticket.basicData en reparto
gitea/salix/dev This commit looks good
Details
|
2019-04-01 15:04:09 +02:00 |
|
Carlos Jimenez Ruiz
|
62acb534e1
|
#1181 No modificar ticket.basicData en reparto
|
2019-04-01 14:49:12 +02:00 |
 Joan Sanchez
|
3f1889daa3
|
fix open client card from ticket descriptor #1291
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:48:22 +02:00 |
|
Joan Sanchez
|
5898d07822
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:02:13 +02:00 |
|
Joan Sanchez
|
dfe1a68d35
|
fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good
Details
|
2019-04-01 09:01:11 +02:00 |
|
Joan Sanchez
|
8db51fdf64
|
added shrink class to item index #1278
gitea/salix/dev This commit looks good
Details
|
2019-03-29 08:01:15 +01:00 |
|
Gerard
|
8bf4190d12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-03-29 07:37:23 +01:00 |
|
Gerard
|
280efdae50
|
#732 Loggable now inserts the correct values for FK values
|
2019-03-29 07:36:26 +01:00 |
|
Joan Sanchez
|
8110325af8
|
send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good
Details
|
2019-03-29 07:29:09 +01:00 |
|
Carlos Jimenez Ruiz
|
2263da2e05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-28 11:55:31 +01:00 |
|
Carlos Jimenez Ruiz
|
a14ba28629
|
#1263 invoiceOut.summary
|
2019-03-28 11:55:23 +01:00 |
|
Gerard
|
3b3e4a96e9
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-27 10:03:53 +01:00 |
|
Gerard
|
59d99db6b4
|
#1272 ticket.index
gitea/salix/test This commit looks good
Details
|
2019-03-27 09:58:58 +01:00 |
|
Joan Sanchez
|
8433e15875
|
show client id on ticket summary header #1273
gitea/salix/dev This commit looks good
Details
|
2019-03-27 09:06:21 +01:00 |
|
Gerard
|
8fc9581b8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-27 08:56:39 +01:00 |
|
Gerard
|
650e5b8626
|
#1257 route.log
|
2019-03-27 08:56:25 +01:00 |
Bernat
|
4e27581045
|
cau 10269 fix test and update fixtures
gitea/salix/dev This commit looks good
Details
|
2019-03-27 08:44:15 +01:00 |
|
Gerard
|
eaec968aa4
|
Now you can change the shipped hour of a ticket
|
2019-03-26 12:25:06 +01:00 |
|
Joan Sanchez
|
2ca5def095
|
build english locale on dist directory #1268
gitea/salix/dev This commit looks good
Details
|
2019-03-26 12:05:53 +01:00 |
|
Joan Sanchez
|
a16b43546d
|
fixed volume onLoad errors #1238
gitea/salix/dev This commit looks good
Details
|
2019-03-26 09:33:54 +01:00 |
|
Joan Sanchez
|
500105675c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-26 07:29:57 +01:00 |
|
Joan Sanchez
|
3df5f4cae9
|
replaced numeric fields with input-number #1138
|
2019-03-26 07:29:45 +01:00 |
Carlos Jimenez Ruiz
|
d322c941a4
|
#1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good
Details
|
2019-03-25 15:16:56 +01:00 |
|
Gerard
|
f4ddf3544d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-25 09:36:30 +01:00 |
|
Gerard
|
649b7f0e21
|
log added to ticket module models
|
2019-03-25 09:36:24 +01:00 |
|
Joan Sanchez
|
4a4b997e1b
|
added subName to fetched-tags #1246
gitea/salix/dev This commit looks good
Details
|
2019-03-22 15:05:15 +01:00 |
|
Gerard
|
37546e7a26
|
#1236 revision con pepe
gitea/salix/dev This commit looks good
Details
|
2019-03-22 12:34:42 +01:00 |
|
Joan Sanchez
|
6eaf317b5e
|
added worker calendar #1147
gitea/salix/dev This commit looks good
Details
|
2019-03-22 08:28:57 +01:00 |
|
Javi Gallego
|
0dd7e528dd
|
#1245 bug ticket line
gitea/salix/dev This commit looks good
Details
|
2019-03-21 14:56:09 +01:00 |
|
Gerard
|
bb321995fa
|
deleted wrongly an unused relation alertLevel
gitea/salix/dev This commit looks good
Details
|
2019-03-21 12:05:27 +01:00 |
|
Carlos Jimenez Ruiz
|
7a5124aca2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-03-20 12:27:36 +01:00 |
|
Carlos Jimenez Ruiz
|
30333a914e
|
#957 ticket.descriptor stowaway singlepage nav e2e
|
2019-03-20 12:23:38 +01:00 |
|
Carlos Jimenez Ruiz
|
d38ca72fd8
|
orden de resultados por defecto DESC de id y fecha
|
2019-03-20 11:49:11 +01:00 |
|
Bernat
|
981800a0e2
|
import production structure db to local and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-20 08:52:54 +01:00 |
|
Gerard
|
41a34421df
|
ship menu now open the stowaways in new tabs
gitea/salix/dev This commit looks good
Details
|
2019-03-11 11:29:31 +01:00 |
|
Joan Sanchez
|
891c4b201a
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-11 11:10:28 +01:00 |
|
Joan Sanchez
|
91f8f337f5
|
removed clog
gitea/salix/test This commit looks good
Details
|
2019-03-11 11:09:59 +01:00 |
|
Gerard
|
562403cd0a
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-11 08:15:00 +01:00 |
|
Gerard
|
63787a7beb
|
showing client tickets from client descriptor works again
gitea/salix/test This commit looks good
Details
|
2019-03-11 08:11:48 +01:00 |
|
Gerard
|
7f0d3279d1
|
#1189 ticket.index mostrar mas informacion
gitea/salix/dev This commit looks good
Details
|
2019-03-08 08:14:22 +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
|
fdfddd260a
|
#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button
|
2019-03-06 12:27:56 +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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Javi Gallego
|
a5b60a9016
|
instalacion impresora revisado
gitea/salix/dev This commit has test failures
Details
|
2019-03-01 09:07:44 +01:00 |
|
Gerard
|
7dd08dc6e5
|
merge test
gitea/salix/dev This commit looks good
Details
|
2019-02-28 10:19:31 +01:00 |
|
Gerard
|
624733dcfb
|
changed order of ticket index
gitea/salix/dev This commit has test failures
Details
|
2019-02-28 10:01:54 +01:00 |
|
Joan Sanchez
|
4729dda5f6
|
isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good
Details
|
2019-02-28 08:55:34 +01:00 |
|
Gerard
|
9a7bd834df
|
date offset fixed
gitea/salix/test This commit looks good
Details
|
2019-02-27 17:04:32 +01:00 |
|
Gerard
|
87e8be0ede
|
time filter changed by dateTime
|
2019-02-27 17:04:00 +01:00 |
|
Gerard
|
4de73fb2a8
|
#1152 refactor ticket.sale
|
2019-02-26 17:32:32 +01:00 |
|
Gerard
|
d404fc92c8
|
dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good
Details
|
2019-02-26 12:51:01 +01:00 |
 Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
961eb6edaf
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-02-22 14:38:45 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
|
Gerard
|
9370142731
|
styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 12:43:08 +01:00 |
|
Gerard
|
1e199e9d5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 12:58:05 +01:00 |
|
Gerard
|
6fb936a08a
|
ticket log disabled temporally
|
2019-02-21 12:57:19 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Gerard
|
ab6606a624
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:07:27 +01:00 |
|
Gerard
|
8d6fdc4b2f
|
added envialia and solved problems with worker popover
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:06:38 +01:00 |
|
Joan Sanchez
|
c9746521dc
|
removed unused getSubTotal() method
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:44:03 +01:00 |
|
Joan Sanchez
|
06be535115
|
ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:43:04 +01:00 |
|
Gerard
|
a651142fff
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 18:50:08 +01:00 |
|
Gerard
|
4b54b82a9d
|
#1150 descriptor popover intentar abrir con id movimiento
gitea/salix/test This commit looks good
Details
|
2019-02-20 18:46:30 +01:00 |
|
Gerard
|
a3dab9013c
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 17:53:10 +01:00 |
|
Gerard
|
0cca3bb9ce
|
#1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good
Details
|
2019-02-20 17:52:36 +01:00 |
|
Gerard
|
79cf4afb3e
|
#1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures
Details
|
2019-02-20 16:30:46 +01:00 |
|
Juan Ferrer
|
752a703cdb
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-02-20 14:34:56 +01:00 |
|
Juan Ferrer
|
8f1e41e744
|
Style fixes
|
2019-02-20 14:34:16 +01:00 |
|
Joan Sanchez
|
646e6c7b46
|
Disabled delivery-note preview
gitea/salix/dev This commit looks good
Details
|
2019-02-20 13:26:31 +01:00 |
|
Gerard
|
23e08331fc
|
fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:12:16 +01:00 |
|
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
|
Gerard
|
b7db5f969b
|
fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:09:50 +01:00 |
|
Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Carlos Jimenez Ruiz
|
4186fbacb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-16 17:15:03 +01:00 |
|
Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
|
Carlos Jimenez Ruiz
|
b034a8fab7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 15:33:11 +01:00 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +01:00 |