21340 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	ba1a29ac88	feat(samba): refs #5770 #5770 Add new front field GroupDn in sambaConfig	2024-05-08 07:14:11 +02:00
Javier Segarra	e2e4e550d7	feat(samba): refs #5770 #5770 Add new field GroupDn in sambaConfig	2024-05-08 07:13:56 +02:00
Javier Segarra	91f73b916f	feat(samba): refs #5770 #5770 Create samba connection	2024-05-07 15:44:04 +02:00
Javier Segarra	84603bf000	Merge branch 'dev' into 5770_sambaGroups	2024-05-07 15:14:56 +02:00
Robert Ferrús	e5ba6a8673	Merge pull request 'feat: refs #179881' (!2421) from 179881-deleteProcedureFv_pca into dev ... Reviewed-on: #2421 Reviewed-by: Juanjo Breso <jbreso@verdnatura.es>	2024-05-07 12:39:51 +00:00
Robert Ferrús	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +02:00
Guillermo Bonet	0e8d2af741	Merge branch 'test' into dev	2024-05-07 13:19:18 +02:00
Guillermo Bonet	6e9ea9665d	Merge branch 'master' into test	2024-05-07 13:18:46 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Guillermo Bonet	20414c70ad	Merge pull request 'hotfix: #7173 Rollback' (!2418) from 7173-rollbackInvoiceInRestriction into master ... Reviewed-on: #2418 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 11:12:55 +00:00
Guillermo Bonet	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Jorge Penadés	4fb8a19936	Merge pull request '#6938 rollback phone' (!2417) from 6938-hotfix-rollbackHidePhone into master ... Reviewed-on: #2417 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:44:34 +00:00
Jorge Penadés	dce754a64b	Merge branch 'master' into 6938-hotfix-rollbackHidePhone	2024-05-07 10:41:50 +00:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +02:00
Jorge Penadés	1d9b6e489c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hotfix-rollbackHidePhone	2024-05-07 11:49:31 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Guillermo Bonet	3ed1c8f6fd	hotfix: ticket #181890 duaInvoiceInBooking	2024-05-07 11:35:07 +02:00
Guillermo Bonet	ef567bb167	fix: ticket #181920 catalog_componentCalculate	2024-05-07 10:03:33 +02:00
Alex Moreno	545f90c8b6	deploy: init version 2422	2024-05-07 08:36:29 +02:00
Alex Moreno	834d58c449	Merge pull request '7336_devToTest' (!2414) from 7336_devToTest into test ... Reviewed-on: #2414 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 06:26:51 +00:00
Alex Moreno	966b7794f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-07 08:03:37 +02:00
Alex Moreno	5d421cb4f0	Merge pull request 'dump: db dump' (!2413) from 7299_dump into master ... Reviewed-on: #2413 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-07 06:01:59 +00:00
Alex Moreno	56008ba51f	dump: db dump	2024-05-07 07:53:11 +02:00
Alex Moreno	878ee9e303	Merge pull request '7299_testToMaster' (!2411) from 7299_testToMaster into master ... Reviewed-on: #2411 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 05:30:41 +00:00
Alex Moreno	f23924e792	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-06 14:31:41 +02:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Javi Gallego	69766bbfeb	Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev ... Reviewed-on: #2409 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 12:00:14 +00:00
Javi Gallego	f9348b41ea	feat: #7109 inventoryType	2024-05-06 13:42:19 +02:00
Carlos Andrés	53a6de27cf	Merge pull request 'fix: Error workerTimeControl_direction Salix' (!2407) from 7330-Error-workerTimeControl_direction-en-Salix into master ... Reviewed-on: #2407 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 11:41:09 +00:00
Carlos Andrés	0b4ac51749	fix: Error workerTimeControl_direction Salix	2024-05-06 13:34:46 +02:00
Javi Gallego	faa4496d81	Merge pull request 'feat: #6382 chekCodeFormat' (!2351) from 6382-regularizar-Shelving-Parking into dev ... Reviewed-on: #2351 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-06 07:46:08 +00:00
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00:00
Javi Gallego	fe025b510d	Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev ... Reviewed-on: #2405 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 07:41:27 +00:00
Carlos Andrés	166f4da934	Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev ... Reviewed-on: #2331 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 17:08:07 +00:00
Carlos Andrés	e979defd92	fix: descuentos en bs.ventas refs #6974	2024-05-03 15:03:05 +02:00
Ivan Mas	5643a2e9e2	Merge pull request 'refs #7191 check isBooked in entry_BeforeUpdate' (!2329) from 7191-entry_BeforeUpdate-isBooked into dev ... Reviewed-on: #2329 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-03 12:59:12 +00:00
Ivan Mas	5d3235977f	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-05-03 12:57:26 +00:00
Javi Gallego	432b696305	feat: create isInformal	2024-05-03 14:57:09 +02:00
Pablo Natek	95aba9e7b3	Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ... Reviewed-on: #2292 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 11:52:22 +00:00
Pablo Natek	4c55ae40ef	Merge pull request 'test' (!2402) from test into dev ... Reviewed-on: #2402 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:58:42 +00:00
Pablo Natek	52c9015fca	Merge pull request 'fix: refs #6005 runtime' (!2401) from 6005-fix-runtime-error into test ... Reviewed-on: #2401 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:53:51 +00:00
Pablo Natek	bc366c950d	Merge branch '6005-fix-runtime-error' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:52:19 +02:00
Pablo Natek	3ae192c761	fix: refs #6005 fix test	2024-05-03 12:52:12 +02:00
Pako Natek	7d5b1708c1	Merge pull request 'defaultSector' (!2398) from productionConfig.defaultSectorFk into dev ... Reviewed-on: #2398 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 10:51:01 +00:00
Jorge Penadés	a9d434989d	Merge pull request '#7165 fix delivery-note css report' (!2389) from 7165-fixEmptySheet into dev ... Reviewed-on: #2389 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 10:50:54 +00:00
Pako Natek	38af3156ff	Merge branch 'dev' into productionConfig.defaultSectorFk	2024-05-03 10:48:50 +00:00
Jorge Penadés	19841f0e12	Merge branch 'dev' into 7165-fixEmptySheet	2024-05-03 10:48:43 +00:00
Pablo Natek	6152820078	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:47:14 +02:00
Pablo Natek	0dfb7f2825	Merge branch 'test' into 6005-fix-runtime-error	2024-05-03 10:34:52 +00:00
Pablo Natek	48bfba71de	fix: refs #6005 runtime	2024-05-03 12:33:59 +02:00