1139 Commits

Author	SHA1	Message	Date
Javier Segarra	0e97c453ed	Merge branch 'dev' into 6321_negative_tickets	2024-07-22 16:47:05 +02:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Javier Segarra	7ec47f2f80	Merge branch 'dev' into 6321_negative_tickets	2024-07-22 10:21:50 +02:00
Guillermo Bonet	ce59a2bbbf	fix: refs #6769 Item diary redirection to Lilium	2024-07-22 08:40:12 +02:00
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Javier Segarra	ac7c28cd27	Merge branch 'dev' into 6321_negative_tickets	2024-07-18 22:02:22 +02:00
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Guillermo Bonet	31530d6d3d	feat: refs #6769 Fix tests	2024-07-12 07:22:22 +02:00
Guillermo Bonet	9e3baeffa6	feat: refs #7704 Added tests	2024-07-11 14:27:16 +02:00
Guillermo Bonet	02bcfd9be3	feat: refs #7704 Major changes	2024-07-11 08:57:45 +02:00
Guillermo Bonet	1f2c0190d0	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:02:15 +02:00
Guillermo Bonet	e64f56cff1	Merge branch 'test' into dev	2024-07-08 07:55:00 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +02:00
Sergio De la torre	159f2f5f1c	hotFix itemNewer refs #6964	2024-07-05 08:44:09 +02:00
Sergio De la torre	859f610f43	hotFix itemNewer refs #6964	2024-07-05 08:43:45 +02:00
Javier Segarra	b5ea2f12ff	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-07-03 23:05:42 +02:00
Javier Segarra	37de252e15	Merge branch 'dev' into 6321_negative_tickets	2024-07-02 12:22:35 +02:00
Jon Elias	0e84749c07	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-01 10:22:11 +00:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Jon Elias	419de69690	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-20 12:24:06 +02:00
Javier Segarra	a1c48974c9	Merge branch 'dev' into 6321_negative_tickets	2024-06-20 12:21:24 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Sergio De la torre	46cd20a1fd	feat hasItemOlder refs#6964	2024-06-18 08:24:15 +02:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Javier Segarra	dba76a4f6b	test(Salix): refs #6321 #6321 add default items as Proposal	2024-06-17 12:38:36 +02:00
Jon Elias	0bf384b2ce	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-14 07:06:30 +00:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Javier Segarra	ab85b8e703	Merge branch 'dev' into 6321_negative_tickets	2024-06-12 22:37:14 +02:00
Javier Segarra	2cbd610bc2	perf(salix): refs #6321 #7563 add ink.showOrder to procedure	2024-06-12 22:19:59 +02:00
Carlos Satorres	ba67acb72b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-12 14:33:11 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Jon Elias	2b45c2c61a	feat: refs #6436 new test changes, rollback order/filter and /ticket/clone	2024-06-12 08:25:50 +02:00
Robert Ferrús	8039530ab4	fix: refs #7039 fix item-tax	2024-06-11 14:15:10 +02:00
Jon Elias	bd45352215	refactor: refs #6436 fourth wave	2024-06-11 12:02:15 +02:00
Jon Elias	093eaeb475	refactor: refs #6436 third wave	2024-06-11 10:45:46 +02:00
Jon Elias	7df7382346	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-11 09:41:26 +02:00
Javier Segarra	64a4a78308	feat(salix): refs #6321 updates	2024-06-10 17:09:25 +02:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Carlos Satorres	48550bd986	refs #6897 fix remove	2024-06-07 11:35:03 +02:00
Javier Segarra	149aeac54e	Merge branch 'dev' into 6321_negative_tickets	2024-06-04 09:26:15 +02:00