23307 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	65ac02e468	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 05:47:35 +00:00
Guillermo Bonet	23732ab20a	Merge branch 'test' into dev	2024-07-24 07:42:08 +02:00
Guillermo Bonet	2086746eb0	fix: refs #7505 Visible COM	2024-07-24 07:34:52 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00
Robert Ferrús	bb40e6cbf3	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 04:54:00 +00:00
Pablo Natek	8a9fa58823	Merge pull request 'fix: refs #6403 take observation from ticket' (!2777) from 6403-fixObservation into master ... Reviewed-on: #2777 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-24 04:49:58 +00:00
Pablo Natek	795ca14def	Merge branch 'master' into 6403-fixObservation	2024-07-24 04:41:51 +00:00
Alex Moreno	1f9cacedad	Merge pull request 'fix: defaulter filter correct sql' (!2779) from 6943-fix_defaulter_filter into dev ... Reviewed-on: #2779 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-07-23 12:47:51 +00:00
Alex Moreno	1a3ed42bcd	fix: defaulter filter correct sql	2024-07-23 14:37:34 +02:00
Alex Moreno	4f32134001	add prefix	2024-07-23 14:19:20 +02:00
Guillermo Bonet	abfbf13440	fix: refs #7505 fix	2024-07-23 14:18:52 +02:00
Guillermo Bonet	a9aa47fef1	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 14:17:01 +02:00
Guillermo Bonet	5d2e9c6210	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 13:59:36 +02:00
Alex Moreno	eb18bd2400	fix: without path	2024-07-23 13:57:14 +02:00
Pablo Natek	bdfaf02c95	fix: refs #6403 fix delivery observation	2024-07-23 13:36:52 +02:00
Alex Moreno	a472059043	Merge branch 'dev' into hotFix_liliumRedirection	2024-07-23 11:34:51 +00:00
Guillermo Bonet	88724d6d8c	fix: refs #7505 visible_refresh support warehouse null	2024-07-23 13:08:49 +02:00
Pablo Natek	80b338228e	fix: refs #6403 take observation from ticket	2024-07-23 12:29:08 +02:00
Robert Ferrús	91db2dc0e0	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-23 09:55:44 +00:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Alex Moreno	d8df9bc959	Merge pull request 'build: dump db' (!2775) from 7773-dump into master ... Reviewed-on: #2775 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-23 09:45:24 +00:00
Robert Ferrús	bfc2d6f734	feat: refs #7716 travel_setDelivered	2024-07-23 11:38:05 +02:00
Alex Moreno	85b7254353	Merge branch 'master' into 7773-dump	2024-07-23 09:02:18 +00:00
Alex Moreno	e35ded5e35	hotFix: add summaryId to productionConfigLog & agencyLog	2024-07-23 11:01:57 +02:00
Alex Moreno	4cf52c5e80	Merge branch '7773-dump' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump	2024-07-23 10:48:13 +02:00
Alex Moreno	eb413af275	hotFix: collection assign	2024-07-23 10:48:12 +02:00
Alex Moreno	6167454097	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump	2024-07-23 10:39:36 +02:00
Alex Moreno	83fef59686	Merge branch 'master' into 7773-dump	2024-07-23 08:27:01 +00:00
Guillermo Bonet	bc49600e21	Merge branch 'test' into dev	2024-07-23 10:24:47 +02:00
Alex Moreno	71cd805b7e	build: dump db	2024-07-23 10:23:28 +02:00
Guillermo Bonet	fa10376bea	fix: refs #7662 assign	2024-07-23 10:21:09 +02:00
Guillermo Bonet	c6b49e2134	Merge branch 'test' into dev	2024-07-23 09:27:05 +02:00
Guillermo Bonet	04ff3e0cc7	fix: refs #7382 throw	2024-07-23 09:23:42 +02:00
Guillermo Bonet	bfd2b5aebb	fix: refs #7382 invoiceIn_booking change	2024-07-23 09:22:18 +02:00
Robert Ferrús	2a70df151a	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-23 07:16:28 +00:00
Alex Moreno	7c4032c859	Merge pull request '7773-testToMaster_2430' (!2774) from 7773-testToMaster_2430 into master ... Reviewed-on: #2774 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-23 06:21:01 +00:00
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Pablo Natek	aeb8d4dbea	Merge pull request '7129-fixFilter' (!2766) from 7129-fixFilter into test ... Reviewed-on: #2766 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-22 15:52:22 +00:00
Sergio De la torre	296fe3442d	Merge pull request 'master' (!2773) from master into test ... Reviewed-on: #2773 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 14:48:36 +00:00
Guillermo Bonet	3fc973dcee	Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev ... Reviewed-on: #2770 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 12:02:18 +00:00
Sergio De la torre	b6ae9a55f7	Merge pull request 'hotFix solve isPicked refs #6861' (!2772) from 6861_itemShelvingSaleReserve into master ... Reviewed-on: #2772 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 11:54:42 +00:00
Sergio De la torre	afbce80303	hotFix solve isPicked refs #6861	2024-07-22 13:42:42 +02:00
Carlos Andrés	33a71867bd	feat: refactor buyUltimate refs #7736	2024-07-22 13:39:48 +02:00
Carlos Andrés	b086cc7658	feat: refactor buyUltimate refs #7736	2024-07-22 13:34:04 +02:00
Pablo Natek	d152a58dda	Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter	2024-07-22 13:33:52 +02:00
Pablo Natek	b73eceb1c8	fix: refs #7129 fix backFilters	2024-07-22 13:33:51 +02:00
Pablo Natek	62ab72d6d5	Merge branch 'test' into 7129-fixFilter	2024-07-22 11:20:04 +00:00
Guillermo Bonet	513b4583b3	fix(deletExpeditions): merge test → dev	2024-07-22 12:49:50 +02:00
Guillermo Bonet	b9c57c2f0e	Fix	2024-07-22 12:45:57 +02:00
Guillermo Bonet	7e125cdba5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-22 12:36:29 +02:00