17904 Commits

All Branches

Search

Author	SHA1	Message	Date
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	b1c931a510	remove console.log	2023-10-18 08:52:17 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	6871ce4b15	Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:29:03 +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
Carlos Andrés	92e76a6d44	Merge pull request 'refs #6199 fix(sale_hook): fix quantity case' (!1797) from 6119-better_sale_hook into test ... Reviewed-on: #1797 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-17 13:34:26 +00:00
Pablo Natek	8d44bb8867	refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749	2023-10-17 15:05:48 +02:00
Jorge Penadés	fdfa481d21	ref #5947 drop procedure	2023-10-17 14:52:47 +02:00
Jorge Penadés	69a54be1a9	ref #5947 refactorWorkerCreate	2023-10-17 14:02:08 +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
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Alex Moreno	dbb2372cd3	Merge pull request 'hotFix: workerTimeControl' (!1796) from hotFix_workeTimeControl_sendMail into master ... Reviewed-on: #1796 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-10-17 07:03:02 +00:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	afe4c676fc	fix(url): la ulr termina con / no es necesario añadir el texto	2023-10-16 18:38:33 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +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	a6437f8024	Merge pull request '6199---Cantidad-mínima-back' (!1790) from 6199---Cantidad-mínima-back into test ... Reviewed-on: #1790 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-10-16 10:26:37 +00: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
Alex Moreno	ce64d5f0c4	Merge pull request 'hotFix: delete getCurrentWorkerMana' (!1791) from hotFix_delete_getCurrentWorkerMana into master ... Reviewed-on: #1791 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-16 07:06:02 +00:00
Jorge Penadés	4897b22336	Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-16 08:21:12 +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
Jorge Penadés	ab6c58cd12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-16 08:18:00 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Sergio De la torre	85baac5c8e	Merge pull request 'refs #5134 feat: models' (!1783) from 5134-ModelsSalix into dev ... Reviewed-on: #1783 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-13 15:09:33 +00: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
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Jorge Penadés	557eef266a	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-13 13:16:22 +02:00
Jorge Penadés	9ba3c9c8bc	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:17:12 +00:00
Jorge Penadés	16f22c4d39	Merge pull request 'refs #6119 microsip link added' (!1729) from 6119-addMicrosipLink into dev ... Reviewed-on: #1729 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-10-13 11:15:47 +00:00
Jorge Penadés	6b8a6c7a69	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:15:04 +00:00
Jorge Penadés	737eca2771	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-13 13:13:52 +02:00
Alex Moreno	f00a4e63a6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back	2023-10-13 13:08:54 +02:00
Alex Moreno	2250fca6bb	Merge pull request 'refs #6199 Added minQuantity in item' (!1786) from 6199-minQuantity into test ... Reviewed-on: #1786 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-13 11:06:49 +00:00
Javi Gallego	0081c55b9e	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-13 10:56:33 +00:00
Guillermo Bonet	e1c1d1a556	refs #6199 Fixed tests	2023-10-13 12:33:39 +02:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Alex Moreno	fa90132934	refs #6199 fix(orderCatalogView): html and css	2023-10-13 10:23:48 +02:00
Guillermo Bonet	7367656a35	refs #6199 Requested changes	2023-10-13 09:02:40 +02:00
Pablo Natek	f9fdd4c726	Merge branch '3126-changePackageFkTopackagingFk' of https://gitea.verdnatura.es/verdnatura/salix into 3126-changePackageFkTopackagingFk	2023-10-13 08:54:07 +02:00
Pablo Natek	104d11ac3c	refs #3126 procReplace	2023-10-13 08:52:28 +02:00
Sergio De la torre	1a7f7b6a00	refs #5134 feat:models	2023-10-13 08:02:00 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00