22934 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	2797a731c5	refs #6952 subName	2024-06-25 12:00:49 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +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	205d79f0a6	Merge branch 'dev' into 5855-temporaryTable	2024-06-25 06:13:16 +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	0284f3b1ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 07:30:20 +02:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00
Sergio De la torre	2012560d70	Merge pull request '7357_dipole_review' (!2615) from 7357_dipole_review into dev ... Reviewed-on: #2615 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-24 11:49:10 +00:00
Carlos Andrés	cf79711f6a	feat: previas con sitema de reservas refs #6861	2024-06-24 13:30:03 +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
Robert Ferrús	a170edcdef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-24 08:09:52 +02:00
Pablo Natek	ea0b0dc779	fix: business overlapping	2024-06-24 08:08:39 +02:00
Robert Ferrús	9022f62116	feat: refs #5855 changes required	2024-06-24 08:03:43 +02:00
Sergio De la torre	6a4b44733f	Merge branch 'dev' into 7357_dipole_review	2024-06-24 05:15:32 +00:00
Sergio De la torre	72ef84d6c2	Merge pull request 'feat itemShelving_filterBuyer refs #7023' (!2622) from 7023_itemShelving_filterBuyer into dev ... Reviewed-on: #2622 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-24 05:15:05 +00:00
Sergio De la torre	429149d4e0	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-24 05:05:27 +00:00
Alex Moreno	1dd0357a34	Merge pull request 'test to dev' (!2629) from test into dev ... Reviewed-on: #2629 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 12:33:58 +00: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
Jorge Penadés	24cf23dddc	feat: refs #62add travelKgPercentage table and model	2024-06-21 13:16:01 +02:00
Sergio De la torre	4131653700	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:02:36 +02:00
Sergio De la torre	3fa7eb1d2a	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:01:19 +02:00
Robert Ferrús	c42a21bc6f	fix: refs #19537 changes required	2024-06-21 11:47:34 +02:00
Robert Ferrús	fb58e8226d	Merge branch 'master' into 195937-icoterms	2024-06-21 08:52:14 +00:00
Sergio De la torre	ccc0dc2ee3	Merge branch 'dev' into 7357_dipole_review	2024-06-21 08:16:15 +00:00
Carlos Satorres	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +02:00
Pako Natek	fc0c03f01a	Merge pull request 'Warehouse name' (!2610) from 7420-supplierPackaging_reportSource_update into dev ... Reviewed-on: #2610 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-21 07:02:31 +00:00
Pako Natek	9694c80c09	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-21 07:00:16 +00:00
Javi Gallego	925e28115c	Merge pull request 'feat: refs #7555 remove account.password__' (!2624) from 7555-remove_account_password__ into dev ... Reviewed-on: #2624	2024-06-21 06:50:12 +00:00
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Alex Moreno	42b483e27e	feat: refs #7555 remove account.password__	2024-06-21 08:35:35 +02:00
Pako Natek	7347c50f8e	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-21 06:33:15 +00:00
Pako Natek	fe154b9ee8	sref	2024-06-21 08:32:22 +02:00
Sergio De la torre	da40b705c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review	2024-06-21 07:20:00 +02:00
Sergio De la torre	13952f60e1	feat boxPicking refs #7357	2024-06-21 07:18:10 +02:00
Javier Segarra	a303d22a18	Merge pull request '#6264 - FIX - Log renewToken when not success' (!2619) from 6264_log_tmp_renewToken into master ... Reviewed-on: #2619 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-21 05:17:18 +00:00
Guillermo Bonet	6874474207	Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ... Reviewed-on: #2394 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:05:20 +00:00