1640 Commits

Author	SHA1	Message	Date
Pablo Natek	a3f92a284f	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-19 07:02:11 +00:00
Pablo Natek	2f93da199a	feat: refs #8138 reduce credit on risk	2024-11-19 08:01:41 +01:00
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Carlos Satorres	6619ec451c	fix: getSales	2024-11-18 13:46:56 +01:00
Javier Segarra	9558d030ff	feat: refs #7289 #7289 remove bad translation	2024-11-18 10:10:30 +01:00
Javier Segarra	6c00efae89	feat: refs #7289 #7289 apply option 1	2024-11-17 17:57:54 +01:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Guillermo Bonet	b3dcaf4cf5	feat: refs #8151 Requested changes	2024-11-14 10:53:13 +01:00
Guillermo Bonet	534b50f51a	feat: refs #8151 Requested changes	2024-11-14 10:45:28 +01:00
Guillermo Bonet	9c0af7f7c6	refactor: refs #7950 Requested changes	2024-11-14 07:57:13 +01:00
Guillermo Bonet	d4a60f63c9	feat: refs #8151 Added test	2024-11-13 14:05:03 +01:00
Guillermo Bonet	018393fa93	feat: refs #8151 Added test	2024-11-13 14:04:02 +01:00
Guillermo Bonet	344427da45	feat: refs #8151 moveExpeditions	2024-11-13 13:46:40 +01:00
Guillermo Bonet	3c8ef7cdba	refactor: refs #7950 Requested changes	2024-11-12 14:54:11 +01:00
Guillermo Bonet	6427a90c44	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-12 12:25:11 +00:00
Guillermo Bonet	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +01:00
Sergio De la torre	fd36f7ecc3	feat: refs #8150 movExpeditions	2024-11-08 10:44:01 +01:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Sergio De la torre	93feb74949	Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost	2024-10-28 10:22:23 +01:00
Guillermo Bonet	765d125219	Merge branch 'master' into test	2024-10-28 07:11:21 +01:00
Sergio De la torre	e775e56120	feat: refs #7921 refs#7921 sendLostExpedition	2024-10-25 13:48:27 +02:00
Guillermo Bonet	69e1df2504	fix: refs #235425 Requested changes	2024-10-25 08:47:43 +02:00
Guillermo Bonet	111480f7b7	fix: refs #235425 Requested changes	2024-10-25 07:22:36 +02:00
Sergio De la torre	11e13fdb20	feat: refs #7922 refs #792 scanOrder	2024-10-25 06:40:06 +02:00
Guillermo Bonet	4da11c65bb	fix: refs #235425 sale priceFixed update	2024-10-24 12:26:03 +02:00
Javier Segarra	070a5640df	fix: recalculatePrice not working with all ids	2024-10-24 08:16:04 +00:00
Alex Moreno	4660118211	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-24 07:47:41 +02:00
Jorge Penadés	43f8b22593	feat: refs #8083 add field	2024-10-23 16:10:00 +02:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Jorge Penadés	1efe258ea0	fix: refs #7524 filter by department	2024-10-21 14:30:45 +02:00
Jorge Penadés	2f77359892	Merge branch 'dev' into 7919-deleteTicketRefund	2024-10-21 11:00:31 +00:00
Jon Elias	158f701f1e	Merge branch 'dev' into Fix-ItemRequest	2024-10-21 09:31:29 +00:00
Jorge Penadés	cb4e8355ba	feat: refs #7524 myteam filter	2024-10-21 10:58:36 +02:00
Jorge Penadés	288dc1c598	feat: refs #7524 myteam filter wip	2024-10-21 10:05:58 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Jon Elias	9e9773578a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:22:35 +00:00
Jon Elias	3139d99130	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:30:43 +00:00
Jon Elias	46993ad103	refactor: refs #7010 deleted distinct	2024-10-18 09:29:01 +02:00
Jon Elias	f68584b3fa	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 06:53:38 +00:00
Javi Gallego	681f82a3ae	feat: refs #7744 test back ok	2024-10-16 16:09:53 +02:00
Jorge Penadés	8ca097d4a9	chore: refs #7919 change var name	2024-10-16 09:23:39 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Jorge Penadés	d57f4fc44a	chore: refs #7919 refactor, drop relation on back	2024-10-15 17:24:14 +02:00
Jorge Penadés	6f8a005726	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-15 17:01:29 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Jon Elias	e334152acc	refactor: deleted comment	2024-10-15 09:03:15 +02:00
Javi Gallego	976e50b566	feat: refs #8098 identation	2024-10-15 08:25:53 +02:00
Javi Gallego	4526873bbe	feat: refs #8098 without Date	2024-10-15 08:24:13 +02:00