1856 Commits

Author	SHA1	Message	Date
Pablo Natek	8e61160aeb	Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ... Reviewed-on: #3230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 13:12:33 +00:00
Jorge Penadés	8b37d99287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-12 09:58:42 +01:00
Pablo Natek	33287938ec	Merge branch 'dev' into 7301-itemLastEntries	2024-12-12 08:34:54 +00:00
Jon Elias	956673cf56	Merge branch 'dev' into Invoice-Out-TransferInvoice	2024-12-12 07:02:28 +00:00
Jorge Penadés	2a2b4b139b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-11 09:13:50 +01:00
Alex Moreno	2f47d7d76e	build: refs #8282 dump db	2024-12-10 10:30:43 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +01:00
Jorge Penadés	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +01:00
Jon Elias	123c0db126	feat: modified data to be equal as the updated back	2024-12-04 11:58:17 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +01:00
Jorge Penadés	9d26a9df7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-02 17:11:21 +01:00
Jorge Penadés	9573090318	chore: refs #6818 rollback	2024-12-02 14:49:35 +01:00
Jorge Penadés	66a87f1997	feat: refs #6818 add current country prefix	2024-12-02 13:33:39 +01:00
Jorge Penadés	fc4f5b55f7	fix: refs #6818 update country & channel	2024-12-02 12:59:37 +01:00
Javier Segarra	22dc1e22f4	Merge branch 'dev' of https: refs #7134//gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance	2024-12-02 10:18:21 +01:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Jorge Penadés	7d5ae9dfbd	feat: refs #7936 add reference rates for currency in fixtures	2024-11-28 14:52:41 +01:00
Alex Moreno	816a7f23e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-26 14:18:19 +01:00
Alex Moreno	c66ae728d6	build: dump db	2024-11-26 14:12:10 +01:00
Pablo Natek	2ba931bedb	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-22 06:32:19 +01:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +01:00
Carlos Andrés	770ace0f8e	Merge branch 'test' into dev	2024-11-21 16:11:42 +01:00
Carlos Andrés	0870a1c3d6	refs#8087 Redadas en travel test	2024-11-21 15:09:58 +01:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Pablo Natek	c17069a909	Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries	2024-11-21 10:29:52 +01:00
Pablo Natek	c63dfba7da	feat: refs #7301 add inventory-config and acl	2024-11-21 10:18:09 +01:00
Ivan Mas	0274c01c14	Merge branch 'dev' into 7690-renameConfigTables	2024-11-20 13:54:57 +00:00
Javier Segarra	f46a46359e	feat: refs #7134 #7134 modify balanceStartingDate	2024-11-20 14:07:00 +01:00
Javier Segarra	771e06743e	feat: refs #7134 add supplier payment	2024-11-20 14:06:52 +01:00
Carlos Satorres	7ab1b7d171	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-20 13:14:26 +01:00
Ivan Mas	715cea0670	Merge branch 'dev' into 7690-renameConfigTables	2024-11-19 15:07:03 +00:00
Carlos Andrés	63c0747304	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-19 13:52:12 +01:00
Sergio De la torre	d21b42a567	feat: refs #8099 refs#8099 addComplmentSalary	2024-11-19 11:24:00 +01:00
Javi Gallego	a40a5a22ab	fix: refs #7821 fixtures without raid	2024-11-18 14:27:38 +01:00
Javi Gallego	72415a4348	Merge branch 'dev' into 7821-entryIsBooked	2024-11-18 12:49:59 +01:00
Ivan Mas	2a1c0ef2af	Merge branch 'dev' into 7690-renameConfigTables	2024-11-15 13:35:14 +00:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Jorge Penadés	4b659c0b48	fix: refs #6818 use right col type	2024-11-14 16:39:35 +01:00
Jorge Penadés	f96b914649	fix: refs #6818 use right col type	2024-11-14 16:39:26 +01:00
Jorge Penadés	a37332f7be	fix: refs #6818 add defaultChannel	2024-11-14 11:18:38 +01:00
Jorge Penadés	c8ab5d4344	fix: refs #6818 add defaultChannel	2024-11-14 11:16:45 +01:00
Guillermo Bonet	97e53b2ef8	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-14 06:57:26 +00:00
Guillermo Bonet	9d5ef3eeb0	Merge branch 'dev' into 7920-itemShelving	2024-11-13 10:16:57 +00:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Guillermo Bonet	779a75cd78	refactor: refs #7920 Major changes	2024-11-13 09:03:44 +01:00
Guillermo Bonet	c2381f0feb	refactor: refs #7920 Main change	2024-11-13 07:42:58 +01:00
Ivan Mas	870882cdc1	Merge branch 'dev' into 7690-renameConfigTables	2024-11-12 16:27:19 +00:00
Ivan Mas	20bd426704	refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig	2024-11-12 17:25:05 +01:00
Carlos Andrés	69d6e4a104	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel	2024-11-12 16:24:05 +01:00
Guillermo Bonet	6427a90c44	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-12 12:25:11 +00:00
Pako Natek	a9def89e01	Merge branch 'dev' into fixturesLocal	2024-11-12 11:27:35 +00:00
Jorge Penadés	0f5ca107f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-12 09:45:19 +01:00
Javi Gallego	ea45d1da0a	Merge branch 'dev' into 7821-entryIsBooked	2024-11-12 09:30:40 +01:00
Alex Moreno	d442593823	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-12 08:49:17 +01:00
Alex Moreno	07e59ccdbf	build: refs #8179 dump	2024-11-12 08:45:40 +01:00
Pako Natek	76d072e00f	fix: more data for fixture.before	2024-11-12 08:28:26 +01:00
Guillermo Bonet	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +01:00
Jorge Penadés	186312702d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-11 16:41:37 +01:00
Carlos Andrés	cf102699d5	feat: refs#8087 Redadas en travel	2024-11-11 14:19:11 +01:00
Alex Moreno	9f763ebae7	Merge branch 'dev' into 6828-supplier_companySize	2024-11-11 12:41:43 +00:00
Guillermo Bonet	0dc77851c0	fix: refs #4948 Tests	2024-11-11 11:34:37 +01:00
Alex Moreno	f7a29cd9c7	feat(Supplier): refs #6828 add companySize	2024-11-11 10:32:17 +01:00
Jorge Penadés	6ef1f950d1	feat: refs #6818 add config table	2024-11-08 17:47:10 +01:00
Jorge Penadés	9b28cf9130	feat: refs #6818 add records	2024-11-08 12:51:09 +01:00
Jorge Penadés	6927f4b28d	feat: refs #6818 saysimple integration	2024-11-08 11:51:00 +01:00
Carlos Satorres	c5afde3334	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-11-07 12:48:05 +01:00
Alex Moreno	85ded59cb3	refactor: refs #6920 add correct role	2024-11-04 13:46:54 +01:00
Carlos Satorres	e0e487859f	fix: refs #7529 fix models	2024-10-29 13:59:47 +01:00
Carlos Andrés	66a5708efb	Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev ... Reviewed-on: #3147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 14:41:01 +00:00
Javi Gallego	fa9451ea38	feat: refs #7821 isBooked with grants	2024-10-25 16:15:13 +02:00
Carlos Andrés	fb0764bc1f	feat: refs #8087 Traspasar redadas a travels	2024-10-25 14:34:51 +02:00
Carlos Andrés	1bf900f81b	feat: refs #8087 Traspasar redadas a travels	2024-10-24 12:33:47 +02:00
Guillermo Bonet	4c9682e107	Merge branch 'dev' into 7266-itemLabels	2024-10-24 05:16:16 +00:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Jon Elias	2ec0d7f186	refactor: refs #7202 modified new invoice procedure and incoterms sql	2024-10-23 08:10:00 +02:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Guillermo Bonet	c3f8da52c6	feat: refs #7266 Item label barcode	2024-10-22 13:43:54 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Guillermo Bonet	bf2d7541a5	feat: refs #7266 Item label QR	2024-10-21 14:57:55 +02:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Ivan Mas	7dc35458e8	refactor: refs #7865 delete client.gestdocFk from TPV	2024-10-17 17:05:08 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Jorge Penadés	295c31a5f0	feat: refs #7874 add finance obs type	2024-10-10 11:01:25 +02:00
Jorge Penadés	70a2189e30	Merge branch 'dev' into 7207-showPbx	2024-10-04 07:46:18 +00:00
Jorge Penadés	23d2d2b1ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-10-03 15:39:37 +02:00
Pablo Natek	46e2ffd6c2	fix: refs #7404 add fixtures	2024-10-03 14:39:58 +02:00
Alex Moreno	cb69ed8a7b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-03 09:56:53 +02:00
Alex Moreno	34c4715f6e	build: refs #8062 dump db and import ticketCanAdvanceConfig	2024-10-03 09:49:16 +02:00
Alex Moreno	e870d16cb9	build: refs #8062 dump db	2024-10-03 07:54:16 +02:00
Robert Ferrús	47ed9a8f4e	Merge pull request 'test' (!3056) from test into dev ... Reviewed-on: #3056 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:22:26 +00:00
Robert Ferrús	e51dd897c3	Merge pull request 'master' (!3055) from master into test ... Reviewed-on: #3055 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:13:09 +00:00
Robert Ferrús	6e4244866c	feat: refs #8012 create column	2024-10-02 07:53:53 +02:00
Jon Elias	f4015117e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 12:43:47 +02:00
Javi Gallego	4c9a199418	Merge branch 'dev' into 9722-travelThermographTrigger	2024-10-01 12:29:55 +02:00
Alex Moreno	f54a9a1348	fix(fixtures): revert bad merge master to test	2024-10-01 12:27:16 +02:00
Jon Elias	698ef3dec3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 10:12:21 +02:00
Alex Moreno	61f806b0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-30 14:40:35 +02:00
Jon Elias	6fbc5a1a54	feat: refs #7202 added new field	2024-09-30 09:17:27 +02:00