2469 Commits

Author	SHA1	Message	Date
Jorge Penadés	6b8a6c7a69	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:15:04 +00:00
Javi Gallego	0081c55b9e	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-13 10:56:33 +00:00
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
Alex Moreno	f07ac89cb6	refs #5976 add custom error	2023-07-18 15:01:04 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Alex Moreno	15dee8bef4	refs #5976 refactor: transaferSale call setDeleted	2023-07-17 15:19:36 +02:00
Vicent Llopis	28eedbfd23	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-14 11:04:06 +00:00
Vicent Llopis	75a66571ba	refs #5244 refactor: modificados todos los url='activeWith...'	2023-07-13 12:59:39 +02:00
Vicent Llopis	1d7f0e2135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-13 11:42:49 +02:00
Vicent Llopis	392dc5060a	refs #4770 delete test	2023-07-13 10:19:12 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	337ce56a60	refs #5887 test exlcuido	2023-07-13 08:37:11 +02:00
Alex Moreno	219a4fbca9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-12 13:09:58 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Vicent Llopis	bd85cf4e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-12 12:29:17 +02:00
Vicent Llopis	da13f0811c	refs 5887 cambiado drop y create por create or replace	2023-07-11 09:59:11 +02:00
Vicent Llopis	93e70e699a	refs #5874 feat: refactorizado proceso facturación	2023-07-11 09:19:15 +02:00
Alex Moreno	8922d27f20	refs #4614 fix e2e	2023-07-07 12:25:02 +02:00
Alex Moreno	8fe9b387ce	refs #4614 test: front and correct folder	2023-07-06 15:16:52 +02:00
Alex Moreno	be0120728d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-06 15:15:36 +02:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Alex Moreno	6530e87508	refs #4614 feat(ticket): prevent invoice without weight	2023-07-05 15:20:51 +02:00
Alex Moreno	040e9e4197	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight	2023-07-05 12:50:45 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Carlos Satorres	f42273006c	refs #4764 service ant	2023-07-05 07:36:01 +02:00
Carlos Satorres	3b81198a05	refs #4764 mod button	2023-07-04 13:57:52 +02:00
Carlos Satorres	6b813cb859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-07-04 11:54:19 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Carlos Satorres	d03df4c5cc	refs #5690 ticketproblems	2023-07-03 11:38:38 +02:00
Vicent Llopis	7b4e8570aa	refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker	2023-06-30 12:03:26 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Alex Moreno	5f42ee5f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 07:55:47 +02:00
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Vicent Llopis	011db142d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-29 12:49:55 +02:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Carlos Satorres	454cf30de7	refs #4764 boton save	2023-06-29 08:27:20 +02:00
Carlos Satorres	319c6af354	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-29 06:37:23 +02:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Alex Moreno	f8a972c2f2	refs #5094 fix translation	2023-06-27 14:48:22 +02:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Vicent Llopis	a699e2d874	refs #5244 feat: añadido 'depatments' como binding	2023-06-21 14:07:36 +02:00
Vicent Llopis	dd75302bbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-21 13:33:09 +02:00
Vicent Llopis	e99627c0b2	codigo innecesario	2023-06-20 11:28:25 +02:00
Vicent Llopis	cea6fae649	fix: eliminada variable que no estaba definida	2023-06-20 10:40:57 +02:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Carlos Satorres	8dd360bf1e	refs #4764 e2e solve	2023-06-19 08:46:15 +02:00
Vicent Llopis	55e123e795	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-16 11:45:08 +02:00
Carlos Satorres	fbe4441eda	refs #4764 e2e solve	2023-06-16 09:06:25 +02:00
Alex Moreno	50fe53fbb6	Merge branch 'test' into warnFix_ticket_sale_orderBy	2023-06-16 05:38:14 +00:00
Carlos Satorres	9b950cd8d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-16 07:23:41 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Carlos Satorres	b3022d0ce2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-14 17:47:56 +02:00
Sergio De la torre	c62e6fa0eb	refs #5651 packingSiteAdvanced	2023-06-14 10:51:22 +02:00
Juan Ferrer	961941ecb3	refs #5667 TicketRequest translations added/fixed	2023-06-13 20:52:26 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Carlos Satorres	58bcad7b2d	refs #4764 validator create	2023-06-12 12:42:30 +02:00
Carlos Satorres	c9bf74dcc4	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-12 09:56:34 +00:00
Alex Moreno	2c0c0f24b0	reactive	2023-06-12 08:36:19 +02:00
Alex Moreno	1a58424531	refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType	2023-06-12 08:33:31 +02:00
Alexandre Riera	48ee29568d	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-06-12 05:26:28 +00:00
Carlos Satorres	06d1334e1f	refs #4764 withWarehouse	2023-06-09 14:30:46 +02:00
Carlos Satorres	9ca82a2f79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-09 14:23:55 +02:00
Carlos Satorres	61d9e2dcd3	refs #4764 remake refund, back front	2023-06-09 14:19:17 +02:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Carlos Satorres	bdffc0401f	refs #5760 update getChanges, traduccion	2023-06-08 15:29:03 +02:00
Vicent Llopis	1e759119db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-08 11:13:07 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +00:00
Vicent Llopis	e2c7a38e82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-06-07 14:18:36 +02:00
Carlos Satorres	a34519f6d0	refs #4764 refundTicket	2023-06-07 14:12:04 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Carlos Satorres	d09075d490	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 05:57:05 +00:00
Vicent Llopis	391dba6d2c	refs #5561 feat: add async functions	2023-06-06 12:15:39 +02:00
Vicent Llopis	024cb1e3f4	refs #5561 feat: permite modificar registros	2023-06-06 11:56:14 +02:00
Carlos Satorres	05111c9268	hotfix test front	2023-06-06 11:43:14 +02:00
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Carlos Satorres	4d333c3a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-06-05 10:38:59 +02:00
Vicent Llopis	5eac9d20dc	a	2023-06-05 09:43:39 +02:00
Vicent Llopis	b253ea8edf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-06-05 09:40:23 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Vicent Llopis	67413360c6	refs #5561 feat: utilizar métodos bd	2023-06-02 13:31:41 +02:00
Vicent Llopis	ba64dbbe46	refs #5561 refactor: actualizados nombres	2023-06-02 12:20:29 +02:00
Vicent Llopis	02d2afcb8b	refs #5561 feat: permite coloear todos los circulos	2023-06-02 10:57:28 +02:00
Vicent Llopis	cf2bf0a17b	refs #5561 delete: codigo obsoleto	2023-06-02 08:23:44 +02:00
Vicent Llopis	d727ea83ab	refs # 5561 feat: cambiar url del crud-model	2023-06-01 15:31:16 +02:00
Vicent Llopis	0d85069e0f	refs #5561 feat: permite colorear	2023-06-01 15:01:38 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Vicent Llopis	3b4626ee74	a	2023-05-31 13:01:16 +02:00
Vicent Llopis	02665ec8e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-05-31 12:28:13 +02:00
Alex Moreno	9ebac5a3f8	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-05-31 09:40:32 +00:00
Alexandre Riera	eeadd72cc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-05-31 09:53:56 +02:00
Carlos Satorres	d6c588d7eb	Merge branch 'dev' into 5398-fixErrorWarehouses	2023-05-30 14:02:54 +00:00