Commit Graph

25375 Commits

Author SHA1 Message Date
Guillermo Bonet d302a9c3ba Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-20 12:17:30 +01:00
Guillermo Bonet 917e3128a9 Merge pull request 'fix: refs #8191 Deleted msg send rocket in getSales.js' (!3225) from 8191-getSales into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3225
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-11-20 11:13:28 +00:00
Guillermo Bonet 22ce7a4dd4 fix: refs #8191 Deleted unused traductions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-20 12:07:10 +01:00
Guillermo Bonet a4b568e9b8 fix: refs #8191 Deleted msg send rocket in getSales.js
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-20 12:03:30 +01:00
Carlos Satorres 91164624bc Merge pull request 'fix: fix deleteZone' (!3224) from hotfix-deleteZoneShipped into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3224
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-11-20 10:19:06 +00:00
Carlos Satorres be311c0557 fix: fix deleteZone
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-20 11:09:15 +01:00
Jorge Penadés e4317a385c Merge pull request 'fix: refs #6818 add config' (!3223) from 6818-warmfixxInsertConfig into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #3223
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-20 09:00:39 +00:00
Jorge Penadés 3cce342d9d fix: refs #6818 add config
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-20 09:52:42 +01:00
Alex Moreno 033e269a5d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-11-19 14:09:46 +01:00
Jorge Penadés 2335b57e05 Merge pull request '#7323 add remaining fields' (!3220) from 7323-warfix-addRemainingFields into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #3220
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-19 12:37:24 +00:00
Jorge Penadés c31fa7e9cf Merge branch 'test' into 7323-warfix-addRemainingFields
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 12:33:01 +00:00
Sergio De la torre f192b92c6a Merge pull request 'feat: refs #8099 refs#8099 addComplmentSalary' (!3219) from 8099-addComplementSalary into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #3219
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-19 12:25:47 +00:00
Robert Ferrús b29053e850 Merge pull request 'feat: refs #8211 route_afterUpdate' (!3218) from 8211-hotFixRoute_afterUpdate into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3218
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-19 11:05:30 +00:00
Jorge Penadés f89080d373 fix: refs #7323 add remaining fields
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:53:12 +01:00
Sergio De la torre feb11c123e feat: refs #8099 refs#8099 addComplmentSalary
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:45:40 +01:00
Sergio De la torre d21b42a567 feat: refs #8099 refs#8099 addComplmentSalary
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:24:00 +01:00
Robert Ferrús 7b5e474d24 feat: refs #8211 route_afterUpdate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 11:15:57 +01:00
Alex Moreno 562d3b0f70 Merge pull request '8144-devToTest_2448' (!3216) from 8144-devToTest_2448 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3216
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-11-19 07:36:02 +00:00
Alex Moreno 413e9e1e9f build: refs #8144 change package version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 07:59:27 +01:00
Alex Moreno 7f39edf014 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-19 07:46:43 +01:00
Pablo Natek 0d205eb6ce Merge pull request 'fix: refs #7404 negative quantity' (!3214) from 7404-fixNegativeQuantity into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-19 06:16:09 +00:00
Sergio De la torre f3e5806990 Merge pull request 'fix: refs #6861 refs#6861 getTickets' (!3187) from 6861-ItemShelvingSalesgetTickets into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3187
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-19 06:08:10 +00:00
Sergio De la torre 6a94848007 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6861-ItemShelvingSalesgetTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 07:01:34 +01:00
Sergio De la torre 38f2421de0 Merge pull request 'fix: refs #6861 setQuantity' (!3119) from 6861-itemShelvingSetQuantity into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3119
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-19 05:58:59 +00:00
Sergio De la torre 8840d57041 Merge branch 'master' into 6861-ItemShelvingSalesgetTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 05:55:54 +00:00
Sergio De la torre 2335ef754a Merge branch 'master' into 6861-itemShelvingSetQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 05:55:45 +00:00
Javi Gallego 7a9bcf11e2 Merge pull request 'refactor: refs #7457 Added from param if not exists' (!2502) from 7457-orderFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2502
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-19 05:33:34 +00:00
Pablo Natek b70b69557e fix: refs #7457 empty commit for gitea 2024-11-19 06:30:19 +01:00
Pablo Natek 4e7a96442a Merge branch 'master' into 7404-fixNegativeQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 05:21:26 +00:00
Pablo Natek 33d9ba9b44 fix: refs #7404 negative quantity
gitea/salix/pipeline/pr-master Build queued... Details
2024-11-19 06:21:00 +01:00
Pablo Natek 056b5adddc Merge branch 'dev' into 7457-orderFilter 2024-11-19 05:12:18 +00:00
Alex Moreno 28ee32a411 Merge pull request 'fix: getSales' (!3213) from hotfix-gertSales into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3213
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-18 13:00:33 +00:00
Carlos Satorres 6619ec451c fix: getSales
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-18 13:46:56 +01:00
Guillermo Bonet 8d4769d74d feat: refs #8057 More precision in getGeo
gitea/salix/pipeline/head This commit looks good Details
2024-11-18 13:34:20 +01:00
Guillermo Bonet cdcc5051d2 feat: refs #8057 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-11-18 13:09:33 +01:00
Guillermo Bonet 2b770c0201 feat: refs #8057 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-18 12:56:37 +01:00
Guillermo Bonet aed4bc89c7 feat: refs #8057 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-18 12:53:36 +01:00
Guillermo Bonet baadd621e1 Merge pull request 'feat: refs #8057 Added geoFk columns' (!3204) from 8057-geoFk into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3204
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-11-18 11:47:53 +00:00
Javier Segarra 3f6a23fe35 Merge pull request '#7289 Sales already moved' (!3212) from 7289_sales_already_moved into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3212
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-18 10:40:54 +00:00
Javier Segarra 4b64b27ca7 Merge branch 'dev' into 7289_sales_already_moved
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 10:39:17 +00:00
Jorge Penadés 433f883700 Merge pull request 'feat: refs #6869 define model' (!3172) from 6869-createGetDetails into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3172
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-18 10:08:20 +00:00
Pablo Natek d2b545aaae Merge branch 'dev' into 7457-orderFilter 2024-11-18 10:05:29 +00:00
Guillermo Bonet 66009ee0dd Merge branch 'dev' into 8057-geoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 09:52:55 +00:00
Guillermo Bonet 754c0cb9ab Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-18 10:52:44 +01:00
Guillermo Bonet a64f9b74ec feat: refs #8057 Requested changes 2024-11-18 10:52:41 +01:00
Jorge Penadés dd637b9333 fix: refs #6869 use id as primaryKey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 10:34:23 +01:00
Jorge Penadés 5e78317b5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 10:15:35 +01:00
Javier Segarra f471f7e76c Merge branch 'dev' into 7289_sales_already_moved
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 10:10:57 +01:00
Javier Segarra 9558d030ff feat: refs #7289 #7289 remove bad translation 2024-11-18 10:10:30 +01:00
Robert Ferrús 5e21e4e368 Merge pull request 'feat: refs #8127 entry_getCommission' (!3128) from 8127-entry_updateComission into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3128
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-18 08:48:50 +00:00