Commit Graph

4854 Commits

Author SHA1 Message Date
Gerard 506c857b70 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-21 10:17:54 +01:00
Gerard 03e168739b updated icons
gitea/salix/test This commit looks good Details
2019-02-21 10:17:13 +01:00
Juan Ferrer 02569aeea4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-02-21 10:10:48 +01:00
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +01:00
Gerard ab6606a624 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover
gitea/salix/test This commit looks good Details
2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method
gitea/salix/dev This commit has test failures Details
2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures Details
2019-02-21 08:43:04 +01:00
Carlos Jimenez Ruiz 0f496b9500 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-21 07:49:30 +01:00
Gerard 42cc2bde0d Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-21 07:48:31 +01:00
Gerard 444d531162 summary action now shows ticket id
gitea/salix/test This commit looks good Details
2019-02-21 07:46:27 +01:00
Carlos Jimenez Ruiz 1ac820478e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-21 07:40:38 +01:00
Carlos Jimenez Ruiz c3679b5642 #1077 e2e específico para login 2019-02-21 07:40:22 +01:00
Gerard a651142fff Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento
gitea/salix/test This commit looks good Details
2019-02-20 18:46:30 +01:00
Gerard a3dab9013c Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 17:53:10 +01:00
Gerard 0cca3bb9ce #1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good Details
2019-02-20 17:52:36 +01:00
Gerard 902b654f80 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 16:43:52 +01:00
Gerard c95b2d71d4 tag not closed correctly fixed
gitea/salix/test This commit looks good Details
2019-02-20 16:43:01 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures Details
2019-02-20 16:30:46 +01:00
Juan Ferrer 8c401b6921 Style fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-20 14:38:41 +01:00
Juan Ferrer 752a703cdb Merge
gitea/salix/dev This commit looks good Details
2019-02-20 14:34:56 +01:00
Juan Ferrer 8f1e41e744 Style fixes 2019-02-20 14:34:16 +01:00
Bernat 258e60b9fb update fixtures cau 9908
gitea/salix/dev This commit looks good Details
2019-02-20 14:01:05 +01:00
Bernat e5b95460f6 update fixtures cau 9908
gitea/salix/dev This commit looks good Details
2019-02-20 13:51:41 +01:00
Gerard a93684e5ac Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-02-20 13:49:54 +01:00
Gerard 888db7d8a6 button styles fixed
gitea/salix/test This commit looks good Details
2019-02-20 13:49:25 +01:00
Joan Sanchez 646e6c7b46 Disabled delivery-note preview
gitea/salix/dev This commit looks good Details
2019-02-20 13:26:31 +01:00
Carlos Jimenez Ruiz f21b88840c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-20 12:50:02 +01:00
Carlos Jimenez Ruiz ccf5c95b56 #860 E2E client/client/src/web-payment/index.js 2019-02-20 12:49:39 +01:00
Joan Sanchez 29f6b403da Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 12:31:49 +01:00
Joan Sanchez 90092a4f48 fixed treeview order
gitea/salix/dev This commit looks good Details
2019-02-20 12:31:08 +01:00
Gerard 687e000e60 deleted route model as its not longer needed and
gitea/salix/dev This commit looks good Details
2019-02-20 12:25:41 +01:00
Gerard 23e08331fc fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good Details
2019-02-20 12:12:16 +01:00
Gerard b97cb52abe changed traduction of email
gitea/salix/dev This commit looks good Details
2019-02-20 11:52:36 +01:00
Gerard 53891336a6 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 11:42:23 +01:00
Gerard 5d6951a610 deleted deprecated component
gitea/salix/dev There was a failure building this commit Details
2019-02-20 11:41:06 +01:00
Gerard efff9d2184 deleted duplicated data
gitea/salix/dev This commit looks good Details
2019-02-20 11:36:55 +01:00
Gerard 0f5d1e55c0 item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good Details
2019-02-20 11:30:55 +01:00
Joan Sanchez f793ec93df Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 10:07:40 +01:00
Joan Sanchez 20843a9068 updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good Details
2019-02-20 09:59:39 +01:00
Joan Sanchez 6b4fbb180a fixed print styles
gitea/salix/dev This commit looks good Details
2019-02-20 09:29:14 +01:00
Joan Sanchez 40d765adc1 removed fi from worker module
gitea/salix/dev This commit looks good Details
2019-02-20 09:16:19 +01:00
Gerard 3e2dd9cd3a Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 09:00:40 +01:00
Joan Sanchez 031aeae950 fixed styles
gitea/salix/dev This commit has test failures Details
2019-02-20 08:57:51 +01:00
Gerard e3e9998243 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-02-20 08:35:15 +01:00
Gerard 419778f67e now has the proper title directive
gitea/salix/dev This commit looks good Details
2019-02-20 08:26:53 +01:00
Gerard d22a69f546 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-20 08:24:24 +01:00
Gerard c8623ef3da e2e now changes the agency 2019-02-20 08:24:10 +01:00
Joan Sanchez a33a63f866 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-20 07:32:10 +01:00