Commit Graph

9724 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 8d2cc56216 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-19 14:33:33 +01:00
Carlos Jimenez Ruiz 43c1c34cf3 #1888 nightmarejs extension 2019-11-19 14:33:25 +01:00
Bernat 2bfa0873a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-19 13:49:24 +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 20088c6712 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-19 13:40:50 +01:00
Bernat ee3a83ac0a update structure and fixtures 2019-11-19 13:40:29 +01:00
Joan Sanchez 615cfe15cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-19 13:07:21 +01:00
Joan Sanchez e499d44018 dont use payMethodId on view #1854
gitea/salix/dev This commit looks good Details
2019-11-19 12:53:25 +01:00
Bernat b608273510 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit has test failures Details
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 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
Bernat 0b58b5d09a update fixtures tblContadores 2019-11-19 11:40:46 +01:00
Joan Sanchez ed5458a264 error handling fixes
gitea/salix/dev This commit looks good Details
2019-11-19 10:32:09 +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 e74cb52867 Merge branch '1391-ticket_closure' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2019-11-19 07:02:12 +00:00
Joan Sanchez 06e4cbb783 renamed view atenderFk to
gitea/salix/dev This commit looks good Details
2019-11-19 07:41:02 +01:00
Carlos Jimenez Ruiz f5aacc804d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-18 16:46:51 +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
Juan Ferrer bdb03729b7 zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good Details
2019-11-18 16:36:08 +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
Joan Sanchez 8643030bf0 restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good Details
2019-11-18 15:04:51 +01:00
Javi Gallego 60cdc1114c #1602 back confirm.js
gitea/salix/dev There was a failure building this commit Details
2019-11-18 14:48:37 +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 e056184337 holidays fix #1853
gitea/salix/master This commit looks good Details
2019-11-15 10:58:45 +01:00
Joan Sanchez 3e0b175b11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-11-15 10:46:10 +01:00
Joan Sanchez c83a97d7ec holidays fix #1853
gitea/salix/dev This commit looks good Details
2019-11-15 10:44:11 +01:00