Commit Graph

1435 Commits

Author SHA1 Message Date
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
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
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 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
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 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
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 3c975aa9c4 refactor: refs #7580 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:32:41 +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
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
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 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
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
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 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
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
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
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 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
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 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
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
Guillermo Bonet 50c9ded103 refs #6769 Fix 2024-07-05 08:38:40 +02:00
Guillermo Bonet 6f0196d656 refs #6769 Changes 2024-07-05 07:06:40 +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
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
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
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 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 cf63d6e71c feat: refs #7378 Added productionConfigLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 11:17:33 +02: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 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