Commit Graph

23355 Commits

Author SHA1 Message Date
Sergio De la torre bf49b3f318 Merge branch 'dev' into 7269_printLabel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 05:24:08 +00:00
Guillermo Bonet 31530d6d3d feat: refs #6769 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:22:22 +02:00
Robert Ferrús 880b332575 Merge pull request 'feat: refs #7685 delivery coordinates' (!2706) from 7685-delivery_beforeDeadlock into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2706
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-12 05:22:12 +00: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 77b1facf46 Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 05:16:34 +00: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 b28a8a34dc feat(salix): refs #7648 #7648 add new filter 2024-07-11 19:55:36 +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
Sergio De la torre 485404d68f feat solvePrintLabel refs #7269
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 16:20:37 +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 69e0d78537 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:31:17 +02:00
Guillermo Bonet 9e3baeffa6 feat: refs #7704 Added tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 14:27:16 +02: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
Guillermo Bonet f1b0b95442 feat: refs #7704 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:47:06 +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
Robert Ferrús b25cf67036 Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:17:06 +00:00
Guillermo Bonet 2e48263636 feat: refs #7704 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:10:01 +02:00
Robert Ferrús f3d96f178f Merge branch 'dev' into 7685-delivery_beforeDeadlock
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:52:48 +00:00
Carlos Satorres 3305d2897c Merge pull request 'refs #6952 add producer sql trad' (!2698) from 6952-fixProducerNameInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2698
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-11 08:32:51 +00:00
Carlos Satorres ec356423bb Merge branch 'dev' into 6952-fixProducerNameInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:31:13 +00: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
Carlos Satorres 741360cd63 Merge pull request 'hotfix routeSummary' (!2718) from hotfix-routeSummary into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2718
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-11 07:17:26 +00:00
Carlos Satorres 0579e7dbbf hotfix routeSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 09:14:14 +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
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
Sergio De la torre 203db3ec3a feat solvePrintLabel refs #7269 2024-07-10 12:47:09 +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 889982dd82 refactor: refs #7126 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 12:00:54 +02:00
Robert Ferrús 36b1beeebf Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 09:44:54 +00:00