Commit Graph

1005 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 7a44a5aab8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-06 09:48:46 +02:00
Carlos Jimenez Ruiz cd6b60015f #1486 back test updateDiscount 2019-06-06 09:48:08 +02:00
Bernat f3558a2d26 #1462 updateVolume backTest
gitea/salix/dev This commit looks good Details
2019-06-06 09:34:45 +02:00
Carlos Jimenez Ruiz 3082ce2556 #1486 back test updateDiscount 2019-06-06 09:34:36 +02:00
Carlos Jimenez Ruiz 55ea445f02 #1486 back test updateDiscount
gitea/salix/dev This commit looks good Details
2019-06-05 15:20:56 +02:00
Carlos Jimenez Ruiz 7bcd4b53e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-05 15:09:00 +02:00
Bernat 082c292ed7 fix updatePrice
gitea/salix/dev This commit looks good Details
2019-06-05 15:05:07 +02:00
Bernat 3a338739d1 Tarea #1462 Route.descriptior Añadir menú - actualizar m3
gitea/salix/dev This commit looks good Details
2019-06-05 13:51:34 +02:00
Carlos Jimenez Ruiz 605dabbe19 #1486 back test updateDiscount 2019-06-05 13:39:15 +02:00
Joan Sanchez 073c457abb Merge branch 'test'
gitea/salix/master This commit looks good Details
2019-06-05 08:56:56 +02:00
Carlos Jimenez Ruiz 05fc1f08a8 renamed vars according to convention 2019-06-05 07:41:20 +02:00
Joan Sanchez d169a66e19 clone zone with calenday days (#1482) & fixed clone hour #1458
gitea/salix/test This commit looks good Details
2019-06-05 07:19:22 +02:00
Javi Gallego 0f5ebf42ec Tarea #1506 worker.pbx quitar campo password
gitea/salix/dev This commit has test failures Details
2019-06-04 12:54:41 +02:00
Bernat 62f4abf6ed Refactor #1418 claim.action Mover casilla mana
gitea/salix/dev This commit looks good Details
2019-06-04 11:00:05 +02:00
Bernat c49f72b36c #1493 Refactorizar el método back /Tickets/deleted
gitea/salix/dev This commit looks good Details
2019-06-03 14:54:03 +02:00
Carlos Jimenez Ruiz 6e2c71eca9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-03 13:36:41 +02:00
Bernat 798d4063ea fix karma test
gitea/salix/dev This commit looks good Details
2019-06-03 12:41:57 +02:00
Carlos Jimenez Ruiz d06d5cd9c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-03 12:00:58 +02:00
Carlos Jimenez Ruiz 9671307688 #1486 back test updateDiscount 2019-06-03 12:00:48 +02:00
Bernat fa7b79b1c8 Bug/Test #1491, #1500 refactor new.js
gitea/salix/dev There was a failure building this commit Details
2019-06-03 10:05:22 +02:00
quique a6a6ea5b06 WorkerTimerControl App
gitea/salix/test This commit looks good Details
2019-06-03 09:41:54 +02:00
quique b034333cdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-03 09:20:35 +02:00
quique 8005b0a892 WorkerTimeControl App 2019-06-03 09:20:20 +02:00
Bernat 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good Details
2019-06-03 08:01:24 +02:00
Joan Sanchez a138465071 moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/master This commit looks good Details
2019-05-31 13:54:15 +02:00
Carlos Jimenez Ruiz a009329bdd removed console logs from spec file
gitea/salix/test This commit looks good Details
2019-05-31 13:54:05 +02:00
Joan Sanchez 5abb82faab moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/test This commit looks good Details
2019-05-31 13:33:37 +02:00
Joan Sanchez 68f67f12d7 moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/dev This commit has test failures Details
2019-05-31 13:28:28 +02:00
Bernat 97459bd7e6 1497
gitea/salix/test This commit looks good Details
2019-05-31 11:33:28 +02:00
Bernat d4a3a1a72e export production structure and fixtures updated
gitea/salix/test This commit looks good Details
2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz ed3024e144 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-30 08:57:38 +02:00
Carlos Jimenez Ruiz 80d5c923cc #1486 back test updateDiscount 2019-05-30 08:57:25 +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
Bernat 24c3b35605 Test #1489 updatePrice backTest skipped
gitea/salix/dev This commit looks good Details
2019-05-30 08:06:52 +02:00
Bernat d742eef7c3 Tarea #1478 item.basicData 2019-05-30 08:04:46 +02:00
Bernat 726d0ab359 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-30 07:53:23 +02:00
Bernat 4f20716fa3 #1489 updatePrice backTest 2019-05-29 14:59:26 +02:00
Carlos Jimenez Ruiz cfcadc4f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Bernat 7a7ea03bff 1485 refactor updatePrice
gitea/salix/dev This commit has test failures Details
2019-05-29 12:41:26 +02:00
Bernat 85761043cd delete console.log
gitea/salix/dev This commit looks good Details
2019-05-29 11:15:08 +02:00
Bernat 84a4b049f0 1453 ticket UpdateDiscount refactor
gitea/salix/dev This commit looks good Details
2019-05-29 11:11:54 +02:00
Joan Sanchez 749c6f1167 clone zone with calenday days (#1482) & fixed clone hour #1458
gitea/salix/master This commit looks good Details
2019-05-28 12:56:40 +02:00
Joan Sanchez 12e0268870 clone zone with calenday days (#1482) & fixed clone hour #1458
gitea/salix/dev This commit looks good Details
2019-05-28 12:55:50 +02:00
Bernat 69434caa52 #1470 update fixtures, client.dms gestdoc
gitea/salix/dev This commit looks good Details
2019-05-28 11:26:54 +02:00
Carlos Jimenez Ruiz 027602e18a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-27 15:10:57 +02:00
Bernat 230516b9d4 #1438 fix test back makeInvoice
gitea/salix/dev This commit looks good Details
2019-05-27 10:01:35 +02:00
Bernat 59069749a2 1461 fix test back
gitea/salix/dev This commit looks good Details
2019-05-27 09:19:23 +02:00
Carlos Jimenez Ruiz 16c8d2fd2a removed service name from end points
gitea/salix/dev This commit looks good Details
2019-05-27 08:46:11 +02:00
Carlos Jimenez Ruiz f2752d9098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-24 15:31:03 +02:00
Carlos Jimenez Ruiz a3311f6093 #1250 ticket.line al mover todas las lineas delete 2019-05-24 15:30:50 +02:00
Javi Gallego f871879ee5 merge fixtures dinamicas para zoneCalendar 2019-05-23 13:33:06 +02:00
Javi Gallego c5743ce37a fallos de tablas 2019-05-23 13:25:26 +02:00
Javi Gallego c311b0ae65 dump y procedimientos volcados 2019-05-23 13:18:15 +02:00
Javi Gallego 94cc7af8b2 merge paso 2 2019-05-23 13:07:59 +02:00
Javi Gallego 3776e0588c merge paso 1 2019-05-23 13:05:02 +02:00
Joan Sanchez e9c2ae073a Clone item without size
gitea/salix/master This commit looks good Details
2019-05-23 11:42:14 +02:00
Joan Sanchez e60ebb283b sms accessType 2019-05-23 11:42:12 +02:00
Joan Sanchez 34542ce12f message send ACL fix #1464
gitea/salix/dev This commit looks good Details
2019-05-23 11:39:14 +02:00
Joan Sanchez f7aeaa707f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-23 11:35:36 +02:00
Bernat ae2fa8d0af 1459 export production to local
gitea/salix/dev This commit looks good Details
2019-05-23 09:31:37 +02:00
Bernat 443feef673 #1456 fixtores for dms and model
gitea/salix/dev This commit looks good Details
2019-05-23 09:30:29 +02:00
Joan Sanchez 318c014fab Clone item without size 2019-05-23 08:03:31 +02:00
Joan Sanchez cc72432a37 accessType refactor #1460
gitea/salix/master This commit looks good Details
2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460
gitea/salix/dev This commit looks good Details
2019-05-22 12:35:24 +02:00
Carlos Jimenez Ruiz 4c8aa7ff6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-22 11:59:14 +02:00
Bernat 1769b03846 1457 client.sample.index
gitea/salix/dev This commit looks good Details
2019-05-22 07:50:08 +02:00
Carlos Jimenez Ruiz bb1c85459e removed unused code 2019-05-21 13:09:30 +02:00
Carlos Jimenez Ruiz fef62d59a5 removed extraneous code 2019-05-21 13:08:25 +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
Bernat bb5c81a3e9 #1409 ticket.weekly add finder
gitea/salix/dev This commit looks good Details
2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz 32555c47d0 #1434 agency.index explota por zoneFk al cargar
gitea/salix/dev This commit looks good Details
2019-05-20 15:04:33 +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
Bernat b86cf1d98a 1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good Details
2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz 8df885b19b removed f from describe
gitea/salix/dev This commit looks good Details
2019-05-16 14:19:14 +02:00
Carlos Jimenez Ruiz c7ad52f7b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz 43bf6b45cf #1260 ticket.service textfield por autocomplete 2019-05-16 14:07:16 +02:00
Joan Sanchez 2ac654fa53 parse scopeDays integer on ticket.index #1439
gitea/salix/master This commit looks good Details
2019-05-16 12:53:49 +02:00
Joan Sanchez 858916e528 remove description properties from item clone 2019-05-16 12:53:40 +02:00
Joan Sanchez a0ffde8ed1 remove description properties from item clone
gitea/salix/dev This commit looks good Details
2019-05-16 12:51:16 +02:00
Joan Sanchez 599084a8be parse scopeDays integer on ticket.index #1439 2019-05-16 12:33:41 +02:00
Joan Sanchez 5c9d06b5d2 edit claim basic data for salesPerson #1433
gitea/salix/master This commit looks good Details
2019-05-16 10:49:27 +02:00
Joan Sanchez ecc335d781 client greuge order by shipped and amount #1431 2019-05-16 10:49:17 +02:00
Joan Sanchez b70316551b edit claim basic data for salesPerson #1433
gitea/salix/dev This commit looks good Details
2019-05-16 09:33:56 +02:00
Joan Sanchez 1ae2512169 client greuge order by shipped and amount #1431 2019-05-16 09:24:13 +02:00
Carlos Jimenez Ruiz fa191af14c #1430 client.balance bug fix and e2e fix
gitea/salix/master This commit looks good Details
2019-05-16 07:07:10 +02:00
Carlos Jimenez Ruiz 417dc511f5 #1430 client.balance bug fix and e2e fix
gitea/salix/dev This commit looks good Details
2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz 41c20d977c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-15 13:07:44 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +02:00
Joan Sanchez 307cffcb58 fixed item clone #1429
gitea/salix/master This commit looks good Details
2019-05-15 13:05:49 +02:00
Joan Sanchez 11ae1dbe7c fixed item clone #1429
gitea/salix/dev This commit looks good Details
2019-05-15 12:57:46 +02:00
Carlos Jimenez Ruiz d358f940a6 #1428 disabled test for the time being
gitea/salix/dev This commit looks good Details
2019-05-15 12:21:46 +02:00
Carlos Jimenez Ruiz ed14f94fd6 small amends
gitea/salix/dev This commit has test failures Details
2019-05-15 08:33:27 +02:00
Joan Sanchez 5cc78ce5ac ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-05-14 08:14:37 +02:00
Joan Sanchez 790577acaf ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures Details
2019-05-14 08:13:04 +02:00
Carlos Jimenez Ruiz 18d0aa9282 #1398 Test unitarios de filtros
gitea/salix/dev This commit has test failures Details
2019-05-13 14:34:37 +02:00
Joan Sanchez eae6a6f43c show spinner on load for table & catalog components #1424
gitea/salix/dev This commit looks good Details
2019-05-10 14:42:46 +02:00
Carlos Jimenez Ruiz da04d409a3 #1415 implementar color legend en worker.calendar
gitea/salix/dev This commit has test failures Details
2019-05-10 13:16:37 +02:00
Bernat e6d6e63255 1413 ticket.summary refactor checkbox triple state
gitea/salix/dev This commit looks good Details
2019-05-09 14:40:59 +02:00
Javi Gallego 0d0f354902 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-09 11:25:51 +02:00
Javi Gallego ac5b17be31 ticket View 2019-05-09 11:25:46 +02:00
Bernat 1f128797c3 export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good Details
2019-05-09 09:32:04 +02:00
Carlos Jimenez Ruiz c9521d1024 #1407 email core francia LCR 2019-05-08 10:42:26 +02:00
Bernat e43b7be526 1397 client.descriptor change icon to icon-basketadd
gitea/salix/dev This commit looks good Details
2019-05-07 11:55:47 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good Details
2019-05-07 11:32:35 +02:00
Bernat 86e0d66f55 #926 update fixtures and model claimState
gitea/salix/dev This commit looks good Details
2019-05-07 08:18:14 +02:00
Joan Sanchez 8161ef2d7c create zone with zero bonus, price, travelingDays
gitea/salix/dev This commit looks good Details
2019-05-06 07:41:28 +02:00
Joan Sanchez 4aff31a165 fixed update discount
gitea/salix/dev This commit looks good Details
2019-05-06 07:40:59 +02:00
Carlos Jimenez Ruiz 8771098045 #1350 route.index
gitea/salix/dev This commit looks good Details
2019-05-03 18:23:44 +02:00
Carlos Jimenez Ruiz b60ee825ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-03 17:38:47 +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 28a69c8d2b #1350 route.index 2019-05-02 13:25:41 +02:00
Carlos Jimenez Ruiz 46756dfdcb #1351 e2e order.catalog 2019-05-02 11:41:24 +02:00
Joan Sanchez 0dbed4e102 fixed translation
gitea/salix/dev This commit looks good Details
2019-05-02 10:40:46 +02:00
Joan Sanchez a2fd8ddc8a buy requests translation & default order
gitea/salix/dev This commit looks good Details
2019-05-02 10:04:02 +02:00
Joan Sanchez 2b7287dabb added ticket.dms #1373
gitea/salix/dev This commit looks good Details
2019-05-01 18:49:39 +02:00
Joan Sanchez 3615fe36a8 removed template strings
gitea/salix/dev This commit looks good Details
2019-04-30 14:25:07 +02:00
Bernat c68015fb88 1341 invoiceOut.descriptor asentar factura
gitea/salix/dev This commit looks good Details
2019-04-30 11:47:39 +02:00
Joan Sanchez c8bf9d0d7b fixed worker calendar error for local holidays
gitea/salix/dev This commit looks good Details
2019-04-30 11:43:26 +02:00
Joan Sanchez 1a524e33b1 regenerate invoiceOut ACL
gitea/salix/dev This commit looks good Details
2019-04-30 11:29:57 +02:00
Bernat a81e705251 #1341 invoiceOut.descriptor book invoiceOut
gitea/salix/dev This commit looks good Details
2019-04-30 11:03:48 +02:00
Joan Sanchez a572130b6c propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit Details
2019-04-30 08:00:27 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374
gitea/salix/dev This commit looks good Details
2019-04-29 11:49:43 +02:00
Bernat a8a5193a86 1389 update fixtures for invoiceOut and fix test
gitea/salix/dev This commit looks good Details
2019-04-29 11:40:54 +02:00