25353 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	495bb7e36e	Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-30 10:46:00 +02:00
Guillermo Bonet	857b1e9939	Merge branch 'test' into dev	2024-07-30 10:26:33 +02:00
Guillermo Bonet	e2c3539dfc	Merge branch 'master' into test	2024-07-30 10:26:17 +02:00
Guillermo Bonet	1f80117ff7	fix: refs #6861 Column	2024-07-30 10:24:50 +02:00
Guillermo Bonet	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Alex Moreno	f1628f26b9	Merge branch 'master' into 7679-postCode_town_addRequireds	2024-07-30 08:18:23 +00:00
Alex Moreno	b17b5a1b21	test: fix postcode filter back test	2024-07-30 10:15:09 +02:00
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Alex Moreno	2ac8760061	test: fix postcode filter back test	2024-07-30 10:13:32 +02:00
Jorge Penadés	c84f57ab6a	Merge pull request 'chore: refs #6989 add config model' (!2798) from 6989-showClientName into dev ... Reviewed-on: #2798 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-30 08:07:19 +00:00
Jorge Penadés	587b34f090	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6989-showClientName	2024-07-30 10:05:00 +02:00
Jorge Penadés	82c28e0399	chore: refs #7524 WIP limit call	2024-07-30 10:01:05 +02:00
Guillermo Bonet	18dc3873b8	feat: refs #7650 Added no transfer lines to inventory entry and fixtures	2024-07-30 09:54:43 +02:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +02:00
Alex Moreno	dbe0f4497c	fix(postcode_filter): add limit	2024-07-30 08:59:03 +02:00
Carlos Satorres	d26bc307ed	Merge pull request 'refs #7801 frenchGoLabel' (!2800) from 7801-franceGoLabel into master ... Reviewed-on: #2800 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-30 06:47:49 +00:00
Carlos Satorres	90f7cc0583	Merge branch 'master' into 7801-franceGoLabel	2024-07-30 06:44:17 +00:00
Alex Moreno	fcd26784bf	build: init version 2434	2024-07-30 08:37:35 +02:00
Alex Moreno	79c8ef7d11	Merge pull request '7806_devToTest_2332' (!2801) from 7806_devToTest_2330 into test ... Reviewed-on: #2801 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-30 06:14:08 +00:00
Carlos Satorres	6c1de1d6bd	refs #7801 frenchGoLabel	2024-07-30 07:55:14 +02:00
Carlos Andrés	9fc3516e52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-29 19:12:48 +02:00
Alex Moreno	434dfe4ae4	fix: refs #7679 postcode filter	2024-07-29 15:03:40 +02:00
Guillermo Bonet	a01ae9b7b8	fix: refs #7756 Foreign keys invoiceOut	2024-07-29 14:09:55 +02:00
Jorge Penadés	254cced550	chore: refs #6989 add config model	2024-07-29 13:40:30 +02:00
Guillermo Bonet	baa1498923	feat: refs #7712 sizeLimit	2024-07-29 13:29:26 +02:00
Guillermo Bonet	6ad3d5a5eb	feat: refs #6453 Minor changes	2024-07-29 12:36:08 +02:00
Guillermo Bonet	e53b12d51b	feat: refs #6453 Fixes	2024-07-29 12:31:44 +02:00
Guillermo Bonet	4c602800ea	feat: refs #6453 Added new ticket search	2024-07-29 11:46:59 +02:00
Alex Moreno	5264d6c973	feat(postcode_town): refs #7679 add requireds	2024-07-29 10:35:01 +02:00
Jorge Penadés	a95475ef61	Merge pull request '#7197 filter by correcting & supplierActivity' (!2641) from 7197-fixInvoiceIn into dev ... Reviewed-on: #2641 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-29 07:43:55 +00:00
Guillermo Bonet	5d91566cc0	Merge branch 'dev' into 7759-newDefiner	2024-07-29 09:42:47 +02:00
Jorge Penadés	4f385f16e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 09:40:34 +02:00
Guillermo Bonet	f9c58e63e1	Merge branch 'test' into dev	2024-07-29 09:24:57 +02:00
Guillermo Bonet	b013842750	Merge branch 'master' into test	2024-07-29 09:24:20 +02:00
Guillermo Bonet	c713c3a5c0	fix: refs #6861 Unhandled error	2024-07-29 09:21:35 +02:00
Jorge Penadés	ffd8e5e282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 08:05:55 +02:00
Guillermo Bonet	e0b9100de1	fix	2024-07-29 07:20:05 +02:00
Guillermo Bonet	6de9ea4b16	Merge branch 'dev' into 7759-newDefiner	2024-07-29 07:18:23 +02:00
Guillermo Bonet	403252ac39	Merge branch 'test' into dev	2024-07-26 14:07:15 +02:00
Guillermo Bonet	5c6df930cf	Merge branch 'master' into test	2024-07-26 14:07:01 +02:00
Guillermo Bonet	a4d3eec1e1	fix: refs #7580 Parking deadlock	2024-07-26 14:05:22 +02:00
Guillermo Bonet	c6bcf6f488	Merge branch 'test' into dev	2024-07-26 13:56:07 +02:00
Guillermo Bonet	ce8c355757	Merge branch 'master' into test	2024-07-26 13:55:47 +02:00
Guillermo Bonet	b876d1c278	feat: refs #7644 Added item reference	2024-07-26 13:52:18 +02:00
Alex Moreno	2505adf87f	hotFix: ticketAdvanced	2024-07-26 13:47:15 +02:00
Pablo Natek	54a5a91177	Merge branch '7781-fixPalletMerge' of https://gitea.verdnatura.es/verdnatura/salix into 7781-fixPalletMerge	2024-07-26 12:39:04 +02:00
Pablo Natek	ba494a77e6	fix: refs #7781 conditional	2024-07-26 12:39:00 +02:00
Pablo Natek	a49c36e179	Merge pull request 'feat: refs #7401 redirect lilium' (!2794) from 7401-routeToLilium into dev ... Reviewed-on: #2794 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 08:34:58 +00:00
Pablo Natek	cf84ce1337	feat: refs #7401 redirect lilium	2024-07-26 09:38:49 +02:00
Javier Segarra	0ab40dbfb2	Merge pull request '#7648 - HOTFIX: Add args to filter shipped value' (!2791) from hotfix_myEntries into master ... Reviewed-on: #2791 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 05:50:31 +00:00