17188 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Guillermo Bonet	a6b730ecc2	Merge branch 'test' into dev	2023-09-18 09:54:33 +02:00
Guillermo Bonet	4c5b97d448	Merge branch 'master' into test	2023-09-18 09:54:04 +02:00
Guillermo Bonet	73b79ed7b2	Merge pull request 'refs #5684 Fixed no error' (!1751) from 5684-updateDataHandledError into master ... Reviewed-on: #1751 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-18 07:50:01 +00:00
Sergio De la torre	3782170b9e	Merge pull request '5652-ItemTrash' (!1747) from 5652-ItemTrash into dev ... Reviewed-on: #1747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-18 05:44:30 +00:00
Guillermo Bonet	690df509d3	refs #5684 Fixed no error	2023-09-18 07:10:12 +02:00
Sergio De la torre	881a1ee0b8	refs #5652 modify: solved Tests	2023-09-15 11:24:17 +02:00
Sergio De la torre	0403c67bad	Merge branch 'dev' into 5652-ItemTrash	2023-09-15 05:47:00 +00:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Sergio De la torre	0b39265d14	Merge pull request 'refs #6141feat:buyer model' (!1748) from 6141-model-Buyer into dev ... Reviewed-on: #1748 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 15:35:06 +00:00
Sergio De la torre	3cf4168e76	Merge branch 'dev' into 6141-model-Buyer	2023-09-14 11:50:07 +00:00
Javi Gallego	ca2257d29b	subo version 2340	2023-09-14 13:47:04 +02:00
Javi Gallego	0d78e5506b	Merge pull request 'dev' (!1750) from dev into test ... Reviewed-on: #1750	2023-09-14 11:40:17 +00:00
Javi Gallego	45d78307b9	Merge pull request 'move sql' (!1749) from fixSQL into dev ... Reviewed-on: #1749 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 11:33:36 +00:00
Carlos Satorres	11109d72a6	move sql	2023-09-14 11:36:09 +02:00
Javi Gallego	eff0975eb2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-14 10:27:03 +02:00
Javi Gallego	82631d6fcd	claimingRate divide por 100	2023-09-14 10:26:59 +02:00
Javi Gallego	e1b03172fb	Merge pull request 'test' (!1744) from test into dev ... Reviewed-on: #1744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 07:32:24 +00:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	4c1ff2e4d7	refs #6141feat:buyer model	2023-09-14 08:27:49 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Carlos Satorres	5536e06ed1	Merge pull request '4764-serviceAbono' (!1505) from 4764-serviceAbono into dev ... Reviewed-on: #1505 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-13 09:47:34 +00:00
Carlos Satorres	12dff3e248	Merge branch 'dev' into 4764-serviceAbono	2023-09-13 08:52:59 +00:00
Javi Gallego	7bd3bfddc3	fix sin bankEntity ya no falla	2023-09-13 07:07:22 +02:00
Pablo Natek	e1cc254f82	Merge pull request 'refs #6131 constraint' (!1708) from 6131-duplicatedProvince into dev ... Reviewed-on: #1708 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-12 14:53:50 +00:00
Pablo Natek	d9088885e7	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-12 14:47:38 +00:00
Javi Gallego	e25e0aad63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-12 15:44:12 +02:00
Javi Gallego	f8149a988c	e2e invoiceIn basicData fixed	2023-09-12 15:44:05 +02:00
Sergio De la torre	1d25355423	refs #5652 fix:without fit	2023-09-12 08:44:42 +02:00
Pablo Natek	37c57af2ed	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-11 17:27:10 +00:00
Pablo Natek	1b158bea67	refs #6131 unique constraint country-name	2023-09-11 19:28:05 +02:00
Sergio De la torre	5f5a0645be	refs #5652 feat:itemTrash_new	2023-09-11 16:16:49 +02:00
Carlos Satorres	b9dd442841	refs #4764 edit package-log	2023-09-11 10:52:16 +02:00
Carlos Satorres	a29b25cffd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-11 10:48:38 +02:00
Javi Gallego	08e97b6a19	Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev ... Reviewed-on: #1728 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-11 07:00:20 +00:00
Carlos Andrés	5f254ed841	Merge pull request '6176-book-entry-deleted' (!1738) from 6176-book-entry-deleted into dev ... Reviewed-on: #1738 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-08 09:39:10 +00:00
Carlos Satorres	2d2d6b77db	refs #4764 changelog	2023-09-07 13:38:51 +02:00
Carlos Satorres	c2f73eb548	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-07 13:38:38 +02:00
Carlos Andrés	4784e71350	refs #6176 book entry deleted	2023-09-07 13:21:03 +02:00
Carlos Andrés	ea771cb910	refs #6176 book entry deleted	2023-09-07 11:30:01 +02:00
Juan Ferrer	15d471bf99	Merge pull request 'test' (!1742) from test into master ... Reviewed-on: #1742	2023-09-07 09:20:39 +00:00
Pablo Natek	0a1a36018b	Merge pull request 'refs #5881 changes' (!1741) from 5881-fixerror into test ... Reviewed-on: #1741 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-07 09:17:10 +00:00
Pablo Natek	da9182783d	refs #5881 changes	2023-09-07 11:02:47 +02:00
Javi Gallego	fc7e393546	Merge pull request 'test' (!1740) from test into master ... Reviewed-on: #1740	2023-09-07 07:43:51 +00:00
Javi Gallego	b96a7f5850	Merge pull request 'master' (!1739) from master into test ... Reviewed-on: #1739	2023-09-07 06:56:12 +00:00
Carlos Andrés	0465c2ca54	Merge branch 'dev' into 6176-book-entry-deleted	2023-09-06 19:27:02 +00:00
Carlos Andrés	0d2db7749f	refs #6176 book entry deleted	2023-09-06 21:22:10 +02:00
Carlos Satorres	c09a2e075e	Merge pull request 'refs #6194 change link' (!1737) from 6194-changeURLGoLabel into master ... Reviewed-on: #1737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-06 12:48:31 +00:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Sergio De la torre	8218eb2a6b	refs #5652 feat:itemTrash_new	2023-09-06 09:37:41 +02:00