Commit Graph

6082 Commits

Author SHA1 Message Date
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
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
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