25240 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	37646e0c48	Merge branch 'dev' of https: refs #8099//gitea.verdnatura.es/verdnatura/salix into 8099-AddSalarySupplements	2024-11-19 07:07:43 +01:00
Javi Gallego	7a9bcf11e2	Merge pull request 'refactor: refs #7457 Added from param if not exists' (!2502) from 7457-orderFilter into dev ... Reviewed-on: #2502 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-19 05:33:34 +00:00
Pablo Natek	b70b69557e	fix: refs #7457 empty commit for gitea	2024-11-19 06:30:19 +01:00
Pablo Natek	056b5adddc	Merge branch 'dev' into 7457-orderFilter	2024-11-19 05:12:18 +00:00
Guillermo Bonet	8d4769d74d	feat: refs #8057 More precision in getGeo	2024-11-18 13:34:20 +01:00
Guillermo Bonet	cdcc5051d2	feat: refs #8057 Fix version	2024-11-18 13:09:33 +01:00
Guillermo Bonet	2b770c0201	feat: refs #8057 Fix version	2024-11-18 12:56:37 +01:00
Guillermo Bonet	aed4bc89c7	feat: refs #8057 Fix version	2024-11-18 12:53:36 +01:00
Guillermo Bonet	baadd621e1	Merge pull request 'feat: refs #8057 Added geoFk columns' (!3204) from 8057-geoFk into dev ... Reviewed-on: #3204 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-11-18 11:47:53 +00:00
Javier Segarra	3f6a23fe35	Merge pull request '#7289 Sales already moved' (!3212) from 7289_sales_already_moved into dev ... Reviewed-on: #3212 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-18 10:40:54 +00:00
Javier Segarra	4b64b27ca7	Merge branch 'dev' into 7289_sales_already_moved	2024-11-18 10:39:17 +00:00
Jorge Penadés	433f883700	Merge pull request 'feat: refs #6869 define model' (!3172) from 6869-createGetDetails into dev ... Reviewed-on: #3172 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-18 10:08:20 +00:00
Pablo Natek	d2b545aaae	Merge branch 'dev' into 7457-orderFilter	2024-11-18 10:05:29 +00:00
Guillermo Bonet	66009ee0dd	Merge branch 'dev' into 8057-geoFk	2024-11-18 09:52:55 +00:00
Guillermo Bonet	754c0cb9ab	Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk	2024-11-18 10:52:44 +01:00
Guillermo Bonet	a64f9b74ec	feat: refs #8057 Requested changes	2024-11-18 10:52:41 +01:00
Jorge Penadés	dd637b9333	fix: refs #6869 use id as primaryKey	2024-11-18 10:34:23 +01:00
Jorge Penadés	5e78317b5e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails	2024-11-18 10:15:35 +01:00
Javier Segarra	f471f7e76c	Merge branch 'dev' into 7289_sales_already_moved	2024-11-18 10:10:57 +01:00
Javier Segarra	9558d030ff	feat: refs #7289 #7289 remove bad translation	2024-11-18 10:10:30 +01:00
Robert Ferrús	5e21e4e368	Merge pull request 'feat: refs #8127 entry_getCommission' (!3128) from 8127-entry_updateComission into dev ... Reviewed-on: #3128 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-18 08:48:50 +00:00
Robert Ferrús	329488d700	Merge branch 'dev' into 8127-entry_updateComission	2024-11-18 08:46:49 +00:00
Guillermo Bonet	2b97c18412	Merge branch 'dev' into 6869-createGetDetails	2024-11-18 08:34:11 +00:00
Sergio De la torre	7d5928bc3d	Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev ... Reviewed-on: #3210 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-18 08:21:18 +00:00
Guillermo Bonet	e81727f3f8	Merge branch 'dev' into 8057-geoFk	2024-11-18 07:58:51 +00:00
Guillermo Bonet	353ca659cd	feat: refs #8057 Requested changes	2024-11-18 08:58:38 +01:00
Javier Segarra	6c00efae89	feat: refs #7289 #7289 apply option 1	2024-11-17 17:57:54 +01:00
Pablo Natek	60f989b566	Merge branch 'dev' into 7457-orderFilter	2024-11-15 11:56:54 +00:00
Pablo Natek	55daa2d02b	Merge pull request '7743-simpleTestForSendMail' (!3170) from 7743-simpleTestForSendMail into dev ... Reviewed-on: #3170 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 11:54:23 +00:00
Guillermo Bonet	b529ccfe29	feat: refs #7920 Added ItemShelving in shelvingLog	2024-11-15 12:43:15 +01:00
Robert Ferrús	923296e85e	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:34:34 +00:00
Guillermo Bonet	a3945070f2	refactor: refs #7920 No changes in itemShelvingLog table	2024-11-15 11:34:18 +01:00
Robert Ferrús	c5f1b05671	feat: refs #8127 quitar esquemas	2024-11-15 11:32:20 +01:00
Robert Ferrús	f7a5fc7e31	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:06:45 +00:00
Pablo Natek	86e4e3e981	Merge branch 'dev' into 7743-simpleTestForSendMail	2024-11-15 09:26:42 +00:00
Sergio De la torre	07318656b7	feat: refs #8135 refs#8135 updateTicketACL	2024-11-15 08:47:30 +01:00
Guillermo Bonet	e1a091535e	refactor: refs #7920 Fix version	2024-11-15 08:45:28 +01:00
Sergio De la torre	7a4455d6d0	feat: refs #6869 refs#6869 itemShelving_get	2024-11-15 08:12:16 +01:00
Guillermo Bonet	b5463e5560	refactor: refs #7920 Fix version	2024-11-15 07:54:33 +01:00
Guillermo Bonet	e49285ace8	refactor: refs #7920 Fix version	2024-11-15 07:51:37 +01:00
Guillermo Bonet	e344ae3bf2	refactor: refs #7920 Fix version	2024-11-15 07:48:17 +01:00
Guillermo Bonet	216b81adda	Merge pull request 'refactor: refs #7920 Main change' (!3194) from 7920-itemShelving into dev ... Reviewed-on: #3194 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:44:16 +00:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Pablo Natek	d8e728e823	Merge branch 'dev' into 7457-orderFilter	2024-11-15 06:17:04 +00:00
Guillermo Bonet	96b85701d8	Merge pull request 'refactor: refs #7950 Created cmr model' (!3180) from 7950-cmrModelUnify into dev ... Reviewed-on: #3180 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:07:16 +00:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Guillermo Bonet	0fbef4c88a	Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev ... Reviewed-on: #3198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:01:48 +00:00
Guillermo Bonet	3b48cf3d5d	Merge pull request 'feat: refs #8151 moveExpeditions' (!3200) from 8151-moveExpeditions into dev ... Reviewed-on: #3200 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 05:59:19 +00:00
Jorge Penadés	7e2194df41	Merge pull request 'fix: refs #6818 add defaultChannel' (!3205) from 6818-addDefaultChannel into dev ... Reviewed-on: #3205 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:41:10 +00:00
Jorge Penadés	4b659c0b48	fix: refs #6818 use right col type	2024-11-14 16:39:35 +01:00