1379 Commits

Author	SHA1	Message	Date
Sergio De la torre	13c7b34c98	Merge branch 'master' into 6861-ItemShelvingSaleReserve	2024-10-14 14:15:51 +00:00
Jorge Penadés	0549e22720	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 15:38:30 +02:00
Alex Moreno	e0b252e6bb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 14:12:16 +02:00
Alex Moreno	0063591089	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-14 14:11:57 +02:00
Carlos Satorres	68469e2ba8	Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto	2024-10-14 13:52:08 +02:00
Sergio De la torre	06b7d56837	fix: refs #6861 assignCollection&isOnReservationMode	2024-10-14 13:01:30 +02:00
Alex Moreno	394cf0d18b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8066-docuware_oauth	2024-10-14 12:31:20 +02:00
Jorge Penadés	b39a749bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-14 08:37:58 +02:00
Alex Moreno	d8e0c1debe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-14 07:27:19 +02:00
Jorge Penadés	295c31a5f0	feat: refs #7874 add finance obs type	2024-10-10 11:01:25 +02:00
Jorge Penadés	2b17e6da4c	Merge branch 'dev' into 7874-createObservationType	2024-10-10 08:16:29 +00:00
Pako Natek	3347cde109	Merge branch 'master' into 8075-master-itemShelvingMoving	2024-10-10 06:33:13 +00:00
Pako Natek	679773b33e	feat: refs #8075 itemShelvingMoving	2024-10-09 07:26:22 +02:00
Pako Natek	5eda0af20f	feat: refs #8075 itemShelvingMoving	2024-10-09 07:24:34 +02:00
Carlos Satorres	39e808bca7	fix: refs #7986 fix model	2024-10-08 16:06:38 +02:00
Alex Moreno	5cdb0b7eb6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-08 12:19:10 +02:00
Alex Moreno	9695fea48f	feat(Docuware): refs #8066 add username and password	2024-10-08 12:05:19 +02:00
Carlos Satorres	b4dc5276dd	fix: refs #7986 create fk	2024-10-08 08:36:17 +02:00
Guillermo Bonet	023842ac33	feat: refs #7994 comment changes	2024-10-08 08:33:04 +02:00
Pako Natek	ff43533b5a	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-08 05:33:14 +00:00
Ivan Mas	0358157b2c	Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity	2024-10-07 14:48:20 +00:00
Pako Natek	33a4061058	feat: refs #8069 8069-overStocking	2024-10-07 14:24:55 +02:00
Pako Natek	22719820fd	feat: refs #8069 overStocking protocol	2024-10-07 14:21:18 +02:00
Pako Natek	e105fba227	feat: refs #8075 itemShelving ... new field movingState	2024-10-07 13:46:56 +02:00
Pako Natek	3cc31b7779	Merge branch 'dev' into 8075-itemShelvingMoving	2024-10-07 06:41:45 +00:00
Pako Natek	542d0dcbd2	feat(itemShelving): refs #8075 new field ... isMoving indicates the record must be transferred to another sector Refs: #8075	2024-10-07 08:41:07 +02:00
Jorge Penadés	4fb0936399	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:11 +00:00
Guillermo Bonet	7b4d15cb23	refactor: refs #6824 Requested changes	2024-10-07 07:30:36 +02:00
Jorge Penadés	c4faac7446	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 07:47:38 +00:00
Jorge Penadés	3f1de126c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 15:13:49 +02:00
Guillermo Bonet	9499819eec	Merge branch 'test' into dev	2024-10-03 12:43:21 +02:00
Jorge Penadés	1930bc450f	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:59:06 +00:00
Jorge Penadés	530617ce6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 09:57:53 +02:00
Guillermo Bonet	a994f0c1c1	Merge pull request 'refactor: refs #7980 Deleted table buyMark' (!3052) from 7980-byeBuyMark into dev ... Reviewed-on: #3052 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-03 07:49:07 +00:00
Robert Ferrús	d1c08e68d3	Merge branch 'master' into 8064-itemTagState	2024-10-03 07:37:16 +00:00
Jorge Penadés	546bb85484	Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-10-03 09:27:51 +02:00
Jorge Penadés	0311069f00	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:16:55 +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
Pako Natek	abb39ec0e7	Merge branch 'dev' into 8069-Overstocking	2024-10-02 12:32:45 +00: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
Guillermo Bonet	724ddd5fe8	refactor: refs #7980 Deleted table buyMark	2024-10-02 09:26:23 +02:00
Pako Natek	b53f6d4008	Merge branch 'dev' into 8069-Overstocking	2024-10-02 06:53:43 +00:00
Robert Ferrús	c3c386046d	Merge branch 'master' into 8012-packagingIsActive	2024-10-02 06:34:14 +00:00
Robert Ferrús	a3d79f3c56	feat: refs #8012 format	2024-10-02 07:59:00 +02: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
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
Pablo Natek	c6a823e6aa	Merge branch 'dev' into 7404-deprecateStockBuyedAndRelatedProcs	2024-10-01 13:05:54 +00:00
Pablo Natek	435fec03da	refactor: refs #7404 deprecated stockBuyed	2024-10-01 15:05:02 +02:00
Pako Natek	fd262e32c1	feat: refs #8069 new trigger hedera.orderRow_afterInsert	2024-10-01 14:25:10 +02:00
Jon Elias	e91386dc92	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-10-01 10:49:00 +00:00
Guillermo Bonet	0525081c52	Merge branch 'dev' into 7935-fixBool	2024-10-01 10:46:48 +00:00
Jon Elias	8e2359a672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 11:37:01 +02:00
Alex Moreno	c2e89002cd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-01 11:31:47 +02:00
Guillermo Bonet	19dcedbce5	fix: refs #7935 Fix boolens	2024-10-01 11:31:35 +02:00
Alex Moreno	f916509b86	fix(StockBought): revert bad merge master to test	2024-10-01 11:30:34 +02:00
Jon Elias	698ef3dec3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 10:12:21 +02:00
Guillermo Bonet	94636e1c19	Merge branch 'dev' into 7817-isChecked	2024-10-01 05:56:48 +00:00
Robert Ferrús	982c1dd67b	feat: refs #8064 itemTagState	2024-10-01 07:42:06 +02:00
Alex Moreno	61f806b0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-30 14:40:35 +02:00
Alex Moreno	75d0c298a1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-30 14:38:17 +02:00
Jon Elias	da749a5dcb	fix: refs #7202 fixed sql	2024-09-30 09:21:05 +02:00
Jon Elias	6fbc5a1a54	feat: refs #7202 added new field	2024-09-30 09:17:27 +02:00
Robert Ferrús	e6d950e33f	Merge branch 'dev' into 7981-showAgencyName	2024-09-30 06:31:27 +00:00
Pablo Natek	f7e13e8ac9	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 06:21:51 +00:00
Pako Natek	95601b139b	feat(priceDelta): refs #8030 new field zoneGeoFk ... Buyers need zone restriction field for the new component bonus Refs: #8030	2024-09-30 08:15:57 +02:00
Javier Segarra	35e4c0e76b	Merge branch 'test' into 7404-revert-commit	2024-09-27 11:01:40 +00:00
Pablo Natek	f858674c8a	Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev" ... This reverts commit f6c5f41d44, reversing changes made to 5ee5da24e1.	2024-09-27 12:01:54 +02:00
Robert Ferrús	a7c858dbba	Merge branch 'dev' into 7981-showAgencyName	2024-09-27 08:13:35 +00:00
Jorge Penadés	20e894257d	fix: refs #7874 rollback	2024-09-26 16:07:14 +02:00
Jorge Penadés	f62d11dab2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-26 09:17:14 +02:00
Jorge Penadés	d1529c808e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-26 09:09:07 +02:00
Jorge Penadés	7c23acde64	feat: refs #7874 add observationTypeFk col	2024-09-26 09:08:42 +02:00
Javi Gallego	6ce4ff1311	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:31:12 +02:00
Javi Gallego	9ef44d8d8d	feat: refs #6722 refactor createThermograph	2024-09-25 13:23:31 +02:00
Jorge Penadés	3e270befa5	chore: refs #7874 refactor table	2024-09-25 12:19:12 +02:00
Jorge Penadés	ddebd31648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-25 10:57:53 +02:00
Sergio De la torre	eb85181ea0	feat: refs #7855 delete isChecked	2024-09-25 08:43:38 +02:00
Sergio De la torre	b776788714	feat: refs #7855 delete isChecked	2024-09-25 08:35:15 +02:00
Pako Natek	beb66cce1f	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:43:29 +02:00
Pako Natek	8c18bcd776	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:36:48 +02:00
Robert Ferrús	3f81d624cb	feat: refs #7981 deprecated showAgencyName	2024-09-24 18:52:55 +02:00
Pako Natek	64376b7503	fix: refs #8030 new table version	2024-09-24 14:04:29 +02:00
Pako Natek	785778e58a	fix: refs #8030 database selected for grant	2024-09-24 13:56:41 +02:00
Pako Natek	e33429f474	fix: refs #8030 grant actions to buyer	2024-09-24 13:53:24 +02:00
Pako Natek	7a343d60e6	feat: refs #8030 new fields for vn.priceDelta	2024-09-24 13:04:03 +02:00
Alex Moreno	63a4cb1847	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-24 12:25:41 +02:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Jorge Penadés	11b54666d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-24 10:34:16 +02:00
Jorge Penadés	78b500e452	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-24 10:15:25 +02:00
Pako Natek	fb7208d898	fix: refs #8030 warehouse filter ... Warehouse is also needed to make the filter Refs: #8030	2024-09-24 09:05:30 +02:00
Pako Natek	acabd3e154	feat(catalog_componentCalculate): refs #8030 new component improved ... The procedure has now the component "bonus", a special price increasing for a group of items Refs: #8030	2024-09-24 08:50:34 +02:00
Pako Natek	9a0b487d20	feat: refs #8030 new table	2024-09-23 13:12:53 +02:00
Javier Segarra	4689681618	fix(salix): add administrative ACLs	2024-09-23 12:07:06 +02:00
Jorge Penadés	8ff0dc06fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-23 09:29:51 +02:00