297 Commits

Author	SHA1	Message	Date
Ivan Mas	94461cff58	feat: refs #7758 Modify code lowerCamelCase and UNIQUE	2024-08-23 11:34:26 +02:00
Ivan Mas	9806265030	Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType	2024-08-23 06:25:06 +00:00
Ivan Mas	d9d2ae2f7b	feat: refs #7758 Add code mandateType and accountDetailType	2024-08-21 16:45:46 +02:00
Javier Segarra	b594011433	feat(salix): refs #7677 #7677 return more postcode fields	2024-08-20 07:01:13 +02:00
Javi Gallego	575577d29b	feat: refs #7346 add multiple feature	2024-08-16 10:08:58 +02:00
Pablo Natek	b636b5429a	fix: refs #7404 refactor fixtures	2024-08-09 08:20:42 +02:00
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Pablo Natek	323ab638d7	fix: refs #7404 fix fixtures and back test	2024-08-05 15:55:44 +02:00
Pablo Natek	f148635c68	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-08-05 15:41:41 +02:00
Pablo Natek	961fafb33e	feat: refs #7404 stockBought add and calculate	2024-08-05 15:32:36 +02:00
Guillermo Bonet	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Guillermo Bonet	18dc3873b8	feat: refs #7650 Added no transfer lines to inventory entry and fixtures	2024-07-30 09:54:43 +02:00
Jon Elias	9cf5f8759f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-07-24 07:34:44 +02:00
Jon Elias	2568ac4e92	feat: refs #6346 new wagon type section	2024-07-23 13:24:43 +02:00
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +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
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
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
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	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +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
Alex Moreno	a26f6eaf21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-07-01 11:32:21 +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
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	cf4a7c8fba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-06-21 09:11:40 +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	774d55d4ae	refs #7407 fix acls fixtures	2024-06-18 13:28:21 +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
Pablo Natek	a30ff44837	fix: refs #6404 fix notification	2024-06-14 17:40:08 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	e3e9706fb8	fix fixtures	2024-06-14 09:53:50 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Guillermo Bonet	cb056ff789	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:14:00 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Guillermo Bonet	fd237b6d35	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-03 11:40:50 +02:00
Guillermo Bonet	4703ebbdf3	refactor: refs #7519 Minor change	2024-06-03 11:38:09 +02:00
Guillermo Bonet	b9d04e9557	Merge branch 'dev' into 7126-improvedWaste	2024-06-03 05:22:15 +00:00
Jorge Penadés	dc8696b422	feat: refs #6889 add back tests	2024-05-31 16:31:36 +02:00
Jorge Penadés	ee09617b27	fix: refs #6889 e2e tests	2024-05-31 13:05:12 +02:00
Jorge Penadés	ab9c11ef84	fix: refs #6889 modify fixtures	2024-05-31 12:56:22 +02:00
Jorge Penadés	4772509b67	fix: refs #6889 e2e tests	2024-05-31 12:51:06 +02:00
Jorge Penadés	05e6e10337	fix: refs #6889 fix back tests	2024-05-30 10:04:34 +02:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Jorge Penadés	a32db7840e	feat: refs #6889 fixtures & models	2024-05-29 16:54:24 +02:00
Alex Moreno	08856a9132	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-28 12:11:51 +02:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +02:00
Robert Ferrús	b02995918e	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:04:40 +00:00
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +02:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +02:00
Robert Ferrús	7065cf0b38	feat: refs #6281 change fixtures	2024-05-21 09:58:03 +02:00
Robert Ferrús	c6f7a0768a	Merge branch 'dev' into 7039-country-country	2024-05-14 05:49:39 +00:00
Jorge Penadés	e16e5e3db3	feat: refs #5919 back test	2024-05-13 13:19:28 +02:00
Guillermo Bonet	b324b0c0f3	Merge branch 'dev' into 7126-improvedWaste	2024-05-10 11:20:33 +00:00
Guillermo Bonet	6b7a529b55	refactor: refs #7345 Renamed column of invoiceInConfig	2024-05-10 11:39:14 +02:00
Guillermo Bonet	1ea357a5dd	feat: refs #7126 Refactor and added columns in bs.waste table & proc	2024-05-10 10:01:46 +02:00
Guillermo Bonet	f0b814c79b	refactor: refs #6701 Refactor claim_ratio_routine	2024-05-03 14:15:55 +02:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Guillermo Bonet	80b44ccace	Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ... Reviewed-on: #2362 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 05:37:33 +00:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Guillermo Bonet	f7ebd071bf	refactor: #7258 Deleted all dependences of vn2008 schema	2024-04-24 09:53:31 +02:00
Robert Ferrús	ffe56edc9c	feat: refs #7039 country	2024-04-24 09:24:42 +02:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00