22070 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	f23924e792	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-06 14:31:41 +02:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Javi Gallego	69766bbfeb	Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev ... Reviewed-on: #2409 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 12:00:14 +00:00
Javi Gallego	f9348b41ea	feat: #7109 inventoryType	2024-05-06 13:42:19 +02:00
Carlos Andrés	53a6de27cf	Merge pull request 'fix: Error workerTimeControl_direction Salix' (!2407) from 7330-Error-workerTimeControl_direction-en-Salix into master ... Reviewed-on: #2407 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 11:41:09 +00:00
Carlos Andrés	0b4ac51749	fix: Error workerTimeControl_direction Salix	2024-05-06 13:34:46 +02:00
Robert Ferrús	1eb75599d8	Merge branch 'dev' into 7296-expeditionTruck	2024-05-06 09:38:14 +00:00
Robert Ferrús	b57be129e3	Merge branch 'dev' into 7039-country-country	2024-05-06 08:27:21 +00:00
Carlos Satorres	bc5f78827c	Merge branch 'dev' into 6682-notHolidays	2024-05-06 08:09:21 +00:00
Javi Gallego	faa4496d81	Merge pull request 'feat: #6382 chekCodeFormat' (!2351) from 6382-regularizar-Shelving-Parking into dev ... Reviewed-on: #2351 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-06 07:46:08 +00:00
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00:00
Javi Gallego	fe025b510d	Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev ... Reviewed-on: #2405 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 07:41:27 +00:00
Carlos Satorres	fe300f0f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-06 09:26:14 +02:00
Robert Ferrús	87e85e4a4e	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:07 +00:00
Carlos Andrés	166f4da934	Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev ... Reviewed-on: #2331 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 17:08:07 +00:00
Carlos Andrés	e979defd92	fix: descuentos en bs.ventas refs #6974	2024-05-03 15:03:05 +02:00
Ivan Mas	5643a2e9e2	Merge pull request 'refs #7191 check isBooked in entry_BeforeUpdate' (!2329) from 7191-entry_BeforeUpdate-isBooked into dev ... Reviewed-on: #2329 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-03 12:59:12 +00:00
Ivan Mas	5d3235977f	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-05-03 12:57:26 +00:00
Javi Gallego	432b696305	feat: create isInformal	2024-05-03 14:57:09 +02:00
Carlos Satorres	e15b8eee30	refs #6842 worker	2024-05-03 14:54:12 +02:00
Pablo Natek	699684bd65	feat: refs #7187 add sim column to the model and id	2024-05-03 14:22:48 +02:00
Pablo Natek	133b862dc0	fix: refs #7187 move column sim to deviceProductionUser	2024-05-03 14:20:16 +02:00
Carlos Andrés	2659e3b259	feat: Turn issues into calculated columns refs#7213	2024-05-03 14:03:26 +02:00
Pablo Natek	95aba9e7b3	Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ... Reviewed-on: #2292 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 11:52:22 +00:00
Pablo Natek	4c55ae40ef	Merge pull request 'test' (!2402) from test into dev ... Reviewed-on: #2402 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:58:42 +00:00
Pablo Natek	52c9015fca	Merge pull request 'fix: refs #6005 runtime' (!2401) from 6005-fix-runtime-error into test ... Reviewed-on: #2401 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:53:51 +00:00
Pablo Natek	bc366c950d	Merge branch '6005-fix-runtime-error' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:52:19 +02:00
Pablo Natek	3ae192c761	fix: refs #6005 fix test	2024-05-03 12:52:12 +02:00
Pako Natek	7d5b1708c1	Merge pull request 'defaultSector' (!2398) from productionConfig.defaultSectorFk into dev ... Reviewed-on: #2398 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 10:51:01 +00:00
Jorge Penadés	a9d434989d	Merge pull request '#7165 fix delivery-note css report' (!2389) from 7165-fixEmptySheet into dev ... Reviewed-on: #2389 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 10:50:54 +00:00
Pako Natek	38af3156ff	Merge branch 'dev' into productionConfig.defaultSectorFk	2024-05-03 10:48:50 +00:00
Jorge Penadés	19841f0e12	Merge branch 'dev' into 7165-fixEmptySheet	2024-05-03 10:48:43 +00:00
Pablo Natek	6152820078	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error	2024-05-03 12:47:14 +02:00
Pablo Natek	0dfb7f2825	Merge branch 'test' into 6005-fix-runtime-error	2024-05-03 10:34:52 +00:00
Pablo Natek	48bfba71de	fix: refs #6005 runtime	2024-05-03 12:33:59 +02:00
Sergio De la torre	98d366cd06	Merge pull request 'refs #6799 feat: french and portuguese' (!2395) from 6799_translations into dev ... Reviewed-on: #2395 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:32:50 +00:00
Carlos Satorres	f77cf619db	refs #6682 holidays conditional	2024-05-03 12:27:19 +02:00
Javier Segarra	6e00b790d2	Merge branch 'dev' into 7272_bug_redirectToLogin	2024-05-03 10:27:08 +00:00
Pablo Natek	f5352c03a9	Merge pull request 'fix: refs #6005 time issue' (!2399) from 6005-fix-time-error into test ... Reviewed-on: #2399 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-03 10:12:28 +00:00
Pablo Natek	8b11a4a290	fix: refs #6005 time issue	2024-05-03 12:08:22 +02:00
Sergio De la torre	c3b9e76cd6	Merge branch 'dev' into 6799_translations	2024-05-03 09:28:28 +00:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Pako Natek	b5402a3f2f	defaultSector	2024-05-03 10:44:57 +02:00
Carlos Andrés	7659a39b42	feat: Turn issues into calculated columns refs#7213	2024-05-03 10:19:05 +02:00
Jorge Penadés	3b46f67b9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7165-fixEmptySheet	2024-05-03 09:14:59 +02:00
Javier Segarra	da3c4cb8fc	fix(salix): refs #7272 #7272 Errors when Token not exists	2024-05-03 08:24:10 +02:00
Robert Ferrús	cdb0bf28c2	Merge pull request 'feat: refs #7325 item_getBalance' (!2397) from 7325-item_getBalance into dev ... Reviewed-on: #2397 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-03 06:04:47 +00:00
Robert Ferrús	b6e4130184	feat: refs #7325 item_getBalance	2024-05-03 07:51:04 +02:00
Robert Ferrús	523735e4fc	Merge branch 'dev' into 7296-expeditionTruck	2024-05-03 04:59:01 +00:00
Carlos Andrés	9905d7254d	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-05-02 18:17:31 +02:00