Commit Graph

342 Commits

Author SHA1 Message Date
Javi Gallego ea1cc68d29 test passed 2020-04-03 17:52:47 +02:00
Ainki 42f3bfb86d test, fitxures and changes 2020-03-30 14:28:29 +02:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia 2020-03-27 12:16:47 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway 2020-03-27 11:22:00 +01:00
Joan Sanchez d4ca58edad Updated back unit test 2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita 2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR 2020-03-26 17:41:40 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving 2020-03-25 16:14:13 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e 2020-03-23 23:57:11 +01:00
Joan Sanchez 27b1376799 changes 2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech a19a0578e9 structure DB 2020-03-16 10:25:49 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev 2020-03-06 11:19:26 +00:00
Carlos Jimenez Ruiz 0f3ceea653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test 2020-03-04 15:13:03 +01:00
Carlos Jimenez Ruiz 0179461cb3 timeBusiness and timeControl db tests 2020-03-04 15:12:36 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev 2020-03-04 12:15:41 +00:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty 2020-03-04 09:26:12 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Joan Sanchez 04917f980f Updated E2E 2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech 5e86f67b37 dbtest workerTimeControCheck 2020-03-02 08:18:41 +01:00
Joan Sanchez 28553a1c0d Worker dms changes 2020-03-02 07:50:07 +01:00
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Joan Sanchez 224241a954 Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev 2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev 2020-02-21 08:50:50 +01:00
Javi Gallego a8137c8a6b zoneClosure 3 2020-02-20 15:15:50 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request 2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor 2020-02-18 10:33:17 +01:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed 2020-02-18 07:21:35 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat 2020-02-17 12:47:03 +01:00
Bernat Exposito Domenech b78858eb7c export structure db 2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary 2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent 2020-02-12 10:39:46 +01:00
Joan Sanchez c174d0a29e acl fix 2020-01-29 14:50:53 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests 2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData 2020-01-27 09:45:13 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev 2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours 2020-01-24 12:38:08 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms 2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models 2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db 2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev 2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech 2790cc8057 update structure 2020-01-22 14:34:45 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods 2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests 2020-01-21 09:33:26 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors 2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-20 13:05:06 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 4002b51565 added section 2020-01-17 08:43:10 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev 2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor 2020-01-17 07:24:57 +01:00
Joan Sanchez 3cba6f0293 Translated family names 2020-01-16 14:35:40 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter 2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure 2020-01-15 13:43:38 +01:00
Bernat Exposito Domenech 1f60aac446 export structure db 2020-01-15 08:19:22 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev 2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech d432c32577 export production and create new models 2020-01-09 10:49:09 +01:00
Joan Sanchez 5a7bd4e18f filters refactor 2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays 2020-01-03 08:43:03 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice 2020-01-02 11:10:26 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug 2019-12-31 14:01:05 +01:00
Joan Sanchez 417642ac9e updated UserPhone acl 2019-12-31 11:07:46 +01:00
Joan Sanchez 0ece53a35e Send chat message with user avatar 2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql 2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db 2019-12-20 13:51:04 +01:00
Joan Sanchez 72d591e143 sql changes 2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql 2019-12-20 10:40:12 +01:00
Bernat Exposito Domenech aab970e667 client.phone section 2019-12-17 09:11:28 +01:00
Bernat Exposito Domenech c1db827889 update structure db 2019-12-16 11:33:10 +01:00
Bernat Exposito Domenech e4c17492f0 update structure 2019-12-16 09:22:59 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one 2019-12-16 08:48:12 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql 2019-12-13 09:06:39 +01:00
Bernat Exposito Domenech dd86961542 update structure 2019-12-13 08:46:40 +01:00
Bernat Exposito 6d1bd7575d Merge branch '1925excludeTables' of verdnatura/salix into dev 2019-12-13 06:17:03 +00:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev 2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech e8c216799c update estructure 2019-12-12 14:28:58 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures 2019-12-12 09:46:29 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Bernat Exposito Domenech d0a2f4627b 1707 route.ticket sistema tablas que soporte dirección salida para warehouses 2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech f6eabc81da add models and update structure db 2019-12-05 14:20:11 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Bernat 89e127f0ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references 2019-11-26 14:26:50 +01:00
Bernat 18b5342609 update fixtures and structure db 2019-11-26 14:15:43 +01:00
Bernat Exposito a4a48e76a4 Merge branch '1762-worker_dms' of verdnatura/salix into dev 2019-11-25 08:33:04 +00:00
Joan Sanchez f9dba9489f updated tests 2019-11-25 09:17:24 +01:00
Bernat 5040d1d4a8 #1711 Eliminar referencias al esquema vn2008 2019-11-22 14:34:28 +01:00
Joan Sanchez a077dd5165 test unitario 2019-11-22 14:34:20 +01:00
Bernat 1ce0c63bf2 1711Eliminar_referencias_vn2008 2019-11-22 08:23:31 +01:00
Bernat 038ba3edb2 1711 update structure db 2019-11-21 13:18:30 +01:00
Carlos Jimenez Ruiz 8202a6f419 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 11:17:17 +01:00
Joan Sanchez 56a73f152e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-21 09:33:10 +01:00
Joan Sanchez 5f28d39bbf dynamic header & footer texts by company #1336 2019-11-21 09:33:08 +01:00
Carlos Jimenez Ruiz c04640bd62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz 52a8d5e0c2 #1891 tests for worker time control function 2019-11-21 09:19:03 +01:00
Bernat 0473f1de82 #1711 Eliminar referencias al esquema vn2008 2019-11-21 09:09:17 +01:00
Bernat 525e115781 #1711 Eliminar referencias al esquema vn2008 2019-11-21 07:24:31 +01:00
Bernat ee3a83ac0a update structure and fixtures 2019-11-19 13:40:29 +01:00
Bernat b608273510 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 12:51:11 +01:00
Bernat 99585b9cc9 fix fixtures 2019-11-19 12:50:50 +01:00
Joan Sanchez 3d90e80c82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 11:53:04 +01:00
Joan Sanchez f9deb9f52d send closure error by email 2019-11-19 11:53:01 +01:00
Bernat 12825f0503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 11:43:00 +01:00
Bernat 0b58b5d09a update fixtures tblContadores 2019-11-19 11:40:46 +01:00
Carlos Jimenez Ruiz 04b4f60c48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 16:35:21 +01:00
Juan Ferrer 4d4e4f31f4 vnZoneEvents refactor 2019-11-18 16:31:37 +01:00
Carlos Jimenez Ruiz 8629b72d55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz 34bd35ce4e #1852 worker.time-control 2019-11-14 14:20:05 +01:00
Joan Sanchez e0ed9072c9 unified LCR and CORE #1868 2019-11-14 08:16:52 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk 2019-11-13 13:22:39 +01:00
Bernat a3159f7dbd dumped data updated 2019-11-13 10:41:14 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-13 08:09:54 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local 2019-11-12 11:13:20 +01:00
Joan Sanchez 963ac3ad77 dumpedfixtures rollback 2019-11-11 11:56:13 +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
Joan Sanchez 5705c37f92 show attachments on email templates attachment component 2019-11-07 11:19:05 +01:00
Javi Gallego 729f6cb767 changes to zone 2019-11-06 13:44:58 +01:00
Joan Sanchez 114e8c87d6 export sample table 2019-11-06 10:56:18 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table 2019-11-06 10:55:04 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados 2019-10-31 12:54:16 +01:00
Bernat cb90e86f64 #1846 exportar produccion a la local 2019-10-29 11:28:35 +01:00
Bernat eb384425f2 #1777 travel.descriptor 2019-10-24 14:43:11 +02:00
Bernat afd7c5684a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary 2019-10-24 12:49:23 +02:00
Bernat 7bdb497976 #1773 travel.summary & #1774 2019-10-24 12:49:18 +02:00
Carlos Jimenez Ruiz c84625b0d5 #1713 route.tickets boton mas bajo derecha 2019-10-23 09:25:28 +02:00
Bernat 939c507fba #1810 El método listPackaging filtrar por isPackagingReturnable 2019-10-21 09:16:52 +02:00
Bernat 6adeb689eb Tarea #1814 refactor fixtures userPhone 2019-10-21 08:52:42 +02:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz bdbadaf61a #1819 fixtures 2019-10-17 14:30:52 +02:00
Bernat 25bd28990a Refactor #1812 refactor phone 2019-10-15 14:44:00 +02:00
Bernat ed1ed7f50b #1738 exportar estructura y datos de produccion a la local 2019-10-15 07:23:34 +02:00
Joan Sanchez 05d0f50606 changed warehouse from ticket id 17 2019-10-10 09:58:34 +02:00
Joan Sanchez 73b1f18759 Fixed production errors #1699 2019-09-19 08:58:42 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635 2019-09-09 09:05:13 +02:00
Bernat e8cb57e27a #1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen 2019-09-06 09:47:58 +02:00
Bernat a2228fa15f Tarea #1673 exportar estructura y datos de produccion a la local 2019-09-04 09:06:08 +02:00
Bernat b9c13ac3a3 #1664 , table city deprecated 2019-09-02 14:58:58 +02:00
Carlos Jimenez Ruiz 11b99d9a5f #1618 e2e ticket.basicData.stepOne 2019-08-20 14:18:32 +02:00
Bernat 3cea9cf405 #1637 update fixtures for dms 2019-08-12 14:07:30 +02:00