Commit Graph

1643 Commits

Author SHA1 Message Date
Joan Sanchez 6aca80b075 Merge branch 'dev' into 2338-ticket_weekly 2020-07-07 12:34:04 +00:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion 2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz c801d8a969 Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests 2020-07-01 14:28:05 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e 2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor 2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech faee28cb01 fix bugs in ticket weekly 2020-06-29 09:35:18 +02:00
Bernat Exposito Domenech ea1eb16060 export structure 2020-06-29 07:32:08 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario 2020-06-25 17:12:53 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor 2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz e6a72d0f09 clean code refactor 2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz 4d97357213 update estate without model.refresh() 2020-06-18 13:50:52 +02:00
Carlos Jimenez Ruiz edea60dd94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests 2020-06-16 15:11:24 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume 2020-06-12 11:26:32 +02:00
Carlos Jimenez Ruiz 538ae75b89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway 2020-06-10 16:24:17 +02:00
Joan Sanchez 5edfc59d97 Updated unit test 2020-06-10 13:57:32 +02:00
Joan Sanchez 461fec7e64 Updated unit test 2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz 4b1e79a433 2314 server side unit test fixed 2020-06-10 13:50:03 +02:00
Joan Sanchez 3cfb8b4730 2323 - Filter by myTeam fix 2020-06-10 12:13:07 +02:00
Joan Sanchez 1fed4c7913 Contextmenu fixes 2020-06-09 12:16:40 +02:00
Carlos Jimenez Ruiz d8593ea3e0 Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-08 12:59:59 +00:00
Joan Sanchez ba9a44dec1 Updated back unit test 2020-06-08 13:06:33 +02:00
Joan Sanchez ab1e8fb622 2176 First working version 2020-06-08 12:14:27 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu 2020-06-08 08:19:18 +02:00
Javi Gallego faa053a3d2 Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones 2020-06-05 10:01:52 +02:00
Javi Gallego b40be5cca9 2035 2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech a81862baad set deleteded skiped 2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech f340466daf fix test 2296 2020-06-04 14:23:48 +02:00
Joan Sanchez 94dcf7679b Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-03 10:54:41 +00:00
Joan Sanchez 613937dc8d Fixed order 2020-06-03 12:21:03 +02:00
Joan Sanchez 18edd523d2 Excluded failing test 2020-06-03 11:40:18 +02:00
Joan Sanchez b7ceeae65a Excluded back unit tests. TLS error 2020-06-03 11:27:14 +02:00
Joan Sanchez 751f79373a Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:28:14 +00:00
Bernat Exposito fac64c45c0 Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech aac47e52e9 update log 2020-06-02 11:15:07 +02:00
Joan Sanchez a0767a6ea2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters 2020-06-02 10:56:40 +02:00
Joan Sanchez 1e4f36b775 Updated back unit test 2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech 546272cc3f zone delete 2020-06-02 08:59:04 +02:00
Joan Sanchez 052c51cee5 2282 - Change stowaway state to FIXING 2020-06-01 12:47:04 +02:00
Joan Sanchez 3f1109aee3 Test changes 2020-05-29 12:10:04 +02:00
Joan Sanchez 90ae1562dd Added filters 2020-05-29 11:10:58 +02:00
Bernat Exposito Domenech 8be929c1da log tiquet request 2020-05-27 08:07:14 +02:00
Javi Gallego d8871c0bce cr 2020-05-26 10:37:52 +02:00
Joan Sanchez 4d2d57d646 2265 Changes to filter 2020-05-26 08:08:09 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan 2020-05-19 08:46:42 +02:00
Bernat Exposito Domenech 2681060878 update mehod ticket summary 2020-05-18 14:59:58 +02:00
Bernat Exposito Domenech c205c173f8 invoiceOut descriptor popover in ticket summary 2020-05-18 10:28:33 +02:00
Javi Gallego 3815edfbea falta CR 2020-05-15 12:17:34 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones 2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo 2020-04-20 13:49:33 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E 2020-04-08 12:33:36 +02:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary 2020-03-27 11:45:10 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway 2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech 74b27778ab add phones in ticket summary 2020-03-27 11:10:20 +01:00
Joan Sanchez 598ebe96d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale 2020-03-27 11:06:35 +01:00
Joan Sanchez d4ca58edad Updated back unit test 2020-03-27 09:10:30 +01:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method 2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete 2020-03-26 12:00:07 +01:00
Joan Sanchez 9bae89a672 Updated unit test 2020-03-23 16:03:27 +01:00
Joan Sanchez 27b1376799 changes 2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech f6ca9eee01 ticketlog in componentUpdate 2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech fdd1c73485 refactor componentUpdate 2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech 3ab80e1479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-12 12:04:35 +01:00
Joan Sanchez 6d437d0e2e Allow empty agency on ticket creation 2020-03-10 11:46:58 +01:00
Joan Sanchez 24becf7872 Updated var names 2020-03-04 11:17:35 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty 2020-03-04 09:26:12 +01:00
Joan Sanchez 7e694c3e80 2073 - Filter by pending tickets 2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech 42b151c849 fix isEditable spec 2020-03-02 09:43:22 +01:00
Bernat Exposito Domenech 63cd436d3c fix request changes 2020-03-02 08:30:33 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable 2020-02-27 12:31:38 +01:00
Bernat Exposito Domenech 9cad13f166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model 2020-02-26 08:24:21 +01:00
Bernat Exposito Domenech 85db094f1d componentUpdate 2020-02-25 12:36:33 +01:00
Bernat Exposito Domenech 2fdd275085 log in ticketUpdate 2020-02-25 11:43:50 +01:00
Joan Sanchez 415316d7d0 2081 - Fix ticket search by order id 2020-02-24 13:28:59 +01:00
Joan Sanchez d0c2f88a77 2126 - Search by client name 2020-02-24 12:08:53 +01:00
Joan Sanchez 2f089681df Don't throw error if no salesPerson is assigned 2020-02-20 12:52:05 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request 2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech f900b7ef62 crud model test 2020-02-17 13:50:54 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent 2020-02-12 10:39:46 +01:00
Joan Sanchez 91210c3a0d 1684 - Log old quantity value 2020-02-11 08:19:03 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values 2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech dd368a8c3f refactor ticket.basicData steps 2020-02-07 13:38:32 +01:00
Bernat Exposito Domenech bb09fc9746 update ticket.isEditable 2020-02-06 11:50:32 +01:00
Bernat Exposito Domenech 8193b0ffc0 update ticket.filter 2020-02-06 07:37:41 +01:00
Bernat Exposito Domenech b244df4807 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db 2020-01-24 12:56:01 +01:00
Bernat Exposito Domenech 439f9009ff fix model componentType 2020-01-23 13:47:00 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests 2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests 2020-01-20 11:59:15 +01:00
Bernat Exposito e1aefc795b Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev 2020-01-16 13:42:12 +00:00
Bernat Exposito Domenech ba2300288f sendSms test 2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech b42b2ec8c3 refactor sms send 2020-01-15 13:27:14 +01:00
Joan Sanchez 708789502d Added waste section 2020-01-15 13:07:33 +01:00
Joan Sanchez 048fcb733d added zone name to ticket summary 2020-01-13 07:42:41 +01:00
Bernat Exposito Domenech e9d3b14da7 refactor models component and componentType 2019-12-27 08:01:53 +01:00
Joan Sanchez 5273e90a30 Added params to ticket method & updated unit tests 2019-12-26 07:12:34 +01:00
Joan Sanchez 42239815e0 removed fdescribe 2019-12-19 15:01:33 +01:00
Juan Ferrer 9947021736 #1953 Temporal fix 2019-12-19 12:17:53 +01:00
Joan Sanchez ef95244d07 stowaway refactor 2019-12-17 08:38:36 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field 2019-12-13 11:59:25 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770 2019-11-21 12:00:56 +01:00
Joan Sanchez fee0d674a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components 2019-11-21 11:06:31 +01:00
Joan Sanchez 5bb7f7f14a deprecated getItemVisibleAvailable() #1887 2019-11-20 11:14:11 +01:00
Joan Sanchez c6d1536500 recalculate ticket components 2019-11-20 06:53:37 +01:00
Javi Gallego c736e4de29 #1850 descomentar test back 2019-11-18 12:32:50 +01:00
Joan Sanchez c028233012 ticket.sale recalculate sale price #1768 2019-11-14 14:19:39 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk 2019-11-13 13:22:39 +01:00
Joan Sanchez c166067888 updated tests & email compatibility with phone 2019-11-13 12:18:30 +01:00
Joan Sanchez 603bb034a1 Excluded specs with calls to setDeleted #1874 2019-11-13 07:56:09 +01:00
Joan Sanchez 7f2af116bc updated translation 2019-11-13 07:04:47 +01:00
Joan Sanchez c3962c3d78 updated test 2019-11-12 15:07:37 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Bernat 1be61b16d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-05 08:56:59 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados 2019-10-31 12:54:16 +01:00
Bernat 9353d54b16 add alias on weekly filter 2019-10-29 14:55:05 +01:00
Bernat afd7c5684a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary 2019-10-24 12:49:23 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818 2019-10-22 13:44:36 +02:00
Bernat 939c507fba #1810 El método listPackaging filtrar por isPackagingReturnable 2019-10-21 09:16:52 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters 2019-10-21 08:31:14 +02:00
Joan Sanchez 55f3390f85 added validation for confirmed purcharse requests 2019-10-21 07:08:47 +02:00
Bernat ed1ed7f50b #1738 exportar estructura y datos de produccion a la local 2019-10-15 07:23:34 +02:00
Joan Sanchez 300ba61fd3 #1759 Forzar desenrutado al cambiar datos básicos de ticket 2019-10-14 14:43:10 +02:00
Joan Sanchez 9bfc87f1e2 changed state to stowaway ticket 2019-10-10 09:59:28 +02:00
Joan Sanchez c0403873e7 stowaway changed to correct field name 2019-10-08 14:36:02 +02:00
Carlos Jimenez Ruiz fb846baaa4 #1740 Intermitencia test de back 2019-10-01 13:19:22 +02:00
Juan Ferrer a177ad8e26 Fixes 2019-09-30 13:02:11 +02:00
Carlos Jimenez Ruiz 6e50c1fad9 #1685 ticket.transferSale 2019-09-27 16:55:40 +02:00
Carlos Jimenez Ruiz a8c6c57b7e #1719 claim.detail final amends and tests 2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz 2a2c5ae3c4 #1719 claim.detail cambiar descuento falla 2019-09-26 10:56:49 +02:00
Carlos Jimenez Ruiz 65981099b6 #1719 claim.detail cambiar descuento falla 2019-09-26 09:05:18 +02:00
Carlos Jimenez Ruiz 1841e4edb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-25 11:53:42 +02:00
Carlos Jimenez Ruiz be65c5acad #1719 claim.detail cambiar descuento falla 2019-09-25 11:53:12 +02:00
Joan Sanchez 73eca9905e fixed #1734 canHaveStowaway validation 2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz 0c27b90c5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 14:39:22 +02:00
Carlos Jimenez Ruiz 99ef8a6010 #1719 claim.detail cambiar descuento falla 2019-09-24 14:23:21 +02:00
Bernat bf5a9967cf Refactor #1682 modificar modelos componentRate y componentTypeRate 2019-09-24 13:45:54 +02:00
Joan Sanchez 15183df65f transfer sales error fixed 2019-09-24 08:51:21 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Bernat 2e1b329584 #1681 delete comment 2019-09-13 11:27:32 +02:00
Bernat c6507fc2bb #1681 crear test para el endpoint getPossibleStowaways 2019-09-13 07:40:27 +02:00
Bernat c344d8088b merge 2019-09-11 14:18:21 +02:00
Joan Sanchez ff626764d8 fixed back unit tests 2019-09-11 08:24:28 +02:00
Joan Sanchez 342886942f fixed sale loggable transaction error #1686 2019-09-11 08:12:27 +02:00
Bernat ac6d1ed829 #1663 update ticketLog 2019-09-10 14:43:00 +02:00
Bernat 8932aa4e5a Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log 2019-09-10 13:27:41 +02:00
Carlos Jimenez Ruiz 56c291a160 merge 2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz ce9fb14b62 #1655 e2e ticket.sale Añadir lineas 2019-09-06 11:43:15 +02:00
Bernat e8cb57e27a #1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen 2019-09-06 09:47:58 +02:00
Joan Sanchez d3441fa1b3 Ticket step one refactor #1669 2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables 2019-09-03 14:42:52 +02:00
Carlos Jimenez Ruiz 219614b44f #1656 ticket.regularizar eliminar ticket + tests 2019-09-03 13:27:02 +02:00
Carlos Jimenez Ruiz e1b5b449ce #1656 ticket.regularizar eliminar ticket 2019-09-03 09:57:53 +02:00
Joan Sanchez d93974f481 ticket.basicData Update zone on changes + fixes #1668 2019-09-02 14:36:54 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js 2019-08-19 07:56:20 +02:00
Bernat d9c63e3bc0 Tarea #1501 ticket / delete 2019-08-13 12:44:34 +02:00
Bernat d08a43bc23 #1630 state.isEditable 2019-08-12 13:28:27 +02:00
Bernat 2e89af9795 #1630 state.isEditable 2019-08-12 13:26:44 +02:00
Bernat b6cc769df3 Test #1636 refactor test de back isEditable y editableState 2019-08-12 12:31:31 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251 2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598 2019-08-08 08:37:03 +02:00
Bernat 2f1472b9ee Tarea #1574
ticket.sale editableState
2019-08-08 08:33:27 +02:00
Joan Sanchez e52a0ac5da ticket.sale split show active tickets 2019-08-06 07:36:26 +02:00
Joan Sanchez efeba38fb4 back errors fixed 2019-08-01 11:52:53 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test 2019-07-31 07:46:24 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612 2019-07-29 13:12:36 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604 2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz e1cbf781e1 #1608 item.request 2019-07-25 09:55:09 +02:00
Bernat 8089c32ec2 Tarea #1611 export db roduction to local 2019-07-23 14:56:57 +02:00
Bernat 6a23a5429c Tarea #1562 ticket.line isEditable 2019-07-22 13:14:00 +02:00
Joan Sanchez 2a6de77e17 ticket.index show zone hour & minute. Show only tickets from today 2019-07-12 08:49:44 +02:00
Joan Sanchez 62ef2dccd8 show expeditions fix 2019-07-11 11:20:41 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585 2019-07-08 14:07:09 +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
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 2019-07-01 11:56:16 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent 2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz 5270693bdd #1387 e2e Ticket Edit sale path 2019-06-26 15:27:58 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test 2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket 2019-06-25 11:17:58 +02:00
Bernat 1227f7ac83 Test #1549 Arreglar test de back 2019-06-21 13:19:51 +02:00
Javi Gallego 289f588923 #1550 ticket.descriptor polizon cambia estado 2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz 594268183b #1517 ticket.index 2019-06-20 14:35:47 +02:00
Carlos Jimenez Ruiz 560cce7c8c #1537 refactor fixtures 2019-06-19 14:40:47 +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
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 58cc90929f TX fixes, debug disabled, glob transaction timeout 2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz 921af523f8 #1526 refactor fixtures 2019-06-12 11:38:31 +02:00
Bernat 2504d06bab Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:23:55 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure 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
Bernat ea38ff221d #1467 ticket filter with hours 2019-06-07 07:45:12 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484 2019-06-06 13:59:11 +02:00
Carlos Jimenez Ruiz 55ea445f02 #1486 back test updateDiscount 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 2019-06-05 15:05:07 +02:00
Bernat 3a338739d1 Tarea #1462 Route.descriptior Añadir menú - actualizar m3 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' 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
Bernat c49f72b36c #1493 Refactorizar el método back /Tickets/deleted 2019-06-03 14:54:03 +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 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest 2019-06-03 08:01:24 +02:00
Carlos Jimenez Ruiz a009329bdd removed console logs from spec file 2019-05-31 13:54:05 +02:00
Bernat d4a3a1a72e export production structure and fixtures updated 2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz ed3024e144 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 2019-05-30 08:41:08 +02:00
Bernat 24c3b35605 Test #1489 updatePrice backTest skipped 2019-05-30 08:06:52 +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 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 2019-05-29 12:41:26 +02:00
Bernat 85761043cd delete console.log 2019-05-29 11:15:08 +02:00
Bernat 84a4b049f0 1453 ticket UpdateDiscount refactor 2019-05-29 11:11:54 +02:00
Bernat 69434caa52 #1470 update fixtures, client.dms gestdoc 2019-05-28 11:26:54 +02:00
Bernat 230516b9d4 #1438 fix test back makeInvoice 2019-05-27 10:01:35 +02:00
Bernat 59069749a2 1461 fix test back 2019-05-27 09:19:23 +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 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 cc72432a37 accessType refactor #1460 2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460 2019-05-22 12:35:24 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449 2019-05-21 12:56:29 +02:00
Bernat bb5c81a3e9 #1409 ticket.weekly add finder 2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz 32555c47d0 #1434 agency.index explota por zoneFk al cargar 2019-05-20 15:04:33 +02:00
Javi Gallego 0d0f354902 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 2019-05-09 09:32:04 +02:00
Joan Sanchez 4aff31a165 fixed update discount 2019-05-06 07:40:59 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour 2019-05-03 12:23:57 +02:00
Javi Gallego 24fedff62f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-25 18:30:17 +02:00
Javi Gallego a920bc1d8f tablas dms 2019-04-25 18:30:11 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Bernat 0eabd9876d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-24 11:36:43 +02:00
Joan Sanchez d88e2e81ca update ticket line discount until invoiced #1365 2019-04-24 11:23:24 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Bernat 94480a8189 #1329 fix test and fixtures, update ticket-service 2019-04-24 07:43:11 +02:00
Bernat 75c9d1122c #1329 ticket.services validation 2019-04-23 11:25:49 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request 2019-04-18 11:02:28 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Joan Sanchez b5fe7a6fae restore fixtures makeInvoice 2019-04-12 14:53:17 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310 2019-04-12 13:54:31 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315 2019-04-11 09:38:53 +02:00
Javi Gallego 50d70f0f6f Tarea #1259 crear modelo ticketServiceType 2019-04-10 14:44:41 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest 2019-04-05 15:20:12 +02:00
Gerard ebe269f41e #1249 ticket.invoice 2019-04-05 12:24:39 +02:00
Gerard 93bca3b3f0 merge master 2019-04-04 12:47:02 +02:00
Gerard 4861b789f7 Loggable now inserts the correct values for FK values 2019-04-04 12:38:54 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270
ticket.index advanced search mostrar dias en el futuro
2019-04-03 15:16:32 +02:00
Gerard a23c636c16 #1279 loggable rawSql 2019-04-02 14:36:49 +02:00
Javi Gallego 0b977d3b0b #1293 ticket.components solo muestra base 2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz 056c07b17c #1181 No modificar ticket.basicData en reparto 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 5898d07822 Merge branch 'test' into dev 2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277 2019-04-01 09:01:11 +02:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 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
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Gerard 8fc9581b8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-27 08:56:39 +01:00
Gerard 650e5b8626 #1257 route.log 2019-03-27 08:56:25 +01:00
Bernat 4e27581045 cau 10269 fix test and update fixtures 2019-03-27 08:44:15 +01:00
Joan Sanchez a16b43546d fixed volume onLoad errors #1238 2019-03-26 09:33:54 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura 2019-03-25 15:16:56 +01:00
Gerard 649b7f0e21 log added to ticket module models 2019-03-25 09:36:24 +01:00
Gerard 37546e7a26 #1236 revision con pepe 2019-03-22 12:34:42 +01:00
Gerard bb321995fa deleted wrongly an unused relation alertLevel 2019-03-21 12:05:27 +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 d38ca72fd8 orden de resultados por defecto DESC de id y fecha 2019-03-20 11:49:11 +01:00
Bernat 981800a0e2 import production structure db to local and fix test 2019-03-20 08:52:54 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion 2019-03-08 08:14:22 +01:00
Gerard 1cc196983e Merge branch 'test' into dev 2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test 2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono 2019-03-06 14:06:36 +01:00
Gerard b2adde4ba3 #1176 ticket.sale actualizar descuento 2019-03-06 08:54:56 +01:00
Gerard 1c7d50fc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 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 2019-03-05 14:59:18 +01:00
Gerard fbc84f48a1 Merge branch 'test' into dev 2019-03-05 14:44:38 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order 2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz d37d314304 #1202 refactor del cambio de estado de un ticket 2019-03-05 12:01:53 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166 2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back 2019-03-01 11:50:26 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado 2019-03-01 09:07:44 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108 2019-02-28 08:55:34 +01:00
Gerard 9a7bd834df date offset fixed 2019-02-27 17:04:32 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Gerard ab6606a624 Merge branch 'test' into dev 2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover 2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method 2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151 2019-02-21 08:43:04 +01:00
Gerard a651142fff Merge branch 'test' into dev 2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento 2019-02-20 18:46:30 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module 2019-02-20 16:30:46 +01:00
Carlos Jimenez Ruiz 3ab0b2eb19 merge 2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Gerard 1144a197a5 #1112 ticket.sale 2019-02-14 12:06:14 +01:00
Bernat bbd4188695 #9848 fix test and update fixtures 2019-02-13 13:19:15 +01:00
Gerard 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Bernat d994bd8e9d #9783 update model and fixtures 2019-02-11 10:39:53 +01:00
Gerard 171716806a #1096 back validaciones crear ticket 2019-02-06 16:37:59 +01:00
Gerard 87b3032a4f #1067 error en boton "Importar Reclamacion" 2019-02-06 11:39:22 +01:00
Javi Gallego f9982047aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 07:58:43 +01:00
Javi Gallego 60c5d3062f expedition.json new externalId field 2019-02-06 07:56:10 +01:00
Gerard 3869742fd7 #1088 ticket.descriptor añadir polizon interval server error 2019-02-04 12:41:38 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Carlos Jimenez Ruiz f4e202dc62 #1069 index now show nicknames 2019-01-30 15:10:52 +01:00
Gerard 21e30bcaef #1064 quitar comprobación isTaxDataChecked 2019-01-30 08:46:05 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Gerard 6e6b646978 #1022 ticket.create 2019-01-25 11:58:50 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Gerard aeb0f65fec #1037 order.descriptor 2019-01-23 12:30:32 +01:00
Gerard 05ed72661e test fixed 2019-01-23 11:17:18 +01:00
Gerard abea582014 #1017 ticket.index 2019-01-22 16:18:26 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Gerard ea0504db21 stowaway fixes 2019-01-21 08:44:21 +01:00
Gerard 345acc1353 #951 ticket.descriptor añadir polizon 2019-01-18 13:36:13 +01:00
Gerard e9bc3f00a1 #954 ticket.descriptor añadir link a polizon 2019-01-18 13:34:50 +01:00
Gerard 2b2fe69d0d alert level not available fixed 2019-01-17 11:04:00 +01:00
Gerard 542dd9f280 #973 order.action 2019-01-16 12:55:38 +01:00
Gerard 0fd1149c55 #975 ticket.summary 2019-01-16 12:43:18 +01:00
Gerard 140e7b4f92 #968 ticket/servicios 2019-01-16 10:49:49 +01:00
Bernat 3faf03cf9f fix test and update fixtures 2019-01-11 15:06:18 +01:00
Bernat f7244cc22b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-11 12:26:06 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Gerard aa03c686e5 added log of ticket packaging 2019-01-11 08:30:44 +01:00
Bernat 85b4f46479 structuredb step 2 2019-01-10 07:26:10 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00