Commit Graph

7985 Commits

Author SHA1 Message Date
Jorge Penadés 3109f7722e refs #6276 saleTracking_mark 2023-12-12 13:24:18 +01:00
Jorge Penadés 8acd03f115 refs #6276 saleTrackingReplace 2023-12-11 13:01:34 +01:00
Jorge Penadés e27bf2ef8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-12-11 08:29:35 +01:00
Carlos Satorres 3c9c221220 Merge branch 'dev' into 6010-testBackPending 2023-12-07 06:59:38 +00:00
Carlos Satorres c7d960229d Merge branch 'dev' into 6010-testBackPending 2023-12-07 06:34:32 +00:00
Carlos Satorres acfa0fd857 Merge branch 'dev' into 6318-negativeQuantity 2023-12-07 06:31:21 +00:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Carlos Satorres f55e85a189 refs #6010 remove pending 2023-12-05 10:35:48 +01:00
Carlos Satorres af07a531ed refs #6318 quantity 2023-12-05 08:49:55 +01:00
Jorge Penadés 1dfdd94584 refs #6276 fix getItemPackingType 2023-12-01 13:56:43 +01:00
Jorge Penadés 4690dca4f9 refs #6276 getItemPackingType 2023-12-01 13:54:09 +01:00
Jorge Penadés 660e77be55 refs #6276 updateFromSale refactored 2023-12-01 12:48:21 +01:00
Jorge Penadés 7e57640758 refs #6276 itemShelving_updateFromSale 2023-12-01 11:43:07 +01:00
Jorge Penadés d2769f4c21 refs #6276 return fixed 2023-12-01 11:38:30 +01:00
Jorge Penadés f2ab44bb8f refs #6276 itemShelving_return 2023-12-01 10:14:32 +01:00
Jorge Penadés 30b63f577f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-12-01 09:49:49 +01:00
Jorge Penadés d5f09c2f75 refs #6276 saleTrackingDel 2023-12-01 09:44:49 +01:00
Jorge Penadés 3333c83702 refs #6276 WIP itemShelving_return 2023-11-30 16:25:13 +01:00
Jorge Penadés 611b45bae0 Merge branch 'dev' into 5835-summaryRate 2023-11-30 15:16:18 +00:00
Pablo Natek 72283005b8 remove(console.log): refs #3271 remove console.log 2023-11-30 14:43:14 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix 2023-11-30 12:39:26 +00:00
Jorge Penadés 40236fdb7b refs #6276 itemShelvingMake_multi 2023-11-30 13:23:10 +01:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-11-30 12:49:42 +01:00
Alex Moreno 35e74a7635 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-11-30 12:48:27 +01:00
Alex Moreno 016e4ae37c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-11-30 12:20:50 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter 2023-11-30 12:13:12 +01:00
Jorge Penadés 25a0ffcfde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-11-30 09:49:50 +01:00
Jorge Penadés 6121eeaa3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate 2023-11-30 09:44:05 +01:00
Carlos Satorres 9cdb7c3cca refs #6065 remove workcenter 2023-11-30 09:18:00 +01:00
Javier Segarra 1576ab992d refs #6434 perf: new field in SignInLog table 2023-11-29 19:36:30 +00:00
Jorge Penadés 0d558fb4f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-11-29 16:26:10 +01:00
Javi Gallego d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix 2023-11-29 15:26:51 +01:00
Jorge Penadés 877c679273 refs #6276 getVersion 2023-11-29 13:22:44 +01:00
Jorge Penadés 133fe1065a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-11-29 09:44:09 +01:00
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method 2023-11-28 13:22:17 +01:00
Jorge Penadés f2673c3818 refs #5835 rate added 2023-11-28 12:12:42 +01:00
Guillermo Bonet 1a5cc67312 Merge branch 'dev' into 6023-changeRol 2023-11-28 12:07:50 +01:00
Javi Gallego 2fa56cce4b fix: refs #5652 arreglo fixtures 2023-11-28 09:22:00 +01:00
Alex Moreno 37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties 2023-11-27 15:10:00 +01:00
Juan Ferrer c7291e3367 Merge pull request 'test' (!1863) from test into dev
Reviewed-on: #1863
2023-11-27 12:17:11 +00:00
Juan Ferrer 74772472d5 Merge pull request 'master' (!1820) from master into test
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-27 12:16:42 +00:00
Guillermo Bonet 3bdb002034 Merge branch 'dev' into 3222-expenceToExpense 2023-11-27 09:06:17 +00:00
Guillermo Bonet aefff68c29 refactor: refs #3222 Requested changes 2023-11-27 09:51:56 +01:00
Alex Moreno 3fb1ed9dfe Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract 2023-11-27 08:38:17 +01:00
Carlos Satorres f9d5cad412 refs #6506 contract 2023-11-27 07:57:18 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense 2023-11-24 12:42:25 +01:00
Jorge Penadés 53c8e87b5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress 2023-11-24 10:57:32 +01:00
Jorge Penadés 8ac3887d80 refs #5811 rename methods 2023-11-24 10:53:38 +01:00
Jorge Penadés c56588a472 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress 2023-11-24 10:18:47 +01:00
Jorge Penadés b3584d9db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals 2023-11-24 10:12:45 +01:00