Commit Graph

978 Commits

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