Commit Graph

1350 Commits

Author SHA1 Message Date
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 5d63a14b15 transactions refactor #1546
gitea/salix/test This commit looks good Details
2019-06-21 10:00:00 +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 7c23f92957 round worker calendar holidays #1547
gitea/salix/test This commit looks good Details
2019-06-21 09:54:42 +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
Joan Sanchez 19dc0c80b8 upload dms files into new folder structure #1548
gitea/salix/test This commit looks good Details
2019-06-20 07:46:30 +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
Carlos Jimenez Ruiz 85dc6e51af #1258 ticket.index sumatorio removed unused code
gitea/salix/dev This commit looks good Details
2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz 774d8524cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz 10669f01f3 #1258 ticket.index sumatorio unit test fixed 2019-04-29 10:21:36 +02:00
Bernat 5bc6f5107e #1370 ticket.descriptor change shipped hour
gitea/salix/dev This commit looks good Details
2019-04-29 07:48:59 +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 ed8705a50c #1340 invoiceOut.descriptor delete invoiceOut
gitea/salix/dev This commit looks good Details
2019-04-26 12:05:49 +02:00
Joan Sanchez 16bf0b3448 regenerate invoice #1342
gitea/salix/dev This commit looks good Details
2019-04-26 08:52:43 +02:00
Javi Gallego 24fedff62f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-25 18:30:17 +02:00
Javi Gallego a920bc1d8f tablas dms 2019-04-25 18:30:11 +02:00
Bernat fabe4f396f #1371 claim descriptor hour
gitea/salix/dev This commit looks good Details
2019-04-25 14:51:22 +02:00
Carlos Jimenez Ruiz 3cb7319efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-25 14:24:08 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Joan Sanchez 4465f48afe fix search by string barcode #1381
gitea/salix/dev This commit looks good Details
2019-04-25 13:51:34 +02:00
Joan Sanchez aec46bb855 fix send notification to salesPerson #1382
gitea/salix/dev This commit looks good Details
2019-04-25 13:32:14 +02:00
Carlos Jimenez Ruiz 8384a6cb2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-25 09:26:52 +02:00
Javi Gallego 59e8990db9 bug solved
gitea/salix/dev This commit looks good Details
2019-04-25 09:26:42 +02:00
Carlos Jimenez Ruiz da925eb9b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-25 08:28:33 +02:00
Carlos Jimenez Ruiz e11d33eb27 worker descriptor refactor 2019-04-25 08:28:23 +02:00
Carlos Jimenez Ruiz 4e5c6ff882 #1356 advanced search refactor 2019-04-25 08:28:08 +02:00
Javi Gallego 47e55580ad #1258 ticket.index sumatorio
gitea/salix/dev This commit looks good Details
2019-04-25 07:57:26 +02:00
Bernat 0eabd9876d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-24 11:36:43 +02:00
Bernat 4ac36e6bf2 #1362 ticket.packaging negative quantity 2019-04-24 11:36:13 +02:00
Joan Sanchez d88e2e81ca update ticket line discount until invoiced #1365
gitea/salix/dev This commit looks good Details
2019-04-24 11:23:24 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Joan Sanchez 6747a80943 fixed available/visible icon on ticket sales #1363
gitea/salix/dev This commit looks good Details
2019-04-24 09:54:25 +02:00
Joan Sanchez 00c11a95c6 fixed catalog filter bugs #1352
gitea/salix/dev This commit looks good Details
2019-04-24 09:21:24 +02:00
Bernat b2f88872fa #1366 bug in claim-index
gitea/salix/dev This commit looks good Details
2019-04-24 09:10:56 +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
Carlos Jimenez Ruiz a6fa9f98fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-23 13:30:43 +02:00
Carlos Jimenez Ruiz 8d5cc93ddb #1359 refactor absences 2019-04-23 13:29:52 +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 5501ff8f4f test repairs
gitea/salix/dev This commit has test failures Details
2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz c2badeacd0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-23 09:04:30 +02:00
Carlos Jimenez Ruiz 2b04eebe84 #1334 E2E ticket.descriptor - Make invoice 2019-04-23 08:58:49 +02:00
Joan Sanchez 76269a8a16 added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures Details
2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz 0176fbc2d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-18 11:47:41 +02:00
Carlos Jimenez Ruiz fb30a01fde #1348 invoiceOut.summary 2019-04-18 11:47:31 +02:00
Carlos Jimenez Ruiz 2107b57764 small typo 2019-04-18 11:12:48 +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
Carlos Jimenez Ruiz 2876f19101 #1348 invoiceOut.summary 2019-04-17 11:44:00 +02:00
Carlos Jimenez Ruiz e34cb8ce84 #1351 e2e order.catalog
gitea/salix/dev This commit looks good Details
2019-04-17 09:37:55 +02:00
Carlos Jimenez Ruiz bafbd92802 Bug/Test #1331 cambio de rol
gitea/salix/dev This commit looks good Details
2019-04-17 08:21:58 +02:00
Carlos Jimenez Ruiz 1f5fe891e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-17 07:16:13 +02:00
Carlos Jimenez Ruiz d52f5077b0 #1306 Renombrar controladores, rutas y carpeta 2019-04-16 15:00:21 +02:00
Carlos Jimenez Ruiz 9baa37b833 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 14:30:01 +02:00
Carlos Jimenez Ruiz 85851e7a33 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 13:40:26 +02:00
Bernat 9a86929e3a #1344 create test for worker filter
gitea/salix/dev This commit looks good Details
2019-04-16 13:10:06 +02:00
Carlos Jimenez Ruiz 5770bed5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 12:44:12 +02:00
Bernat 54f65a9227 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 12:21:58 +02:00
Joan Sanchez 842101e239 fixed catalog price popover
gitea/salix/dev This commit looks good Details
2019-04-16 12:11:06 +02:00
Carlos Jimenez Ruiz a326fd2a65 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 11:32:45 +02:00
Carlos Jimenez Ruiz 02c63b0d5f refactor tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:46:59 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Bernat 97f3761e0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 08:36:16 +02:00
Joan Sanchez 6573e61a7c fixed karma tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:21:20 +02:00
Javi Gallego ce2615e2d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-16 08:09:20 +02:00
Javi Gallego 28bbc024b2 #1195 claim.action regularize 2019-04-16 08:09:16 +02:00
Bernat 0d680bdaed #1343 update worker filter 2019-04-16 07:59:29 +02:00
Joan Sanchez f814584f6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-16 07:59:15 +02:00
Joan Sanchez 90bbe1bd02 Log sent sms #1324 2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz 9c596b06c8 merge
gitea/salix/dev This commit looks good Details
2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz 82ed0078d2 #1339 Print - Hoja de rutas 2019-04-15 14:34:33 +02:00
Bernat a68174c456 #1337 refactor checkbox in ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-15 14:21:52 +02:00
Bernat 6a68003d84 #1212 refactor claim filter
gitea/salix/dev This commit looks good Details
2019-04-15 11:06:42 +02:00
Joan Sanchez 79f9dfb515 error when sending to a salesPerson pay-method changes #1338
gitea/salix/dev This commit looks good Details
2019-04-15 08:46:20 +02:00
Joan Sanchez b5fe7a6fae restore fixtures makeInvoice
gitea/salix/dev This commit looks good Details
2019-04-12 14:53:17 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310
gitea/salix/dev This commit has test failures Details
2019-04-12 13:54:31 +02:00
Javi Gallego 6eef192929 añade opcion mana con permisos
gitea/salix/dev This commit looks good Details
2019-04-11 12:44:43 +02:00
Joan Sanchez 2f38f6e88f Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-11 11:34:25 +02:00
Joan Sanchez 84151d6527 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-04-11 11:24:46 +02:00
Joan Sanchez bed6721643 changed credit min value to zero
gitea/salix/master This commit looks good Details
2019-04-11 11:24:10 +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
Joan Sanchez 7c3052d17b fixed input time & input number
gitea/salix/master This commit looks good Details
2019-04-11 07:42:27 +02:00
Joan Sanchez da473c921d input time refactor #1292
gitea/salix/master This commit looks good Details
2019-04-11 07:32:58 +02:00
Joan Sanchez 3d71165682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-11 07:29:43 +02:00
Joan Sanchez 1e06a19884 input time refactor #1292 2019-04-11 07:29:41 +02:00
Javi Gallego 50d70f0f6f Tarea #1259 crear modelo ticketServiceType 2019-04-10 14:44:41 +02:00
Joan Sanchez 49ef341eb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 12:04:22 +02:00
Joan Sanchez 6f98d81db1 fixed input time 2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz e9102249be #1328 module home refactor
gitea/salix/dev This commit looks good Details
2019-04-10 11:49:39 +02:00
Carlos Jimenez Ruiz 9db389329d renamed the it statement 2019-04-10 10:53:00 +02:00
Carlos Jimenez Ruiz a248f722a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-10 10:43:19 +02:00
Carlos Jimenez Ruiz 98e704adf8 #1326 enlazar en ticket.descriptor tres puntos 2019-04-10 10:43:11 +02:00
Bernat 2be3481138 #1309 add icon in routes module
gitea/salix/dev This commit looks good Details
2019-04-10 10:02:28 +02:00
Joan Sanchez 20ba05a655 item filter by id or barcode 2019-04-10 09:32:29 +02:00
Joan Sanchez b3c00e5a29 updated td-editable styles #1313
gitea/salix/dev This commit looks good Details
2019-04-09 13:47:13 +02:00
Joan Sanchez 9ce1e93da7 changed worker holidays length 2019-04-09 13:38:02 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Carlos Jimenez Ruiz 26ba8b2463 #1312 InvoiceOut.descriptor
gitea/salix/dev Something is wrong with the build of this commit Details
2019-04-08 16:53:37 +02:00
Joan Sanchez 33e6467c44 fixed zone descriptor
gitea/salix/dev There was a failure building this commit Details
2019-04-08 10:57:01 +02:00
Joan Sanchez d0dc192fc4 navigate to next claim section for salesAssistant #1119
gitea/salix/dev This commit has test failures Details
2019-04-08 09:01:10 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz c9cd1b19dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-05 13:59:22 +02:00
Joan Sanchez c312374c3e added sms back unit test
gitea/salix/dev There was a failure building this commit Details
2019-04-05 13:58:50 +02:00
Carlos Jimenez Ruiz 2ba91a6cc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-05 13:20:47 +02:00
Carlos Jimenez Ruiz 837a7b08cc #1300-1301 client.risk 2019-04-05 13:20:34 +02:00
Gerard ebe269f41e #1249 ticket.invoice
gitea/salix/dev This commit looks good Details
2019-04-05 12:24:39 +02:00
Gerard d7c063f389 removed unused binding 2019-04-05 09:27:43 +02:00
Gerard 00b7442b89 #1247 reparar tests excluidos
gitea/salix/dev This commit looks good Details
2019-04-05 07:52:08 +02:00
Gerard cfdeb387a1 #1241 routes.tickets
gitea/salix/dev This commit looks good Details
2019-04-04 13:06:41 +02:00
Gerard 93bca3b3f0 merge master
gitea/salix/dev This commit looks good Details
2019-04-04 12:47:02 +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
Gerard d1a179c1c3 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 12:09:57 +02:00
Gerard 9abaa8ce51 bug sending messages to buyers fixed
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-04-04 12:05:01 +02:00
Joan Sanchez c4c5c67b18 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 11:54:25 +02:00
Joan Sanchez bb039386f2 fixed input focus #1302
gitea/salix/master This commit looks good Details
2019-04-04 11:53:13 +02:00
Carlos Jimenez Ruiz 11c6939ad4 traduccion de invoice out
gitea/salix/dev There was a failure building this commit Details
2019-04-03 15:32:21 +02:00
Carlos Jimenez Ruiz 09288c2c12 merge 2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270
ticket.index advanced search mostrar dias en el futuro
2019-04-03 15:16:32 +02:00
Joan Sanchez afafbdda95 fixed back unit test
gitea/salix/dev This commit looks good Details
2019-04-03 14:04:25 +02:00
Joan Sanchez 4ecc1f445a added filter from-to on routes index #1296
gitea/salix/dev This commit has test failures Details
2019-04-03 13:51:14 +02:00
Joan Sanchez ccb2505896 Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:58:59 +02:00
Joan Sanchez eea4f53151 removed field acl for buyer on item tags
gitea/salix/master This commit looks good Details
2019-04-03 12:58:30 +02:00
Joan Sanchez 0a0aa3853a Merge branch 'master' into dev
gitea/salix/dev This commit has test failures Details
2019-04-03 12:48:21 +02:00
Joan Sanchez 1e99a890e2 allow item tags for accessory role
gitea/salix/master This commit looks good Details
2019-04-03 12:47:51 +02:00
Joan Sanchez f8035c9777 fixed calendar front unit tests
gitea/salix/dev This commit has test failures Details
2019-04-03 12:39:24 +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
Joan Sanchez e433828f7c Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 11:55:18 +02:00
Joan Sanchez 892e267a16 fixed worker calendar total holidays #1299
gitea/salix/master This commit looks good Details
2019-04-03 11:36:10 +02:00
Joan Sanchez f337799e39 tests & refactor calendar component #811 2019-04-03 11:34:58 +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 b86c1afa79 re-activated preview on invoiceout index
gitea/salix/dev This commit looks good Details
2019-04-02 12:32:15 +02:00
Carlos Jimenez Ruiz ef53d60c94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-02 11:05:16 +02:00
Carlos Jimenez Ruiz 570e2b5732 #1243 ticket.log columna worker 2019-04-02 11:04:53 +02:00
Joan Sanchez eb67dffd35 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-02 10:57:30 +02:00
Joan Sanchez a0a6c49349 order filter sort by created desc
gitea/salix/test This commit looks good Details
2019-04-02 10:56:24 +02:00
Joan Sanchez 0f2d9ade57 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-02 10:06:16 +02:00
Joan Sanchez a44bb2a13c route index order by created desc
gitea/salix/test This commit looks good Details
2019-04-02 10:05:56 +02:00
Joan Sanchez a36c50b324 merge
gitea/salix/dev There was a failure building this commit Details
2019-04-02 09:51:05 +02:00
Joan Sanchez 8bd4d25e2e route index order by date desc
gitea/salix/test This commit looks good Details
2019-04-02 09:44:03 +02:00
Joan Sanchez c0e52c475f hide invoiceOut preview
gitea/salix/test This commit looks good Details
2019-04-02 09:15:47 +02:00
Javi Gallego 0b977d3b0b #1293 ticket.components solo muestra base
gitea/salix/dev This commit looks good Details
2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz 056c07b17c #1181 No modificar ticket.basicData en reparto
gitea/salix/dev This commit looks good Details
2019-04-01 15:04:09 +02:00
Carlos Jimenez Ruiz 62acb534e1 #1181 No modificar ticket.basicData en reparto 2019-04-01 14:49:12 +02:00
Joan Sanchez 3f1889daa3 fix open client card from ticket descriptor #1291
gitea/salix/dev This commit looks good Details
2019-04-01 09:48:22 +02:00
Joan Sanchez 48cd9e2919 price fixes
gitea/salix/dev This commit looks good Details
2019-04-01 09:13:24 +02:00
Gerard 03d8e96deb Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-01 09:03:33 +02:00
Gerard 66d94dde3a claim detail now adds a sale with its total quantity
gitea/salix/test This commit looks good Details
2019-04-01 09:03:05 +02:00
Joan Sanchez 5898d07822 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good Details
2019-04-01 09:01:11 +02:00
Joan Sanchez 6d51ef4187 fixed absence test
gitea/salix/dev This commit looks good Details
2019-04-01 08:56:18 +02:00
Gerard 164093af48 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-04-01 08:43:22 +02:00
Gerard 034bd77d52 Date is visible always
gitea/salix/test This commit looks good Details
2019-04-01 08:42:19 +02:00
Carlos Jimenez Ruiz a191ddebf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-29 13:15:06 +01:00
Carlos Jimenez Ruiz 0fb95bc8d2 test repairs plus some traductions 2019-03-29 13:14:48 +01:00
Joan Sanchez 75cb05865b filter by firstName & lastName
gitea/salix/dev This commit looks good Details
2019-03-29 13:07:06 +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
Joan Sanchez 8db51fdf64 added shrink class to item index #1278
gitea/salix/dev This commit looks good Details
2019-03-29 08:01:15 +01:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-03-29 07:37:23 +01:00
Gerard 280efdae50 #732 Loggable now inserts the correct values for FK values 2019-03-29 07:36:26 +01:00
Joan Sanchez 8110325af8 send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good Details
2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Gerard 3b3e4a96e9 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-27 10:03:53 +01:00
Gerard 59d99db6b4 #1272 ticket.index
gitea/salix/test This commit looks good Details
2019-03-27 09:58:58 +01:00
Joan Sanchez 8433e15875 show client id on ticket summary header #1273
gitea/salix/dev This commit looks good Details
2019-03-27 09:06:21 +01:00
Gerard 8fc9581b8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-27 08:56:39 +01:00
Gerard 650e5b8626 #1257 route.log 2019-03-27 08:56:25 +01:00
Joan Sanchez 56f352686c added sms endpoint #1149
gitea/salix/dev This commit looks good Details
2019-03-27 08:48:13 +01:00
Bernat 4e27581045 cau 10269 fix test and update fixtures
gitea/salix/dev This commit looks good Details
2019-03-27 08:44:15 +01:00
Gerard b24a6a6255 #1262 invoiceOut.descriptor
gitea/salix/dev This commit looks good Details
2019-03-26 14:27:08 +01:00
Gerard eaec968aa4 Now you can change the shipped hour of a ticket 2019-03-26 12:25:06 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268
gitea/salix/dev This commit looks good Details
2019-03-26 12:05:53 +01:00
Bernat 4e1e3bdeeb cau 10270 refactor fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-03-26 10:25:11 +01:00
Joan Sanchez a16b43546d fixed volume onLoad errors #1238
gitea/salix/dev This commit looks good Details
2019-03-26 09:33:54 +01:00
Joan Sanchez 500105675c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-26 07:29:57 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Gerard 40cbb60673 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 16:30:43 +01:00
Gerard f31be20bd3 changed wrong descriptions 2019-03-25 16:30:40 +01:00
Carlos Jimenez Ruiz de7c1f3d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 16:26:06 +01:00
Carlos Jimenez Ruiz 1e150dbc8f #1264 cambiar ruta invoice a invoiceOut 2019-03-25 16:25:59 +01:00
Gerard 2c7b9968eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 15:49:10 +01:00
Gerard aa0f04b47f Changed wrong english label of two properties 2019-03-25 15:45:59 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good Details
2019-03-25 15:16:56 +01:00
Gerard 462879a40b #1241 summary refactor
gitea/salix/dev This commit looks good Details
2019-03-25 13:16:34 +01:00
Bernat 3340163315 refactor worker fixtures
gitea/salix/dev This commit looks good Details
2019-03-25 10:00:49 +01:00
Gerard f4ddf3544d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 09:36:30 +01:00
Gerard 649b7f0e21 log added to ticket module models 2019-03-25 09:36:24 +01:00
Carlos Jimenez Ruiz 92738759a3 #1235 route.basic-data
gitea/salix/dev This commit has test failures Details
2019-03-23 16:16:47 +01:00
Carlos Jimenez Ruiz ce43bd63c9 #1234 route.create 2019-03-22 16:47:20 +01:00
Carlos Jimenez Ruiz ae9ad7a6cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-22 16:04:59 +01:00
Joan Sanchez 4a4b997e1b added subName to fetched-tags #1246
gitea/salix/dev This commit looks good Details
2019-03-22 15:05:15 +01:00
Carlos Jimenez Ruiz 80f59eeeb7 merge 2019-03-22 14:08:01 +01:00
Joan Sanchez 6c9f1cfdfa fix claim regularize & message.send methods #1242
gitea/salix/dev This commit looks good Details
2019-03-22 13:45:17 +01:00
Joan Sanchez c5e953f922 worker calendar front & back unit tests #1248
gitea/salix/dev This commit looks good Details
2019-03-22 12:51:44 +01:00
Gerard 37546e7a26 #1236 revision con pepe
gitea/salix/dev This commit looks good Details
2019-03-22 12:34:42 +01:00
Gerard e23a184166 styles added 2019-03-22 11:56:21 +01:00
Gerard f4476ca690 #1236 route.summary
gitea/salix/dev This commit looks good Details
2019-03-22 11:10:23 +01:00
Gerard 7ae011b3b6 #1240 route.descriptor 2019-03-22 11:07:44 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147
gitea/salix/dev This commit looks good Details
2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz 40cabdd3bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-21 15:02:12 +01:00
Carlos Jimenez Ruiz 82683a09b5 corredted typo 2019-03-21 15:02:06 +01:00
Javi Gallego 0dd7e528dd #1245 bug ticket line
gitea/salix/dev This commit looks good Details
2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz bbb00b98dc #1233 route.index
gitea/salix/dev This commit looks good Details
2019-03-21 13:47:33 +01:00
Carlos Jimenez Ruiz 92347cd9c4 #1233 route.index 2019-03-21 13:46:14 +01:00
Bernat 504dc954d0 update model vehicle
gitea/salix/dev This commit looks good Details
2019-03-21 12:50:34 +01:00
Gerard bb321995fa deleted wrongly an unused relation alertLevel
gitea/salix/dev This commit looks good Details
2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz 6b11f26296 test refactor to async await
gitea/salix/dev This commit looks good Details
2019-03-21 08:53:12 +01:00
Carlos Jimenez Ruiz 7a5124aca2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz 30333a914e #957 ticket.descriptor stowaway singlepage nav e2e 2019-03-20 12:23:38 +01:00
Carlos Jimenez Ruiz d38ca72fd8 orden de resultados por defecto DESC de id y fecha 2019-03-20 11:49:11 +01:00
Bernat 41e1505b1a #1233 new models and fixtures
gitea/salix/dev This commit looks good Details
2019-03-20 10:10:36 +01:00
Bernat 981800a0e2 import production structure db to local and fix test
gitea/salix/dev This commit looks good Details
2019-03-20 08:52:54 +01:00
Carlos Jimenez Ruiz d7d8bff92b #1196 worker.descriptor correo 2019-03-15 12:58:26 +01:00
Joan Sanchez 6b5d91f545 fixed translations
gitea/salix/dev This commit looks good Details
2019-03-15 08:12:36 +01:00
Joan Sanchez 274d744b69 added clone zone button #1159
gitea/salix/dev This commit looks good Details
2019-03-14 15:07:24 +01:00
Carlos Jimenez Ruiz b165f0d06b removed unexpected fdescribe
gitea/salix/dev There was a failure building this commit Details
2019-03-14 08:29:35 +01:00
Carlos Jimenez Ruiz 53bbba49d7 removed key bind from invoices as requested.
gitea/salix/dev This commit looks good Details
2019-03-14 08:25:38 +01:00
Carlos Jimenez Ruiz dcf22303ea #1179 invoice.index crear el módulo
gitea/salix/dev This commit looks good Details
2019-03-14 08:10:14 +01:00
Gerard f48e3260bd Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-03-13 16:15:18 +01:00
Gerard 5fcb9f61ab Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-13 16:09:14 +01:00
Gerard 0a95f1b299 #1229 general search of worker searckpanel now searchs users
gitea/salix/master This commit looks good Details
2019-03-13 16:08:04 +01:00
Joan Sanchez 12308de5d1 catalog filter by item id #1219
gitea/salix/dev This commit looks good Details
2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz 98f73fc5d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-13 14:16:26 +01:00
Carlos Jimenez Ruiz f4b74abe3b #1179 invoice.index crear el módulo 2019-03-13 14:10:45 +01:00
Gerard fd4fe288a5 has visible disabled temporally
gitea/salix/master This commit looks good Details
2019-03-13 12:03:06 +01:00
Joan Sanchez aa37a9f66a Added zone.isVolumetric #1227
gitea/salix/dev There was a failure building this commit Details
gitea/salix/test This commit looks good Details
2019-03-13 11:27:45 +01:00
Joan Sanchez 5f5ce1a765 required if for checked data
gitea/salix/dev This commit looks good Details
2019-03-13 08:35:25 +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
Gerard fb75ff0eae #1222 Activar log en el modulo ítem
gitea/salix/dev This commit looks good Details
2019-03-12 11:47:53 +01:00
Gerard 41a34421df ship menu now open the stowaways in new tabs
gitea/salix/dev This commit looks good Details
2019-03-11 11:29:31 +01:00
Joan Sanchez 891c4b201a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 11:10:28 +01:00
Joan Sanchez 91f8f337f5 removed clog
gitea/salix/test This commit looks good Details
2019-03-11 11:09:59 +01:00
Gerard 926ee532ae Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:40:59 +01:00
Gerard 987fc1e4e3 tranlations added
gitea/salix/test This commit looks good Details
2019-03-11 08:40:35 +01:00
Gerard 562403cd0a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:15:00 +01:00
Gerard 63787a7beb showing client tickets from client descriptor works again
gitea/salix/test This commit looks good Details
2019-03-11 08:11:48 +01:00
Gerard 3afedbd89b merge
gitea/salix/dev This commit looks good Details
2019-03-11 08:02:06 +01:00
Gerard f6eb8315a3 #999 worker.index buscador
gitea/salix/test This commit looks good Details
2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz 7323ed03e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz 78103137bb Test #1221 e2e worker.pbx 2019-03-08 14:46:01 +01:00
Gerard cd86b78596 Merge branch 'test' into dev 2019-03-08 13:46:59 +01:00
Gerard d1ce85c81e taxclass field temporally removed as it slows the query
gitea/salix/test This commit looks good Details
2019-03-08 13:46:33 +01:00
Gerard 9d85094ccd Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-08 13:12:33 +01:00
Gerard 720803facb #1220 item.index añadir campos a buscador avanzado
gitea/salix/test This commit looks good Details
2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz aceecd9c7a Tarea #1197 worker.centralita 2019-03-08 09:41:53 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion
gitea/salix/dev This commit looks good Details
2019-03-08 08:14:22 +01:00
Gerard 759cca3989 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-08 08:04:20 +01:00
Gerard 7d8879a979 deleted default query on item index 2019-03-08 07:52:43 +01:00
Carlos Jimenez Ruiz 6bb4f04bd1 #1211 client.billingData
gitea/salix/dev This commit looks good Details
2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz 75fba75688 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Bernat b709930db5 cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good Details
2019-03-07 07:51:29 +01:00
Gerard b04dc02c61 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 16:29:15 +01:00
Gerard af960e5f5f fonts updated to 1.26 version
gitea/salix/test This commit looks good Details
2019-03-06 16:28:09 +01:00
Gerard 1cc196983e Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono
gitea/salix/master This commit looks good Details
2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz fdfddd260a #1208 Cambiar componente de icono papelera vn-icon por vn-icon-button 2019-03-06 12:27:56 +01:00
Gerard b2adde4ba3 #1176 ticket.sale actualizar descuento
gitea/salix/dev This commit looks good Details
2019-03-06 08:54:56 +01:00
Gerard 8923970e75 e2e fixed
gitea/salix/dev This commit looks good Details
2019-03-06 08:54:04 +01:00
Gerard 1c7d50fc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-05 15:00:38 +01:00
Gerard dd7ded018b test fixed 2019-03-05 15:00:17 +01:00
Joan Sanchez 11603f8d90 Add services to deliver-note #1201. Renamed receipt
gitea/salix/dev This commit has test failures Details
2019-03-05 14:59:18 +01:00
Gerard fbc84f48a1 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-03-05 14:44:38 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order
gitea/salix/test This commit looks good Details
2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz 17654ef71e #1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good Details
2019-03-05 12:37:43 +01:00
Carlos Jimenez Ruiz d37d314304 #1202 refactor del cambio de estado de un ticket
gitea/salix/dev This commit looks good Details
2019-03-05 12:01:53 +01:00
Joan Sanchez e7ca55fea3 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-03-05 11:12:44 +01:00
Joan Sanchez 8e45858cd0 Disable & create new mandate when sending a new core sample #1207
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz f8a4ad0f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz d1d11233ad #1039 ticket.summary 2019-03-04 16:34:41 +01:00
Gerard d6683918bb #1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good Details
2019-03-04 16:06:41 +01:00
Gerard 96704cc4df Merge branch 'test' into dev 2019-03-04 14:29:18 +01:00
Gerard 2f7c544c52 changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good Details
2019-03-05 12:25:37 +01:00
Gerard 025c0810be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-05 12:13:59 +01:00
Gerard 32893b49c1 #1174 item.index buscador avanzado mostrar comprador 2019-03-05 12:13:46 +01:00
Gerard 00f9754c1e #1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good Details
2019-03-05 12:03:34 +01:00
Gerard 7f10a509e0 #1188 item.index filtering doesnt work for some params
gitea/salix/dev This commit looks good Details
2019-03-05 11:34:05 +01:00
Gerard 9be6f1351a updated steps
gitea/salix/master This commit looks good Details
2019-03-05 08:42:05 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166
gitea/salix/dev This commit looks good Details
2019-03-04 12:04:23 +01:00
Gerard 1b2f851525 #1191 item not available icon added
gitea/salix/dev This commit has test failures Details
2019-03-04 20:00:12 +01:00
Bernat 11c6fd2da7 Cau 8402 fix test and update structure
gitea/salix/dev This commit looks good Details
2019-03-01 12:19:12 +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
Carlos Jimenez Ruiz daa65e967f typo corrected
gitea/salix/dev This commit looks good Details
2019-03-01 11:09:20 +01:00
Carlos Jimenez Ruiz 443da0c44c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-01 10:51:12 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado
gitea/salix/dev This commit has test failures Details
2019-03-01 09:07:44 +01:00
Carlos Jimenez Ruiz 0762b734fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-01 07:33:31 +01:00
Joan Sanchez dbc582a410 Merge branch 'test' into dev 2019-03-01 07:30:30 +01:00
Joan Sanchez 4fe4c7886b fixed samples visible scope
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-01 07:27:29 +01:00
Carlos Jimenez Ruiz 4026004ecf #987 client.billing-data ALPHA 2019-02-28 14:30:29 +01:00
Gerard 9ef3eac480 #1136 item.buscador Avanzado añadir campo visible y isActive
gitea/salix/dev This commit looks good Details
2019-02-28 13:50:39 +01:00
Gerard 08650a177e client index not being able to open summary popover fixed
gitea/salix/test This commit looks good Details
2019-02-28 11:29:24 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Joan Sanchez d19d360ca6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-28 10:17:28 +01:00
Joan Sanchez d336fd0eb1 fixed address 2019-02-28 10:17:09 +01:00
Gerard 624733dcfb changed order of ticket index
gitea/salix/dev This commit has test failures Details
2019-02-28 10:01:54 +01:00
Carlos Jimenez Ruiz c2b95b093a removed focus describe
gitea/salix/dev This commit has test failures Details
2019-02-28 09:37:42 +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
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz ac6851bf4a eslint rules passed
gitea/salix/dev This commit looks good Details
2019-02-27 16:50:14 +01:00
Carlos Jimenez Ruiz 1e89b6977a #1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good Details
2019-02-27 13:10:26 +01:00
Carlos Jimenez Ruiz 048c5c2ad8 #1104 order.index mostar mas campos
gitea/salix/dev This commit looks good Details
2019-02-27 12:03:54 +01:00
Carlos Jimenez Ruiz c227784877 typoe fixed 2019-02-27 10:05:49 +01:00
Gerard a37fdd1e33 EQTAX restriction deleted CR Javi 2019-02-26 17:32:58 +01:00
Gerard 4de73fb2a8 #1152 refactor ticket.sale 2019-02-26 17:32:32 +01:00
Joan Sanchez 4d53564602 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-26 14:26:47 +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
Gerard 43f26d1bc9 input number now has a option to hide the controls
gitea/salix/test This commit looks good Details
2019-02-25 15:56:42 +01:00
Joan Sanchez 2862501475 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-25 15:08:42 +01:00
Carlos Jimenez Ruiz 4b37b0fc1e #1155 item.index añadir grouping y packing
gitea/salix/dev This commit looks good Details
2019-02-25 14:55:06 +01:00
Gerard 8a137e7713 grouping and packing added
gitea/salix/dev This commit looks good Details
2019-02-25 13:40:53 +01:00
Joan Sanchez 23ed5e4ddf added offset calendar remove selection
gitea/salix/test This commit looks good Details
2019-02-25 12:22:04 +01:00
Joan Sanchez ac1e619b06 fixed zone bugs 2019-02-25 10:03:50 +01:00
Juan Ferrer c3f20dba3c Small fix
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-22 17:23:03 +01:00
Juan Ferrer 26419e75c9 Style fixes
gitea/salix/test This commit looks good Details
2019-02-22 16:15:54 +01:00
Juan Ferrer 961eb6edaf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-02-22 14:38:45 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard ea9d194368 traduction added
gitea/salix/test This commit looks good Details
2019-02-22 13:18:53 +01:00
Gerard 9370142731 styles fixed
gitea/salix/test This commit looks good Details
2019-02-22 12:43:08 +01:00
Gerard 86b3407e35 item barcode to item created
gitea/salix/test This commit looks good Details
2019-02-22 08:32:18 +01:00
Gerard c590dc6270 traduction added
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-21 14:08:32 +01:00
Gerard 1324d53e1b claim action now shows ticket
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-21 13:48:34 +01:00
Gerard 1e199e9d5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-02-21 12:58:05 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge
gitea/salix/dev This commit has test failures Details
2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
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
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
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
Joan Sanchez 646e6c7b46 Disabled delivery-note preview
gitea/salix/dev This commit looks good Details
2019-02-20 13:26:31 +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 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 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 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 40d765adc1 removed fi from worker module
gitea/salix/dev This commit looks good Details
2019-02-20 09:16:19 +01:00
Carlos Jimenez Ruiz 250bb359e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz 7d2bc25c95 #1142 order.line total 2019-02-19 17:55:19 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00