9591 Commits

Author	SHA1	Message	Date
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
Carlos Satorres	797a4e5df6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2	2024-07-03 08:51:14 +02:00
Sergio De la torre	7677ada925	Merge branch 'dev' into 7195_roadmap2	2024-07-03 06:46:10 +00:00
Javier Segarra	5c73a20f43	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 06:17:34 +00:00
Javier Segarra	946d6f553a	perf(salix): refs #7648 #7648 sql conventions	2024-07-03 08:16:55 +02:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Javier Segarra	adbbe4aef9	fix(salix): refs #7648 #7648 solve big bug	2024-07-03 01:46:01 +02:00
Javier Segarra	cc004a864a	feat(salix): refs #7648 #7648 rename some travel fields	2024-07-02 20:41:53 +02:00
Sergio De la torre	61265a45e3	Merge branch 'dev' into 7195_roadmap2	2024-07-02 11:25:46 +00:00
Sergio De la torre	e1b6ba4276	feat roadmap refs #7195	2024-07-02 12:03:21 +02:00
Javier Segarra	3539b5a33e	test(salix): refs #7648 #7648 remove fdescribe	2024-07-02 10:08:51 +02:00
Javier Segarra	30520cbe48	test(salix): refs #7648 #7648 getBuys.filter	2024-07-02 10:06:26 +02:00
Jorge Penadés	45573fed41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-02 09:57:10 +02:00
Javier Segarra	89a394a10d	test(salix): refs #7648 #7648 entry.filter	2024-07-02 09:52:18 +02:00
Javier Segarra	f41c2489d9	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 09:34:46 +02:00
Sergio De la torre	08cf79b09b	feat roadmap refs #7195	2024-07-02 08:39:42 +02:00
Javier Segarra	f27bdec758	feat(salix): refs #7648 #7648 changes requested	2024-07-01 21:14:27 +02:00
Sergio De la torre	d9742afc9b	feat roadmap refs #7195	2024-07-01 17:45:45 +02:00
Sergio De la torre	5992d7f53f	Merge branch 'dev' into 6861-Reservas-front	2024-07-01 14:39:19 +00:00
Javier Segarra	f0326860ba	feat(salix): refs #7648 #7648 add new fields	2024-07-01 14:07:46 +02:00
Javier Segarra	f47197cd80	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 14:06:28 +02:00
Jon Elias	0e84749c07	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-01 10:22:11 +00:00
Jorge Penadés	dcfc156209	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-01 11:56:30 +02:00
Carlos Satorres	0240734a4b	refs #6897 fix filter	2024-07-01 11:50:37 +02:00
Sergio De la torre	22959db0ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2	2024-07-01 11:28:14 +02:00
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Guillermo Bonet	ac54994760	Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev ... Reviewed-on: #2651 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-01 07:56:14 +00:00
Guillermo Bonet	5c8d8ba280	refs #7644 Added locales and changed name of method	2024-07-01 09:07:36 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Javi Gallego	355e426ccf	mail-alias-account con mixin	2024-07-01 07:19:00 +02:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Sergio De la torre	cbc00b90b9	feat front-reservas refs #6861	2024-06-26 14:02:25 +02:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Jorge Penadés	624f4707ac	feat: refs #7197 filter by correcting	2024-06-26 10:43:02 +02:00
Carlos Satorres	f9a09f3fec	Merge branch 'dev' into 7409-workerIncome	2024-06-26 08:00:58 +00: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
Jorge Penadés	1f6fd8d6d1	feat: refs #6286 check if is teamBoss	2024-06-25 17:27:00 +02:00
Jorge Penadés	93f2995d39	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Carlos Satorres	d1ed4b4459	refs #7409 fix back	2024-06-25 16:03:59 +02:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Carlos Satorres	f811e7e96c	Merge branch 'dev' into 7406-workerFormation	2024-06-25 10:39:38 +00:00
Carlos Satorres	95e1bba58b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 12:36:12 +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
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	2024-06-25 08:57:21 +02:00
Jorge Penadés	24cf23dddc	feat: refs #62add travelKgPercentage table and model	2024-06-21 13:16:01 +02: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
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Guillermo Bonet	b02a4721af	Merge branch 'test' into dev	2024-06-20 13:10:31 +02:00
Guillermo Bonet	074d4f4755	Merge branch 'master' into test	2024-06-20 13:10:07 +02:00
Guillermo Bonet	9a4ec46073	hotfix: refs #6820 Deleted km validation	2024-06-20 13:09:40 +02:00
Jon Elias	419de69690	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-20 12:24:06 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Jorge Penadés	4b8b503964	Merge branch 'master' into 6744-hotfix-showChangePass	2024-06-19 14:50:32 +00:00
Alex Moreno	7a0d107943	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 12:43:43 +00:00
Carlos Andrés	c596cae0c0	Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master ... Reviewed-on: #2592 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 12:22:32 +00:00
Jorge Penadés	905528a704	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6744-hotfix-showChangePass	2024-06-19 13:44:39 +02:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Javi Gallego	637c6a9035	feat: refs #7216 logUnpaid	2024-06-19 09:40:24 +02:00
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +02:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Jorge Penadés	3070d1ef01	refactor: refs #6238 drop useless round	2024-06-18 10:04:21 +02:00
Jorge Penadés	87feddaedb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage	2024-06-18 09:55:22 +02:00
Sergio De la torre	46cd20a1fd	feat hasItemOlder refs#6964	2024-06-18 08:24:15 +02:00
Alex Moreno	deb0f8e828	Merge branch 'dev' into 6897-entryMigration	2024-06-18 06:04:12 +00:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Alex Moreno	e8c7b55329	fix(WorkerIncome): refs #7409 fix models	2024-06-17 14:17:43 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Guillermo Bonet	39381a4a7c	Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev ... Reviewed-on: #2596 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-17 11:22:30 +00:00
Guillermo Bonet	eaaf83561c	fix: refs #5995 Optimized downloadCmrsZip	2024-06-17 13:03:02 +02:00
Jorge Penadés	4bc62a30bd	fix: refs #6744 back test	2024-06-17 12:23:01 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Robert Ferrús	cfa0b87898	feat: refs #7296 RoutesMonitor	2024-06-17 11:50:25 +02:00
Carlos Satorres	54b6ef491f	refs #7409 back	2024-06-17 10:23:30 +02:00
Pablo Natek	25afa80bab	fix: refs #6404 remove fixtures after test	2024-06-17 09:09:45 +02:00
Carlos Andrés	9b118f83e5	fix: asociar ticketRefund refs #7586	2024-06-14 17:56:24 +02:00
Jorge Penadés	202884fdce	feat: refs #6238 add travelKgPercentage table and model	2024-06-14 14:25:15 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Jon Elias	0bf384b2ce	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-14 07:06:30 +00:00
Jon Elias	d3f23a6d7a	fix: refs #6436 fix filter test	2024-06-14 09:04:18 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jorge Penadés	7717c38a45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 14:00:14 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Carlos Satorres	2d9092d2a5	Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-13 09:20:46 +02:00
Carlos Satorres	3c1544ac9d	refs #6897 fix es.yml	2024-06-13 09:20:43 +02:00
Robert Ferrús	5714539d78	Merge pull request 'test' (!2585) from test into dev ... Reviewed-on: #2585 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 07:18:55 +00:00
Jorge Penadés	e093808af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 09:10:36 +02:00
Carlos Satorres	2dc7e75aee	Merge branch 'dev' into 6897-entryMigration	2024-06-13 06:51:09 +00:00
Robert Ferrús	b5e139b734	fix: refs #7039 supplier search-panel country	2024-06-13 08:43:11 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Jorge Penadés	7480f5ecb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-12 16:54:03 +02:00
Carlos Satorres	b72de3570a	refs #6897 fix redirection	2024-06-12 14:41:35 +02:00
Carlos Satorres	ba67acb72b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-12 14:33:11 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Guillermo Bonet	dcb9d54105	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:48:01 +02:00
Alex Moreno	3ca71b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 10:38:02 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Jon Elias	2b45c2c61a	feat: refs #6436 new test changes, rollback order/filter and /ticket/clone	2024-06-12 08:25:50 +02:00
Alex Moreno	60d4372996	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 07:51:01 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Pablo Natek	11a7d890a0	Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ... Reviewed-on: #2577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 14:32:14 +00:00
Jorge Penadés	d7d6de73c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 15:41:06 +02:00
Javi Gallego	4744f57269	Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #2568 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:54:06 +00:00
Javi Gallego	79c922300b	hotfix #6408	2024-06-11 14:50:47 +02:00
Pablo Natek	13d1d0a61c	feat: refs #7499 add printedStickers	2024-06-11 14:29:16 +02:00
Robert Ferrús	8039530ab4	fix: refs #7039 fix item-tax	2024-06-11 14:15:10 +02:00
Jon Elias	944355d54f	refactor: refs #6436 end first wave of changes in modules	2024-06-11 13:17:19 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Jon Elias	665d03f048	refactor: refs #6436 user-config and some sections tests	2024-06-11 12:35:44 +02:00
Carlos Satorres	5d7a570c3f	refs #6897 fix redirection	2024-06-11 12:28:49 +02:00
Jon Elias	bd45352215	refactor: refs #6436 fourth wave	2024-06-11 12:02:15 +02:00
Jon Elias	093eaeb475	refactor: refs #6436 third wave	2024-06-11 10:45:46 +02:00
Jorge Penadés	902a9ee51b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 10:43:33 +02:00
Jon Elias	b3fa869757	refactor: refs #6436 second wave	2024-06-11 10:00:30 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Jon Elias	7df7382346	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-11 09:41:26 +02:00
Jon Elias	f0ad012835	refactor: refs #6436 first wave	2024-06-11 09:39:06 +02:00
Carlos Satorres	b38c5cdecc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-11 09:19:05 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Jorge Penadés	8e3cc574ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 15:21:59 +02:00
Javi Gallego	e081c4504d	feat: refs #7548 link a grafana	2024-06-10 14:51:48 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Jorge Penadés	7794f23c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 09:02:52 +02:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Jorge Penadés	ee1678ebb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-07 12:14:18 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Carlos Satorres	48550bd986	refs #6897 fix remove	2024-06-07 11:35:03 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Alex Moreno	379d7ef2ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-07 10:33:07 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-07 10:32:49 +02:00
Alex Moreno	6e17f3dca3	Merge branch 'master' into 6147-transferInvoice_split	2024-06-07 08:14:38 +00:00
Jorge Penadés	310c2383cb	fix: refs #6286 replace id for reason	2024-06-07 09:08:21 +02:00
Carlos Satorres	4508f7bfff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-07 08:53:28 +02:00
Carlos Satorres	cdc18ed84f	refs #6897 fix entry Salix	2024-06-07 08:32:59 +02:00
Jorge Penadés	1912fdd45d	refactor: refs #6286 replace name	2024-06-06 17:26:23 +02:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00
Jon Elias	c2e80060b3	Merge branch 'dev' into 6753-TicketsSaveSign	2024-06-06 07:51:23 +00:00
Jorge Penadés	14afd8246a	feat: refs #6273 add back test	2024-06-05 17:38:48 +02:00
Jorge Penadés	8188bdbcb0	fix: refs #6273 use userId	2024-06-05 17:12:37 +02:00
Jorge Penadés	a79285cd3d	feat: refs #6273 register freelance	2024-06-05 16:27:00 +02:00
Alex Moreno	a33f14ffa5	feat(transferInvoice): makePdf of refund	2024-06-05 12:44:28 +02:00
Javi Gallego	1fa22e71a9	feat: refs #7203 nombre variables	2024-06-05 12:42:55 +02:00
Javi Gallego	9b8fef2f20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-05 07:07:18 +02:00
Javi Gallego	143930bc86	fix: warmFix setDeleted checks ticketRequest not answered	2024-06-05 07:07:13 +02:00
Juan Ferrer	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00:00
Carlos Andrés	3a68cfef77	Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master ... Reviewed-on: #2540 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-04 17:14:51 +00:00
Sergio De la torre	f70605e565	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 16:03:37 +02:00
Carlos Andrés	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Javi Gallego	4089c7deb3	feat: refs #4560 minorChanges	2024-06-04 12:23:28 +02:00
Javi Gallego	da1b4649bb	feat: refs #4560 sin expeditionTruck	2024-06-04 11:58:39 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Alex Moreno	7a803cce37	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-04 09:38:50 +02:00
Alex Moreno	03201e1e2c	fix(ticket): throw error if id is null	2024-06-04 09:10:47 +02:00
Sergio De la torre	94aef434a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 07:17:37 +02:00
Sergio De la torre	882d5bf036	feat: roadMap refs #7195	2024-06-03 18:39:11 +02:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Jorge Penadés	a13581ed97	feat: refs #6243 Add warehouseFk parameter	2024-06-03 16:31:38 +02:00
Jorge Penadés	58053d8286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-03 15:22:08 +02:00
Alex Moreno	bbf027ede5	fix(operator): neq error	2024-06-03 15:01:06 +02:00
Alex Moreno	c445bcb0ba	build(operator): remove console.log	2024-06-03 14:39:32 +02:00
Alex Moreno	a73c98eebe	build(operator): console.log	2024-06-03 13:04:09 +02:00
Jorge Penadés	39dcb7d6a8	fix: refs #6889 check if has collection or sectorCollection	2024-06-03 10:30:20 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	1382b24c1d	refactor: refs #6600 add space	2024-06-03 09:38:35 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00
Jorge Penadés	68bb282659	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 08:30:41 +02:00
Sergio De la torre	b9a9f52514	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-03 07:56:43 +02:00
Guillermo Bonet	b9d04e9557	Merge branch 'dev' into 7126-improvedWaste	2024-06-03 05:22:15 +00:00
Sergio De la torre	1941d8f5b3	Merge branch 'dev' into 6832_refactorBackToItem	2024-06-03 05:04:05 +00:00
Jorge Penadés	dc8696b422	feat: refs #6889 add back tests	2024-05-31 16:31:36 +02:00
Jorge Penadés	836cfcbd07	refactor: refs #6889 sale tests e2e	2024-05-31 13:58:26 +02:00
Sergio De la torre	2985e1c9e8	feat: roadMap refs #7195	2024-05-31 13:08:48 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Carlos Satorres	e09a8f2eb7	refs #6897 remove code redirection	2024-05-31 12:41:38 +02:00
Javi Gallego	6a08a806a9	Merge branch 'dev' into 6408-rocketChat	2024-05-31 10:39:14 +00:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Robert Ferrús	85c328e522	fix: refs #7039 hotFixcountry	2024-05-31 10:07:27 +02:00
Alex Moreno	788f334e70	intros	2024-05-31 09:29:47 +02:00
Alex Moreno	bd82bb011a	fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests	2024-05-31 08:44:30 +02:00
Sergio De la torre	1944a4f308	Merge branch 'dev' into 4021_packaging	2024-05-31 06:43:20 +00:00
Jorge Penadés	eb15262fb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 08:37:28 +02:00
Sergio De la torre	db1c352be3	feat: packaging refs #4021	2024-05-30 18:06:35 +02:00
Jorge Penadés	002111d8d1	fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer	2024-05-30 11:47:12 +02:00
Jorge Penadés	5158017edd	fix: refs #6889 fix back tests	2024-05-30 11:21:42 +02:00
Jorge Penadés	05e6e10337	fix: refs #6889 fix back tests	2024-05-30 10:04:34 +02:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Javi Gallego	5e55f2d92d	feat: refs # 6408 test ok	2024-05-30 09:35:42 +02:00
Alex Moreno	f9d25ccd6c	hotFix(updateClaim): salesPerson undefined	2024-05-30 08:14:10 +02:00
Jorge Penadés	a32db7840e	feat: refs #6889 fixtures & models	2024-05-29 16:54:24 +02:00
Javi Gallego	d9d7904aaf	refs: #7108 weekends	2024-05-29 11:58:13 +02:00
Jorge Penadés	fc606f7e36	fix: refs #6889 rollback	2024-05-29 10:22:22 +02:00
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Jorge Penadés	d35bbe5c06	Merge branch 'dev' into 6942-improveInvoiceIn	2024-05-29 07:00:17 +00:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Carlos Andrés	dc3c92eef1	Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master ... Reviewed-on: #2519 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 11:34:04 +00:00
Jorge Penadés	56407e12a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-28 13:22:33 +02:00
Jorge Penadés	44e71b303c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-28 13:14:31 +02:00
Javi Gallego	1bcd7a9665	Merge branch 'dev' into 6408-rocketChat	2024-05-28 12:46:37 +02:00
Carlos Andrés	6e5b41a886	Hotfix contabilizar DUA Ticket #188682	2024-05-28 12:30:17 +02:00
Carlos Satorres	b95009899c	refs #7406 fix back	2024-05-28 12:22:11 +02:00
Javi Gallego	9ee05860f6	feat: #6408 tests	2024-05-28 12:19:54 +02:00
Alex Moreno	08856a9132	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-28 12:11:51 +02:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +02:00
Jorge Penadés	7cc86d5af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 14:36:18 +02:00
Carlos Satorres	578b8a2c71	refs #7406 changes sql, modelconfig model	2024-05-27 14:28:13 +02:00
Robert Ferrús	b404c7d101	Merge pull request 'test' (!2514) from test into dev ... Reviewed-on: #2514 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-27 12:11:12 +00:00
Robert Ferrús	f4426f5863	Merge branch 'test' into 7296-restoreExpeditionTruck	2024-05-27 12:05:49 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Guillermo Bonet	c7a324bc27	Merge branch 'test' into dev	2024-05-27 13:57:53 +02:00
Jorge Penadés	9ecba10446	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-27 13:57:35 +02:00
Guillermo Bonet	d384c5624f	refactor: refs #7486 Deleted unused debugAll	2024-05-27 13:57:27 +02:00
Jorge Penadés	c136f2783a	refactor: refs #6942 toUnbook & drop buyer acls	2024-05-27 12:34:27 +02:00
Carlos Satorres	208409acb2	refs #7406 add relation	2024-05-27 11:50:15 +02:00
Jorge Penadés	dc90ad6595	fix: refs #6942 acls & back	2024-05-27 10:48:32 +02:00
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +02:00
Jorge Penadés	c76fd15f07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-24 08:46:16 +02:00
Carlos Satorres	2fc6f6356f	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:38:27 +00:00
Carlos Satorres	a435d88e55	refs #7292 fix tback	2024-05-24 08:37:46 +02:00
Carlos Satorres	a5079a5ae0	Merge branch 'dev' into 6095-refFk-null-on-search	2024-05-24 06:26:46 +00:00
Sergio De la torre	cee8fdd784	refs #6832 fix: ToItem	2024-05-23 16:56:35 +02:00
Carlos Satorres	84582120d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 16:12:55 +02:00