25013 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	b34727a436	fix: refs #8069 wrong field name	2024-10-03 08:39:30 +02:00
Alex Moreno	e870d16cb9	build: refs #8062 dump db	2024-10-03 07:54:16 +02:00
Javi Gallego	91d9a6e417	Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev ... Reviewed-on: #3060 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-03 05:45:09 +00:00
Alex Moreno	fe10f03459	Merge pull request '8062-testToMaster_2' (!3059) from 8062-testToMaster_2 into master ... Reviewed-on: #3059 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-03 05:43:40 +00:00
Javi Gallego	5f695f63b3	Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev ... Reviewed-on: #2882 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-03 05:34:44 +00:00
Javi Gallego	ee52c8b45f	fix: refs #7346 findByid con fields	2024-10-02 15:34:53 +02:00
Javi Gallego	43df98598c	feat: refs #7346 manual invoice with address	2024-10-02 15:27:09 +02:00
Pako Natek	3a5eb00a45	Merge pull request '8069-Overstocking' (!3051) from 8069-Overstocking into dev ... Reviewed-on: #3051 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-02 12:34:13 +00:00
Pako Natek	abb39ec0e7	Merge branch 'dev' into 8069-Overstocking	2024-10-02 12:32:45 +00:00
Pako Natek	fc1ea280fa	fix: refs #8069 new conception	2024-10-02 14:03:57 +02:00
Guillermo Bonet	a49d6aaf12	Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete	2024-10-02 11:32:23 +02:00
Guillermo Bonet	2655e20ef6	refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale	2024-10-02 11:32:20 +02:00
Carlos Satorres	5b75ffdbba	Merge pull request '7366-travelMigration' (!3054) from 7366-travelMigration into dev ... Reviewed-on: #3054 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 09:31:42 +00:00
Carlos Satorres	1b78aa1985	Merge branch 'dev' into 7366-travelMigration	2024-10-02 09:30:15 +00:00
Guillermo Bonet	c4c08934a7	Merge branch 'dev' into 6824-itemShelvingSaleNoDelete	2024-10-02 09:27:57 +00:00
Guillermo Bonet	62bd2ae03b	refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale	2024-10-02 11:27:09 +02:00
Robert Ferrús	47ed9a8f4e	Merge pull request 'test' (!3056) from test into dev ... Reviewed-on: #3056 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:22:26 +00:00
Robert Ferrús	e51dd897c3	Merge pull request 'master' (!3055) from master into test ... Reviewed-on: #3055 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:13:09 +00:00
Robert Ferrús	79adce30b6	Merge branch 'master' into 8064-itemTagState	2024-10-02 09:12:08 +00:00
Carlos Satorres	c8abf153e5	Merge branch 'dev' of https: refs #7366//gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration	2024-10-02 10:38:21 +02:00
Sergio De la torre	bbcf71619c	fix: refs #6861 duplicatedTicketsInReserve	2024-10-02 09:56:36 +02:00
Guillermo Bonet	724ddd5fe8	refactor: refs #7980 Deleted table buyMark	2024-10-02 09:26:23 +02:00
Guillermo Bonet	c15b4f1bdf	Merge pull request 'feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets' (!2908) from 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado into dev ... Reviewed-on: #2908 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 07:10:31 +00:00
Guillermo Bonet	26a9e8ca50	Merge branch '7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado' of https://gitea.verdnatura.es/verdnatura/salix into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado	2024-10-02 09:09:05 +02:00
Guillermo Bonet	b556903d6d	feat: refs #7902 Changed definer and throw msg	2024-10-02 09:09:04 +02:00
Guillermo Bonet	2baf433d1a	Merge branch 'dev' into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado	2024-10-02 07:07:48 +00:00
Guillermo Bonet	9ba017d352	feat: refs #7902 Changed definer and throw msg	2024-10-02 09:06:21 +02:00
Pako Natek	b53f6d4008	Merge branch 'dev' into 8069-Overstocking	2024-10-02 06:53:43 +00:00
Pako Natek	9d84c39fce	feat: refs #8069 orderRow_updateOverstocking	2024-10-02 08:52:20 +02:00
Robert Ferrús	617c44a178	Merge pull request '#8012 -packagingIsActive' (!3049) from 8012-packagingIsActive into master ... Reviewed-on: #3049 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 06:45:49 +00:00
Robert Ferrús	c3c386046d	Merge branch 'master' into 8012-packagingIsActive	2024-10-02 06:34:14 +00:00
Robert Ferrús	4ad070ab66	feat: refs #8012 cubos	2024-10-02 08:26:38 +02:00
Pako Natek	34f1a43f1e	Merge pull request 'feat: refs #8030 new field vn.priceDelta.zoneGeoFk' (!3050) from 8030-master-HotFix-PriceDelta into master ... Reviewed-on: #3050 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 06:04:19 +00:00
Pako Natek	16d1dc3c11	Merge branch 'master' into 8030-master-HotFix-PriceDelta	2024-10-02 06:02:44 +00:00
Robert Ferrús	a3d79f3c56	feat: refs #8012 format	2024-10-02 07:59:00 +02:00
Robert Ferrús	0dd9be96dd	feat: refs #8012 restore	2024-10-02 07:54:57 +02:00
Pako Natek	6c31c85d72	Merge pull request '8030-testPriceDelta' (!3048) from 8030-testPriceDelta into test ... Reviewed-on: #3048 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 05:54:23 +00:00
Robert Ferrús	6e4244866c	feat: refs #8012 create column	2024-10-02 07:53:53 +02:00
Pako Natek	d87f940fff	Merge branch 'test' into 8030-testPriceDelta	2024-10-02 05:40:48 +00:00
Pako Natek	02ef314ed9	feat: refs #8030 new field vn.priceDelta.zoneGeoFk	2024-10-02 07:40:26 +02:00
Pako Natek	7d3c2a4a1c	fix: refs #8030 schema missing in zoneGeo table	2024-10-02 07:36:04 +02:00
Guillermo Bonet	dc0a4f35f3	Merge branch 'dev' into 7886-buy_getVolumeByAgency	2024-10-02 05:36:02 +00:00
Pako Natek	3c89d1e5e0	fix: refs #8030 foreign key zoneGeo	2024-10-02 07:34:57 +02:00
Pako Natek	a48843a5cf	feat: refs #8030 new field vn.priceDelta.zoneGeoFk	2024-10-02 07:30:49 +02:00
Jon Elias	2fbf8478c0	Merge pull request '#7884 added new filter field' (!2981) from 7884-AddLabelerField into dev ... Reviewed-on: #2981 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 05:04:17 +00:00
Robert Ferrús	0a0b2f9ba0	Merge branch 'master' into 8064-itemTagState	2024-10-02 05:03:02 +00:00
Jon Elias	2267b2c6b1	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 04:55:56 +00:00
Pablo Natek	48c387be75	Merge pull request 'refactor: refs #7404 deprecated stockBuyed' (!3046) from 7404-deprecateStockBuyedAndRelatedProcs into dev ... Reviewed-on: #3046 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-01 13:57:53 +00:00
Javi Gallego	1cf14035d5	feat: existingRefund without ticketRefund	2024-10-01 15:51:30 +02:00
Javi Gallego	40512ca67e	feat: existingRefund without ticketRefunds	2024-10-01 15:49:51 +02:00