7284 Commits

Author	SHA1	Message	Date
Javier Segarra	294c2f832e	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 14:53:19 +01:00
Robert Ferrús	2e247c3ea5	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-21 14:14:27 +01:00
Guillermo Bonet	482fe77159	feat: refs #8227 Roadmap changes	2025-01-21 14:03:50 +01:00
Carlos Satorres	d66b8f4963	fix: refs #7917 acls	2025-01-21 13:54:02 +01:00
Javier Segarra	dfcfd34202	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 13:42:36 +01:00
Robert Ferrús	c727586855	feat: refs #8387 add column validationRegex	2025-01-21 11:25:03 +01:00
Robert Ferrús	77606468fd	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-21 10:07:28 +00:00
Robert Ferrús	7292ac48b2	Merge branch 'dev' into 6822-entryTransfer	2025-01-21 08:48:24 +00:00
Robert Ferrús	785a10a26a	feat: refs #8447 create tables tag	2025-01-21 09:34:56 +01:00
Javi Gallego	a46ec1bc8d	feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records	2025-01-21 08:13:56 +01:00
Javi Gallego	8e21ca5293	Merge branch 'dev' into 8381-thermographTravel	2025-01-21 07:53:38 +01:00
Guillermo Bonet	477646ba31	feat: refs #8227 Roadmap changes	2025-01-20 14:43:14 +01:00
Carlos Satorres	a98967bac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 12:38:46 +01:00
Robert Ferrús	316a17304f	feat: refs #8401 restriction itemFk	2025-01-20 12:26:29 +01:00
Robert Ferrús	4b78c12ee4	Merge branch 'master' into 8401-itemTaxCountryTrigger	2025-01-20 10:26:14 +00:00
Robert Ferrús	cb065f42cd	feat: refs #8401 change request	2025-01-20 11:19:24 +01:00
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	9584ffcf5b	feat: refs #7531 Added landed index	2025-01-20 08:10:12 +01:00
Guillermo Bonet	04180bf8da	Merge branch 'test' into dev	2025-01-20 07:52:04 +01:00
Guillermo Bonet	934507569e	feat: refs #7531 Added comment	2025-01-20 07:48:43 +01:00
Guillermo Bonet	e6abb1d759	feat: refs #7531 Minor change	2025-01-20 07:41:41 +01:00
Guillermo Bonet	044a22bc3e	feat: refs #7531 Deleted address_hasDelivery	2025-01-20 07:13:04 +01:00
Robert Ferrús	ce96b0a819	Merge branch 'dev' into 6822-entryTransfer	2025-01-19 07:58:16 +00:00
Robert Ferrús	6c2071742c	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-19 07:38:25 +00:00
Robert Ferrús	5fe032ac75	feat: refs #8401 create triggers to itemTaxCountry	2025-01-19 08:30:14 +01:00
Javi Gallego	4f68a7d262	feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model	2025-01-17 15:36:11 +01:00
Guillermo Bonet	e636d43f04	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:42:15 +01:00
Guillermo Bonet	a666cfa4cd	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:40:07 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Guillermo Bonet	1aa1fbda6c	feat: refs #7531 Added address_hasDelivery	2025-01-17 08:10:26 +01:00
Guillermo Bonet	69b78b6bf1	feat: refs #7531 Added address_hasDelivery	2025-01-16 15:04:21 +01:00
Javi Gallego	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00
Robert Ferrús	81ab9fe0ba	Merge branch 'dev' into 6822-entryTransfer	2025-01-16 09:06:42 +00:00
Robert Ferrús	df3f4c3d2e	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-16 08:59:15 +00:00
Javi Gallego	b8dbaec46c	Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev ... Reviewed-on: #3340 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 08:10:09 +00:00
Javi Gallego	69f1e76307	Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry model and queries' (!3354) from 8381-entryTemperature into dev ... Reviewed-on: #3354 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-16 06:56:42 +00:00
Robert Ferrús	4853e45051	feat: refs #8398 change merge.spec	2025-01-16 07:29:40 +01:00
Carlos Andrés	f79bc2a665	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 17:37:32 +00:00
Ivan Mas	416e6c81f1	refactor: refs #8378 deprecate bi.f_tvc	2025-01-15 15:22:48 +01:00
Carlos Satorres	516147b8bb	fix: refs #7917 fix acls	2025-01-15 13:04:49 +01:00
Guillermo Bonet	c2ca9cfbe5	feat: refs #7531 Added address_hasDelivery	2025-01-15 12:26:16 +01:00
Jon Elias	d0df1c1f42	Merge pull request '#8247: Added new acl for VnUser model' (!3358) from 8247-CreateNewAcl into dev ... Reviewed-on: #3358 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-15 10:51:25 +00:00
Carlos Andrés	948ad3a752	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 10:16:25 +00:00
Carlos Satorres	6ef0d2625d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-15 08:40:16 +01:00
Carlos Satorres	d39c063786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-15 06:31:00 +01:00
Javi Gallego	44765b5a64	feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic	2025-01-14 09:07:00 +01:00
Robert Ferrús	277cd80f50	Merge branch 'dev' into 6822-entryTransfer	2025-01-14 07:13:52 +00:00
Alex Moreno	48ad72ac98	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-14 08:00:08 +01:00
Alex Moreno	6aa898ee59	build: refs #8389 dump db	2025-01-14 07:39:52 +01:00
Jon Elias	29e6a99983	feat: refs #8247 added new acl for VnUser model	2025-01-14 07:36:23 +01:00
Carlos Satorres	07b07611be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:21:13 +01:00
Carlos Satorres	60c1daa47c	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-14 07:18:09 +01:00
Carlos Satorres	86dde8dfb3	fix: refs #7917 fix pr	2025-01-14 07:18:05 +01:00
Javier Segarra	9bfc2a01c5	perf: refs #7134 sql style	2025-01-13 23:09:13 +01:00
Javier Segarra	f6c3893d00	feat: refs #7134 minor changes	2025-01-13 12:41:36 +01:00
Javier Segarra	f207222b47	Merge branch 'dev' into 7134-supplierBalance	2025-01-13 11:56:25 +01:00
Javi Gallego	c15a3bfe50	feat: refs #8381 add initial and final temperature fields to entry model and queries	2025-01-13 11:28:30 +01:00
Alex Moreno	951376af2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:03 +01:00
Carlos Satorres	978914aa71	Merge branch 'dev' into 6553-workerBusiness	2025-01-13 07:50:12 +00:00
Carlos Satorres	d547456d22	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-13 07:14:59 +00:00
Robert Ferrús	1c30de5eee	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-10 09:36:09 +00:00
Robert Ferrús	bdaaffbbd7	feat: refs #7584 changes request	2025-01-10 10:33:19 +01:00
Guillermo Bonet	886383b82d	Merge branch 'dev' into 7686-onPrevious	2025-01-10 10:01:40 +01:00
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Carlos Satorres	6d661dba85	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-10 05:36:23 +00:00
Carlos Andrés	2d8bda2b56	fix: refs #7965 UnifyProblems	2025-01-09 15:46:04 +01:00
Carlos Andrés	09b4b2cf1b	fix: refs #7965 UnifyProblems	2025-01-09 11:52:30 +01:00
Guillermo Bonet	2f0a79da3f	Merge branch 'test' into dev	2025-01-09 11:34:53 +01:00
Guillermo Bonet	1787cd3102	Merge branch 'master' into test	2025-01-09 11:34:41 +01:00
Guillermo Bonet	2141d7d95d	fix: refs #7912 Major corrections waste_addSales	2025-01-09 11:29:07 +01:00
Carlos Andrés	638a8e344d	fix: refs #7965 UnifyProblems	2025-01-09 10:34:49 +01:00
Carlos Satorres	c8d57a1efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-09 09:59:25 +01:00
Jorge Penadés	7391beb29e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-restrictAbsencePrivs	2025-01-09 09:47:51 +01:00
Carlos Andrés	8f99b14510	fix: refs #7965 UnifyProblems	2025-01-09 08:43:14 +01:00
Carlos Andrés	71fcce4ed7	Merge branch 'dev' into 7965-unifyProblems	2025-01-09 08:13:42 +01:00
Guillermo Bonet	6b39e5c651	Merge branch 'test' into dev	2025-01-09 07:30:14 +01:00
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01:00
Guillermo Bonet	d0d1950e75	fix: refs #7912 Changed week num param to to be similar vn.time	2025-01-09 07:28:14 +01:00
Jorge Penadés	838617e3f6	fix: update access control for modifying absences in the past	2025-01-08 15:47:53 +01:00
Jorge Penadés	c07e30a89c	fix: prevent deleting absences for past dates	2025-01-08 12:48:28 +01:00
Javi Gallego	be56313706	feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data	2025-01-08 11:58:50 +01:00
Javi Gallego	1816b6de67	feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables	2025-01-08 10:24:18 +01:00
Carlos Satorres	209bd21548	Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-08 10:17:50 +01:00
Robert Ferrús	5d337c4def	Merge branch 'dev' into 6822-entryTransfer	2025-01-08 06:34:24 +00:00
Robert Ferrús	94ccdabe89	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 06:23:04 +00:00
Robert Ferrús	8417030438	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 12:43:57 +00:00
Guillermo Bonet	c83e6a8bbd	Merge branch 'dev' into 8357-workerManaExcludedTriggers	2025-01-07 12:28:23 +00:00
Ivan Mas	23fb04876c	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2025-01-07 12:16:20 +00:00
Carlos Satorres	bd1cee6d8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 12:47:48 +01:00
Robert Ferrús	823be8e0ea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-07 12:02:35 +01:00
Robert Ferrús	c4c9b5640e	feat: refs #6822 modify transaction	2025-01-07 12:02:32 +01:00
Guillermo Bonet	065f13557b	feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana	2025-01-07 11:58:36 +01:00
Robert Ferrús	65aa931738	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 09:39:36 +00:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Robert Ferrús	aee747abd3	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 08:32:28 +00:00
Robert Ferrús	f04f88d2fc	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 08:00:54 +00:00
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01:00
Alex Moreno	48d4bab706	build: refs #8355 dump db	2025-01-07 08:01:44 +01:00
Robert Ferrús	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00:00
Carlos Satorres	ddecfee24b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 06:13:51 +01:00
Alex Moreno	e0a5a3cd8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-06 19:06:14 +01:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Robert Ferrús	31aa7f9915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:35:17 +01:00
Robert Ferrús	02d77324b1	feat: refs #6822 crear test	2025-01-03 08:27:34 +01:00
Pablo Natek	98b68a2c74	Merge pull request 'fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic' (!3324) from 7301-removeRedundantInventories into dev ... Reviewed-on: #3324 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-02 09:54:10 +00:00
Jon Elias	5221b9254a	Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:57 +01:00
Carlos Satorres	78a8f80321	fix: refs #7917 fix tback	2025-01-02 08:38:24 +01:00
Alex Moreno	7092226c01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-02 07:51:54 +01:00
Alex Moreno	bf80cbbf4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-02 07:50:28 +01:00
Carlos Satorres	81d3bce12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-02 06:23:35 +01:00
Ivan Mas	1cc6e37697	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-31 07:36:21 +00:00
Javi Gallego	8ca5808554	fix: add isCustomInspectionRequired column to item table for customs inspection indication	2024-12-29 10:16:38 +01:00
Javi Gallego	49d87ea44f	Merge pull request 'feat: refs #7924 add isCustomInspectionRequired field to item and update related logic' (!3325) from 7924-itemInspection into dev ... Reviewed-on: #3325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:51 +00:00
Javier Segarra	3691daded4	feat: refs #7134 add bank name	2024-12-27 13:26:38 +01:00
Javier Segarra	ca90d6ecd7	Merge branch 'dev' into 7134-supplierBalance	2024-12-27 11:57:28 +01:00
Jose Antonio Tubau	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
Carlos Satorres	85163a13fa	fix: refs #7917 fix fixtures	2024-12-24 08:13:00 +01:00
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00
Carlos Satorres	6f16974320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-12-23 13:30:27 +01:00
Carlos Satorres	419815ff87	fix: refs #7917 fix back	2024-12-23 11:59:40 +01:00
Carlos Satorres	afb01ed021	fix: refs #7917 fix route filter freeLancer	2024-12-23 11:55:48 +01:00
Ivan Mas	c59cae9f74	feat: refs #8073 new comment message	2024-12-19 14:38:28 +01:00
Ivan Mas	da4968f8b1	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-19 12:55:23 +00:00
Javi Gallego	a99d7adfe8	feat: refs #7924 add isCustomInspectionRequired field to item and update related logic	2024-12-19 10:11:33 +01:00
Pablo Natek	49c30890e5	fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic	2024-12-19 08:31:51 +01:00
Carlos Andrés	83d46d0a28	feat: refs #8324 country unique	2024-12-18 17:58:30 +01:00
Ivan Mas	148ab57b1a	feat: refs #8073 change names and primary key	2024-12-18 15:06:49 +01:00
Ivan Mas	5620242d7e	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-18 12:30:16 +00:00
Ivan Mas	1ba23ad450	feat: refs #8073 #refs 8073 create vn.productionCountryVolume	2024-12-18 13:27:43 +01:00
Carlos Andrés	94136d35ff	Actualizar db/routines/vn/triggers/route_afterUpdate.sql	2024-12-18 12:22:59 +00:00
Ivan Mas	ab5cf0f497	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-18 11:17:14 +00:00
Alex Moreno	116ec5b107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:22:28 +01:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Alex Moreno	1a8b05c46b	fix: refs #8315 fixture claimDevelopment	2024-12-18 07:08:23 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Jorge Penadés	6476eb28e6	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-17 10:51:52 +01:00
Guillermo Bonet	db2a102a88	Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev ... Reviewed-on: #3311 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:17:19 +00:00
Guillermo Bonet	4f4eb389c9	Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev ... Reviewed-on: #3310 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:15:29 +00:00
Robert Ferrús	68715a8c36	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2024-12-16 13:25:38 +00:00
Juanjo Breso	6a3cbed3dd	fix: refs #8174 fix	2024-12-16 13:47:36 +01:00
Juanjo Breso	5a7ac8dcb3	fix: refs #8174 fix	2024-12-16 13:44:58 +01:00
Juanjo Breso	48064d6393	fix: refs #8174 fix	2024-12-16 13:35:50 +01:00
Carlos Satorres	e2a4c5339a	fix: refs #6553 fix back	2024-12-16 13:01:44 +01:00
Juanjo Breso	de69a8db1d	fix: refs#8174 fix	2024-12-16 13:01:00 +01:00
Juanjo Breso	11db90c67c	fix: refs#8174 fix	2024-12-16 12:48:43 +01:00
Juanjo Breso	deb1b68c49	fix: refs#8174 fix	2024-12-16 12:47:47 +01:00
Juanjo Breso	7232bfb7a6	fix: 8174 pasar PIN a CHAR	2024-12-16 12:42:08 +01:00
Juanjo Breso	d03a2ced04	fix: refs8174 pasar a char el PIN	2024-12-16 12:30:35 +01:00
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +01:00