6093 Commits

Author	SHA1	Message	Date
Guillermo Bonet	2980b2da51	fix: refs #7759 Added more grants for vn user	2024-09-17 08:41:52 +02:00
Pablo Natek	9896ac2361	fix: refs #7760 remove throw on ticket split	2024-09-17 08:21:29 +02:00
Carlos Andrés	faf963ba52	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:11:51 +02:00
Carlos Andrés	1d42f58c39	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:09:34 +02:00
Carlos Andrés	2e03fe8193	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:41:29 +02:00
Alex Moreno	8803ae0534	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-16 14:25:27 +02:00
Carlos Andrés	33540063f4	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:17:51 +02:00
Carlos Andrés	e7343b7e25	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:16:48 +02:00
Sergio De la torre	c33740e36e	fix: refs #6861 itemShelvingSale debug	2024-09-16 13:00:20 +02:00
Pako Natek	6983a2fbd9	fix: refs #7969 no agency restriction removed	2024-09-16 08:38:06 +02:00
Pako Natek	390b8271c2	fix: root instead of vn	2024-09-16 08:20:17 +02:00
Pako Natek	6cbf25dee5	fix: refs #7969 fix on collectionNew	2024-09-16 08:10:58 +02:00
Sergio De la torre	1ef9cc0458	Merge pull request 'master' (!2957) from master into test ... Reviewed-on: #2957 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:39:45 +00:00
Sergio De la torre	99761c97e8	Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master ... Reviewed-on: #2952 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 12:38:14 +00:00
Guillermo Bonet	8518351790	Merge branch 'master' into test	2024-09-11 14:19:37 +02:00
Guillermo Bonet	889f3bdab4	fix: refs #7213 risk F11	2024-09-11 14:12:07 +02:00
Sergio De la torre	7e06c2ab37	fix: available refs #6861	2024-09-11 13:57:03 +02:00
Sergio De la torre	db7d5c5e52	fix: available refs #6861	2024-09-11 13:18:09 +02:00
Guillermo Bonet	4c6aba96e5	Merge branch 'master' into test	2024-09-11 12:54:16 +02:00
Sergio De la torre	87182abf7e	fix: available refs #6861	2024-09-11 12:47:51 +02:00
Guillermo Bonet	07f7f87c28	Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master ... Reviewed-on: #2943 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-11 10:32:59 +00:00
Guillermo Bonet	011c16180d	fix: refs #7213 buyUltimate	2024-09-11 12:31:16 +02:00
Carlos Andrés	ad8f27ea81	fix: refs #7213 change rounding problems	2024-09-11 10:15:37 +02:00
Sergio De la torre	bebd49f08a	fix: debugAdd refs #6861	2024-09-11 07:08:36 +02:00
Carlos Andrés	8fd7c1a8dd	fix: refs #7213 change rounding problems	2024-09-10 13:16:15 +02:00
Carlos Andrés	0bbf10ca4f	fix: refs #7213 change rounding problems	2024-09-10 12:59:07 +02:00
Guillermo Bonet	01d591af53	fix: refs #7564 Deleted query	2024-09-10 12:58:16 +02:00
Alex Moreno	e74da7cbab	feat: refs #7953 pullinfo	2024-09-10 08:17:47 +02:00
Guillermo Bonet	9d9e0996f6	Merge branch 'dev' into 7882-quadMinds	2024-09-10 08:12:15 +02:00
Guillermo Bonet	946806c98e	Merge branch 'test' into dev	2024-09-09 14:25:51 +02:00
Alex Moreno	0949112b13	Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-09-09 12:42:13 +02:00
Carlos Andrés	88a8b4975b	fix: ticket 218504 ticket_close	2024-09-09 12:37:49 +02:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Guillermo Bonet	c4527cc5c5	feat: refs #4515 New throw buy_checkItem	2024-09-09 08:28:27 +02:00
Juan Ferrer	37fabc38bd	fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added	2024-09-06 14:56:14 +02:00
Jorge Penadés	b277ae2d92	Merge branch 'dev' into 7323-dynamicRole	2024-09-06 12:01:18 +00:00
Guillermo Bonet	a718b6e81f	Merge branch 'test' into dev	2024-09-06 13:52:10 +02:00
Guillermo Bonet	5a82ce4aae	Merge branch 'master' into test	2024-09-06 13:51:13 +02:00
Carlos Andrés	d10db686e5	fix: refs #7346 ticket_close serial	2024-09-06 12:52:24 +02:00
Ivan Mas	762975ed14	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 09:54:34 +00:00
Ivan Mas	d9c860c44a	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 09:48:58 +00:00
Jorge Penadés	af929c1ee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole	2024-09-06 10:45:35 +02:00
Jorge Penadés	2df9bb9bdb	Merge branch 'dev' into 7524-addFixture	2024-09-06 08:42:53 +00:00
Jorge Penadés	18d93d93a6	chore: refs #7323 worker changes	2024-09-06 10:40:16 +02:00
Jorge Penadés	0a7a9e2cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole	2024-09-06 10:29:44 +02:00
Juan Ferrer	93330db88f	Merge branch 'test' into 7931-availableFix	2024-09-06 07:14:08 +00:00
Jorge Penadés	78a851336f	chore: refs #7323 worker changes wip	2024-09-06 09:11:20 +02:00
Juan Ferrer	640b45ed99	fix: refs #7931 Apply PR change requests	2024-09-06 09:06:00 +02:00
Ivan Mas	26db88b344	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 07:00:19 +00:00
Ivan Mas	0626b83370	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 06:56:15 +00:00
Ivan Mas	747e6a562a	feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval	2024-09-06 08:51:41 +02:00
Guillermo Bonet	1b8583a19d	feat: refs #7759 Revoke routine grants vn	2024-09-06 08:50:50 +02:00
Ivan Mas	f193938264	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 06:02:01 +00:00
Robert Ferrús	75146f930a	Merge branch 'master' into 7929-createTableMaterial	2024-09-06 04:28:11 +00:00
Guillermo Bonet	72024fb854	fix: refs #7759 Added user 'vn'@'localhost' & grants	2024-09-06 06:12:48 +02:00
Ivan Mas	ac8b101455	feat: refs #7898 Modify default	2024-09-05 17:05:48 +02:00
Jorge Penadés	cff5bef54b	fix: refs #7524 add fixture orm config	2024-09-05 15:47:45 +02:00
Juan Ferrer	a7bc58a5bc	fix: refs #7931 Immediately discount order lines from available	2024-09-05 14:45:17 +02:00
Robert Ferrús	5e456a32fb	Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial	2024-09-05 14:38:58 +02:00
Robert Ferrús	3e4caa8edf	feat: refs #7929 autoincrement 1	2024-09-05 14:38:55 +02:00
Robert Ferrús	fa34c4328e	Merge branch 'master' into 7929-createTableMaterial	2024-09-05 12:27:41 +00:00
Robert Ferrús	684658bb96	feat: refs #7929 quitar codigo	2024-09-05 14:25:50 +02:00
Jorge Penadés	4869322476	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:57:26 +00:00
Guillermo Bonet	620ce5d45e	Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev ... Reviewed-on: #2900 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:44:38 +00:00
Guillermo Bonet	5a51d5c07b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-05 11:19:02 +02:00
Guillermo Bonet	ac01da5eed	feat: refs #7759 Deleted version 11163-maroonEucalyptus	2024-09-05 11:19:00 +02:00
Javi Gallego	40a1b24403	Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ... Reviewed-on: #2904 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:24 +00:00
Javier Segarra	bb401af086	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:00:14 +00:00
Guillermo Bonet	8ca491b8de	Merge branch 'dev' into 7759-newDefiner	2024-09-05 09:40:42 +02:00
Jorge Penadés	e98313a1a5	Merge branch 'dev' into 7524-addFixture	2024-09-05 07:37:56 +00:00
Guillermo Bonet	d0eab064b7	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:26:27 +00:00
Guillermo Bonet	6df817ea5d	Merge branch 'test' into dev	2024-09-05 09:25:00 +02:00
Guillermo Bonet	2b465d0d23	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:18:37 +00:00
Jorge Penadés	03d711b694	chore: refs #7524 add select limit	2024-09-05 09:12:52 +02:00
Robert Ferrús	777eba8c53	Merge branch 'master' into ticket216260-buy_recalcPrices	2024-09-05 05:22:02 +00:00
Carlos Satorres	b66386fdb1	Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev ... Reviewed-on: #2603 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:07:50 +00:00
Robert Ferrús	75be124e1f	feat: refs #7929 create table material	2024-09-04 14:14:12 +02:00
Guillermo Bonet	2bb73af47d	Merge branch 'test' into dev	2024-09-04 14:12:50 +02:00
Guillermo Bonet	80839100c7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-04 14:10:33 +02:00
Guillermo Bonet	212e8d1a03	fix: refs #7346 invoiceSerial	2024-09-04 14:09:31 +02:00
Pako Natek	e574f0060a	hotfix	2024-09-04 13:37:13 +02:00
Guillermo Bonet	afcb590a9e	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:45:33 +02:00
Guillermo Bonet	297eb30395	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:41:44 +02:00
Guillermo Bonet	74a5d1f217	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:23:01 +02:00
Guillermo Bonet	fbfbcf9bd4	Merge branch 'test' into dev	2024-09-04 09:02:57 +02:00
Guillermo Bonet	a8cc3f496f	build: refs #7897 dump 24.36	2024-09-04 09:02:38 +02:00
Guillermo Bonet	c5521ea021	Merge branch 'test' into dev	2024-09-04 07:06:22 +02:00
Javier Segarra	d54361a0bc	Merge branch 'dev' into 7277-RefundInvoices	2024-09-03 13:38:03 +00:00
Guillermo Bonet	3cc19549e4	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 15:03:09 +02:00
Ivan Mas	77fd3e7f46	feat: refs #7898 Add column "floor" in vn.parking	2024-09-03 14:42:07 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Guillermo Bonet	0c3349dc03	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 12:06:31 +02:00
Guillermo Bonet	6f97d1b83a	fix: refs #7844 salesFilter and isTooLittle condition	2024-09-03 09:57:18 +02:00
Guillermo Bonet	7632f33322	fix: refs #7712 sizeLimit	2024-09-03 09:22:55 +02:00
Guillermo Bonet	6b53c24f20	feat: refs #6650 Added saleGroupLog	2024-09-03 08:17:27 +02:00
Guillermo Bonet	5468049b26	Merge branch 'dev' into 6650-shelvingLog	2024-09-03 07:59:22 +02:00
Javier Segarra	7d5cb45b3a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-03 07:57:43 +02:00
Guillermo Bonet	8e34e78964	Merge branch 'test' into dev	2024-09-03 07:52:05 +02:00
Guillermo Bonet	b436ac0518	fix: refs #7916 itemShelving_transfer	2024-09-03 07:45:25 +02:00
Javier Segarra	5e26eccd53	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-02 19:29:23 +02:00