1458 Commits

Author	SHA1	Message	Date
Alex Moreno	351a12204a	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 08:07:30 +00:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Javier Segarra	7723b244d0	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-18 07:17:51 +00:00
Javier Segarra	8d650cf6c0	refs #6172 test: remove message code	2023-12-18 08:09:44 +01:00
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javi Gallego	26a05a4840	fix: refs #3979 si se abona un abono sin almacen no falla	2023-12-14 09:14:21 +01:00
Javier Segarra	397eb4d32b	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 06:22:22 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Javier Segarra	7bdb1b2078	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-13 13:49:38 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Guillermo Bonet	3bdb002034	Merge branch 'dev' into 3222-expenceToExpense	2023-11-27 09:06:17 +00:00
Alex Moreno	824ca1d70a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-11-27 07:42:50 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Javi Gallego	aa0794e136	Merge branch 'dev' into 6275-silex-to-salix	2023-11-24 06:31:25 +01:00
Jorge Penadés	db15285858	refs #5811 test updated	2023-11-23 11:21:56 +01:00
Jorge Penadés	2e67ef4f5d	refs #5811 refactor deleteExpeditions	2023-11-23 10:32:07 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Jorge Penadés	26a8cc6a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-22 15:41:24 +01:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Alex Moreno	02e8b90926	refs #6454 test: fix e2e by dump	2023-11-21 10:12:07 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Alex Moreno	0ddfb28327	refs #5914 fix: transferInvoice	2023-11-20 07:56:15 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javi Gallego	3f7663da97	feat: refs #6275 crea back etExpeditionSummary	2023-11-15 10:09:04 +01:00
Pablo Natek	2a57f7e98a	Merge branch 'dev' into 6366-unifyTicketChangeState	2023-11-14 14:02:27 +00:00
Pablo Natek	0a5e8e1902	refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState	2023-11-14 14:49:54 +01:00
Carlos Satorres	f3faf37e1a	hotfix addressFk	2023-11-14 12:34:00 +01:00
Alex Moreno	bc6389fd66	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-14 09:00:12 +00:00
Alex Moreno	aec1c9d447	fix: correct align	2023-11-14 09:54:07 +01:00
Guillermo Bonet	2792efa9cd	perf: refs #6184 Requested changes	2023-11-13 08:36:05 +01:00
Carlos Satorres	a1c8bba4a5	hotfix addressId	2023-11-10 11:29:18 +01:00
Alex Moreno	2eacf7391e	refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls	2023-11-10 08:46:49 +01:00
Guillermo Bonet	05a7498219	Merge branch 'dev' into 6184-saveCmr	2023-11-09 13:14:21 +00:00
Guillermo Bonet	0771548ef1	refs #6184 Requested changes	2023-11-09 14:14:09 +01:00
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Alex Moreno	a523e32373	refs #6335 style(ticketAdvance): fix with split-progress	2023-11-03 07:57:53 +01:00
Sergio De la torre	728838334c	hotFix_6312 fix originalQuantity	2023-11-02 14:42:22 +01:00
Alex Moreno	740d2fb976	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-02 08:48:03 +01:00
Carlos Andrés	8c1ff26de7	Merge branch 'dev' into 5637-saleGroupLog	2023-10-31 11:12:40 +00:00
Robert Ferrús	6112c7ba5f	refs #5637 saleGroup traducciones	2023-10-31 09:59:34 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Alex Moreno	37dce99447	refs #6335 test(ticketAdvance): add test to keep price	2023-10-30 15:00:05 +01:00
Alex Moreno	a80715583c	refs #6335 feat(ticketAdvance): change the date if you can	2023-10-30 14:16:25 +01:00
Jorge Penadés	ab0640291b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState	2023-10-30 08:25:41 +01:00
Alex Moreno	bd8cc897c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-30 07:21:31 +01:00
Pablo Natek	14753212bb	fix(saveSign): refs #4131 remove call state on saveSign	2023-10-27 18:07:17 +02:00
Pablo Natek	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Sergio De la torre	7ae12327f5	refs #5134 fix: model ExpeditionScan	2023-10-27 16:16:22 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	42bbdf9814	feat(ticket.state): refs #4131 convert changeState to State	2023-10-27 13:41:32 +02:00
Pablo Natek	524ac4d99d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges	2023-10-26 22:16:06 +02:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00:00
Jorge Penadés	3a1227bdc2	ref #5914 fix ticketrefund	2023-10-26 09:20:25 +02:00
Jorge Penadés	da2bc416f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 08:26:35 +02:00
Alex Moreno	a501d577f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-25 09:23:00 +02:00
Alex Moreno	efa9f16452	fix: remove unnecessary UserError	2023-10-25 09:22:44 +02:00
Jorge Penadés	9f141238bc	ref #5216 add userFk	2023-10-24 11:47:54 +02:00
Alex Moreno	5442476f05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 10:35:11 +02:00
Jorge Penadés	f1deeb69ca	ref #5914 add ticketrefund and fix text	2023-10-24 09:34:04 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Alex Moreno	247aa5af2a	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:52:06 +02:00
Alex Moreno	cf856a585b	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:50:00 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Alex Moreno	1eabad7f4b	refs #6257 fix(saleQuantity): add isInPreparing restriction	2023-10-20 12:37:44 +02:00
Pablo Natek	75cfea4a2e	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 10:18:43 +00:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	84aed7ca21	refs #6257 fix(saleQuantity): newPrice correct restricction	2023-10-20 09:26:56 +02:00
Alex Moreno	d5f98700e7	refs #6287 fix: ticket new correct return type	2023-10-20 08:32:35 +02:00
Pablo Natek	9cb4e57951	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 05:31:12 +00:00
Carlos Andrés	16f20cea70	refs #6199 fix(sale): get minim price without grouping	2023-10-19 15:12:06 +02:00
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Jorge Penadés	e680a6a080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 10:00:43 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	da20697052	refs #6199 feat(sale_updateQuantity): can upload	2023-10-18 15:19:26 +02:00
Javi Gallego	44ce0a8730	refs #6312 no inserta el originalquantity	2023-10-18 13:46:41 +02:00
Pablo Natek	44bc30adf7	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-18 10:35:53 +00:00
Pablo Natek	2bb4300e1b	remove: se quita el console log refs #6278	2023-10-18 12:35:45 +02:00
Alex Moreno	a84f6fe1da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-18 12:05:04 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Jorge Penadés	ab6c58cd12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-16 08:18:00 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02: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
Guillermo Bonet	3e70cb07e0	refs #6184 Changes	2023-10-11 14:20:35 +02:00
Guillermo Bonet	c0089b1fa0	refs #6184 Added cmrFk in ticket model	2023-10-11 12:20:30 +02:00
Guillermo Bonet	d9339af87e	refs #6184 Insert in ticketCmr	2023-10-11 11:46:56 +02:00
Guillermo Bonet	3e522b08b6	refs #6184 Added saveCmr	2023-10-11 11:43:21 +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
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	542119983b	refs #5929 test: fix test after fix ticket_isEditable	2023-09-29 09:28:23 +02: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