21594 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	0b5f05cbed	refactor: refs #7375 Refactor clientsDisable	2024-05-17 12:36:54 +02:00
Guillermo Bonet	1154e484e5	Merge branch 'test' into dev	2024-05-17 09:57:35 +02:00
Guillermo Bonet	91784f2253	Merge branch 'master' into test	2024-05-17 09:57:19 +02:00
Guillermo Bonet	a99554c773	fix: Occasionally saleVolume bad index	2024-05-17 09:50:53 +02:00
Guillermo Bonet	bddc9a8386	Deleted insert into util.debug (deletedState)	2024-05-17 07:51:51 +02:00
Carlos Andrés	08ea0d2693	Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev ... Reviewed-on: #2467 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 18:13:39 +00:00
Carlos Andrés	dab90633db	Merge pull request 'test' (!2466) from test into dev ... Reviewed-on: #2466 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 17:21:54 +00:00
Carlos Andrés	8d8cfa24de	refs #7400 feat: book ledger with counters	2024-05-16 19:16:25 +02:00
Carlos Andrés	38c505fb7a	refs #7400 feat: book ledger with counters	2024-05-16 19:07:48 +02:00
Carlos Andrés	01d1a2391d	refs #7400 feat: book ledger with counters	2024-05-16 18:48:59 +02:00
Carlos Andrés	402506467b	Merge pull request 'master' (!2464) from master into test ... Reviewed-on: #2464 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 14:56:56 +00:00
Carlos Andrés	c5f2b3a384	Merge pull request 'fix: invoiceInTax_getFromEntries (referenceRate)' (!2462) from Hotfix-referenceRate-en-invoiceInTax_getFromEntries into master ... Reviewed-on: #2462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 12:53:27 +00:00
Carlos Andrés	2f4f199fad	fix: invoiceInTax_getFromEntries (referenceRate)	2024-05-16 14:40:02 +02:00
Ivan Mas	9b5b269fe6	Merge pull request 'refs #6965 Add Fk vehicleFk firstEditorFk' (!2433) from 6965-AddFkRoute-vehicleFk-firstEditorFk into dev ... Reviewed-on: #2433 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-16 11:41:31 +00:00
Ivan Mas	10d812ae3d	Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk	2024-05-16 11:34:18 +00:00
Ivan Mas	993dd0d8bd	refs #6965 Modify firstEditorFk NULL	2024-05-16 13:15:55 +02:00
Guillermo Bonet	115d1aaf85	Fix version	2024-05-16 08:10:53 +02:00
Guillermo Bonet	7e3861a02f	Merge branch 'test' into dev	2024-05-15 14:32:48 +02:00
Guillermo Bonet	049e8931ab	hotfix: Tmp fix item_getSimilar	2024-05-15 14:30:04 +02:00
Guillermo Bonet	c443872d1f	Merge pull request 'feat: refs #7264 Refactor proc itemShelvingRadar and added columns' (!2460) from 7264-itemShelvingRadar into dev ... Reviewed-on: #2460 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-15 12:18:10 +00:00
Guillermo Bonet	dfe317e78a	Merge branch '7264-itemShelvingRadar' of https://gitea.verdnatura.es/verdnatura/salix into 7264-itemShelvingRadar	2024-05-15 14:05:36 +02:00
Guillermo Bonet	9134e0ff65	feat: refs #7264 Minor change	2024-05-15 14:05:35 +02:00
Guillermo Bonet	ac2a0c5151	Merge branch 'dev' into 7264-itemShelvingRadar	2024-05-15 11:54:55 +00:00
Guillermo Bonet	53fa78894c	feat: refs #7264 Refactor proc itemShelvingRadar and added columns	2024-05-15 13:54:22 +02:00
Alex Moreno	8260016da5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-15 13:53:07 +02:00
Carlos Satorres	4b8cad9aef	hotfix accessScopes	2024-05-15 13:23:36 +02:00
Ivan Mas	c15f9b13f2	Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk	2024-05-15 11:17:11 +00:00
Ivan Mas	9ed90412de	refs #6965 Points to user instead of worker	2024-05-15 13:15:27 +02:00
Carlos Satorres	6387075413	Merge pull request 'hotfix accessScopes' (!2458) from hotfix-accesScopesPdf into master ... Reviewed-on: #2458 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-15 10:53:15 +00:00
Carlos Satorres	a4e1b1931c	hotfix accessScopes	2024-05-15 12:38:30 +02:00
Alex Moreno	53057863e1	Merge pull request 'testToMaster hotFix' (!2457) from test into master ... Reviewed-on: #2457 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-15 10:26:13 +00:00
Alex Moreno	dcc943e82d	hotFix(env): refs #7388 disable webpack nodeEnv	2024-05-15 12:19:01 +02:00
Alex Moreno	f442f0dafb	hotFix(env): refs #7388 install gettext-base	2024-05-15 11:52:50 +02:00
Robert Ferrús	23eea27268	Merge pull request 'feat: refs #7296 expeditionTruck to roadmapStop' (!2386) from 7296-expeditionTruck into dev ... Reviewed-on: #2386 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 09:06:47 +00:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00:00
Guillermo Bonet	778f368300	Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev ... Reviewed-on: #2429 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 08:19:34 +00:00
Alex Moreno	1c3c5e1423	Merge pull request 'hotFix: fix env' (!2454) from 7388_fix_front_env into test ... Reviewed-on: #2454 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-15 08:18:12 +00:00
Alex Moreno	a64d41fedb	Merge branch 'test' into 7388_fix_front_env	2024-05-15 07:02:48 +00:00
Alex Moreno	f368e00677	hotFix: fix env	2024-05-15 09:02:23 +02:00
Juan Ferrer	e469fb2da4	Merge pull request 'test' (!2456) from test into dev ... Reviewed-on: #2456	2024-05-15 06:57:05 +00:00
Juan Ferrer	af198e2832	Merge pull request 'master' (!2455) from master into test ... Reviewed-on: #2455	2024-05-15 06:56:48 +00:00
Alex Moreno	022d78e76c	hotFix: fix env	2024-05-15 07:53:42 +02:00
Carlos Andrés	df15e44442	Merge pull request '6974-sale_add' (!2452) from 6974-sale_add into master ... Reviewed-on: #2452 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-14 15:06:35 +00:00
Javi Gallego	0894cbd38c	Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev ... Reviewed-on: #2422 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-14 13:45:11 +00:00
Carlos Andrés	adaba6ecfb	refs #6974 refactor: optimize sale_add	2024-05-14 15:39:28 +02:00
Carlos Andrés	d0d710f023	refs #6974 refactorLoop	2024-05-14 15:36:09 +02:00
David Domenech	33ce0f2291	Merge pull request 'fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit' (!2450) from 7389-sipConf_callLimit into master ... Reviewed-on: #2450 Reviewed-by: David Domenech <davidd@verdnatura.es>	2024-05-14 12:29:59 +00:00
Juan Ferrer	b6f788a8db	fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit	2024-05-14 14:21:16 +02:00
Pako Natek	5fd2ef3cff	Merge pull request 'done' (!2432) from 7362-VIP into dev ... Reviewed-on: #2432 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-14 10:52:11 +00:00
Pako Natek	0adf6bfc45	Merge branch 'dev' into 7362-VIP	2024-05-14 10:50:59 +00:00