 Juan Ferrer
|
09a187ecfe
|
Merge
|
2019-11-14 15:05:49 +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
|
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
|
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
|
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
|
6f7962935d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-11 11:24:26 +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
|
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 |
|
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 |
|
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 |
|
Juan Ferrer
|
38b4483edf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-31 13:43:15 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Juan Ferrer
|
c41fb1d0f4
|
#1847 vnDialog refactor
|
2019-10-30 16:57:14 +01:00 |
|
Bernat
|
9353d54b16
|
add alias on weekly filter
|
2019-10-29 14:55:05 +01:00 |
|
Joan Sanchez
|
443aa56fed
|
refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-10-29 07:46:44 +01:00 |
|
Juan Ferrer
|
0a4a22ec87
|
vnInputFile fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-28 21:40:24 +01:00 |
|
Juan Ferrer
|
1b2c383502
|
vnDialog opens in body, nightmare extensions with detailed errors
|
2019-10-28 17:31:33 +01:00 |
|
Juan Ferrer
|
47998aaa97
|
vnDialog opens in body
|
2019-10-27 01:30:01 +02:00 |
|
Juan Ferrer
|
5ae558e965
|
Watchers performance fixes
|
2019-10-26 12:04:48 +02:00 |
|
Juan Ferrer
|
5fdfda47b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-25 00:53:57 +02:00 |
|
Juan Ferrer
|
c7384bb3ac
|
API path prefix, repeated code removed from tests
|
2019-10-25 00:53:53 +02:00 |
|
Bernat
|
afd7c5684a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good
Details
|
2019-10-24 12:49:23 +02:00 |
|
Joan Sanchez
|
2ed4cf3e4a
|
Item request refactor #1818
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-22 13:44:36 +02:00 |
|
Joan Sanchez
|
58a763acf5
|
added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 14:21:52 +02:00 |
|
Bernat
|
939c507fba
|
#1810 El método listPackaging filtrar por isPackagingReturnable
|
2019-10-21 09:16:52 +02:00 |
|
Joan Sanchez
|
e2a7c09e4a
|
Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:31:14 +02:00 |
|
Joan Sanchez
|
55f3390f85
|
added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures
Details
|
2019-10-21 07:08:47 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures
Details
|
2019-10-19 01:18:25 +02:00 |
|
Juan Ferrer
|
17a150370c
|
Style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-18 21:54:13 +02:00 |
|
Juan Ferrer
|
43fd8fe75e
|
Merge
|
2019-10-18 21:37:28 +02:00 |
|
Juan Ferrer
|
457034daad
|
Tests fixed
|
2019-10-18 21:36:30 +02:00 |
|
Joan Sanchez
|
04785d3f72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:28:07 +02:00 |
|
Joan Sanchez
|
b2b76b05d8
|
css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:27:50 +02:00 |
 Carlos Jimenez Ruiz
|
8ce804a099
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-17 11:56:12 +02:00 |
|
Carlos Jimenez Ruiz
|
e0d9f69aef
|
corrected a description
|
2019-10-16 10:59:42 +02:00 |
|
Juan Ferrer
|
a2881e5b1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-15 16:19:38 +02:00 |
|
Juan Ferrer
|
3bf44d08de
|
vnDatePicker refactor
|
2019-10-15 16:19:35 +02:00 |
|
Bernat
|
ed1ed7f50b
|
#1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-15 07:23:34 +02:00 |
|
Joan Sanchez
|
300ba61fd3
|
#1759 Forzar desenrutado al cambiar datos básicos de ticket
|
2019-10-14 14:43:10 +02:00 |
|
Joan Sanchez
|
ecda659a8c
|
Bug #1796 fixed edit discount dialog position
gitea/salix/dev This commit looks good
Details
|
2019-10-14 14:17:18 +02:00 |
|
Joan Sanchez
|
81097287fa
|
#1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good
Details
|
2019-10-14 11:44:54 +02:00 |
|
Joan Sanchez
|
4a2d61ddcb
|
#1769 removed route report from ticket descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-14 08:52:48 +02:00 |
|
Juan Ferrer
|
7dfd1fe6f2
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-10-11 17:43:29 +02:00 |
|
Juan Ferrer
|
a72c12e1c9
|
Tests passed
|
2019-10-11 17:38:04 +02:00 |
|
Joan Sanchez
|
9bfc87f1e2
|
changed state to stowaway ticket
gitea/salix/dev This commit looks good
Details
|
2019-10-10 09:59:28 +02:00 |
|
Joan Sanchez
|
756acd41ef
|
added data-viewer
gitea/salix/dev This commit has test failures
Details
|
2019-10-10 09:26:44 +02:00 |
|
Joan Sanchez
|
21c32b0af2
|
dialog css fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-10 08:07:11 +02:00 |
|
Juan Ferrer
|
a9d5e87078
|
vnField alpha with ngModel
|
2019-10-10 00:47:29 +02:00 |
|
Juan Ferrer
|
fc09d76422
|
Merge
|
2019-10-08 23:57:54 +02:00 |
|
Juan Ferrer
|
757fc6fe23
|
vnField stable & applied to all field except vnTextfield
|
2019-10-08 23:57:02 +02:00 |
|
Joan Sanchez
|
c0403873e7
|
stowaway changed to correct field name
gitea/salix/dev This commit has test failures
Details
|
2019-10-08 14:36:02 +02:00 |
|
Joan Sanchez
|
c7d2c33ffb
|
merge
gitea/salix/test There was a failure building this commit
Details
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:48:13 +02:00 |
|
Joan Sanchez
|
edecadc78e
|
#1756 stowaway no muestra resultados
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:41:17 +02:00 |
|
Juan Ferrer
|
eeef468964
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-05 00:17:10 +02:00 |
|
Juan Ferrer
|
b12a666653
|
CSS padding/margin refactor, glob styles in core
|
2019-10-05 00:16:57 +02:00 |
|
Carlos Jimenez Ruiz
|
4fa532abb8
|
#1744 ticket.index ocultar columnas expendables
gitea/salix/dev This commit looks good
Details
|
2019-10-04 17:49:51 +02:00 |
|
Joan Sanchez
|
b4c23b86a2
|
fixed summary button
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:39:24 +02:00 |
|
Joan Sanchez
|
7b7d7664e1
|
disabled autoload on stowaway model #1747
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:18:07 +02:00 |
|
Joan Sanchez
|
69ef2c2e27
|
update zone and shipped on #1746
gitea/salix/dev This commit looks good
Details
|
2019-10-04 09:28:09 +02:00 |
|
Juan Ferrer
|
ec9797a4b3
|
vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good
Details
|
2019-10-02 21:02:49 +02:00 |
|
Juan Ferrer
|
76604744d1
|
Global & client style fixes
|
2019-10-01 16:17:57 +02:00 |
|
Juan Ferrer
|
a4892845e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 13:46:16 +02:00 |
|
Juan Ferrer
|
4e4919c1e2
|
Agency fixes & exclusion with left calendar
|
2019-10-01 13:45:43 +02:00 |
|
Carlos Jimenez Ruiz
|
fb846baaa4
|
#1740 Intermitencia test de back
|
2019-10-01 13:19:22 +02:00 |
|
Juan Ferrer
|
daeb4bed09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 11:15:25 +02:00 |
|
Juan Ferrer
|
0bd852604a
|
Refactor: vnCheck, vnRadio, vnTreeview, vnNumber
|
2019-10-01 11:15:15 +02:00 |
|
Carlos Jimenez Ruiz
|
e8a9de6acd
|
ticket.index.total warning css range from 1 to 50
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 11:06:20 +02:00 |
|
Joan Sanchez
|
fe95406594
|
Ticket list order by zone hour #1728
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 08:14:08 +02:00 |
|
Juan Ferrer
|
a177ad8e26
|
Fixes
|
2019-09-30 13:02:11 +02:00 |
|
Juan Ferrer
|
84572dc398
|
Merge & fixes
|
2019-09-30 13:02:03 +02:00 |
|
Juan Ferrer
|
2bcdcaa133
|
#1285 fixed, vnInputTime fixes
|
2019-09-30 11:30:54 +02:00 |
|
Carlos Jimenez Ruiz
|
6e50c1fad9
|
#1685 ticket.transferSale
|
2019-09-27 16:55:40 +02:00 |
|
Carlos Jimenez Ruiz
|
a8c6c57b7e
|
#1719 claim.detail final amends and tests
gitea/salix/1719-claim-detail This commit looks good
Details
|
2019-09-26 12:07:40 +02:00 |
|
Carlos Jimenez Ruiz
|
e57210fdfc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-26 11:52:42 +02:00 |
|
Joan Sanchez
|
b64a6fd05c
|
Mostrar fotos de reclamaciones en el summary #1732
gitea/salix/dev This commit looks good
Details
|
2019-09-26 11:41:56 +02:00 |
|
Carlos Jimenez Ruiz
|
2a2c5ae3c4
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 10:56:49 +02:00 |
|
Carlos Jimenez Ruiz
|
156c9ec3ab
|
#1716 ticket.summary añadir link a la Ruta
gitea/salix/dev This commit looks good
Details
|
2019-09-26 09:05:54 +02:00 |
|
Carlos Jimenez Ruiz
|
65981099b6
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 09:05:18 +02:00 |
|
Carlos Jimenez Ruiz
|
1841e4edb0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:53:42 +02:00 |
|
Carlos Jimenez Ruiz
|
be65c5acad
|
#1719 claim.detail cambiar descuento falla
|
2019-09-25 11:53:12 +02:00 |
|
Joan Sanchez
|
73eca9905e
|
fixed #1734 canHaveStowaway validation
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:26:12 +02:00 |
|
Carlos Jimenez Ruiz
|
92eef27f37
|
#1723 ticket.index si el total es menor de 50€
gitea/salix/dev This commit looks good
Details
|
2019-09-24 16:38:57 +02:00 |
|
Carlos Jimenez Ruiz
|
0c27b90c5d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:39:22 +02:00 |
|
Carlos Jimenez Ruiz
|
b3bd40e2dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 14:25:56 +02:00 |
|
Carlos Jimenez Ruiz
|
99ef8a6010
|
#1719 claim.detail cambiar descuento falla
|
2019-09-24 14:23:21 +02:00 |
|
Bernat
|
de0034f145
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:22:46 +02:00 |
|
Joan Sanchez
|
d627a8ba25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:03:42 +02:00 |
|
Joan Sanchez
|
d0fc74cefd
|
updated e2e and unit tests
|
2019-09-24 14:03:30 +02:00 |
|
Bernat
|
2b80c4f7bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 13:56:31 +02:00 |
|
Bernat
|
bf5a9967cf
|
Refactor #1682 modificar modelos componentRate y componentTypeRate
|
2019-09-24 13:45:54 +02:00 |
|
Carlos Jimenez Ruiz
|
d56c7ff540
|
#1727 ticlet.line foco en cambiar hora
gitea/salix/dev This commit looks good
Details
|
2019-09-24 13:25:18 +02:00 |
|
Joan Sanchez
|
3af26900e3
|
watcher preventing claim creation
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:55:36 +02:00 |
|
Joan Sanchez
|
5851784e41
|
Create new order now opens on new window
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:41:00 +02:00 |
|
Juan Ferrer
|
52a6221b59
|
recover getLeaves
|
2019-09-24 10:38:05 +02:00 |
|
Joan Sanchez
|
15183df65f
|
transfer sales error fixed
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:51:21 +02:00 |
|
Carlos Jimenez Ruiz
|
0f04aed2fe
|
#1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 17:20:54 +02:00 |
|
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
|
Carlos Jimenez Ruiz
|
206dec59a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-13 16:09:27 +02:00 |
|
Carlos Jimenez Ruiz
|
2251fb65ad
|
#1615 migrar karma a jest
|
2019-09-13 16:09:14 +02:00 |
|
Bernat
|
2e1b329584
|
#1681 delete comment
gitea/salix/dev This commit looks good
Details
|
2019-09-13 11:27:32 +02:00 |
|
Bernat
|
c6507fc2bb
|
#1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good
Details
|
2019-09-13 07:40:27 +02:00 |
|
Joan Sanchez
|
8b8463e936
|
Updated dms colums size #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 12:12:39 +02:00 |
|
Joan Sanchez
|
f6bd915ae6
|
Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 11:47:56 +02:00 |
|
Bernat
|
c344d8088b
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-09-11 14:18:21 +02:00 |
|
Joan Sanchez
|
ff626764d8
|
fixed back unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-11 08:24:28 +02:00 |
|
Joan Sanchez
|
342886942f
|
fixed sale loggable transaction error #1686
gitea/salix/dev This commit has test failures
Details
|
2019-09-11 08:12:27 +02:00 |
|
Bernat
|
ac6d1ed829
|
#1663 update ticketLog
|
2019-09-10 14:43:00 +02:00 |
|
Bernat
|
8932aa4e5a
|
Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log
|
2019-09-10 13:27:41 +02:00 |
|
Joan Sanchez
|
73f438c300
|
reset watcher on changes #1678
|
2019-09-09 12:35:59 +02:00 |
|
Joan Sanchez
|
1f5a75b285
|
fixed karma unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-09 10:57:10 +02:00 |
|
Carlos Jimenez Ruiz
|
3c9fe334c9
|
#1655 e2e ticket.sale Añadir lineas
gitea/salix/dev This commit looks good
Details
|
2019-09-06 14:56:56 +02:00 |
|
Carlos Jimenez Ruiz
|
56c291a160
|
merge
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-06 11:45:55 +02:00 |
|
Carlos Jimenez Ruiz
|
ce9fb14b62
|
#1655 e2e ticket.sale Añadir lineas
|
2019-09-06 11:43:15 +02:00 |
|
Joan Sanchez
|
f31d544cd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-06 11:06:57 +02:00 |
|
Joan Sanchez
|
7fad401624
|
Send delivery note to client #1332
|
2019-09-06 11:06:44 +02:00 |
|
Bernat
|
e8cb57e27a
|
#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen
gitea/salix/dev This commit looks good
Details
|
2019-09-06 09:47:58 +02:00 |
|
Bernat
|
751c945575
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-06 09:35:27 +02:00 |
|
Bernat
|
ec2a457849
|
ticket.weekly add order
|
2019-09-06 08:00:19 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
gitea/salix/dev This commit looks good
Details
|
2019-09-05 13:06:40 +02:00 |
|
Joan Sanchez
|
59c6952025
|
Implement watcher on ticket sales #1678
gitea/salix/dev This commit looks good
Details
|
2019-09-05 09:00:55 +02:00 |
|
Joan Sanchez
|
0d21519523
|
updated transfer css
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:37:29 +02:00 |
|
Joan Sanchez
|
db1113ab0b
|
added scrollbar to transfer popover
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:08:08 +02:00 |
|
Joan Sanchez
|
d3441fa1b3
|
Ticket step one refactor #1669
gitea/salix/dev This commit looks good
Details
|
2019-09-04 08:04:31 +02:00 |
|
Carlos Jimenez Ruiz
|
c1cca30a26
|
bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good
Details
|
2019-09-03 14:42:52 +02:00 |
|
Carlos Jimenez Ruiz
|
219614b44f
|
#1656 ticket.regularizar eliminar ticket + tests
gitea/salix/dev This commit looks good
Details
|
2019-09-03 13:27:02 +02:00 |
|
Carlos Jimenez Ruiz
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
|
Joan Sanchez
|
d93974f481
|
ticket.basicData Update zone on changes + fixes #1668
gitea/salix/dev This commit has test failures
Details
|
2019-09-02 14:36:54 +02:00 |
|
Joan Sanchez
|
37b9c5c4ce
|
Added zone inflation field #1641
gitea/salix/dev This commit looks good
Details
|
2019-09-02 11:25:31 +02:00 |
|
Carlos Jimenez Ruiz
|
11b99d9a5f
|
#1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good
Details
|
2019-08-20 14:18:32 +02:00 |
|
Bernat
|
7eea9d1d2c
|
Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-19 07:56:20 +02:00 |
|
Bernat
|
4032bde243
|
fix bug ticket.sale
gitea/salix/dev This commit looks good
Details
|
2019-08-13 14:03:02 +02:00 |
|
Bernat
|
d9c63e3bc0
|
Tarea #1501 ticket / delete
gitea/salix/dev This commit looks good
Details
|
2019-08-13 12:44:34 +02:00 |
|
Bernat
|
d08a43bc23
|
#1630 state.isEditable
gitea/salix/dev This commit looks good
Details
|
2019-08-12 13:28:27 +02:00 |
|
Bernat
|
2e89af9795
|
#1630 state.isEditable
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 13:26:44 +02:00 |
|
Bernat
|
b6cc769df3
|
Test #1636 refactor test de back isEditable y editableState
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 12:31:31 +02:00 |
|
Joan Sanchez
|
0918f154e9
|
transfer partially sale #1251
gitea/salix/dev This commit looks good
Details
|
2019-08-09 08:04:44 +02:00 |
|
Joan Sanchez
|
a5486ec694
|
Get allowed content-types from model #1598
gitea/salix/dev This commit looks good
Details
|
2019-08-08 08:37:03 +02:00 |
|
Bernat
|
2f1472b9ee
|
Tarea #1574
gitea/salix/dev This commit looks good
Details
ticket.sale editableState
|
2019-08-08 08:33:27 +02:00 |
|
Bernat
|
8f519fd15b
|
Bug #900 Ticket.picture lineas vacias cuando no tiene tags
gitea/salix/dev This commit looks good
Details
|
2019-08-07 09:58:05 +02:00 |
|
Joan Sanchez
|
e52a0ac5da
|
ticket.sale split show active tickets
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-06 07:36:26 +02:00 |
|
Joan Sanchez
|
efeba38fb4
|
back errors fixed
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-01 11:52:53 +02:00 |
|
Bernat
|
7571cd6e1b
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 07:46:24 +02:00 |
|
Joan Sanchez
|
82d3ac27cf
|
ticket basicData change zone on date update
gitea/salix/dev This commit looks good
Details
|
2019-07-30 12:43:21 +02:00 |
|
Joan Sanchez
|
fb4ce77c01
|
claim upload pictures #1593
gitea/salix/dev This commit looks good
Details
|
2019-07-30 08:51:38 +02:00 |
|
Joan Sanchez
|
07af2271c2
|
ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good
Details
|
2019-07-29 13:12:36 +02:00 |
|
Joan Sanchez
|
64a4e5f43d
|
ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good
Details
|
2019-07-26 11:48:01 +02:00 |
|
Carlos Jimenez Ruiz
|
e1cbf781e1
|
#1608 item.request
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 09:55:09 +02:00 |
|
Bernat
|
8089c32ec2
|
Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good
Details
|
2019-07-23 14:56:57 +02:00 |
|
Bernat
|
97f2229090
|
Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good
Details
|
2019-07-23 11:15:06 +02:00 |
|
Bernat
|
16257e9918
|
fix test front
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-23 07:36:10 +02:00 |
|
Bernat
|
6a23a5429c
|
Tarea #1562 ticket.line isEditable
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-22 13:14:00 +02:00 |
|
Joan Sanchez
|
970c8ab5ec
|
show dms order number #1601
gitea/salix/dev This commit looks good
Details
|
2019-07-19 08:13:52 +02:00 |
|
Joan Sanchez
|
51734db404
|
ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-17 15:01:38 +02:00 |
|
Joan Sanchez
|
f56423bac9
|
disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good
Details
|
2019-07-17 10:55:58 +02:00 |
|
Joan Sanchez
|
145e596d16
|
fixed dms unit tests
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 14:12:58 +02:00 |
|
Joan Sanchez
|
4f73d1eb5a
|
dms fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-16 13:37:25 +02:00 |
|
Joan Sanchez
|
72fcf807b0
|
7z mimetype
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 07:22:29 +02:00 |
|
Joan Sanchez
|
b85aa6d3da
|
fixed icons column size
gitea/salix/dev This commit has test failures
Details
|
2019-07-15 13:20:50 +02:00 |
|
Joan Sanchez
|
dae49f52b6
|
removed download file conditional
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:56:17 +02:00 |
|
Joan Sanchez
|
588250b1c1
|
dms update files
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:40:11 +02:00 |
|
Joan Sanchez
|
23f5ff0c5c
|
merge
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2019-07-12 14:02:38 +02:00 |
|
Joan Sanchez
|
c21532e5f7
|
ticket.index filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 14:00:32 +02:00 |
|
Joan Sanchez
|
eefa4b9f5b
|
apply default filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:56:00 +02:00 |
|
Joan Sanchez
|
6b9286d1b0
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:32:02 +02:00 |
|
Joan Sanchez
|
c4fcaeb908
|
ticket.index filter by date if no filters were entered
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:20:55 +02:00 |
|
Joan Sanchez
|
29744c52f3
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 11:43:10 +02:00 |
|
Joan Sanchez
|
e135ae039a
|
changed closure field
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:42:06 +02:00 |
|
Joan Sanchez
|
25014654b1
|
changed closure field
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:39:59 +02:00 |
|
Joan Sanchez
|
659a441f47
|
ticket index show zone closure hour
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:29:22 +02:00 |
|
Joan Sanchez
|
6634cdf059
|
ticket.index show zone hour & minute. Show only tickets from today
|
2019-07-12 09:29:16 +02:00 |
|
Joan Sanchez
|
14a69e47c9
|
ticket index show zone closure hour
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:06:19 +02:00 |
|
Joan Sanchez
|
2a6de77e17
|
ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-12 08:49:44 +02:00 |
|
Joan Sanchez
|
1b8a407916
|
show expeditions fix
gitea/salix/master This commit looks good
Details
|
2019-07-11 11:21:12 +02:00 |
|
Joan Sanchez
|
62ef2dccd8
|
show expeditions fix
gitea/salix/dev This commit looks good
Details
|
2019-07-11 11:20:41 +02:00 |
|
Joan Sanchez
|
8ecc88b516
|
hide download button for dms without a file attached #1590
gitea/salix/master This commit looks good
Details
|
2019-07-11 09:54:42 +02:00 |
|
Joan Sanchez
|
3ce59c0b73
|
hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good
Details
|
2019-07-11 09:53:16 +02:00 |
|
Joan Sanchez
|
6f3b023644
|
Create postcode form #1585
gitea/salix/dev This commit looks good
Details
|
2019-07-08 14:07:09 +02:00 |
|
Carlos Jimenez Ruiz
|
a35533687f
|
removed unused spec files
gitea/salix/dev This commit looks good
Details
|
2019-07-03 11:53:03 +02:00 |
|
Carlos Jimenez Ruiz
|
a2a9dfd7e5
|
#1567 refactor logs - worker descriptor
|
2019-07-03 11:08:44 +02:00 |
|
Bernat
|
65ec629221
|
Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse
|
2019-07-03 08:29:40 +02:00 |
|
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +02:00 |
|
Bernat
|
dd38a21e8d
|
Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-07-01 11:56:16 +02:00 |
|
Carlos Jimenez Ruiz
|
bd76840cb3
|
#1446 e2e ticket.summary
gitea/salix/dev This commit looks good
Details
|
2019-06-27 15:33:15 +02:00 |
|
Carlos Jimenez Ruiz
|
8c26a89516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:44:29 +02:00 |
|
Carlos Jimenez Ruiz
|
a7c5a9e598
|
#1566 ticket.sales state autocomplete
|
2019-06-27 09:44:19 +02:00 |
|
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:03:03 +02:00 |
|
Carlos Jimenez Ruiz
|
5270693bdd
|
#1387 e2e Ticket Edit sale path
gitea/salix/dev This commit looks good
Details
|
2019-06-26 15:27:58 +02:00 |
|
Carlos Jimenez Ruiz
|
c352a12d49
|
merge
|
2019-06-26 15:02:22 +02:00 |
|
Carlos Jimenez Ruiz
|
d27402d4e6
|
#1558 ticket.sales mark/unmark as reserved
|
2019-06-26 13:56:40 +02:00 |
|
Bernat
|
682a75ac76
|
#1533 update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-06-25 14:00:55 +02:00 |
|
Carlos Jimenez Ruiz
|
2ce442a022
|
#1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good
Details
|
2019-06-25 11:17:58 +02:00 |
|
Bernat
|
1227f7ac83
|
Test #1549 Arreglar test de back
gitea/salix/dev This commit looks good
Details
|
2019-06-21 13:19:51 +02:00 |
|
Javi Gallego
|
289f588923
|
#1550 ticket.descriptor polizon cambia estado
gitea/salix/dev This commit has test failures
Details
|
2019-06-21 07:41:03 +02:00 |
|
Carlos Jimenez Ruiz
|
7d0c42c077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-20 14:41:58 +02:00 |
|
Carlos Jimenez Ruiz
|
594268183b
|
#1517 ticket.index
|
2019-06-20 14:35:47 +02:00 |
|
Joan Sanchez
|
7fd6c850d7
|
lock controls #1533
gitea/salix/dev There was a failure building this commit
Details
|
2019-06-20 13:50:58 +02:00 |
|
Carlos Jimenez Ruiz
|
9162ef9c1e
|
#1517 ticket.index hot fix
|
2019-06-20 11:31:03 +02:00 |
|
Carlos Jimenez Ruiz
|
73ccf9a107
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-19 14:42:59 +02:00 |
|
Carlos Jimenez Ruiz
|
560cce7c8c
|
#1537 refactor fixtures
|
2019-06-19 14:40:47 +02:00 |
|
Carlos Jimenez Ruiz
|
63febf8bd0
|
#1537 refactor fixtures + e2e fixes
|
2019-06-19 09:03:45 +02:00 |
|
Bernat
|
c3f5b2c4dd
|
Bug/Test #1543 ticket.request.create precio con decimales
gitea/salix/dev This commit looks good
Details
|
2019-06-18 12:09:43 +02:00 |
|
Bernat
|
53f6db7a4a
|
Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice
gitea/salix/dev This commit looks good
Details
|
2019-06-17 12:13:05 +02:00 |
|
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
|
Juan Ferrer
|
89a563eaf9
|
Merge
|
2019-06-13 09:21:36 +02:00 |
|
Juan Ferrer
|
58cc90929f
|
TX fixes, debug disabled, glob transaction timeout
gitea/salix/master This commit looks good
Details
|
2019-06-12 17:31:45 +02:00 |
|
Carlos Jimenez Ruiz
|
921af523f8
|
#1526 refactor fixtures
|
2019-06-12 11:38:31 +02:00 |
|
Bernat
|
2504d06bab
|
Bug/Test #1515 Dump structure de production a dev
|
2019-06-11 12:23:55 +02:00 |
|
Joan Sanchez
|
43e87a1cb1
|
mege from test to dev - no structure
gitea/salix/dev This commit looks good
Details
|
2019-06-07 13:07:23 +02:00 |
|
Joan Sanchez
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
|
Bernat
|
ea38ff221d
|
#1467 ticket filter with hours
gitea/salix/dev This commit looks good
Details
|
2019-06-07 07:45:12 +02:00 |
|
Joan Sanchez
|
c28734ff61
|
added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit
Details
|
2019-06-06 13:59:11 +02:00 |
|
Carlos Jimenez Ruiz
|
cd6b60015f
|
#1486 back test updateDiscount
|
2019-06-06 09:48:08 +02:00 |
|
Carlos Jimenez Ruiz
|
3082ce2556
|
#1486 back test updateDiscount
|
2019-06-06 09:34:36 +02:00 |
|
Carlos Jimenez Ruiz
|
55ea445f02
|
#1486 back test updateDiscount
gitea/salix/dev This commit looks good
Details
|
2019-06-05 15:20:56 +02:00 |
|
Carlos Jimenez Ruiz
|
7bcd4b53e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-05 15:09:00 +02:00 |
|
Bernat
|
082c292ed7
|
fix updatePrice
gitea/salix/dev This commit looks good
Details
|
2019-06-05 15:05:07 +02:00 |
|
Bernat
|
3a338739d1
|
Tarea #1462 Route.descriptior Añadir menú - actualizar m3
gitea/salix/dev This commit looks good
Details
|
2019-06-05 13:51:34 +02:00 |
|
Carlos Jimenez Ruiz
|
605dabbe19
|
#1486 back test updateDiscount
|
2019-06-05 13:39:15 +02:00 |
|
Joan Sanchez
|
073c457abb
|
Merge branch 'test'
gitea/salix/master This commit looks good
Details
|
2019-06-05 08:56:56 +02:00 |
|
Carlos Jimenez Ruiz
|
05fc1f08a8
|
renamed vars according to convention
|
2019-06-05 07:41:20 +02:00 |
|
Bernat
|
c49f72b36c
|
#1493 Refactorizar el método back /Tickets/deleted
gitea/salix/dev This commit looks good
Details
|
2019-06-03 14:54:03 +02:00 |
|
Carlos Jimenez Ruiz
|
d06d5cd9c8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-03 12:00:58 +02:00 |
|
Carlos Jimenez Ruiz
|
9671307688
|
#1486 back test updateDiscount
|
2019-06-03 12:00:48 +02:00 |
|
Bernat
|
62fe9d760c
|
#1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good
Details
|
2019-06-03 08:01:24 +02:00 |
|
Carlos Jimenez Ruiz
|
a009329bdd
|
removed console logs from spec file
gitea/salix/test This commit looks good
Details
|
2019-05-31 13:54:05 +02:00 |
|
Bernat
|
d4a3a1a72e
|
export production structure and fixtures updated
gitea/salix/test This commit looks good
Details
|
2019-05-30 13:45:13 +02:00 |
|
Carlos Jimenez Ruiz
|
ed3024e144
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-30 08:57:38 +02:00 |
|
Carlos Jimenez Ruiz
|
80d5c923cc
|
#1486 back test updateDiscount
|
2019-05-30 08:57:25 +02:00 |
|
Javi Gallego
|
e01765e34e
|
test back-front fixed
gitea/salix/test This commit looks good
Details
|
2019-05-30 08:41:08 +02:00 |
|
Bernat
|
24c3b35605
|
Test #1489 updatePrice backTest skipped
gitea/salix/dev This commit looks good
Details
|
2019-05-30 08:06:52 +02:00 |
|
Bernat
|
726d0ab359
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-30 07:53:23 +02:00 |
|
Bernat
|
4f20716fa3
|
#1489 updatePrice backTest
|
2019-05-29 14:59:26 +02:00 |
|
Carlos Jimenez Ruiz
|
cfcadc4f28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-05-29 13:07:23 +02:00 |
|
Carlos Jimenez Ruiz
|
40654f94c4
|
#1475 no borrar servicios de tickets no editables
|
2019-05-29 13:06:42 +02:00 |
|
Bernat
|
7a7ea03bff
|
1485 refactor updatePrice
gitea/salix/dev This commit has test failures
Details
|
2019-05-29 12:41:26 +02:00 |
|
Bernat
|
85761043cd
|
delete console.log
gitea/salix/dev This commit looks good
Details
|
2019-05-29 11:15:08 +02:00 |
|
Bernat
|
84a4b049f0
|
1453 ticket UpdateDiscount refactor
gitea/salix/dev This commit looks good
Details
|
2019-05-29 11:11:54 +02:00 |
|
Bernat
|
69434caa52
|
#1470 update fixtures, client.dms gestdoc
gitea/salix/dev This commit looks good
Details
|
2019-05-28 11:26:54 +02:00 |
|
Bernat
|
230516b9d4
|
#1438 fix test back makeInvoice
gitea/salix/dev This commit looks good
Details
|
2019-05-27 10:01:35 +02:00 |
|
Bernat
|
59069749a2
|
1461 fix test back
gitea/salix/dev This commit looks good
Details
|
2019-05-27 09:19:23 +02:00 |
|
Carlos Jimenez Ruiz
|
16c8d2fd2a
|
removed service name from end points
gitea/salix/dev This commit looks good
Details
|
2019-05-27 08:46:11 +02:00 |
|
Carlos Jimenez Ruiz
|
a3311f6093
|
#1250 ticket.line al mover todas las lineas delete
|
2019-05-24 15:30:50 +02:00 |
|
Javi Gallego
|
f871879ee5
|
merge fixtures dinamicas para zoneCalendar
|
2019-05-23 13:33:06 +02:00 |
|
Javi Gallego
|
c311b0ae65
|
dump y procedimientos volcados
|
2019-05-23 13:18:15 +02:00 |
|
Javi Gallego
|
94cc7af8b2
|
merge paso 2
|
2019-05-23 13:07:59 +02:00 |
|
Javi Gallego
|
3776e0588c
|
merge paso 1
|
2019-05-23 13:05:02 +02:00 |
|
Joan Sanchez
|
cc72432a37
|
accessType refactor #1460
gitea/salix/master This commit looks good
Details
|
2019-05-22 12:38:51 +02:00 |
|
Joan Sanchez
|
f73b42b0be
|
accessType refactor #1460
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:35:24 +02:00 |
|
Carlos Jimenez Ruiz
|
4c8aa7ff6e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-22 11:59:14 +02:00 |
|
Carlos Jimenez Ruiz
|
bb1c85459e
|
removed unused code
|
2019-05-21 13:09:30 +02:00 |
|
Joan Sanchez
|
52e26eb99d
|
mark manual lines #1449
gitea/salix/dev This commit looks good
Details
|
2019-05-21 12:56:29 +02:00 |
|
Bernat
|
bb5c81a3e9
|
#1409 ticket.weekly add finder
gitea/salix/dev This commit looks good
Details
|
2019-05-21 09:03:57 +02:00 |
|
Carlos Jimenez Ruiz
|
32555c47d0
|
#1434 agency.index explota por zoneFk al cargar
gitea/salix/dev This commit looks good
Details
|
2019-05-20 15:04:33 +02:00 |
|
Bernat
|
b86cf1d98a
|
1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good
Details
|
2019-05-17 07:34:25 +02:00 |
|
Carlos Jimenez Ruiz
|
c7ad52f7b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-16 14:07:42 +02:00 |
|
Carlos Jimenez Ruiz
|
43bf6b45cf
|
#1260 ticket.service textfield por autocomplete
|
2019-05-16 14:07:16 +02:00 |
|
Joan Sanchez
|
2ac654fa53
|
parse scopeDays integer on ticket.index #1439
gitea/salix/master This commit looks good
Details
|
2019-05-16 12:53:49 +02:00 |
|
Joan Sanchez
|
599084a8be
|
parse scopeDays integer on ticket.index #1439
|
2019-05-16 12:33:41 +02:00 |
|
Carlos Jimenez Ruiz
|
2358c94aae
|
#1402 route.ticket
|
2019-05-15 13:07:32 +02:00 |
|
Joan Sanchez
|
5cc78ce5ac
|
ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-05-14 08:14:37 +02:00 |
|
Joan Sanchez
|
790577acaf
|
ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures
Details
|
2019-05-14 08:13:04 +02:00 |
|
Bernat
|
e6d6e63255
|
1413 ticket.summary refactor checkbox triple state
gitea/salix/dev This commit looks good
Details
|
2019-05-09 14:40:59 +02:00 |
|
Javi Gallego
|
0d0f354902
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-09 11:25:51 +02:00 |
|
Javi Gallego
|
ac5b17be31
|
ticket View
|
2019-05-09 11:25:46 +02:00 |
|
Bernat
|
1f128797c3
|
export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good
Details
|
2019-05-09 09:32:04 +02:00 |
|
Bernat
|
83898c9ba7
|
1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good
Details
|
2019-05-07 11:32:35 +02:00 |
|
Joan Sanchez
|
4aff31a165
|
fixed update discount
gitea/salix/dev This commit looks good
Details
|
2019-05-06 07:40:59 +02:00 |
|
Bernat
|
91e8b1f81b
|
update fixtures, #1388 ticket descript change shiiped hour
gitea/salix/dev This commit looks good
Details
|
2019-05-03 12:23:57 +02:00 |
|
Joan Sanchez
|
2b7287dabb
|
added ticket.dms #1373
gitea/salix/dev This commit looks good
Details
|
2019-05-01 18:49:39 +02:00 |
|
Joan Sanchez
|
a572130b6c
|
propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-30 08:00:27 +02:00 |
|
Carlos Jimenez Ruiz
|
85dc6e51af
|
#1258 ticket.index sumatorio removed unused code
gitea/salix/dev This commit looks good
Details
|
2019-04-29 10:35:46 +02:00 |
|
Carlos Jimenez Ruiz
|
774d8524cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-29 10:21:54 +02:00 |
|
Carlos Jimenez Ruiz
|
10669f01f3
|
#1258 ticket.index sumatorio unit test fixed
|
2019-04-29 10:21:36 +02:00 |
|
Bernat
|
5bc6f5107e
|
#1370 ticket.descriptor change shipped hour
gitea/salix/dev This commit looks good
Details
|
2019-04-29 07:48:59 +02:00 |
|
Carlos Jimenez Ruiz
|
2ca85394f3
|
#1385 excluded tests
gitea/salix/dev This commit looks good
Details
|
2019-04-26 16:10:51 +02:00 |
|
Joan Sanchez
|
16bf0b3448
|
regenerate invoice #1342
gitea/salix/dev This commit looks good
Details
|
2019-04-26 08:52:43 +02:00 |
|
Javi Gallego
|
24fedff62f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-25 18:30:17 +02:00 |
|
Javi Gallego
|
a920bc1d8f
|
tablas dms
|
2019-04-25 18:30:11 +02:00 |
|
Carlos Jimenez Ruiz
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
|
Javi Gallego
|
47e55580ad
|
#1258 ticket.index sumatorio
gitea/salix/dev This commit looks good
Details
|
2019-04-25 07:57:26 +02:00 |
|
Bernat
|
0eabd9876d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-24 11:36:43 +02:00 |
|
Bernat
|
4ac36e6bf2
|
#1362 ticket.packaging negative quantity
|
2019-04-24 11:36:13 +02:00 |
|
Joan Sanchez
|
d88e2e81ca
|
update ticket line discount until invoiced #1365
gitea/salix/dev This commit looks good
Details
|
2019-04-24 11:23:24 +02:00 |
|
Bernat
|
37293ad695
|
#1364 bug create ticket
|
2019-04-24 11:02:31 +02:00 |
|
Joan Sanchez
|
6747a80943
|
fixed available/visible icon on ticket sales #1363
gitea/salix/dev This commit looks good
Details
|
2019-04-24 09:54:25 +02:00 |
|
Bernat
|
94480a8189
|
#1329 fix test and fixtures, update ticket-service
gitea/salix/dev This commit looks good
Details
|
2019-04-24 07:43:11 +02:00 |
|
Bernat
|
75c9d1122c
|
#1329 ticket.services validation
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 11:25:49 +02:00 |
|
Carlos Jimenez Ruiz
|
5501ff8f4f
|
test repairs
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 09:08:28 +02:00 |
|
Carlos Jimenez Ruiz
|
2b04eebe84
|
#1334 E2E ticket.descriptor - Make invoice
|
2019-04-23 08:58:49 +02:00 |
|
Carlos Jimenez Ruiz
|
0176fbc2d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-18 11:47:41 +02:00 |
|
Carlos Jimenez Ruiz
|
2107b57764
|
small typo
|
2019-04-18 11:12:48 +02:00 |
|
Bernat
|
bc005b2310
|
#1346 fix confirm.js and update item request
gitea/salix/dev This commit looks good
Details
|
2019-04-18 11:02:28 +02:00 |
|
Carlos Jimenez Ruiz
|
1f5fe891e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-17 07:16:13 +02:00 |
|
Carlos Jimenez Ruiz
|
d52f5077b0
|
#1306 Renombrar controladores, rutas y carpeta
|
2019-04-16 15:00:21 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Joan Sanchez
|
6573e61a7c
|
fixed karma tests
gitea/salix/dev This commit looks good
Details
|
2019-04-16 08:21:20 +02:00 |
|
Joan Sanchez
|
f814584f6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-16 07:59:15 +02:00 |
|
Joan Sanchez
|
90bbe1bd02
|
Log sent sms #1324
|
2019-04-16 07:59:12 +02:00 |
|
Carlos Jimenez Ruiz
|
9c596b06c8
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-04-15 14:37:12 +02:00 |
|
Carlos Jimenez Ruiz
|
82ed0078d2
|
#1339 Print - Hoja de rutas
|
2019-04-15 14:34:33 +02:00 |
|
Bernat
|
a68174c456
|
#1337 refactor checkbox in ticketRequest
gitea/salix/dev This commit looks good
Details
|
2019-04-15 14:21:52 +02:00 |
|
Joan Sanchez
|
b5fe7a6fae
|
restore fixtures makeInvoice
gitea/salix/dev This commit looks good
Details
|
2019-04-12 14:53:17 +02:00 |
|
Bernat
|
dbe56b2496
|
#1330 add info in the search panel
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 14:33:08 +02:00 |
|
Joan Sanchez
|
ac8a27d2f4
|
Added ticket invoice #1310
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 13:54:31 +02:00 |
|
Joan Sanchez
|
353167734e
|
send message to salesPerson #1315
gitea/salix/dev This commit looks good
Details
|
2019-04-11 09:38:53 +02:00 |
|
Javi Gallego
|
50d70f0f6f
|
Tarea #1259 crear modelo ticketServiceType
|
2019-04-10 14:44:41 +02:00 |
|
Carlos Jimenez Ruiz
|
98e704adf8
|
#1326 enlazar en ticket.descriptor tres puntos
|
2019-04-10 10:43:11 +02:00 |
|
Joan Sanchez
|
4f1a1ae004
|
Merge branch 'master' into dev
|
2019-04-09 13:19:34 +02:00 |
|
Joan Sanchez
|
a6308c7f1e
|
input-number refactor #1311
gitea/salix/master This commit looks good
Details
|
2019-04-09 13:18:55 +02:00 |
|
Joan Sanchez
|
33e6467c44
|
fixed zone descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-08 10:57:01 +02:00 |
Gerard
|
633ab28c41
|
#1315 item.ticketRequest
gitea/salix/dev This commit looks good
Details
|
2019-04-05 15:20:12 +02:00 |
|
Gerard
|
ebe269f41e
|
#1249 ticket.invoice
gitea/salix/dev This commit looks good
Details
|
2019-04-05 12:24:39 +02:00 |
|
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 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
d6a8cd68d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:19:21 +01:00 |
|
Javi Gallego
|
8bea3afbfb
|
karma reparado
|
2019-02-15 13:13:23 +01:00 |
|
Carlos Jimenez Ruiz
|
3ab0b2eb19
|
merge
|
2019-02-15 12:43:18 +01:00 |
|
Carlos Jimenez Ruiz
|
92a645f395
|
#1122 + worker descriptor popover + small refactors for worker.nickname
|
2019-02-15 12:39:21 +01:00 |
|
Gerard
|
db6a5cfc3e
|
changed hide for on-hide binding
|
2019-02-14 20:18:10 +01:00 |
|
Gerard
|
1144a197a5
|
#1112 ticket.sale
|
2019-02-14 12:06:14 +01:00 |
|
Juan Ferrer
|
f3e3c1bbae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 14:01:38 +01:00 |
|
Juan Ferrer
|
1f759b6b8c
|
Style fixes
|
2019-02-13 14:01:37 +01:00 |
|
Bernat
|
df452ff345
|
merge
|
2019-02-13 13:28:02 +01:00 |
|
Bernat
|
bbd4188695
|
#9848 fix test and update fixtures
|
2019-02-13 13:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
fb4a4cd3de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 08:19:44 +01:00 |
|
Juan Ferrer
|
d65a6fd59e
|
Ticket summary fix: lines with no claim
|
2019-02-12 15:39:37 +01:00 |
|
Carlos Jimenez Ruiz
|
3a5b5096da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-12 14:40:22 +01:00 |
|
Carlos Jimenez Ruiz
|
9c0613e8e7
|
#1127
|
2019-02-12 14:40:13 +01:00 |
|
Gerard
|
5b50bbd5d0
|
Merge branch 'test' into dev
|
2019-02-12 14:36:24 +01:00 |
|
Gerard
|
208936f979
|
Merge branch 'master' into test
|
2019-02-12 14:29:45 +01:00 |
|
Gerard
|
41d950eaef
|
hotfix errors creting tickets
|
2019-02-12 14:23:04 +01:00 |
|
Carlos Jimenez Ruiz
|
b0e22febd3
|
#1127 mover ticket.descriptor al modulo ticket
|
2019-02-12 09:03:56 +01:00 |
|
Gerard
|
93aa94c5a0
|
fixed typo
|
2019-02-11 13:14:02 +01:00 |
|
Bernat
|
d994bd8e9d
|
#9783 update model and fixtures
|
2019-02-11 10:39:53 +01:00 |
|
Juan Ferrer
|
c0dd1624f6
|
Table style
|
2019-02-10 22:52:35 +01:00 |
|
Juan Ferrer
|
f52d306db4
|
Color style unified
|
2019-02-08 17:49:51 +01:00 |
|
Gerard
|
8bef242a54
|
fixed lines icon not preventing event default
|
2019-02-07 09:33:54 +01:00 |
|
Gerard
|
171716806a
|
#1096 back validaciones crear ticket
|
2019-02-06 16:37:59 +01:00 |
|
Gerard
|
d714c34f59
|
#1049 ticket.sale
|
2019-02-06 11:42:22 +01:00 |
|
Gerard
|
9573c875e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 11:40:43 +01:00 |
|
Gerard
|
87b3032a4f
|
#1067 error en boton "Importar Reclamacion"
|
2019-02-06 11:39:22 +01:00 |
|
Juan Ferrer
|
91d83bc132
|
Merge
|
2019-02-06 11:25:36 +01:00 |
|
Juan Ferrer
|
2bf9244770
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 11:24:31 +01:00 |
|
Juan Ferrer
|
03406a7d9b
|
Style fixes
|
2019-02-06 11:24:29 +01:00 |
|
Gerard
|
6d54c860cd
|
#1029 ir a lineas pedido en ticket.index
|
2019-02-06 09:55:17 +01:00 |
|
Gerard
|
3b4126ee79
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 09:25:40 +01:00 |
|
Javi Gallego
|
f9982047aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 07:58:43 +01:00 |
|
Javi Gallego
|
60c5d3062f
|
expedition.json new externalId field
|
2019-02-06 07:56:10 +01:00 |
|
Gerard
|
391c5e42c0
|
#1101 ticket.index
|
2019-02-05 17:01:01 +01:00 |
|
Gerard
|
69edf3fc43
|
Merge branch 'master' into test
|
2019-02-05 12:24:34 +01:00 |
|
Gerard
|
d51ed26025
|
tracking edit not showing hotfix
|
2019-02-05 12:20:03 +01:00 |
|
Gerard
|
8d714e655f
|
bug fixed
|
2019-02-05 11:44:08 +01:00 |
|
Gerard
|
edd433561b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 11:25:50 +01:00 |
|
Gerard
|
a32ea66a15
|
#913 ticket-basic data step one
|
2019-02-05 11:25:47 +01:00 |
|
Juan Ferrer
|
8f72fbad23
|
Merge
|
2019-02-05 09:14:22 +01:00 |
|
Juan Ferrer
|
1dbb75a1b8
|
vnSideMenu, vnBackground, style fixes
|
2019-02-05 09:13:15 +01:00 |
|
Gerard
|
3869742fd7
|
#1088 ticket.descriptor añadir polizon interval server error
|
2019-02-04 12:41:38 +01:00 |
|
Gerard
|
879c9b8877
|
#1093 ticket.descriptor ha dejado de funcionar en el modulo item
|
2019-02-04 12:24:47 +01:00 |
|
Juan Ferrer
|
84c0002cb1
|
Hot bugs fixed
|
2019-02-01 17:11:14 +01:00 |
|
Carlos Jimenez Ruiz
|
fd4205f9ab
|
#1069
|
2019-01-31 17:01:33 +01:00 |
|
Carlos Jimenez Ruiz
|
d109e480a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 14:14:52 +01:00 |
|
Carlos Jimenez Ruiz
|
00ccf9a4a0
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:14:39 +01:00 |
|
Joan Sanchez
|
1bcaf27563
|
changed currency filter, fixed tag value errors
|
2019-01-31 11:44:03 +01:00 |
|
Juan Ferrer
|
f643261a85
|
Styles fixed, change language moved to user config popover
|
2019-01-31 00:33:43 +01:00 |
|
Juan Ferrer
|
1dc8cafc73
|
Style & translation fixes
|
2019-01-30 23:47:06 +01:00 |
|
Carlos Jimenez Ruiz
|
f4e202dc62
|
#1069 index now show nicknames
|
2019-01-30 15:10:52 +01:00 |
|
Gerard
|
21e30bcaef
|
#1064 quitar comprobación isTaxDataChecked
|
2019-01-30 08:46:05 +01:00 |
|
Juan Ferrer
|
e553d63492
|
#996 worker.descriptor
|
2019-01-29 21:00:27 +01:00 |
|
Juan Ferrer
|
d46575a072
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 16:38:11 +01:00 |
|
Juan Ferrer
|
f47fe9c1cc
|
#998 worker.index, back tests fixed
|
2019-01-29 16:37:59 +01:00 |
|
Carlos Jimenez Ruiz
|
8f7fd03d6e
|
#1035 ticket al borrar falta traduccion
|
2019-01-29 14:46:21 +01:00 |
|
Juan Ferrer
|
3e40c651af
|
#998 worker.index
|
2019-01-28 16:24:45 +01:00 |
|
Juan Ferrer
|
ce99ab64bd
|
#1058 Fixed
|
2019-01-28 10:04:08 +01:00 |
|
Juan Ferrer
|
18c7851fb7
|
Merge
|
2019-01-28 00:32:28 +01:00 |
|
Juan Ferrer
|
317102b612
|
Section titile in topbar, responsive
|
2019-01-28 00:26:01 +01:00 |
|
Carlos Jimenez Ruiz
|
7333cb4114
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-27 20:49:21 +01:00 |
|
Carlos Jimenez Ruiz
|
20bea9679c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 13:04:20 +01:00 |
|
Juan Ferrer
|
af5ab770ec
|
More cleaning, deps in routes.json, module autodetection
|
2019-01-26 02:30:46 +01:00 |
|
Carlos Jimenez Ruiz
|
5b252fbc47
|
#1040 ticket.step2
|
2019-01-25 12:52:12 +01:00 |
|
Gerard
|
6e6b646978
|
#1022 ticket.create
|
2019-01-25 11:58:50 +01:00 |
|
Carlos Jimenez Ruiz
|
7096273800
|
#1045 ticket.datos basicos
|
2019-01-24 15:41:48 +01:00 |
|
Carlos Jimenez Ruiz
|
6bfa39e0eb
|
#1030 ticket.index orden siempre por fecha ascencente
|
2019-01-24 13:50:57 +01:00 |
|
Juan Ferrer
|
637c61063b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 10:57:45 +01:00 |
|
Gerard
|
91b0484c74
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 10:04:20 +01:00 |
|
Gerard
|
8b17524432
|
changed salesperson definition
|
2019-01-24 10:04:18 +01:00 |
|
Juan Ferrer
|
1ccffd63a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 09:25:57 +01:00 |
|
Juan Ferrer
|
498ae5d4fe
|
Keybindings bugs fixed
|
2019-01-24 09:25:51 +01:00 |
|
Carlos Jimenez Ruiz
|
79ee9bb0da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 09:08:38 +01:00 |
|
Carlos Jimenez Ruiz
|
8cbde4c137
|
removed global variable serviceRoot
|
2019-01-24 09:08:28 +01:00 |
|
Gerard
|
e6ee15fc8d
|
console log removed
|
2019-01-24 08:25:48 +01:00 |
|
Gerard
|
bbb7fafed1
|
fixed default search on ticket index
|
2019-01-24 08:21:00 +01:00 |
|
Juan Ferrer
|
30749f0f4d
|
#981 Back & front tests passed, keybinds on it's own module routes.json
|
2019-01-23 17:49:28 +01:00 |
|
Gerard
|
288300db41
|
#1048 ticket.index quitar columnas
|
2019-01-23 16:51:39 +01:00 |
|
Gerard
|
cd28d559c4
|
#1026 ticket.line
|
2019-01-23 14:12:05 +01:00 |
|
Gerard
|
aeb0f65fec
|
#1037 order.descriptor
|
2019-01-23 12:30:32 +01:00 |
|
Gerard
|
05ed72661e
|
test fixed
|
2019-01-23 11:17:18 +01:00 |
|
Gerard
|
abea582014
|
#1017 ticket.index
|
2019-01-22 16:18:26 +01:00 |
|
Carlos Jimenez Ruiz
|
5f850e76e2
|
#884 e2e claim.detail + bug fixes en autocompleteSearch extension
|
2019-01-22 13:18:20 +01:00 |
|
Gerard
|
87a0a0bccc
|
#972 ticket.tracking
|
2019-01-22 10:04:42 +01:00 |
|
Gerard
|
ea0504db21
|
stowaway fixes
|
2019-01-21 08:44:21 +01:00 |
|
Juan Ferrer
|
6e43b11e16
|
Left menu fixed
|
2019-01-20 18:48:03 +01:00 |
|
Juan Ferrer
|
2df9579f2c
|
Summary style fixes
|
2019-01-20 16:47:04 +01:00 |
|
Joan Sanchez
|
9cb298fb08
|
modules summary were not updating view data #978
|
2019-01-18 14:04:12 +01:00 |
|
Gerard
|
345acc1353
|
#951 ticket.descriptor añadir polizon
|
2019-01-18 13:36:13 +01:00 |
|
Gerard
|
e9bc3f00a1
|
#954 ticket.descriptor añadir link a polizon
|
2019-01-18 13:34:50 +01:00 |
|
Gerard
|
2b2fe69d0d
|
alert level not available fixed
|
2019-01-17 11:04:00 +01:00 |
|
Javi Gallego
|
f7cf8cd656
|
Bug #976
|
2019-01-16 15:38:50 +01:00 |
|
Gerard
|
542dd9f280
|
#973 order.action
|
2019-01-16 12:55:38 +01:00 |
|
Gerard
|
0fd1149c55
|
#975 ticket.summary
|
2019-01-16 12:43:18 +01:00 |
|
Gerard
|
ef7660162c
|
#966 loggable
|
2019-01-16 12:09:43 +01:00 |
|
Gerard
|
140e7b4f92
|
#968 ticket/servicios
|
2019-01-16 10:49:49 +01:00 |
Carlos Jimenez
|
8ea3278a10
|
#875 e2e ticket create
|
2019-01-16 08:52:56 +01:00 |
|
Gerard
|
c0170628f4
|
autopcomplete not pointing to the right endpoint fixed
|
2019-01-16 08:11:28 +01:00 |
|
Javi Gallego
|
b60deafff1
|
actualiza fuentes a 1.19
|
2019-01-15 13:22:31 +01:00 |
|
Gerard
|
7383a377aa
|
ticket services hidden
|
2019-01-15 11:26:05 +01:00 |
|
Gerard
|
35e237fb4f
|
fixed bug showing null instead id
|
2019-01-14 13:40:39 +01:00 |
|
Bernat
|
3faf03cf9f
|
fix test and update fixtures
|
2019-01-11 15:06:18 +01:00 |
|
Bernat
|
f7244cc22b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-11 12:26:06 +01:00 |
|
Bernat
|
f678bfea37
|
exportDB step 3
|
2019-01-11 12:25:53 +01:00 |
|
Gerard
|
aa03c686e5
|
added log of ticket packaging
|
2019-01-11 08:30:44 +01:00 |
|
Gerard
|
100871edf6
|
clients autocompletes now order by id
|
2019-01-11 08:03:36 +01:00 |
|
Bernat
|
85b4f46479
|
structuredb step 2
|
2019-01-10 07:26:10 +01:00 |
|
Gerard
|
360ef4837f
|
#931 ticket.create
|
2019-01-07 16:47:26 +01:00 |
|
Gerard
|
650becf455
|
#945 en salix no se pueden modificar los consignatarios antiguos
|
2019-01-07 16:28:18 +01:00 |
|
Juan Ferrer
|
9cdfe0c5d9
|
#814 First stable version
|
2018-12-27 12:54:16 +01:00 |
|
Juan Ferrer
|
f2fc5b6b2b
|
#841 Client modules mixed with service modules
|
2018-12-22 11:59:26 +01:00 |
|
Juan Ferrer
|
97e0b33d0d
|
#814 Service modules moved to project root, models reclassified
|
2018-12-21 20:22:13 +01:00 |