 Pako Natek
|
8b8c64ed65
|
Merge branch 'master' into 7969-plantTray
|
2024-09-17 10:53:44 +00:00 |
 Guillermo Bonet
|
a3022a7379
|
Merge branch 'dev' into 7893-waste_addSales
|
2024-09-17 10:35:27 +00:00 |
|
Guillermo Bonet
|
fa5ace677c
|
refactor: refs #7893 Requested changes
|
2024-09-17 12:35:08 +02:00 |
|
Guillermo Bonet
|
4a102d315d
|
fix: refs #7564 Ticket volume item cost
|
2024-09-17 12:10:47 +02:00 |
|
Pako Natek
|
829475b49b
|
feat(collection_new): refs #7969 new restriction hasPlantTray for pickers
Refs: #7969
|
2024-09-17 11:57:00 +02:00 |
|
Pako Natek
|
019d855fbf
|
fix: refs #7969 new plantTray restriction
|
2024-09-17 11:22:07 +02:00 |
 Pablo Natek
|
d308f185bc
|
Merge branch 'dev' into 7404-stockBuyed
|
2024-09-17 08:11:17 +00:00 |
|
Guillermo Bonet
|
55df919076
|
fix: refs #7760 collection_new
|
2024-09-17 09:37:25 +02:00 |
|
Guillermo Bonet
|
267ce3167c
|
fix: refs #7760 collection_new
|
2024-09-17 09:30:40 +02:00 |
|
Guillermo Bonet
|
3fe1724e84
|
fix: refs #7760 ticket_splitItemPackingType
|
2024-09-17 09:12:25 +02:00 |
|
Guillermo Bonet
|
88f434435b
|
Merge branch 'test' into dev
|
2024-09-17 08:42:34 +02:00 |
|
Pablo Natek
|
9896ac2361
|
fix: refs #7760 remove throw on ticket split
|
2024-09-17 08:21:29 +02:00 |
 Javi Gallego
|
361d60a8a8
|
Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev
Reviewed-on: #2945
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-09-17 05:28:48 +00:00 |
 Carlos Andrés
|
faf963ba52
|
fix: refs #7760 tmp.ticketIPT
|
2024-09-16 15:11:51 +02:00 |
|
Carlos Andrés
|
1d42f58c39
|
fix: refs #7760 tmp.ticketIPT
|
2024-09-16 15:09:34 +02:00 |
|
Carlos Andrés
|
2e03fe8193
|
fix: refs #7760 tmp.ticketIPT
|
2024-09-16 14:41:29 +02:00 |
 Alex Moreno
|
cabc9660d6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-09-16 14:27:08 +02:00 |
|
Alex Moreno
|
8803ae0534
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2024-09-16 14:25:27 +02:00 |
|
Carlos Andrés
|
33540063f4
|
fix: refs #7760 tmp.ticketIPT
|
2024-09-16 14:17:51 +02:00 |
|
Carlos Andrés
|
e7343b7e25
|
fix: refs #7760 tmp.ticketIPT
|
2024-09-16 14:16:48 +02:00 |
 Robert Ferrús
|
10fcbffd37
|
feat: refs #7964 entry_beforeUpdate not
|
2024-09-16 13:37:35 +02:00 |
|
Guillermo Bonet
|
51da7ae063
|
feat: refs #7893 Created waste_addSalesLauncher
|
2024-09-16 13:33:53 +02:00 |
|
Robert Ferrús
|
e361b789f4
|
Merge branch 'dev' into 7964-entry_getCommission
|
2024-09-16 11:03:08 +00:00 |
 Sergio De la torre
|
c33740e36e
|
fix: refs #6861 itemShelvingSale debug
|
2024-09-16 13:00:20 +02:00 |
|
Guillermo Bonet
|
5c7a537275
|
feat: refs #7912 Added new waste types
|
2024-09-16 12:32:52 +02:00 |
|
Robert Ferrús
|
7540526b9b
|
feat: refs #7964 entry_beforeUpdate
|
2024-09-16 12:26:29 +02:00 |
|
Pablo Natek
|
88962b051f
|
Merge branch 'dev' into 7404-stockBuyed
|
2024-09-16 10:13:13 +00:00 |
|
Pablo Natek
|
8f4f2d2d15
|
Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
|
2024-09-16 09:06:04 +02:00 |
|
Javi Gallego
|
d7679fcb50
|
feat: refs #7977 muestra las facturas sin vencimientos tambien
|
2024-09-16 09:01:47 +02:00 |
|
Pako Natek
|
6983a2fbd9
|
fix: refs #7969 no agency restriction removed
|
2024-09-16 08:38:06 +02:00 |
|
Pako Natek
|
390b8271c2
|
fix: root instead of vn
|
2024-09-16 08:20:17 +02:00 |
|
Pako Natek
|
6cbf25dee5
|
fix: refs #7969 fix on collectionNew
|
2024-09-16 08:10:58 +02:00 |
|
Guillermo Bonet
|
63dde3dd78
|
fix: refs #7819 Version
|
2024-09-13 14:13:14 +02:00 |
 Ivan Mas
|
d7336b93df
|
Merge branch 'dev' into 7923-DeleteLogifloraFunctions
|
2024-09-13 08:49:11 +00:00 |
|
Sergio De la torre
|
630e9cec1e
|
Merge pull request 'test' (!2958) from test into dev
Reviewed-on: #2958
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
|
2024-09-13 05:41:50 +00:00 |
|
Sergio De la torre
|
1ef9cc0458
|
Merge pull request 'master' (!2957) from master into test
Reviewed-on: #2957
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
|
2024-09-13 05:39:45 +00:00 |
|
Pako Natek
|
a0bfc20595
|
revision
|
2024-09-12 14:34:19 +02:00 |
|
Pako Natek
|
b1027f454b
|
locallyTested
|
2024-09-12 14:13:17 +02:00 |
|
Ivan Mas
|
8a1677f4e9
|
Merge branch 'dev' into 7923-DeleteLogifloraFunctions
|
2024-09-12 11:25:45 +00:00 |
|
Ivan Mas
|
4f9eb865d0
|
Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
|
2024-09-12 10:27:27 +00:00 |
|
Ivan Mas
|
37900daf9e
|
Merge branch 'dev' into 7923-DeleteLogifloraFunctions
|
2024-09-12 10:19:51 +00:00 |
|
Guillermo Bonet
|
fcfef2a970
|
Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev
Reviewed-on: #2941
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-09-12 08:21:32 +00:00 |
 Javier Segarra
|
504e2f0ed2
|
Merge branch 'dev' into 7956-itemGetSimilar
|
2024-09-11 17:42:05 +00:00 |
|
Ivan Mas
|
0feb44e404
|
refactor: refs #7923 Delete Logiflora functions
|
2024-09-11 15:07:37 +02:00 |
|
Guillermo Bonet
|
728c40916c
|
refactor: refs #7895 workerDocument to workerDms
|
2024-09-11 14:38:58 +02:00 |
|
Sergio De la torre
|
99761c97e8
|
Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master
Reviewed-on: #2952
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-09-11 12:38:14 +00:00 |
|
Guillermo Bonet
|
956058c10c
|
Merge branch 'test' into dev
|
2024-09-11 14:19:51 +02:00 |
|
Guillermo Bonet
|
8518351790
|
Merge branch 'master' into test
|
2024-09-11 14:19:37 +02:00 |
|
Guillermo Bonet
|
889f3bdab4
|
fix: refs #7213 risk F11
|
2024-09-11 14:12:07 +02:00 |
|
Sergio De la torre
|
7e06c2ab37
|
fix: available refs #6861
|
2024-09-11 13:57:03 +02:00 |
|
Ivan Mas
|
d15be5100d
|
refactor: refs #7952 Deprecate creditInsurance.creditClassification
|
2024-09-11 13:42:04 +02:00 |
|
Sergio De la torre
|
db7d5c5e52
|
fix: available refs #6861
|
2024-09-11 13:18:09 +02:00 |
|
Guillermo Bonet
|
6b5f59a09b
|
Merge branch 'test' into dev
|
2024-09-11 12:54:27 +02:00 |
|
Guillermo Bonet
|
4c6aba96e5
|
Merge branch 'master' into test
|
2024-09-11 12:54:16 +02:00 |
|
Guillermo Bonet
|
479fc02245
|
Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev
Reviewed-on: #2602
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-09-11 10:48:02 +00:00 |
|
Sergio De la torre
|
87182abf7e
|
fix: available refs #6861
|
2024-09-11 12:47:51 +02:00 |
|
Guillermo Bonet
|
07f7f87c28
|
Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master
Reviewed-on: #2943
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-09-11 10:32:59 +00:00 |
|
Guillermo Bonet
|
011c16180d
|
fix: refs #7213 buyUltimate
|
2024-09-11 12:31:16 +02:00 |
|
Guillermo Bonet
|
2a41fc6fc4
|
Merge branch 'dev' into 6727-logClean
|
2024-09-11 09:25:52 +00:00 |
|
Javi Gallego
|
10f7583587
|
feat: refs #7956 sin AS
|
2024-09-11 11:22:22 +02:00 |
|
Pablo Natek
|
842c98edfc
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-11 08:22:24 +00:00 |
|
Pablo Natek
|
92f305b9fd
|
fix: refs #6156 proc and version
|
2024-09-11 10:19:55 +02:00 |
|
Carlos Andrés
|
ad8f27ea81
|
fix: refs #7213 change rounding problems
|
2024-09-11 10:15:37 +02:00 |
|
Javi Gallego
|
ed8cf628a5
|
feat: refs #7956 tabulaciones
|
2024-09-11 08:15:32 +02:00 |
|
Javi Gallego
|
6ae15a8e64
|
feat: refs #7956 definer
|
2024-09-11 08:13:28 +02:00 |
|
Javi Gallego
|
56e6a7e6aa
|
feat: refs #7956 parametro daysInForward
|
2024-09-11 08:10:21 +02:00 |
|
Pablo Natek
|
8607a60ca7
|
feat: refs #7404 format date before select
|
2024-09-11 07:56:08 +02:00 |
|
Sergio De la torre
|
bebd49f08a
|
fix: debugAdd refs #6861
|
2024-09-11 07:08:36 +02:00 |
|
Javier Segarra
|
f487aed336
|
Merge branch 'dev' into 5938_fine_ticketAdvance
|
2024-09-10 14:16:56 +00:00 |
|
Carlos Andrés
|
8fd7c1a8dd
|
fix: refs #7213 change rounding problems
|
2024-09-10 13:16:15 +02:00 |
|
Carlos Andrés
|
0bbf10ca4f
|
fix: refs #7213 change rounding problems
|
2024-09-10 12:59:07 +02:00 |
|
Javier Segarra
|
c407dde7a0
|
feat(salix): refs #6156 #6156 remove redundant condition
|
2024-09-09 15:14:01 +02:00 |
|
Javier Segarra
|
615f57b2e6
|
feat(salix): refs #6156 #6156 simplify CONCAT_WS
|
2024-09-09 15:13:32 +02:00 |
|
Javier Segarra
|
f9a25617f0
|
feat(salix): refs #6156 #6156 add missing values
|
2024-09-09 15:13:08 +02:00 |
|
Javier Segarra
|
f70f475223
|
feat(salix): refs #6156 #6156 change user definer
|
2024-09-09 15:12:44 +02:00 |
|
Javier Segarra
|
a5f6fe95ea
|
feat(salix): refs #5938 #5938 add futureAlertLevel
|
2024-09-09 14:58:02 +02:00 |
|
Guillermo Bonet
|
bf1a43a23e
|
refactor: refs #7900 Deleted sectorProdPriority column
|
2024-09-09 14:43:16 +02:00 |
|
Guillermo Bonet
|
946806c98e
|
Merge branch 'test' into dev
|
2024-09-09 14:25:51 +02:00 |
|
Javier Segarra
|
2fef104954
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-09 10:48:20 +00:00 |
|
Carlos Andrés
|
88a8b4975b
|
fix: ticket 218504 ticket_close
|
2024-09-09 12:37:49 +02:00 |
|
Javier Segarra
|
31b04cba75
|
feat(salix): refs #6156 #6156 Move to myt version
|
2024-09-09 12:08:12 +02:00 |
|
Guillermo Bonet
|
daf3dfd2ee
|
Merge branch 'test' into dev
|
2024-09-09 11:35:28 +02:00 |
|
Guillermo Bonet
|
7053f2786a
|
Merge branch 'dev' into 6727-logClean
|
2024-09-09 09:38:40 +02:00 |
|
Robert Ferrús
|
620cf1c26e
|
Merge branch 'dev' into 7709-supplierPackaging_ReportSource
|
2024-09-09 07:33:21 +00:00 |
|
Guillermo Bonet
|
c4527cc5c5
|
feat: refs #4515 New throw buy_checkItem
|
2024-09-09 08:28:27 +02:00 |
|
Robert Ferrús
|
55fe9f2f86
|
feat: refs #7709 añadir alias
|
2024-09-09 08:16:04 +02:00 |
|
Robert Ferrús
|
da00e368d1
|
Merge branch 'dev' into 7709-supplierPackaging_ReportSource
|
2024-09-09 06:11:09 +00:00 |
 Juan Ferrer
|
37fabc38bd
|
fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
|
2024-09-06 14:56:14 +02:00 |
|
Guillermo Bonet
|
a718b6e81f
|
Merge branch 'test' into dev
|
2024-09-06 13:52:10 +02:00 |
|
Guillermo Bonet
|
5a82ce4aae
|
Merge branch 'master' into test
|
2024-09-06 13:51:13 +02:00 |
|
Carlos Andrés
|
d10db686e5
|
fix: refs #7346 ticket_close serial
|
2024-09-06 12:52:24 +02:00 |
|
Juan Ferrer
|
640b45ed99
|
fix: refs #7931 Apply PR change requests
|
2024-09-06 09:06:00 +02:00 |
|
Ivan Mas
|
747e6a562a
|
feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval
|
2024-09-06 08:51:41 +02:00 |
|
Juan Ferrer
|
a7bc58a5bc
|
fix: refs #7931 Immediately discount order lines from available
|
2024-09-05 14:45:17 +02:00 |
|
Guillermo Bonet
|
8ca491b8de
|
Merge branch 'dev' into 7759-newDefiner
|
2024-09-05 09:40:42 +02:00 |
|
Guillermo Bonet
|
6df817ea5d
|
Merge branch 'test' into dev
|
2024-09-05 09:25:00 +02:00 |
|
Robert Ferrús
|
777eba8c53
|
Merge branch 'master' into ticket216260-buy_recalcPrices
|
2024-09-05 05:22:02 +00:00 |
|
Guillermo Bonet
|
2bb73af47d
|
Merge branch 'test' into dev
|
2024-09-04 14:12:50 +02:00 |
|
Guillermo Bonet
|
80839100c7
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2024-09-04 14:10:33 +02:00 |
|
Guillermo Bonet
|
212e8d1a03
|
fix: refs #7346 invoiceSerial
|
2024-09-04 14:09:31 +02:00 |