24881 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	69a34ab0fa	Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev ... Reviewed-on: #3135 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 10:25:41 +00:00
Pablo Natek	1731af13ea	Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc	2024-10-21 12:19:22 +02:00
Pablo Natek	e479873547	fix: restore cursor	2024-10-21 12:19:20 +02:00
Pablo Natek	92f699aac3	Merge branch 'dev' into fixNightProc	2024-10-21 09:37:07 +00:00
Pablo Natek	e38c061deb	fix: add date format on insert data	2024-10-21 11:36:44 +02:00
Jon Elias	d75a032d75	Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev ... Reviewed-on: #3094 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 09:34:53 +00:00
Jon Elias	158f701f1e	Merge branch 'dev' into Fix-ItemRequest	2024-10-21 09:31:29 +00:00
Guillermo Bonet	5d55fb287d	Merge branch 'test' into dev	2024-10-21 09:25:39 +02:00
Guillermo Bonet	dead904c19	Merge branch 'master' into test	2024-10-21 09:25:29 +02:00
Guillermo Bonet	ca81c2c440	Merge pull request 'fix: refs #230926 item_getSimilar' (!3133) from 230926-hotfix into master ... Reviewed-on: #3133 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 06:42:32 +00:00
Guillermo Bonet	bbc17d1ff8	fix: refs #230926 item_getSimilar	2024-10-21 08:33:16 +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
Carlos Satorres	a5bbdd7a01	Merge pull request 'fix: refs #7906 remake method' (!3109) from 7906-notDeleteZone into dev ... Reviewed-on: #3109 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 08:33:03 +00:00
Carlos Satorres	ed69604767	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 08:31:38 +00:00
Guillermo Bonet	939f083671	Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ... Reviewed-on: #3122 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-18 08:27:08 +00:00
Jon Elias	35621e9051	Merge pull request '#7010 added filter fields to show packing type field in ticket list' (!3024) from 7010-AddPackingField into dev ... Reviewed-on: #3024 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 07:40:35 +00:00
Carlos Satorres	5a14aed73a	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 07:40:04 +00:00
Jon Elias	3139d99130	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:30:43 +00:00
Guillermo Bonet	46c7745128	Merge pull request 'refactor: refs #7811 Deleted pm2' (!3127) from 7811-byePm2 into dev ... Reviewed-on: #3127 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-10-18 07:30:13 +00:00
Jon Elias	46993ad103	refactor: refs #7010 deleted distinct	2024-10-18 09:29:01 +02:00
Carlos Satorres	1273e895af	fix: refs #7906 fix test back	2024-10-18 09:27:43 +02:00
Carlos Satorres	8609e85ba1	Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev ... Reviewed-on: #3095 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 07:24:49 +00:00
Carlos Satorres	50a2f6081e	Merge branch 'dev' into 7986-workerMoto	2024-10-18 07:20:06 +00:00
Jon Elias	f68584b3fa	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 06:53:38 +00:00
Carlos Satorres	02dc952024	fix: refs #7906 add test	2024-10-18 08:28:08 +02:00
Robert Ferrús	8479dd76cd	Merge pull request 'feat: refs #8108 create tables itemTag' (!3102) from 8108-itemTags into master ... Reviewed-on: #3102 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-18 06:25:57 +00:00
Ivan Mas	d7fd1b7ee5	Merge pull request 'refactor: refs #7865 delete client.gestdocFk from TPV' (!3123) from 7865-deleteClientGestdocFkTPV into dev ... Reviewed-on: #3123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-18 06:22:58 +00:00
Ivan Mas	f4b041c9b1	Merge branch 'dev' into 7865-deleteClientGestdocFkTPV	2024-10-18 06:20:38 +00:00
Guillermo Bonet	44dc84be9f	Merge branch 'dev' into 7811-byePm2	2024-10-18 06:02:20 +00:00
Guillermo Bonet	93494c3eb0	refactor: refs #7811 Deleted pm2	2024-10-18 08:02:06 +02:00
Carlos Satorres	b15b2d578d	Merge pull request 'fix: refs #7230 producer fix' (!3112) from 7230-deliveryNoteProducer into dev ... Reviewed-on: #3112 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 05:56:29 +00:00
Carlos Satorres	541990efb7	Merge branch 'dev' into 7230-deliveryNoteProducer	2024-10-18 05:53:34 +00: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
Guillermo Bonet	a188efb1e3	refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile	2024-10-17 11:45:13 +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