Commit Graph

23113 Commits

Author SHA1 Message Date
Pablo Natek 8fda12e4cf Revert "commit"
This reverts commit c41bb16477.
2024-07-26 10:01:01 +02:00
Pablo Natek c41bb16477 commit 2024-07-26 10:00:50 +02:00
Guillermo Bonet 1bc50112fa Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:29:28 +02: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
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 10dbc53acc Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:33 +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 3e0e43da2f Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:24:46 +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 b92165cf76 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 12:05:40 +02: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
Alex Moreno c0664fd1af hotFix_liliumRedirection
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 10:05:29 +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
Pablo Natek 795ca14def Merge branch 'master' into 6403-fixObservation
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 04:41:51 +00:00
Guillermo Bonet abfbf13440 fix: refs #7505 fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:18:52 +02:00
Guillermo Bonet a9aa47fef1 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 14:17:01 +02:00
Guillermo Bonet 5d2e9c6210 fix: refs #7505 visible_refresh support warehouse null and added isComparative
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:59:36 +02:00
Pablo Natek bdfaf02c95 fix: refs #6403 fix delivery observation
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 13:36:52 +02:00
Guillermo Bonet 88724d6d8c fix: refs #7505 visible_refresh support warehouse null
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 13:08:49 +02:00
Pablo Natek 80b338228e fix: refs #6403 take observation from ticket
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 12:29:08 +02:00
Robert Ferrús 91db2dc0e0 Merge branch 'master' into 7716-travel_setDeliveredMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 09:55:44 +00:00
Alex Moreno d8df9bc959 Merge pull request 'build: dump db' (!2775) from 7773-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2775
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-07-23 09:45:24 +00:00
Robert Ferrús bfc2d6f734 feat: refs #7716 travel_setDelivered
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 11:38:05 +02:00
Alex Moreno 85b7254353 Merge branch 'master' into 7773-dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 09:02:18 +00:00
Alex Moreno e35ded5e35 hotFix: add summaryId to productionConfigLog & agencyLog
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:01:57 +02:00
Alex Moreno 4cf52c5e80 Merge branch '7773-dump' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 10:48:13 +02:00
Alex Moreno eb413af275 hotFix: collection assign 2024-07-23 10:48:12 +02:00
Alex Moreno 6167454097 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump 2024-07-23 10:39:36 +02:00
Alex Moreno 83fef59686 Merge branch 'master' into 7773-dump
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 08:27:01 +00:00
Alex Moreno 71cd805b7e build: dump db
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-23 10:23:28 +02:00
Guillermo Bonet fa10376bea fix: refs #7662 assign
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 10:21:09 +02:00
Guillermo Bonet 04ff3e0cc7 fix: refs #7382 throw
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:23:42 +02:00
Guillermo Bonet bfd2b5aebb fix: refs #7382 invoiceIn_booking change
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:22:18 +02:00
Alex Moreno 7c4032c859 Merge pull request '7773-testToMaster_2430' (!2774) from 7773-testToMaster_2430 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2774
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-23 06:21:01 +00:00