13957 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Alexandre Riera	7d1b8c8c56	refs #4971 itemSearchFunc added	2022-12-23 12:11:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Alexandre Riera	53b5ef6d78	refs #4937 viewReceipt added	2022-12-23 11:48:59 +01:00
Vicent Llopis	10a6c280a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 10:58:19 +01:00
Joan Sanchez	c13b49c7cd	Added next version & changelog	2022-12-23 10:07:19 +01:00
Joan Sanchez	39699114e3	Changed version	2022-12-23 10:01:08 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Joan Sanchez	ff0243db8f	Fixed SQL files	2022-12-23 09:55:15 +01:00
Pau	1978d228ff	Merge pull request 'Closes #288 translation for vn.state using i18n' (!1152) from #288-traducir-state-i18n into dev ... Reviewed-on: #1152 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-23 08:15:36 +00:00
Pau	fc86e913c4	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-23 08:09:38 +00:00
Alexandre Riera	bd6935c28e	Merge pull request 'fixes #3302 log front modificaciones' (!1198) from 3302-logFormat into dev ... Reviewed-on: #1198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-23 08:03:59 +00:00
Alexandre Riera	c34c239375	refs #3302 corrections	2022-12-23 08:13:08 +01:00
Alexandre Riera	eefc5ab80d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-23 08:01:52 +01:00
Joan Sanchez	e15d724db5	Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev ... Reviewed-on: #1151 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 12:44:01 +00:00
Joan Sanchez	4ae77d7f51	Merge pull request 'fix(pagination): duplicated rows on paginate' (!1214) from 4531-monitor_duplicates into dev ... Reviewed-on: #1214 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-22 10:45:15 +00:00
Joan Sanchez	7c33cd2691	Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev ... Reviewed-on: #1188 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 10:43:20 +00:00
Joan Sanchez	606bacbad7	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
Guillermo Bonet	6660c568e5	Merge pull request 'refs #4898 Added barcode and changes in structure' (!1220) from 4898-expedition-pallet-label-barcode into dev ... Reviewed-on: #1220 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 09:54:06 +00:00
Pau	a8ca163321	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 10:49:41 +01:00
Guillermo Bonet	861cdb2863	Merge branch 'dev' into 4898-expedition-pallet-label-barcode	2022-12-22 09:46:50 +00:00
Pau	6ded11a4c2	requested changes refs #3681 @3h	2022-12-22 10:35:11 +01:00
Vicent Llopis	9e045e15b7	Merge pull request '4794-mdb_block' (!1170) from 4794-mdb_block into dev ... Reviewed-on: #1170 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-12-22 09:19:15 +00:00
Vicent Llopis	7f80c7ed2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-22 09:30:35 +01:00
Pau	aa716634db	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-12-22 08:30:36 +01:00
Pau	ea6d399cf1	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-22 07:25:38 +00:00
Pau	c0d285856b	move sql files	2022-12-22 08:24:54 +01:00
Pau	f57201c8c3	add requested changes	2022-12-22 08:20:59 +01:00
Pau	bf70ba43a3	Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n	2022-12-22 08:07:41 +01:00
Pau	fed4cc8534	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-22 08:07:25 +01:00
Guillermo Bonet	d391946f57	refs #4898 Added barcode and changes in structure	2022-12-22 08:04:03 +01:00
Pau	a713cf92cf	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 08:00:33 +01:00
Pau	f6f6d0866d	requested changes refs #4732 @1h	2022-12-22 08:00:18 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Vicent Llopis	7731ca143e	Merge pull request '4804-ticket.descriptor_sms' (!1217) from 4804-ticket.descriptor_sms into dev ... Reviewed-on: #1217 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-21 11:29:59 +00:00
Vicent Llopis	630890cd04	fix: colum name in model	2022-12-21 12:23:16 +01:00
Vicent Llopis	a45ef27e3f	move changes sql	2022-12-21 12:15:33 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	3a33750890	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-21 10:11:37 +01:00
Vicent Llopis	e4f4e70cc6	Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:26:53 +00:00
Vicent Llopis	6634ebcec5	fix: id duplicado en util.notification	2022-12-21 09:25:52 +01:00
Alexandre Riera	ebb81a3377	Merge pull request 'fixes #3963 Adelantar la fecha de preparacion de tickets' (!1155) from 3963-ticket-advance into dev ... Reviewed-on: #1155 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-21 07:37:19 +00:00
Alexandre Riera	081ef7fc99	Merge branch 'dev' into 3963-ticket-advance	2022-12-21 07:30:17 +00:00
Vicent Llopis	b0595dd0da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:12:59 +01:00
Vicent Llopis	144a1cb105	Merge pull request '3951-invoiceOut.index_downloadZip' (!1215) from 3951-invoiceOut.index_downloadZip into dev ... Reviewed-on: #1215 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-21 07:12:14 +00:00
Vicent Llopis	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Vicent Llopis	5a4a78d045	Merge branch 'dev' into 3951-invoiceOut.index_downloadZip	2022-12-21 07:02:12 +00:00
Pau	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +00:00
Pau	04055f2294	Merge pull request '4791-refactor-sendsms' (!1160) from 4791-refactor-sendsms into dev ... Reviewed-on: #1160 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-21 06:55:27 +00:00
Pau	c9b4e1ab9a	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-21 06:38:20 +00:00