25220 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	e38adf4296	fix: refs #7641 align columns	2024-11-11 16:23:17 +01:00
Jorge Penadés	7c016da8f9	refactor: refs #7641 entry report style	2024-11-11 16:16:42 +01:00
Alex Moreno	180b0b5b3f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-11 14:09:21 +01:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-11 14:09:03 +01:00
Javi Gallego	eaad989b3a	fix: clean deletes also zoneEvent range records	2024-11-11 13:57:49 +01:00
Alex Moreno	a79905f7c2	Merge pull request 'feat(Supplier): refs #6828 add companySize' (!3174) from 6828-supplier_companySize into dev ... Reviewed-on: #3174 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-11 12:48:08 +00:00
Alex Moreno	9f763ebae7	Merge branch 'dev' into 6828-supplier_companySize	2024-11-11 12:41:43 +00:00
Jorge Penadés	a41fc36f90	feat: refs #6869 define model	2024-11-11 13:02:09 +01:00
Jorge Penadés	e0ffc2840b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails	2024-11-11 12:49:10 +01:00
Guillermo Bonet	0dc77851c0	fix: refs #4948 Tests	2024-11-11 11:34:37 +01:00
Pako Natek	b62b33d175	Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171) from hotFix-remove-notOwn-agency-collection-advantage into master ... Reviewed-on: #3171 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-11 10:02:42 +00:00
Alex Moreno	f7a29cd9c7	feat(Supplier): refs #6828 add companySize	2024-11-11 10:32:17 +01:00
Jorge Penadés	5c054fe0d3	feat: refs #6869 add back	2024-11-11 09:09:51 +01:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets ... Refs: #0000	2024-11-11 09:02:04 +01:00
Pablo Natek	c4fc51f4b8	Merge branch 'dev' into 7743-simpleTestForSendMail	2024-11-11 07:12:27 +00:00
Pablo Natek	50a73c98a2	feat: refs #7743 add try catch stmt to the test	2024-11-11 08:12:07 +01:00
Pablo Natek	d6349f113c	feat: refs #7743 add simple spec for sendMail	2024-11-11 08:06:22 +01:00
Robert Ferrús	94ed23ca07	feat: refs #8169 modifica role	2024-11-11 07:51:26 +01:00
Guillermo Bonet	a254cb19cd	feat: refs #4948 Added ticket_selfConsumptionPackaging	2024-11-11 07:40:17 +01:00
Pablo Natek	82e62e8ee7	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-11 05:53:30 +00:00
Jorge Penadés	6ef1f950d1	feat: refs #6818 add config table	2024-11-08 17:47:10 +01:00
Pablo Natek	f8c3d69c5d	fix: refs #7404 remove volume from ticket sold on holland	2024-11-08 13:44:20 +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
Sergio De la torre	fd36f7ecc3	feat: refs #8150 movExpeditions	2024-11-08 10:44:01 +01:00
Javi Gallego	dd7c967624	Merge branch 'test' into dev	2024-11-07 14:49:26 +01:00
Javi Gallego	d95e455ccf	fix: refs #7935 sin modificar autonomy	2024-11-07 14:48:31 +01:00
Sergio De la torre	cab2b7c93c	Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev ... Reviewed-on: #3161 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-06 14:56:13 +00:00
Sergio De la torre	3b87cf0c69	Merge pull request 'feat: refs #7266 buyFkForPrint' (!3159) from 7266-ItemShelvingBuy into dev ... Reviewed-on: #3159 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-06 14:55:55 +00:00
Sergio De la torre	c113d83797	feat: refs #6845 userInterface	2024-11-05 16:42:51 +01:00
Alex Moreno	c899727bfc	Merge pull request 'refactor: refs #6920 add correct role' (!3160) from 6920-dms_invoiceIn into dev ... Reviewed-on: #3160 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-05 09:57:15 +00:00
Alex Moreno	85ded59cb3	refactor: refs #6920 add correct role	2024-11-04 13:46:54 +01:00
Sergio De la torre	37548e5e64	feat: refs #7266 buyFkForPrint	2024-11-04 08:59:10 +01:00
Sergio De la torre	4c0dec19d4	feat: refs #7266 buyFkForPrint	2024-11-04 07:48:28 +01:00
Guillermo Bonet	6c40934f74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-29 09:57:06 +01:00
Guillermo Bonet	17412c5b84	feat: refs #7266 Version	2024-10-29 09:57:04 +01:00
Robert Ferrús	5a9d254396	Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev ... Reviewed-on: #3058 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-29 06:48:05 +00:00
Robert Ferrús	f699f64caa	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:45:57 +00:00
Sergio De la torre	6bf186ca66	Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev ... Reviewed-on: #3157 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-29 06:45:11 +00:00
Sergio De la torre	a8cc417fb4	Merge branch 'dev' into 7922-scanOrder	2024-10-29 06:32:32 +00:00
Robert Ferrús	8ab6bc39cc	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-29 06:31:21 +00:00
Guillermo Bonet	2f0fa56040	feat: refs #7266 Version	2024-10-29 07:19:51 +01:00
Guillermo Bonet	6afb8fbeb5	Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev ... Reviewed-on: #3154 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-29 06:04:15 +00: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
Guillermo Bonet	bfc446ab79	feat: refs #7266 Requested changes and improvements	2024-10-28 14:56:01 +01:00
Guillermo Bonet	c8662a5051	Merge branch '7266-itemQrBarcodeLabel' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemQrBarcodeLabel	2024-10-28 14:51:21 +01:00
Guillermo Bonet	a37b7b71a8	feat: refs #7266 Requested changes and improvements	2024-10-28 14:51:19 +01:00
Robert Ferrús	f05b6a46b0	feat: refs #8071 quitar esquema	2024-10-28 14:36:10 +01:00
Robert Ferrús	994b562823	Merge branch 'dev' into 8071-travelWeeklyClone	2024-10-28 13:34:54 +00:00
Carlos Andrés	bffb13f94a	feat: refs #8087 Traspasar redadas a travels	2024-10-28 14:24:44 +01:00