22299 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	a12b90e20b	feat: refs #7654 quitar esquema	2024-07-03 09:43:52 +02:00
Robert Ferrús	aba703f81b	Merge branch 'master' into 7654-entry_splitByShelving	2024-07-02 11:49:31 +00:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Robert Ferrús	cc4b925b4e	Merge branch 'master' into 7654-entry_splitByShelving	2024-07-02 06:46:37 +00:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Robert Ferrús	5c99d71215	Merge branch 'master' into 7654-entry_splitByShelving	2024-07-02 05:30:25 +00:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Robert Ferrús	1b5543bd62	feat: refs #7654 entry_splitByShelving	2024-07-01 13:26:33 +02:00
Guillermo Bonet	8409ffa950	fix: refs #7552 Hotfix	2024-07-01 10:26:46 +02:00
Guillermo Bonet	2bf06d8add	fix: refs #7552 Hotfix	2024-07-01 10:06:34 +02:00
Guillermo Bonet	f73176375b	Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master ... Reviewed-on: #2645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 05:30:31 +00:00
Guillermo Bonet	08c9d43b17	refs #7486 Declare exit handler fix collection_assign error	2024-06-28 13:30:08 +02:00
Pablo Natek	8e7cfb6391	Merge pull request 'fix: refs #6404 get label' (!2649) from 6404-fixtGetLabel into master ... Reviewed-on: #2649 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 07:19:51 +00:00
Pablo Natek	94a73294cb	fix: refs #6404 get label	2024-06-28 09:11:20 +02:00
Guillermo Bonet	9164901eac	refs #7640 Requested changes	2024-06-27 13:26:59 +02:00
Guillermo Bonet	e8dc6eafdc	refs #7640 multiple inventory	2024-06-27 10:18:43 +02:00
Pablo Natek	eade4b55e5	Merge pull request 'feat: refs #6404 add mail notification' (!2566) from 6404-sendMailOnDeadLine into master ... Reviewed-on: #2566 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 08:00:48 +00:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Jorge Penadés	cdcb347b05	Merge pull request 'fix: refs 197934 add alias' (!2643) from 195937-hotfix-addAlias into master ... Reviewed-on: #2643 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 15:25:14 +00:00
Jorge Penadés	0da6d633fd	fix: refs 197934 add alias	2024-06-26 17:21:22 +02:00
Guillermo Bonet	220f402f4e	Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master ... Reviewed-on: #2640 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 09:53:25 +00:00
Carlos Andrés	e75682e4d9	Merge pull request 'Hotfix-Ticket-197488-clonar-turnos' (!2638) from Hotfix-Ticket-197488-clonar-turnos into master ... Reviewed-on: #2638 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-26 09:33:18 +00:00
Robert Ferrús	ded7a5391f	Merge pull request 'fix: refs #7039 filterFix' (!2639) from 7039-hotFixFilterCountry into master ... Reviewed-on: #2639 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-26 08:24:59 +00:00
Guillermo Bonet	c4af92e9ba	horfix: ticket 197676	2024-06-26 09:54:51 +02:00
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Carlos Andrés	75486ae743	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:47:22 +02:00
Carlos Andrés	5bcdc57978	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:33:54 +02:00
Carlos Andrés	82118ae933	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:30:59 +02:00
Guillermo Bonet	2e1ab3af20	refs #7486 Fix same assign collection	2024-06-25 14:00:46 +02:00
Alex Moreno	89dba7c3c0	Merge pull request 'build: db dump' (!2635) from 7631_dump into master ... Reviewed-on: #2635 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-25 09:32:00 +00:00
Alex Moreno	6150f64e88	build: db dump	2024-06-25 09:29:42 +02:00
Alex Moreno	cf0f80142f	hotFix: create view vn.expeditionTruck	2024-06-25 09:24:34 +02:00
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	2024-06-25 08:57:21 +02:00
Alex Moreno	ece055ca1e	Merge pull request '7631_testToMaster_2426' (!2634) from 7631_testToMaster_2426 into master ... Reviewed-on: #2634 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-25 06:36:57 +00:00
Alex Moreno	3f327866ca	Merge branch 'master' into 7631_testToMaster_2426	2024-06-25 06:35:33 +00:00
Robert Ferrús	dfd53f73e5	Merge pull request 'fix: refs #7611 & ticket195937 incoterms' (!2613) from 195937-icoterms into master ... Reviewed-on: #2613 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 05:58:30 +00:00
Robert Ferrús	f2caa4bec9	Merge branch 'master' into 195937-icoterms	2024-06-25 05:55:26 +00:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00
Pako Natek	708937b99c	Merge pull request 'tested proc' (!2632) from supplierPackaging_ReportSource_masterHotFix into master ... Reviewed-on: #2632 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-06-24 10:52:45 +00:00
Pako Natek	6244509e3d	Merge pull request 'supplierPackaging_ReportSource_hotFix' (!2633) from supplierPackaging_ReportSource_hotFix into test ... Reviewed-on: #2633 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-06-24 10:50:49 +00:00
Pako Natek	c32a87126c	Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix	2024-06-24 10:50:31 +00:00
Pablo Natek	738ba11ad3	Merge pull request 'fix: business overlapping' (!2631) from fixBusinessOverlaping into master ... Reviewed-on: #2631 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-24 10:21:54 +00:00
Pako Natek	5f329fde38	or replace	2024-06-24 10:32:51 +02:00
Pako Natek	f999010c6c	tested proc	2024-06-24 10:32:12 +02:00
Pako Natek	8c5f468087	tested proc	2024-06-24 10:30:25 +02:00
Pablo Natek	ea0b0dc779	fix: business overlapping	2024-06-24 08:08:39 +02:00
Jorge Penadés	87b69e0455	Merge pull request '#6238 add scheme' (!2628) from 6238-warmfix-useDb into test ... Reviewed-on: #2628 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 11:40:11 +00:00
Jorge Penadés	5ef0dffa3e	fix: refs #6238 add scheme	2024-06-21 13:38:00 +02:00
Jorge Penadés	2d38c370a9	Merge pull request '#6238 add travelKgPercentage table and model' (!2626) from 6238-warmfix-addTable into test ... Reviewed-on: #2626 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 11:34:47 +00:00