10281 Commits

Author	SHA1	Message	Date
Jorge Penadés	7c2c56ed9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 13:50:01 +01:00
Jon Elias	87577d0982	Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ... Reviewed-on: #3278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-09 12:30:53 +00:00
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +01:00
Jorge Penadés	db8ab307ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-05 10:10:40 +01:00
Guillermo Bonet	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +01:00
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +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
Carlos Satorres	7d1e3b6751	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:18:27 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +00:00
Carlos Andrés	d7af439787	Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js	2024-12-03 17:49:48 +00:00
Jorge Penadés	104bef43c1	feat: add country id filter to sales monitor	2024-12-03 14:03:08 +01:00
Carlos Satorres	2267942368	fix: fix invoiceOut filter	2024-12-03 10:25:40 +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	5b04debfb1	refactor: refs #7936 add transaction & tests	2024-12-02 17:48:40 +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
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Robert Ferrús	d355b320b4	test: refs #244936 remove window.open called	2024-12-02 12:25:27 +01:00
Robert Ferrús	30da83a88c	fix: refs #244936 sale redirect catalog to lilium	2024-12-02 11:52:05 +01:00
Jorge Penadés	00085f2b99	feat: refs #7936 add tests for invoiceIn filter	2024-11-29 17:05:13 +01:00
Jorge Penadés	59b5dd5a36	feat: refs #7936 add tests for invoiceIn	2024-11-29 16:25:47 +01:00
Jorge Penadés	ac87905351	feat: refs #7936 add back test for updateInvoiceIn	2024-11-29 15:49:14 +01:00
Jorge Penadés	c9cf96676b	fix: refs #7936 check if insert in hook & change test description	2024-11-29 14:32:12 +01:00
Jorge Penadés	163c6ddd20	feat: refs #7936 add currency handling in invoiceIn trigger	2024-11-29 13:44:42 +01:00
Jorge Penadés	9ece52c5ce	feat: refs #7936 add currency check to updateInvoiceIn	2024-11-29 12:42:15 +01:00
Jorge Penadés	03bf115831	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-29 12:29:19 +01:00
Jorge Penadés	332e1c62d9	feat: refs #7936 add validation to InvoiceIn & InvoiceInTax	2024-11-29 12:22:01 +01:00
Jorge Penadés	1f6e401e39	feat: refs #7936 add save validation	2024-11-29 11:53:07 +01:00
Guillermo Bonet	3453aa0f8c	Merge branch 'test' into dev	2024-11-29 11:40:22 +01:00
Sergio De la torre	009b4ab7b9	fix: refs #7920 refs#7920 itemShelvingLogs	2024-11-29 11:31:31 +01:00
Jorge Penadés	c270ec3723	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-29 09:41:08 +01:00
Alex Moreno	20b68b4b41	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-29 07:28:55 +01:00
Ivan Mas	df51b93e5b	Merge branch 'dev' into 7146-route.createdToDated	2024-11-28 16:32:03 +00:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Alex Moreno	5923916cda	fix: change debugAdd to console.error	2024-11-28 11:31:38 +01:00
Alex Moreno	8ef78818db	Merge branch 'master' into 7404-add-debug	2024-11-28 10:19:32 +00:00
Pablo Natek	00e5f86020	fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods	2024-11-28 11:18:09 +01:00
Guillermo Bonet	699c6553a0	Merge branch 'test' into dev	2024-11-28 11:17:19 +01:00
Jorge Penadés	f92543a628	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-28 11:04:56 +01:00
Jorge Penadés	5ee4563ee7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix	2024-11-28 09:38:28 +01:00
Pablo Natek	1d59d4eeef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8004-liliumStyleRemake	2024-11-28 09:34:36 +01:00
Pablo Natek	d5693291f0	refactor: refs #8004 simplify SQL query by removing redundant aliases	2024-11-28 09:24:02 +01:00
Guillermo Bonet	71bc1adcba	Merge branch 'test' into dev	2024-11-28 09:00:38 +01:00
Guillermo Bonet	847692f103	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-11-28 08:59:11 +01:00
Guillermo Bonet	93388461d1	fix: refs #7266 Changed method name and corrections	2024-11-28 08:59:08 +01:00
Sergio De la torre	6f1bfd6787	Merge branch 'master' into 8213-itemShelvingSalePicker	2024-11-28 07:50:06 +00:00