22710 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	1799b52f8b	feat: refs #7622 Added type column addressWaste	2024-07-05 12:37:59 +02:00
Alex Moreno	aafe764d9d	Merge pull request 'fix: send rocket after commit cau 199307' (!2680) from warmFix_deleteSales_rocket into dev ... Reviewed-on: #2680 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-05 07:17:00 +00:00
Carlos Andrés	d6f6df48f2	Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev ... Reviewed-on: #2676 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-04 11:30:11 +00:00
Alex Moreno	776fd05648	fix: send rocket after commit cau 199307	2024-07-04 12:45:52 +02:00
Robert Ferrús	87e4a78092	Merge pull request 'feat: refs #7654 entry_splitByShelving' (!2673) from 7654-entry_splitByShelvingCreateColumn into dev ... Reviewed-on: #2673 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-04 09:20:14 +00:00
Robert Ferrús	9819744caf	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:34:31 +00:00
Guillermo Bonet	c2d899cd6a	Merge branch 'test' into dev	2024-07-04 09:33:08 +02:00
Guillermo Bonet	108a62f738	refs #7486 Fix tests	2024-07-04 09:32:56 +02:00
Robert Ferrús	58fab284f4	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:29:35 +00:00
Guillermo Bonet	58ba6d0f4c	Merge branch 'test' into dev	2024-07-04 09:26:49 +02:00
Guillermo Bonet	5a9850939e	Merge branch 'master' into test	2024-07-04 09:26:00 +02:00
Guillermo Bonet	009dcd8fc7	refs #7486 Fix tests	2024-07-04 09:23:57 +02:00
Robert Ferrús	897da1e48a	feat: refs #7654	2024-07-04 08:59:22 +02:00
Robert Ferrús	c696be4dda	Merge branch '7654-entry_splitByShelvingCreateColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn	2024-07-04 08:57:10 +02:00
Robert Ferrús	e897cdc35b	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 06:48:29 +00:00
Robert Ferrús	68871e6345	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn	2024-07-04 08:21:11 +02:00
Guillermo Bonet	5f7c7ae5dd	Merge branch 'test' into dev	2024-07-04 07:44:11 +02:00
Guillermo Bonet	af6422cf05	Merge branch 'master' into test	2024-07-04 07:43:58 +02:00
Guillermo Bonet	a7b653c42a	refs #7486 Fix collection_new	2024-07-04 07:34:41 +02:00
Robert Ferrús	ac01543b00	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 05:24:27 +00:00
Carlos Andrés	989fa5ac5a	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:10:02 +02:00
Carlos Andrés	d65af6aaaa	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:00:28 +02:00
Carlos Andrés	e202bea92f	Merge pull request 'hotfix-sale_getProblems-líneas-redondeo' (!2674) from hotfix-sale_getProblems-líneas-redondeo into master ... Reviewed-on: #2674 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 15:26:12 +00:00
Carlos Andrés	097350adb6	Hotfix sale_getProblems	2024-07-03 17:07:25 +02:00
Carlos Andrés	1ec7cd9540	Hotfix sale_getProblems	2024-07-03 16:59:01 +02:00
Carlos Satorres	5500a6f085	Merge pull request 'refs #6952 subName' (!2636) from 6952-productorItemPDF into dev ... Reviewed-on: #2636 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-03 12:43:46 +00:00
Robert Ferrús	4f9552379e	feat: refs #7654 entry_splitByShelving	2024-07-03 13:46:19 +02:00
Carlos Satorres	420daeba9f	Merge branch 'dev' into 6952-productorItemPDF	2024-07-03 11:26:11 +00:00
Guillermo Bonet	a0d524b22b	Merge pull request 'refactor: refs #7504 Rename id greuge' (!2669) from 7504-greugeId into dev ... Reviewed-on: #2669 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 11:17:18 +00:00
Jorge Penadés	c7f6ca6db9	Merge pull request '#7648 add myOpts' (!2672) from 7648-fix-addOpts into dev ... Reviewed-on: #2672 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-03 11:08:50 +00:00
Jorge Penadés	900fa2de5e	fix: refs #7648 add myOpts	2024-07-03 13:03:19 +02:00
Carlos Satorres	e6c1ec11d3	Merge branch '6952-productorItemPDF' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-03 12:52:39 +02:00
Carlos Satorres	dbc3bdbc97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-03 12:52:37 +02:00
Carlos Satorres	92163231b1	Merge pull request 'refs #6897 fix filter' (!2657) from 6897-entryMigration2 into dev ... Reviewed-on: #2657 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-03 10:15:03 +00:00
Carlos Satorres	fafebb4339	refs #6897 fix filter	2024-07-03 12:13:40 +02:00
Carlos Satorres	dd3a8d4b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2	2024-07-03 12:05:00 +02:00
Guillermo Bonet	2c39c2a6ba	Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev ... Reviewed-on: #2668 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 09:50:32 +00:00
Jorge Penadés	12f29aa50e	Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev ... Reviewed-on: #2277 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-07-03 08:51:56 +00:00
Guillermo Bonet	aaca2d12c5	refactor: refs #7504 Rename id greuge	2024-07-03 10:20:20 +02:00
Alex Moreno	4535795515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-03 10:08:15 +02:00
Alex Moreno	39f95e376b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-03 10:06:39 +02:00
Sergio De la torre	a0065dfc13	Merge pull request 'feat roadmap refs #7195' (!2666) from 7195_roadmap_t into test ... Reviewed-on: #2666 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-03 08:04:29 +00:00
Jon Elias	743fdb16da	Merge pull request '#6436 Definir funcion global que añada ctx' (!2232) from 6436_jasmine_beforeAll into dev ... Reviewed-on: #2232 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-03 07:56:17 +00:00
Guillermo Bonet	77d86c9fd9	feat: refs #7664 Added created in calendar table	2024-07-03 09:55:14 +02:00
Jon Elias	d01820c751	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:54:55 +00:00
Javier Segarra	d72a52d6b1	Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev ... Reviewed-on: #2659 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 07:29:00 +00:00
Sergio De la torre	1561e15d5e	feat roadmap refs #7195	2024-07-03 09:21:58 +02:00
Jon Elias	4bdbb3b08e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:13:21 +00:00
Jorge Penadés	1c6dd17f90	Merge branch 'dev' into 6449-addColumnLogTables	2024-07-03 07:10:41 +00:00
Sergio De la torre	947c28b988	Merge pull request '7195_roadmap2' (!2554) from 7195_roadmap2 into dev ... Reviewed-on: #2554 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 06:56:49 +00:00