22109 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	030106f06d	refactor: refs #7422 Deprecated column	2024-05-21 08:13:06 +02:00
Guillermo Bonet	b33d4ce319	Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev ... Reviewed-on: #2471 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-21 06:11:24 +00:00
Guillermo Bonet	ac2ed0956b	refs #7422 Fixed all problems	2024-05-21 08:04:28 +02:00
Guillermo Bonet	81c220d130	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-21 07:58:53 +02:00
Guillermo Bonet	cbf9a4c4e9	refs #7422 Fixed all problems	2024-05-21 07:58:51 +02:00
Pako Natek	0496c90d86	Merge pull request 'casting values' (!2479) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2479 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-21 05:52:34 +00:00
Pako Natek	f947b44da1	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-21 05:51:15 +00:00
Guillermo Bonet	93314d67b6	refs #7422 Fix	2024-05-21 07:31:24 +02:00
Guillermo Bonet	cc2b5764e9	refs #7422 Fix	2024-05-21 07:26:54 +02:00
Guillermo Bonet	82d985ff3a	refs #7422 Fix	2024-05-21 07:19:04 +02:00
Guillermo Bonet	8563116091	Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev ... Reviewed-on: #2478 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-21 05:06:12 +00:00
Pablo Natek	335b9caaa4	fix: refs #7187 got summary before lilium	2024-05-21 01:10:53 +02:00
Carlos Satorres	119102b0b3	refs #6820 acl	2024-05-20 16:00:38 +02:00
Jorge Penadés	50dbc5c515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 15:36:09 +02:00
Pablo Natek	38b1e48959	Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev ... Reviewed-on: #2485 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-20 12:27:48 +00:00
Alex Moreno	6212974154	Merge pull request 'feat: refs #7296 roadmapStop' (!2461) from 7296-expeditionTruckToRoadmapStop into dev ... Reviewed-on: #2461 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-20 12:24:21 +00:00
Pablo Natek	dab8ae92ef	Merge pull request 'fix: refs #6404 fix cancel shipment' (!2486) from 6404-mrwIntegrationWebService into dev ... Reviewed-on: #2486 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 12:02:48 +00:00
Pablo Natek	3fa557f90d	fix: refs #6404 create shipment	2024-05-20 13:58:32 +02:00
Robert Ferrús	823e8fd7a1	feat: refs #7296 requested changes3	2024-05-20 13:27:38 +02:00
Robert Ferrús	34f48e46e7	feat: refs #7296 requested changes2	2024-05-20 13:19:01 +02:00
Jorge Penadés	40762ba4aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 12:34:37 +02:00
Robert Ferrús	996f14341d	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-20 10:31:13 +00:00
Robert Ferrús	62ca4885c4	feat: refs #7296 requested changes	2024-05-20 12:28:27 +02:00
Pablo Natek	143f9cf0bb	fix: refs #6404 fix return	2024-05-20 12:17:10 +02:00
Pablo Natek	d51c9fc120	fix: refs #6404 fix cancel shipment	2024-05-20 12:14:59 +02:00
Robert Ferrús	623aa8d537	Merge branch 'dev' into 6281_buyFk	2024-05-20 09:38:11 +00:00
Pablo Natek	b203d94b27	feat: refs #6021 add new column	2024-05-20 11:37:40 +02:00
Alex Moreno	9cba2be00d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-20 11:31:24 +02:00
Alex Moreno	f361a07dd5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-20 11:31:03 +02:00
Alex Moreno	f82b105430	fix: TicketLog res.data	2024-05-20 11:30:43 +02:00
Carlos Satorres	2291c3ca86	Merge pull request 'master' (!2483) from master into test ... Reviewed-on: #2483 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 09:24:14 +00:00
Carlos Satorres	f9ecc687dd	Merge pull request 'hotfix TicketLog filter' (!2481) from hotfix-TicketLogs into master ... Reviewed-on: #2481 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 09:21:16 +00:00
Carlos Satorres	6d66c0f71f	hotfix TicketLog filter	2024-05-20 11:14:30 +02:00
Pako Natek	abdacb3627	casting values	2024-05-20 10:33:01 +02:00
Jorge Penadés	741c995c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 10:30:38 +02:00
Carlos Satorres	7f1210e712	refs #6820 fix back	2024-05-20 10:26:09 +02:00
Pako Natek	44ce998604	Merge pull request 'improved proc' (!2477) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2477 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-20 08:22:39 +00:00
Pako Natek	f1ae4d9f29	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-20 08:21:25 +00:00
Guillermo Bonet	7f0f1b9547	refactor: refs #7422 Deleted tables	2024-05-20 09:54:30 +02:00
Sergio De la torre	598a7eefbc	6281 feat:buyFk in itemShelving	2024-05-20 09:39:23 +02:00
Sergio De la torre	2b2406ae52	6281 feat:buyFk in itemShelving	2024-05-20 09:32:12 +02:00
Sergio De la torre	20bf2b73b6	6281 feat:buyFk in itemShelving	2024-05-20 09:27:20 +02:00
Sergio De la torre	dd76168bc3	6281 feat:buyFk in itemShekving	2024-05-20 09:15:24 +02:00
Sergio De la torre	b71984c53f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk	2024-05-20 09:13:44 +02:00
Jorge Penadés	480daea26f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 08:54:17 +02:00
Robert Ferrús	e67981b382	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-20 06:44:31 +00:00
Carlos Satorres	cbbd488674	Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev ... Reviewed-on: #2474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 06:27:33 +00:00
Pako Natek	9a5acedd38	improved proc	2024-05-20 08:21:54 +02:00
Guillermo Bonet	9d98ae4a03	Merge branch 'test' into dev	2024-05-20 07:02:00 +02:00
Guillermo Bonet	18ce388944	Merge branch 'test' into dev	2024-05-20 06:59:42 +02:00