Commit Graph

1325 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 6e50c1fad9 #1685 ticket.transferSale 2019-09-27 16:55:40 +02:00
Bernat 907b4a4991 #1729 client.webPayment mostrar hora
gitea/salix/dev This commit looks good Details
2019-09-27 11:04:27 +02:00
Carlos Jimenez Ruiz f3d2313464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 14:52:54 +02:00
Juan Ferrer 455d953e9a Tests fixed
gitea/salix/dev This commit looks good Details
2019-09-26 14:51:45 +02:00
Carlos Jimenez Ruiz 38a58af3ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 14:23:31 +02:00
Carlos Jimenez Ruiz d5d7b1ef96 Bug/Test #1736 back errors 2019-09-26 13:45:42 +02:00
Juan Ferrer dbd70da866 Merge
gitea/salix/dev This commit looks good Details
2019-09-26 13:36:22 +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 52552ec502 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 11:07:38 +02:00
Carlos Jimenez Ruiz 2a2c5ae3c4 #1719 claim.detail cambiar descuento falla 2019-09-26 10:56:49 +02:00
Juan Ferrer c0f39ba87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 10:09:07 +02:00
Bernat f28305de9b Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good Details
2019-09-26 09:13:18 +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
Juan Ferrer 91e4e62a1c Merge branch 'test' into dev 2019-09-26 08:44:00 +02:00
Juan Ferrer 2a0cc1dc8b Style/i18n fixes 2019-09-25 23:09:10 +02:00
Juan Ferrer dba4ae14d5 Query delivery days by province 2019-09-25 22:35:21 +02:00
Juan Ferrer 54839782f3 Style fix 2019-09-25 20:14:43 +02:00
Juan Ferrer 91b5ad5a3e Merge 2019-09-25 20:11:14 +02:00
Juan Ferrer 98cc3ce00e Agency events, delivery days viewer 2019-09-25 20:06:42 +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
Bernat faf355fab8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 12:38:26 +02:00
Bernat 7384fabec0 Tarea #1724 order/index buscar por alias 2019-09-24 12:10:03 +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 a319eed5f6 Zone.getLeaves() refactor
gitea/salix/dev This commit looks good Details
2019-09-24 10:41:25 +02:00
Juan Ferrer 4b58078798 Zone.getLeaves refactor & fixes 2019-09-24 10:38:07 +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
Joan Sanchez 314b609060 fixed family translation
gitea/salix/dev This commit looks good Details
2019-09-24 08:34:14 +02:00
Joan Sanchez a091674f08 allowed numbers on fiscal name
gitea/salix/dev This commit looks good Details
2019-09-24 07:47:06 +02:00
Carlos Jimenez Ruiz 6c1fdb444a removed fdescribe
gitea/salix/dev This commit looks good Details
2019-09-24 07:03:22 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Joan Sanchez 36d7e514ff Allow spanish characters on socialName #1712 2019-09-23 09:27:58 +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
Carlos Jimenez Ruiz 7bcc908708 #1704 item.basicData
gitea/salix/dev There was a failure building this commit Details
2019-09-20 16:39:20 +02:00
Juan Ferrer 6d50012fab agency.location fixes
gitea/salix/master This commit looks good Details
2019-09-19 18:00:40 +02:00
Juan Ferrer 40c555702d Zone.getLeaves() refactor
gitea/salix/master This commit looks good Details
2019-09-19 17:49:46 +02:00
Juan Ferrer 05fec10cf2 Zone.getLeaves refactor & fixes
gitea/salix/master This commit looks good Details
2019-09-19 17:30:16 +02:00
Juan Ferrer e0ffef70b1 Method ZoneGeo.getLeaves optimized
gitea/salix/master This commit looks good Details
2019-09-19 15:51:39 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Joan Sanchez d6d825ebf1 fixed automerge
gitea/salix/master This commit looks good Details
2019-09-19 10:52:23 +02:00
Joan Sanchez f67006e526 changed fiscal name translation
gitea/salix/master This commit looks good Details
2019-09-19 09:44:50 +02:00
Joan Sanchez 9ce18fbd0a double start pick 2019-09-19 09:44:18 +02:00
Joan Sanchez 4d894365eb Fixed production errors #1699 2019-09-19 09:42:41 +02:00
Joan Sanchez 8cb10759d3 updated transactions 2019-09-19 09:42:32 +02:00
Joan Sanchez 2edfb66423 changed fiscal name translation
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:41:02 +02:00
Joan Sanchez fa549630c4 Bug/Test #1700
gitea/salix/dev This commit has test failures Details
2019-09-19 09:37:02 +02:00
Joan Sanchez a85e653f34 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-19 09:24:27 +02:00
Joan Sanchez 5a4c6bf66f updated back unit tests 2019-09-19 09:17:21 +02:00
Bernat 526e4e34fa skip e2e #1702
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:05:11 +02:00
Joan Sanchez 73b1f18759 Fixed production errors #1699 2019-09-19 08:58:42 +02:00
Bernat c773ddc499 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-19 06:56:47 +02:00
Joan Sanchez 335f92173c updated transactions
gitea/salix/dev There was a failure building this commit Details
2019-09-18 15:11:09 +02:00
Bernat 86d793b9ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-18 11:11:53 +02:00
Bernat 7af4f3626d #1691 item.basicData - Añadir campo hasKgPrice 2019-09-18 11:11:47 +02:00
Joan Sanchez f56e4f4b7d pick
gitea/salix/master This commit looks good Details
2019-09-18 10:37:54 +02:00
Joan Sanchez 86ef44c90d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-09-18 10:35:49 +02:00
Joan Sanchez 031dbcb63a Unlocked from autocomplete city and postcode fields #1703 2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz 4c33f07e42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Joan Sanchez c7423f5580 pick2
gitea/salix/master This commit looks good Details
2019-09-17 07:15:34 +02:00
Joan Sanchez dd0c34d31b allowed null parent 2019-09-17 07:13:37 +02:00
Joan Sanchez 043fe80254 cherry 1 2019-09-17 07:12:45 +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
Joan Sanchez a529efc783 getleaves fix
gitea/salix/dev This commit looks good Details
2019-09-13 13:26:50 +02:00
Joan Sanchez a25652293d changed initial leaves depth
gitea/salix/dev This commit looks good Details
2019-09-13 12:26:37 +02:00
Joan Sanchez 7f23e006fa allowed null parent
gitea/salix/dev This commit looks good Details
2019-09-13 12:16:38 +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
Bernat 2172bdee4e #1689 2019-09-12 12:27:19 +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
Joan Sanchez e16d43b2fc Allow disable log on model properties
gitea/salix/dev This commit looks good Details
2019-09-12 09:49:02 +02:00
Joan Sanchez 9bf54f34dd Added fruit translation
gitea/salix/dev This commit looks good Details
2019-09-12 07:26:15 +02:00
Joan Sanchez 5d980f5129 Added fruit translation
gitea/salix/master This commit looks good Details
2019-09-12 07:25:05 +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 03c44d4ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-10 14:43:10 +02:00
Bernat ac6d1ed829 #1663 update ticketLog 2019-09-10 14:43:00 +02:00
Joan Sanchez b36846994d Server error on change paymethod #1687
gitea/salix/master This commit looks good Details
2019-09-10 14:13:45 +02:00
Joan Sanchez 0ed240df0b Server error on change paymethod #1687
gitea/salix/dev There was a failure building this commit Details
2019-09-10 14:12:03 +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 7ecb67052d item.diary css chip fixed #1676
gitea/salix/dev There was a failure building this commit Details
2019-09-10 08:47:46 +02:00
Joan Sanchez 197e89ae5a Added fiscal data validate translation
gitea/salix/dev This commit looks good Details
2019-09-09 12:45:09 +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
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
2019-09-09 09:05:13 +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
Bernat 9db989d191 ticket.sale ok state fixed
gitea/salix/master This commit looks good Details
2019-09-05 11:12:33 +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