Commit Graph

23134 Commits

Author SHA1 Message Date
Guillermo Bonet 1a2ed9ce68 refactor: refs #7644 Optimized barcode
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 11:33:12 +02:00
Guillermo Bonet cfebee86f3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:59:36 +02:00
Guillermo Bonet 07b6d2aca9 feat: refs #7644 Added comment if has itemOriginalFk 2024-07-31 08:59:33 +02:00
Alex Moreno 707b45f9a6 Merge pull request '7679-postCode_town_addRequireds' (!2804) from 7679-postCode_town_addRequireds into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2804
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-31 05:43:50 +00:00
Sergio De la torre 5bda4c86c7 Merge pull request 'hotFix getTickets refs #6861' (!2812) from 6861_getTickets_reservas into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2812
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 15:46:36 +00:00
Sergio De la torre d97aba8e10 hotFix getTickets refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 17:28:55 +02:00
Carlos Andrés d9151bdf6a Merge pull request 'hotFix reallocate iss refs #6861' (!2809) from 6861_reallocate_itemShelving into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2809
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 11:06:50 +00:00
Sergio De la torre 9e486e4aff hotFix reallocate iss refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 13:04:33 +02:00
Carlos Andrés 186fa90ef0 Merge pull request 'hotFix reallocate resfs #6861' (!2808) from 6861_imteShelving_reallocate into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2808
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 10:41:18 +00:00
Sergio De la torre 2015256f5d hotFix reallocate resfs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 12:38:13 +02:00
Carlos Andrés 01562420d4 Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:14:15 +00:00
Guillermo Bonet 1f80117ff7 fix: refs #6861 Column
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:24:50 +02:00
Alex Moreno f1628f26b9 Merge branch 'master' into 7679-postCode_town_addRequireds
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 08:18:23 +00:00
Alex Moreno b17b5a1b21 test: fix postcode filter back test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 10:15:09 +02:00
Alex Moreno 2ac8760061 test: fix postcode filter back test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-30 10:13:32 +02:00
Alex Moreno dbe0f4497c fix(postcode_filter): add limit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-30 08:59:03 +02:00
Carlos Satorres d26bc307ed Merge pull request 'refs #7801 frenchGoLabel' (!2800) from 7801-franceGoLabel into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2800
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-30 06:47:49 +00:00
Carlos Satorres 90f7cc0583 Merge branch 'master' into 7801-franceGoLabel
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 06:44:17 +00:00
Carlos Satorres 6c1de1d6bd refs #7801 frenchGoLabel
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 07:55:14 +02:00
Alex Moreno 434dfe4ae4 fix: refs #7679 postcode filter 2024-07-29 15:03:40 +02:00
Alex Moreno 5264d6c973 feat(postcode_town): refs #7679 add requireds 2024-07-29 10:35:01 +02:00
Guillermo Bonet c713c3a5c0 fix: refs #6861 Unhandled error
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:21:35 +02:00
Guillermo Bonet a4d3eec1e1 fix: refs #7580 Parking deadlock
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:05:22 +02:00
Guillermo Bonet b876d1c278 feat: refs #7644 Added item reference
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 13:52:18 +02:00
Alex Moreno 2505adf87f hotFix: ticketAdvanced
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 13:47:15 +02:00
Javier Segarra 0ab40dbfb2 Merge pull request '#7648 - HOTFIX: Add args to filter shipped value' (!2791) from hotfix_myEntries into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2791
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-26 05:50:31 +00:00
Javier Segarra 6d2a64f47d Merge branch 'master' into hotfix_myEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 05:45:23 +00:00
Guillermo Bonet 9e18a208b2 fix: refs #7662 get value for proc with select for updates
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:26:45 +02:00
Javier Segarra 7254abea40 feat(salix): #7648 Add args to filter shipped value
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:49:23 +02:00
Robert Ferrús 12c34db12c Merge pull request 'fix: refs #7654 itemShelving' (!2790) from 7654-hotFixEntry_splitByShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2790
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-25 10:37:00 +00:00
Robert Ferrús 6661cb4c2a fix: refs #7654 itemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:30:18 +02:00
Pablo Natek f02c7a5ada Merge pull request 'feat: refs #6403 default mobile' (!2789) from 6403-defaultMobile into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2789
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-25 10:07:06 +00:00
Pablo Natek 81120df4e4 feat: refs #6403 default mobile
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 09:57:56 +02:00
Guillermo Bonet 25464f8a96 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 08:57:19 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Sergio De la torre 8059ae3e23 Merge pull request 'hotFix itemShelvingSale_addBySale refs #6861' (!2788) from 6861_itemShelvingSale into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2788
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-07-25 06:39:37 +00:00
Sergio De la torre 2374711a88 hotFix itemShelvingSale_addBySale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 08:36:14 +02:00
Guillermo Bonet 1639f7155e fix: refs #7640 multipleInventory
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:21:01 +02:00
Alex Moreno df737c784d Merge pull request 'fix: refs #6403 remove console log' (!2786) from 6403-remove-console-log into master
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 12:38:27 +02:00
Javier Segarra d2cc6a77fe Merge pull request 'HOTFIX: Missing fields whe request getBuys' (!2785) from hotfix_entry_getBuys_fields into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2785
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-24 10:36:07 +00:00
Javier Segarra de7b4dc9d6 fix: missing fields
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 10:08:01 +00:00
Alex Moreno 808c09643f remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 12:05:26 +02:00
Alex Moreno e3f4cd293f hotFix: liliumRedirection
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 10:07:44 +02:00
Guillermo Bonet db31ac3b60 fix: refs #7662 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:39:33 +02:00
Robert Ferrús f74a9c3500 Merge pull request 'feat: refs #7716 travel_setDelivered' (!2776) from 7716-travel_setDeliveredMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2776
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-24 05:49:14 +00:00
Robert Ferrús 65ac02e468 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 05:47:35 +00:00
Guillermo Bonet 2086746eb0 fix: refs #7505 Visible COM
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:34:52 +02:00
Robert Ferrús bb40e6cbf3 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 04:54:00 +00:00
Pablo Natek 8a9fa58823 Merge pull request 'fix: refs #6403 take observation from ticket' (!2777) from 6403-fixObservation into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2777
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-24 04:49:58 +00:00