25117 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	96a13af02c	Merge branch 'dev' into 8143-deprecateColumnsFromUser	2024-11-14 10:11:37 +00:00
Carlos Satorres	cd7ed6987a	Merge pull request 'fix: refs #7283 remove' (!2907) from 7283-itemsMigration3 into dev ... Reviewed-on: #2907 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-14 08:40:50 +00:00
Carlos Satorres	b0812139cb	Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-11-14 09:26:16 +01:00
Carlos Satorres	155616e622	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-11-14 09:26:13 +01:00
Ivan Mas	e1b0fc298c	feat: refs #8143 deprecate recoverPass and sync from account.user	2024-11-13 20:26:54 +01:00
Guillermo Bonet	782563f67d	Merge branch 'test' into dev	2024-11-13 12:19:42 +01:00
Guillermo Bonet	aa1c017f22	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 12:17:58 +01:00
Robert Ferrús	021bc03ecf	Merge pull request 'feat: refs #8169 create table itemTextureTag' (!3155) from 8169-itemTextureTag into master ... Reviewed-on: #3155 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-13 09:48:46 +00:00
Robert Ferrús	9b079a8bb2	Merge branch 'master' into 8169-itemTextureTag	2024-11-13 09:45:23 +00:00
Guillermo Bonet	172b4d8e05	Merge branch 'test' into dev	2024-11-13 09:40:30 +01:00
Guillermo Bonet	1086981b53	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 09:35:06 +01:00
Jorge Penadés	968e308ab6	Merge pull request 'feat: refs #6818 saysimple integration' (!3168) from 6818-saySimpleIntegration into dev ... Reviewed-on: #3168 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-13 08:25:20 +00:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Guillermo Bonet	ab2e35b64c	fix: refs #8153 Version	2024-11-13 07:12:49 +01:00
Guillermo Bonet	628b67e1e5	fix: refs #8153 Version	2024-11-13 07:10:52 +01:00
Guillermo Bonet	a426e9c7c6	Merge pull request 'refactor: refs #8153 Optimized order_getTax' (!3188) from 8153-order_getTaxOptimize into dev ... Reviewed-on: #3188 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-13 06:07:38 +00:00
Pablo Natek	d06be8b5b6	Merge pull request 'fix: problem calculation updated' (!3193) from hotFix-sale_getProblems into master ... Reviewed-on: #3193 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-11-13 05:56:30 +00:00
Pako Natek	ebc0420531	fix: problem calculation updated	2024-11-13 06:50:21 +01:00
Ivan Mas	fbd59de3cd	Merge pull request 'feat: refs #7994 remove comment script' (!3192) from 7994-removeCommentScript into master ... Reviewed-on: #3192 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-12 18:29:05 +00:00
Ivan Mas	4add10f3dd	feat: refs #7994 remove comment script	2024-11-12 17:52:51 +01:00
Guillermo Bonet	127c6fced0	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:25:51 +01:00
Guillermo Bonet	4891e98109	Merge pull request 'refactor: refs #7242 Deleted select column' (!3189) from 7242-unlocated into dev ... Reviewed-on: #3189 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-11-12 12:18:36 +00:00
Guillermo Bonet	2ece748138	refactor: refs #7242 Deleted select column	2024-11-12 13:13:13 +01:00
Guillermo Bonet	a67ea6b15f	Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev ... Reviewed-on: #3184 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 12:09:54 +00:00
Guillermo Bonet	f45460b0e1	Merge branch 'dev' into 8153-order_getTaxOptimize	2024-11-12 12:04:59 +00:00
Guillermo Bonet	d52f537f0c	refactor: refs #8153 Optimized order_getTax	2024-11-12 13:04:23 +01:00
Robert Ferrús	d925a5d7fa	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 11:55:50 +00:00
Pako Natek	2d70e95996	Merge pull request 'fix: more data for fixture.before' (!3181) from fixturesLocal into dev ... Reviewed-on: #3181 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-12 11:29:02 +00:00
Pako Natek	a9def89e01	Merge branch 'dev' into fixturesLocal	2024-11-12 11:27:35 +00:00
Sergio De la torre	b532691043	Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev ... Reviewed-on: #3167 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 11:02:58 +00:00
Guillermo Bonet	dd3a854ec5	Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev ... Reviewed-on: #3185 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-12 10:48:17 +00:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Guillermo Bonet	699675b476	fix: hotfix	2024-11-12 11:27:23 +01:00
Javier Segarra	ec3f852bde	Merge pull request 'HOTFIX New order from Customer' (!3186) from hotFix_newOrder_redirect into master ... Reviewed-on: #3186 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-12 09:54:49 +00:00
Javier Segarra	96301f8a0b	fix: hotfix create order from customer	2024-11-12 10:43:05 +01:00
Guillermo Bonet	f989b72fab	feat: refs #8080 Added column comment	2024-11-12 10:18:00 +01:00
Guillermo Bonet	a921e51023	refactor: refs #7715 Deleted hasNewLabelMrwMethod column	2024-11-12 09:51:48 +01:00
Jorge Penadés	0f5ca107f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-12 09:45:19 +01:00
Pablo Natek	307179cb9d	Merge pull request 'fix: refs #7404 restore stockBuyed old proc' (!3183) from 7404-recoverStockBuyedProcs into master ... Reviewed-on: #3183 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 08:13:08 +00:00
Pablo Natek	69999125c7	Merge branch 'master' into 7404-recoverStockBuyedProcs	2024-11-12 07:51:59 +00:00
Pablo Natek	63425d31ae	fix: refs #7404 restore stockBuyed old proc	2024-11-12 08:51:03 +01:00
Alex Moreno	d442593823	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-12 08:49:17 +01:00
Alex Moreno	d28f12a0d1	Merge pull request 'build: refs #8179 dump' (!3182) from 8179-dump into master ... Reviewed-on: #3182 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-11-12 07:49:01 +00:00
Alex Moreno	07e59ccdbf	build: refs #8179 dump	2024-11-12 08:45:40 +01:00
Robert Ferrús	55fced363e	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 07:42:58 +00:00
Pako Natek	eb3d0e837f	Merge branch 'dev' into fixturesLocal	2024-11-12 07:29:08 +00:00
Pako Natek	76d072e00f	fix: more data for fixture.before	2024-11-12 08:28:26 +01:00
Guillermo Bonet	5bbcf5005f	Merge branch 'test' into dev	2024-11-12 08:04:30 +01:00
Guillermo Bonet	3158644032	fix: refs #7994 commented alter	2024-11-12 07:59:07 +01:00
Alex Moreno	732dd02a19	Merge pull request '8179-testToMaster' (!3176) from 8179-testToMaster into master ... Reviewed-on: #3176 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-12 06:41:51 +00:00