6813 Commits

Author	SHA1	Message	Date
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
Guillermo Bonet	2a41fc6fc4	Merge branch 'dev' into 6727-logClean	2024-09-11 09:25:52 +00:00
Javi Gallego	10f7583587	feat: refs #7956 sin AS	2024-09-11 11:22:22 +02:00
Pablo Natek	842c98edfc	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 08:22:24 +00:00
Pablo Natek	92f305b9fd	fix: refs #6156 proc and version	2024-09-11 10:19:55 +02:00
Carlos Andrés	ad8f27ea81	fix: refs #7213 change rounding problems	2024-09-11 10:15:37 +02:00
Jorge Penadés	558ab6eba2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:18 +02:00
Javi Gallego	ed8cf628a5	feat: refs #7956 tabulaciones	2024-09-11 08:15:32 +02:00
Javi Gallego	6ae15a8e64	feat: refs #7956 definer	2024-09-11 08:13:28 +02:00
Javi Gallego	56e6a7e6aa	feat: refs #7956 parametro daysInForward	2024-09-11 08:10:21 +02:00
Sergio De la torre	b492a1e6a8	feat: refs #6868 refs# 6868 handleUser	2024-09-11 08:05:26 +02:00
Pablo Natek	8607a60ca7	feat: refs #7404 format date before select	2024-09-11 07:56:08 +02:00
Sergio De la torre	bebd49f08a	fix: debugAdd refs #6861	2024-09-11 07:08:36 +02:00
Javier Segarra	f487aed336	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 14:16:56 +00:00
Jorge Penadés	85c50db19e	Merge branch 'dev' into 4074-useAcls	2024-09-10 11:45:09 +00: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
Jorge Penadés	e2ef3472b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-10 09:41:46 +02:00
Pablo Natek	fd1370f2e0	Merge branch 'master' into 7781-fixPalletMerge	2024-09-10 06:35:06 +00: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
Jon Elias	9759715609	fix: refs #6346 created test	2024-09-10 07:52:09 +02:00
Jon Elias	0593ea9a30	Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-10 07:50:42 +02:00
Jon Elias	125c0c9b3b	refactor: refs #6346 requested changes	2024-09-10 07:50:40 +02:00
Javier Segarra	c407dde7a0	feat(salix): refs #6156 #6156 remove redundant condition	2024-09-09 15:14:01 +02:00
Jorge Penadés	579ac481f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 15:13:52 +02:00
Javier Segarra	615f57b2e6	feat(salix): refs #6156 #6156 simplify CONCAT_WS	2024-09-09 15:13:32 +02:00
Javier Segarra	f9a25617f0	feat(salix): refs #6156 #6156 add missing values	2024-09-09 15:13:08 +02:00
Javier Segarra	f70f475223	feat(salix): refs #6156 #6156 change user definer	2024-09-09 15:12:44 +02:00
Javier Segarra	773933ca3c	feat(salix): refs #6156 #6156 change config sql	2024-09-09 15:11:55 +02:00
Javier Segarra	a5f6fe95ea	feat(salix): refs #5938 #5938 add futureAlertLevel	2024-09-09 14:58:02 +02:00
Guillermo Bonet	bf1a43a23e	refactor: refs #7900 Deleted sectorProdPriority column	2024-09-09 14:43:16 +02:00
Guillermo Bonet	946806c98e	Merge branch 'test' into dev	2024-09-09 14:25:51 +02:00
Javier Segarra	38ee76f7c9	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 12:20:02 +00:00
Jorge Penadés	6e511f00c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 13:58:46 +02:00
Javier Segarra	2fef104954	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:20 +00: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
Javier Segarra	31b04cba75	feat(salix): refs #6156 #6156 Move to myt version	2024-09-09 12:08:12 +02:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Javier Segarra	378ee1119f	Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField	2024-09-09 10:18:10 +02:00
Jon Elias	c93275b62d	Merge branch 'dev' into 6346-FixWagonModule	2024-09-09 08:06:04 +00:00
Jorge Penadés	18ec76d156	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-09 10:03:22 +02:00
Guillermo Bonet	261bebbc3b	feat: refs #6727 Deleted duplicated indexes	2024-09-09 09:41:40 +02:00
Guillermo Bonet	56eb3e093d	feat: refs #6727 Added indexes in creationDate	2024-09-09 09:39:10 +02:00
Guillermo Bonet	7053f2786a	Merge branch 'dev' into 6727-logClean	2024-09-09 09:38:40 +02:00
Guillermo Bonet	c4527cc5c5	feat: refs #4515 New throw buy_checkItem	2024-09-09 08:28:27 +02:00
Pablo Natek	25ff498a0b	Merge branch 'master' into 7781-fixPalletMerge	2024-09-09 05:54:07 +00:00
Jon Elias	b3aa263cea	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-09 07:32:11 +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	c43c61991d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls	2024-09-06 14:22:57 +02:00
Jorge Penadés	901cdc7117	feat: refs #4074 modify acls	2024-09-06 14:18:15 +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	26d47b3f38	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-06 11:29:53 +02: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
Ivan Mas	900e840eec	Merge branch 'dev' into 7819-Delete_obsolete_objects	2024-09-06 07:43:06 +00: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
Guillermo Bonet	925002256a	Merge branch 'dev' into 7562-deleteDeprecatedObjects	2024-09-06 05:49:20 +00:00
Guillermo Bonet	7486c4a3c6	feat: refs #7562 refs #7532 Requested changes	2024-09-06 07:48:53 +02: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
Jorge Penadés	544ddb0f15	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-04 10:39:46 +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
Jorge Penadés	a07582faa4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-03 16:22:04 +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
Jon Elias	26876fd0a6	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-03 14:35:59 +02:00
Jon Elias	29b0851741	refactor: refs #6346 hook added in wagon-type-tray model	2024-09-03 14:35:05 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Ivan Mas	690898630c	Merge branch 'dev' into 7819-Delete_obsolete_objects	2024-09-03 10:35:47 +00:00
Ivan Mas	d330529bf2	feat: refs #7819 Delete obsolete objects	2024-09-03 12:33:26 +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
Jorge Penadés	a0ac2be203	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-03 09:08:56 +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
Pablo Natek	e20ef7c699	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-03 07:50:41 +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
Carlos Andrés	08c7bd2c42	feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets	2024-09-02 17:59:31 +02:00
Carlos Andrés	0ca1db7633	feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets	2024-09-02 17:57:39 +02:00
Jorge Penadés	b83e548feb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-02 17:02:00 +02:00
Pablo Natek	f30c0fb94d	Merge branch 'master' into 7781-fixPalletMerge	2024-09-02 12:52:46 +00:00
Guillermo Bonet	7ab1eea7e9	Merge branch 'test' into dev	2024-09-02 14:30:32 +02:00
Guillermo Bonet	89f8e987dc	feat: refs #7562 Requested changes	2024-09-02 14:27:04 +02:00
Carlos Satorres	28a34fa5af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-09-02 14:07:01 +02:00
Guillermo Bonet	b40ecf9e19	feat: refs #7882 Improved sendOrders and added more config params	2024-09-02 11:48:32 +02:00
Javier Segarra	48c7d1d783	Merge branch 'dev' into 7277-RefundInvoices	2024-09-02 09:35:08 +02:00
Pablo Natek	225060ff74	fix: refs #7781 varible asign value	2024-09-02 09:24:08 +02:00
Guillermo Bonet	f15fd66e48	Merge branch 'dev' into 7562-deleteDeprecatedObjects	2024-09-02 07:57:10 +02:00
Guillermo Bonet	2ba391fc85	feat: refs #7562 Deleted deleteDeprecatedObjects objects	2024-09-02 07:57:00 +02:00
Guillermo Bonet	9d35cbfae4	Merge branch 'dev' into 7650-triggerInv	2024-09-02 07:31:04 +02:00
Guillermo Bonet	8fee3dd706	Merge branch 'test' into dev	2024-09-02 07:06:13 +02:00
Javier Segarra	8aa4427693	Merge branch 'dev' into 7905-getBuysCsv	2024-08-30 21:38:53 +00:00
Carlos Andrés	c88b069ac3	fix: refs #7213 problem rounding	2024-08-30 14:16:03 +02:00
Carlos Andrés	4ed5811042	fix: refs #7213 problem rounding	2024-08-30 14:14:06 +02:00
Guillermo Bonet	d46a93a96f	Merge branch 'dev' into 7564-ticketVolume	2024-08-30 11:55:03 +00:00
Javi Gallego	51535bfa6b	feat: refs #7277 refundInvoices	2024-08-30 13:50:51 +02:00
Carlos Andrés	beb54aedf8	fix: refs #7213 problem rounding	2024-08-30 13:14:45 +02:00
Carlos Andrés	3da6a700ae	fix: refs #7213 problem rounding	2024-08-30 13:08:15 +02:00
Guillermo Bonet	7b1a34e249	feat: refs #7860 Update new packagings	2024-08-30 12:47:05 +02:00
Guillermo Bonet	e50c67c305	feat: refs #7905 Added new method getBuysCsv	2024-08-29 12:22:29 +02:00
Guillermo Bonet	72b4607d54	feat: refs #7905 Added new method getBuysCsv	2024-08-29 12:19:06 +02:00
Guillermo Bonet	6cb6110b14	Merge branch 'test' into dev	2024-08-29 07:51:23 +02:00
Guillermo Bonet	6093f2001b	Merge branch 'master' into test	2024-08-29 07:51:14 +02:00
Guillermo Bonet	5e95e0465c	Merge branch 'dev' into 6727-noDeleteLogInProc	2024-08-29 05:06:16 +00:00
Carlos Andrés	1a47040e75	Merge pull request 'fixes: refs #7760 collection problems' (!2888) from 7760-Refactor-collection_assign into dev ... Reviewed-on: #2888 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 15:27:14 +00:00
Carlos Andrés	484bb48d04	fix: refs #7760 collection problems	2024-08-28 12:33:05 +02:00
Carlos Andrés	423ba8c218	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-28 11:59:46 +02:00
Jorge Penadés	80844acc61	Merge branch 'test' into 7524-warmfix-modifyColumn	2024-08-28 06:50:28 +00:00
Guillermo Bonet	f9c59a9e4c	Merge branch 'master' into test	2024-08-28 08:40:24 +02:00
Guillermo Bonet	3dda49b3c5	fix: refs #pako Deleted duplicated version	2024-08-28 08:40:03 +02:00
Guillermo Bonet	97b839bf1a	fix: refs #6727 No delete log tables data in clean procedures	2024-08-28 08:10:32 +02:00
Carlos Andrés	16fd69904b	fixes: refs #7760 collection problems	2024-08-27 18:36:07 +02:00
Carlos Andrés	1ec9e5bf09	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:39:54 +02:00
Carlos Andrés	9a2351b958	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:12:41 +02:00
Jorge Penadés	b833fd5081	chore: refs #7524 modify ormConfig table col	2024-08-27 14:45:11 +02:00
Carlos Andrés	6090e8ceee	fixes: refs #7760 collection problems	2024-08-27 13:47:47 +02:00
Carlos Andrés	58f8903b53	fixes: refs #7760 collection problems	2024-08-27 13:43:20 +02:00
Carlos Andrés	44072de928	fixes: refs #7760 collection problems	2024-08-27 13:36:06 +02:00
Carlos Andrés	3ac2c18da5	fixes: refs #7760 collection problems	2024-08-27 13:31:07 +02:00
Pako Natek	a4cc36eed1	version	2024-08-27 11:41:34 +02:00
Carlos Andrés	b317c8c462	fixes: refs #7760 collection problems	2024-08-27 10:47:09 +02:00
Guillermo Bonet	79e2424a41	Merge branch 'dev' into 7844-changeProblemsCalc	2024-08-27 08:04:21 +00:00
Pako Natek	ce2058ec8b	version	2024-08-27 08:36:14 +02:00
Jorge Penadés	4a3faebe7d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-26 16:59:40 +02:00
Guillermo Bonet	aaf95e3cff	fix: refs #7756 id 0	2024-08-26 14:39:30 +02:00
Guillermo Bonet	1e91d689c5	Merge branch 'dev' into 7564-ticketVolume	2024-08-26 12:18:20 +00:00
Guillermo Bonet	5a22f009f2	refactor: refs #7817 itemShelving_addList change	2024-08-26 14:06:10 +02:00
Guillermo Bonet	e9870be76f	Merge branch 'test' into dev	2024-08-26 12:14:38 +02:00
Javi Gallego	638a43d3e6	Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev ... Reviewed-on: #2878 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 13:41:39 +00:00
Javi Gallego	32d36cda21	feat: refs #7710 pr revision	2024-08-23 14:28:25 +02:00
Ivan Mas	c5210157b1	feat: refs #7758 accountDetailType fix deploy error	2024-08-23 13:55:51 +02:00
Guillermo Bonet	c9a9a6e074	Merge branch 'dev' into 7882-quadMinds	2024-08-23 11:26:29 +00:00
Guillermo Bonet	0610cbc32e	feat: refs #7882 Added model and method	2024-08-23 13:12:11 +02:00
Ivan Mas	754792e3b5	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-23 09:36:06 +00:00
Ivan Mas	94461cff58	feat: refs #7758 Modify code lowerCamelCase and UNIQUE	2024-08-23 11:34:26 +02:00
Guillermo Bonet	3974728658	Merge branch 'dev' into 7567-movingCleanFix	2024-08-23 07:09:31 +00:00
Ivan Mas	9806265030	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-23 06:25:06 +00:00
Ivan Mas	7c545a379f	feat: refs #7862 roadmap new fields	2024-08-22 17:02:59 +02:00
Javi Gallego	24468ad338	Merge pull request 'feat: refs #7346' (!2864) from 7346 into dev ... Reviewed-on: #2864 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-22 09:30:27 +00:00
Ivan Mas	150c60c894	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-21 14:49:05 +00:00
Ivan Mas	d9d2ae2f7b	feat: refs #7758 Add code mandateType and accountDetailType	2024-08-21 16:45:46 +02:00
Guillermo Bonet	c2cc7207c3	Merge branch 'dev' into 7567-movingCleanFix	2024-08-21 12:42:29 +00:00
Guillermo Bonet	582fa5faeb	feat: refs #7567 Requested changes	2024-08-21 14:42:03 +02:00
Guillermo Bonet	73fedfabea	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-21 12:28:22 +00:00
Guillermo Bonet	9c4f4ad5a9	Merge branch 'dev' into 7514-srtLog	2024-08-21 11:21:21 +00:00
Guillermo Bonet	d63a1c5497	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:28:14 +02:00
Guillermo Bonet	c641b47a9b	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:26:34 +02:00
Guillermo Bonet	29b779d6ab	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:03:49 +02:00
Guillermo Bonet	4839add2b4	Merge branch '7567-movingCleanFix' of https://gitea.verdnatura.es/verdnatura/salix into 7567-movingCleanFix	2024-08-21 09:35:43 +02:00
Guillermo Bonet	62176b8517	feat: refs #7567 Changed time to call event	2024-08-21 09:35:42 +02:00
Guillermo Bonet	0bd64a790e	Merge branch 'dev' into 7567-movingCleanFix	2024-08-21 07:34:05 +00:00
Guillermo Bonet	d2709a871c	feat: refs #7514 Changes to put srt log	2024-08-21 08:29:32 +02:00
Guillermo Bonet	92f01f79d3	feat: refs #7800 Added company Fk	2024-08-20 13:11:04 +02:00
Guillermo Bonet	a967be51e2	Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry	2024-08-20 12:59:31 +02:00
Guillermo Bonet	d2bd408e31	feat: refs #3199 Requested changes	2024-08-20 12:59:28 +02:00
Guillermo Bonet	c991f32f5a	feat: refs #7564 Fix version	2024-08-20 12:01:28 +02:00
Guillermo Bonet	9154507b72	Merge branch '7564-ticketVolume' of https://gitea.verdnatura.es/verdnatura/salix into 7564-ticketVolume	2024-08-20 11:45:52 +02:00
Guillermo Bonet	2b12e046e4	feat: refs #7564 Fix version	2024-08-20 11:45:50 +02:00
Guillermo Bonet	289dc58be4	Merge branch 'dev' into 7564-ticketVolume	2024-08-20 09:45:01 +00:00
Guillermo Bonet	8a03650eca	feat: refs #7564 Requested changes	2024-08-20 11:44:38 +02:00
Guillermo Bonet	7fc47f0506	feat: refs #7564 Requested changes	2024-08-20 11:43:08 +02:00
Guillermo Bonet	1db68c08ed	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-20 08:59:42 +00:00
Guillermo Bonet	d0f1362f85	feat: refs #3199 Requested changes	2024-08-20 10:59:05 +02:00
Guillermo Bonet	a995d80b46	feat: refs #3199 Requested changes	2024-08-20 10:58:26 +02:00
Guillermo Bonet	45fa615daf	Merge branch 'dev' into 7712-sizeLimit	2024-08-20 08:28:19 +00:00
Javi Gallego	340348a38e	feat: refs #7346 backTest checks new implementation	2024-08-20 10:11:42 +02:00
Guillermo Bonet	6acd3e0b1d	feat: refs #7759 Changed defined only of vn objects	2024-08-20 10:10:46 +02:00
Guillermo Bonet	3087a14248	Merge branch 'dev' into 7759-newDefiner	2024-08-20 10:07:33 +02:00
Guillermo Bonet	8e63d85964	feat: refs #7759 Changed name	2024-08-20 10:06:10 +02:00
Jorge Penadés	81c79967f1	Merge branch 'master' into 7831-hotfix-correctOrder	2024-08-20 08:00:34 +00:00
Guillermo Bonet	0d8d5d8b3d	build: dump 2434	2024-08-20 09:57:33 +02:00
Guillermo Bonet	1f5145ba9e	feat: refs #7712 Unify	2024-08-20 09:34:02 +02:00
Guillermo Bonet	f9d0afa5da	feat: refs #7712 Fix	2024-08-20 09:30:25 +02:00
Jorge Penadés	cf977ce06d	fix: refs #7831 sql	2024-08-20 09:12:10 +02:00
Guillermo Bonet	0fcff01433	refactor: refs #7756 Fix tests	2024-08-20 09:11:30 +02:00
Guillermo Bonet	fc1767cab4	refactor: refs #7756 Fix tests	2024-08-20 08:45:04 +02:00
Guillermo Bonet	b1ef037272	Merge branch 'dev' into 7756-fixRefFk	2024-08-20 08:05:51 +02:00
Javier Segarra	b594011433	feat(salix): refs #7677 #7677 return more postcode fields	2024-08-20 07:01:13 +02:00
Javi Gallego	ccfb53891f	Merge branch 'dev' into 7346	2024-08-19 09:10:06 +02:00
Javi Gallego	575577d29b	feat: refs #7346 add multiple feature	2024-08-16 10:08:58 +02:00
Jorge Penadés	2aaad4316b	Merge branch 'dev' into 7524-limitSelect	2024-08-16 06:54:35 +00:00
Jorge Penadés	57a1de7f13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-14 16:29:12 +02:00
Guillermo Bonet	8d35e95731	Merge branch 'test' into dev	2024-08-14 12:48:52 +02:00
Guillermo Bonet	5e0bf4c739	Merge branch 'master' into test	2024-08-14 12:48:22 +02:00
Javi Gallego	f21c292e20	Merge branch 'dev' into 7346	2024-08-14 12:19:40 +02:00
Javi Gallego	7f543e8d3a	Merge branch 'dev' into 7346	2024-08-14 10:32:32 +02:00
Javier Segarra	befcf89534	fix(salix): #7867 apply SQL conventions	2024-08-13 11:18:23 +00:00
Guillermo Bonet	68ee5e3549	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:52:39 +02:00
Guillermo Bonet	dd5845abae	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:49:56 +02:00
Javier Segarra	a178c285c0	fix(salix): #7867 avoid deactivate user when is supplier	2024-08-13 10:44:54 +00:00
Guillermo Bonet	360e20545a	feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk	2024-08-13 12:26:01 +02:00
Guillermo Bonet	38cf5af23e	feat: refs #7842 Added editorFk in vn.host	2024-08-13 12:21:03 +02:00
Guillermo Bonet	e4dc86c685	Merge branch 'test' into dev	2024-08-13 12:16:01 +02:00
Guillermo Bonet	d9f64dea08	fix: refs #7713 ACL Log	2024-08-13 12:15:30 +02:00
Jorge Penadés	85f064c869	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-13 11:41:52 +02:00
Sergio De la torre	32d5ca0d5c	fix: refs #6861 refs#6861 bySectorCollection	2024-08-13 11:37:08 +02:00
Guillermo Bonet	61d6efaea7	refactor: refs #7798 Drop bi.Greuges_comercial_detail	2024-08-13 09:53:05 +02:00
Jorge Penadés	c742f6f79d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-12 16:59:28 +02:00
Jorge Penadés	3adb73cddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-12 15:38:40 +02:00
Jorge Penadés	82da7bff9b	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 09:28:11 +00:00
Jorge Penadés	1602c12200	fix: refs #7283 sql	2024-08-12 09:13:30 +02:00
Jorge Penadés	6f26dc4990	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-12 09:06:28 +02:00
Guillermo Bonet	931c13d8ab	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:06:24 +02:00
Guillermo Bonet	3cf2cec946	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:02:38 +02:00
Guillermo Bonet	c4e8202261	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 08:53:24 +02:00
Guillermo Bonet	5b2200a134	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-08-12 08:53:02 +02:00
Guillermo Bonet	8655ca0a21	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-08-12 06:04:06 +00:00
Guillermo Bonet	00845c0534	refactor: refs #7646 #7646 Deleted scannable* variables productionConfig	2024-08-12 08:03:49 +02:00
Jorge Penadés	9ece46ee46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 15:29:21 +02:00
Guillermo Bonet	5339dcbf19	Merge branch 'test' into dev	2024-08-09 13:53:56 +02:00
Guillermo Bonet	38dbe6e966	fix: #7126 waste_addSales	2024-08-09 13:53:28 +02:00
Jorge Penadés	a512fe75ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:12:25 +02:00
Guillermo Bonet	4fc43df11b	feat: refs #6650 new itemShelvingLog	2024-08-09 11:28:30 +02:00
Guillermo Bonet	d60f8a5319	Merge branch 'test' into dev	2024-08-09 08:26:22 +02:00
Pablo Natek	b636b5429a	fix: refs #7404 refactor fixtures	2024-08-09 08:20:42 +02:00
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02:00
Pako Natek	cd1eec7e29	Merge branch 'dev' into 7836-futureEntries	2024-08-09 06:14:15 +00:00
Pako Natek	98f4cb1de5	dropping proc	2024-08-09 08:04:36 +02:00
Pablo Natek	e028bc1ddb	Merge pull request 'feat: refs #6403 packingSite to productionConfig' (!2793) from 6403-from-packingSite-to-productionConfig into master ... Reviewed-on: #2793 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-09 05:11:34 +00:00
Pablo Natek	9f2057fdd0	fix: refs #7781 pallet merge	2024-08-08 12:46:10 +02:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Pako Natek	a01794f9cd	Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries	2024-08-08 08:27:52 +02:00
Pako Natek	41942783aa	dropOldProc	2024-08-08 08:27:50 +02:00
Pako Natek	a9cdbb1255	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:01:35 +00:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Robert Ferrús	03cc32a525	Merge branch 'master' into 7818-entry_splitByShelvingFix	2024-08-07 10:01:32 +00:00
Pako Natek	9b2cbcd5cc	reviewed	2024-08-07 10:42:14 +02:00
Guillermo Bonet	4f2e343d0c	refs #7844 Fix	2024-08-07 10:40:10 +02:00
Guillermo Bonet	ea75446982	refs #7844 Change in problems calc	2024-08-07 10:32:47 +02:00
Jorge Penadés	4b8b7e3a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-07 10:16:53 +02:00
Robert Ferrús	41e44b747a	fix: refs #7685 hotFixAddress_updateCoordinates	2024-08-07 10:12:39 +02:00
Robert Ferrús	f385b9a8a3	feat: refs #7818 entry_splitByShelving	2024-08-07 07:12:29 +02:00
Pablo Natek	9d49d23be8	Merge branch 'master' into 7781-fixPalletMerge	2024-08-06 15:00:13 +00:00
Pablo Natek	eaf7730394	Merge branch 'master' into 6403-from-packingSite-to-productionConfig	2024-08-06 14:58:54 +00:00
Jorge Penadés	c31e33535d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-06 15:23:59 +02:00
Guillermo Bonet	fc102eff7b	Merge branch 'test' into dev	2024-08-06 14:12:32 +02:00
Guillermo Bonet	03358170d3	fix: refs #7740 ticket route throw	2024-08-06 14:10:16 +02:00
Pako Natek	fc7c7beef7	Merge branch 'dev' into 7836-futureEntries	2024-08-06 11:23:56 +00:00
Guillermo Bonet	184cbb2800	Merge branch 'test' into dev	2024-08-06 12:58:08 +02:00
Guillermo Bonet	ffa775a8a5	Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master ... Reviewed-on: #2832 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-06 10:56:10 +00:00
Guillermo Bonet	d1bb77d6ed	fix: refs #7834 expeditionScan_Put	2024-08-06 12:51:55 +02:00
Guillermo Bonet	28b848930e	Merge branch 'test' into dev	2024-08-06 12:45:55 +02:00
Guillermo Bonet	c7c711ac1a	fix: refs #7728 duaInvoiceInBooking	2024-08-06 12:43:51 +02:00
Jorge Penadés	b1b7f6639c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 09:52:43 +02:00
Alex Moreno	afbba83969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:16 +02:00
Alex Moreno	89ba79053a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:11 +02:00
Guillermo Bonet	58677dca56	Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev ... Reviewed-on: #2833 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-06 07:15:20 +00:00
Jorge Penadés	eaea1f3559	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 08:47:23 +02:00
Alex Moreno	70a91da0ff	build: dump 2432	2024-08-06 08:27:40 +02:00
Guillermo Bonet	54e6c63b8b	fix: refs #7834 SELECT	2024-08-06 07:29:32 +02:00
Guillermo Bonet	e03a1914d9	fix: refs #7834 Throw	2024-08-06 07:27:36 +02:00
Guillermo Bonet	1e41f5d533	Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev ... Reviewed-on: #2783 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-06 05:05:19 +00:00
Pablo Natek	323ab638d7	fix: refs #7404 fix fixtures and back test	2024-08-05 15:55:44 +02:00
Pablo Natek	f148635c68	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-08-05 15:41:41 +02:00
Pablo Natek	961fafb33e	feat: refs #7404 stockBought add and calculate	2024-08-05 15:32:36 +02:00
Pako Natek	dcdbb0bf93	Merge branch 'dev' into 7836-futureEntries	2024-08-05 12:29:30 +00:00
Pako Natek	be5859b8cf	prototipo	2024-08-05 14:28:29 +02:00
Guillermo Bonet	fa3a7aa931	refactor: refs #7820 Deprecated silexACL	2024-08-05 12:49:04 +02:00
Guillermo Bonet	967443b427	fix: refs #7834 expeditionScan_Put	2024-08-05 12:26:16 +02:00
Guillermo Bonet	21423d3b48	Merge branch 'test' into dev	2024-08-05 12:00:01 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Jorge Penadés	09783ae576	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-02 15:38:49 +02:00
Jorge Penadés	bf7cd1530c	feat: refs #7283 order by desc date	2024-08-02 15:36:02 +02:00
Carlos Andrés	f431d6c37f	Hotfix changes whit conficts merged incorrectly	2024-08-02 13:45:58 +02:00
Guillermo Bonet	abd8bc9639	fix: refs #6453 order_confirmWithUser	2024-08-02 12:20:50 +02:00
Guillermo Bonet	ae9472e092	Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev ... Reviewed-on: #2694 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-02 10:14:58 +00:00
Guillermo Bonet	6acba08a91	Merge branch 'test' into dev	2024-08-02 12:08:40 +02:00
Guillermo Bonet	f6db62945d	Merge branch 'master' into test	2024-08-02 12:08:22 +02:00
Guillermo Bonet	dead585a1b	Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master ... Reviewed-on: #2810 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 10:01:55 +00:00
Guillermo Bonet	afb2f8d111	Merge branch 'test' into dev	2024-08-02 11:50:26 +02:00
Guillermo Bonet	4c67daedec	Merge branch 'master' into test	2024-08-02 11:50:16 +02:00
Carlos Andrés	69d4c8bd6e	Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master ... Reviewed-on: #2828 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 09:45:06 +00:00
Carlos Andrés	29a50caaca	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 11:43:30 +02:00
Carlos Andrés	ddd5e4ffa4	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 10:28:50 +02:00
Guillermo Bonet	879d48eb27	Merge branch 'test' into dev	2024-08-02 10:00:35 +02:00
Guillermo Bonet	01df29b47c	Merge branch 'master' into test	2024-08-02 10:00:12 +02:00
Guillermo Bonet	d852d16ae4	feat: refs #7382 Changes	2024-08-02 08:11:38 +02:00
Guillermo Bonet	b56260af36	feat: refs #6453 Requested changes	2024-08-02 07:58:45 +02:00
Alex Moreno	20caa5d9a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-01 14:11:00 +02:00
Robert Ferrús	619dd2fbe8	Merge pull request 'master' (!2823) from master into test ... Reviewed-on: #2823 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-08-01 05:05:14 +00:00
Sergio De la torre	94d89f9c99	Merge branch 'master' into 6861_triggerItemShelving	2024-07-31 19:51:36 +00:00
Carlos Andrés	77f6e80066	Actualizar db/routines/vn/procedures/ticket_setRisk.sql	2024-07-31 17:38:50 +00:00
Sergio De la torre	65e9ed301f	hotFix itemShelving refs #6861	2024-07-31 18:11:03 +02:00
Carlos Andrés	6c0aae04c0	fix: refs #7213 componentLack y setRisk	2024-07-31 14:59:12 +02:00
Carlos Andrés	77fa4dd497	fix: refs #7213 componentLack y setRisk	2024-07-31 14:38:12 +02:00
Robert Ferrús	dca7900ab2	fix: refs #7818 entry_splitByShelving	2024-07-31 11:31:02 +02:00
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +02:00
Guillermo Bonet	cc78355aad	fix: refs #7821 Requested changes	2024-07-31 09:26:55 +02:00
Robert Ferrús	1d22dc46f0	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-31 06:20:10 +00:00
Sergio De la torre	eec7790a02	Merge pull request 'test' (!2815) from test into dev ... Reviewed-on: #2815 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:13:13 +00:00
Carlos Andrés	a61f68cbc9	Merge pull request 'master' (!2811) from master into test ... Reviewed-on: #2811 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 14:49:38 +00:00
Guillermo Bonet	961d05ab35	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:19:04 +02:00
Guillermo Bonet	4ef57e6869	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:17:41 +02:00
Guillermo Bonet	057174ae6a	Merge branch 'test' into dev	2024-07-30 13:53:58 +02:00
Sergio De la torre	9e486e4aff	hotFix reallocate iss refs #6861	2024-07-30 13:04:33 +02:00
Sergio De la torre	2015256f5d	hotFix reallocate resfs #6861	2024-07-30 12:38:13 +02:00
Carlos Andrés	01562420d4	Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql	2024-07-30 10:14:15 +00:00
Guillermo Bonet	bcf08db6d6	Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev ... Reviewed-on: #2675 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 10:02:10 +00:00
Carlos Andrés	495bb7e36e	Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-30 10:46:00 +02:00
Guillermo Bonet	857b1e9939	Merge branch 'test' into dev	2024-07-30 10:26:33 +02:00
Guillermo Bonet	e2c3539dfc	Merge branch 'master' into test	2024-07-30 10:26:17 +02:00
Guillermo Bonet	1f80117ff7	fix: refs #6861 Column	2024-07-30 10:24:50 +02:00
Guillermo Bonet	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Guillermo Bonet	18dc3873b8	feat: refs #7650 Added no transfer lines to inventory entry and fixtures	2024-07-30 09:54:43 +02:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +02:00
Carlos Andrés	9fc3516e52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-29 19:12:48 +02:00
Guillermo Bonet	a01ae9b7b8	fix: refs #7756 Foreign keys invoiceOut	2024-07-29 14:09:55 +02:00
Jorge Penadés	254cced550	chore: refs #6989 add config model	2024-07-29 13:40:30 +02:00
Guillermo Bonet	baa1498923	feat: refs #7712 sizeLimit	2024-07-29 13:29:26 +02:00
Guillermo Bonet	6ad3d5a5eb	feat: refs #6453 Minor changes	2024-07-29 12:36:08 +02:00
Guillermo Bonet	e53b12d51b	feat: refs #6453 Fixes	2024-07-29 12:31:44 +02:00
Guillermo Bonet	4c602800ea	feat: refs #6453 Added new ticket search	2024-07-29 11:46:59 +02:00
Guillermo Bonet	e0b9100de1	fix	2024-07-29 07:20:05 +02:00
Guillermo Bonet	6de9ea4b16	Merge branch 'dev' into 7759-newDefiner	2024-07-29 07:18:23 +02:00
Guillermo Bonet	403252ac39	Merge branch 'test' into dev	2024-07-26 14:07:15 +02:00
Guillermo Bonet	a4d3eec1e1	fix: refs #7580 Parking deadlock	2024-07-26 14:05:22 +02:00
Pablo Natek	54a5a91177	Merge branch '7781-fixPalletMerge' of https://gitea.verdnatura.es/verdnatura/salix into 7781-fixPalletMerge	2024-07-26 12:39:04 +02:00
Pablo Natek	ba494a77e6	fix: refs #7781 conditional	2024-07-26 12:39:00 +02:00
Pablo Natek	000a967a03	feat: refs #6403 packingSite to productionConfig	2024-07-26 07:12:51 +02:00
Pablo Natek	876e08b1da	Merge branch 'master' into 7781-fixPalletMerge	2024-07-26 04:35:59 +00:00
Pablo Natek	6845f1456e	fix: refs #7781 prevent pallet merge	2024-07-25 15:03:33 +02:00
Guillermo Bonet	95b61ae86a	Merge branch 'test' into dev	2024-07-25 13:29:42 +02:00
Robert Ferrús	6661cb4c2a	fix: refs #7654 itemShelving	2024-07-25 12:30:18 +02:00
Guillermo Bonet	ff8f340978	Merge branch 'test' into dev	2024-07-25 09:40:45 +02:00
Guillermo Bonet	25464f8a96	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-07-25 08:57:19 +02:00
Guillermo Bonet	af62c2e807	fix: refs #7664 No insert editorFk	2024-07-25 08:57:18 +02:00
Sergio De la torre	2374711a88	hotFix itemShelvingSale_addBySale refs #6861	2024-07-25 08:36:14 +02:00
Guillermo Bonet	70142c43db	Merge branch 'test' into dev	2024-07-25 07:25:04 +02:00
Guillermo Bonet	1639f7155e	fix: refs #7640 multipleInventory	2024-07-25 07:21:01 +02:00
Jon Elias	9e844c15b7	Merge branch 'dev' into 6346-FixWagonModule	2024-07-25 05:07:32 +00:00
Guillermo Bonet	de850e62c9	Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev ... Reviewed-on: #2787 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-25 05:03:29 +00:00
Robert Ferrús	cb7d6f25e9	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-24 12:45:03 +00:00
Guillermo Bonet	983d66a681	feat: refs #7728 Added throw due date	2024-07-24 14:24:06 +02:00
Robert Ferrús	d0dfb95718	feat: refs #7774	2024-07-24 13:56:21 +02:00
Guillermo Bonet	3d1d5841fd	Merge branch 'dev' into 7728-Vctos-DUA	2024-07-24 08:25:33 +00:00
Guillermo Bonet	cf3ee07dd2	feat: refs #7713 Created ACLLog	2024-07-24 10:03:51 +02:00
Guillermo Bonet	e214da164a	Merge branch 'test' into dev	2024-07-24 09:40:06 +02:00
Guillermo Bonet	db31ac3b60	fix: refs #7662 ticket_splitItemPackingType	2024-07-24 09:39:33 +02:00
Robert Ferrús	896e76016d	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-24 07:14:52 +00:00
Robert Ferrús	5a9ab84356	feat: refs #7646 delete scannableCodeType	2024-07-24 09:14:28 +02:00
Guillermo Bonet	0c51a97a17	refactor: refs #7640 Multipleinventory available	2024-07-24 09:13:47 +02:00
Robert Ferrús	65ac02e468	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 05:47:35 +00:00
Guillermo Bonet	23732ab20a	Merge branch 'test' into dev	2024-07-24 07:42:08 +02:00
Guillermo Bonet	2086746eb0	fix: refs #7505 Visible COM	2024-07-24 07:34:52 +02:00
Robert Ferrús	49888cc3b9	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-07-24 05:27:34 +00:00
Robert Ferrús	a7f725a194	feat: refs #7774 ticket_cloneWeekly	2024-07-24 07:25:43 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00
Robert Ferrús	bb40e6cbf3	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 04:54:00 +00:00
Guillermo Bonet	abfbf13440	fix: refs #7505 fix	2024-07-23 14:18:52 +02:00
Guillermo Bonet	a9aa47fef1	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 14:17:01 +02:00
Guillermo Bonet	5d2e9c6210	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 13:59:36 +02:00
Jon Elias	03523afff1	Merge branch 'dev' into 6346-FixWagonModule	2024-07-23 11:26:59 +00:00
Jon Elias	2568ac4e92	feat: refs #6346 new wagon type section	2024-07-23 13:24:43 +02:00
Guillermo Bonet	88724d6d8c	fix: refs #7505 visible_refresh support warehouse null	2024-07-23 13:08:49 +02:00
Robert Ferrús	91db2dc0e0	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-23 09:55:44 +00:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Robert Ferrús	bfc2d6f734	feat: refs #7716 travel_setDelivered	2024-07-23 11:38:05 +02:00
Alex Moreno	85b7254353	Merge branch 'master' into 7773-dump	2024-07-23 09:02:18 +00:00
Alex Moreno	e35ded5e35	hotFix: add summaryId to productionConfigLog & agencyLog	2024-07-23 11:01:57 +02:00
Alex Moreno	71cd805b7e	build: dump db	2024-07-23 10:23:28 +02:00
Guillermo Bonet	c6b49e2134	Merge branch 'test' into dev	2024-07-23 09:27:05 +02:00
Guillermo Bonet	04ff3e0cc7	fix: refs #7382 throw	2024-07-23 09:23:42 +02:00
Guillermo Bonet	bfd2b5aebb	fix: refs #7382 invoiceIn_booking change	2024-07-23 09:22:18 +02:00
Robert Ferrús	2a70df151a	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-23 07:16:28 +00:00
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Sergio De la torre	296fe3442d	Merge pull request 'master' (!2773) from master into test ... Reviewed-on: #2773 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 14:48:36 +00:00
Guillermo Bonet	3fc973dcee	Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev ... Reviewed-on: #2770 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 12:02:18 +00:00
Sergio De la torre	afbce80303	hotFix solve isPicked refs #6861	2024-07-22 13:42:42 +02:00
Carlos Andrés	33a71867bd	feat: refactor buyUltimate refs #7736	2024-07-22 13:39:48 +02:00
Carlos Andrés	b086cc7658	feat: refactor buyUltimate refs #7736	2024-07-22 13:34:04 +02:00
Guillermo Bonet	7e125cdba5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-22 12:36:29 +02:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Guillermo Bonet	b58cdcc590	Merge branch 'master' into test	2024-07-22 12:24:39 +02:00
Guillermo Bonet	24c85608eb	feat: refs #7740 Ticket before update added restriction	2024-07-22 12:09:24 +02:00
Carlos Andrés	d7b9a3ffd0	feat: refactor buyUltimate refs #7736	2024-07-22 11:58:51 +02:00
Guillermo Bonet	219740f669	feat: refs #7759 Changed definer root to vn-admin	2024-07-22 11:52:42 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Javi Gallego	8f623bd51e	feat: refs #7346 mas intuitivo	2024-07-22 10:26:40 +02:00
Guillermo Bonet	32e88532f9	fix: refs #7752 fix table name (change pablo)	2024-07-22 10:07:21 +02:00
Guillermo Bonet	a0abc29167	Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master" ... This reverts commit d41262798c, reversing changes made to 3d20908a42.	2024-07-22 10:04:03 +02:00
Pablo Natek	7b44e9f866	fix: refs #7752 fix format	2024-07-22 09:49:54 +02:00
Pablo Natek	2ba4ca088d	fix: refs #7752 fix table name	2024-07-22 09:46:20 +02:00
Guillermo Bonet	a2799e1e61	feat: refs #7589 Added display (item_valuateInventory)	2024-07-22 08:01:23 +02:00
Guillermo Bonet	ccc02d57b7	feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)	2024-07-22 07:59:15 +02:00
Carlos Andrés	bf0f95f661	Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-19 15:57:16 +02:00
Carlos Andrés	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +02:00
Carlos Andrés	55ea761af4	eat: refactor buyUltimate refs #7736	2024-07-19 15:11:14 +02:00
Guillermo Bonet	fe363fd4db	fix: refs #7126 Primary key no unique data	2024-07-19 15:00:13 +02:00
Guillermo Bonet	05598b3371	fix: refs #7126 Slow update	2024-07-19 14:29:20 +02:00
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Guillermo Bonet	b72923f160	Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev ... Reviewed-on: #2707 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 11:12:21 +00:00
Guillermo Bonet	6aab5fa9ef	fix: refs #7546 Deleted insert util.binlogQueue	2024-07-19 12:47:05 +02:00
Carlos Andrés	b2a8326170	feat: refactor buyUltimate refs #7736	2024-07-19 12:44:45 +02:00
Javier Segarra	287f9edc83	fix(salix): refs #7648 #7648 improve update ACL	2024-07-19 11:54:21 +02:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Guillermo Bonet	578de51f7e	feat: #6453 Refactor	2024-07-19 10:54:40 +02:00
Guillermo Bonet	5f29384389	feat: #6453 Rollback always split by itemPackingType	2024-07-19 10:49:45 +02:00
Pablo Natek	d0a635e86a	Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master ... Reviewed-on: #2760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 08:35:39 +00:00
Guillermo Bonet	9466c7e529	Merge branch 'dev' into 6727-logClean	2024-07-19 07:30:07 +00:00
Guillermo Bonet	c94ca96226	feat: #6727 Minor changes	2024-07-19 09:29:42 +02:00
Guillermo Bonet	1133750629	feat: #6727 Requested changes	2024-07-19 09:29:15 +02:00
Guillermo Bonet	e61210fd17	feat: #3199 Requested changes	2024-07-19 09:09:45 +02:00
Alex Moreno	b8244b48e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:08:47 +02:00
Guillermo Bonet	3cf5555612	feat: refs #6727 Fixes	2024-07-19 08:58:51 +02:00
Guillermo Bonet	930e2951b7	feat: refs #6727 Added started and finished	2024-07-19 08:27:39 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Sergio De la torre	dbf91293f8	Merge pull request 'master' (!2761) from master into test ... Reviewed-on: #2761 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 04:31:34 +00:00
Sergio De la torre	2d2eafd4ed	Merge branch 'master' into 6861_hotFix_resevas	2024-07-18 15:17:26 +00:00
Ivan Mas	c44bf909b2	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-18 13:23:38 +00:00
Ivan Mas	a6e6f435f7	refs #7531 No assigned department	2024-07-18 15:21:59 +02:00
Pablo Natek	3b529440ba	fix: refs #7752 refactor insert	2024-07-18 15:16:25 +02:00
Pablo Natek	684983ee42	fix: refs #7752 add new state after scan	2024-07-18 15:14:18 +02:00
Guillermo Bonet	f687994a7f	refactor: refs #7681 Requested changes	2024-07-18 14:27:10 +02:00
Guillermo Bonet	625b3a5608	refactor: refs #7567 Minor change	2024-07-18 14:12:37 +02:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Guillermo Bonet	ba5c44994d	feat: refs #7686 Added cascade on update vn.state.alertLevel	2024-07-18 13:45:06 +02:00
Sergio De la torre	bd10741311	hotFix reservas refs #6861	2024-07-18 12:42:00 +02:00
Robert Ferrús	57efba8601	Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock	2024-07-18 12:04:19 +02:00
Robert Ferrús	15adc59ec5	feat: refs #7683 drop temporary table	2024-07-18 12:04:17 +02:00
Robert Ferrús	e878615983	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 09:53:38 +00:00
Robert Ferrús	c17214ce05	feat: refs #7683 drop temporary table	2024-07-18 11:50:01 +02:00
Sergio De la torre	fa07d03b8c	Merge pull request 'master' (!2753) from master into test ... Reviewed-on: #2753 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-07-18 05:05:01 +00:00
Carlos Andrés	f7429f3927	Hotfix itemShelvingSale_doReserve Ticket #204044	2024-07-17 18:24:27 +02:00
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	a35ec4a42c	hotFix reservas refs #6861	2024-07-17 16:48:52 +02:00
Sergio De la torre	8ff3e8acb0	hotFix reservas refs #6861	2024-07-17 16:21:37 +02:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Pablo Natek	075f2b7ba4	Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev ... Reviewed-on: #2740 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 12:58:40 +00:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Robert Ferrús	762989557f	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-17 05:18:01 +00:00
Carlos Andrés	4ee0bd687f	feat: refactor buyUltimate refs #7736	2024-07-16 19:01:02 +02:00
Carlos Andrés	5ca2a432da	feat: refactor buyUltimate refs #7736	2024-07-16 18:58:26 +02:00
Ivan Mas	350e4b4c53	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-16 16:57:50 +00:00
Ivan Mas	50e2c03d3e	refs #7531 Requested modifications in redmine	2024-07-16 18:56:00 +02:00
Carlos Andrés	d6a949a9f3	feat: refactor buyUltimate refs #7736	2024-07-16 18:55:58 +02:00
Carlos Andrés	38d863aac6	feat: refactor buyUltimate refs #7736	2024-07-16 18:44:24 +02:00
Carlos Andrés	2181664c25	fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213	2024-07-16 15:14:10 +02:00
Javier Segarra	5293becb6d	Merge branch 'master' into 7648_myEntries	2024-07-16 11:52:54 +00:00
Sergio De la torre	3f297acbd3	hotFix itemShelvingSale refs #6861	2024-07-16 13:06:04 +02:00
Javier Segarra	6856ab0501	feat(salix): refs #7648 #7648 myEntries	2024-07-16 12:45:14 +02:00
Sergio De la torre	c086de2644	hotFix itemShelvingSale refs #6861	2024-07-16 11:38:44 +02:00
Sergio De la torre	dbb893c723	Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ... Reviewed-on: #2737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 08:19:38 +00:00
Robert Ferrús	b1a401444e	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-16 08:19:34 +00:00
Pablo Natek	99bbb55c37	feat: refs #7297 add new columns	2024-07-16 10:02:57 +02:00
Javi Gallego	63763f2b22	Merge branch 'dev' into 7346	2024-07-16 09:32:16 +02:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Carlos Andrés	8d61cb762b	feat: tabla config dias margen vctos. refs #7728	2024-07-15 17:53:23 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Robert Ferrús	0fb882e688	feat: refs #7722 changes required	2024-07-15 14:55:11 +02:00
Robert Ferrús	8f41546829	feat: refs #7222	2024-07-15 14:25:42 +02:00
Javi Gallego	3698651306	Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev ... Reviewed-on: #2670 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-15 12:16:31 +00:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Robert Ferrús	200a6714bb	fix: refs #7722 delete sms	2024-07-15 12:02:00 +02:00
Carlos Andrés	31f537ae28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas	2024-07-15 11:52:57 +02:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Carlos Andrés	67b19ee4ca	hotfix: packaging ticket 199070	2024-07-14 09:08:14 +02:00
Javier Segarra	c70824535a	feat(ssalix): refs #7648 clean fixtures	2024-07-12 20:52:00 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Carlos Andrés	49183c79f1	feat: Turn issues into calculated columns refs#7213	2024-07-12 16:47:24 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Carlos Andrés	d2e482d7cd	hotfix: packaging ticket 199070	2024-07-12 12:13:21 +02:00
Carlos Andrés	66959dd388	hotfix: packaging ticket 199070	2024-07-12 12:10:43 +02:00
Guillermo Bonet	323d26f226	Fix	2024-07-12 10:37:39 +02:00
Carlos Andrés	b93601d6d8	Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql	2024-07-12 08:27:24 +00:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	9b8e2e1279	Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev ... Reviewed-on: #2717 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 07:43:44 +00:00
Guillermo Bonet	f3612c7ee3	fix: refs #7580	2024-07-12 09:42:10 +02:00
Guillermo Bonet	5ed8b33cef	Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev ... Reviewed-on: #2700 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-12 07:34:45 +00:00
Guillermo Bonet	186cd4c7dd	refactor: refs #6769 Requested changes	2024-07-12 09:29:33 +02:00
Sergio De la torre	21987011b6	feat itemShelvingSale refs #6861	2024-07-12 09:06:05 +02:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Javier Segarra	5a8634356a	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 08:51:56 +02:00
Guillermo Bonet	05202e0b76	refactor: refs #7680 Added cursors	2024-07-12 08:15:09 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Guillermo Bonet	28b6dc901f	feat: refs #6769 Requested changes	2024-07-12 07:18:37 +02:00
Robert Ferrús	1c675ca43f	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-12 05:16:13 +00:00
Javier Segarra	1c5ab395e6	Merge branch 'dev' into 7648_myEntries_filter	2024-07-11 19:55:52 +02:00
Javier Segarra	ca48ad9777	feat(salix): refs #7648 #7648 add new entries and travels	2024-07-11 19:55:19 +02:00
Sergio De la torre	69bcad9ce0	feat itemShelvingSale refs #6861	2024-07-11 18:09:00 +02:00
Guillermo Bonet	96a157d2f7	Merge branch 'dev' into 7580-setParkingfIX	2024-07-11 12:50:44 +00:00
Guillermo Bonet	6702ff8616	feat: refs #7580 Requested changes	2024-07-11 14:50:21 +02:00
Guillermo Bonet	dab386326f	feat: refs #6769 Requested changes	2024-07-11 14:44:46 +02:00
Guillermo Bonet	0fd0302545	Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev ... Reviewed-on: #2671 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-11 12:36:05 +00:00
Guillermo Bonet	443a752cfe	feat: refs #7704 Added check	2024-07-11 13:45:24 +02:00
Guillermo Bonet	d9bd7ad84e	feat: refs #7704 Fix	2024-07-11 13:32:34 +02:00
Guillermo Bonet	0d30331c9a	feat: refs #7704 Fixtures hedera	2024-07-11 13:25:26 +02:00
Guillermo Bonet	ca1933cb83	feat: refs #7704 Fixtures hedera	2024-07-11 13:04:19 +02:00
Robert Ferrús	c770d17c25	feat: refs #7685	2024-07-11 11:57:48 +02:00
Robert Ferrús	fb1c66633c	feat: refs #7685	2024-07-11 11:55:10 +02:00
Robert Ferrús	9b2ebe7bd9	feat: refs #7685	2024-07-11 11:52:27 +02:00
Robert Ferrús	cb0461b241	feat: refs #7685 changes required	2024-07-11 11:43:19 +02:00
Guillermo Bonet	7bdc242fc7	feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem	2024-07-11 11:40:06 +02:00
Guillermo Bonet	90802bd330	feat: refs #7704 Minor changes	2024-07-11 11:28:00 +02:00
Guillermo Bonet	823756d71a	feat: refs #7704 Optimization	2024-07-11 10:29:26 +02:00
Robert Ferrús	1669944286	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-11 08:26:46 +00:00
Robert Ferrús	b3a98226c0	feat: refs #7685 chages required	2024-07-11 10:23:31 +02:00
Guillermo Bonet	0416ebedb5	feat: refs #7704 Added grant	2024-07-11 09:54:49 +02:00
Guillermo Bonet	7ba2e8d4c5	feat: refs #7704 Fix tests	2024-07-11 09:48:31 +02:00
Guillermo Bonet	61a746c2d8	feat: refs #7704 Fixes	2024-07-11 09:00:07 +02:00
Guillermo Bonet	02bcfd9be3	feat: refs #7704 Major changes	2024-07-11 08:57:45 +02:00
Javi Gallego	c45c920dbb	Merge branch '7348-client-hasDailyInvoice' of https://gitea.verdnatura.es/verdnatura/salix into 7348-client-hasDailyInvoice	2024-07-11 08:52:15 +02:00
Javi Gallego	5304929f57	feat: #refs 7348 schema	2024-07-11 08:52:07 +02:00
Javi Gallego	618baaf604	usa campo factura multipe	2024-07-11 08:37:08 +02:00
Guillermo Bonet	6dc464d26b	refactor: refs #6453 Minor changes	2024-07-11 07:14:02 +02:00
Guillermo Bonet	a2f2ed743d	refactor: refs #7681 Changes	2024-07-10 13:31:48 +02:00
Robert Ferrús	3de57b776b	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-10 11:02:32 +00:00
Guillermo Bonet	a82f7bc025	Merge branch 'dev' into 6769-itemDiary	2024-07-10 10:04:27 +00:00
Guillermo Bonet	889982dd82	refactor: refs #7126 Requested changes	2024-07-10 12:00:54 +02:00
Guillermo Bonet	27f9001e34	refactor: refs #7378 Requested changes	2024-07-10 11:35:05 +02:00
Guillermo Bonet	3c975aa9c4	refactor: refs #7580 Requested changes	2024-07-10 11:32:41 +02:00
Guillermo Bonet	15f580508b	refactor: refs #6453 Minor changes	2024-07-10 11:29:14 +02:00
Guillermo Bonet	7e415181c2	refactor: refs #6453 Major changes	2024-07-10 11:26:45 +02:00
Alex Moreno	c7d9fae17b	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-10 08:39:35 +00:00
Guillermo Bonet	a1d3d2f2f8	refactor: refs #6453 Major changes	2024-07-10 10:30:24 +02:00
Guillermo Bonet	a003cd24f6	Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev ... Reviewed-on: #2697 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-10 08:22:45 +00:00
Guillermo Bonet	0e760ba505	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:23:43 +02:00
Guillermo Bonet	a8d0345073	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:18:33 +02:00
Guillermo Bonet	b75bdc07c2	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:10:34 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Robert Ferrús	5264888f06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7116-agencyIncoming	2024-07-10 07:26:09 +02:00
Robert Ferrús	4f4d12c76a	Merge branch 'dev' into 7544-claimChangeState	2024-07-10 05:22:19 +00:00
Robert Ferrús	5bfabee6e3	Merge branch 'dev' into 7116-agencyIncoming	2024-07-10 05:19:02 +00:00
Robert Ferrús	004dcb67ff	feat: refs #7116 insert into agencyIncoming	2024-07-10 07:13:57 +02:00
Guillermo Bonet	9d4db0d408	Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev ... Reviewed-on: #2573 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-10 05:03:18 +00:00
Guillermo Bonet	1ca95678df	Fix	2024-07-09 14:53:09 +02:00
Guillermo Bonet	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +02:00
Guillermo Bonet	64ed96c8ae	feat: refs #7486 More debug	2024-07-09 14:47:12 +02:00
Guillermo Bonet	daec922c5c	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 12:25:11 +00:00
Guillermo Bonet	e2b6473831	feat: refs #7505 Minor changes	2024-07-09 14:24:35 +02:00
Guillermo Bonet	470c9bc872	feat: refs #7505 Minor changes	2024-07-09 14:24:17 +02:00
Guillermo Bonet	c2e9095ccd	feat: refs #7505 Requested changes	2024-07-09 14:22:32 +02:00
Robert Ferrús	f8efecd7c4	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 10:47:02 +00:00
Robert Ferrús	f8169b3034	feat: refs #7544 chages required	2024-07-09 12:46:50 +02:00
Guillermo Bonet	b28ef09f3d	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:04:02 +02:00
Guillermo Bonet	1f2c0190d0	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:02:15 +02:00
Guillermo Bonet	bb7002b702	fix: refs #7126 Minor change	2024-07-09 12:00:55 +02:00
Guillermo Bonet	f4e5f0205d	fix: refs #7126 Fix	2024-07-09 11:56:32 +02:00
Robert Ferrús	8f86ffbc38	fix: refs #6738	2024-07-09 11:47:02 +02:00
Robert Ferrús	d8f3a04553	fix: refs #6738 restore column grupotarifa	2024-07-09 11:45:58 +02:00
Guillermo Bonet	c3051ebcfb	fix: refs #7126 Fix	2024-07-09 11:43:15 +02:00
Guillermo Bonet	769ee33ab2	fix: refs #7126 Added addressWaste type	2024-07-09 11:40:24 +02:00
Guillermo Bonet	5b9e6f0e59	Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev ... Reviewed-on: #2688 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 09:33:53 +00:00
Robert Ferrús	775ceabe77	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 09:20:45 +00:00
Guillermo Bonet	35ca968d88	Merge branch 'test' into dev	2024-07-09 11:03:37 +02:00
Guillermo Bonet	3e4bf55eed	fix: refs #7490 Correction	2024-07-09 11:03:17 +02:00
Alex Moreno	248000bdcd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-09 11:00:36 +02:00
Robert Ferrús	928dc977b0	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 09:00:05 +00:00
Guillermo Bonet	96d2bacb3d	feat: refs #7681 Changes	2024-07-09 10:22:42 +02:00
Guillermo Bonet	376adebe9d	feat: refs #7681 Changes	2024-07-09 10:19:18 +02:00
Guillermo Bonet	a725cd2840	feat: refs #7681 Changes	2024-07-09 10:19:04 +02:00
Guillermo Bonet	042ea84055	feat: refs #7681 Changes	2024-07-09 10:14:55 +02:00
Guillermo Bonet	2078bf58ff	feat: refs #7681 Optimization and refactor	2024-07-09 10:09:00 +02:00
Robert Ferrús	85a8009034	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-09 08:02:59 +00:00
Robert Ferrús	4dcc8b02a5	feat: refs #7685 delivery coordinates	2024-07-09 10:01:32 +02:00
Guillermo Bonet	40461fb89e	Merge pull request 'refactor: refs #7662 Added transaction' (!2702) from 7662-ticketSplitPackingType into dev ... Reviewed-on: #2702 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:49:09 +00:00
Javier Segarra	725cbb5aa4	Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev ... Reviewed-on: #2677 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:46:50 +00:00
Guillermo Bonet	29f9fa0ce3	feat: refs #7505 Optimization	2024-07-09 09:45:55 +02:00
Guillermo Bonet	86acc644fe	feat: refs #7505 Changes	2024-07-09 09:38:07 +02:00
Guillermo Bonet	7279feab12	feat: refs #7505 Changes	2024-07-09 09:33:31 +02:00
Guillermo Bonet	c9e9d95cff	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 09:06:27 +02:00
Guillermo Bonet	6430fb5b51	refactor: refs #7662 Requested changes	2024-07-09 08:43:02 +02:00
Robert Ferrús	8469b2ac3f	feat: refs #7683 productionControl	2024-07-09 08:24:50 +02:00
Javier Segarra	4d52e32718	Merge branch 'dev' into 7380_substitutionCondition	2024-07-09 06:24:27 +00:00
Robert Ferrús	9892b37ed0	Merge branch 'dev' into 7116-agencyIncoming	2024-07-09 06:24:05 +00:00
Alex Moreno	213524edb5	deploy: dump db	2024-07-09 07:52:18 +02:00
Alex Moreno	1866c16727	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-08 14:33:12 +02:00
Alex Moreno	30d118f9df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-08 14:32:43 +02:00
Guillermo Bonet	eaca342777	refactor: refs #7662 Minor change	2024-07-08 14:11:55 +02:00
Javier Segarra	f009e8f8ad	Merge branch 'dev' into 7380_substitutionCondition	2024-07-08 12:11:53 +00:00
Guillermo Bonet	32793990ec	refactor: refs #7662 Minor change	2024-07-08 14:01:18 +02:00
Guillermo Bonet	86859c98e3	refactor: refs #7662 Added transaction	2024-07-08 13:57:17 +02:00
Guillermo Bonet	73b43aa254	refactor: refs #7580 Fixes	2024-07-08 13:22:10 +02:00
Guillermo Bonet	f57ab72482	refactor: refs #7580 Fix and improvement	2024-07-08 13:17:29 +02:00
Javi Gallego	938037d67a	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-08 12:40:00 +02:00
Guillermo Bonet	4757ce11a3	refactor: refs #7567 Fix and improvement	2024-07-08 12:35:29 +02:00
Guillermo Bonet	f79b2378af	Merge branch 'dev' into 7622-addressWaste	2024-07-08 10:05:35 +00:00
Guillermo Bonet	eb60a1ed77	Merge branch 'dev' into 7378-productionLogConfig	2024-07-08 10:00:32 +00:00
Guillermo Bonet	098bda0f9c	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-07-08 09:59:32 +00:00
Robert Ferrús	0722a97c60	feat: refs #7582	2024-07-08 11:28:33 +02:00
Robert Ferrús	a796787cb5	feat: refs #7582	2024-07-08 11:04:35 +02:00
Robert Ferrús	3fa0823d93	feat: refs #7582 quitar vn	2024-07-08 11:01:35 +02:00
Guillermo Bonet	4b0a08d965	refactor: refs #7684 vehicle warehouseFk fix	2024-07-08 10:57:46 +02:00
Pablo Natek	62045756e6	fix: refs #6403 extend length to 6 digits for mrw clientType	2024-07-08 10:50:15 +02:00
Guillermo Bonet	b068327352	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:49:39 +02:00
Guillermo Bonet	460723bd7a	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:08:04 +02:00
Javier Segarra	a9b4b3ee16	Merge branch 'dev' into 7380_substitutionCondition	2024-07-08 08:03:35 +00:00
Javier Segarra	8355d544c3	Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition	2024-07-08 09:54:56 +02:00
Javier Segarra	9f4680325b	feat(salix): refs #7380 #7380 rename extension file	2024-07-08 09:54:52 +02:00
Javier Segarra	9f57e50f89	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-08 09:54:40 +02:00
Robert Ferrús	e9d2ff1476	feat: refs #7582 claimDestination addColumn code	2024-07-08 09:43:59 +02:00
Guillermo Bonet	e64f56cff1	Merge branch 'test' into dev	2024-07-08 07:55:00 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +02:00
Guillermo Bonet	6eef7876d9	Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master ... Reviewed-on: #2689 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-08 05:52:51 +00:00
Guillermo Bonet	3a2acfb7f8	feat: refs #7640 Optimization	2024-07-08 07:21:53 +02:00
Javier Segarra	3c2a44eb53	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-07 23:47:00 +02:00
Javier Segarra	570b06bd18	Merge branch 'dev' into 7380_substitutionCondition	2024-07-07 21:27:04 +00:00
Javier Segarra	2f10066290	feat(salix): refs #7380 #7380 remove new field	2024-07-07 23:23:30 +02:00
Ivan Mas	f07964be20	Merge pull request 'refs #7561 add fk en userFk' (!2690) from 7561-userFk-expeditionState into dev ... Reviewed-on: #2690 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-05 12:11:01 +00:00
Ivan Mas	3508cf3a9e	refs #7561 add fk en userFk	2024-07-05 14:01:09 +02:00
Guillermo Bonet	fb07cdccc3	Merge branch 'test' into dev	2024-07-05 13:51:09 +02:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Guillermo Bonet	592738c7a0	refs #7024 & ticket 198125 Hotfix	2024-07-05 13:48:03 +02:00
Guillermo Bonet	55f0e90771	feat: refs #7640 Minor change	2024-07-05 13:36:38 +02:00
Guillermo Bonet	3ddf49da0a	feat: refs #7640 Fix	2024-07-05 13:21:07 +02:00
Guillermo Bonet	8ac26c7281	refactor: refs #7640 Refactor multipleInventory	2024-07-05 12:50:31 +02:00
Guillermo Bonet	b9e986c962	feat: refs #7622 Fix	2024-07-05 12:39:54 +02:00
Guillermo Bonet	1799b52f8b	feat: refs #7622 Added type column addressWaste	2024-07-05 12:37:59 +02:00
Guillermo Bonet	481d57042f	Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev ... Reviewed-on: #2667 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 10:26:25 +00:00
Robert Ferrús	3051e4ed25	Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries	2024-07-05 10:35:32 +02:00
Guillermo Bonet	182273d3b3	refs #7450 Modified msg throw	2024-07-05 09:59:15 +02:00
Guillermo Bonet	aa46d7a536	refs #6769 item_getBalance optimization	2024-07-05 09:46:09 +02:00
Robert Ferrús	923efadf6a	fix: refs #6371 restore table Series	2024-07-05 09:00:40 +02:00
Guillermo Bonet	50c9ded103	refs #6769 Fix	2024-07-05 08:38:40 +02:00
Robert Ferrús	1e109a493d	Merge branch 'dev' into 7116-agencyIncoming	2024-07-05 05:40:14 +00:00
Guillermo Bonet	6f0196d656	refs #6769 Changes	2024-07-05 07:06:40 +02:00
Carlos Satorres	f3dcc7dd99	Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore	2024-07-04 16:50:57 +02:00
Carlos Satorres	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +02:00
Carlos Andrés	d6f6df48f2	Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev ... Reviewed-on: #2676 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-04 11:30:11 +00:00
Guillermo Bonet	cf7de14de6	refs #6769 Changes, with error no database selected	2024-07-04 11:34:55 +02:00
Robert Ferrús	9819744caf	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:34:31 +00:00
Guillermo Bonet	c2d899cd6a	Merge branch 'test' into dev	2024-07-04 09:33:08 +02:00
Guillermo Bonet	108a62f738	refs #7486 Fix tests	2024-07-04 09:32:56 +02:00
Robert Ferrús	58fab284f4	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:29:35 +00:00
Guillermo Bonet	58ba6d0f4c	Merge branch 'test' into dev	2024-07-04 09:26:49 +02:00
Guillermo Bonet	5a9850939e	Merge branch 'master' into test	2024-07-04 09:26:00 +02:00
Guillermo Bonet	009dcd8fc7	refs #7486 Fix tests	2024-07-04 09:23:57 +02:00
Guillermo Bonet	a7895ab0a4	refs #6769 First commit	2024-07-04 09:17:22 +02:00
Robert Ferrús	897da1e48a	feat: refs #7654	2024-07-04 08:59:22 +02:00
Robert Ferrús	68871e6345	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn	2024-07-04 08:21:11 +02:00
Guillermo Bonet	5f7c7ae5dd	Merge branch 'test' into dev	2024-07-04 07:44:11 +02:00
Guillermo Bonet	af6422cf05	Merge branch 'master' into test	2024-07-04 07:43:58 +02:00
Guillermo Bonet	a7b653c42a	refs #7486 Fix collection_new	2024-07-04 07:34:41 +02:00
Javier Segarra	17e7dc8c7e	feat(salix): refs #7380 #7380 new typeObservation	2024-07-03 23:02:47 +02:00
Javier Segarra	d59cab13d8	feat(salix): refs #7380 #7380 client.substitutionAllowed new field	2024-07-03 23:02:28 +02:00
Carlos Andrés	989fa5ac5a	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:10:02 +02:00
Carlos Andrés	d65af6aaaa	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:00:28 +02:00
Ivan Mas	4bef3e9107	refs #7531 Modify zone_getAddresses	2024-07-03 17:09:10 +02:00
Carlos Andrés	097350adb6	Hotfix sale_getProblems	2024-07-03 17:07:25 +02:00
Carlos Andrés	1ec7cd9540	Hotfix sale_getProblems	2024-07-03 16:59:01 +02:00
Guillermo Bonet	0c27ac6e71	Merge branch 'dev' into 7382-triggerInvoiceInTax	2024-07-03 12:24:47 +00:00
Guillermo Bonet	246b34571d	feat: refs #7382 Fix	2024-07-03 14:24:26 +02:00
Guillermo Bonet	2278b9a05a	feat: refs #7382 Changes	2024-07-03 14:20:43 +02:00
Robert Ferrús	4f9552379e	feat: refs #7654 entry_splitByShelving	2024-07-03 13:46:19 +02:00
Guillermo Bonet	a0d524b22b	Merge pull request 'refactor: refs #7504 Rename id greuge' (!2669) from 7504-greugeId into dev ... Reviewed-on: #2669 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 11:17:18 +00:00
Guillermo Bonet	2c39c2a6ba	Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev ... Reviewed-on: #2668 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 09:50:32 +00:00
Guillermo Bonet	cf63d6e71c	feat: refs #7378 Added productionConfigLog	2024-07-03 11:17:33 +02:00
Jorge Penadés	12f29aa50e	Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev ... Reviewed-on: #2277 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-07-03 08:51:56 +00:00
Javi Gallego	a8d663bee4	feat: refs #7348 hasDailyInvoice field	2024-07-03 10:49:51 +02:00
Guillermo Bonet	aaca2d12c5	refactor: refs #7504 Rename id greuge	2024-07-03 10:20:20 +02:00
Guillermo Bonet	77d86c9fd9	feat: refs #7664 Added created in calendar table	2024-07-03 09:55:14 +02:00
Guillermo Bonet	d1ef1c80f8	feat: refs #7382 Added unique key	2024-07-03 09:36:20 +02:00
Guillermo Bonet	2f8df96ba7	feat: refs #7564 Added ticket_setVolumeItemCost	2024-07-03 09:29:12 +02:00
Javier Segarra	d72a52d6b1	Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev ... Reviewed-on: #2659 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 07:29:00 +00:00
Sergio De la torre	1561e15d5e	feat roadmap refs #7195	2024-07-03 09:21:58 +02:00
Jorge Penadés	1c6dd17f90	Merge branch 'dev' into 6449-addColumnLogTables	2024-07-03 07:10:41 +00:00
Javier Segarra	3710c7c9c8	Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries	2024-07-03 08:55:01 +02:00
Javier Segarra	beff905e02	perf(salix): refs #7648 #7648 remove change role for user 2	2024-07-03 08:54:58 +02:00
Robert Ferrús	f1c9c71f4f	Merge branch 'dev' into 7116-agencyIncoming	2024-07-03 06:50:29 +00:00
Robert Ferrús	19c378d6bd	feat: refs #7116 añadir comentario	2024-07-03 08:48:24 +02:00
Sergio De la torre	7677ada925	Merge branch 'dev' into 7195_roadmap2	2024-07-03 06:46:10 +00:00
Javier Segarra	5c73a20f43	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 06:17:34 +00:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Guillermo Bonet	1afce8124f	Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev ... Reviewed-on: #2658 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:21:19 +00:00
Guillermo Bonet	18b7fb48c7	Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev ... Reviewed-on: #2665 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:18:52 +00:00
Javier Segarra	0e4db6c3d3	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 20:29:01 +02:00
Javi Gallego	0d70cb8929	fix: informatica no necesita este correo	2024-07-02 17:39:46 +02:00
Guillermo Bonet	0bb4439f85	refs #7443 Deleted ekt barcode	2024-07-02 14:37:22 +02:00
Sergio De la torre	61265a45e3	Merge branch 'dev' into 7195_roadmap2	2024-07-02 11:25:46 +00:00
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +00:00
Ivan Mas	99beb21927	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-02 10:36:40 +00:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Javier Segarra	08612fc70c	perf(salix): refs #7648 #7648 fixtures and firstScript	2024-07-02 10:07:23 +02:00
Guillermo Bonet	1e5fd8002c	feat: refs #7564 Added proc	2024-07-02 09:36:23 +02:00
Javier Segarra	f41c2489d9	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 09:34:46 +02:00
Guillermo Bonet	2a203926b9	feat: refs #7564 Added volume column	2024-07-02 09:02:24 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Javier Segarra	f27bdec758	feat(salix): refs #7648 #7648 changes requested	2024-07-01 21:14:27 +02:00
Javier Segarra	a0185dca04	feat(salix): refs #7648 #7648 new supplier role	2024-07-01 18:39:21 +02:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Ivan Mas	da9ff6f22c	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-01 12:55:06 +00:00
Ivan Mas	29aecd62a5	refs #7651 add afterDelete trigger	2024-07-01 14:51:32 +02:00
Javier Segarra	0035967b11	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-01 12:29:27 +00:00
Javier Segarra	f47197cd80	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 14:06:28 +02:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Ivan Mas	2ed31ee1d3	refs #7651 Add editorFk and triggers	2024-07-01 13:26:59 +02:00
Guillermo Bonet	9e5f416d55	refactor: refs #7418 Item type refactor	2024-07-01 12:06:30 +02:00
Alex Moreno	a26f6eaf21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-07-01 11:32:21 +02:00
Sergio De la torre	22959db0ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2	2024-07-01 11:28:14 +02:00