Commit Graph

20424 Commits

Author SHA1 Message Date
Alex Moreno 89c55d23a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-08 08:11:30 +01:00
Alex Moreno 3df4d3c86b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-08 08:10:46 +01:00
David Domenech b3115d2efd Merge pull request '6372-Fix-tables-vn2008' () from 6372-Fix-tables-vn2008 into master
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-08 06:55:06 +00:00
Alex Moreno 8cda12a9da feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:49:00 +01:00
Alex Moreno c2ecedca71 feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:48:55 +01:00
David Domenech 60c50337ff refs #6372 2024-03-08 07:43:13 +01:00
David Domenech 014914e1d9 refs #6372 2024-03-08 07:36:14 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog 2024-03-07 15:56:02 +01:00
Carlos Satorres 557f1ec2d9 Merge branch 'dev' into 6842-sageMod 2024-03-07 13:40:37 +00:00
Pako Natek b588b9807c fixtures local 2024-03-07 13:45:53 +01:00
Alex Moreno 2f2aba1cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-07 11:42:35 +01:00
Alex Moreno dbbebbe73c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-07 11:39:03 +01:00
Alex Moreno 951e0a7798 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-07 11:38:46 +01:00
Alex Moreno 01cd2709cc deploy: refs #6995 skip test 2024-03-07 11:38:30 +01:00
Carlos Satorres d4d3fdceb5 refs #6755 fix canRestoreTicket 2024-03-07 11:36:30 +01:00
Alex Moreno ed39ede6cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-07 10:35:14 +01:00
Alex Moreno a7662194b3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-07 10:34:54 +01:00
Alex Moreno f29212cb65 deploy: refs #6995 production dump 2024-03-07 10:34:24 +01:00
Alex Moreno fbdebad12c fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition 2024-03-07 10:29:31 +01:00
Alex Moreno 00355aba3a fix: refs #6995 desdeprecar unary y unary_scan 2024-03-07 10:24:18 +01:00
Alex Moreno 3bfaa97ddd fix: refs #6995remove preparation_exception 2024-03-07 10:18:30 +01:00
Alex Moreno 62de03e630 Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2145) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master
Reviewed-on: #2145
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
Reviewed-by: David Domenech <davidd@verdnatura.es>
2024-03-07 09:10:09 +00:00
Alex Moreno 463714de14 Merge branch 'master' into 6995-hotFix_restoreExchangeInsuranceInPrevious 2024-03-07 09:08:49 +00:00
Alex Moreno 99c9ad77d2 fix: refs #6995 restore vn.exchangeInsuranceInPrevious 2024-03-07 10:07:42 +01:00
Alex Moreno 06e4477a52 Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2144) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master
Reviewed-on: #2144
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 08:57:41 +00:00
Alex Moreno 572a09f704 fix: refs #6995 restore vn.exchangeInsuranceInPrevious 2024-03-07 09:55:29 +01:00
Alex Moreno 625abbb804 Merge pull request 'fix: refs #6995 restore vn2008.jerarquia' (!2143) from 6995-hotFix_restoreJerarquia into master
Reviewed-on: #2143
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 08:35:50 +00:00
Alex Moreno b8f09f363f fix: refs #6995 restore vn2008.jerarquia 2024-03-07 09:33:32 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind 2024-03-07 09:29:51 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +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
Robert Ferrús 1d684d171e Merge pull request 'fix: rutasAnalyzeHotFix' (!2119) from rutasAnalyzeHotFix into master
Reviewed-on: #2119
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-07 07:21:45 +00:00
Alex Moreno b9d1964d19 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-07 08:16:38 +01:00
Alex Moreno 24d1f63003 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-07 08:16:11 +01:00
Robert Ferrús bf9842d5fd Merge branch 'master' into rutasAnalyzeHotFix 2024-03-07 07:16:11 +00:00
Alex Moreno 4f68b336bc Merge pull request '6995-testToMaster_2410' (!2139) from 6995-testToMaster_2410 into master
Reviewed-on: #2139
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 07:09:07 +00:00
Sergio De la torre dd732297c4 Merge branch 'dev' into 6078_workerActivty 2024-03-07 07:31:04 +01:00
Alex Moreno 702792ace0 refs #6990 hotFix: puppeteer cluster 2024-03-07 07:28:55 +01:00
Alex Moreno e127457ed6 refs #6990 hotFix: puppeteer cluster 2024-03-07 07:27:18 +01:00
Alex Moreno a59d45b28c refs #6990 hotFix: puppeteer cluster 2024-03-07 07:26:31 +01:00
Alex Moreno a8c2779ee7 Merge branch 'master' into 6995-testToMaster_2410 2024-03-07 06:22:04 +00:00
Guillermo Bonet 134a8e43ab Merge pull request 'refactor: refs #6948 Bank to Accouting' (!2128) from 6948-bank into dev
Reviewed-on: #2128
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-07 06:19:49 +00:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty 2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank 2024-03-07 06:17:26 +00:00
Guillermo Bonet ee08502f33 Merge branch 'dev' into 6495-procRefactor4 2024-03-07 06:07:54 +00:00
Guillermo Bonet cd40bd47e5 refactor: refs #6495 Deleted procs 2024-03-07 07:08:40 +01:00
Robert Ferrús 29926db45f Merge branch 'master' into rutasAnalyzeHotFix 2024-03-07 06:01:37 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-03-06 18:18:34 +00:00
Carlos Andrés f1654609df Merge pull request 'test' (!2142) from test into dev
Reviewed-on: #2142
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-03-06 16:16:16 +00:00
Carlos Andrés fc3c9332b3 Merge pull request 'master' (!2141) from master into test
Reviewed-on: #2141
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-06 16:10:42 +00:00