23481 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7551c911fe	Merge pull request '#7323 add locale' (!2854) from 7323-addWorkerLocale into test ... Reviewed-on: #2854 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-13 08:33:06 +00:00
Jorge Penadés	a733560649	feat: refs #7323 add locale	2024-08-13 10:26:36 +02:00
Alex Moreno	25b3e36b18	Merge pull request '7863-devToTest_2434' (!2852) from 7863-devToTest_2434 into test ... Reviewed-on: #2852 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-13 06:50:23 +00:00
Jorge Penadés	462f9a95b7	Merge pull request '#7283 item subsections migration' (!2830) from 7283-itemSectionsMigration into dev ... Reviewed-on: #2830 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 12:06:24 +00:00
Jorge Penadés	82da7bff9b	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 09:28:11 +00:00
Guillermo Bonet	ece8bee45c	Merge pull request 'feat: refs #7774 ticket_cloneWeekly' (!2781) from 7774-ticket_cloneWeekly into dev ... Reviewed-on: #2781 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 08:32:32 +00:00
Jorge Penadés	1602c12200	fix: refs #7283 sql	2024-08-12 09:13:30 +02:00
Jorge Penadés	6f26dc4990	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-12 09:06:28 +02:00
Guillermo Bonet	931c13d8ab	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:06:24 +02:00
Guillermo Bonet	3cf2cec946	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:02:38 +02:00
Guillermo Bonet	c4e8202261	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 08:53:24 +02:00
Guillermo Bonet	5b2200a134	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-08-12 08:53:02 +02:00
Guillermo Bonet	f0a273395d	Merge pull request 'feat: refs #7646 delete scannableCodeType' (!2782) from 7646-deleteColumnsProductionConfig into dev ... Reviewed-on: #2782 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-12 06:06:59 +00:00
Guillermo Bonet	8655ca0a21	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-08-12 06:04:06 +00:00
Guillermo Bonet	00845c0534	refactor: refs #7646 #7646 Deleted scannable* variables productionConfig	2024-08-12 08:03:49 +02:00
Jorge Penadés	9ece46ee46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 15:29:21 +02:00
Guillermo Bonet	5339dcbf19	Merge branch 'test' into dev	2024-08-09 13:53:56 +02:00
Guillermo Bonet	38dbe6e966	fix: #7126 waste_addSales	2024-08-09 13:53:28 +02:00
Alex Moreno	64fb097086	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-09 12:54:34 +02:00
Alex Moreno	af65ef2536	fix(orders_filter): add sourceApp accepts	2024-08-09 12:54:33 +02:00
Jorge Penadés	4a76a7554e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:33:13 +02:00
Jorge Penadés	d6bea43731	Merge pull request '#6900 rectificative filter' (!2845) from 6900-fineTunningInvoiceIn into dev ... Reviewed-on: #2845 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-09 10:32:13 +00:00
Jorge Penadés	a512fe75ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:12:25 +02:00
Jorge Penadés	8ab049be0d	chore: refs #6900 beautify code	2024-08-09 11:48:22 +02:00
Jorge Penadés	a4a45274af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn	2024-08-09 08:44:37 +02:00
Guillermo Bonet	d60f8a5319	Merge branch 'test' into dev	2024-08-09 08:26:22 +02:00
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02:00
Pako Natek	d9c0b849ad	Merge pull request '7836-futureEntries' (!2844) from 7836-futureEntries into dev ... Reviewed-on: #2844 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-09 06:15:29 +00:00
Pako Natek	cd1eec7e29	Merge branch 'dev' into 7836-futureEntries	2024-08-09 06:14:15 +00:00
Pako Natek	98f4cb1de5	dropping proc	2024-08-09 08:04:36 +02:00
Pablo Natek	e028bc1ddb	Merge pull request 'feat: refs #6403 packingSite to productionConfig' (!2793) from 6403-from-packingSite-to-productionConfig into master ... Reviewed-on: #2793 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-09 05:11:34 +00:00
Jorge Penadés	5dfdb458a6	#6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn	2024-08-08 15:27:42 +02:00
Alex Moreno	1c75c429cc	test: husky	2024-08-08 13:29:02 +02:00
Pablo Natek	7ca768582f	Merge pull request 'fix: refs #6130 commit lint' (!2846) from 6130-fix-husky-lint into dev ... Reviewed-on: #2846 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-08 10:55:40 +00:00
Pablo Natek	62cee3a07a	fix: refs #6130 commit lint	2024-08-08 12:49:36 +02:00
Alex Moreno	141e116401	Merge pull request 'BREACKING CHANGE: claim redirect to lilium' (!2843) from 6336-claim-redirectToLilium into dev ... Reviewed-on: #2843 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-08-08 10:43:38 +00:00
Alex Moreno	30e1b7280a	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 10:38:33 +00:00
Jorge Penadés	853a57ec63	#6900 fix: empty commit	2024-08-08 12:37:29 +02:00
Jorge Penadés	660ebfbe15	#6900 feat: empty commit	2024-08-08 12:36:06 +02:00
Jorge Penadés	4af881a8d9	#6900 feat: clear empty	2024-08-08 12:35:11 +02:00
Jorge Penadés	b4ea7819f8	#6900 feat: clear empty	2024-08-08 12:18:42 +02:00
Jorge Penadés	1ccfd8731f	#6900 feat: empty commit	2024-08-08 12:17:56 +02:00
Jorge Penadés	afc5615140	#6900 fix: #6900 rectificative filter	2024-08-08 12:14:44 +02:00
Alex Moreno	dd6aa6b1dd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 11:52:06 +02:00
Alex Moreno	c8f1b7c5ff	hotFix(validateCode): username comparation	2024-08-08 11:51:46 +02:00
Sergio De la torre	09d93caddb	Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev ... Reviewed-on: #2814 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-08 08:26:11 +00:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Alex Moreno	8580fa0849	hotFix(sendTwoFactor): fix code digits	2024-08-08 10:07:03 +02:00
Alex Moreno	f0f4610be5	Merge branch '6336-claim-redirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-08 09:05:08 +02:00
Alex Moreno	4fb82dc944	test: fix ticket sale e2e	2024-08-08 09:05:08 +02:00