7711 Commits

Author	SHA1	Message	Date
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	84aed7ca21	refs #6257 fix(saleQuantity): newPrice correct restricction	2023-10-20 09:26:56 +02:00
Alex Moreno	d5f98700e7	refs #6287 fix: ticket new correct return type	2023-10-20 08:32:35 +02:00
Carlos Andrés	16f20cea70	refs #6199 fix(sale): get minim price without grouping	2023-10-19 15:12:06 +02:00
Pablo Natek	f26595bb62	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 12:15:43 +00:00
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +00:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Pablo Natek	71182d8630	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:49:31 +00:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Juan Ferrer	39a0f13500	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:14:29 +00:00
Guillermo Bonet	1b8f227c47	ticket #125321 filter advance tickets fix	2023-10-19 11:58:15 +02:00
Pablo Natek	e2f7ce8b35	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 08:58:50 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00
Jorge Penadés	52b14cf8b4	ref #6138 fix emailVerified	2023-10-19 09:51:10 +02:00
Jorge Penadés	5b1e5743b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 09:35:37 +02:00
Javi Gallego	84fc0de4ea	Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev ... Reviewed-on: #1803 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-19 06:41:43 +00:00
Jorge Penadés	7e25fac3e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 08:25:00 +02:00
Alex Moreno	daaf076133	Merge branch 'dev' into 6312	2023-10-19 05:29:43 +00:00
Alex Moreno	da20697052	refs #6199 feat(sale_updateQuantity): can upload	2023-10-18 15:19:26 +02:00
Javi Gallego	44ce0a8730	refs #6312 no inserta el originalquantity	2023-10-18 13:46:41 +02:00
Jorge Penadés	ea5597d3f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-18 13:40:02 +02:00
Jorge Penadés	af0d5072ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-18 13:37:14 +02:00
Pablo Natek	3e96b3d0d2	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-18 11:24:03 +00:00
Jorge Penadés	330fb08aac	ref #5417 fix back test	2023-10-18 13:23:00 +02:00
Pablo Natek	bf09f13aa2	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-18 11:07:24 +00:00
Pablo Natek	34c9d030e9	Merge branch 'dev' into 6266-minimumImprtSmsFix	2023-10-18 10:31:12 +00:00
Pablo Natek	5f49a4fe1d	fix: created -> shipped refs #6266	2023-10-18 12:25:47 +02:00
Pablo Natek	1920a1b893	merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266	2023-10-18 12:23:23 +02:00
Jorge Penadés	251d71a437	ref #5417 refactor transactions	2023-10-18 12:05:33 +02:00
Alex Moreno	a84f6fe1da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-18 12:05:04 +02:00
Jorge Penadés	700caac641	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-18 12:03:07 +02:00
Alex Moreno	4300b24c14	refs #5918 refactor(worker_timeControl): simplify ng-show	2023-10-18 10:45:15 +02:00
Alex Moreno	d1cb2a1d9a	refs #5918 test: add updateWorkerTimeControlMail	2023-10-18 10:30:36 +02:00
Alex Moreno	a7b0ef1e4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-18 09:23:55 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	8d44bb8867	refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749	2023-10-17 15:05:48 +02:00
Pablo Natek	541926d3f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded	2023-10-17 13:57:32 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Jorge Penadés	3af72e1439	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-16 08:20:20 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02:00