1628 Commits

Author	SHA1	Message	Date
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Guillermo Bonet	6aab5fa9ef	fix: refs #7546 Deleted insert util.binlogQueue	2024-07-19 12:47:05 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Javier Segarra	c70824535a	feat(ssalix): refs #7648 clean fixtures	2024-07-12 20:52:00 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Javier Segarra	ca48ad9777	feat(salix): refs #7648 #7648 add new entries and travels	2024-07-11 19:55:19 +02:00
Guillermo Bonet	0d30331c9a	feat: refs #7704 Fixtures hedera	2024-07-11 13:25:26 +02:00
Guillermo Bonet	ca1933cb83	feat: refs #7704 Fixtures hedera	2024-07-11 13:04:19 +02:00
Guillermo Bonet	7ba2e8d4c5	feat: refs #7704 Fix tests	2024-07-11 09:48:31 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Guillermo Bonet	1f2c0190d0	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:02:15 +02:00
Alex Moreno	248000bdcd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-09 11:00:36 +02:00
Alex Moreno	213524edb5	deploy: dump db	2024-07-09 07:52:18 +02:00
Javier Segarra	8355d544c3	Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition	2024-07-08 09:54:56 +02:00
Javier Segarra	9f57e50f89	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-08 09:54:40 +02:00
Javier Segarra	3c2a44eb53	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-07 23:47:00 +02:00
Guillermo Bonet	fb07cdccc3	Merge branch 'test' into dev	2024-07-05 13:51:09 +02:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Carlos Satorres	f3dcc7dd99	Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore	2024-07-04 16:50:57 +02:00
Carlos Satorres	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +02:00
Guillermo Bonet	58ba6d0f4c	Merge branch 'test' into dev	2024-07-04 09:26:49 +02:00
Guillermo Bonet	5a9850939e	Merge branch 'master' into test	2024-07-04 09:26:00 +02:00
Guillermo Bonet	009dcd8fc7	refs #7486 Fix tests	2024-07-04 09:23:57 +02:00
Javier Segarra	3710c7c9c8	Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries	2024-07-03 08:55:01 +02:00
Javier Segarra	beff905e02	perf(salix): refs #7648 #7648 remove change role for user 2	2024-07-03 08:54:58 +02:00
Javier Segarra	5c73a20f43	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 06:17:34 +00:00
Javier Segarra	08612fc70c	perf(salix): refs #7648 #7648 fixtures and firstScript	2024-07-02 10:07:23 +02:00
Guillermo Bonet	9e5f416d55	refactor: refs #7418 Item type refactor	2024-07-01 12:06:30 +02:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Carlos Satorres	f811e7e96c	Merge branch 'dev' into 7406-workerFormation	2024-06-25 10:39:38 +00:00
Carlos Satorres	f5bc0482d2	refs #7409 resolve conflicts	2024-06-25 12:36:28 +02:00
Carlos Satorres	95e1bba58b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 12:36:12 +02:00
Carlos Satorres	248358fbd7	refs #7409 fix pr	2024-06-25 12:35:25 +02:00
Carlos Satorres	655bbe4967	refs #7406 fix pr	2024-06-25 12:29:17 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Alex Moreno	6150f64e88	build: db dump	2024-06-25 09:29:42 +02:00
Carlos Satorres	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +02:00
Carlos Satorres	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Sergio De la torre	da40b705c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review	2024-06-21 07:20:00 +02:00
Sergio De la torre	182cd3fa8e	feat boxPicking refs #7357	2024-06-20 11:34:51 +02:00
Sergio De la torre	c87f060d51	feat boxPicking refs #7357	2024-06-20 09:21:27 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Guillermo Bonet	43df0ef55d	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-17 07:42:33 +00:00
Guillermo Bonet	1d0b89ed52	refs #7519 Requested changes	2024-06-17 09:42:16 +02:00
Pablo Natek	c3d64b2358	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-17 08:49:26 +02:00