24001 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	ac57fed1c8	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-22 05:40:28 +00:00
Javier Segarra	0005d3329d	Merge branch 'dev' into 6930_scope_Default_Multimedia	2024-04-22 05:40:21 +00:00
Jon Elias	fa653f630c	Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration	2024-04-22 07:37:49 +02:00
Jon Elias	9759ee4bd0	refactor: refs #6899 requested changes	2024-04-22 07:37:47 +02:00
Sergio De la torre	e2a6f992cb	Merge pull request 'refs #6413 hotFix fix:ubicadorChecking' (!2337) from hotFix_Ubicador into master ... Reviewed-on: #2337 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-22 05:35:08 +00:00
Sergio De la torre	081c97828c	Merge branch 'master' into hotFix_Ubicador	2024-04-22 05:08:59 +00:00
Carlos Andrés	fd903f27c0	fix: descuentos en bs.ventas refs #6974	2024-04-21 16:01:32 +02:00
Ivan Mas	0615510a9c	refs #7021 Modify myt.config.yml	2024-04-19 15:28:53 +02:00
Guillermo Bonet	e7f81e99bc	Merge branch 'test' into dev	2024-04-19 14:40:26 +02:00
Guillermo Bonet	6c552b9ee0	Merge pull request 'feat: #7231 Collection_assing more time and throw' (!2341) from 7231-collectionProcsThrow into master ... Reviewed-on: #2341 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-19 12:37:30 +00:00
Juan Ferrer	a0126748e2	fix(binlog): refs #4409 Fix fixtures cursor name	2024-04-19 14:19:34 +02:00
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +02:00
Carlos Andrés	e3d96fef97	Merge pull request 'fix: hotfix importar A3 Ticket 175840' (!2339) from hotfix-importar-A3Ticket-#175840 into master ... Reviewed-on: #2339 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-19 12:12:58 +00:00
Ivan Mas	ad317cb5e5	refs #7021 Delete rfid schema	2024-04-19 14:11:35 +02:00
Carlos Andrés	e0cd08b280	fix: hotfix importar A3 Ticket 175840	2024-04-19 14:10:11 +02:00
Alex Moreno	bab2ee78c4	feat: refs #6428 auto-changelog with bash	2024-04-19 13:13:57 +02:00
Sergio De la torre	e6258dc9e5	refs #6413 hotFix fix:ubicadorChecking	2024-04-19 13:03:57 +02:00
Ivan Mas	00ce018ee3	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-19 09:47:53 +00:00
Javier Segarra	329f875640	feat(salix): refs #7190 Call renewtoken with tokenMultimedia	2024-04-19 11:36:49 +02:00
Javier Segarra	d2aba88a34	feat(salix): refs #7190 minor change salix-back	2024-04-19 11:36:34 +02:00
Robert Ferrús	5b027a88fa	feat: refs #6777 restore view	2024-04-19 11:33:33 +02:00
Robert Ferrús	e601310d3e	feat: refs #6777 restore view	2024-04-19 11:27:54 +02:00
Robert Ferrús	8be8dc8f74	Merge pull request 'feat: refs #7237 company_getSuppliersDebt' (!2336) from 7237-company_getSuppliersDebt into master ... Reviewed-on: #2336 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-19 09:13:23 +00:00
Robert Ferrús	28c08d8b18	feat: refs #7237 company_getSuppliersDebt	2024-04-19 10:58:19 +02:00
Robert Ferrús	d32ba92df0	Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 10:53:05 +02:00
Robert Ferrús	fb17a54ebd	feat: refs #6777 resotre view	2024-04-19 10:53:03 +02:00
Javier Segarra	b4503afc47	Merge branch 'dev' into 6930_scope_Default_Multimedia	2024-04-19 10:50:45 +02:00
Javier Segarra	30d0db163e	feat(salix): refs #6930 minor updates	2024-04-19 10:50:14 +02:00
Javier Segarra	322d91d814	feat(salix): refs #6930 Add DEFAULT scope	2024-04-19 10:49:57 +02:00
Robert Ferrús	cc6ad39398	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 07:54:29 +00:00
Alex Moreno	5e77d648fb	Merge branch 'master' into 174903-item_getSimilar	2024-04-19 07:39:06 +00:00
Alex Moreno	da7ab00c73	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 07:22:33 +00:00
Alex Moreno	5b5ec11973	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-19 08:58:17 +02:00
Jon Elias	9dedd5383c	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 06:10:49 +00:00
Javier Segarra	1b6f7a49fd	Merge pull request 'hotFix: change require to import' (!2328) from hotFix_ImportUserError_front into master ... Reviewed-on: #2328 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-19 05:53:09 +00:00
Jon Elias	f40c730f6e	refactor: refs #6899 changed comercial value in negativeBases	2024-04-19 07:52:43 +02:00
Robert Ferrús	44f36e640b	Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 07:48:47 +02:00
Robert Ferrús	067e71e3ce	feat: refs #6777 puppeteer	2024-04-19 07:48:45 +02:00
Alex Moreno	91e13070c7	fix: try to fix puppeteer	2024-04-19 07:27:54 +02:00
Robert Ferrús	c375223ae5	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 05:23:23 +00:00
Alex Moreno	8b468b52ea	fix: try to fix puppeteer	2024-04-19 07:21:35 +02:00
Alex Moreno	f766b9a3b1	fix: try to fix puppeteer	2024-04-19 07:17:53 +02:00
Carlos Andrés	27d59f4a8f	fix: descuentos en bs.ventas refs #6974	2024-04-18 19:12:24 +02:00
Sergio De la torre	f4afda8cb2	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 14:52:57 +00:00
Ivan Mas	7e488ee601	refs #7191 check isBooked in entry_BeforeUpdate	2024-04-18 16:09:05 +02:00
Alex Moreno	9ec51e534d	fix: jenkins puppeteer	2024-04-18 15:39:25 +02:00
Alex Moreno	87e23b49e7	hotFix: change require to import	2024-04-18 15:19:19 +02:00
Jon Elias	08ca1a302b	Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev ... Reviewed-on: #2323 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 12:55:58 +00:00
Robert Ferrús	f269d41596	Merge branch 'master' into 174903-item_getSimilar	2024-04-18 12:52:52 +00:00
Guillermo Bonet	bb8379f8db	refactor: refs #6724 Minor change	2024-04-18 14:42:29 +02:00