801 Commits

Author	SHA1	Message	Date
Pablo Natek	cc1cd0563f	feat: refs #7404 fixtures and translates	2024-09-16 09:00:46 +02:00
Jon Elias	a73bdfe18f	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-12 07:36:55 +02:00
Jorge Penadés	91abf2eefe	refactor: refs #7663 accurate error	2024-09-10 09:50:02 +02:00
Jon Elias	125c0c9b3b	refactor: refs #6346 requested changes	2024-09-10 07:50:40 +02:00
Jon Elias	b3aa263cea	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-09 07:32:11 +02:00
Jorge Penadés	26d47b3f38	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-06 11:29:53 +02:00
Guillermo Bonet	b0abe829b1	fix: refs ##7905 Handle error	2024-09-06 10:10:41 +02:00
Javi Gallego	40a1b24403	Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ... Reviewed-on: #2904 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:24 +00:00
Javi Gallego	99243fa248	feat: refs #7277 traducciones	2024-09-04 08:30:01 +02:00
Jon Elias	26876fd0a6	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-03 14:35:59 +02:00
Jon Elias	29b0851741	refactor: refs #6346 hook added in wagon-type-tray model	2024-09-03 14:35:05 +02:00
Pablo Natek	e20ef7c699	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-03 07:50:41 +02:00
Robert Ferrús	48bf5004a6	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-02 08:09:43 +00:00
Jorge Penadés	4a3faebe7d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-26 16:59:40 +02:00
Jorge Penadés	c742f6f79d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-12 16:59:28 +02:00
Jorge Penadés	c31e33535d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-06 15:23:59 +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	6d25cb3c8c	fix: refs #7404 fix translation	2024-08-05 15:35:48 +02:00
Pablo Natek	961fafb33e	feat: refs #7404 stockBought add and calculate	2024-08-05 15:32:36 +02:00
Guillermo Bonet	ab446b54ed	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:35 +02:00
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +02:00
Robert Ferrús	67764f4139	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-31 06:13:42 +00:00
Alex Moreno	f1628f26b9	Merge branch 'master' into 7679-postCode_town_addRequireds	2024-07-30 08:18:23 +00:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +02:00
Alex Moreno	434dfe4ae4	fix: refs #7679 postcode filter	2024-07-29 15:03:40 +02:00
Guillermo Bonet	c713c3a5c0	fix: refs #6861 Unhandled error	2024-07-29 09:21:35 +02:00
Robert Ferrús	39b52e706a	feat: refs #7615 setDeleted	2024-07-11 14:51:34 +02:00
Jon Elias	0917fc318a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-28 13:19:38 +02:00
Alex Moreno	cca62ae902	feat: return sql check error	2024-06-26 12:25:18 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Javi Gallego	b2ad449809	feat: refs #7027 mailError managed	2024-06-19 14:38:56 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Jon Elias	711fad6b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-14 08:50:32 +02:00
Jorge Penadés	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-07 10:32:49 +02:00
Alex Moreno	a33f14ffa5	feat(transferInvoice): makePdf of refund	2024-06-05 12:44:28 +02:00
Jon Elias	cf5b8a27a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-03 10:04:38 +02:00
Alex Moreno	bd82bb011a	fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests	2024-05-31 08:44:30 +02:00
Javi Gallego	1bcd7a9665	Merge branch 'dev' into 6408-rocketChat	2024-05-28 12:46:37 +02:00
Javi Gallego	9ee05860f6	feat: #6408 tests	2024-05-28 12:19:54 +02:00
Carlos Satorres	3626941c8c	fix traduction & e2e	2024-05-27 12:30:53 +02:00
Alex Moreno	a464b0afd1	fix: en translations	2024-05-27 11:54:37 +02:00
Carlos Satorres	4c3428da55	refs #7292 add traduction	2024-05-24 08:21:28 +02:00
Carlos Satorres	f45f909995	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember	2024-05-23 14:46:33 +02:00
Carlos Satorres	ee010a3bb3	refs #7296 fix pr errors, trad	2024-05-23 14:44:47 +02:00
Jon Elias	e902a84d10	refactor: refs #5447 changed models	2024-05-23 09:22:19 +02:00
Pablo Natek	2142b78deb	feat: refs #7187 Add support for multiple PDAs per user	2024-05-21 19:25:18 +02:00
Carlos Satorres	cf630a7213	refs #7292 traduction es	2024-05-21 10:20:54 +02:00
Carlos Satorres	9bd5244f64	refs #7292 hook ueemember	2024-05-21 10:19:21 +02:00
Guillermo Bonet	9d98ae4a03	Merge branch 'test' into dev	2024-05-20 07:02:00 +02:00
Guillermo Bonet	18ce388944	Merge branch 'test' into dev	2024-05-20 06:59:42 +02:00
Jorge Penadés	2694f277d2	fix: refs #6744 add es locale	2024-05-17 13:03:24 +02:00
Pablo Natek	bcb3ea4837	feat: refs #7187 new method available pda	2024-05-16 10:23:33 +02:00
Carlos Satorres	8a7d124066	refs #6882 fix traductions	2024-05-08 12:17:44 +02:00
Carlos Satorres	fe300f0f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-06 09:26:14 +02:00
Sergio De la torre	c3b9e76cd6	Merge branch 'dev' into 6799_translations	2024-05-03 09:28:28 +00:00
Sergio De la torre	d994a682f9	refs #6799 feat: french and portuguese	2024-05-02 16:48:58 +02:00
Carlos Satorres	a43593f63b	Merge branch 'dev' into 6870-modifyDefaulterNotification	2024-05-02 10:42:00 +00:00
Carlos Satorres	def1521131	refs #6870 defaulter id	2024-05-02 12:42:17 +02:00
Carlos Satorres	ae15f4b5d1	refs #6870 markdown	2024-05-02 12:14:39 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02: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	d25c5eb327	fix: refs #4988 translates	2024-04-25 17:22:22 +02:00
Pablo Natek	af1abe934f	fix: refs #4988 translates	2024-04-25 17:21:59 +02:00
Jorge Penadés	931c2c4f5e	feat: refs #7211 error & locale	2024-04-25 13:12:06 +02:00
Pablo Natek	48d3ee373e	fix: refs #4988 yml	2024-04-25 12:47:52 +02:00
Pablo Natek	00359a0a6b	fix: refs #4988 traduction	2024-04-25 12:44:27 +02:00
Pablo Natek	c2888e4f97	fix: refs #4988 correct yml	2024-04-25 12:43:47 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Jorge Penadés	6749722634	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 10:10:06 +02:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Javier Segarra	30d0db163e	feat(salix): refs #6930 minor updates	2024-04-19 10:50:14 +02:00
Guillermo Bonet	bc2b6ff97e	feat: refs #7173 Added traduction	2024-04-17 07:25:46 +02:00
Carlos Satorres	de75d811c3	refs #6682 absence	2024-04-09 12:30:25 +02:00
Guillermo Bonet	6c1e44638e	feat: refs #6636 Added getEnumValue method	2024-04-05 11:01:00 +02:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Sergio De la torre	8b684442f5	refs #6276 hotFix: setUserError and return	2024-03-25 16:07:20 +01:00
Sergio De la torre	9e5e49c28f	refs #6276 feat:newWarehouse	2024-03-22 06:56:27 +01:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Alex Moreno	517aeebe8b	refs #7019 fix(createManualInvoice): add throw error	2024-03-18 14:20:05 +01:00
Jorge Penadés	6281ba352b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-03-15 10:38:08 +01:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Alex Moreno	c2ecedca71	feat: refs #6925 check incoterms in closure and makeInvoice	2024-03-08 07:48:55 +01:00
Jorge Penadés	a94fd1a61c	fix: refs #6744 change error kind	2024-03-07 09:29:51 +01:00
Jorge Penadés	05f3a3f31b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-03-07 08:43:01 +01:00
Jorge Penadés	f600a99708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 10:55:05 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Alex Moreno	a3052c1cf9	refs #6925 hotFix(invoice) parenthesis & handle incoterms error	2024-03-01 15:05:12 +01:00
Jorge Penadés	7d8d31022b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 12:29:55 +01:00
Jorge Penadés	1658838c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword	2024-02-29 12:41:24 +01:00
Jorge Penadés	c875abf5e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 09:42:14 +01:00
Carlos Satorres	c0988f8d11	fix json	2024-02-27 09:31:25 +01:00