10350 Commits

Author	SHA1	Message	Date
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +01:00
Carlos Satorres	34f9f9b29f	Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-05 09:19:42 +01:00
Carlos Satorres	483966501a	fix: refs #7031 fix vnPrice	2024-12-05 08:31:09 +01:00
Guillermo Bonet	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +01:00
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +01:00
Carlos Satorres	7d1e3b6751	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:18:27 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +00:00
Carlos Andrés	d7af439787	Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js	2024-12-03 17:49:48 +00:00
Jorge Penadés	104bef43c1	feat: add country id filter to sales monitor	2024-12-03 14:03:08 +01:00
Carlos Satorres	424a0c8079	fix: refs #6389 packing	2024-12-03 12:25:39 +01:00
Carlos Satorres	c25b77c4bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-03 11:54:55 +01:00
Carlos Satorres	2267942368	fix: fix invoiceOut filter	2024-12-03 10:25:40 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +01:00
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Robert Ferrús	d355b320b4	test: refs #244936 remove window.open called	2024-12-02 12:25:27 +01:00
Robert Ferrús	30da83a88c	fix: refs #244936 sale redirect catalog to lilium	2024-12-02 11:52:05 +01:00
Carlos Satorres	f50c20fb28	Merge branch 'master' into hotfix-7323workerHoliday	2024-12-02 09:49:55 +00:00
Carlos Satorres	fb40e25c7c	fix: remove ctx	2024-12-02 10:47:44 +01:00
Carlos Satorres	4e6b83809b	fix: workerHoliday hr	2024-12-02 10:29:12 +01:00
Carlos Satorres	cf862202ff	fix: hotfix 7323 createAbsence	2024-12-02 10:12:56 +01:00
Guillermo Bonet	3453aa0f8c	Merge branch 'test' into dev	2024-11-29 11:40:22 +01:00
Sergio De la torre	009b4ab7b9	fix: refs #7920 refs#7920 itemShelvingLogs	2024-11-29 11:31:31 +01:00
Alex Moreno	20b68b4b41	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-29 07:28:55 +01:00
Robert Ferrús	6492c11220	Merge branch 'dev' into 8077-sumDefaulter	2024-11-29 05:08:00 +00:00
Ivan Mas	df51b93e5b	Merge branch 'dev' into 7146-route.createdToDated	2024-11-28 16:32:03 +00:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Alex Moreno	5923916cda	fix: change debugAdd to console.error	2024-11-28 11:31:38 +01:00
Alex Moreno	8ef78818db	Merge branch 'master' into 7404-add-debug	2024-11-28 10:19:32 +00:00
Pablo Natek	00e5f86020	fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods	2024-11-28 11:18:09 +01:00
Guillermo Bonet	699c6553a0	Merge branch 'test' into dev	2024-11-28 11:17:19 +01:00
Jorge Penadés	5ee4563ee7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix	2024-11-28 09:38:28 +01:00
Pablo Natek	1d59d4eeef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8004-liliumStyleRemake	2024-11-28 09:34:36 +01:00
Pablo Natek	d5693291f0	refactor: refs #8004 simplify SQL query by removing redundant aliases	2024-11-28 09:24:02 +01:00
Guillermo Bonet	71bc1adcba	Merge branch 'test' into dev	2024-11-28 09:00:38 +01:00
Guillermo Bonet	847692f103	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-11-28 08:59:11 +01:00
Guillermo Bonet	93388461d1	fix: refs #7266 Changed method name and corrections	2024-11-28 08:59:08 +01:00
Sergio De la torre	6f1bfd6787	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-28 07:50:06 +00:00
Alex Moreno	65c994e9d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-28 08:42:36 +01:00
Alex Moreno	34348f50e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-28 08:42:24 +01:00
Carlos Andrés	30cc7a49a0	Actualizar modules/entry/back/methods/entry/print.js	2024-11-27 15:38:50 +00:00
Carlos Andrés	d872f164fd	Actualizar modules/entry/back/models/entry.js	2024-11-27 14:55:30 +00:00
Jorge Penadés	8fd133c5e8	feat: refs #6818 define prefix model	2024-11-27 12:51:09 +01:00
Carlos Satorres	7202cc93a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-11-27 11:27:28 +01:00
Guillermo Bonet	10fe53b7f2	refactor: refs #8204 Deprecated itemShelvingLog	2024-11-26 14:01:44 +01:00
Ivan Mas	f32d709b9d	Merge branch 'dev' into 7899-deleteUnusedStates	2024-11-26 12:22:30 +00:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Sergio De la torre	0b5ef35d22	feat: refs #8213 refs#8213 picker ItemShelvingSale	2024-11-25 16:16:47 +01:00
Ivan Mas	00412e3258	refactor: refs #7899 delete unused states	2024-11-22 12:21:05 +01:00
Jorge Penadés	b97058735c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile	2024-11-22 10:25:28 +01:00
Guillermo Bonet	46c85d44d6	Merge branch 'test' into dev	2024-11-22 09:12:23 +01:00
Guillermo Bonet	a731bb3a45	Merge branch 'master' into test	2024-11-22 09:11:29 +01:00
Javier Segarra	a6d2f9c3f8	Merge branch 'test' into revert_7283_itemMigration3	2024-11-22 07:56:09 +00:00
Robert Ferrús	3adbc9c343	Merge branch 'dev' into 8077-sumDefaulter	2024-11-22 05:39:20 +00:00
Pablo Natek	2ba931bedb	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-22 06:32:19 +01:00
Pablo Natek	e92ce939b8	refactor: refs #7301 update entry and item filter tests to validate results against specific criteria	2024-11-22 06:27:00 +01:00
Javier Segarra	0c592946e6	revert cd7ed6987a	2024-11-21 20:24:33 +01:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +01:00
Carlos Andrés	770ace0f8e	Merge branch 'test' into dev	2024-11-21 16:11:42 +01:00
Carlos Andrés	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Pablo Natek	c17069a909	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-21 10:29:52 +01:00
Carlos Satorres	2978af8341	fix: hotfix errorMyTeam	2024-11-21 10:18:17 +01:00
Pablo Natek	c63dfba7da	feat: refs #7301 add inventory-config and acl	2024-11-21 10:18:09 +01:00
Ivan Mas	b2fa7e7caf	Merge branch 'dev' into 7690-renameConfigTables	2024-11-21 09:11:06 +00:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Alex Moreno	0ac46882be	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-21 06:54:00 +00:00
Jorge Penadés	e125dee691	refactor: refs #7229 desestructure	2024-11-20 16:51:14 +01:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Jorge Penadés	16111220fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile	2024-11-20 13:52:55 +01:00
Jorge Penadés	bbb7815765	fix: refs #7229 set right urls	2024-11-20 13:52:24 +01:00
Carlos Satorres	7ab1b7d171	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-20 13:14:26 +01:00
Robert Ferrús	26965c33de	Merge branch 'dev' into 8077-sumDefaulter	2024-11-20 11:43:58 +00:00
Pablo Natek	cde3c8c50a	Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev ... Reviewed-on: #3215 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-20 11:21:09 +00:00
Guillermo Bonet	42a27f3407	Merge branch 'test' into dev	2024-11-20 12:17:53 +01:00
Guillermo Bonet	d302a9c3ba	Merge branch 'master' into test	2024-11-20 12:17:30 +01:00
Carlos Satorres	be311c0557	fix: fix deleteZone	2024-11-20 11:09:15 +01:00
Pablo Natek	5e52b3b596	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-20 06:46:46 +00:00
Carlos Andrés	ad345a0b91	Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev ... Reviewed-on: #3177 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-19 16:57:15 +00:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Robert Ferrús	846479f942	Merge branch 'dev' into 8077-sumDefaulter	2024-11-19 13:05:04 +00:00
Carlos Andrés	63c0747304	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-19 13:52:12 +01:00
Jon Elias	492c79de46	Merge branch 'dev' into 6924-NotifyOnlyToBoss	2024-11-19 12:42:53 +00:00
Jon Elias	149524f4fd	Merge branch '6924-NotifyOnlyToBoss' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss	2024-11-19 13:40:32 +01:00
Jon Elias	f145649fc7	fix: refs #6924 requested change	2024-11-19 13:40:31 +01:00
Jorge Penadés	c31fa7e9cf	Merge branch 'test' into 7323-warfix-addRemainingFields	2024-11-19 12:33:01 +00:00
Jorge Penadés	f89080d373	fix: refs #7323 add remaining fields	2024-11-19 11:53:12 +01:00
Sergio De la torre	d21b42a567	feat: refs #8099 refs#8099 addComplmentSalary	2024-11-19 11:24:00 +01:00
Carlos Satorres	19fa05e774	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-11-19 08:51:58 +01:00
Pablo Natek	a3f92a284f	Merge branch 'dev' into 8138-feat-reduce-credit-on-risk	2024-11-19 07:02:11 +00:00
Pablo Natek	2f93da199a	feat: refs #8138 reduce credit on risk	2024-11-19 08:01:41 +01:00
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Pablo Natek	4e7a96442a	Merge branch 'master' into 7404-fixNegativeQuantity	2024-11-19 05:21:26 +00:00
Pablo Natek	33d9ba9b44	fix: refs #7404 negative quantity	2024-11-19 06:21:00 +01:00
Pablo Natek	056b5adddc	Merge branch 'dev' into 7457-orderFilter	2024-11-19 05:12:18 +00:00