1125 Commits

Author	SHA1	Message	Date
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	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
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
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
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
Guillermo Bonet	61d6efaea7	refactor: refs #7798 Drop bi.Greuges_comercial_detail	2024-08-13 09:53:05 +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
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
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
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
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