verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
14,799 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

553 Commits

Author SHA1 Message Date
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
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 7f2af116bc updated translation
gitea/salix/dev This commit looks good Details
2019-11-13 07:04:47 +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
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
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
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
Joan Sanchez a2ea532fc1 refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-31 12:43:04 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Bernat 6477a1458d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-21 07:24:56 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +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
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 08:56:13 +02:00
Joan Sanchez 8f7b01ca11 translation
gitea/salix/dev This commit looks good Details
2019-10-14 11:49:23 +02:00
Joan Sanchez c12ef09d0b translation
gitea/salix/dev This commit looks good Details
2019-10-14 11:47:48 +02:00
Carlos Jimenez Ruiz 4a6ff9ca20 removed useless FIXME comments as per #1782
gitea/salix/dev This commit looks good Details
2019-10-14 10:59:10 +02:00
Joan Sanchez 9358602471 #15 Updated changes width dev
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:03:19 +02:00
Joan Sanchez 4025c624b3 #15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 12:48:12 +02:00
Joan Sanchez 9919f9a46e add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 07:41:24 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Joan Sanchez 73eca9905e fixed #1734 canHaveStowaway validation
gitea/salix/dev This commit looks good Details
2019-09-25 11:26:12 +02:00
Joan Sanchez 2edfb66423 changed fiscal name translation
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:41:02 +02:00
Joan Sanchez 031dbcb63a Unlocked from autocomplete city and postcode fields #1703 2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz 4f99907ee3 includeSubdomains deprecated Use includeSubDomains
gitea/salix/dev There was a failure building this commit Details
2019-09-16 13:13:25 +02:00
Joan Sanchez f0253fd1ce Increased max file size up to 250MB
gitea/salix/dev This commit looks good Details
2019-09-12 14:16:09 +02:00
Joan Sanchez e16d43b2fc Allow disable log on model properties
gitea/salix/dev This commit looks good Details
2019-09-12 09:49:02 +02:00
Bernat 8932aa4e5a Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log 2019-09-10 13:27:41 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev This commit looks good Details
2019-09-06 09:47:58 +02:00
Carlos Jimenez Ruiz b9234fc1a8 #1642 order.summary en el descriptor 2019-08-29 13:16:38 +02:00
Carlos Jimenez Ruiz 6bc92b6ba7 #1294 e2e ticket.descriptor change shipped
gitea/salix/dev This commit looks good Details
2019-08-21 09:32:21 +02:00
Joan Sanchez 41dc5f93e5 Increased max file size to 50MB
gitea/salix/dev This commit looks good Details
2019-08-09 13:14:09 +02:00
Joan Sanchez e09e29707c updated allowed mimeTypes
gitea/salix/dev This commit looks good Details
2019-08-06 07:41:54 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good Details
2019-07-29 13:12:36 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Joan Sanchez 4f73d1eb5a dms fixes
gitea/salix/dev There was a failure building this commit Details
2019-07-16 13:37:25 +02:00
Joan Sanchez 588250b1c1 dms update files
gitea/salix/dev This commit looks good Details
2019-07-15 11:40:11 +02:00
Joan Sanchez daae159b67 fixed file hash generation converting id to string
gitea/salix/dev This commit looks good Details
2019-07-11 08:17:32 +02:00
Joan Sanchez d0e2b6f90a dms storage hash path changed to length 3
gitea/salix/dev This commit looks good Details
2019-07-11 07:54:34 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Carlos Jimenez Ruiz f6ddcdf7cc Enabled all client errors to be displayed 2019-06-27 12:48:47 +02:00
Carlos Jimenez Ruiz 5270693bdd #1387 e2e Ticket Edit sale path
gitea/salix/dev This commit looks good Details
2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good Details
2019-06-25 11:17:58 +02:00
Joan Sanchez dae43bb9b0 transactions refactor #1546
gitea/salix/dev This commit has test failures Details
2019-06-21 08:26:59 +02:00
Joan Sanchez bf6344e463 datasource dms storage path
gitea/salix/dev Something is wrong with the build of this commit Details
2019-06-20 14:37:35 +02:00
Joan Sanchez e45d95ac10 upload dms files into new folder structure #1548
gitea/salix/dev There was a failure building this commit Details
2019-06-20 07:47:03 +02:00
Carlos Jimenez Ruiz 73ccf9a107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz 63febf8bd0 #1537 refactor fixtures + e2e fixes 2019-06-19 09:03:45 +02:00
Juan Ferrer edfa112874 Merge with master
gitea/salix/test This commit looks good Details
2019-06-17 11:33:34 +02:00
Juan Ferrer da01d52756 Secret removed from worker/pbx
gitea/salix/master This commit looks good Details
2019-06-17 11:14:45 +02:00
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 58cc90929f TX fixes, debug disabled, glob transaction timeout
gitea/salix/master This commit looks good Details
2019-06-12 17:31:45 +02:00
Juan Ferrer 3ff95fa45e Remotig debug enabled, log of HTTP 400 disabled
gitea/salix/master This commit looks good Details
2019-06-11 15:46:42 +02:00
Bernat 2504d06bab Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:23:55 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Joan Sanchez 734b659163 fake loopback-storage path
gitea/salix/dev This commit looks good Details
2019-06-06 14:56:01 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
2019-06-06 13:59:11 +02:00
Carlos Jimenez Ruiz 605dabbe19 #1486 back test updateDiscount 2019-06-05 13:39:15 +02:00
Javi Gallego e01765e34e test back-front fixed
gitea/salix/test This commit looks good Details
2019-05-30 08:41:08 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Carlos Jimenez Ruiz a3311f6093 #1250 ticket.line al mover todas las lineas delete 2019-05-24 15:30:50 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449
gitea/salix/dev This commit looks good Details
2019-05-21 12:56:29 +02:00
Carlos Jimenez Ruiz 28057ecf3f #1445 e2e ticket.services
gitea/salix/dev This commit looks good Details
2019-05-20 11:16:56 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360
gitea/salix/dev This commit has test failures Details
2019-05-17 13:27:51 +02:00
Carlos Jimenez Ruiz 809f122f6f #1427 Método rest para comprobar estado de backend
gitea/salix/test This commit looks good Details
2019-05-15 13:51:59 +02:00
Carlos Jimenez Ruiz 48da697582 #1427 Método rest para comprobar estado de backend
gitea/salix/dev This commit has test failures Details
2019-05-15 11:53:57 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour
gitea/salix/dev This commit looks good Details
2019-05-03 12:23:57 +02:00
Carlos Jimenez Ruiz 2ca85394f3 #1385 excluded tests
gitea/salix/dev This commit looks good Details
2019-04-26 16:10:51 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Bernat 94480a8189 #1329 fix test and fixtures, update ticket-service
gitea/salix/dev This commit looks good Details
2019-04-24 07:43:11 +02:00
Bernat 75c9d1122c #1329 ticket.services validation
gitea/salix/dev This commit has test failures Details
2019-04-23 11:25:49 +02:00
Carlos Jimenez Ruiz 2b04eebe84 #1334 E2E ticket.descriptor - Make invoice 2019-04-23 08:58:49 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request
gitea/salix/dev This commit looks good Details
2019-04-18 11:02:28 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315
gitea/salix/dev This commit looks good Details
2019-04-11 09:38:53 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-05 15:20:12 +02:00
Gerard ebe269f41e #1249 ticket.invoice
gitea/salix/dev This commit looks good Details
2019-04-05 12:24:39 +02:00
Gerard 05b23127b4 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-05 08:25:21 +02:00
Joan Sanchez b4f9b2fc3b loggable not saving id fixed
gitea/salix/master This commit looks good Details
2019-04-05 08:23:16 +02:00
Gerard 4861b789f7 Loggable now inserts the correct values for FK values
gitea/salix/master This commit looks good Details
2019-04-04 12:38:54 +02:00
Joan Sanchez d407fc7803 fixed calendar month name display
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:29:23 +02:00
Gerard a23c636c16 #1279 loggable rawSql
gitea/salix/dev This commit looks good Details
2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz b483ccba27 #1228e2e verifiedData solo cuando el NIF correto 2019-04-01 10:00:15 +02:00
Carlos Jimenez Ruiz 0fb95bc8d2 test repairs plus some traductions 2019-03-29 13:14:48 +01:00
Carlos Jimenez Ruiz d2331ccd68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-29 10:51:13 +01:00
Carlos Jimenez Ruiz 14bd970fbc #1265 worker.pbx da error si no tiene extensión 2019-03-29 10:51:02 +01:00
Gerard 280efdae50 #732 Loggable now inserts the correct values for FK values 2019-03-29 07:36:26 +01:00
Gerard eecb907d51 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-14 13:17:39 +01:00
Gerard c889984d77 #1232 loggable inserta datos erroneos fixed
gitea/salix/master This commit looks good Details
2019-03-14 13:13:27 +01:00
Joan Sanchez 92170c34d5 worker department #1133
gitea/salix/dev This commit has test failures Details
2019-03-12 15:04:09 +01:00
Javi Gallego df48041444 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-12 08:49:20 +01:00
Carlos Jimenez Ruiz 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Javi Gallego 159f8fdd6f Quito la traduccion porque ya no existe 2019-03-04 08:34:01 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good Details
2019-03-01 11:50:26 +01:00
Gerard b2a84ab82c datestrings deleted
gitea/salix/dev This commit has test failures Details
2019-03-01 07:31:11 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Gerard 5b4224147e dates fixed
gitea/salix/test This commit looks good Details
2019-02-28 09:20:14 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good Details
2019-02-28 08:55:34 +01:00
Gerard 9a7bd834df date offset fixed
gitea/salix/test This commit looks good Details
2019-02-27 17:04:32 +01:00
Joan Sanchez 331b69963f loggable now works with transactions
gitea/salix/dev This commit looks good Details
2019-02-27 10:56:31 +01:00
Joan Sanchez 4853c8fd60 zone calendar date picker
gitea/salix/test This commit looks good Details
2019-02-26 14:11:30 +01:00
Gerard d404fc92c8 dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good Details
2019-02-26 12:51:01 +01:00
Joan Sanchez 6068ede6ee removed offset from agency module
gitea/salix/test This commit looks good Details
2019-02-25 14:02:47 +01:00
Joan Sanchez 7a7b2c67d0 offset changes
gitea/salix/test This commit looks good Details
2019-02-25 11:55:59 +01:00
Joan Sanchez dd4f4e39fb date offset
gitea/salix/test This commit looks good Details
2019-02-25 11:40:50 +01:00
Joan Sanchez 5ec352b71a fixed vn-mysql time offset
gitea/salix/test This commit looks good Details
2019-02-25 10:04:11 +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 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
Javi Gallego a0cf617cca #498 e2e arreglado
gitea/salix/jgallego This commit looks good Details
2019-02-19 08:42:36 +01:00
Juan Ferrer a21ce7fba1 Fix 2019-02-12 09:24:20 +01:00
Juan Ferrer 7e0ccfcc11 #1107 Back tests from Jenkins 2019-02-11 22:57:48 +01:00
Carlos Jimenez Ruiz b5a1e52bf3 #1051 2019-02-07 14:33:52 +01:00
Carlos Jimenez Ruiz 50399ba325 merge 2019-02-06 16:10:18 +01:00
Carlos Jimenez Ruiz 8aed4013e1 #1051 2019-02-06 16:08:23 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Gerard 6c2fe1d4a3 #1036 order.line 2019-02-05 09:27:01 +01:00
Joan Sanchez 1bcaf27563 changed currency filter, fixed tag value errors 2019-01-31 11:44:03 +01:00
Joan Sanchez a49d937fd9 ita-tag validation error + home shortcuts 2019-01-31 09:47:52 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Juan Ferrer d46575a072 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 16:38:11 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Carlos Jimenez Ruiz 8f7fd03d6e #1035 ticket al borrar falta traduccion 2019-01-29 14:46:21 +01:00
Juan Ferrer af5ab770ec More cleaning, deps in routes.json, module autodetection 2019-01-26 02:30:46 +01:00
Juan Ferrer 8fc8292e72 Obsolete code & files removed 2019-01-25 23:02:29 +01:00
Juan Ferrer 71af7f6d0e #981 Login fixes 2019-01-25 17:05:53 +01:00
Juan Ferrer 013710c6b3 #981 Login bugs fixed, cookies disabled, session remember by default 2019-01-25 12:04:35 +01:00
Juan Ferrer 1ccffd63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:25:57 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Carlos Jimenez Ruiz 648bd46862 small e2e refactors 2019-01-23 15:33:25 +01:00
Juan Ferrer e080802445 #981 Login unified without passing tests 2019-01-23 13:11:44 +01:00
Carlos Jimenez Ruiz 6612d3e3fd traduccion 2019-01-22 16:37:23 +01:00
Carlos Jimenez Ruiz dc46ede513 #1020 modificar e2e ticket.tracking 2019-01-22 15:55:58 +01:00
Joan Sanchez ec1d36f8b9 copy print folder on dockerfile build 2019-01-22 10:57:52 +01:00
Gerard 457e68cd3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 10:04:53 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Joan Sanchez 4e83172dae added print service part 1 #1001 2019-01-22 09:55:35 +01:00
Juan Ferrer 2df9579f2c Summary style fixes 2019-01-20 16:47:04 +01:00
Juan Ferrer 48f11f942e #255 Download invoice PDF bug fixed 2019-01-15 12:04:34 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Juan Ferrer 3f215c5265 Merge branch 'test' into dev 2019-01-09 12:40:44 +01:00
Carlos Jimenez 2e81a86b05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-09 11:11:46 +01:00
Carlos Jimenez 858cdc623f en.js additions 2019-01-09 11:11:37 +01:00
Juan Ferrer 71108144b9 Docker fixes 2019-01-08 20:15:47 +01:00
Gerard bbb242b728 #948 alta de cliente 2019-01-08 08:36:08 +01:00
Gerard 7f745de314 #927 order.basic-data 2019-01-07 16:53:34 +01:00
Juan Ferrer f3a52a9b43 Paths fixed, unused files removed, deploy fixes 2019-01-07 08:41:54 +01:00
Joan 88883c380f getWpAssets() could not access to wpAssetsFound 2019-01-02 08:15:55 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00