23068 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Sergio De la torre	31a2c3bbd1	Merge pull request 'feat itemShelvingSale refs #6861' (!2729) from 6861_reservas_gettickets into master ... Reviewed-on: #2729 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 10:34:40 +00:00
Robert Ferrús	c4fa37f499	Merge branch 'master' into 7722-deleteSms	2024-07-15 10:05:41 +00:00
Robert Ferrús	200a6714bb	fix: refs #7722 delete sms	2024-07-15 12:02:00 +02:00
Carlos Andrés	31f537ae28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas	2024-07-15 11:52:57 +02:00
Javier Segarra	87a3fb57fe	Merge pull request '#7648 - Filter entries by days' (!2722) from 7648_myEntries_filter into dev ... Reviewed-on: #2722 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 09:22:34 +00:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	199d8e0034	Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter	2024-07-15 09:59:58 +02:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Sergio De la torre	00a1a84205	Merge branch 'master' into 6861_reservas_gettickets	2024-07-15 06:27:52 +00:00
Carlos Satorres	88dcbc726b	Merge pull request 'fix(worker_new): fix countryFk' (!2728) from hotFix_workerNew_countryFk into master ... Reviewed-on: #2728 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 06:26:20 +00:00
Alex Moreno	aa3fbf0cb4	Merge branch 'master' into hotFix_workerNew_countryFk	2024-07-15 05:05:18 +00:00
Sergio De la torre	806dc40eb9	Merge branch 'master' into 6861_reservas_gettickets	2024-07-15 05:05:17 +00:00
Carlos Andrés	67b19ee4ca	hotfix: packaging ticket 199070	2024-07-14 09:08:14 +02:00
Javier Segarra	0ca4bffaf0	Perf: improve condition days filter	2024-07-13 18:07:46 +00:00
Javier Segarra	1d23554508	perf(ssalix): refs #7648 remove default value	2024-07-12 20:52:52 +02:00
Javier Segarra	5dcabd687e	feat(ssalix): refs #7648 clean test !entry.filter	2024-07-12 20:52:26 +02:00
Javier Segarra	c70824535a	feat(ssalix): refs #7648 clean fixtures	2024-07-12 20:52:00 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Carlos Andrés	49183c79f1	feat: Turn issues into calculated columns refs#7213	2024-07-12 16:47:24 +02:00
Guillermo Bonet	dcde6bb37a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-12 14:04:50 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Carlos Andrés	97e5bd7a31	Merge pull request 'hotfix: packaging ticket 199070' (!2727) from Hotfix-packaging-ticket-199070 into master ... Reviewed-on: #2727 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-07-12 11:36:40 +00:00
Sergio De la torre	cb107215b6	feat itemShelvingSale refs #6861	2024-07-12 13:14:00 +02:00
Carlos Andrés	d2e482d7cd	hotfix: packaging ticket 199070	2024-07-12 12:13:21 +02:00
Carlos Andrés	66959dd388	hotfix: packaging ticket 199070	2024-07-12 12:10:43 +02:00
Alex Moreno	896d273da8	fix(worker_new): fix countryFk	2024-07-12 12:06:37 +02:00
Robert Ferrús	58f8b4f714	Merge pull request 'feat: refs #7670 addSale' (!2679) from 7670-addSaleRenewPrice into dev ... Reviewed-on: #2679 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 09:46:33 +00:00
Robert Ferrús	4da811cba6	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 08:50:48 +00:00
Guillermo Bonet	323d26f226	Fix	2024-07-12 10:37:39 +02:00
Carlos Andrés	b93601d6d8	Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql	2024-07-12 08:27:24 +00:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	1531e27911	fix: refs #7704 Restored minimum quantity label	2024-07-12 10:00:52 +02:00
Guillermo Bonet	9b8e2e1279	Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev ... Reviewed-on: #2717 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 07:43:44 +00:00
Guillermo Bonet	f3612c7ee3	fix: refs #7580	2024-07-12 09:42:10 +02:00
Guillermo Bonet	5ed8b33cef	Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev ... Reviewed-on: #2700 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-12 07:34:45 +00:00
Robert Ferrús	8f2185e85a	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 07:31:05 +00:00
Guillermo Bonet	186cd4c7dd	refactor: refs #6769 Requested changes	2024-07-12 09:29:33 +02:00
Guillermo Bonet	910071bde0	refactor: refs #7704 Requested changes	2024-07-12 09:11:55 +02:00
Carlos Andrés	b883d0ee2b	Merge pull request 'feat itemShelvingSale refs #6861' (!2721) from 6861_reservas_retro into master ... Reviewed-on: #2721 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-12 07:08:02 +00:00
Sergio De la torre	21987011b6	feat itemShelvingSale refs #6861	2024-07-12 09:06:05 +02:00
Guillermo Bonet	b1290a539b	Merge pull request 'refactor: refs #7680 Added cursors' (!2723) from 7680-saleTicketSetProblem into dev ... Reviewed-on: #2723 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-12 07:04:52 +00:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Javier Segarra	47cff3f894	feat(ssalix): refs #7648 remove select field	2024-07-12 08:52:03 +02:00
Javier Segarra	5a8634356a	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 08:51:56 +02:00
Guillermo Bonet	05202e0b76	refactor: refs #7680 Added cursors	2024-07-12 08:15:09 +02:00
Robert Ferrús	bfe79eb1d1	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 06:07:24 +00:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Sergio De la torre	21cc43b690	Merge pull request 'feat: refs #7269 printLabel' (!2720) from 7269_printLabel into dev ... Reviewed-on: #2720 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-12 05:33:42 +00:00
Sergio De la torre	bf49b3f318	Merge branch 'dev' into 7269_printLabel	2024-07-12 05:24:08 +00:00