17904 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Sergio De la torre	0028dd150a	refs #5134 feat:models	2023-10-11 17:12:55 +02:00
Javi Gallego	393d1889f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-11 14:06:32 +02:00
Javi Gallego	df9d6fd6f8	efectue con acento	2023-10-11 14:06:28 +02:00
Carlos Satorres	0007843394	Merge pull request 'refs #6293 traducción' (!1787) from 6293-hotfixRounding into master ... Reviewed-on: #1787 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-11 10:26:39 +00:00
Carlos Satorres	86b382b533	Merge pull request 'refs #5768 trad choose address' (!1762) from 5768-incoterms into dev ... Reviewed-on: #1762 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-11 10:10:07 +00:00
Carlos Satorres	cba8a48d18	Merge branch 'dev' into 5768-incoterms	2023-10-11 10:05:45 +00:00
Carlos Satorres	0023561acb	refs #6293 traducción	2023-10-11 12:04:12 +02:00
Guillermo Bonet	6b1dded222	refs #6199 Requested change, position of input	2023-10-11 08:28:52 +02:00
Guillermo Bonet	d41233efaf	refs #6199 Requested change, name of color	2023-10-11 07:59:05 +02:00
Guillermo Bonet	2b41bf7eb1	refs #6199 Requested changes	2023-10-11 07:39:41 +02:00
Guillermo Bonet	d2ce920f13	refs #6199 Added minQuantity in catalog and more	2023-10-10 13:49:11 +02:00
Carlos Satorres	4adee11c63	refs #5768 remove comment	2023-10-10 12:35:34 +02:00
Carlos Satorres	93db2663a8	Merge pull request 'hotfix length sales' (!1785) from 4764-hotfixServices into master ... Reviewed-on: #1785 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-10 10:33:00 +00:00
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Guillermo Bonet	03afea3b8e	refs #6199 Added minQuantity in item	2023-10-10 10:51:02 +02:00
Guillermo Bonet	1a2b58af9c	Merge pull request 'refs #5662 Add email modified-collection-volumetry' (!1743) from 5662-CollectionVolumetryNotify into dev ... Reviewed-on: #1743 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-10-10 07:45:38 +00:00
Carlos Satorres	1adfa33a9a	hotfix length sales	2023-10-06 14:52:30 +02:00
Guillermo Bonet	47747ee236	Merge branch 'dev' into 5662-CollectionVolumetryNotify	2023-10-06 06:55:14 +00:00
Pablo Natek	23019df6fb	Merge pull request 'refs #6213 fixCreateError' (!1746) from 6213-supplierFixCreateErrors into dev ... Reviewed-on: #1746 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-06 06:24:02 +00:00
Pablo Natek	c4e3fdf510	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-10-06 06:03:03 +00:00
Pablo Natek	27f473a0cc	Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors	2023-10-06 08:03:38 +02:00
Pablo Natek	90fe65acc2	refs #6213 fixChanges	2023-10-06 08:03:37 +02:00
Alex Moreno	402ad39d5c	Merge branch 'dev' into 6260-User.password-NOT-NULL	2023-10-06 05:56:58 +00:00
Carlos Satorres	dea3bb7a98	Merge pull request 'refs #6282 left join' (!1784) from 6282-hotfixFreeLancer into master ... Reviewed-on: #1784 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-06 05:43:02 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Carlos Satorres	b8321c12c3	Merge pull request 'hotfix-change minus' (!1782) from hotfix-refundTicket into master ... Reviewed-on: #1782 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-06 05:02:51 +00:00
Carlos Satorres	62c7dc9db5	hotfix-change minus	2023-10-06 06:16:42 +02:00
Pablo Natek	e3d23c5c42	Merge pull request 'refs #4764 hotfix' (!1780) from 4764-ticketRefundhotFix into master ... Reviewed-on: #1780 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-05 13:46:29 +00:00
Pablo Natek	674fefeab5	refs #4764 ticket	2023-10-05 15:43:02 +02:00
Pablo Natek	2c2fa97631	refs #4764 ticketRefound	2023-10-05 15:35:59 +02:00
Pablo Natek	f52a6cb0c7	refs #4764 fixReport	2023-10-05 15:04:39 +02:00
Pablo Natek	f40185c2d4	refs #4764 hotfix	2023-10-05 14:24:52 +02:00
Carlos Satorres	3fbdae15b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-05 14:04:42 +02:00
Carlos Satorres	3b81b511c2	remove consolelog	2023-10-05 14:01:53 +02:00
Carlos Satorres	5b6eb0a2a6	refs #5768 add address, nickname, pdf, email	2023-10-05 14:01:07 +02:00
Juan Ferrer	903b9aa043	Merge pull request 'refs #6216 feat(ticket_sale): open filtered ticketLog' (!1772) from 6216-saleLog_open_ticketLog into dev ... Reviewed-on: #1772 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-10-05 11:44:59 +00:00
Pablo Natek	020de5d754	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-05 07:57:46 +00:00
Javi Gallego	726bc26a75	fixes #6260 vn-user quito campos redundantes	2023-10-05 09:40:05 +02:00
Alex Moreno	8d7eda5af3	refs #5673 fix: add development translation	2023-10-05 09:12:54 +02:00
Alex Moreno	7a6022efd4	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-05 06:31:54 +00:00
Jorge Penadés	d6d95b3533	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-05 06:29:26 +00:00
Jorge Penadés	abd087a3e3	Merge branch '6119-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-05 08:20:58 +02:00
Jorge Penadés	0d39471970	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-05 08:20:47 +02:00
Alex Moreno	9538841a30	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-05 07:28:02 +02:00
Alex Moreno	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00
Alex Moreno	7cd2e290ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-05 07:22:41 +02:00
Jorge Penadés	9d086f5433	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-04 13:55:28 +00:00
Jorge Penadés	7431e884fc	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-04 13:54:47 +00:00
Carlos Satorres	f2adbc1716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-04 13:54:18 +02:00