14139 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	c8c66dc272	Merge branch 'master' into hotfix-viewReceipt-clientBalance	2023-01-27 07:58:31 +00:00
Alexandre Riera	98ef87729b	Merge pull request 'hotfix delete saleChecked from vnClean' (!1271) from hotfix-delete-saleChecked-from-vnClean into master ... Reviewed-on: #1271	2023-01-27 07:51:04 +00:00
Alexandre Riera	fccfabdcd1	hotfix viewReceipt clientBalance	2023-01-27 08:31:14 +01:00
Alexandre Riera	956b3e05f8	hotfix delete saleChecked from vnClean	2023-01-27 07:56:51 +01:00
Joan Sanchez	c04185aadd	Updated package version	2023-01-26 12:53:47 +01:00
Alexandre Riera	14b5a44446	Merge pull request 'hotfix instanceLog css' (!1269) from hotfix-instance-log-css into test ... Reviewed-on: #1269 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-25 09:18:18 +00:00
Alexandre Riera	d06ed159bf	Merge branch 'hotfix-instance-log-css' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-instance-log-css	2023-01-24 14:38:28 +01:00
Alexandre Riera	6c435e095f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-instance-log-css	2023-01-24 14:38:21 +01:00
Alexandre Riera	96da1140c9	Merge branch 'test' into hotfix-instance-log-css	2023-01-24 13:38:11 +00:00
Alexandre Riera	1e89352446	hotfix instanceLog css	2023-01-24 14:37:08 +01:00
Alexandre Riera	1936680f49	Merge pull request 'hotfix itemName' (!1268) from hotfix-itemName into test ... Reviewed-on: #1268 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-24 11:29:12 +00:00
Alexandre Riera	ca7154bff1	hotfix itemName	2023-01-24 12:16:10 +01:00
Vicent Llopis	5ccee0c5e9	Merge pull request 'TEST_2952-ticket.sale-tracking' (!1262) from TEST_2952-ticket.sale-tracking into test ... Reviewed-on: #1262 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-24 09:36:02 +00:00
Joan Sanchez	869cd39df3	Merge branch 'test' into TEST_2952-ticket.sale-tracking	2023-01-24 08:57:26 +00:00
Alex Moreno	78d33e2cd9	Merge pull request 'fix: typo' (!1265) from reset-password-typo into test	2023-01-23 12:12:10 +00:00
Alex Moreno	6b6f27c2f2	fix: typo	2023-01-23 08:44:58 +01:00
Vicent Llopis	9523991b04	fix: mostrar descriptor worker en vez de item	2023-01-20 12:45:02 +01:00
Vicent Llopis	ab1a9389cb	fix: cambiados de donde coge el item id	2023-01-20 12:37:41 +01:00
Vicent Llopis	b1be6addd1	fix: delete unnecessary code	2023-01-20 12:16:06 +01:00
Joan Sanchez	91e27d76be	Updated version	2023-01-20 07:44:04 +01:00
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +01:00
Joan Sanchez	9072f3696d	Merge pull request '4903-workerTimeControl_sendMail' (!1261) from 4903-workerTimeControl_sendMail into dev ... Reviewed-on: #1261 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-20 06:21:02 +00:00
Vicent Llopis	dfcacdad71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail	2023-01-19 08:56:39 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00
Vicent Llopis	38e4349e17	borrado comentario	2023-01-18 14:25:24 +01:00
Vicent Llopis	2c995208d1	fix: transaccionado por trabajador y día	2023-01-18 14:23:05 +01:00
Vicent Llopis	7368b572a0	fix: añadidos await y actualizado condicional permissionRate	2023-01-18 13:05:02 +01:00
Pau	5507b2de21	Merge pull request 'closes 4732 etiquetas con QR para previa y item' (!1163) from 4732-previa-label into dev ... Reviewed-on: #1163 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2023-01-18 08:26:10 +00:00
Pau	5e198b8541	Merge branch 'dev' into 4732-previa-label	2023-01-18 08:15:45 +00:00
Alexandre Riera	52b12d52b1	Merge pull request 'fixes #5020 Borrado lógico en la tabla ItemPackingType' (!1257) from 5020-borradoLogico-IPT into dev ... Reviewed-on: #1257 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-18 08:15:08 +00:00
Alexandre Riera	4aaa5b2687	refs #5020 isActive Not Null	2023-01-18 09:08:09 +01:00
Alexandre Riera	98d6322b0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT	2023-01-18 08:00:20 +01:00
Pau	eb4ad206d0	Merge branch 'dev' into 4732-previa-label	2023-01-18 06:20:14 +00:00
Alexandre Riera	5473b2ca2e	Merge pull request 'fixes #4930 Añadir Zona en la info del cliente, en las reclamaciones' (!1226) from 4930-add-zone into dev ... Reviewed-on: #1226 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-17 12:01:35 +00:00
Joan Sanchez	1597c40a16	Merge branch 'dev' into 4930-add-zone	2023-01-17 11:33:56 +00:00
Pau	f0cc28d698	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:46:55 +00:00
Alex Moreno	1f042d01ba	Merge pull request 'fixes #4523 item_fixed-price_rate2' (!1218) from 4523-item_fixed-price_rate2 into dev	2023-01-17 10:45:28 +00:00
Alex Moreno	bc9510a317	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 09:46:16 +00:00
Pau	51b2e5a3bc	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:37:07 +01:00
Pau	ffad1a6d79	eliminadas las comillas de template	2023-01-17 10:35:19 +01:00
Pau	f7a25c64b5	format sql	2023-01-17 10:13:41 +01:00
Pau	ba1e46f8d7	Merge pull request 'closes #4605 Create-Model-PackagingMistake' (!1247) from 4605-Create-Model-PackagingMistake into dev ... Reviewed-on: #1247 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-17 09:05:19 +00:00
Pau	3a1aea2afd	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-17 09:01:45 +00:00
Alexandre Riera	c371c2fe92	refs #4930 refresh structure	2023-01-17 09:03:13 +01:00
Alexandre Riera	e97a02a871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-17 09:02:27 +01:00
Alexandre Riera	c47cac7d55	refs #5020 isActive column added, filter in front	2023-01-17 08:54:26 +01:00
Alexandre Riera	abf4c4e59b	Merge pull request 'fixes #4866 más detalle en faltas' (!1201) from 4866-detalle-faltas into dev ... Reviewed-on: #1201 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-01-17 07:37:49 +00:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alexandre Riera	be1f9bdd1b	Merge pull request 'fixes #4951 Comprobar longitud de cuentas contables al generar asientos' (!1238) from 4951-longitud-cuentaContables into dev ... Reviewed-on: #1238 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-17 07:30:36 +00:00