26041 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	f3cb2bd200	Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev ... Reviewed-on: #3380 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 07:33:30 +00:00
Jon Elias	603e3e32c4	fix: shipped field	2025-01-24 07:39:18 +01:00
Ivan Mas	13821b86ea	Merge pull request 'feat: refs #8342 deprecate sorter and splitLine tables' (!3377) from 8342-deprecateSorterAndSplitLineTables into dev ... Reviewed-on: #3377 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-23 11:40:55 +00:00
Ivan Mas	d98a867e12	Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables	2025-01-23 11:38:38 +00:00
Robert Ferrús	89de87c280	Merge pull request 'feat: refs #8398 sendCheckingPresence' (!3362) from 8398-mergeSendCheckingPresenceBack into dev ... Reviewed-on: #3362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:51:03 +00:00
Robert Ferrús	14e69c1c64	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-23 08:21:32 +00:00
Jon Elias	64c697da6c	Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev ... Reviewed-on: #3378 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:05 +00:00
Alex Moreno	8ebf68cc4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-23 08:34:08 +01:00
Alex Moreno	200a7cf995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-23 08:33:58 +01:00
Jon Elias	602e822599	refactor: refs #7184 deleted .value	2025-01-23 08:21:19 +01:00
Jon Elias	6d5a329b49	fix: refs #7184 fixed filter and test	2025-01-22 17:09:01 +01:00
Jon Elias	0eff155daf	refactor: refs #7184 created myteam filter and modified filters where it is used	2025-01-22 16:34:14 +01:00
Ivan Mas	43528a0a53	feat: refs #8342 deprecate sorter and splitLine tables	2025-01-22 13:04:16 +01:00
Alex Moreno	9d289fa11e	build: init version	2025-01-21 11:57:35 +01:00
Robert Ferrús	0e0db6591e	Merge pull request 'feat: refs #8401 create triggers to itemTaxCountry' (!3370) from 8401-itemTaxCountryTrigger into master ... Reviewed-on: #3370 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:37:13 +00:00
Robert Ferrús	77606468fd	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-21 10:07:28 +00:00
Robert Ferrús	405e0adaec	Merge pull request 'feat: refs #8447 create tables tag' (!3375) from 8447-createTableTags2 into master ... Reviewed-on: #3375 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 10:02:01 +00:00
Alex Moreno	ded035285b	Merge pull request '8448-devToTest' (!3373) from 8448-devToTest into test ... Reviewed-on: #3373 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-21 10:00:49 +00:00
Alex Moreno	05b383ecb0	test: refs #8448 fix e2e	2025-01-21 10:57:40 +01:00
Robert Ferrús	785a10a26a	feat: refs #8447 create tables tag	2025-01-21 09:34:56 +01:00
Sergio De la torre	6f73758cad	Merge pull request '7569-sendEmailOrderTicket' (!3350) from 7569-sendEmailOrderTicket into dev ... Reviewed-on: #3350 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 06:29:28 +00:00
Sergio De la torre	c50ff6a43a	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-21 07:05:42 +01:00
Sergio De la torre	eee73f001d	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 07:00:02 +01:00
Sergio De la torre	7f17cd59e7	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 06:58:15 +01:00
Sergio De la torre	ef68884fe0	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 16:27:35 +01:00
Sergio De la torre	b5e27707a7	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:36:31 +01:00
Sergio De la torre	0340612645	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:35:55 +01:00
Robert Ferrús	316a17304f	feat: refs #8401 restriction itemFk	2025-01-20 12:26:29 +01:00
Robert Ferrús	4b78c12ee4	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-20 10:26:14 +00:00
Robert Ferrús	cb065f42cd	feat: refs #8401 change request	2025-01-20 11:19:24 +01:00
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	86a2b1de1e	Merge branch 'master' into test	2025-01-20 08:10:29 +01:00
Guillermo Bonet	9584ffcf5b	feat: refs #7531 Added landed index	2025-01-20 08:10:12 +01:00
Guillermo Bonet	04180bf8da	Merge branch 'test' into dev	2025-01-20 07:52:04 +01:00
Guillermo Bonet	5998002420	Merge branch 'master' into test	2025-01-20 07:51:45 +01:00
Guillermo Bonet	fff6979921	Merge pull request 'feat: refs #7531 Added address_hasDelivery' (!3361) from 7531-addressHasDelivery into master ... Reviewed-on: #3361 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:51:18 +00:00
Guillermo Bonet	7a5ed0ff23	Merge branch 'master' into 7531-addressHasDelivery	2025-01-20 06:49:42 +00:00
Guillermo Bonet	934507569e	feat: refs #7531 Added comment	2025-01-20 07:48:43 +01:00
Guillermo Bonet	e6abb1d759	feat: refs #7531 Minor change	2025-01-20 07:41:41 +01:00
Guillermo Bonet	044a22bc3e	feat: refs #7531 Deleted address_hasDelivery	2025-01-20 07:13:04 +01:00
PAU ROVIRA ROSALENY	5ef1d615a7	Merge pull request 'feat: #8258 added uppercase validation on supplier create' (!3368) from 8258-uppercaseInputs into dev ... Reviewed-on: #3368 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:01:20 +00:00
Robert Ferrús	6c2071742c	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-19 07:38:25 +00:00
Robert Ferrús	5fe032ac75	feat: refs #8401 create triggers to itemTaxCountry	2025-01-19 08:30:14 +01:00
PAU ROVIRA ROSALENY	1cdeadb59d	feat: refs #8258 added uppercase validation on supplier create	2025-01-17 13:20:45 +01:00
Guillermo Bonet	e636d43f04	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:42:15 +01:00
Guillermo Bonet	a666cfa4cd	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:40:07 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Guillermo Bonet	1aa1fbda6c	feat: refs #7531 Added address_hasDelivery	2025-01-17 08:10:26 +01:00
Guillermo Bonet	69b78b6bf1	feat: refs #7531 Added address_hasDelivery	2025-01-16 15:04:21 +01:00
Javi Gallego	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00