Commit Graph

1514 Commits

Author SHA1 Message Date
Joan Sanchez aa809eea8a trigger build
gitea/salix/master This commit looks good Details
2019-12-19 14:21:18 +01:00
Joan Sanchez 8a54da6fd3 fixed dms links 2019-12-19 14:13:24 +01:00
Juan Ferrer 9947021736 #1953 Temporal fix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-19 12:17:53 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech 03af680968 fix backtest
gitea/salix/1933-fix_backTest This commit looks good Details
2019-12-18 07:30:24 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00
Joan Sanchez 3d83a08eca Merge branch 'test' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-17 12:34:51 +00:00
Joan Sanchez 9d487f3cee updated translation
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 13:25:30 +01:00
Juan Ferrer 39a41f9a64 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/master This commit looks good Details
2019-12-17 12:23:46 +01:00
Juan Ferrer 4da83ef963 Hotfixes: vnTicketSale menu, vnItemDiary width 2019-12-17 12:23:31 +01:00
Joan Sanchez 8ddcd5a654 ACL fixes
gitea/salix/master This commit looks good Details
2019-12-17 12:18:17 +01:00
Juan Ferrer d1341c2758 Hotfixes
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-12-17 09:23:11 +01:00
Bernat Exposito Domenech aab970e667 client.phone section
gitea/salix/1928-client_phone This commit looks good Details
2019-12-17 09:11:28 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one
gitea/salix/1926-delete_bs This commit has test failures Details
2019-12-16 08:48:12 +01:00
Joan Sanchez 4a69a7f9b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1919-ticket_service_type
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:31:51 +01:00
Joan Sanchez da361a8ffb Merge branch '1921-claim_detail_discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 11:19:46 +00:00
Joan Sanchez 8808e49a10 updated unit test
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:07:36 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 11:59:25 +01:00
Bernat Exposito Domenech 2e68ad0d01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-13 10:54:52 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good Details
2019-12-13 09:06:39 +01:00
Joan Sanchez 2325127390 pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:40:59 +01:00
Joan Sanchez 7bbb9fa321 Pull from dev
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:26:27 +01:00
Javi Gallego 44304e993a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good Details
2019-12-13 08:19:22 +01:00
Joan Sanchez 676b5198a8 changed discount popover width + refresh discount
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:01:13 +01:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 13:49:05 +00:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good Details
2019-12-12 13:53:54 +01:00
Bernat Exposito Domenech a87ce44f08 test front worker.phone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-12 12:23:31 +01:00
Carlos Jimenez Ruiz 8a2eda7c08 Merge branch '1923-ticket-summary-discount' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 10:06:47 +00:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Bernat Exposito Domenech e573a2cff0 fix error
gitea/salix/1707route.ticket There was a failure building this commit Details
2019-12-12 09:13:24 +01:00
Bernat Exposito Domenech 126a02c1b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket 2019-12-12 09:11:45 +01:00
Carlos Jimenez Ruiz 4d493c3572 Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-12-12 07:25:22 +00:00
Joan Sanchez af47ab6cac fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit Details
2019-12-12 08:22:04 +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
gitea/salix/1707route.ticket This commit looks good Details
2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech 17acfc2631 update translations
gitea/salix/1900travelCreate This commit looks good Details
2019-12-10 08:18:53 +01:00
Bernat Exposito Domenech 2cc9c5e951 create section travel create
gitea/salix/1900travelCreate This commit looks good Details
2019-12-09 12:15:19 +01:00
Bernat Exposito Domenech f6eabc81da add models and update structure db
gitea/salix/1834createTravelModels This commit looks good Details
2019-12-05 14:20:11 +01:00
Bernat da2503d4b8 fix test
gitea/salix/1904%2FupgradeStructureDb This commit looks good Details
2019-12-04 11:18:26 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +01:00
Bernat Exposito a4a48e76a4 Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-25 08:33:04 +00:00
Joan Sanchez f9dba9489f updated tests
gitea/salix/1762-worker_dms This commit looks good Details
2019-11-25 09:17:24 +01:00
Joan Sanchez 8fc76b49c9 summary unit tests #1905
gitea/salix/dev This commit looks good Details
2019-11-25 08:35:34 +01:00
Joan Sanchez 974bf67e8d removed focus
gitea/salix/dev This commit looks good Details
2019-11-25 07:46:00 +01:00
Joan Sanchez a077dd5165 test unitario
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 14:34:20 +01:00
Joan Sanchez 3c144ea0cd transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 13:46:38 +01:00
Juan Ferrer f50f99b962 Minor bug & style fixes
gitea/salix/dev This commit looks good Details
2019-11-22 13:23:43 +01:00
Joan Sanchez 5aae48c7dc added gestdoc
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 10:42:05 +01:00
Joan Sanchez a67f6ec1ae removed zeroFill
gitea/salix/dev This commit looks good Details
2019-11-22 07:41:06 +01:00
Bernat Exposito 9f345fe244 Merge branch '1875-send-sms-dialog' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 13:13:05 +00:00
Joan Sanchez 27cab0e722 added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good Details
2019-11-21 14:00:27 +01:00
Joan Sanchez 423240ac7d open dialog 2019-11-21 13:02:46 +01:00
Carlos Jimenez Ruiz f4a62dfa86 Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 11:30:00 +00:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 12:00:56 +01:00
Carlos Jimenez Ruiz 6a0783d22f #1891 tests for worker time control function 2019-11-21 11:16:10 +01:00
Joan Sanchez fee0d674a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 11:06:31 +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 d1dfa126c0 #1711 Eliminar referencias al esquema vn2008 2019-11-21 09:08:43 +01:00
Carlos Jimenez Ruiz 6929e3d497 #1889 absences() unit test fixed + refactor
gitea/salix/dev This commit looks good Details
2019-11-20 14:22:44 +01:00
Joan Sanchez 5bb7f7f14a deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures Details
2019-11-20 11:14:11 +01:00
Joan Sanchez c6d1536500 recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures Details
2019-11-20 06:53:37 +01:00
Juan Ferrer 59fddb5c55 vnAgencyEvents: console.log removed
gitea/salix/dev This commit looks good Details
2019-11-19 15:44:33 +01:00
Juan Ferrer c47f3137c1 Delivery days fixes
gitea/salix/dev This commit looks good Details
2019-11-19 13:49:10 +01:00
Bernat 9743b61f63 delete endpoint getWorkerInfo
gitea/salix/dev Build queued... Details
2019-11-19 11:51:47 +01:00
Bernat 12825f0503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-11-19 11:43:00 +01:00
Joan Sanchez cba578d42e fixed zoom photo url #1884
gitea/salix/dev This commit looks good Details
2019-11-19 09:24:53 +01:00
Carlos Jimenez Ruiz f998a04808 #1852 worker.time-control 2019-11-18 16:37:33 +01:00
Carlos Jimenez Ruiz eeead2cc86 corrected a typo 2019-11-18 16:37:03 +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
gitea/salix/dev This commit looks good Details
2019-11-18 16:31:37 +01:00
Javi Gallego f12b1b8595 test fron arreglados
gitea/salix/dev This commit looks good Details
2019-11-18 16:03:10 +01:00
Carlos Jimenez Ruiz 3c2ad2df48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 12:35:30 +01:00
Javi Gallego c736e4de29 #1850 descomentar test back
gitea/salix/dev There was a failure building this commit Details
2019-11-18 12:32:50 +01:00
Carlos Jimenez Ruiz 7c199b5d74 #1852 worker.time-control 2019-11-18 11:00:09 +01:00
Javi Gallego 4b51d607f7 error getLanded con drop temporary table
gitea/salix/dev This commit looks good Details
2019-11-15 15:42:00 +01:00
Joan Sanchez c83a97d7ec holidays fix #1853
gitea/salix/dev This commit looks good Details
2019-11-15 10:44:11 +01:00
Carlos Jimenez Ruiz d1b114de59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-15 10:37:42 +01:00
Joan Sanchez ddb19cb198 added event
gitea/salix/dev This commit looks good Details
2019-11-15 10:03:46 +01:00
Joan Sanchez 6e5f460fab #1867 show warehouses on summary
gitea/salix/dev This commit looks good Details
2019-11-15 07:35:51 +01:00
Juan Ferrer 4f5c1404d7 E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-14 15:24:08 +01:00
Juan Ferrer 09a187ecfe Merge 2019-11-14 15:05:49 +01:00
Juan Ferrer 2621da8dce Hour formating fix
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-14 14:40:19 +01:00
Juan Ferrer 64124376f0 Final fixes 2019-11-14 14:37:18 +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 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 5561ff169e deprecated worker.sendMessage() 2019-11-14 11:21:08 +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
Carlos Jimenez Ruiz d12f815c80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 12:31:13 +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
Bernat dfd29ced70 1711 delete references 2019-11-13 11:04:52 +01:00
Carlos Jimenez Ruiz b4669270c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 08:54:27 +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
Carlos Jimenez Ruiz 65b84d752c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-13 07:51:06 +01:00
Joan Sanchez 7f2af116bc updated translation
gitea/salix/dev This commit looks good Details
2019-11-13 07:04:47 +01:00
Carlos Jimenez Ruiz 0730aa1d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 15:18:41 +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 1c035ca045 All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-12 14:18:46 +01:00
Carlos Jimenez Ruiz 266de44f2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 13:19:34 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +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
Carlos Jimenez Ruiz d284e36ee6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 08:52:07 +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 6cedfceddd Show ticket state #1836
gitea/salix/dev This commit looks good Details
2019-11-11 13:51:30 +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 5b2e407870 dialog styles
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 12:26:22 +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 115156f89d updated unit tests
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-11 11:23:39 +01:00
Joan Sanchez 0838540789 template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-11 11:04:49 +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 bee50a6b03 Front tests passed 2019-11-10 13:10:52 +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
Carlos Jimenez Ruiz f2de7ddab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-07 12:17:33 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +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
Carlos Jimenez Ruiz 9442a198b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-06 15:13:14 +01:00
Bernat 4220c995a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-06 14:02:26 +01:00
Javi Gallego 729f6cb767 changes to zone
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-06 13:44:58 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 10:55:04 +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
Carlos Jimenez Ruiz 76f3dc48e5 #1852 worker.time-control 2019-11-05 11:57:05 +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
Carlos Jimenez Ruiz b9be0188d8 manual merge 2019-11-05 09:05:00 +01:00
Carlos Jimenez Ruiz 03ab88bcd9 #1852 worker.time-control 2019-11-05 08:59:48 +01:00
Bernat 1be61b16d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-05 08:56:59 +01:00
Joan Sanchez 5d83849e2b unknown provider
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-05 07:19:16 +01:00
Joan Sanchez 14cb32d1c8 updated reports
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-04 13:55:20 +01:00
Joan Sanchez fc2abdc0ab change log columns size
gitea/salix/dev This commit looks good Details
2019-11-04 08:05:00 +01:00
Juan Ferrer 026c608f42 Faster module loading & vnAgencyCalendar bug fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-11-01 13:02:47 +01:00
Juan Ferrer 4fcaa2e507 Jest fixes
gitea/salix/dev This commit looks good Details
2019-10-31 15:38:20 +01:00
Juan Ferrer f759c1e11a vnDialog bug fixes & front tests, workerTimeControl date fixes
gitea/salix/dev There was a failure building this commit Details
2019-10-31 15:24:28 +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 5a15e65fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-30 16:57:26 +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