442 Commits

Author	SHA1	Message	Date
Sergio De la torre	ff8522cfd1	refs #6964 feat:advice for olderItem	2024-03-27 07:09:18 +01:00
Sergio De la torre	678eb2928f	refs #6964 feat:hasItemOlder	2024-03-26 10:30:17 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Sergio De la torre	a40234ba9b	refs #6964 feat:hasItemOlder	2024-03-25 08:20:08 +01:00
Sergio De la torre	22f78dbb91	refs #6964 feat:hasItemOlder	2024-03-25 07:54:51 +01:00
Sergio De la torre	c4fcb2cd12	refs #6964 feat:advice for olderItem	2024-03-22 13:04:16 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem	2024-03-22 11:47:12 +01:00
Sergio De la torre	976c5b7ba8	refs #6964 feat:advice for olderItem	2024-03-22 11:42:19 +01:00
Sergio De la torre	027aa86662	refs #6964 feat:advice for olderItem	2024-03-22 10:08:20 +01:00
Sergio De la torre	2a976664ec	refs #6276 feat:newWarehouse	2024-03-21 12:05:34 +01:00
Sergio De la torre	5135bee2d2	refs #6276 feat:newWarehouse	2024-03-21 12:02:57 +01:00
Sergio De la torre	d8da317339	Merge branch 'dev' into 6964_itemOlder	2024-03-21 10:10:57 +00:00
Sergio De la torre	1d37d3d8bf	refs #6276 feat:newWarehouse	2024-03-21 10:33:49 +01:00
Sergio De la torre	3fbf32bd52	refs #6276 feat:newWarehouse	2024-03-21 10:32:36 +01:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Sergio De la torre	def9aaf41a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-13 07:15:45 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Alex Moreno	dbbebbe73c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 11:39:03 +01:00
Alex Moreno	01cd2709cc	deploy: refs #6995 skip test	2024-03-07 11:38:30 +01:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +00:00
Sergio De la torre	09923d2509	refs #6964 feat:advice for olderItem	2024-03-04 18:35:36 +01:00
Jorge Penadés	854a9b62af	fix: refs #6276 refactor updateInTime & changes	2024-03-04 09:21:41 +01:00
Jorge Penadés	b86110c898	fix: refs #6276 changes	2024-02-27 10:29:49 +01:00
Javier Segarra	04086e37ee	refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method	2024-02-26 06:57:17 +01:00
Jorge Penadés	e9f7fbed86	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 14:46:56 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Jorge Penadés	fc6e34ddfd	fix: refs #6776 replace name	2024-02-19 11:18:05 +01:00
Jorge Penadés	69acebb43c	fix: refs #6776 replace name	2024-02-16 13:48:55 +01:00
Jorge Penadés	f11aa2605b	feat: refs #6776 back & procedure modified	2024-02-15 14:48:30 +01:00
Jorge Penadés	be7a570314	fix: refs #6776 test	2024-02-15 11:18:01 +01:00
Jorge Penadés	21cf05ddd0	fix: refs #6276 fix tests & errors	2024-02-02 09:23:29 +01:00
Jorge Penadés	2a6abffef9	fix: refs #6276 fix errors & refactor	2024-01-30 16:07:33 +01:00
Jorge Penadés	5690da0a18	fix: refs #6776 add userId	2024-01-30 16:05:56 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Jorge Penadés	afa34c6296	feat: refs #6776 makeMulti	2024-01-30 14:00:08 +01:00
Jorge Penadés	63fb3db8a1	fix: refs #6276 test item_card & general fixes	2024-01-25 12:14:14 +01:00
Jorge Penadés	02e38eb711	fix: refs #6276 fix tests	2024-01-25 08:13:47 +01:00
Jorge Penadés	5c0425b942	feat: refs #6276 test machineWorker_update	2024-01-19 09:52:49 +01:00
Jorge Penadés	34420375cd	feat: refs #6276 test item_updateFromSale	2024-01-18 15:03:17 +01:00
Jorge Penadés	b33594e0da	fix: refs #6276 item_card & wip test	2024-01-18 14:35:51 +01:00
Jorge Penadés	c8bfb35cf6	feat: refs #6276 test itemShelvingMake_multi	2024-01-18 13:28:22 +01:00
Jorge Penadés	6f35c62cd5	feat: refs #6276 test collection_addItem	2024-01-18 11:51:21 +01:00
Jorge Penadés	8e5be5f5da	feat: refs #6276 test itemBarcode_delete	2024-01-17 15:26:04 +01:00
Jorge Penadés	c0398d17bf	feat: refs #6276 test itemShelving_return	2024-01-17 14:21:50 +01:00
Jorge Penadés	1fbb84ae9f	fix: refs #6276 itemShelving_return	2024-01-17 12:58:57 +01:00
Jorge Penadés	8a5da43503	refactor: sectorCollection_getSale refs #6276	2024-01-04 16:00:25 +01:00
Sergio De la torre	0b5ffcc81c	refs #6276:modify back silex→salix	2024-01-03 12:50:53 +01:00
Jorge Penadés	8d61473d4f	refs #6276 fixtures & itemBarcode_delete	2023-12-13 11:43:19 +01:00
Jorge Penadés	a4c3d78e31	refs #6276 drop fixtures & fix getSale	2023-12-13 09:45:01 +01:00
Jorge Penadés	64c10f3b8e	refs #6276 sectorCollection_getSales	2023-12-13 08:52:43 +01:00
Jorge Penadés	4690dca4f9	refs #6276 getItemPackingType	2023-12-01 13:54:09 +01:00
Jorge Penadés	660e77be55	refs #6276 updateFromSale refactored	2023-12-01 12:48:21 +01:00
Jorge Penadés	7e57640758	refs #6276 itemShelving_updateFromSale	2023-12-01 11:43:07 +01:00
Jorge Penadés	d2769f4c21	refs #6276 return fixed	2023-12-01 11:38:30 +01:00
Jorge Penadés	f2ab44bb8f	refs #6276 itemShelving_return	2023-12-01 10:14:32 +01:00
Jorge Penadés	3333c83702	refs #6276 WIP itemShelving_return	2023-11-30 16:25:13 +01:00
Jorge Penadés	40236fdb7b	refs #6276 itemShelvingMake_multi	2023-11-30 13:23:10 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Sergio De la torre	692c5eb164	refs #5652 fix: setVisibleDiscard add parameter null	2023-11-15 12:38:08 +01:00
Pablo Natek	020de5d754	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-05 07:57:46 +00:00
Carlos Andrés	52cba80dc8	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 15:13:37 +02:00
Alex Moreno	28dfb895ca	refs #6224 deploy: correct sql folder and fix sql	2023-09-28 13:49:58 +02:00
Alex Moreno	e51df063d3	refs #5890 feat: add userId in rawSql	2023-09-28 13:26:05 +02:00
Sergio De la torre	4048627c76	refs #5890 fix: format	2023-09-28 08:08:40 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Pablo Natek	a854fff94f	refs #3126 changes	2023-09-22 10:59:48 +02:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Sergio De la torre	022d3d08e6	refs #5652 feat:itemTrash_new	2023-09-01 12:34:33 +02:00
Carlos Satorres	0b9199688e	refs #5843 userFk remove and vchange	2023-08-30 12:48:57 +02:00
Vicent Llopis	2f2611a705	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-08-22 10:31:17 +00:00
Carlos Satorres	b1b6bd13ea	refs #5843 change userFk	2023-08-22 10:45:41 +02:00
Vicent Llopis	65b9cadd9e	refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker	2023-07-27 12:51:14 +02:00
Vicent Llopis	8f7caa1183	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-20 11:42:10 +02:00
Sergio De la torre	9076553070	refs #5983 test(itemShelving): add getInventory	2023-07-18 14:11:50 +02:00
Sergio De la torre	93da129239	refs #5983 feat(itemShelving): add getInventory	2023-07-18 08:54:45 +02:00
Vicent Llopis	28eedbfd23	Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-14 11:04:06 +00:00
Carlos Satorres	d1c8f0ff11	refs #5949 itemRecycle	2023-07-11 07:37:51 +02:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Vicent Llopis	024cb1e3f4	refs #5561 feat: permite modificar registros	2023-06-06 11:56:14 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alexandre Riera	2591d2d115	refs #3628 added check & date-picker	2023-05-18 11:42:22 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Joan Sanchez	610f51aaf8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-17 08:59:49 +02:00
Joan Sanchez	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Vicent Llopis	ec03c6edfa	fix intermittent backTest	2023-04-11 10:23:33 +02:00
Vicent Llopis	fb5969a120	refs #5275 add test	2023-04-05 08:43:47 +02:00
Vicent Llopis	e97b5a9f80	refs #5275 fix backTest	2023-04-05 07:54:56 +02:00
Vicent Llopis	28a12d0706	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor	2023-04-05 07:36:53 +02:00
Joan Sanchez	c126c6044a	Updated format	2023-04-04 13:55:44 +02:00
Vicent Llopis	3b615d9879	refs #5275 fix: actualiza correctamete los elementos del checkedDummy	2023-03-29 09:11:40 +02:00
Vicent Llopis	fb1b39da17	refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto	2023-03-28 10:30:02 +02:00
Vicent Llopis	06ac8f9910	refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas	2023-03-28 09:41:39 +02:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Joan Sanchez	1f52326091	Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev ... Reviewed-on: #1390 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-16 06:22:45 +00:00
Joan Sanchez	596a017cfd	Don't throw error on file unlink	2023-03-16 07:18:29 +01:00