25389 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	4bd28c62b9	feat: refs #8119 Requested changes	2024-10-18 07:35:36 +02:00
Guillermo Bonet	865da7bba2	refactor: refs #8106 Requested changes	2024-10-18 07:15:26 +02:00
Alex Moreno	d93653372a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-18 07:12:18 +02:00
Alex Moreno	08e22db950	Merge pull request 'master' (!3125) from master into test ... Reviewed-on: #3125 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 05:09:32 +00:00
Guillermo Bonet	5017b344d4	Merge pull request 'refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile' (!3118) from 7930-healthcheckDockerfile into dev ... Reviewed-on: #3118 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-10-18 05:06:52 +00:00
Robert Ferrús	ddf7215084	Merge branch 'master' into 8108-itemTags	2024-10-18 04:57:37 +00:00
Sergio De la torre	90a3f369b6	Merge pull request 'fix: refs #6861 saleTrackingAdd' (!3121) from 6861-ReserveSaleTracking into master ... Reviewed-on: #3121 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-17 15:29:12 +00:00
Sergio De la torre	8df09bc64a	Merge branch 'master' into 6861-ReserveSaleTracking	2024-10-17 15:23:05 +00:00
Sergio De la torre	3463036086	fix: refs #6861 saleTrackingAdd	2024-10-17 17:20:21 +02:00
Ivan Mas	7dc35458e8	refactor: refs #7865 delete client.gestdocFk from TPV	2024-10-17 17:05:08 +02:00
Sergio De la torre	63c0ec308f	fix: refs #6861 saleTrackingAdd	2024-10-17 17:01:44 +02:00
Guillermo Bonet	28e957fecd	refactor: refs #8106 refs #1406 Optimized ticket_getTax	2024-10-17 14:46:19 +02:00
Sergio De la torre	cb53962405	fix: refs #6861 saleTrackingAdd	2024-10-17 13:58:21 +02:00
Robert Ferrús	0e2dcbce0c	Merge branch 'master' into 8108-itemTags	2024-10-17 11:31:52 +00:00
Robert Ferrús	faecbbb373	feat: refs #8108 saltos de linea	2024-10-17 13:08:58 +02:00
Sergio De la torre	989b68c33a	fix: refs #6861 setQuantity	2024-10-17 12:44:05 +02:00
Guillermo Bonet	a188efb1e3	refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile	2024-10-17 11:45:13 +02:00
Guillermo Bonet	f85267db92	feat: refs #8119 Fix test	2024-10-17 11:06:11 +02:00
Guillermo Bonet	2bd98b7fb6	feat: refs #8119 Minor change	2024-10-17 10:29:35 +02:00
Guillermo Bonet	8ca69d3574	feat: refs #8119 Minor change	2024-10-17 10:21:39 +02:00
Guillermo Bonet	41d078aaf1	feat: refs #8119 itemCampaignQuantity	2024-10-17 10:16:26 +02:00
Guillermo Bonet	3628abd5bf	feat: refs #8119 itemCampaignQuantity	2024-10-17 10:15:45 +02:00
Guillermo Bonet	410c6f2d83	Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity	2024-10-17 10:09:58 +02:00
Guillermo Bonet	ec13c41be3	feat: refs #8119 itemCampaignQuantity	2024-10-17 10:09:57 +02:00
Guillermo Bonet	a8525c5ba8	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-17 08:08:48 +00:00
Guillermo Bonet	999cb2dbb4	feat: refs #8119 itemCampaignQuantity	2024-10-17 10:08:27 +02:00
Alex Moreno	76415e507d	Merge pull request 'MASTER feat(Docuware): refs #8066 use oath' (!3084) from 8066-docuware_oauth into master ... Reviewed-on: #3084 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-17 07:09:07 +00:00
Pablo Natek	78ee7e141d	fix: refs #7457 remove translate and use param definition for restriction	2024-10-17 08:40:25 +02:00
Pablo Natek	a35c10adab	fix: refs #7457 error on empty from param and add translate	2024-10-17 08:35:24 +02:00
Pablo Natek	3ce8d21ed3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter	2024-10-17 08:19:06 +02:00
Jorge Penadés	de0fe37ffe	feat: refs #8083 add prop	2024-10-16 16:16:51 +02:00
Javi Gallego	681f82a3ae	feat: refs #7744 test back ok	2024-10-16 16:09:53 +02:00
Carlos Satorres	37d3ef5f16	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:13 +00:00
Carlos Satorres	67714f2dff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-10-16 13:59:04 +02:00
Carlos Satorres	3f3b936255	fix: refs #7906 remove code	2024-10-16 13:56:42 +02:00
Carlos Satorres	5de4a11e8b	fix: refs #7230 fix line	2024-10-16 13:53:20 +02:00
Carlos Satorres	3e443ad5ce	fix: refs #7230 producer fix	2024-10-16 12:22:57 +02:00
Carlos Satorres	a282170016	fix: refs #7906 fix method	2024-10-16 11:36:48 +02:00
Alex Moreno	cb7575d821	Merge pull request 'fix: refs #7353 redirect to lilium' (!3111) from 7353-fixRedirect into dev ... Reviewed-on: #3111 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-16 07:39:10 +00:00
Jorge Penadés	8f01e4d110	fix: refs #7353 redirect to lilium	2024-10-16 09:32:15 +02:00
Carlos Satorres	c5aa7dc44e	fix: refs #7906 edit test	2024-10-16 09:30:37 +02:00
Jorge Penadés	8ca097d4a9	chore: refs #7919 change var name	2024-10-16 09:23:39 +02:00
Javi Gallego	f78aad0874	Merge branch 'dev' into 7744-closeAllTest	2024-10-16 09:09:41 +02:00
Alex Moreno	c355fcfece	test(docuware_core): refs #8066 adapt	2024-10-16 09:03:47 +02:00
Javi Gallego	aac4dd0a6d	feat: refs #7348 minor bug	2024-10-16 08:52:27 +02:00
Alex Moreno	ccaec1a2cf	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth	2024-10-16 08:41:50 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Carlos Satorres	46e657675b	fix: refs #7906 remake method	2024-10-16 08:26:39 +02:00
Sergio De la torre	a989bef78c	Merge pull request 'master' (!3108) from master into test ... Reviewed-on: #3108 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-10-16 06:16:36 +00:00
Sergio De la torre	15622a3e68	Merge pull request 'fix: refs #6861 getTickets' (!3106) from 6861-itemShelvingSaleTickets into master ... Reviewed-on: #3106 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-16 05:58:52 +00:00