Commit Graph

9560 Commits

Author SHA1 Message Date
Guillermo Bonet 5e0bf4c739 Merge branch 'master' into test 2024-08-14 12:48:22 +02:00
Jorge Penadés a733560649 feat: refs #7323 add locale 2024-08-13 10:26:36 +02:00
Alex Moreno 46abf2f57b fix(defaulter_filter): recovery subquery 2024-08-12 10:27:26 +02:00
Alex Moreno 64fb097086 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-08-09 12:54:34 +02:00
Alex Moreno af65ef2536 fix(orders_filter): add sourceApp accepts 2024-08-09 12:54:33 +02:00
Jorge Penadés 8ab049be0d chore: refs #6900 beautify code 2024-08-09 11:48:22 +02:00
Jorge Penadés 5dfdb458a6 #6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn 2024-08-08 15:27:42 +02:00
Alex Moreno 30e1b7280a Merge branch 'dev' into 6336-claim-redirectToLilium 2024-08-08 10:38:33 +00:00
Jorge Penadés 853a57ec63 #6900 fix: empty commit 2024-08-08 12:37:29 +02:00
Jorge Penadés 660ebfbe15 #6900 feat: empty commit 2024-08-08 12:36:06 +02:00
Jorge Penadés 4af881a8d9 #6900 feat: clear empty 2024-08-08 12:35:11 +02:00
Jorge Penadés b4ea7819f8 #6900 feat: clear empty 2024-08-08 12:18:42 +02:00
Jorge Penadés 1ccfd8731f #6900 feat: empty commit 2024-08-08 12:17:56 +02:00
Jorge Penadés afc5615140 #6900 fix: #6900 rectificative filter 2024-08-08 12:14:44 +02:00
Alex Moreno 715439ae38 test: fix claim descriptor redirect to lilium 2024-08-08 08:23:17 +02:00
Alex Moreno c768fa113e test: fix ticket redirect to lilium 2024-08-08 08:20:26 +02:00
Jorge Penadés 8241a6c22a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration 2024-08-07 15:48:41 +02:00
Alex Moreno 4e831dc1bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium 2024-08-07 11:17:09 +02:00
Alex Moreno 0152fb8a98 hotFix getTIckets 2024-08-06 09:51:15 +02:00
Alex Moreno 69c676d44b hotFix(route): fix getTicket use skip 2024-08-06 09:38:27 +02:00
Alex Moreno 6fb78e1599 test: hotFix saveSign 2024-08-06 08:59:20 +02:00
Guillermo Bonet d6e09fcfc9 Merge branch 'master' into test 2024-08-05 12:59:37 +02:00
Guillermo Bonet 91253cc807 fix: refs #7835 transferSales 2024-08-05 12:57:38 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test 2024-08-05 11:59:46 +02:00
Guillermo Bonet ab446b54ed feat: refs #7644 Optimized entry labels report 2024-08-05 11:29:35 +02:00
Jon Elias 6620a1d119 Merge branch 'dev' into Worker_Migration 2024-08-01 11:56:06 +00:00
Jon Elias ed283cac46 feat: deleted worker module code & redirect to Lilium 2024-08-01 13:15:11 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) from master into test
Reviewed-on: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving 2024-07-31 19:51:36 +00:00
Carlos Andrés 5b0dcee62d hotfix: getBuys add field comment Ticket 207748 2024-07-31 18:41:18 +02:00
Sergio De la torre 70b931553b hotFix itemShelving refs #6861 2024-07-31 18:14:09 +02:00
Sergio De la torre 952b7a5054 hotFix model itemShelving refs #7805 2024-07-31 07:10:38 +02:00
Carlos Andrés 9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate 2024-07-29 19:12:48 +02:00
Jorge Penadés 4f385f16e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-29 09:40:34 +02:00
Guillermo Bonet f9c58e63e1 Merge branch 'test' into dev 2024-07-29 09:24:57 +02:00
Guillermo Bonet c713c3a5c0 fix: refs #6861 Unhandled error 2024-07-29 09:21:35 +02:00
Jorge Penadés ffd8e5e282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-29 08:05:55 +02:00
Guillermo Bonet c6bcf6f488 Merge branch 'test' into dev 2024-07-26 13:56:07 +02:00
Guillermo Bonet b876d1c278 feat: refs #7644 Added item reference 2024-07-26 13:52:18 +02:00
Alex Moreno 2505adf87f hotFix: ticketAdvanced 2024-07-26 13:47:15 +02:00
Pablo Natek cf84ce1337 feat: refs #7401 redirect lilium 2024-07-26 09:38:49 +02:00
Javier Segarra 7254abea40 feat(salix): #7648 Add args to filter shipped value 2024-07-25 12:49:23 +02:00
Guillermo Bonet ff8f340978 Merge branch 'test' into dev 2024-07-25 09:40:45 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Alex Moreno df737c784d Merge pull request 'fix: refs #6403 remove console log' (!2786) from 6403-remove-console-log into master
Reviewed-on: #2786
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-24 10:57:06 +00:00
Pablo Natek bc9fe220d5 fix: refs #6403 remove console log 2024-07-24 12:38:27 +02:00
Javier Segarra de7b4dc9d6 fix: missing fields 2024-07-24 10:08:01 +00:00
Alex Moreno 1a3ed42bcd fix: defaulter filter correct sql 2024-07-23 14:37:34 +02:00
Guillermo Bonet c6b49e2134 Merge branch 'test' into dev 2024-07-23 09:27:05 +02:00
Pablo Natek d152a58dda Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter 2024-07-22 13:33:52 +02:00