1504 Commits

Author	SHA1	Message	Date
Ivan Mas	d15be5100d	refactor: refs #7952 Deprecate creditInsurance.creditClassification	2024-09-11 13:42:04 +02:00
Guillermo Bonet	479fc02245	Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev ... Reviewed-on: #2602 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-11 10:48:02 +00:00
Guillermo Bonet	2a41fc6fc4	Merge branch 'dev' into 6727-logClean	2024-09-11 09:25:52 +00: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
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
Sergio De la torre	b492a1e6a8	feat: refs #6868 refs# 6868 handleUser	2024-09-11 08:05:26 +02:00
Jorge Penadés	85c50db19e	Merge branch 'dev' into 4074-useAcls	2024-09-10 11:45:09 +00: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
Guillermo Bonet	9d9e0996f6	Merge branch 'dev' into 7882-quadMinds	2024-09-10 08:12:15 +02:00
Jon Elias	125c0c9b3b	refactor: refs #6346 requested changes	2024-09-10 07:50:40 +02:00
Javier Segarra	773933ca3c	feat(salix): refs #6156 #6156 change config sql	2024-09-09 15:11:55 +02:00
Guillermo Bonet	bf1a43a23e	refactor: refs #7900 Deleted sectorProdPriority column	2024-09-09 14:43:16 +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
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
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
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
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	18d93d93a6	chore: refs #7323 worker changes	2024-09-06 10:40:16 +02:00
Ivan Mas	900e840eec	Merge branch 'dev' into 7819-Delete_obsolete_objects	2024-09-06 07:43:06 +00: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
Ivan Mas	ac8b101455	feat: refs #7898 Modify default	2024-09-05 17:05:48 +02:00
Robert Ferrús	3e4caa8edf	feat: refs #7929 autoincrement 1	2024-09-05 14:38:55 +02:00
Robert Ferrús	684658bb96	feat: refs #7929 quitar codigo	2024-09-05 14:25:50 +02: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
Guillermo Bonet	8ca491b8de	Merge branch 'dev' into 7759-newDefiner	2024-09-05 09:40:42 +02:00
Guillermo Bonet	2b465d0d23	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:18:37 +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
Pako Natek	e574f0060a	hotfix	2024-09-04 13:37:13 +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
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
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	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
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
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
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
Guillermo Bonet	f15fd66e48	Merge branch 'dev' into 7562-deleteDeprecatedObjects	2024-09-02 07:57:10 +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
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
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
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
Jorge Penadés	b833fd5081	chore: refs #7524 modify ormConfig table col	2024-08-27 14:45:11 +02:00
Pako Natek	a4cc36eed1	version	2024-08-27 11:41:34 +02: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
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	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	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	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	45fa615daf	Merge branch 'dev' into 7712-sizeLimit	2024-08-20 08:28:19 +00: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
Guillermo Bonet	1f5145ba9e	feat: refs #7712 Unify	2024-08-20 09:34:02 +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
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
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
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
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
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
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
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
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
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02: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
Pako Natek	fc7c7beef7	Merge branch 'dev' into 7836-futureEntries	2024-08-06 11:23:56 +00: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
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	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	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
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +02:00
Robert Ferrús	1d22dc46f0	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-31 06:20:10 +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
Sergio De la torre	2015256f5d	hotFix reallocate resfs #6861	2024-07-30 12:38:13 +02:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +02:00
Guillermo Bonet	a01ae9b7b8	fix: refs #7756 Foreign keys invoiceOut	2024-07-29 14:09:55 +02:00
Guillermo Bonet	baa1498923	feat: refs #7712 sizeLimit	2024-07-29 13:29:26 +02:00
Guillermo Bonet	6de9ea4b16	Merge branch 'dev' into 7759-newDefiner	2024-07-29 07:18:23 +02:00
Pablo Natek	000a967a03	feat: refs #6403 packingSite to productionConfig	2024-07-26 07:12:51 +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	af62c2e807	fix: refs #7664 No insert editorFk	2024-07-25 08:57:18 +02:00
Jon Elias	9e844c15b7	Merge branch 'dev' into 6346-FixWagonModule	2024-07-25 05:07:32 +00: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
Robert Ferrús	5a9ab84356	feat: refs #7646 delete scannableCodeType	2024-07-24 09:14:28 +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
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Alex Moreno	e35ded5e35	hotFix: add summaryId to productionConfigLog & agencyLog	2024-07-23 11:01:57 +02: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
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	219740f669	feat: refs #7759 Changed definer root to vn-admin	2024-07-22 11:52:42 +02:00
Carlos Andrés	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +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
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	9466c7e529	Merge branch 'dev' into 6727-logClean	2024-07-19 07:30:07 +00: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
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
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
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
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
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	200a6714bb	fix: refs #7722 delete sms	2024-07-15 12:02:00 +02:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02: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	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +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	0d30331c9a	feat: refs #7704 Fixtures hedera	2024-07-11 13:25:26 +02:00
Guillermo Bonet	0416ebedb5	feat: refs #7704 Added grant	2024-07-11 09:54:49 +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	a82f7bc025	Merge branch 'dev' into 6769-itemDiary	2024-07-10 10:04:27 +00:00
Guillermo Bonet	27f9001e34	refactor: refs #7378 Requested changes	2024-07-10 11:35:05 +02:00
Alex Moreno	c7d9fae17b	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-10 08:39:35 +00: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	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02: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	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +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
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	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
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
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	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
Javier Segarra	f009e8f8ad	Merge branch 'dev' into 7380_substitutionCondition	2024-07-08 12:11:53 +00: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
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
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
Robert Ferrús	e9d2ff1476	feat: refs #7582 claimDestination addColumn code	2024-07-08 09:43:59 +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	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	aa46d7a536	refs #6769 item_getBalance optimization	2024-07-05 09:46:09 +02:00
Robert Ferrús	27a4b747b5	fix: refs #6371 restore table Series	2024-07-05 09:05:39 +02:00
Robert Ferrús	1e109a493d	Merge branch 'dev' into 7116-agencyIncoming	2024-07-05 05:40:14 +00: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
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
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
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
Javier Segarra	0e4db6c3d3	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 20:29:01 +02:00
Sergio De la torre	61265a45e3	Merge branch 'dev' into 7195_roadmap2	2024-07-02 11:25:46 +00:00
Javier Segarra	08612fc70c	perf(salix): refs #7648 #7648 fixtures and firstScript	2024-07-02 10:07:23 +02:00
Guillermo Bonet	2a203926b9	feat: refs #7564 Added volume column	2024-07-02 09:02:24 +02: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
Ivan Mas	29aecd62a5	refs #7651 add afterDelete trigger	2024-07-01 14:51:32 +02:00
Javier Segarra	f47197cd80	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 14:06:28 +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
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Robert Ferrús	00f3755de7	feat: refs #7116 agencyIncoming	2024-07-01 07:46:49 +02:00
Robert Ferrús	b8af48dff4	Merge branch 'dev' into 7116-agencyIncoming	2024-07-01 05:40:49 +00:00
Robert Ferrús	d4fba0a95f	Merge branch 'dev' into 7296-routesMonitorDropVirtualColumn	2024-06-28 11:49:08 +00:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Robert Ferrús	8b617df13d	feat: refs #7116 create table	2024-06-28 09:59:55 +02:00
Robert Ferrús	7b3d51dfca	Merge branch 'dev' into 7116-agencyIncoming	2024-06-28 07:54:10 +00:00
Robert Ferrús	f1f57a388d	feat: refs #7296 drop column expeditionTruckFk	2024-06-28 08:45:18 +02:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Jorge Penadés	1b7c7336af	fix: refs #6238 delete unused SQL script	2024-06-27 10:08:58 +02:00
Jorge Penadés	47a0cb6d4f	fix: refs #6238 insert ignore	2024-06-27 09:27:37 +02:00
Carlos Satorres	f9a09f3fec	Merge branch 'dev' into 7409-workerIncome	2024-06-26 08:00:58 +00:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Jorge Penadés	93f2995d39	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Sergio De la torre	acf308fd16	feat itemShelvingLog refs #7168	2024-06-25 13:35:21 +02:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Carlos Satorres	f811e7e96c	Merge branch 'dev' into 7406-workerFormation	2024-06-25 10:39:38 +00:00
Carlos Satorres	95e1bba58b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 12:36:12 +02:00
Carlos Satorres	655bbe4967	refs #7406 fix pr	2024-06-25 12:29:17 +02:00
Carlos Andrés	cf79711f6a	feat: previas con sitema de reservas refs #6861	2024-06-24 13:30:03 +02:00
Alex Moreno	1dd0357a34	Merge pull request 'test to dev' (!2629) from test into dev ... Reviewed-on: #2629 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-21 12:33:58 +00:00
Alex Moreno	7f278269a5	feat(AccessToken&ACL): refs #7547 upgrade security	2024-06-21 14:28:55 +02:00
Guillermo Bonet	c0668d054f	feat: refs #7562 Changes	2024-06-21 13:51:33 +02:00
Jorge Penadés	5ef0dffa3e	fix: refs #6238 add scheme	2024-06-21 13:38:00 +02:00
Guillermo Bonet	d61e32917a	feat: refs #7562 Created deleteDeprecatedObjects	2024-06-21 13:22:59 +02:00
Jorge Penadés	24cf23dddc	feat: refs #62add travelKgPercentage table and model	2024-06-21 13:16:01 +02:00
Carlos Satorres	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +02:00
Carlos Satorres	cf4a7c8fba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-06-21 09:11:40 +02:00
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Alex Moreno	42b483e27e	feat: refs #7555 remove account.password__	2024-06-21 08:35:35 +02:00
Guillermo Bonet	6874474207	Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ... Reviewed-on: #2394 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:05:20 +00:00
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... Reviewed-on: #2621 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:47:11 +00:00
Carlos Andrés	691413a854	Merge pull request 'master' (!2620) from master into test ... Reviewed-on: #2620 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:44:37 +00:00
Carlos Andrés	11675c2e35	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master ... Reviewed-on: #2618 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 13:34:55 +00:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Sergio De la torre	ae01fb6440	hotFix delete unique refs #6281	2024-06-18 17:00:15 +02:00
Carlos Satorres	774d55d4ae	refs #7407 fix acls fixtures	2024-06-18 13:28:21 +02:00
Jorge Penadés	6cf7c58671	fix: refs #6238 use scheme	2024-06-18 12:59:55 +02:00
Ivan Mas	49943e4f25	Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk	2024-06-18 10:09:04 +00:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Carlos Satorres	52a34c8f2d	refs #7409 fix acls	2024-06-18 09:18:09 +02:00
Guillermo Bonet	4880d1497f	feat: refs #6727 Added util logClean	2024-06-18 08:40:33 +02:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Ivan Mas	671290b9a0	refs #7313 delete vn.itemPackaging.workerFk	2024-06-17 16:45:51 +02:00
Carlos Satorres	3e25fff90f	refs #7409 acl	2024-06-17 15:50:58 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Guillermo Bonet	1d0b89ed52	refs #7519 Requested changes	2024-06-17 09:42:16 +02:00
Pablo Natek	c3d64b2358	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-17 08:49:26 +02:00
Pablo Natek	a30ff44837	fix: refs #6404 fix notification	2024-06-14 17:40:08 +02:00
Jorge Penadés	202884fdce	feat: refs #6238 add travelKgPercentage table and model	2024-06-14 14:25:15 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Guillermo Bonet	cfc5e32715	feat: refs #6701 Fix error	2024-06-13 13:11:50 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Guillermo Bonet	dcb9d54105	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:48:01 +02:00
Alex Moreno	60d4372996	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 07:51:01 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Jorge Penadés	902a9ee51b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 10:43:33 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Pablo Natek	65fae086aa	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-10 12:29:42 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +02:00
Carlos Satorres	1a01b3e587	refs #7529 back models acls	2024-06-10 10:42:52 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	521f3f1446	feat: refs #6243 update ACL	2024-06-07 11:52:24 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Jorge Penadés	44e92964f1	Merge pull request 'test to dev' (!2558) from test into dev ... Reviewed-on: #2558 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:19:31 +00:00
Jorge Penadés	99e4808ae9	Merge branch 'test' into 6942-warmfix-setInsertAcl	2024-06-07 07:11:07 +00:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Guillermo Bonet	70eddb6ce2	refactor: refs #7419 Added index ticketLog	2024-06-07 08:18:07 +02:00
Robert Ferrús	f7c2fd824f	feat: refs #7496 changesRequested	2024-06-07 07:05:22 +02:00
Jorge Penadés	5a6e2a2b31	fix: refs #6942 create invoiceIn acl	2024-06-06 15:45:39 +02:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02:00
Robert Ferrús	e52da5117a	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-05 07:57:34 +00:00
Robert Ferrús	a0e79a778d	feat: refs #7496 deprecated ticket.isLabeled	2024-06-05 09:57:15 +02:00
Robert Ferrús	fd011428d5	Merge branch 'dev' into 7039-deleteVirtualColumnCountry	2024-06-05 06:48:20 +00:00
Guillermo Bonet	3dab181bff	Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ... Reviewed-on: #2536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 06:17:10 +00:00
Sergio De la torre	f70605e565	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 16:03:37 +02:00
Javi Gallego	8f7b034aa7	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 14:24:55 +02:00
Javi Gallego	da1b4649bb	feat: refs #4560 sin expeditionTruck	2024-06-04 11:58:39 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Robert Ferrús	3720f7acfe	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-06-04 06:57:29 +00:00
Sergio De la torre	94aef434a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 07:17:37 +02:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Guillermo Bonet	5ab8e79dde	Merge branch 'dev' into 6701-clientRate	2024-06-03 10:11:56 +00:00
Guillermo Bonet	85d68890b8	refactor: refs #6701 New table clientRate	2024-06-03 12:11:26 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00
Robert Ferrús	ecd34e080d	feat: refs #7039 deleteVirtualColumnCountry	2024-06-03 07:59:57 +02:00
Sergio De la torre	b9a9f52514	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-03 07:56:43 +02:00
Guillermo Bonet	b9d04e9557	Merge branch 'dev' into 7126-improvedWaste	2024-06-03 05:22:15 +00:00
Sergio De la torre	2985e1c9e8	feat: roadMap refs #7195	2024-05-31 13:08:48 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Jorge Penadés	4772509b67	fix: refs #6889 e2e tests	2024-05-31 12:51:06 +02:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00