Commit Graph

1029 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz b9234fc1a8 #1642 order.summary en el descriptor 2019-08-29 13:16:38 +02:00
Bernat b656db3a84 #1645 refactor search panel
gitea/salix/dev This commit looks good Details
2019-08-29 08:32:46 +02:00
Bernat 6daabed202 #1645 first part, delete hasVisible
gitea/salix/dev This commit looks good Details
2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz 5e69fc0aa5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-08-28 08:10:49 +02:00
Carlos Jimenez Ruiz 5e3b8fe1f0 #1648 claim.detail add cambiar campos 2019-08-28 08:08:30 +02:00
Bernat 15097313a2 #1651 worker.json
gitea/salix/dev This commit looks good Details
2019-08-27 11:12:17 +02:00
Carlos Jimenez Ruiz 11b99d9a5f #1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good Details
2019-08-20 14:18:32 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit Details
2019-08-19 07:56:20 +02:00
Bernat 4032bde243 fix bug ticket.sale
gitea/salix/dev This commit looks good Details
2019-08-13 14:03:02 +02:00
Bernat d9c63e3bc0 Tarea #1501 ticket / delete
gitea/salix/dev This commit looks good Details
2019-08-13 12:44:34 +02:00
Bernat b749cb80df Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good Details
2019-08-13 07:45:29 +02:00
Bernat f05f3a3df7 Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good Details
2019-08-12 14:58:46 +02:00
Bernat d08a43bc23 #1630 state.isEditable
gitea/salix/dev This commit looks good Details
2019-08-12 13:28:27 +02:00
Bernat 2e89af9795 #1630 state.isEditable
gitea/salix/dev This commit has test failures Details
2019-08-12 13:26:44 +02:00
Bernat b6cc769df3 Test #1636 refactor test de back isEditable y editableState
gitea/salix/dev This commit has test failures Details
2019-08-12 12:31:31 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251
gitea/salix/dev This commit looks good Details
2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Bernat 2f1472b9ee Tarea #1574
gitea/salix/dev This commit looks good Details
ticket.sale editableState
2019-08-08 08:33:27 +02:00
Bernat 8f519fd15b Bug #900 Ticket.picture lineas vacias cuando no tiene tags
gitea/salix/dev This commit looks good Details
2019-08-07 09:58:05 +02:00
Bernat fa4fd15450 Tarea #1573 order.catalog No deben de mostrar familias vacias 2019-08-07 07:27:00 +02:00
Bernat 7e1eba53f1 Refactor #1627 worker.timeControl 2019-08-06 12:25:53 +02:00
Joan Sanchez 3d88d41bd0 fixed fiscal data postcode selection
gitea/salix/dev There was a failure building this commit Details
2019-08-06 12:07:48 +02:00
Joan Sanchez e52a0ac5da ticket.sale split show active tickets
gitea/salix/dev There was a failure building this commit Details
2019-08-06 07:36:26 +02:00
Joan Sanchez 2c71a983e3 postcode autocompletion fixes
gitea/salix/dev This commit looks good Details
2019-08-02 08:27:55 +02:00
Joan Sanchez efeba38fb4 back errors fixed
gitea/salix/dev There was a failure building this commit Details
2019-08-01 11:52:53 +02:00
Joan Sanchez 31b5f689df timeControl calendar fixed #1623
gitea/salix/dev This commit looks good Details
2019-08-01 09:58:59 +02:00
Bernat 098dd7b235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-07-31 10:45:03 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures Details
2019-07-31 09:50:47 +02:00
Bernat 116a34d04a fix test 2019-07-31 09:17:26 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures Details
2019-07-31 07:46:24 +02:00
Joan Sanchez 82d3ac27cf ticket basicData change zone on date update
gitea/salix/dev This commit looks good Details
2019-07-30 12:43:21 +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 f4a3b8e9b2 client.create not showing all postcodes, changed autocomplete #1619
gitea/salix/dev This commit looks good Details
2019-07-26 13:05:22 +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
Carlos Jimenez Ruiz c2573d6853 css amends for item-request
gitea/salix/dev This commit has test failures Details
2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz e1cbf781e1 #1608 item.request
gitea/salix/dev This commit has test failures Details
2019-07-25 09:55:09 +02:00
Joan Sanchez 6d5412227a Changed invoiceOut pdf to hasPdf
gitea/salix/dev This commit has test failures Details
2019-07-24 12:42:33 +02:00
Bernat 8089c32ec2 Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good Details
2019-07-23 14:56:57 +02:00
Bernat 97f2229090 Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good Details
2019-07-23 11:15:06 +02:00
Bernat 16257e9918 fix test front
gitea/salix/dev There was a failure building this commit Details
2019-07-23 07:36:10 +02:00
Bernat 6a23a5429c Tarea #1562 ticket.line isEditable
gitea/salix/dev There was a failure building this commit Details
2019-07-22 13:14:00 +02:00
Joan Sanchez 85049c126b catalogFilter show items without color
gitea/salix/dev This commit looks good Details
2019-07-19 09:25:59 +02:00
Joan Sanchez 970c8ab5ec show dms order number #1601
gitea/salix/dev This commit looks good Details
2019-07-19 08:13:52 +02:00
Joan Sanchez 51734db404 ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit Details
2019-07-17 15:01:38 +02:00
Joan Sanchez f56423bac9 disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good Details
2019-07-17 10:55:58 +02:00
Joan Sanchez c51c4383ce fixed unit tests
gitea/salix/dev This commit looks good Details
2019-07-17 07:39:08 +02:00
Joan Sanchez e99bae89b4 fixed e2e tests
gitea/salix/dev There was a failure building this commit Details
2019-07-17 07:33:46 +02:00
Joan Sanchez 145e596d16 fixed dms unit tests
gitea/salix/dev This commit has test failures Details
2019-07-16 14:12:58 +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 3c3f4bfeae address.edit fixed location autocompletion
gitea/salix/dev This commit has test failures Details
2019-07-16 08:26:57 +02:00
Joan Sanchez 72fcf807b0 7z mimetype
gitea/salix/dev This commit has test failures Details
2019-07-16 07:22:29 +02:00
Joan Sanchez b85aa6d3da fixed icons column size
gitea/salix/dev This commit has test failures Details
2019-07-15 13:20:50 +02:00
Joan Sanchez dae49f52b6 removed download file conditional
gitea/salix/dev This commit looks good Details
2019-07-15 11:56:17 +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 23f5ff0c5c merge
gitea/salix/dev Something is wrong with the build of this commit Details
2019-07-12 14:02:38 +02:00
Joan Sanchez c21532e5f7 ticket.index filters
gitea/salix/master This commit looks good Details
2019-07-12 14:00:32 +02:00
Joan Sanchez eefa4b9f5b apply default filters
gitea/salix/master This commit looks good Details
2019-07-12 12:56:00 +02:00
Joan Sanchez 6b9286d1b0 fixed ticket.index
gitea/salix/master This commit looks good Details
2019-07-12 12:32:02 +02:00
Joan Sanchez c4fcaeb908 ticket.index filter by date if no filters were entered
gitea/salix/master This commit looks good Details
2019-07-12 12:20:55 +02:00
Joan Sanchez 29744c52f3 fixed ticket.index
gitea/salix/master This commit looks good Details
2019-07-12 11:43:10 +02:00
Joan Sanchez e135ae039a changed closure field
gitea/salix/dev This commit looks good Details
2019-07-12 09:42:06 +02:00
Joan Sanchez 25014654b1 changed closure field
gitea/salix/master This commit looks good Details
2019-07-12 09:39:59 +02:00
Joan Sanchez 659a441f47 ticket index show zone closure hour
gitea/salix/master This commit looks good Details
2019-07-12 09:29:22 +02:00
Joan Sanchez 6634cdf059 ticket.index show zone hour & minute. Show only tickets from today 2019-07-12 09:29:16 +02:00
Joan Sanchez 14a69e47c9 ticket index show zone closure hour
gitea/salix/dev This commit looks good Details
2019-07-12 09:06:19 +02:00
Joan Sanchez 2a6de77e17 ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit Details
2019-07-12 08:49:44 +02:00
Joan Sanchez 1b8a407916 show expeditions fix
gitea/salix/master This commit looks good Details
2019-07-11 11:21:12 +02:00
Joan Sanchez 62ef2dccd8 show expeditions fix
gitea/salix/dev This commit looks good Details
2019-07-11 11:20:41 +02:00
Joan Sanchez 8ecc88b516 hide download button for dms without a file attached #1590
gitea/salix/master This commit looks good Details
2019-07-11 09:54:42 +02:00
Joan Sanchez 3ce59c0b73 hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good Details
2019-07-11 09:53:16 +02:00
Joan Sanchez cb23fd28fa updated unit tests 2019-07-11 07:18:07 +02:00
Joan Sanchez 8a5e0c5402 Notify password changes #1588 2019-07-11 07:06:53 +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
Bernat b98b534eec Tarea #1583 exportar produccio a la local
gitea/salix/dev This commit looks good Details
2019-07-05 14:16:33 +02:00
Joan Sanchez 8ec61bf31f fixed unit test for weekends
gitea/salix/dev This commit looks good Details
2019-07-05 11:18:08 +02:00
Bernat 061f0cb39c Refactor #1581 client.balance.create
gitea/salix/dev This commit looks good Details
2019-07-04 10:34:19 +02:00
Carlos Jimenez Ruiz fc80848506 merge 2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz ea5cbf634b #1392 order.catalog 2019-07-03 14:39:08 +02:00
Bernat 82a1d00b0c Tarea #1516 order.index buscador avanzado añadir mi equipo
gitea/salix/dev This commit looks good Details
2019-07-03 14:06:27 +02:00
Carlos Jimenez Ruiz a35533687f removed unused spec files
gitea/salix/dev This commit looks good Details
2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz a2a9dfd7e5 #1567 refactor logs - worker descriptor 2019-07-03 11:08:44 +02:00
Bernat 65ec629221 Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse 2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz 4b0a71644f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-07-02 14:44:39 +02:00
Carlos Jimenez Ruiz 4ac419b419 #1528 e2e claim/detail 2019-07-02 14:44:36 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz bd76840cb3 #1446 e2e ticket.summary
gitea/salix/dev This commit looks good Details
2019-06-27 15:33:15 +02:00
Bernat fb2545994c Refactor #1563 fixtures item
gitea/salix/dev This commit looks good Details
2019-06-27 12:38:30 +02:00
Joan Sanchez 507bc8c2ce updated fonts & calendar acls
gitea/salix/dev This commit looks good Details
2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz 8c26a89516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-27 09:44:29 +02:00
Carlos Jimenez Ruiz a7c5a9e598 #1566 ticket.sales state autocomplete 2019-06-27 09:44:19 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good Details
2019-06-27 09:03:03 +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 c352a12d49 merge 2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz d27402d4e6 #1558 ticket.sales mark/unmark as reserved 2019-06-26 13:56:40 +02:00
Joan Sanchez 8ff61a5d3a added zone prices, radio-group and calendar refactor #1320
gitea/salix/dev This commit looks good Details
2019-06-26 13:35:38 +02:00
Javi Gallego b0c34f8e29 #1564 client.summary defaulting cantidad
gitea/salix/dev This commit looks good Details
2019-06-26 12:18:47 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-06-25 14:00:55 +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
Bernat 1227f7ac83 Test #1549 Arreglar test de back
gitea/salix/dev This commit looks good Details
2019-06-21 13:19:51 +02:00
Bernat 5c152f8813 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-21 11:50:36 +02:00
Joan Sanchez 340e7b8495 round worker calendar holidays #1547
gitea/salix/dev This commit has test failures Details
2019-06-21 09:56:39 +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
Bernat 7f2b61b39c Test #1549 fix back test 2019-06-21 07:50:56 +02:00
Javi Gallego 289f588923 #1550 ticket.descriptor polizon cambia estado
gitea/salix/dev This commit has test failures Details
2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz 7d0c42c077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-20 14:41:58 +02:00
Carlos Jimenez Ruiz 594268183b #1517 ticket.index 2019-06-20 14:35:47 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533
gitea/salix/dev There was a failure building this commit Details
2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz 9162ef9c1e #1517 ticket.index hot fix 2019-06-20 11:31:03 +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 6e029a3623 merged test fix
gitea/salix/dev This commit has test failures Details
2019-06-19 15:30:04 +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 560cce7c8c #1537 refactor fixtures 2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz 63febf8bd0 #1537 refactor fixtures + e2e fixes 2019-06-19 09:03:45 +02:00
Bernat 1336bf092d Test #1540 Reparar test back db
gitea/salix/dev This commit looks good Details
2019-06-19 07:20:02 +02:00
Bernat c3f5b2c4dd Bug/Test #1543 ticket.request.create precio con decimales
gitea/salix/dev This commit looks good Details
2019-06-18 12:09:43 +02:00
Bernat 82ab9e5ac5 Tarea #1534 Paginar consignatarios
gitea/salix/dev This commit looks good Details
2019-06-18 09:34:32 +02:00
Bernat c02d576bb9 erese a fdescribe
gitea/salix/dev This commit looks good Details
2019-06-18 07:57:41 +02:00
Bernat 53f6db7a4a Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice
gitea/salix/dev This commit looks good Details
2019-06-17 12:13:05 +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
Joan Sanchez 3bd12492b0 updated karma unit test
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-06-17 08:16:25 +02:00
Joan Sanchez 471da18a6c optional bank entity code #1416
gitea/salix/dev There was a failure building this commit Details
2019-06-17 08:14:48 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Bernat 5203c33483 Bug #1463 Las reclamaciones no se eliminan por completo
gitea/salix/dev This commit looks good Details
2019-06-14 09:29:23 +02:00
Juan Ferrer ced4578f75 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-06-14 08:33:44 +02:00
Joan Sanchez a9aaa3329a fixed worker calendar
gitea/salix/dev This commit looks good Details
2019-06-14 08:17:12 +02:00
Joan Sanchez 9a18d0bd8c fixed worker calendar
gitea/salix/master This commit looks good Details
2019-06-14 08:15:14 +02:00
Carlos Jimenez Ruiz a0f0230e76 #1437 unitarios back guessPriority 2019-06-13 14:31:55 +02:00
Joan Sanchez 32df2373f7 Order zone by hour
gitea/salix/dev This commit looks good Details
2019-06-13 13:49:07 +02:00
Joan Sanchez 9c00e7e67c Autocomplete geolocation from postcode #1519 and #1531
gitea/salix/dev This commit looks good Details
2019-06-13 13:08:11 +02:00
Juan Ferrer 91174d1c8e fdescribe removed, SQL refactor
gitea/salix/master This commit looks good Details
2019-06-13 11:47:32 +02:00
Juan Ferrer 03205e01ae NPM fix, fdescribe removed
gitea/salix/dev This commit looks good Details
2019-06-13 09:49:36 +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
Carlos Jimenez Ruiz 921af523f8 #1526 refactor fixtures 2019-06-12 11:38:31 +02:00
Bernat a6951bc0a1 Tarea #1419 claim.detail permitir modificar descuento
gitea/salix/dev This commit looks good Details
2019-06-12 08:19:02 +02:00
Bernat 4729a7e9a9 Bug #1514 route.volume No actualiza el volumen
gitea/salix/dev This commit looks good Details
2019-06-11 12:25:17 +02:00
Bernat 5ce33fbefd Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:25:02 +02:00
Bernat 2504d06bab Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz a8b9e2c374 #1435 unitarios back hasActiveRecovery
gitea/salix/dev This commit looks good Details
2019-06-11 08:54:03 +02:00
Carlos Jimenez Ruiz 0c9b4bbe87 #1436 unitarios back invoiceOut/download
gitea/salix/dev This commit looks good Details
2019-06-11 07:06:49 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure
gitea/salix/dev This commit looks good Details
2019-06-07 13:07:23 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Joan Sanchez 372ad15f26 zone add buttons show only for deliveryBoss #1480
gitea/salix/dev This commit looks good Details
2019-06-07 09:09:29 +02:00
Bernat ea38ff221d #1467 ticket filter with hours
gitea/salix/dev This commit looks good Details
2019-06-07 07:45:12 +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
Bernat 217b08cd0a Tarea #1509 route/ticket/delete ticket
gitea/salix/dev This commit looks good Details
2019-06-06 13:50:12 +02:00