Commit Graph

6861 Commits

Author SHA1 Message Date
Guillermo Bonet bcf08db6d6 Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2675
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-30 10:02:10 +00:00
Carlos Andrés 495bb7e36e Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-30 10:46:00 +02:00
Guillermo Bonet 857b1e9939 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:26:33 +02:00
Guillermo Bonet e2c3539dfc Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-30 10:26:17 +02: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
Guillermo Bonet 0451e4bb2a feat: refs #7650 Fix tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 10:20:04 +02:00
Guillermo Bonet b6abcbe090 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 10:14:20 +02:00
Guillermo Bonet 18dc3873b8 feat: refs #7650 Added no transfer lines to inventory entry and fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 09:54:43 +02:00
Jorge Penadés 766da06c2f feat: refs #7524 add mock limit on find query
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 09:40:34 +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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 19:12:48 +02:00
Guillermo Bonet a01ae9b7b8 fix: refs #7756 Foreign keys invoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 14:09:55 +02:00
Jorge Penadés 254cced550 chore: refs #6989 add config model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:40:30 +02:00
Guillermo Bonet baa1498923 feat: refs #7712 sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:29:26 +02:00
Guillermo Bonet 6ad3d5a5eb feat: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:36:08 +02:00
Guillermo Bonet e53b12d51b feat: refs #6453 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 12:31:44 +02:00
Guillermo Bonet 4c602800ea feat: refs #6453 Added new ticket search
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 11:46:59 +02:00
Guillermo Bonet e0b9100de1 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:20:05 +02:00
Guillermo Bonet 6de9ea4b16 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:18:23 +02:00
Guillermo Bonet 403252ac39 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:07:15 +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
Pablo Natek 54a5a91177 Merge branch '7781-fixPalletMerge' of https://gitea.verdnatura.es/verdnatura/salix into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 12:39:04 +02:00
Pablo Natek ba494a77e6 fix: refs #7781 conditional 2024-07-26 12:39:00 +02:00
Pablo Natek 000a967a03 feat: refs #6403 packingSite to productionConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 07:12:51 +02:00
Pablo Natek 876e08b1da Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 04:35:59 +00:00
Pablo Natek 6845f1456e fix: refs #7781 prevent pallet merge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 15:03:33 +02:00
Guillermo Bonet 95b61ae86a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:29:42 +02: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
Guillermo Bonet ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:45 +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 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 70142c43db Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 07:25:04 +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
Jon Elias 9e844c15b7 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-25 05:07:32 +00:00
Guillermo Bonet de850e62c9 Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2787
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-25 05:03:29 +00:00
Robert Ferrús cb7d6f25e9 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 12:45:03 +00:00
Guillermo Bonet 983d66a681 feat: refs #7728 Added throw due date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 14:24:06 +02:00
Robert Ferrús d0dfb95718 feat: refs #7774
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 13:56:21 +02:00
Guillermo Bonet 3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 08:25:33 +00:00
Guillermo Bonet cf3ee07dd2 feat: refs #7713 Created ACLLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 10:03:51 +02:00
Guillermo Bonet e214da164a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:40:06 +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 896e76016d Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 07:14:52 +00:00
Robert Ferrús 5a9ab84356 feat: refs #7646 delete scannableCodeType 2024-07-24 09:14:28 +02:00
Guillermo Bonet 0c51a97a17 refactor: refs #7640 Multipleinventory available
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 09:13:47 +02: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 23732ab20a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:42:08 +02: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 49888cc3b9 Merge branch 'dev' into 7774-ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 05:27:34 +00:00
Robert Ferrús a7f725a194 feat: refs #7774 ticket_cloneWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 07:25:43 +02:00
Guillermo Bonet fdef84f78d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:11:56 +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
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
Jon Elias 03523afff1 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 11:26:59 +00:00
Jon Elias 2568ac4e92 feat: refs #6346 new wagon type section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 13:24:43 +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
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 1c45aef883 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:46:19 +02: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 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 c6b49e2134 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:27:05 +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
Robert Ferrús 2a70df151a Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 07:16:28 +00:00
Sergio De la torre c777b8dbf1 Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2762
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 20:33:47 +00:00
Sergio De la torre 296fe3442d Merge pull request 'master' (!2773) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2773
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 14:48:36 +00:00
Guillermo Bonet 3fc973dcee Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2770
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 12:02:18 +00:00
Sergio De la torre afbce80303 hotFix solve isPicked refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 13:42:42 +02:00
Carlos Andrés 33a71867bd feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:39:48 +02:00
Carlos Andrés b086cc7658 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 13:34:04 +02:00
Guillermo Bonet 7e125cdba5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 12:36:29 +02:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Guillermo Bonet 24c85608eb feat: refs #7740 Ticket before update added restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 12:09:24 +02:00
Carlos Andrés d7b9a3ffd0 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 11:58:51 +02:00
Guillermo Bonet 219740f669 feat: refs #7759 Changed definer root to vn-admin
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 11:52:42 +02:00
Guillermo Bonet ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:27:24 +02:00
Javi Gallego 8f623bd51e feat: refs #7346 mas intuitivo 2024-07-22 10:26:40 +02:00
Guillermo Bonet 32e88532f9 fix: refs #7752 fix table name (change pablo)
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:07:21 +02:00
Guillermo Bonet a0abc29167 Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master"
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
This reverts commit d41262798c, reversing
changes made to 3d20908a42.
2024-07-22 10:04:03 +02:00
Pablo Natek 7b44e9f866 fix: refs #7752 fix format
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:49:54 +02:00
Pablo Natek 2ba4ca088d fix: refs #7752 fix table name
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-22 09:46:20 +02:00
Guillermo Bonet a2799e1e61 feat: refs #7589 Added display (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 08:01:23 +02:00
Guillermo Bonet ccc02d57b7 feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 07:59:15 +02:00
Carlos Andrés bf0f95f661 Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:57:16 +02:00
Carlos Andrés 5567359d73 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:34:32 +02:00
Carlos Andrés 55ea761af4 eat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 15:11:14 +02:00
Guillermo Bonet fe363fd4db fix: refs #7126 Primary key no unique data
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 15:00:13 +02:00
Guillermo Bonet 05598b3371 fix: refs #7126 Slow update
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 14:29:20 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Guillermo Bonet b72923f160 Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2707
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 11:12:21 +00:00
Guillermo Bonet 6aab5fa9ef fix: refs #7546 Deleted insert util.binlogQueue
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 12:47:05 +02:00
Carlos Andrés b2a8326170 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 12:44:45 +02:00
Javier Segarra 287f9edc83 fix(salix): refs #7648 #7648 improve update ACL
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-19 11:54:21 +02:00
Javier Segarra 376ddebdcd Merge branch 'master' into 7648_myEntries 2024-07-19 11:42:53 +02:00
Guillermo Bonet 578de51f7e feat: #6453 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 10:54:40 +02:00
Guillermo Bonet 5f29384389 feat: #6453 Rollback always split by itemPackingType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 10:49:45 +02:00
Pablo Natek d0a635e86a Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2760
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-19 08:35:39 +00:00
Guillermo Bonet 9466c7e529 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:30:07 +00:00
Guillermo Bonet c94ca96226 feat: #6727 Minor changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-19 09:29:42 +02:00
Guillermo Bonet 1133750629 feat: #6727 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:29:15 +02:00
Guillermo Bonet e61210fd17 feat: #3199 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:09:45 +02:00
Alex Moreno b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:08:47 +02:00
Guillermo Bonet 3cf5555612 feat: refs #6727 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:58:51 +02:00
Guillermo Bonet 930e2951b7 feat: refs #6727 Added started and finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:39 +02:00
Sergio De la torre f19f107971 feat checkExpeditionPrintOut refs #7751
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:22 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Guillermo Bonet 3449aeb673 refactor: refs #7511 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:45:17 +02:00
Sergio De la torre dbf91293f8 Merge pull request 'master' (!2761) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 04:31:34 +00:00
Sergio De la torre 2d2eafd4ed Merge branch 'master' into 6861_hotFix_resevas
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:17:26 +00:00
Ivan Mas c44bf909b2 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 13:23:38 +00:00
Ivan Mas a6e6f435f7 refs #7531 No assigned department
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 15:21:59 +02:00
Pablo Natek 3b529440ba fix: refs #7752 refactor insert
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:16:25 +02:00
Pablo Natek 684983ee42 fix: refs #7752 add new state after scan 2024-07-18 15:14:18 +02:00
Guillermo Bonet f687994a7f refactor: refs #7681 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 14:27:10 +02:00
Guillermo Bonet 625b3a5608 refactor: refs #7567 Minor change
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-18 14:12:37 +02:00
Guillermo Bonet f18b165e4a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:23 +02:00
Guillermo Bonet ba5c44994d feat: refs #7686 Added cascade on update vn.state.alertLevel
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:06 +02:00
Sergio De la torre bd10741311 hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 12:42:00 +02:00
Robert Ferrús 57efba8601 Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 12:04:19 +02:00
Robert Ferrús 15adc59ec5 feat: refs #7683 drop temporary table 2024-07-18 12:04:17 +02:00
Robert Ferrús e878615983 Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 09:53:38 +00:00
Robert Ferrús c17214ce05 feat: refs #7683 drop temporary table
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-18 11:50:01 +02:00
Sergio De la torre fa07d03b8c Merge pull request 'master' (!2753) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2753
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-07-18 05:05:01 +00:00
Carlos Andrés f7429f3927 Hotfix itemShelvingSale_doReserve Ticket #204044
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 18:24:27 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre a35ec4a42c hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 16:48:52 +02:00
Sergio De la torre 8ff3e8acb0 hotFix reservas refs #6861 2024-07-17 16:21:37 +02:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Pablo Natek 075f2b7ba4 Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2740
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 12:58:40 +00:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Robert Ferrús 762989557f Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 05:18:01 +00:00
Carlos Andrés 4ee0bd687f feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 19:01:02 +02:00
Carlos Andrés 5ca2a432da feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:58:26 +02:00
Ivan Mas 350e4b4c53 Merge branch 'dev' into 7531-Modify-zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 16:57:50 +00:00
Ivan Mas 50e2c03d3e refs #7531 Requested modifications in redmine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 18:56:00 +02:00
Carlos Andrés d6a949a9f3 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 18:55:58 +02:00
Carlos Andrés 38d863aac6 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 18:44:24 +02:00
Carlos Andrés 2181664c25 fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 15:14:10 +02:00
Javier Segarra 5293becb6d Merge branch 'master' into 7648_myEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:52:54 +00:00
Sergio De la torre 3f297acbd3 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 13:06:04 +02:00
Javier Segarra 6856ab0501 feat(salix): refs #7648 #7648 myEntries 2024-07-16 12:45:14 +02:00
Sergio De la torre c086de2644 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:38:44 +02:00
Sergio De la torre dbb893c723 Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2737
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-16 08:19:38 +00:00
Robert Ferrús b1a401444e Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 08:19:34 +00:00
Pablo Natek 99bbb55c37 feat: refs #7297 add new columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 10:02:57 +02:00
Javi Gallego 63763f2b22 Merge branch 'dev' into 7346 2024-07-16 09:32:16 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Carlos Andrés 8d61cb762b feat: tabla config dias margen vctos. refs #7728
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-15 17:53:23 +02:00
Sergio De la torre 87b0d3e8d1 refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 16:18:30 +02:00
Robert Ferrús 0fb882e688 feat: refs #7722 changes required
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:55:11 +02:00
Robert Ferrús 8f41546829 feat: refs #7222
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 14:25:42 +02:00
Javi Gallego 3698651306 Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2670
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-15 12:16:31 +00:00
Javi Gallego f25d5c3bb5 Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 10:37:53 +00:00
Robert Ferrús 200a6714bb fix: refs #7722 delete sms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 12:02:00 +02:00
Carlos Andrés 31f537ae28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 11:52:57 +02:00
Alex Moreno eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 08:19:26 +00:00
Javier Segarra fb8b31b397 perf: refs #7648 #7648 clean fixtures and SQL filter 2024-07-15 09:59:52 +02:00
Carlos Andrés 67b19ee4ca hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-14 09:08:14 +02:00
Javier Segarra c70824535a feat(ssalix): refs #7648 clean fixtures 2024-07-12 20:52:00 +02:00
Javier Segarra bedff9f290 Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 20:24:25 +02:00
Carlos Andrés 49183c79f1 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 16:47:24 +02:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Carlos Andrés d2e482d7cd hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:13:21 +02:00
Carlos Andrés 66959dd388 hotfix: packaging ticket 199070
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:10:43 +02:00
Guillermo Bonet 323d26f226 Fix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 10:37:39 +02:00
Carlos Andrés b93601d6d8 Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-12 08:27:24 +00:00
Guillermo Bonet f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2683
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 08:13:27 +00:00
Guillermo Bonet 9b8e2e1279 Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 07:43:44 +00:00
Guillermo Bonet f3612c7ee3 fix: refs #7580
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 09:42:10 +02:00
Guillermo Bonet 5ed8b33cef Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2700
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-12 07:34:45 +00:00
Guillermo Bonet 186cd4c7dd refactor: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:29:33 +02:00
Sergio De la torre 21987011b6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 09:06:05 +02:00
Guillermo Bonet bb787b1581 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:03:37 +02:00
Javier Segarra 5a8634356a Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 08:51:56 +02:00
Guillermo Bonet 05202e0b76 refactor: refs #7680 Added cursors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:15:09 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 28b6dc901f feat: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 07:18:37 +02:00
Robert Ferrús 1c675ca43f Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 05:16:13 +00:00
Javier Segarra 1c5ab395e6 Merge branch 'dev' into 7648_myEntries_filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 19:55:52 +02:00
Javier Segarra ca48ad9777 feat(salix): refs #7648 #7648 add new entries and travels 2024-07-11 19:55:19 +02:00
Sergio De la torre 69bcad9ce0 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 18:09:00 +02:00
Guillermo Bonet 96a157d2f7 Merge branch 'dev' into 7580-setParkingfIX
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 12:50:44 +00:00
Guillermo Bonet 6702ff8616 feat: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:50:21 +02:00
Guillermo Bonet dab386326f feat: refs #6769 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 14:44:46 +02:00
Guillermo Bonet 0fd0302545 Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2671
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-11 12:36:05 +00:00
Guillermo Bonet 443a752cfe feat: refs #7704 Added check
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:45:24 +02:00
Guillermo Bonet d9bd7ad84e feat: refs #7704 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:32:34 +02:00
Guillermo Bonet 0d30331c9a feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:25:26 +02:00
Guillermo Bonet ca1933cb83 feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:04:19 +02:00
Robert Ferrús c770d17c25 feat: refs #7685
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:57:48 +02:00
Robert Ferrús fb1c66633c feat: refs #7685
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:55:10 +02:00
Robert Ferrús 9b2ebe7bd9 feat: refs #7685
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:52:27 +02:00
Robert Ferrús cb0461b241 feat: refs #7685 changes required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:43:19 +02:00
Guillermo Bonet 7bdc242fc7 feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:40:06 +02:00
Guillermo Bonet 90802bd330 feat: refs #7704 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:28:00 +02:00
Guillermo Bonet 823756d71a feat: refs #7704 Optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 10:29:26 +02:00
Robert Ferrús 1669944286 Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:26:46 +00:00
Robert Ferrús b3a98226c0 feat: refs #7685 chages required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 10:23:31 +02:00
Guillermo Bonet 0416ebedb5 feat: refs #7704 Added grant
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:54:49 +02:00
Guillermo Bonet 7ba2e8d4c5 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:48:31 +02:00
Guillermo Bonet 61a746c2d8 feat: refs #7704 Fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 09:00:07 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Javi Gallego c45c920dbb Merge branch '7348-client-hasDailyInvoice' of https://gitea.verdnatura.es/verdnatura/salix into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:52:15 +02:00
Javi Gallego 5304929f57 feat: #refs 7348 schema 2024-07-11 08:52:07 +02:00
Javi Gallego 618baaf604 usa campo factura multipe 2024-07-11 08:37:08 +02:00
Guillermo Bonet 6dc464d26b refactor: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 07:14:02 +02:00
Guillermo Bonet a2f2ed743d refactor: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 13:31:48 +02:00
Robert Ferrús 3de57b776b Merge branch 'dev' into 7683-productionControlDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:02:32 +00:00
Guillermo Bonet a82f7bc025 Merge branch 'dev' into 6769-itemDiary
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 10:04:27 +00:00
Guillermo Bonet 889982dd82 refactor: refs #7126 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 12:00:54 +02:00
Guillermo Bonet 27f9001e34 refactor: refs #7378 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:35:05 +02:00
Guillermo Bonet 3c975aa9c4 refactor: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:32:41 +02:00
Guillermo Bonet 15f580508b refactor: refs #6453 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 11:29:14 +02:00
Guillermo Bonet 7e415181c2 refactor: refs #6453 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 11:26:45 +02:00
Alex Moreno c7d9fae17b Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:39:35 +00:00
Guillermo Bonet a1d3d2f2f8 refactor: refs #6453 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 10:30:24 +02:00
Guillermo Bonet a003cd24f6 Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2697
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-10 08:22:45 +00:00
Guillermo Bonet 0e760ba505 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 08:23:43 +02:00
Guillermo Bonet a8d0345073 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 08:18:33 +02:00
Guillermo Bonet b75bdc07c2 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:10:34 +02:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Robert Ferrús 5264888f06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 07:26:09 +02:00
Robert Ferrús 4f4d12c76a Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 05:22:19 +00:00
Robert Ferrús 5bfabee6e3 Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 05:19:02 +00:00
Robert Ferrús 004dcb67ff feat: refs #7116 insert into agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 07:13:57 +02:00
Guillermo Bonet 9d4db0d408 Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2573
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-10 05:03:18 +00:00
Guillermo Bonet 1ca95678df Fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 14:53:09 +02:00
Guillermo Bonet 0b61a175ef Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-09 14:49:51 +02:00
Guillermo Bonet 64ed96c8ae feat: refs #7486 More debug
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:47:12 +02:00
Guillermo Bonet daec922c5c Merge branch 'dev' into 7505-item_calcVisible
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:25:11 +00:00
Guillermo Bonet e2b6473831 feat: refs #7505 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:24:35 +02:00
Guillermo Bonet 470c9bc872 feat: refs #7505 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 14:24:17 +02:00
Guillermo Bonet c2e9095ccd feat: refs #7505 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 14:22:32 +02:00
Robert Ferrús f8efecd7c4 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:47:02 +00:00
Robert Ferrús f8169b3034 feat: refs #7544 chages required
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-09 12:46:50 +02:00
Guillermo Bonet b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:04:02 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Guillermo Bonet bb7002b702 fix: refs #7126 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 12:00:55 +02:00
Guillermo Bonet f4e5f0205d fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:56:32 +02:00
Robert Ferrús 8f86ffbc38 fix: refs #6738
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-09 11:47:02 +02:00
Robert Ferrús d8f3a04553 fix: refs #6738 restore column grupotarifa
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-09 11:45:58 +02:00
Guillermo Bonet c3051ebcfb fix: refs #7126 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:43:15 +02:00
Guillermo Bonet 769ee33ab2 fix: refs #7126 Added addressWaste type
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 11:40:24 +02:00
Guillermo Bonet 5b9e6f0e59 Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2688
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 09:33:53 +00:00
Robert Ferrús 775ceabe77 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:20:45 +00:00
Guillermo Bonet 35ca968d88 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 11:03:37 +02:00
Guillermo Bonet 3e4bf55eed fix: refs #7490 Correction
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 11:03:17 +02:00
Alex Moreno 248000bdcd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-09 11:00:36 +02:00
Robert Ferrús 928dc977b0 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:00:05 +00:00
Guillermo Bonet 96d2bacb3d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:22:42 +02:00
Guillermo Bonet 376adebe9d feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:19:18 +02:00
Guillermo Bonet a725cd2840 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:19:04 +02:00
Guillermo Bonet 042ea84055 feat: refs #7681 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:14:55 +02:00
Guillermo Bonet 2078bf58ff feat: refs #7681 Optimization and refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 10:09:00 +02:00
Robert Ferrús 85a8009034 Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 08:02:59 +00:00
Robert Ferrús 4dcc8b02a5 feat: refs #7685 delivery coordinates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 10:01:32 +02:00
Guillermo Bonet 40461fb89e Merge pull request 'refactor: refs #7662 Added transaction' (!2702) from 7662-ticketSplitPackingType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2702
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 07:49:09 +00:00
Javier Segarra 725cbb5aa4 Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2677
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 07:46:50 +00:00
Guillermo Bonet 29f9fa0ce3 feat: refs #7505 Optimization
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:45:55 +02:00
Guillermo Bonet 86acc644fe feat: refs #7505 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:38:07 +02:00
Guillermo Bonet 7279feab12 feat: refs #7505 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 09:33:31 +02:00
Guillermo Bonet c9e9d95cff Merge branch 'dev' into 7505-item_calcVisible
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 09:06:27 +02:00
Guillermo Bonet 6430fb5b51 refactor: refs #7662 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 08:43:02 +02:00
Robert Ferrús 8469b2ac3f feat: refs #7683 productionControl
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-09 08:24:50 +02:00
Javier Segarra 4d52e32718 Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 06:24:27 +00:00
Robert Ferrús 9892b37ed0 Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 06:24:05 +00:00
Alex Moreno 213524edb5 deploy: dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-09 07:52:18 +02:00
Alex Moreno 1866c16727 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 14:33:12 +02:00
Alex Moreno 30d118f9df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 14:32:43 +02:00
Guillermo Bonet eaca342777 refactor: refs #7662 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 14:11:55 +02:00
Javier Segarra f009e8f8ad Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-08 12:11:53 +00:00
Guillermo Bonet 32793990ec refactor: refs #7662 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 14:01:18 +02:00
Guillermo Bonet 86859c98e3 refactor: refs #7662 Added transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 13:57:17 +02:00
Guillermo Bonet 73b43aa254 refactor: refs #7580 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 13:22:10 +02:00
Guillermo Bonet f57ab72482 refactor: refs #7580 Fix and improvement
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 13:17:29 +02:00
Javi Gallego 938037d67a Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:40:00 +02:00
Guillermo Bonet 4757ce11a3 refactor: refs #7567 Fix and improvement
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 12:35:29 +02:00
Guillermo Bonet f79b2378af Merge branch 'dev' into 7622-addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 10:05:35 +00:00
Guillermo Bonet eb60a1ed77 Merge branch 'dev' into 7378-productionLogConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:00:32 +00:00
Guillermo Bonet 098bda0f9c Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:59:32 +00:00
Robert Ferrús 0722a97c60 feat: refs #7582
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:28:33 +02:00
Robert Ferrús a796787cb5 feat: refs #7582
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:04:35 +02:00
Robert Ferrús 3fa0823d93 feat: refs #7582 quitar vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:01:35 +02:00
Guillermo Bonet 4b0a08d965 refactor: refs #7684 vehicle warehouseFk fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:57:46 +02:00
Pablo Natek 62045756e6 fix: refs #6403 extend length to 6 digits for mrw clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 10:50:15 +02:00
Guillermo Bonet b068327352 refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:49:39 +02:00
Guillermo Bonet 460723bd7a refactor: refs #6453 order_confirmWithUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:08:04 +02:00
Javier Segarra a9b4b3ee16 Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 08:03:35 +00:00
Javier Segarra 8355d544c3 Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:54:56 +02:00
Javier Segarra 9f4680325b feat(salix): refs #7380 #7380 rename extension file 2024-07-08 09:54:52 +02:00
Javier Segarra 9f57e50f89 feat(salix): refs #7380 #7380 add value to fixtures 2024-07-08 09:54:40 +02:00
Robert Ferrús e9d2ff1476 feat: refs #7582 claimDestination addColumn code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:43:59 +02:00
Guillermo Bonet e64f56cff1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:55:00 +02:00
Guillermo Bonet 5213fd4feb Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:54:42 +02:00
Guillermo Bonet 6eef7876d9 Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2689
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-08 05:52:51 +00:00
Guillermo Bonet 3a2acfb7f8 feat: refs #7640 Optimization
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 07:21:53 +02:00
Javier Segarra 3c2a44eb53 feat(salix): refs #7380 #7380 add value to fixtures 2024-07-07 23:47:00 +02:00
Javier Segarra 570b06bd18 Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-07 21:27:04 +00:00
Javier Segarra 2f10066290 feat(salix): refs #7380 #7380 remove new field
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-07 23:23:30 +02:00
Ivan Mas f07964be20 Merge pull request 'refs #7561 add fk en userFk' (!2690) from 7561-userFk-expeditionState into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2690
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-05 12:11:01 +00:00
Ivan Mas 3508cf3a9e refs #7561 add fk en userFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 14:01:09 +02:00
Guillermo Bonet fb07cdccc3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:51:09 +02:00
Guillermo Bonet 5712fbd782 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:50:43 +02:00
Guillermo Bonet 592738c7a0 refs #7024 & ticket 198125 Hotfix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:48:03 +02:00
Guillermo Bonet 55f0e90771 feat: refs #7640 Minor change
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-05 13:36:38 +02:00
Guillermo Bonet 3ddf49da0a feat: refs #7640 Fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 13:21:07 +02:00
Guillermo Bonet 8ac26c7281 refactor: refs #7640 Refactor multipleInventory
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 12:50:31 +02:00
Guillermo Bonet b9e986c962 feat: refs #7622 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:39:54 +02:00
Guillermo Bonet 1799b52f8b feat: refs #7622 Added type column addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:37:59 +02:00
Guillermo Bonet 481d57042f Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2667
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-05 10:26:25 +00:00
Robert Ferrús 3051e4ed25 Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 10:35:32 +02:00
Guillermo Bonet 182273d3b3 refs #7450 Modified msg throw
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 09:59:15 +02:00
Guillermo Bonet aa46d7a536 refs #6769 item_getBalance optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 09:46:09 +02:00
Robert Ferrús 923efadf6a fix: refs #6371 restore table Series 2024-07-05 09:00:40 +02:00
Guillermo Bonet 50c9ded103 refs #6769 Fix 2024-07-05 08:38:40 +02:00
Robert Ferrús 1e109a493d Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 05:40:14 +00:00
Guillermo Bonet 6f0196d656 refs #6769 Changes 2024-07-05 07:06:40 +02:00
Carlos Satorres f3dcc7dd99 Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-04 16:50:57 +02:00
Carlos Satorres cf621071d0 refs #5525 fixear sql, fixtures, js 2024-07-04 16:50:54 +02:00
Carlos Andrés d6f6df48f2 Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2676
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-04 11:30:11 +00:00
Guillermo Bonet cf7de14de6 refs #6769 Changes, with error no database selected 2024-07-04 11:34:55 +02:00
Robert Ferrús 9819744caf Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 07:34:31 +00:00
Guillermo Bonet c2d899cd6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:33:08 +02:00
Guillermo Bonet 108a62f738 refs #7486 Fix tests
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:32:56 +02:00
Robert Ferrús 58fab284f4 Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-04 07:29:35 +00:00
Guillermo Bonet 58ba6d0f4c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:26:49 +02:00
Guillermo Bonet 5a9850939e Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 09:26:00 +02:00
Guillermo Bonet 009dcd8fc7 refs #7486 Fix tests
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-07-04 09:23:57 +02:00
Guillermo Bonet a7895ab0a4 refs #6769 First commit 2024-07-04 09:17:22 +02:00
Robert Ferrús 897da1e48a feat: refs #7654
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-04 08:59:22 +02:00
Robert Ferrús 68871e6345 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn 2024-07-04 08:21:11 +02:00
Guillermo Bonet 5f7c7ae5dd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 07:44:11 +02:00
Guillermo Bonet af6422cf05 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-04 07:43:58 +02:00
Guillermo Bonet a7b653c42a refs #7486 Fix collection_new
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-07-04 07:34:41 +02:00
Javier Segarra 17e7dc8c7e feat(salix): refs #7380 #7380 new typeObservation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 23:02:47 +02:00
Javier Segarra d59cab13d8 feat(salix): refs #7380 #7380 client.substitutionAllowed new field 2024-07-03 23:02:28 +02:00
Carlos Andrés 989fa5ac5a feat: Avisar cuando no hay posibilidad de fichar refs #7669
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 18:10:02 +02:00
Carlos Andrés d65af6aaaa feat: Avisar cuando no hay posibilidad de fichar refs #7669
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 18:00:28 +02:00
Ivan Mas 4bef3e9107 refs #7531 Modify zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 17:09:10 +02:00
Carlos Andrés 097350adb6 Hotfix sale_getProblems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-03 17:07:25 +02:00
Carlos Andrés 1ec7cd9540 Hotfix sale_getProblems 2024-07-03 16:59:01 +02:00
Guillermo Bonet 0c27ac6e71 Merge branch 'dev' into 7382-triggerInvoiceInTax
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 12:24:47 +00:00
Guillermo Bonet 246b34571d feat: refs #7382 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 14:24:26 +02:00
Guillermo Bonet 2278b9a05a feat: refs #7382 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 14:20:43 +02:00
Robert Ferrús 4f9552379e feat: refs #7654 entry_splitByShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 13:46:19 +02:00
Guillermo Bonet a0d524b22b Merge pull request 'refactor: refs #7504 Rename id greuge' (!2669) from 7504-greugeId into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2669
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 11:17:18 +00:00
Guillermo Bonet 2c39c2a6ba Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2668
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 09:50:32 +00:00
Guillermo Bonet cf63d6e71c feat: refs #7378 Added productionConfigLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 11:17:33 +02:00
Jorge Penadés 12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2277
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-07-03 08:51:56 +00:00
Javi Gallego a8d663bee4 feat: refs #7348 hasDailyInvoice field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:49:51 +02:00
Guillermo Bonet aaca2d12c5 refactor: refs #7504 Rename id greuge
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:20:20 +02:00
Guillermo Bonet 77d86c9fd9 feat: refs #7664 Added created in calendar table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:55:14 +02:00
Guillermo Bonet d1ef1c80f8 feat: refs #7382 Added unique key
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:36:20 +02:00
Guillermo Bonet 2f8df96ba7 feat: refs #7564 Added ticket_setVolumeItemCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:29:12 +02:00
Javier Segarra d72a52d6b1 Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 07:29:00 +00:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jorge Penadés 1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:10:41 +00:00
Javier Segarra 3710c7c9c8 Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:55:01 +02:00
Javier Segarra beff905e02 perf(salix): refs #7648 #7648 remove change role for user 2 2024-07-03 08:54:58 +02:00
Robert Ferrús f1c9c71f4f Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:50:29 +00:00
Robert Ferrús 19c378d6bd feat: refs #7116 añadir comentario
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:48:24 +02:00
Sergio De la torre 7677ada925 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:46:10 +00:00
Javier Segarra 5c73a20f43 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:17:34 +00:00
Guillermo Bonet d1a38ec589 Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2656
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:22:48 +00:00
Guillermo Bonet 1afce8124f Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2658
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:21:19 +00:00
Guillermo Bonet 18b7fb48c7 Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2665
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:18:52 +00:00
Javier Segarra 0e4db6c3d3 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:29:01 +02:00
Javi Gallego 0d70cb8929 fix: informatica no necesita este correo
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 17:39:46 +02:00
Guillermo Bonet 0bb4439f85 refs #7443 Deleted ekt barcode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 14:37:22 +02:00
Sergio De la torre 61265a45e3 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-test Build queued... Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 11:25:46 +00:00
Robert Ferrús 872ab1a758 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 11:08:08 +00:00
Ivan Mas 99beb21927 Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 10:36:40 +00:00
Guillermo Bonet edff15662c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 12:34:51 +02:00
Guillermo Bonet 028278ebcf refs #6626 Hotfix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 11:52:25 +02:00
Javier Segarra 08612fc70c perf(salix): refs #7648 #7648 fixtures and firstScript
gitea/salix/pipeline/pr-dev Build started... Details
2024-07-02 10:07:23 +02:00
Guillermo Bonet 1e5fd8002c feat: refs #7564 Added proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 09:36:23 +02:00
Javier Segarra f41c2489d9 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 09:34:46 +02:00
Guillermo Bonet 2a203926b9 feat: refs #7564 Added volume column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 09:02:24 +02:00
Guillermo Bonet b6b3da0771 Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-02 08:06:54 +02:00
Guillermo Bonet a7c7c4c2f6 Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2655
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-02 05:35:52 +00:00
Javier Segarra f27bdec758 feat(salix): refs #7648 #7648 changes requested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 21:14:27 +02:00
Javier Segarra a0185dca04 feat(salix): refs #7648 #7648 new supplier role 2024-07-01 18:39:21 +02:00
Sergio De la torre 1ca22dab92 Merge branch 'dev' into 7575_setParking_regExp
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:36:18 +00:00
Ivan Mas da9ff6f22c Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:55:06 +00:00
Ivan Mas 29aecd62a5 refs #7651 add afterDelete trigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:51:32 +02:00
Javier Segarra 0035967b11 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:29:27 +00:00
Javier Segarra f47197cd80 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 14:06:28 +02:00
Guillermo Bonet cafa7bce44 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 13:40:31 +02:00
Guillermo Bonet a0ea742f9e fix: refs #7486 Hotfix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 13:38:25 +02:00
Ivan Mas 2ed31ee1d3 refs #7651 Add editorFk and triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 13:26:59 +02:00
Guillermo Bonet 9e5f416d55 refactor: refs #7418 Item type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:06:30 +02:00
Alex Moreno a26f6eaf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:32:21 +02:00
Sergio De la torre 22959db0ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:28:14 +02:00
Guillermo Bonet a23f485296 refactor: refs #7424 Component type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:11:16 +02:00
Guillermo Bonet 8409ffa950 fix: refs #7552 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-01 10:26:46 +02:00
Guillermo Bonet 2bf06d8add fix: refs #7552 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-01 10:06:34 +02:00
Sergio De la torre 3ad2346504 feat refactor setParking REGEXP refs #7575
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 09:25:00 +02:00
Robert Ferrús 00f3755de7 feat: refs #7116 agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 07:46:49 +02:00
Robert Ferrús b8af48dff4 Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 05:40:49 +00:00
Guillermo Bonet 57a879723e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 07:39:19 +02:00
Guillermo Bonet f73176375b Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2645
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-01 05:30:31 +00:00
Robert Ferrús d4fba0a95f Merge branch 'dev' into 7296-routesMonitorDropVirtualColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 11:49:08 +00:00
Guillermo Bonet df4e5deae6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-28 13:33:43 +02:00
Guillermo Bonet 08c9d43b17 refs #7486 Declare exit handler fix collection_assign error
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-28 13:30:08 +02:00
Robert Ferrús 8b617df13d feat: refs #7116 create table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 09:59:55 +02:00
Robert Ferrús 7b3d51dfca Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 07:54:10 +00:00
Robert Ferrús f1f57a388d feat: refs #7296 drop column expeditionTruckFk 2024-06-28 08:45:18 +02:00
Guillermo Bonet 9164901eac refs #7640 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 13:26:59 +02:00
Sergio De la torre 746fa82f2a feat expeditionPalletPrint refs #5210
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 13:20:52 +02:00
Carlos Andrés cbd46330b3 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 13:01:42 +02:00
Jorge Penadés 2b0df02f20 Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 08:34:53 +00:00
Guillermo Bonet e8dc6eafdc refs #7640 multiple inventory
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 10:18:43 +02:00
Jorge Penadés 1b7c7336af fix: refs #6238 delete unused SQL script
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 10:08:58 +02:00
Jorge Penadés 47a0cb6d4f fix: refs #6238 insert ignore
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 09:27:37 +02:00
Pablo Natek b6a72a1abb Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 07:12:40 +00:00
Robert Ferrús 0379142fb5 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 11:30:38 +00:00
Guillermo Bonet ad4dd088a3 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-26 11:58:43 +02:00
Guillermo Bonet 220f402f4e Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2640
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-26 09:53:25 +00:00
Carlos Satorres f9a09f3fec Merge branch 'dev' into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 08:00:58 +00:00
Guillermo Bonet c4af92e9ba horfix: ticket 197676
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 09:54:51 +02:00
Pablo Natek 478a38b0ab Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 05:14:37 +00:00
Pablo Natek b23ff33e60 Merge branch 'dev' into 6021-floranet240624
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 05:10:42 +00:00
Carlos Andrés 75486ae743 Hotfix ticketStateUpdate to ticket_setState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 19:47:22 +02:00
Carlos Andrés 5bcdc57978 Hotfix ticketStateUpdate to ticket_setState 2024-06-25 19:33:54 +02:00
Carlos Andrés 82118ae933 Hotfix ticketStateUpdate to ticket_setState 2024-06-25 19:30:59 +02:00
Jorge Penadés 93f2995d39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 16:26:13 +02:00
Sergio De la torre 75f8de9277 Merge branch 'dev' into 7168-itemShelvingLog_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 14:16:29 +00:00
Robert Ferrús c4eb7670fe Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 12:59:48 +00:00
Carlos Satorres ffff851d1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome 2024-06-25 14:49:32 +02:00
Guillermo Bonet b9278f3b3a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:02:16 +02:00
Guillermo Bonet 2e1ab3af20 refs #7486 Fix same assign collection
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:00:46 +02:00
Sergio De la torre e55af8d36f feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 13:41:10 +02:00
Sergio De la torre acf308fd16 feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 13:35:21 +02:00
Sergio De la torre c551e229fb feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 13:30:46 +02:00
Carlos Andrés ff1918ef06 Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-25 11:21:02 +00:00
Alex Moreno dbab56a566 Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 11:15:02 +00:00
Alex Moreno 85854e0713 warmFix: use vn
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 13:14:44 +02:00
Pako Natek 4bf00bd428 version 240625
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:51:14 +02:00
Carlos Satorres f811e7e96c Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 10:39:38 +00:00
Carlos Satorres f5bc0482d2 refs #7409 resolve conflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:36:28 +02:00
Carlos Satorres 95e1bba58b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome 2024-06-25 12:36:12 +02:00
Carlos Satorres 248358fbd7 refs #7409 fix pr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:35:25 +02:00
Carlos Satorres 655bbe4967 refs #7406 fix pr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:29:17 +02:00
Alex Moreno 45e8674087 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 11:34:35 +02:00
Alex Moreno 6150f64e88 build: db dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 09:29:42 +02:00
Alex Moreno cf0f80142f hotFix: create view vn.expeditionTruck
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 09:24:34 +02:00
Robert Ferrús 205d79f0a6 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 06:13:16 +00:00
Alex Moreno 0284f3b1ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 07:30:20 +02:00
Alex Moreno f2ee1df8ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-25 07:29:56 +02:00
Carlos Andrés cf79711f6a feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 13:30:03 +02:00
Pako Natek c32a87126c Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:50:31 +00:00
Pako Natek 5f329fde38 or replace
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-24 10:32:51 +02:00
Pako Natek f999010c6c tested proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:32:12 +02:00
Pako Natek 8c5f468087 tested proc 2024-06-24 10:30:25 +02:00
Robert Ferrús a170edcdef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable 2024-06-24 08:09:52 +02:00
Pablo Natek ea0b0dc779 fix: business overlapping
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 08:08:39 +02:00
Robert Ferrús 9022f62116 feat: refs #5855 changes required
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-24 08:03:43 +02:00
Sergio De la torre 6a4b44733f Merge branch 'dev' into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 05:15:32 +00:00
Sergio De la torre 429149d4e0 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 05:05:27 +00:00
Alex Moreno 1dd0357a34 Merge pull request 'test to dev' (!2629) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2629
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-21 12:33:58 +00:00
Alex Moreno 7f278269a5 feat(AccessToken&ACL): refs #7547 upgrade security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 14:28:55 +02:00
Guillermo Bonet aedc8071e1 feat: refs #7562 Changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 14:27:22 +02:00
Guillermo Bonet c0668d054f feat: refs #7562 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 13:51:33 +02:00
Jorge Penadés 5ef0dffa3e fix: refs #6238 add scheme
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-21 13:38:00 +02:00
Guillermo Bonet c330e8c715 feat: refs #7562 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 13:24:20 +02:00
Guillermo Bonet d61e32917a feat: refs #7562 Created deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 13:22:59 +02:00
Jorge Penadés 24cf23dddc feat: refs #62add travelKgPercentage table and model
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-21 13:16:01 +02:00
Sergio De la torre 4131653700 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 13:02:36 +02:00
Sergio De la torre 3fa7eb1d2a feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 13:01:19 +02:00
Sergio De la torre ccc0dc2ee3 Merge branch 'dev' into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:16:15 +00:00
Carlos Satorres 424e0c430c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:50:29 +02:00
Carlos Satorres cf4a7c8fba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:11:40 +02:00
Pako Natek 9694c80c09 Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:00:16 +00:00
Carlos Satorres a80b0c3b4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:36:50 +02:00
Alex Moreno 42b483e27e feat: refs #7555 remove account.password__
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:35:35 +02:00
Pako Natek 7347c50f8e Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 06:33:15 +00:00
Pako Natek fe154b9ee8 sref
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:32:22 +02:00
Sergio De la torre da40b705c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:20:00 +02:00
Guillermo Bonet 6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2394
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:05:20 +00:00
Guillermo Bonet a899ecaab7 Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2561
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:04:32 +00:00
Carlos Andrés f7b8bd2df6 Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 18:18:05 +02:00
Carlos Andrés ed49c98c1c fnpmeat: previas con sitema de reservas refs #6861 2024-06-20 18:18:03 +02:00
Carlos Andrés 68f48de6f0 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 17:14:38 +02:00
Sergio De la torre 9b0913e439 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 14:36:25 +00:00
Carlos Andrés b5cd57e660 Merge pull request 'test' (!2621) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2621
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:47:11 +00:00
Carlos Andrés 691413a854 Merge pull request 'master' (!2620) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2620
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:44:37 +00:00
Carlos Andrés 11675c2e35 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2618
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-20 13:34:55 +00:00
Carlos Andrés 414bf9eb03 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:48:32 +02:00
Carlos Andrés e0d105313d feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:27:11 +02:00
Sergio De la torre 182cd3fa8e feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-20 11:34:51 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:34 +02:00
Sergio De la torre c1c01df3c3 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-20 09:37:22 +02:00
Sergio De la torre c87f060d51 feat boxPicking refs #7357 2024-06-20 09:21:27 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-20 05:50:14 +00:00
Javi Gallego 1a8df4d87c feat: refs #7216 triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 13:41:37 +02:00
Jorge Penadés 6967aa9811 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-19 13:40:09 +02:00
Pako Natek b117352e1a Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-19 10:31:36 +00:00
Robert Ferrús c4d297f766 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 09:50:27 +00:00
Guillermo Bonet 738dcc7060 Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2582
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-19 09:31:18 +00:00
Robert Ferrús 0128dfd967 feat: refs #5855 changes required 2024-06-19 11:30:50 +02:00
Pablo Natek 47eb6dd8fe Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 08:46:42 +00:00
Pako Natek 49e01218e9 Warehouse name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 10:45:37 +02:00
Robert Ferrús 1e3376f908 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 08:05:01 +00:00
Robert Ferrús a42562b0ca fear: refs #5855 claim_ratio_routine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 10:01:32 +02:00
Pako Natek 1fa0a841da TP previous
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 07:26:30 +02:00
Pako Natek bf62f40c87 actualizada la rama 2024-06-19 07:17:25 +02:00
Pako Natek 841f8e9cac Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 18:38:48 +00:00
Sergio De la torre ae01fb6440 hotFix delete unique refs #6281
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-18 17:00:15 +02:00
Sergio De la torre 5694d9a9fe Merge branch 'test' into 6964-hasItemOlder
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-18 14:20:57 +00:00
Carlos Satorres 774d55d4ae refs #7407 fix acls fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 13:28:21 +02:00
Jorge Penadés 6cf7c58671 fix: refs #6238 use scheme
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 12:59:55 +02:00
Ivan Mas 49943e4f25 Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 10:09:04 +00:00
Pako Natek 66ed958c72 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:07:24 +00:00
Guillermo Bonet a61c12a06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-18 11:04:01 +02:00
Guillermo Bonet b7fadddbb1 Merge branch 'master' into dev 2024-06-18 11:03:56 +02:00
Guillermo Bonet 4d5f3e43ed Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:49 +02:00
Guillermo Bonet 2b1de271a9 refs #7552 Added force vShowType true
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:30 +02:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-06-18 10:08:40 +02:00
Jorge Penadés 87feddaedb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:55:22 +02:00
Carlos Satorres 52a34c8f2d refs #7409 fix acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:18:09 +02:00
Guillermo Bonet 4880d1497f feat: refs #6727 Added util logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 08:40:33 +02:00
Pako Natek 3711f26b5f Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 06:24:59 +00:00
Pako Natek 9fc027a3c6 tickets deleted excluded
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:24:06 +02:00
Sergio De la torre eedcdb54fa feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:50:51 +02:00
Sergio De la torre dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:12:00 +02:00
Ivan Mas 671290b9a0 refs #7313 delete vn.itemPackaging.workerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 16:45:51 +02:00
Carlos Satorres 3e25fff90f refs #7409 acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 15:50:58 +02:00
Guillermo Bonet a84badff87 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-17 14:52:55 +02:00
Guillermo Bonet 9b3f67ff62 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 14:52:40 +02:00
Guillermo Bonet ce709798b4 hotfix: refs #7486 collection_new debug error
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 14:51:04 +02:00
Carlos Satorres fa8c1b3879 acls, fixtures, models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 13:50:07 +02:00
Guillermo Bonet 664f4299b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:42:51 +02:00
Guillermo Bonet 9df3e914bd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:42:33 +02:00
Guillermo Bonet 131b44305d hotfix: refs #7552 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:38:40 +02:00
Guillermo Bonet b4377e36e2 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 11:45:19 +02:00
Guillermo Bonet e7eaecdf6f Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 11:45:00 +02:00
Guillermo Bonet 4c345ffa93 hotfix: refs #7552 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-17 10:57:23 +02:00
Guillermo Bonet 43df0ef55d Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 07:42:33 +00:00
Guillermo Bonet 1d0b89ed52 refs #7519 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 09:42:16 +02:00
Pablo Natek c3d64b2358 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-17 08:49:26 +02:00
Pablo Natek a30ff44837 fix: refs #6404 fix notification
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-14 17:40:08 +02:00
Carlos Andrés 51078c804b Ticket #194195 Recupero vn.item_getAtp
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 16:32:13 +02:00
Carlos Andrés 5473f7a308 Hotfix Ticket #194195 Error radar negativos
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 16:01:27 +02:00
Robert Ferrús df6de7e74c fix: refs #194195 item_getAtp
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 14:55:03 +02:00
Jorge Penadés 202884fdce feat: refs #6238 add travelKgPercentage table and model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 14:25:15 +02:00
Robert Ferrús 8dea9598e8 fix: refs #194195 item_getAtp
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 13:54:43 +02:00
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:48:00 +02:00
Guillermo Bonet 6c2fd2580d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:47:51 +02:00
Guillermo Bonet 798bf6d028 hotfix: refs #6281 itemShelving_add buy is required
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:41:46 +02:00
Carlos Satorres e3e9706fb8 fix fixtures
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-14 09:53:50 +02:00
Carlos Satorres 189c67bd2d warmFix change if
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-14 09:43:10 +02:00
Robert Ferrús 828908a522 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 06:07:39 +00:00
Robert Ferrús 831b2c39f6 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 06:06:54 +00:00
Ivan Mas 615fd3e97b refs #7530 delete trigger deviceProductionConfig_afterUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 15:10:04 +02:00
Sergio De la torre c2e4e187d6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 14:21:59 +02:00
Jorge Penadés 784bd91e04 fix: refs #6286 update WorkerTimeControl permissions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 13:43:28 +02:00
Guillermo Bonet cfc5e32715 feat: refs #6701 Fix error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 13:11:50 +02:00
Guillermo Bonet cb056ff789 Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 11:14:00 +02:00
Sergio De la torre 5340729ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 11:07:57 +02:00
Guillermo Bonet 53c732bcb9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-13 07:12:10 +02:00
Guillermo Bonet d7317e4067 hotfix: refs #7024 Modify booked entries
gitea/salix/pipeline/head This commit looks good Details
2024-06-13 07:09:48 +02:00
Carlos Andrés 30caf79490 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 16:12:06 +02:00
Guillermo Bonet d0b926b2c5 feat: refs #7490 Changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 14:26:26 +02:00
Alex Moreno 671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 10:21:36 +00:00
Javi Gallego 446e180cf0 hotfix claim
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 11:58:07 +02:00
Guillermo Bonet dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 11:48:01 +02:00
Alex Moreno 60d4372996 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 07:51:01 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 07:47:56 +02:00
Guillermo Bonet 17fa1e10f6 feat: refs #6701 Added claimRatio_afterInsert
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 07:33:10 +02:00
Carlos Andrés b9d1c3228b feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 18:43:26 +02:00
Jorge Penadés ee32bc1008 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 14:40:29 +02:00
Guillermo Bonet aa0e06cfec refactor: refs #7505 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 14:00:59 +02:00
Guillermo Bonet 3bd596e5fd refactor: refs #7505 Added description
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:53:41 +02:00
Guillermo Bonet 4f10a93584 refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:36:46 +02:00
Alex Moreno 3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:56:56 +02:00
Guillermo Bonet a9aad7406a refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:51:36 +02:00
Carlos Andrés d75e008a23 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:49:33 +02:00
Carlos Andrés ed7218c133 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:44:25 +02:00
Guillermo Bonet 9f9063567a refactor: refs #7505 item_getVisible refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:40:07 +02:00
Jorge Penadés 1cefe817f5 feat: add editZone ACL for buyer
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 12:06:44 +02:00
Guillermo Bonet 76f76b8304 feat: refs #7568 Added freelancer exception
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:48:24 +02:00
Jorge Penadés 902a9ee51b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 10:43:33 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Alex Moreno 2dec51804c build: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 08:38:26 +02:00
Guillermo Bonet bd13ecd464 refactor: refs #7486 engine memory and primary key sales_merge
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 07:59:53 +02:00
Sergio De la torre 62f4561279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 07:34:42 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:36:34 +02:00
Alex Moreno c241189508 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 14:22:12 +02:00
Guillermo Bonet 75a529830c Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-10 11:33:10 +00:00
Guillermo Bonet 9d82f0ff7c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:48:53 +02:00
Guillermo Bonet 37fa92aca8 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:48:38 +02:00
Guillermo Bonet 272a34c5f9 refactor: refs #7486 Added userFk debug
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 12:46:26 +02:00
Pablo Natek 65fae086aa Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-10 12:29:42 +02:00
Pablo Natek c5227d6cf6 feat: refs #6404 add mail notification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-10 12:24:23 +02:00
Guillermo Bonet 7579e15fcc refactor: refs #7486 Optimized procs
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-10 11:55:40 +02:00
Guillermo Bonet b4820858c9 hotfix: ticket 192672 ticketPreviousPreparingList
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 11:32:44 +02:00
Carlos Satorres 1a01b3e587 refs #7529 back models acls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-10 10:42:52 +02:00
Javi Gallego b4046de190 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 08:17:17 +00:00
Guillermo Bonet ca7d67451b refactor: refs #7517 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 09:09:11 +02:00
Guillermo Bonet 2e8d28d795 refactor: refs #7517 Added throw
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 09:08:26 +02:00
Guillermo Bonet 317f898c2e refactor: refs #7490 Minor changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-10 08:48:56 +02:00
Guillermo Bonet a4f8c0df80 Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 08:47:03 +02:00
Guillermo Bonet fb4be69cf1 refactor: refs #7490 Added final update 2024-06-10 08:47:02 +02:00
Guillermo Bonet e043badc19 Merge branch 'dev' into 7490-duaInvoiceInBooking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 06:39:15 +00:00
Guillermo Bonet 9b21cd5eb1 refactor: refs #7490 Deleted update duaInvoiceInBooking
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-10 08:38:58 +02:00
Sergio De la torre 4cf5c0775c feat isScannedExpedition refs #7276
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 07:30:33 +02:00
Sergio De la torre cac1278c08 feat hsItemOlder refs $6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 16:29:51 +02:00
Carlos Andrés 1497146940 Merge branch 'master' into Hotfix-midnight-determinist
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-07 16:17:11 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:44:24 +00:00
Jorge Penadés 521f3f1446 feat: refs #6243 update ACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:52:24 +02:00
Jorge Penadés 96a3a2e69b fix: refs #6243 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 11:50:16 +02:00
Jorge Penadés faf450e075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:45:51 +02:00
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:03:24 +00:00
Jorge Penadés 44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-07 07:19:31 +00:00
Sergio De la torre 7c0fa6dbb9 feat isScannedExpedition refs #7276
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:18:52 +02:00
Jorge Penadés 99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-07 07:11:07 +00:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:04 +02:00
Guillermo Bonet 70eddb6ce2 refactor: refs #7419 Added index ticketLog
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:18:07 +02:00
Robert Ferrús f7c2fd824f feat: refs #7496 changesRequested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 07:05:22 +02:00
Jorge Penadés 5a6e2a2b31 fix: refs #6942 create invoiceIn acl
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-06 15:45:39 +02:00
Robert Ferrús 1ca7b75ce3 Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 12:33:35 +00:00
Robert Ferrús d8e6a94797 Merge branch 'dev' into 7544-claimChangeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 12:31:08 +00:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Ivan Mas a8f5993c21 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 10:12:45 +00:00
Robert Ferrús ef50d493f1 feat: refs #7544
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 11:54:39 +02:00
Javi Gallego e77bc87a2a Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2546
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-06 09:48:29 +00:00
Robert Ferrús 1c6e881273 feat: refs #7544 crear evento claim_changeState
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-06 11:45:09 +02:00
Robert Ferrús 7f23c81756 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:28:40 +02:00
Carlos Andrés b78ef97813 Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:50:16 +02:00
Carlos Andrés 638a5e9a1e Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:44:11 +02:00
Ivan Mas 8458651ce0 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 12:57:47 +00:00
Ivan Mas 71ea1d1467 refs #7536 modify itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 14:53:59 +02:00
Guillermo Bonet feda14a21b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:23:09 +02:00
Guillermo Bonet c2fecde1b8 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:22:59 +02:00
Robert Ferrús 40d40bd0bb fix: refs #7335 hotFix cmrTicket
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 13:42:21 +02:00
Javi Gallego 1fa22e71a9 feat: refs #7203 nombre variables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 12:42:55 +02:00
Guillermo Bonet e4e7ae1699 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:16:15 +02:00
Guillermo Bonet ceda2718d5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:15:56 +02:00
Guillermo Bonet 82954ed299 hotfix: ticket #176792
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:13:40 +02:00
Carlos Andrés 8b584a08dc Hotfix: midnight deterministic refs #7213
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 10:11:04 +02:00
Carlos Andrés f2b443021f hotfix: midnight deterministis refs #7213 2024-06-05 10:03:37 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Robert Ferrús fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 06:48:20 +00:00
Guillermo Bonet 3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 06:17:10 +00:00
Javi Gallego 130d2b6b47 feat: refs #7203 remove numbres alertLevel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 08:05:46 +02:00
Juan Ferrer feaf5f8f5a Merge pull request 'test' (!2545) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2545
2024-06-04 21:05:47 +00:00
Juan Ferrer f903d7cd2a Merge pull request 'master' (!2538) from master into test
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2538
2024-06-04 21:05:27 +00:00
Carlos Andrés 35b4255505 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 16:45:42 +02:00
Carlos Andrés e4969f7061 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-04 16:43:09 +02:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +02:00
Carlos Andrés a9eb5f7d1e hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:45:54 +02:00
Carlos Andrés c57f4db623 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:41:53 +02:00
Carlos Andrés 1927fbce45 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:39:02 +02:00
Javi Gallego 8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 14:24:55 +02:00
Javi Gallego 4089c7deb3 feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-04 12:23:28 +02:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Javi Gallego 4230d46fe5 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 09:47:58 +02:00
Robert Ferrús 3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 06:57:29 +00:00
Sergio De la torre 94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 07:17:37 +02:00
Carlos Andrés 9a7074d600 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-03 20:16:27 +02:00
Juan Ferrer 1ec55c8850 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 17:38:39 +02:00
Jorge Penadés 58053d8286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 15:22:08 +02:00
Guillermo Bonet 4abede62ab Merge branch '6701-clientRate' of https://gitea.verdnatura.es/verdnatura/salix into 6701-clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 12:16:34 +02:00
Guillermo Bonet d3584691fa refactor: refs #6701 Minor change 2024-06-03 12:16:33 +02:00
Guillermo Bonet 5ab8e79dde Merge branch 'dev' into 6701-clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:11:56 +00:00
Guillermo Bonet 85d68890b8 refactor: refs #6701 New table clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 12:11:26 +02:00
Guillermo Bonet b8e95c0284 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 11:46:52 +02:00
Guillermo Bonet 8cef8eace7 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 11:41:09 +02:00
Guillermo Bonet fd237b6d35 Merge branch 'dev' into 6701-claimRatioRoutine 2024-06-03 11:40:50 +02:00
Guillermo Bonet 4703ebbdf3 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 11:38:09 +02:00
Carlos Satorres 7a92963886 fix acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:21:25 +02:00
Jorge Penadés ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:13:59 +02:00
Jorge Penadés 72630d613b fix: refs #6600 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:32:03 +02:00
Jorge Penadés 790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:25:48 +02:00
Jorge Penadés 084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:34:10 +02:00
Robert Ferrús ecd34e080d feat: refs #7039 deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 07:59:57 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Guillermo Bonet b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 05:22:15 +00:00
Jorge Penadés dc8696b422 feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 16:31:36 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés ee09617b27 fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 13:05:12 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Jorge Penadés ab9c11ef84 fix: refs #6889 modify fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:56:22 +02:00
Jorge Penadés 4772509b67 fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 12:51:06 +02:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Guillermo Bonet d27bbd9a8f hotfix: ticket 189567
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:28:47 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Jorge Penadés 38bea60776 refactor: refs #6889 script sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 09:49:58 +02:00
Jorge Penadés eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 08:37:28 +02:00
Robert Ferrús fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 05:09:16 +00:00
Pablo Natek 81e1179ce0 Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-fixrefernce
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-30 19:13:27 +02:00
Pablo Natek d901584c3f feat: refs #6404 add deadline field
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-30 18:39:06 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 11:47:12 +02:00
Robert Ferrús 467383d7f4 feat: refs #6477 productionConfig add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:32:17 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:04:34 +02:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Jorge Penadés 4fa2a4d58c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 08:45:01 +02:00
Guillermo Bonet d461b78c7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:19:03 +02:00
Guillermo Bonet 255a2c5283 fix: refs #7258 Proc bs.claim_ratio_routine
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 07:18:30 +02:00
Jorge Penadés d866ec6417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:59:19 +02:00
Jorge Penadés a32db7840e feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:54:24 +02:00
Pako Natek a2029f7934 Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 09:39:31 +00:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 09:16:25 +02:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 07:00:17 +00:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Guillermo Bonet f770bce54c fix: refs #7486 Deleted get_lock collection_assign
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 07:55:33 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Carlos Andrés a022ed0854 Hotfix payments ticket 188787
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 14:50:58 +02:00
Carlos Andrés dc3c92eef1 Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2519
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-28 11:34:04 +00:00
Jorge Penadés 44e71b303c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:14:31 +02:00
Carlos Andrés cf84aa7256 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 13:01:27 +02:00
Carlos Andrés 6e5b41a886 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:30:17 +02:00
Pablo Natek 49a243a6fd Merge branch 'master' into 6404-add-default-weight-and-height
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:24:05 +00:00
Alex Moreno 08856a9132 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-28 12:11:51 +02:00
Alex Moreno 8ec2a10cbf deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:05:09 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:08:15 +02:00
Carlos Satorres eb2dd5ba5b refs #7406 acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 16:17:44 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:36:18 +02:00
Carlos Satorres 578b8a2c71 refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:28:13 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-27 12:05:49 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Guillermo Bonet 55fd94a12a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:51:16 +02:00
Guillermo Bonet 086c2291d1 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:50:59 +02:00
Guillermo Bonet 2498849ed0 hotfix: refs #7486 Added tmp debug insert
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:43:55 +02:00
Jorge Penadés 1b4b8668be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:34:53 +02:00
Jorge Penadés 1af24e8473 fix : refs #6942 remove grafana update priv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:34:00 +02:00
Jorge Penadés 1671423d23 fix: refs #6942 add deleteById acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:53:25 +02:00
Jorge Penadés c136f2783a refactor: refs #6942 toUnbook & drop buyer acls 2024-05-27 12:34:27 +02:00
Ivan Mas 6222d2657b Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 10:33:02 +00:00
Sergio De la torre 32aafc3545 feat: refs #6861 trigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:21:22 +02:00
Robert Ferrús 7559875aff feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:08:14 +02:00
Jorge Penadés 0fa6074278 fix: refs #6942 drop quotes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:03:07 +02:00
Sergio De la torre e133dec514 refs #6861 feat: trigger
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-27 11:55:42 +02:00
Robert Ferrús 0b648d09af feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 11:45:22 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:04 +02:00
Jorge Penadés dc90ad6595 fix: refs #6942 acls & back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 10:48:32 +02:00
Robert Ferrús 941438efd0 Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 09:41:30 +02:00
Robert Ferrús aaea0c95f7 feat: refs #7296 roadmapStopFk 2024-05-27 09:41:28 +02:00
Robert Ferrús cf5d520692 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:09:34 +00:00
Robert Ferrús eb503238d7 feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-27 09:07:23 +02:00
Jorge Penadés f209718383 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 09:03:34 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:46:21 +02:00
Sergio De la torre d770cd8d48 refs #6861 feat: getLock
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:33:33 +02:00
Robert Ferrús 846ba9ef66 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:30:33 +00:00
Pako Natek 4550d3719c Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:17:27 +00:00
Robert Ferrús b02995918e Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 05:04:40 +00:00
Carlos Satorres 723327918b refs #7406 worker formation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 15:55:23 +02:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Pako Natek ab3b58ec3c modificacion recipe y element
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 13:41:02 +02:00
Pako Natek 49a2e6fc84 tickets y email
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 11:44:58 +02:00
Guillermo Bonet 2c87730dba Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2505
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-24 09:30:54 +00:00
Ivan Mas 4d79dabb69 Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 08:23:05 +00:00
Ivan Mas 7e22e19e62 refs #7217 Reduce error message
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 10:21:35 +02:00
Jorge Penadés c76fd15f07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 08:46:16 +02:00
Pako Natek 257de96743 Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta 2024-05-24 07:44:12 +02:00
Pako Natek 0a1e09be41 Merge branch 'dev' into 6021-add-observations-to-json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 05:31:10 +00:00
Guillermo Bonet 2fe279ed47 feat: refs #7438 Requested changes and little changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 07:20:27 +02:00
Pablo Natek ee17ea4842 feat: refs #6021 add new field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 21:38:02 +02:00
Jorge Penadés cddc034adf fix: refs #6942 revoke update isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 17:53:08 +02:00
Sergio De la torre ea4f70f460 refs #6861 feat: previas a reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 16:35:36 +02:00
Jorge Penadés 798b4f9df0 fix: refs #6942 toBook/toUnbook 2024-05-23 16:12:21 +02:00
Jorge Penadés 3e2abfea2c fix: refs #6942 merge
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 16:08:48 +02:00
Jorge Penadés 2cd3002d06 Merge pull request 'test' (!2506) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2506
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-23 14:07:21 +00:00
Carlos Andrés 14f243f251 Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2495
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-23 14:03:22 +00:00
Carlos Satorres 33ba999725 Merge pull request 'refs #6111 routeList sql' (!2257) from 6111-routeList into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-23 12:47:56 +00:00
Guillermo Bonet 35ce259e5a feat: refs #7438 Added volume to item_valuateInventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 14:26:11 +02:00
Jorge Penadés 4219b22553 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 14:13:17 +02:00
Carlos Andrés 35a583d6d8 Merge pull request 'test' (!2504) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2504
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-23 11:42:23 +00:00
Guillermo Bonet bbd948c654 refs #7440 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 09:47:14 +02:00
Guillermo Bonet 56aec1c781 refs #7440 Optimized item_comparative 2024-05-23 09:44:18 +02:00
Carlos Satorres 1fa5a22bb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 09:17:19 +02:00
Jorge Penadés a55a6baf6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 08:58:36 +02:00
Robert Ferrús 974e327077 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 06:29:16 +00:00
Sergio De la torre d1affb1191 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder 2024-05-23 07:49:11 +02:00
Carlos Andrés 22a6c3695c feat:concurrency issue refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 18:05:16 +02:00
Carlos Andrés 774e92e639 hotfix: Eliminar restricciones ticketRefund Ticket #187137
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-22 16:43:45 +02:00
Carlos Satorres 4c5f46eb9b Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 13:55:53 +00:00
Carlos Satorres 4dee90ff57 refs #6820 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 14:56:46 +02:00
Carlos Andrés bc6af32962 fix: problems in colums ticket and sale refs #7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-22 14:50:45 +02:00
Sergio De la torre 49fed4e51e refs #6964 feat: hasItemOlder 2024-05-22 12:23:33 +02:00
Jorge Penadés 60fa55566c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 09:13:58 +02:00
Guillermo Bonet a52b9b6d2e Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2494
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-22 06:31:06 +00:00
Guillermo Bonet 0d620c6f33 feat: refs #7398 Change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 08:11:27 +02:00
Jorge Penadés 365e5a3ba3 fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 17:31:29 +02:00
Guillermo Bonet 2ffdce3c64 refactor: refs #7398 Refactor and change ekt_scan
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 14:40:42 +02:00
Robert Ferrús b12fdef703 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 11:38:59 +00:00
Pako Natek ba478d5358 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 11:31:41 +00:00
Pako Natek dfde2f6846 evita facturacion proveedores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 13:28:05 +02:00
Guillermo Bonet 35e892a90c refs #7422 Fix
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 10:07:51 +02:00
Robert Ferrús 0ef93bd98a Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 08:00:50 +00:00
Robert Ferrús 7065cf0b38 feat: refs #6281 change fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 09:58:03 +02:00
Alex Moreno f803f5a57d Merge branch 'dev' into 7431_itemPlacements
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 07:49:00 +00:00
Guillermo Bonet 6f9826421d refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 09:39:09 +02:00
Sergio De la torre 6dad3d8af4 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 09:37:29 +02:00
Sergio De la torre cb866b4ab7 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 09:16:47 +02:00
Jorge Penadés c914199415 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 09:03:48 +02:00
Guillermo Bonet c4b8cef4f8 refactor: refs #7422 Deleted column of Compres
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:17:37 +02:00
Guillermo Bonet 030106f06d refactor: refs #7422 Deprecated column
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:13:06 +02:00
Guillermo Bonet b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2471
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-21 06:11:24 +00:00
Guillermo Bonet ac2ed0956b refs #7422 Fixed all problems
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:04:28 +02:00
Guillermo Bonet 81c220d130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:58:53 +02:00
Guillermo Bonet cbf9a4c4e9 refs #7422 Fixed all problems 2024-05-21 07:58:51 +02:00
Pako Natek f947b44da1 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:51:15 +00:00
Guillermo Bonet 93314d67b6 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:31:24 +02:00
Guillermo Bonet cc2b5764e9 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:26:54 +02:00
Guillermo Bonet 82d985ff3a refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:19:04 +02:00
Guillermo Bonet 8563116091 Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2478
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-21 05:06:12 +00:00
Carlos Satorres 119102b0b3 refs #6820 acl
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 16:00:38 +02:00
Jorge Penadés 50dbc5c515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 15:36:09 +02:00
Pablo Natek 38b1e48959 Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2485
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-20 12:27:48 +00:00
Robert Ferrús 623aa8d537 Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:38:11 +00:00
Pablo Natek b203d94b27 feat: refs #6021 add new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 11:37:40 +02:00
Pako Natek abdacb3627 casting values
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:33:01 +02:00
Guillermo Bonet 7f0f1b9547 refactor: refs #7422 Deleted tables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 09:54:30 +02:00
Sergio De la torre 598a7eefbc 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:39:23 +02:00
Sergio De la torre 2b2406ae52 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:32:12 +02:00
Sergio De la torre 20bf2b73b6 6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:27:20 +02:00
Sergio De la torre dd76168bc3 6281 feat:buyFk in itemShekving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:15:24 +02:00
Sergio De la torre b71984c53f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 09:13:44 +02:00
Jorge Penadés 480daea26f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:54:17 +02:00
Pako Natek 9a5acedd38 improved proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:21:54 +02:00
Sergio De la torre df08f7a8de Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 15:10:26 +00:00
Sergio De la torre c822a64dc7 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 16:38:11 +02:00
Ivan Mas 8b6844b9f0 Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:13:38 +00:00
Jorge Penadés f36f5fa5df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:39:35 +02:00
Pablo Natek 4790ae94d1 Merge branch 'dev' into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:33:57 +00:00
Carlos Andrés 6a576e69e1 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:50:51 +02:00
Carlos Andrés c8db0a3aa8 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-17 12:48:16 +02:00
Guillermo Bonet 0b5f05cbed refactor: refs #7375 Refactor clientsDisable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:36:54 +02:00
Sergio De la torre 135526e513 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:20:26 +02:00
Guillermo Bonet 1154e484e5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 09:57:35 +02:00
Ivan Mas 68425bd41f Merge branch 'dev' into 7217-Unify_errorMessageAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 07:55:27 +00:00
Ivan Mas db28bf335e refs #7217 Modify error message
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 09:53:17 +02:00
Guillermo Bonet a99554c773 fix: Occasionally saleVolume bad index
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 09:50:53 +02:00
Ivan Mas 4bf36f2655 refs #7217 Modify proc name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 08:16:50 +02:00
Guillermo Bonet bddc9a8386 Deleted insert into util.debug (deletedState)
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 07:51:51 +02:00
Sergio De la torre 27110c2abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 06:27:09 +02:00
Carlos Andrés 08ea0d2693 Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 18:13:39 +00:00
Carlos Andrés dab90633db Merge pull request 'test' (!2466) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2466
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 17:21:54 +00:00
Carlos Andrés 8d8cfa24de refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 19:16:25 +02:00
Carlos Andrés 38c505fb7a refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 19:07:48 +02:00
Carlos Andrés 01d1a2391d refs #7400 feat: book ledger with counters 2024-05-16 18:48:59 +02:00
Ivan Mas b2db076c2f refs #7217 create travel_throwAWBError
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 15:34:45 +02:00
Carlos Andrés 2f4f199fad fix: invoiceInTax_getFromEntries (referenceRate)
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-16 14:40:02 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Ivan Mas 10d812ae3d Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 11:34:18 +00:00
Ivan Mas 993dd0d8bd refs #6965 Modify firstEditorFk NULL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 13:15:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Guillermo Bonet 115d1aaf85 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-05-16 08:10:53 +02:00
Sergio De la torre 75bb08a0c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 07:08:47 +02:00
Sergio De la torre 9b73cdfa6f refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 17:03:33 +02:00
Guillermo Bonet 7e3861a02f Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
2024-05-15 14:32:48 +02:00
Guillermo Bonet 049e8931ab hotfix: Tmp fix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 14:30:04 +02:00
Guillermo Bonet 9134e0ff65 feat: refs #7264 Minor change 2024-05-15 14:05:35 +02:00
Guillermo Bonet 53fa78894c feat: refs #7264 Refactor proc itemShelvingRadar and added columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:54:22 +02:00
Ivan Mas c15f9b13f2 Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:17:11 +00:00
Ivan Mas 9ed90412de refs #6965 Points to user instead of worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:15:27 +02:00
Sergio De la torre 9288f08b91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:30:05 +02:00
Robert Ferrús 1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 08:22:00 +00:00
Guillermo Bonet 778f368300 Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2429
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-15 08:19:34 +00:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Carlos Andrés df15e44442 Merge pull request '6974-sale_add' (!2452) from 6974-sale_add into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details
Reviewed-on: #2452
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-14 15:06:35 +00:00
Carlos Andrés adaba6ecfb refs #6974 refactor: optimize sale_add
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 15:39:28 +02:00
Carlos Andrés d0d710f023 refs #6974 refactorLoop 2024-05-14 15:36:09 +02:00
Juan Ferrer b6f788a8db fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 14:21:16 +02:00
Pako Natek bb4f78961f element table 2024-05-14 14:01:13 +02:00
Pako Natek 0adf6bfc45 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 10:50:59 +00:00
Carlos Andrés 4254fac6c2 Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-14 09:35:51 +00:00
Alex Moreno d487d13cdb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 11:26:11 +02:00
Alex Moreno 2ddadcd8a4 deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 09:38:03 +02:00
Pako Natek 53f49531b7 VIP now is Vip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 09:07:43 +02:00
Pako Natek 599f22a25d catalogue tiene en cuenta apc 2024-05-14 09:03:49 +02:00
Guillermo Bonet 9b09bc4efb feat: refs #3199 Added one more scope ticket_recalcByScope
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-14 08:59:11 +02:00
Guillermo Bonet 2cee9c9c01 feat: refs #3199 Added one more scope ticket_recalcByScope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 08:58:44 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Alex Moreno 12f36dc825 hotFix: refs #6731 remove CodCOMPRADOR
gitea/salix/pipeline/head This commit looks good Details
2024-05-14 08:24:40 +02:00
Guillermo Bonet 9112d4bfcc Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 08:24:11 +02:00
Guillermo Bonet 7d47a986bf feat: refs #3199 Created ticket_recalcItemTaxCountryByScope 2024-05-14 08:24:11 +02:00
Guillermo Bonet 5fe88faabd Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:55:02 +00:00
Guillermo Bonet 1ba6bf9a9c feat: refs #3199 Added more scopes ticket_recalcByScope
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-14 07:54:52 +02:00
Guillermo Bonet 4d7ac901c6 feat: refs #3199 Added more scopes ticket_recalcByScope
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-14 07:52:21 +02:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Robert Ferrús b0da193b4a feat: refs #7039 añadir colum virtual country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 07:48:03 +02:00
Sergio De la torre 8656c16165 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-14 07:11:18 +02:00
Jorge Penadés 45082f532f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 15:05:27 +02:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Carlos Andrés 3ce43909e2 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 14:21:01 +02:00
Guillermo Bonet 6c325fccef refactor: refs #7373 Deleted proc packageInvoicing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:41:47 +02:00
Carlos Andrés f89ca786df eat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:31:58 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Robert Ferrús 5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:33:37 +00:00
Carlos Andrés b1af625937 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:32:46 +02:00
Pablo Natek bde7fc9972 fix: refs #4988 no task id on table comment
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 12:30:17 +02:00
Pablo Natek c7eeaf238a fix: refs #4988 add schema
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 11:04:50 +02:00
Pablo Natek 48392879cb fix: refs #4988 insert into agencyWorkCenter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-05-13 10:59:22 +02:00
Carlos Andrés 057121582e feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:06:00 +02:00
Carlos Andrés 6d3f00ec95 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 09:54:27 +02:00
Jorge Penadés 29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 09:35:08 +02:00
Alex Moreno 6ac664a139 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-13 09:06:57 +02:00
Jorge Penadés 562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 08:56:54 +02:00
Pablo Natek 1e956bb0f8 fix: duplicate version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 08:53:25 +02:00
Robert Ferrús 56906963de Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:03:45 +00:00
Ivan Mas 473f261cf1 refs #7342 Modify decimal item plastic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 14:11:29 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés 1996a00af1 feat: refs #5919 drop version 2024-05-10 13:31:21 +02:00
Guillermo Bonet b324b0c0f3 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-10 11:20:33 +00:00
Guillermo Bonet 4d1031e031 feat: refs #7126 Added manaClaim calc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 13:20:15 +02:00
Carlos Andrés 349c3d71dd Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:14:23 +02:00
Robert Ferrús 32b339ffdf Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:13:09 +00:00
Robert Ferrús e7df3fefc6 feat: refs #7363
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 13:11:41 +02:00
Carlos Andrés 56815e4b1a Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:10:54 +02:00
Robert Ferrús 9163d3db74 feat: refs #7363 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 13:05:44 +02:00
Jorge Penadés 8876a7ea8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 13:05:22 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Guillermo Bonet ba72408e84 refactor: refs #7345 Deprecated isFarmer__
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 12:45:53 +02:00
Robert Ferrús cb9cacc1ea feat: refs #7363 item_getBalance saleTracking no mostrar duplicados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 11:51:54 +02:00
Guillermo Bonet 6b7a529b55 refactor: refs #7345 Renamed column of invoiceInConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:39:14 +02:00
Guillermo Bonet eea04520ad Fix: refs #7126 Fix proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 10:05:02 +02:00
Guillermo Bonet 1ea357a5dd feat: refs #7126 Refactor and added columns in bs.waste table & proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 10:01:46 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Robert Ferrús b03fe4e6d3 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:23:07 +00:00
Pako Natek c048389412 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:13:35 +00:00
Pako Natek ec060209aa done
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 18:53:32 +02:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Guillermo Bonet f4229284fa Merge branch 'dev' into 7252-deliveryNoteFarmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:56:05 +00:00
Carlos Andrés cc941de606 feat: conversion art. A1 a A2 refs #4979
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 14:24:20 +02:00
Ivan Mas 9d1dc6b483 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 11:41:04 +00:00
Guillermo Bonet 9c5b46b3e2 Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2346
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 11:30:28 +00:00
Robert Ferrús f963923645 feat: refs #6223 pull master
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 12:54:57 +02:00
Robert Ferrús 0498b425b3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 10:51:18 +00:00
Jorge Penadés 1450a680ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:45:33 +02:00
Ivan Mas 9d7184ed7b refs #6965 Add Fk vehicleFk firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:35:26 +02:00
Jorge Penadés 2c826ed838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:14:43 +02:00
Jorge Penadés bf0db89286 refactor: refs #6202 remove blanks
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:02:44 +02:00
Jorge Penadés 74399d5ab6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher 2024-05-09 11:56:48 +02:00
Pako Natek 2203ac478b Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:56:41 +00:00
Pako Natek 42d17aa7f5 done
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 11:52:25 +02:00
Guillermo Bonet faf2d51a43 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-09 11:36:15 +02:00
Guillermo Bonet 494b46e7ec fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry
gitea/salix/pipeline/head This commit looks good Details
2024-05-09 11:33:57 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Javi Gallego abd692cbd3 Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2426
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 05:49:28 +00:00
Robert Ferrús 833994bd27 Merge branch 'dev' into 7291-sale_getProblems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 05:23:33 +00:00
Robert Ferrús e02dfc0456 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 05:18:08 +00:00
Robert Ferrús 0fce8c755b Merge branch 'master' into 5699-hoFixClientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 05:14:38 +00:00
Sergio De la torre 094b15fe8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-09 07:08:31 +02:00
Sergio De la torre 679f9a1b9b refs #6861 feat:sectoCollection reserve
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-09 07:07:10 +02:00
Sergio De la torre 10513d1991 Merge branch 'master' into 6276_itemShelving_Add
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 05:00:07 +00:00
Carlos Andrés d6451a94e3 feat: conversion art. A1 a A2 refs #4979
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 17:38:52 +02:00
Carlos Andrés 710841ba4a Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 16:31:25 +02:00
Guillermo Bonet c4a66b42bb feat: refs #7247 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:56:51 +02:00
Guillermo Bonet 3a7d93759c Merge branch 'dev' into 7247-monacoVies
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:52:32 +00:00
Guillermo Bonet 1a375c0e88 refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:45:37 +02:00
Guillermo Bonet 162c78e392 Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:59:38 +02:00
Guillermo Bonet 7d92b514c5 refactor: refs #6230 Revoke item: `size`, longName, name 2024-05-08 13:59:37 +02:00
Guillermo Bonet a90e83e9e0 Merge branch 'dev' into 6230-revoke
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 11:56:31 +00:00
Guillermo Bonet 53b58104c7 refactor: refs #6230 Revoke item: `size`, longName, name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 13:52:52 +02:00
Sergio De la torre f7e6901ef6 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 11:32:00 +00:00
Guillermo Bonet 4df13d900a Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:55:47 +00:00
Robert Ferrús b0848edff8 feat: refs #5699 quittar de client_afterUpdate desactivar cliente
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-08 12:52:11 +02:00
Guillermo Bonet 82ac54f0b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 12:52:02 +02:00
Guillermo Bonet 90107936b7 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 12:51:36 +02:00
Sergio De la torre 0d42b32611 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:47:22 +00:00
Robert Ferrús ce42cbf287 Merge branch 'master' into 5699-hoFixClientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-08 10:44:15 +00:00
Guillermo Bonet 84e90bb91b hotfix: rollback tmp item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 12:43:46 +02:00
Robert Ferrús 50157c932e Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:42:54 +00:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Sergio De la torre 5a0882c2ac refs #6861 feat:sectoCollection reserve
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:59:19 +02:00
Sergio De la torre a3e9c91bdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:58:20 +02:00
Javi Gallego 393d57f078 fix: #7344 getSupplierDebt agrupa por pago
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:51:35 +02:00
Robert Ferrús 2866f231b8 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:41:38 +00:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Guillermo Bonet 16e7fb9662 Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:29:00 +00:00
Sergio De la torre 5207f07c80 refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-08 10:03:11 +02:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Guillermo Bonet 71f66085f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 09:50:52 +02:00
Guillermo Bonet 854604368a Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-08 09:50:37 +02:00
Sergio De la torre 9a235838d8 refs #7161 feat:setVisibleDiscard by itemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 09:04:08 +02:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Guillermo Bonet 6cde2e8170 fix: refs #6585 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:08 +02:00
Guillermo Bonet e070906ea6 hotfix: refs #6777 manaCustomerUpdate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-08 07:49:32 +02:00
Carlos Satorres 371df19194 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 14:59:25 +02:00
Carlos Satorres 3eba4a1f69 refs #6882 fix sql 2024-05-07 14:59:23 +02:00
Robert Ferrús 43c742938c feat: refs #179881
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:37:24 +02:00
Robert Ferrús f70f2949ec feat: refs #182001
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:30:38 +02:00
Robert Ferrús f529a7f5b4 feat : refs #182001
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:25:26 +02:00
Robert Ferrús 6c6ae412bd feat: refs #182001 packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:19:11 +02:00
Robert Ferrús 9bd8369469 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5699-hoFixClientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 13:23:49 +02:00
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Robert Ferrús 2dcc959488 fix: refs #5699 clientsDisable
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-07 13:17:56 +02:00
Guillermo Bonet 20414c70ad Merge pull request 'hotfix: #7173 Rollback' (!2418) from 7173-rollbackInvoiceInRestriction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2418
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-07 11:12:55 +00:00
Guillermo Bonet cc8873f48a hotfix: #7173 Rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 13:08:44 +02:00
Jorge Penadés 7d07c513b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:06:47 +02:00
Guillermo Bonet 832db8901e Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:03:51 +02:00
Guillermo Bonet 2adf96cb37 refactor: #6585 Deleted transaction ticket_doCmr 2024-05-07 13:03:50 +02:00
Jorge Penadés dce754a64b Merge branch 'master' into 6938-hotfix-rollbackHidePhone
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 10:41:50 +00:00
Guillermo Bonet 45f7412b35 Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 10:36:28 +00:00
Guillermo Bonet da8378d422 hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 12:15:28 +02:00
Jorge Penadés 1d9b6e489c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hotfix-rollbackHidePhone
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-07 11:49:31 +02:00
Jorge Penadés 0f5e2dcc54 fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 11:47:22 +02:00
Guillermo Bonet 3ed1c8f6fd hotfix: ticket #181890 duaInvoiceInBooking
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 11:35:07 +02:00
Guillermo Bonet ef567bb167 fix: ticket #181920 catalog_componentCalculate
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 10:03:33 +02:00
Alex Moreno 966b7794f0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-07 08:03:37 +02:00
Guillermo Bonet e44568ff4b feat: refs #6585 Added call ticket_afterUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 08:00:26 +02:00
Alex Moreno 56008ba51f dump: db dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 07:53:11 +02:00
Sergio De la torre 7368561bad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 07:21:59 +02:00
Robert Ferrús 1610b9bd0a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 05:11:02 +00:00
Alex Moreno f23924e792 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-06 14:31:41 +02:00
Carlos Andrés 14a1c5cbbb Merge pull request 'master' (!2408) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2408
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-06 12:22:04 +00:00
Javi Gallego 69766bbfeb Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2409
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-06 12:00:14 +00:00
Javi Gallego f9348b41ea feat: #7109 inventoryType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 13:42:19 +02:00
Carlos Andrés 0b4ac51749 fix: Error workerTimeControl_direction Salix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-06 13:34:46 +02:00
Robert Ferrús 1eb75599d8 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 09:38:14 +00:00
Sergio De la torre e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 10:30:19 +02:00
Robert Ferrús b57be129e3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:27:21 +00:00
Carlos Satorres bc5f78827c Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:09:21 +00:00
Javi Gallego 633a3c481c Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 07:42:38 +00:00
Javi Gallego fe025b510d Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2405
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-06 07:41:27 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Jorge Penadés f679687701 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:55:01 +02:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00:00
Carlos Andrés 166f4da934 Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2331
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 17:08:07 +00:00
Jorge Penadés 40b2c32a00 feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 17:37:36 +02:00
Carlos Andrés e979defd92 fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 15:03:05 +02:00
Ivan Mas 5d3235977f Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 12:57:26 +00:00
Javi Gallego 432b696305 feat: create isInformal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:57:09 +02:00
Pablo Natek 133b862dc0 fix: refs #7187 move column sim to deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:20:16 +02:00
Guillermo Bonet 710564bed2 Merge branch '6701-claimRatioRoutine' of https://gitea.verdnatura.es/verdnatura/salix into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:15:56 +02:00
Guillermo Bonet f0b814c79b refactor: refs #6701 Refactor claim_ratio_routine 2024-05-03 14:15:55 +02:00
Carlos Andrés 2659e3b259 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:03:26 +02:00
Pablo Natek 95aba9e7b3 Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 11:52:22 +00:00
Guillermo Bonet b0801f428d Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 11:48:25 +00:00
Guillermo Bonet 883f6f18a3 refactor: refs #6701 Refactor claim_ratio_routine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 13:47:55 +02:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Pako Natek b5402a3f2f defaultSector
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 10:44:57 +02:00
Carlos Andrés 7659a39b42 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 10:19:05 +02:00
Jorge Penadés 67bd95ea32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 08:42:38 +02:00
Robert Ferrús b6e4130184 feat: refs #7325 item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 07:51:04 +02:00
Robert Ferrús 523735e4fc Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 04:59:01 +00:00
Carlos Andrés 9905d7254d Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 18:17:31 +02:00
Carlos Andrés e28a5eb478 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 18:13:12 +02:00
Carlos Andrés 27e3ae897a feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 17:05:10 +02:00
Jorge Penadés 74b04d98f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 16:38:56 +02:00
Guillermo Bonet 3146f4f5b6 refactor: refs #6701 Refactor claim_ratio_routine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 14:59:30 +02:00
Robert Ferrús 00eae3920b feat: refs 179918 clean
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 13:33:25 +02:00
Robert Ferrús 145a477a80 feat: refs #179918 entry delete isBooked
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 12:39:12 +02:00
Pablo Natek d45d53d665 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 10:26:46 +02:00
Jorge Penadés 7cb728432a fix refs #6889 set originalQuantity to 0
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-02 10:15:01 +02:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Guillermo Bonet 0ab79728b5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:10:20 +02:00
Guillermo Bonet 7eb2e8f218 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:09:59 +02:00
Guillermo Bonet b926725021 hotfix: ticket#179915 Fix no worker exists
gitea/salix/pipeline/head This commit looks good Details
2024-05-02 08:04:44 +02:00
Carlos Andrés a67f603990 Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 15:50:13 +02:00
Carlos Andrés a40545264b fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 15:46:24 +02:00
Ivan Mas de5e43fb05 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:41:54 +00:00
Ivan Mas 3167bdcdd0 refs #7191 message modification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 14:37:06 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Robert Ferrús 5ea57ce728 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 10:04:40 +00:00
Robert Ferrús 83e9756692 fear: refs #7296 expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:02:19 +02:00
Robert Ferrús e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:48:18 +02:00
Guillermo Bonet f10ecf4f00 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:55 +02:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Guillermo Bonet d44b8f7c9a hotfix: ticket #179514 ticket_close packaging fix
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:44:16 +02:00
Guillermo Bonet 110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 08:23:52 +00:00
Guillermo Bonet 80b44ccace Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2362
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 05:37:33 +00:00
Ivan Mas a33cbb0a7c Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 17:46:26 +00:00
Ivan Mas 30f6a9324d refs #7191 SQL conventions mod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 19:40:43 +02:00
Carlos Andrés e934b47e98 Hotfix feat: new function to kill connections
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 17:09:51 +02:00
Carlos Andrés e55658e6b3 Hotfix feat: new function to kill connections 2024-04-29 17:02:47 +02:00
Carlos Andrés 21a1e1eed3 Hotfix feat: new function to kill connections 2024-04-29 16:59:56 +02:00
Jorge Penadés 9802f0066c fix: refs #5919 unique key & unassigned locker 2024-04-29 16:05:36 +02:00
Carlos Andrés 7b7afb05c5 hotfix collection_assign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 15:01:20 +02:00
Carlos Andrés 51c8736da2 hotFix collection_assign
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 14:54:15 +02:00
Carlos Andrés dcb6f90ab3 hotfix collection_assign elimino vLockTime
gitea/salix/pipeline/head This commit looks good Details
2024-04-29 14:42:16 +02:00
Jorge Penadés 0003779681 fix: refs 5919 apply version 2024-04-29 11:35:08 +02:00
Robert Ferrús 9af3c17a1f feat: refs #7291 sale_getProblems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 09:58:58 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Pako Natek 9aa6e3f80a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 13:09:15 +02:00
Pako Natek 3440bb1725 hotFix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 12:36:21 +02:00
Jorge Penadés b9d3684db2 feat: refs #6600 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 15:48:30 +02:00
Jorge Penadés 30e927d722 feat: refs #6202 dbWatcher script
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:10:05 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús c819b92141 fix: refs #177968 restore restriction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-26 09:09:22 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Robert Ferrús 30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 05:08:26 +00:00
Javi Gallego 94e04c1c2f Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:45:43 +02:00
Carlos Andrés a4417dde6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-25 19:23:48 +02:00
Carlos Andrés f25d3c14c6 Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-25 19:06:06 +02:00
Carlos Andrés 326c5c97bd Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-04-25 19:02:05 +02:00
Pablo Natek 5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 16:18:18 +02:00
Sergio De la torre 611f907ef0 refs #6861 feat:reserveWithReservation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 16:15:53 +02:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Jorge Penadés edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl 2024-04-25 15:38:40 +02:00
Javi Gallego 2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:31:06 +00:00
Javi Gallego 4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 14:28:53 +02:00
Javi Gallego 7d3870e4a1 feat: refs#6382 test fixed 2024-04-25 14:28:47 +02:00
Javier Casado a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 11:46:53 +00:00
Javi Gallego a4f1183df6 feat: refs #7108 pascalCase
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 13:11:57 +02:00
Pablo Natek 4e11e46fff feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:40:54 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Pablo Natek 42591af5c7 fix: refs #4988 create table 2024-04-25 09:46:15 +02:00
Javi Gallego 1b34822fb7 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 07:13:57 +00:00
Jorge Penadés 88b06ebef5 feat: refs #7211 check if there's available clockIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 08:49:22 +02:00
Sergio De la torre d4d31c6d9e refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-25 08:35:59 +02:00
Sergio De la torre 46f2d790db refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-25 08:01:32 +02:00
Guillermo Bonet 60a3ec99d0 Merge branch 'dev' into 7258-lastChangesMigrationVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 05:02:17 +00:00
Sergio De la torre 8bb2fa93a7 Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 13:46:53 +00:00
Alex Moreno 917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 12:34:46 +00:00
Pablo Natek f2d4283304 fix: refs #7187 number on de code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:29:57 +02:00
Pablo Natek e8a32d8e13 fix: refs #7187 db version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:09:42 +02:00
Pablo Natek 008b6f6f41 fix: refs #7187 unify versions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:08:26 +02:00
Pablo Natek 88ef12032b feat: refs #7187 serialNumber new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:05:18 +02:00
jcasado aeee012c2b refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:43:10 +02:00
Alex Moreno 2638b93299 Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 11:40:25 +02:00
Alex Moreno eced03f69b fix(ticket_getMovable): refs #7225 stock add ifnull 2024-04-24 11:40:24 +02:00
Guillermo Bonet 6fb87531c4 refactor: #7258 Deprecated last tables vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:27:16 +02:00
Pablo Natek a15970c95f fix: refs #7187 sql for pdaFreelancer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:08:57 +02:00
Guillermo Bonet 71e1e53ccd refactor: #7258 Fixes 2024-04-24 10:57:35 +02:00
Alex Moreno 2e1ad0c000 Merge branch 'master' into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 08:42:26 +00:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Guillermo Bonet f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 09:53:31 +02:00
Robert Ferrús ffe56edc9c feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:24:42 +02:00
Robert Ferrús a27e06e8ff feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:08:19 +02:00
Robert Ferrús 7899cf230e feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:05:29 +02:00
Javi Gallego 73f7d09b0e feat: #7108 acl a invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 08:14:07 +02:00
Robert Ferrús ec7dc390b9 Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-24 06:05:03 +00:00
Robert Ferrús e36e997844 feat: refs #6223 ticketCalculateClon 2024-04-24 08:04:28 +02:00
Javi Gallego dcc46494bc Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 07:45:02 +02:00
Guillermo Bonet a6c57ef3df Merge branch 'dev' into 6997-eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 05:09:44 +00:00
Juanjo Breso be8e55a905 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 05:03:19 +00:00
Pablo Natek fbc1614132 fix: refs #7187 sql creation for deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 18:50:28 +02:00
Carlos Andrés 26fd1ae6c9 Merge pull request 'test' (!2359) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2359
2024-04-23 15:53:13 +00:00
Carlos Andrés a7f1188975 Merge pull request 'master' (!2358) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2358
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-04-23 15:35:33 +00:00
Carlos Andrés 033bcf6b67 hotfix importErrorNotification refs #6189
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-23 17:24:47 +02:00