21749 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Carlos Satorres	01e2391e0a	Merge pull request '#7292 - createAddresUEEMember' (!2489) from 7292-createAddresUEEMember into dev ... Reviewed-on: #2489 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:40:28 +00:00
Carlos Satorres	2fc6f6356f	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:38:27 +00:00
Carlos Satorres	9c3700092e	Merge branch '7292-createAddresUEEMember' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-24 08:37:48 +02:00
Carlos Satorres	a435d88e55	refs #7292 fix tback	2024-05-24 08:37:46 +02:00
Carlos Satorres	5eaadf6044	Merge pull request 'fix: refs #6095 filter by refFk null' (!2468) from 6095-refFk-null-on-search into dev ... Reviewed-on: #2468 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:28:28 +00:00
Carlos Satorres	a5079a5ae0	Merge branch 'dev' into 6095-refFk-null-on-search	2024-05-24 06:26:46 +00:00
Carlos Satorres	ed85abf9ef	Merge branch 'dev' into 7292-createAddresUEEMember	2024-05-24 06:22:55 +00:00
Carlos Satorres	4c3428da55	refs #7292 add traduction	2024-05-24 08:21:28 +02:00
Pako Natek	31dc85a0d7	Merge pull request 'feat: refs #6021 add new field' (!2508) from 6021-add-observations-to-json into dev ... Reviewed-on: #2508 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-24 05:32:40 +00:00
Pako Natek	0a1e09be41	Merge branch 'dev' into 6021-add-observations-to-json	2024-05-24 05:31:10 +00:00
Pablo Natek	ee17ea4842	feat: refs #6021 add new field	2024-05-23 21:38:02 +02:00
Carlos Satorres	84582120d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 16:12:55 +02:00
Jorge Penadés	2cd3002d06	Merge pull request 'test' (!2506) from test into dev ... Reviewed-on: #2506 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-23 14:07:21 +00:00
Carlos Andrés	14f243f251	Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ... Reviewed-on: #2495 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-23 14:03:22 +00:00
Carlos Satorres	33ba999725	Merge pull request 'refs #6111 routeList sql' (!2257) from 6111-routeList into dev ... Reviewed-on: #2257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:47:56 +00:00
Carlos Satorres	f45f909995	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 14:46:33 +02:00
Carlos Satorres	ee010a3bb3	refs #7296 fix pr errors, trad	2024-05-23 14:44:47 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Carlos Andrés	8b967ee927	Merge pull request 'fix: problems in colums ticket and sale refs #7213' (!2497) from 7213-Problems-in-colums-ticket-and-sale into test ... Reviewed-on: #2497 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 10:53:15 +00:00
Pablo Natek	a919c71369	Merge pull request 'feat: refs #7187 Add support for multiple PDAs per user' (!2496) from 7187-add-traducctions into test ... Reviewed-on: #2496 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 10:24:53 +00:00
Pablo Natek	86a6211cd8	fix: refs #7187 fix duplicate	2024-05-23 12:23:31 +02:00
Carlos Satorres	49c105ae09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6095-refFk-null-on-search	2024-05-23 11:54:48 +02:00
Guillermo Bonet	1730276844	Merge pull request 'refactor: refs #7440 itemComparativeOptimization' (!2501) from 7440-itemComparativeOptimization into dev ... Reviewed-on: #2501 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-23 08:55:57 +00:00
Guillermo Bonet	bbd948c654	refs #7440 Minor change	2024-05-23 09:47:14 +02:00
Guillermo Bonet	56aec1c781	refs #7440 Optimized item_comparative	2024-05-23 09:44:18 +02:00
Carlos Satorres	1fa5a22bb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList	2024-05-23 09:17:19 +02:00
Carlos Satorres	83f638323a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-22 16:09:52 +02:00
Carlos Satorres	4c5f46eb9b	Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev ... Reviewed-on: #2480 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 13:55:53 +00:00
Carlos Satorres	4dee90ff57	refs #6820 fix pr	2024-05-22 14:56:46 +02:00
Carlos Andrés	bc6af32962	fix: problems in colums ticket and sale refs #7213	2024-05-22 14:50:45 +02:00
Guillermo Bonet	a52b9b6d2e	Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev ... Reviewed-on: #2494 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-22 06:31:06 +00:00
Guillermo Bonet	0d620c6f33	feat: refs #7398 Change	2024-05-22 08:11:27 +02:00
Pablo Natek	2142b78deb	feat: refs #7187 Add support for multiple PDAs per user	2024-05-21 19:25:18 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +02:00
Alex Moreno	f0d3bfba92	Merge pull request 'fix: checking process.env.NODE_ENV' (!2492) from 7421-fix_checking_NODE_ENV into dev ... Reviewed-on: #2492 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-21 13:22:02 +00:00
Alex Moreno	28279b0782	Merge branch 'dev' into 7421-fix_checking_NODE_ENV	2024-05-21 13:12:30 +00:00
Alex Moreno	ff33c926af	fix: move to boot	2024-05-21 15:11:32 +02:00
Guillermo Bonet	2ffdce3c64	refactor: refs #7398 Refactor and change ekt_scan	2024-05-21 14:40:42 +02:00
Pako Natek	e00ac020cc	Merge pull request 'evita facturacion proveedores' (!2491) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2491 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-21 12:19:06 +00:00
Alex Moreno	1f2017c272	fix: simplify	2024-05-21 14:03:13 +02:00
Alex Moreno	d884192066	fix: checking process.env.NODE_ENV	2024-05-21 13:52:50 +02:00
Alex Moreno	18bb8a4ea5	fix: checking process.env.NODE_ENV	2024-05-21 13:50:45 +02:00
Pako Natek	ba478d5358	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-21 11:31:41 +00:00
Pako Natek	dfde2f6846	evita facturacion proveedores	2024-05-21 13:28:05 +02:00
Guillermo Bonet	1f370c8814	Merge branch 'test' into dev	2024-05-21 11:44:52 +02:00
Guillermo Bonet	6e06891937	Merge branch 'master' into test	2024-05-21 11:44:26 +02:00
Guillermo Bonet	d672385776	hotfix: Rectificación Pepe	2024-05-21 11:44:11 +02:00
Alex Moreno	da75bf95c9	deploy: init version	2024-05-21 11:16:12 +02:00
Alex Moreno	5dd1d1f1b6	Merge pull request '7430_devToTest' (!2490) from 7430_devToTest into test ... Reviewed-on: #2490 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-21 09:15:02 +00:00