Commit Graph

1241 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 3595524286 #1794 index de balance pierde la companyFk
gitea/salix/dev This commit looks good Details
2019-10-15 13:18:56 +02:00
Joan Sanchez 3853fc7404 descuadre de horas #1766 rollback
gitea/salix/dev This commit looks good Details
2019-10-15 08:50:11 +02:00
Bernat fe5a77257f #1758 Añadir los alias como prefijos en los filtros 2019-10-15 08:32:25 +02:00
Carlos Jimenez Ruiz c46797d57e removed third party endpoint test
gitea/salix/dev This commit looks good Details
2019-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz 1086d3d362 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 07:43:51 +02:00
Bernat 793dd06e8d merge
gitea/salix/1763-worker_time_control_add This commit looks good Details
2019-10-15 07:30:23 +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
Carlos Jimenez Ruiz c57583e64b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-14 15:20:10 +02:00
Carlos Jimenez Ruiz 5b47eb54b2 #1767 client.balance.index, campo referencia 2019-10-14 15:20:03 +02:00
Joan Sanchez e79456374c fixed item-popover width
gitea/salix/dev This commit looks good Details
2019-10-14 14:54:11 +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 1f8f5af301 fixed transaction params
gitea/salix/dev Build queued... Details
2019-10-14 11:50:45 +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
Carlos Jimenez Ruiz 4a6ff9ca20 removed useless FIXME comments as per #1782
gitea/salix/dev This commit looks good Details
2019-10-14 10:59:10 +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
Joan Sanchez cd2b02b0c6 Bug/Test #1753 - Added dateTime filter 2019-10-14 08:52:48 +02:00
Bernat e267bf93a4 merge
gitea/salix/dev This commit looks good Details
2019-10-14 07:01:29 +02:00
Bernat d637ed2599 1717, route basic data 2019-10-14 06:58:02 +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 8af7f13ac6 #1763 insert from procedure
gitea/salix/1763-worker_time_control_add This commit looks good Details
2019-10-10 14:11:23 +02:00
Javi Gallego 3e71338d94 borra tabla temporal
gitea/salix/dev This commit looks good Details
2019-10-10 12:14:21 +02:00
Joan Sanchez 144f13c400 changed state to stowaway ticket
gitea/salix/master This commit looks good Details
2019-10-10 10:00:38 +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
Carlos Jimenez Ruiz 7db4945a6d #1702 Autocomplete data refresh and #1754 watcher
gitea/salix/dev This commit has test failures Details
2019-10-08 17:27:27 +02:00
Joan Sanchez 6422d25ad6 stowaway changed to correct field name
gitea/salix/master This commit looks good Details
2019-10-08 14:37:38 +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 cc71f51f45 added invoiceOut alias
gitea/salix/master This commit looks good Details
2019-10-08 13:52:50 +02:00
Joan Sanchez 1186654fba added invoiceOut alias
gitea/salix/dev This commit looks good Details
2019-10-08 13:51:16 +02:00
Joan Sanchez 90ca883962 solved conflicts
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:06:50 +02:00
Joan Sanchez 9358602471 #15 Updated changes width dev
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:03:19 +02:00
Joan Sanchez 4025c624b3 #15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 12:48:12 +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 05aa9151eb fixed stowaway list
gitea/salix/master This commit looks good Details
2019-10-08 11:45:00 +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
Joan Sanchez eb655215f4 merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 09:23:29 +02:00
Joan Sanchez b32cf4a386 last refactor
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 07:22:38 +02:00
Carlos Jimenez Ruiz 7449f288b3 #1751 order.summary mostrar campo sourceapp
gitea/salix/dev This commit looks good Details
2019-10-07 10:35:34 +02:00
Juan Ferrer 4f92cafe30 CSS border style classes
gitea/salix/dev This commit has test failures Details
2019-10-06 20:13:24 +02:00
Juan Ferrer c2dcae5577 client.note.index style fixes
gitea/salix/dev This commit has test failures Details
2019-10-05 00:44:25 +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
Juan Ferrer 9b385f4b90 #1749 Fixed
gitea/salix/dev This commit looks good Details
2019-10-04 13:12:53 +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 9c3e7f50ec disabled autoload on stowaway model #1747
gitea/salix/master This commit looks good Details
2019-10-04 11:21: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
Carlos Jimenez Ruiz e158bd5811 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-04 10:07:59 +02:00
Carlos Jimenez Ruiz da2c763573 #1705 item.index optimizar velocidad 2019-10-04 10:07:45 +02:00
Joan Sanchez 6b44686ff4 update zone and shipped on #1746
gitea/salix/master This commit looks good Details
2019-10-04 09:45:30 +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
Joan Sanchez 9919f9a46e add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 07:41:24 +02:00
Juan Ferrer c6e8498281 ModelProxy.status, Paging removed, locale fixes
gitea/salix/dev This commit looks good Details
2019-10-03 19:34:24 +02:00
Joan Sanchez a8f2000f3f Cambios mockup #1745
gitea/salix/dev This commit looks good Details
2019-10-03 11:37:44 +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 87add6cd33 vnDataViewer 2019-10-02 19:24:42 +02:00
Joan Sanchez 2e22c79e18 fixed #1734 canHaveStowaway validation
gitea/salix/master This commit looks good Details
2019-10-02 14:36:24 +02:00
Joan Sanchez 6a184496d6 treeview refactor 2
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-02 14:12:17 +02:00
Joan Sanchez 9473636b5b treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-02 09:54:52 +02:00
Juan Ferrer ac5d9b909b Agency exclusions & style fixes
gitea/salix/dev This commit looks good Details
2019-10-01 16:48:01 +02:00
Juan Ferrer 0e88343649 Agency events bug fixed
gitea/salix/dev This commit looks good Details
2019-10-01 16:31:33 +02:00
Juan Ferrer 34e141e159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 16:21:20 +02:00
Juan Ferrer 21992d3e69 Minimal style fixes 2019-10-01 16:21:08 +02:00
Juan Ferrer 76604744d1 Global & client style fixes 2019-10-01 16:17:57 +02:00
Joan Sanchez 199529b3b9 fiscal name ignore case
gitea/salix/master This commit looks good Details
2019-10-01 15:12:58 +02:00
Joan Sanchez 1ec2362dbf fiscal name ignore case
gitea/salix/dev This commit looks good Details
2019-10-01 15:12:02 +02:00
Joan Sanchez 183d770483 first changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-01 15:09:55 +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 eb80721ec4 removed x from test + merge
gitea/salix/dev This commit looks good Details
2019-10-01 13:21:27 +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
Carlos Jimenez Ruiz cef28307d0 #1660 ticket.log si el usuario es un cliente falla 2019-10-01 10:47:06 +02:00
Joan Sanchez 26be791cf0 fixed styles
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-10-01 10:35:27 +02:00
Carlos Jimenez Ruiz d96f67254f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-10-01 08:15:04 +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
Carlos Jimenez Ruiz 6c438a9109 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-01 07:56:26 +02:00
Juan Ferrer 9319067697 Front tests & DMS imports fixed
gitea/salix/dev This commit has test failures Details
2019-09-30 20:55:41 +02:00
Juan Ferrer eba854f0e3 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-30 20:46:34 +02:00
Juan Ferrer 679c6af0df #1297 Angular material removed from project 2019-09-30 20:46:22 +02:00
Carlos Jimenez Ruiz 4658c843cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-30 15:24:25 +02:00
Joan Sanchez 6d54e7a89d Claim dms upload file with drag & drop #1731
gitea/salix/dev There was a failure building this commit Details
2019-09-30 14:57:54 +02:00
Carlos Jimenez Ruiz 303f18d359 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-30 14:49:22 +02:00
Carlos Jimenez Ruiz 5b38889a72 #1739 claim.detail dialog add cambiar campos 2019-09-30 14:49:04 +02:00
Carlos Jimenez Ruiz ae4533c61e #1726 client.index añadir icono de Listado tickets 2019-09-30 13:16:31 +02:00
Juan Ferrer c72381f9c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-30 13:02:21 +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
Carlos Jimenez Ruiz 300dfc5772 #1726 client.index añadir icono de Listado tickets
gitea/salix/dev This commit looks good Details
2019-09-30 11:47:39 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Bernat e380e4466c #1717 route.basic-data añadir campo description
gitea/salix/dev This commit looks good Details
2019-09-30 08:26:51 +02:00
Carlos Jimenez Ruiz cae2a0a148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-27 16:55:49 +02:00