25265 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	3a8c37aef8	fix: refs #6861 refs#6861 getTickets	2024-11-12 11:59:51 +01: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	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +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
Pablo Natek	82bcb48101	Merge pull request 'test' (!3179) from test into dev ... Reviewed-on: #3179 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-12 06:37:16 +00:00
Pablo Natek	ffe947c73d	Merge pull request 'fix: refs #7404 remove volume from ticket sold on holland' (!3169) from 7404-fix-remove-tickets-volume into test ... Reviewed-on: #3169 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 06:31:32 +00:00
Pablo Natek	3d3bc0dbaa	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-12 06:24:06 +00:00
Pablo Natek	395e6997dd	Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume	2024-11-12 07:23:47 +01:00
Pablo Natek	2dd3ae1c75	fix: refs #7404 empty commit	2024-11-12 07:23:46 +01:00
Jorge Penadés	186312702d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-11 16:41:37 +01:00
Jorge Penadés	e38adf4296	fix: refs #7641 align columns	2024-11-11 16:23:17 +01:00
Jorge Penadés	7c016da8f9	refactor: refs #7641 entry report style	2024-11-11 16:16:42 +01:00
Alex Moreno	180b0b5b3f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-11 14:09:21 +01:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-11 14:09:03 +01:00
Javi Gallego	eaad989b3a	fix: clean deletes also zoneEvent range records	2024-11-11 13:57:49 +01:00
Alex Moreno	a79905f7c2	Merge pull request 'feat(Supplier): refs #6828 add companySize' (!3174) from 6828-supplier_companySize into dev ... Reviewed-on: #3174 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-11 12:48:08 +00:00
Alex Moreno	9f763ebae7	Merge branch 'dev' into 6828-supplier_companySize	2024-11-11 12:41:43 +00:00
Jorge Penadés	a41fc36f90	feat: refs #6869 define model	2024-11-11 13:02:09 +01:00
Jorge Penadés	e0ffc2840b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails	2024-11-11 12:49:10 +01:00
Guillermo Bonet	0dc77851c0	fix: refs #4948 Tests	2024-11-11 11:34:37 +01:00
Pako Natek	b62b33d175	Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171) from hotFix-remove-notOwn-agency-collection-advantage into master ... Reviewed-on: #3171 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-11 10:02:42 +00:00
Alex Moreno	f7a29cd9c7	feat(Supplier): refs #6828 add companySize	2024-11-11 10:32:17 +01:00
Jorge Penadés	5c054fe0d3	feat: refs #6869 add back	2024-11-11 09:09:51 +01:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets ... Refs: #0000	2024-11-11 09:02:04 +01:00
Pablo Natek	c4fc51f4b8	Merge branch 'dev' into 7743-simpleTestForSendMail	2024-11-11 07:12:27 +00:00
Pablo Natek	50a73c98a2	feat: refs #7743 add try catch stmt to the test	2024-11-11 08:12:07 +01:00
Pablo Natek	d6349f113c	feat: refs #7743 add simple spec for sendMail	2024-11-11 08:06:22 +01:00
Robert Ferrús	94ed23ca07	feat: refs #8169 modifica role	2024-11-11 07:51:26 +01:00
Guillermo Bonet	a254cb19cd	feat: refs #4948 Added ticket_selfConsumptionPackaging	2024-11-11 07:40:17 +01:00
Pablo Natek	0c20aea45f	Merge branch 'dev' of https: refs #7457//gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter	2024-11-11 07:34:26 +01:00
Pablo Natek	39f7391abf	Merge branch '7457-orderFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter	2024-11-11 07:27:51 +01:00
Pablo Natek	fc61f7e4ab	fix: refs #7457 remove group by calc time reduce bellow 1s	2024-11-11 07:27:50 +01:00