Commit Graph

6203 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 74213ad880 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-26 06:55:50 +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
Carlos Jimenez Ruiz 58ee076524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-25 09:14:39 +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
Carlos Jimenez Ruiz 474e42c9bd #1772 informe consumo campaña email template
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-22 16:01:11 +01:00
Bernat 5040d1d4a8 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-22 14:34:28 +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
Bernat Exposito 6a153bd69d Merge branch 'timeControl_calculate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-22 09:55:31 +00: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 07af68b7c9 Merge branch '1711Eliminar_referencias_vn2008' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-22 08:07:49 +00:00
Bernat 1ce0c63bf2 1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good Details
2019-11-22 08:23:31 +01:00
Joan Sanchez a67f6ec1ae removed zeroFill
gitea/salix/dev This commit looks good Details
2019-11-22 07:41:06 +01:00
Carlos Jimenez Ruiz dca7dd5fc7 rejected last modifications
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:51:11 +01:00
Carlos Jimenez Ruiz 33e9cf9816 Javi validation
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:39:09 +01:00
Carlos Jimenez Ruiz a45ca84e7f workerTimeControlCalculate procedure refactor
gitea/salix/timeControl_calculate This commit looks good Details
2019-11-21 14:23:22 +01:00
Joan Sanchez 5dc569c12f updated selector
gitea/salix/dev This commit looks good Details
2019-11-21 14:18:07 +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
Bernat 857fbe0299 fix e2e
gitea/salix/dev This commit looks good Details
2019-11-21 13:18:44 +01:00
Bernat 038ba3edb2 1711 update structure db 2019-11-21 13:18:30 +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
Juan Ferrer 30ac174b1e SQL grouping quoted
gitea/salix/dev This commit looks good Details
2019-11-21 12:01:21 +01: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 0733ef8949 Merge branch '1891-worker_time_control_tests' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
Joan: LGTM
2019-11-21 10:36:47 +00:00
Carlos Jimenez Ruiz ac2bab6942 removed unused code
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:28:35 +01:00
Carlos Jimenez Ruiz 8202a6f419 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:17:17 +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
Joan Sanchez 56a73f152e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-11-21 09:09:17 +01:00
Bernat d1dfa126c0 #1711 Eliminar referencias al esquema vn2008 2019-11-21 09:08:43 +01:00
Bernat 525e115781 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-21 07:24:31 +01:00
Bernat 19349472f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-21 07:10:06 +01:00
Carlos Jimenez Ruiz d29f86c914 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-20 14:52:27 +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
Bernat a1784470cc update scheme db 2019-11-20 12:42:10 +01:00
Joan Sanchez 37618efb58 changed userPhone fkeys
gitea/salix/dev This commit has test failures Details
2019-11-20 11:37:13 +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
Carlos Jimenez Ruiz 5888071a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1772-campaign_metrics 2019-11-20 06:55:26 +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
Carlos Jimenez Ruiz 19371fbb41 1772-campaign_metrics refactor
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-19 14:52:38 +01:00