Commit Graph

2367 Commits

Author SHA1 Message Date
Carlos Andrés 9c0334619d refs #6199 2023-10-13 11:56:50 +02:00
Sergio De la torre 35c0ec0d04 Merge branch 'dev' into 5134-ModelsSalix 2023-10-11 15:14:13 +00:00
Javi Gallego df9d6fd6f8 efectue con acento 2023-10-11 14:06:28 +02:00
Carlos Satorres 0023561acb refs #6293 traducción 2023-10-11 12:04:12 +02:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-10-10 11:30:53 +02:00
Carlos Satorres 1adfa33a9a hotfix length sales 2023-10-06 14:52:30 +02:00
Carlos Satorres 62c7dc9db5 hotfix-change minus 2023-10-06 06:16:42 +02:00
Pablo Natek f40185c2d4 refs #4764 hotfix 2023-10-05 14:24:52 +02:00
Alex Moreno 7a6022efd4 Merge branch 'dev' into 6216-saleLog_open_ticketLog 2023-10-05 06:31:54 +00:00
Jorge Penadés 0d39471970 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-05 08:20:47 +02:00
Alex Moreno ca86b3cc2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-10-05 07:27:35 +02:00
Alex Moreno 7cd2e290ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-05 07:22:41 +02:00
Pablo Natek 99d65804e8 refs #6278 fixFilter 2023-10-02 13:29:39 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls 2023-10-02 09:14:30 +02:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog 2023-09-29 11:57:25 +02:00
Jorge Penadés 9536fdba58 ref #6119 refactor 2023-09-29 10:10:58 +02:00
Pablo Natek 0fa56149d7 refs #6266 smsfix 2023-09-29 09:47:22 +02:00
Alex Moreno 542119983b refs #5929 test: fix test after fix ticket_isEditable 2023-09-29 09:28:23 +02:00
Jorge Penadés f1dc809147 Merge branch 'dev' into 6119-addMicrosipLink 2023-09-29 06:22:51 +00:00
Alex Moreno f3c55cdee9 refs #5929 fix(isEditable): can edit if is weekly 2023-09-28 16:00:09 +02:00
Jorge Penadés 4b213c1c9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-28 13:31:45 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix 2023-09-28 08:18:15 +02:00
Sergio De la torre a86469ccd2 refs #5134 fix: format 2023-09-28 07:42:44 +02:00
Sergio De la torre 2ea2943eca refs #5134 feat: models 2023-09-26 13:12:18 +02:00
Jorge Penadés e1e225a1ef Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-26 12:42:47 +02:00
Jorge Penadés 50543963c1 ref #5914 refactor createTicketRefund 2023-09-26 12:42:45 +02:00
Jorge Penadés 45fbe6f174 Merge branch 'dev' into 5914-transferInvoiceOut 2023-09-26 06:36:44 +00:00
Jorge Penadés db8dc8487b ref #6246 replace name 2023-09-25 15:28:08 +02:00
Jorge Penadés 474399b383 ref #5914 refactor 2023-09-25 15:23:51 +02:00
Jorge Penadés f4ce5db93b Merge branch 'dev' into 6246-checkTicketSales 2023-09-25 11:49:18 +00:00
Jorge Penadés c8c06f498c ref #5914 fixed tests e2e 2023-09-25 10:49:47 +02:00
Jorge Penadés 731bad5981 ref #5914 create ticket with new and refactor 2023-09-22 14:52:56 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-22 14:51:20 +02:00
Jorge Penadés 6fe52ba3e8 ref #6246 check sales and update test 2023-09-22 12:48:54 +02:00
Sergio De la torre ed1d8ca94f refs #5134 feat: models 2023-09-22 12:29:56 +02:00
Jorge Penadés 82f14e62ad ref #5914 tests fixed 2023-09-21 16:08:55 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice 2023-09-21 09:14:46 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-21 07:32:19 +02:00
Carlos Satorres f60b6b84fe refs #5843 fix back 2023-09-20 11:58:36 +02:00
Jorge Penadés 4870b0830b ref #5914 fix refund and change method name 2023-09-20 11:06:30 +02:00
Pablo Natek d29c37693d Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-09-20 08:53:53 +00:00
Jorge Penadés 87cee57e56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-20 10:47:53 +02:00
Javi Gallego 29a186fa18 Merge branch 'dev' into 6241--arreglar--dbTest 2023-09-20 08:18:46 +02:00
Javi Gallego 45cf1b1ff3 fixes #6241 dbTest fixed 2023-09-20 08:12:07 +02:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Alex Moreno 2dbd711104 Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress 2023-09-19 05:24:05 +00:00
Jorge Penadés 32a0aedf11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-18 08:07:27 +02:00
Sergio De la torre 881a1ee0b8 refs #5652 modify: solved Tests 2023-09-15 11:24:17 +02:00
Pablo Natek 66e851b5ea refs #4131 changeStateRefactor 2023-09-13 19:48:58 +02:00
Jorge Penadés 48a6bf2969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-08 08:05:17 +02:00
Carlos Satorres c2f73eb548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-09-07 13:38:38 +02:00
Jorge Penadés 427425a750 ref #6119 simplifiy component 2023-09-07 09:50:13 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-06 14:02:53 +02:00
Javi Gallego 6a4d8fbfbf Merge branch 'dev' into 6173-dump-BBDD 2023-09-05 13:48:35 +02:00
Jorge Penadés f46d6355dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-04 08:06:47 +02:00
Jorge Penadés 9eff7c509f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-01 12:06:49 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Sergio De la torre 7d8828e604 refs #6132 fix: saveSign without route 2023-08-31 13:50:31 +02:00
Carlos Satorres 017e0dd948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-08-31 13:29:34 +02:00
Jorge Penadés c2a54b8c65 ref #6119 vnLinkPhone created 2023-08-31 13:02:56 +02:00
Javi Gallego ea5e10faed Merge pull request 'test' (!1730) from test into dev
Reviewed-on: #1730
2023-08-31 07:58:48 +00:00
Jorge Penadés 05f0f72c73 refs #6119 microsip link added 2023-08-30 14:14:48 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange 2023-08-30 12:48:57 +02:00
Juan Ferrer d60e35d817 Merge pull request 'refs #6153 master into test' (!1726) from master into test
Reviewed-on: #1726
2023-08-29 06:50:27 +00:00
Jorge Penadés 5fe12d9281 Merge branch 'dev' into 5216-expeditionStateAdd 2023-08-25 12:43:26 +00:00
Jorge Penadés ca28d2d78f ref #5216 myOptions added 2023-08-25 14:37:32 +02:00
Vicent Llopis f3e43686a3 refs #5811 feat: al borrar expedicion borrar tmb de viaexpress 2023-08-24 14:59:28 +02:00
Jorge Penadés 386de69bce refs #5216 fix error handling 2023-08-24 12:47:10 +02:00
Alex Moreno 4c1d9cd767 hotFix(priceDifference): import UserError 2023-08-24 11:32:20 +02:00
Jorge Penadés 3d4a99b07e refs 5914 transferInvoice created 2023-08-24 10:51:34 +02:00
Jorge Penadés bda3937417 refs #5216 path replaced and test created 2023-08-24 10:01:07 +02:00
Jorge Penadés 0f3b633de4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-24 08:03:01 +02:00
Vicent Llopis 3cffdca0c7 Merge branch 'dev' into 5244-component_workerAutocomplete 2023-08-24 05:39:48 +00:00
Alex Moreno 3eacb4dbd9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-08-23 12:05:04 +02:00
Alex Moreno 508a4b2d34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-08-23 12:04:27 +02:00
Jorge Penadés 82d08261e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-23 10:25:48 +02:00
Vicent Llopis dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-08-22 13:39:09 +02:00
Vicent Llopis 2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-08-22 10:31:17 +00:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk 2023-08-22 10:45:41 +02:00
Alex Moreno a26652045c refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel 2023-08-22 10:17:46 +02:00
Guillermo Bonet 6d60592fb9 Merge branch 'master' into test 2023-08-21 09:34:32 +02:00
Alex Moreno 518d5111e4 refs #6127 hotFix(ticketRefund): get ticketFk front ticketService 2023-08-17 08:42:04 +02:00
Alex Moreno 1ec51d94cf refs #5134 feat: correct sql 2023-08-11 12:53:43 +02:00
Sergio De la torre a6047d257b refs #5134 feat:modelsSalix 2023-08-11 12:45:18 +02:00
Alex Moreno 9ef4ba9bef refs #5134 feat: add saleMistake model 2023-08-11 12:32:49 +02:00
Sergio De la torre 6eb88f8ab7 refs #5134 feat: models 2023-08-11 11:58:30 +02:00
Jorge Penadés 27ab6639c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-10 13:26:42 +02:00
Alex Moreno afc0c98065 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-08-10 11:05:37 +02:00
Carlos Satorres f70b767506 Merge branch 'dev' into 5976-transferSale_call_setDeleted 2023-08-09 08:05:46 +00:00
Jorge Penadés 132640cddf Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-08 15:10:40 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Alex Moreno ce78fc8e5d refs #5986 feat: state model add classColor properties 2023-08-08 15:06:28 +02:00
Alex Moreno 19c09d60a2 refs #5986 feat(ticket_filter): add classColor column 2023-08-08 15:04:21 +02:00
Alex Moreno 0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted 2023-08-08 07:10:25 +02:00
Alex Moreno 00fcd3a800 refs #6083 feat: add lilium ticketSms 2023-08-07 14:03:07 +02:00
Alex Moreno e85cddec3c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-08-07 10:19:27 +02:00
Alex Moreno 26d6bbff4c refs #5929 hotFix: add UserError 2023-08-07 10:04:46 +02:00
Guillermo Bonet eeb68e1ad9 Merge branch 'dev' into test 2023-08-04 08:54:41 +00:00
Alex Moreno 700ba4a7b1 refs #5914 feat(transferInvoiceOut): optimization 2023-08-04 08:22:43 +02:00
Carlos Satorres 1308efb98d Merge branch 'dev' into 5690-redondeo_ticketProblems 2023-08-04 01:21:52 +00:00
Jorge Penadés 725fe674c0 refs #5914 WIP fixing transacticions 2023-08-03 14:01:50 +02:00
Guillermo Bonet 602f57bca9 Merge branch 'test' into master 2023-08-03 08:54:32 +00:00
Guillermo Bonet aab0771e6e refs #5995 Removed my code in closure.js 2023-08-02 14:37:38 +02:00
Alex Moreno fd9b842e6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-08-02 13:58:40 +02:00
Guillermo Bonet 16353dfddc refs #5995 First commit 2023-08-02 07:35:40 +02:00
Jorge Penadés bd122e6327 refs #5014 WIP trasactions added 2023-08-01 16:13:24 +02:00
Carlos Satorres 2bde94a667 Merge branch 'dev' into 5690-redondeo_ticketProblems 2023-08-01 11:40:29 +00:00
Jorge Penadés 3ef74cab5c refs #5914 WIP created transferInvoiceOut 2023-08-01 12:45:57 +02:00
Carlos Satorres 79d88facc3 refs #4764 add test front 2023-08-01 12:33:56 +02:00
Alex Moreno 30c5e8d8cc hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0 2023-08-01 11:11:29 +02:00
Carlos Satorres 12acda0b1c refs #4764 ticketSerivce refund add 2023-07-31 11:06:19 +02:00
Jorge Penadés 22f76ec6a9 refs #5914 WIP clone method created 2023-07-31 10:33:51 +02:00
Jorge Penadés e63efa4f0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-07-31 10:32:41 +02:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut 2023-07-28 15:21:43 +02:00
Vicent Llopis 1d4ce2c703 refs #5804 fix: delete transaction 2023-07-28 12:24:24 +02:00
Carlos Satorres d01584bfb3 refs #4764 service 2023-07-27 15:15:55 +02:00
Vicent Llopis 65b9cadd9e refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker 2023-07-27 12:51:14 +02:00
Vicent Llopis 777426aa05 refs #5561 add backTest 2023-07-27 07:58:55 +02:00
Jorge Penadés 10361ba78e refs #5216 addExpeditionState refactored 2023-07-26 13:33:56 +02:00
Carlos Satorres 118f41c898 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-07-26 13:12:01 +02:00
Jorge Penadés bbc26d8ba4 WIP refs #5216 addExpeditionState 2023-07-26 12:36:30 +02:00
Jorge Penadés 0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-07-26 10:27:01 +02:00
Jorge Penadés 05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-07-26 10:22:32 +02:00
Jorge Penadés a0fee6ad50 refs #5929 removed useless vars 2023-07-26 09:20:54 +02:00
Jorge Penadés fa9dfdf411 refs #5216 try ACL updateExpeditionState 2023-07-25 16:32:38 +02:00
Jorge Penadés 96483a827f Merge branch 'dev' into 5929-editTicketPrice 2023-07-25 13:40:08 +00:00
Jorge Penadés 543fbf3c0a refs #5929 isEditableOrThrow created, tests passed 2023-07-25 15:35:08 +02:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created 2023-07-25 11:33:01 +02:00
Jorge Penadés ea4190f15c refs #5216 update expedition state added 2023-07-24 13:32:28 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors 2023-07-24 10:34:44 +02:00
Alex Moreno 23308d7ae3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-21 12:40:59 +02:00
Vicent Llopis 9bf891fcec refs #5561 fixed 2023-07-21 12:20:06 +02:00
Vicent Llopis f926c60017 remove file 2023-07-21 12:02:02 +02:00
Vicent Llopis 51f9055d23 remove file 2023-07-21 12:01:57 +02:00
Vicent Llopis cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE 2023-07-21 12:01:01 +02:00
Vicent Llopis f52b398596 refs #5561 refactor: sustituidos sql por loopback 2023-07-21 09:50:27 +02:00
Alex Moreno eb963ff993 refs #5866 fix(transferClient): correct variable name 2023-07-21 08:28:19 +02:00
Jorge Penadés 618989052a refs #5866 fix transferClient and test added 2023-07-20 15:15:33 +02:00
Vicent Llopis 7d2e98267f refs #5561 eliminados valores a piñon 2023-07-20 15:09:31 +02:00
Jorge Penadés 8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer 2023-07-20 12:34:16 +00:00
Vicent Llopis 8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel 2023-07-20 11:42:10 +02:00
Jorge Penadés 2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer 2023-07-20 08:23:07 +00:00
Jorge Penadés 9db8ae237f refs #5866 addBackTransferClient 2023-07-20 10:19:03 +02:00
Vicent Llopis 7312ed9cc4 refs #5244 fix back test 2023-07-20 09:56:07 +02:00
Vicent Llopis 04ca5743a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-07-20 09:40:41 +02:00
Vicent Llopis 4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved 2023-07-20 07:22:30 +02:00
Alex Moreno 8c84f006b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-07-20 07:15:30 +02:00
Alex Moreno 2c79056f34 refs #5976 error extended 2023-07-19 13:44:04 +02:00
Carlos Satorres 36c31af455 refs #5690 rounding translate 2023-07-19 12:38:13 +02:00
Carlos Satorres aaba4e74b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems 2023-07-19 12:00:59 +02:00