 Javi Gallego
|
55ec4aaba1
|
Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2890
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2025-02-03 08:12:36 +00:00 |
|
Javi Gallego
|
adba4765ed
|
refactor: refs #7686 update alert level conditions to only check for 'FREE'
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-03 09:07:08 +01:00 |
 Guillermo Bonet
|
12604d0f67
|
Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 14:27:18 +01:00 |
|
Guillermo Bonet
|
8dc803b5df
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 14:25:23 +01:00 |
 Ivan Mas
|
2e4c5fe401
|
feat: refs #8477 add costPerKg to awb view
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 12:10:19 +01:00 |
 Javier Segarra
|
49c6df42a7
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 10:20:42 +00:00 |
|
Guillermo Bonet
|
b40f145613
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 10:57:44 +01:00 |
|
Ivan Mas
|
da5e395450
|
feat: refs #8312 add flippingCost column to Cubos view
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 10:17:01 +01:00 |
 Carlos Andrés
|
672ef36501
|
fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-30 18:11:30 +01:00 |
|
Javi Gallego
|
3965441f7f
|
Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 15:29:45 +01:00 |
|
Guillermo Bonet
|
855600811e
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-30 15:00:19 +01:00 |
|
Guillermo Bonet
|
123f28055e
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-30 09:28:44 +01:00 |
 Sergio De la torre
|
c96d083467
|
fix: refs #7920 shelvingFkByCode
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-30 09:16:54 +01:00 |
|
Javier Segarra
|
dc6f93c241
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 08:54:04 +01:00 |
 Robert Ferrús
|
9c467e67e0
|
Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 06:07:59 +00:00 |
|
Javier Segarra
|
efe0aa708f
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 15:13:49 +00:00 |
|
Guillermo Bonet
|
a14d6227a1
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 14:15:22 +01:00 |
|
Robert Ferrús
|
35e72c90d3
|
Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:46:23 +00:00 |
 Pako Natek
|
af5b4981df
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:16:41 +00:00 |
|
Pako Natek
|
4e2a6d275a
|
fix(travel): refs #8408 trigger restriction for wrong availabled value
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Refs: #8408
|
2025-01-29 12:12:23 +01:00 |
|
Pako Natek
|
0de9c3c172
|
feat(available): refs #8408 available refreshing now includes time
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Refs: #8408
|
2025-01-29 12:03:55 +01:00 |
 Juan Ferrer
|
9a6b89793c
|
fix: refs #8494 Fix ZoneIncluded logs
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
gitea/salix/pipeline/pr-master Build started...
Details
|
2025-01-29 10:35:06 +01:00 |
|
Javier Segarra
|
a63ca1b3c5
|
Merge branch 'dev' into 7134-supplierBalance
|
2025-01-28 23:39:03 +01:00 |
|
Carlos Andrés
|
801629c8db
|
fix: refs #8492 Sage invoiceInTax Check VAT
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 18:04:02 +01:00 |
|
Robert Ferrús
|
8482743baf
|
feat: refs #6822 ACL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:26:48 +01:00 |
|
Javier Segarra
|
9419eada64
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2025-01-28 08:46:17 +01:00 |
|
Javi Gallego
|
0def25ad15
|
Merge branch 'dev' into 7686-onPrevious
|
2025-01-28 08:28:16 +01:00 |
|
Javi Gallego
|
1261722943
|
Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-27 15:12:51 +00:00 |
|
Javi Gallego
|
ba2333f180
|
refactor: refs #7686 remove unused stored procedures for item shelving and ticket delay
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 15:05:27 +01:00 |
|
Guillermo Bonet
|
a948442e13
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 11:24:05 +01:00 |
|
Guillermo Bonet
|
aecf529976
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 11:23:55 +01:00 |
|
Guillermo Bonet
|
cd8e04d648
|
refactor: refs #7568 ticket_doCmr ignore alertLevel
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 11:22:21 +01:00 |
|
Guillermo Bonet
|
75168eef91
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 11:04:34 +01:00 |
|
Guillermo Bonet
|
75b0589561
|
feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-24 12:34:08 +01:00 |
|
Guillermo Bonet
|
e9f1e28ac0
|
feat: refs #8227 Added roadmap_cloneDay
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 11:20:16 +01:00 |
|
Guillermo Bonet
|
a6908aa8c0
|
Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-24 06:00:37 +00:00 |
|
Guillermo Bonet
|
ce8b707400
|
Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-23 14:55:01 +01:00 |
|
Guillermo Bonet
|
162cd4d69e
|
feat: refs #8227 Roadmap major changes
|
2025-01-23 14:54:59 +01:00 |
|
Javier Segarra
|
c3361fd49b
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-23 14:48:28 +01:00 |
|
Robert Ferrús
|
0038fabcc6
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 12:00:13 +00:00 |
|
Robert Ferrús
|
d8847d3d09
|
feat: refs #6822 change request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 12:59:32 +01:00 |
|
Ivan Mas
|
d98a867e12
|
Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 11:38:38 +00:00 |
|
Robert Ferrús
|
1816ff6cf4
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:22:51 +00:00 |
|
Robert Ferrús
|
14e69c1c64
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:21:32 +00:00 |
|
Guillermo Bonet
|
0177353b30
|
Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:19:08 +00:00 |
 Alex Moreno
|
200a7cf995
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-23 08:33:58 +01:00 |
|
Robert Ferrús
|
0f531d4b74
|
feat: refs #6822 change request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-22 13:24:06 +01:00 |
|
Robert Ferrús
|
e92e1d3a46
|
feat: refs #6822 refs #688 change request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-22 13:20:24 +01:00 |
|
Ivan Mas
|
43528a0a53
|
feat: refs #8342 deprecate sorter and splitLine tables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-22 13:04:16 +01:00 |
|
Guillermo Bonet
|
052630d268
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-22 12:40:58 +01:00 |
|
Javier Segarra
|
2a4bad5034
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-21 23:43:07 +01:00 |
|
Javier Segarra
|
294c2f832e
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 14:53:19 +01:00 |
|
Guillermo Bonet
|
482fe77159
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 14:03:50 +01:00 |
|
Javier Segarra
|
dfcfd34202
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 13:42:36 +01:00 |
|
Robert Ferrús
|
7292ac48b2
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-21 08:48:24 +00:00 |
|
Javi Gallego
|
8e21ca5293
|
Merge branch 'dev' into 8381-thermographTravel
|
2025-01-21 07:53:38 +01:00 |
|
Guillermo Bonet
|
477646ba31
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-20 14:43:14 +01:00 |
|
Robert Ferrús
|
316a17304f
|
feat: refs #8401 restriction itemFk
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 12:26:29 +01:00 |
|
Robert Ferrús
|
4b78c12ee4
|
Merge branch 'master' into 8401-itemTaxCountryTrigger
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 10:26:14 +00:00 |
|
Robert Ferrús
|
cb065f42cd
|
feat: refs #8401 change request
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 11:19:24 +01:00 |
|
Guillermo Bonet
|
04180bf8da
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-20 07:52:04 +01:00 |
|
Guillermo Bonet
|
934507569e
|
feat: refs #7531 Added comment
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:48:43 +01:00 |
|
Guillermo Bonet
|
e6abb1d759
|
feat: refs #7531 Minor change
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:41:41 +01:00 |
|
Guillermo Bonet
|
044a22bc3e
|
feat: refs #7531 Deleted address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:13:04 +01:00 |
|
Robert Ferrús
|
ce96b0a819
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-19 07:58:16 +00:00 |
|
Robert Ferrús
|
6c2071742c
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-19 07:38:25 +00:00 |
|
Robert Ferrús
|
5fe032ac75
|
feat: refs #8401 create triggers to itemTaxCountry
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-19 08:30:14 +01:00 |
|
Javi Gallego
|
4f68a7d262
|
feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-17 15:36:11 +01:00 |
|
Guillermo Bonet
|
e636d43f04
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 09:42:15 +01:00 |
|
Guillermo Bonet
|
a666cfa4cd
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 09:40:07 +01:00 |
|
Javi Gallego
|
d4b7d54052
|
Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3345
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-17 08:30:44 +00:00 |
|
Guillermo Bonet
|
1aa1fbda6c
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 08:10:26 +01:00 |
|
Guillermo Bonet
|
69b78b6bf1
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-01-16 15:04:21 +01:00 |
|
Javi Gallego
|
125b7730e7
|
feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-16 12:56:04 +01:00 |
|
Robert Ferrús
|
4853e45051
|
feat: refs #8398 change merge.spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-16 07:29:40 +01:00 |
|
Guillermo Bonet
|
c2ca9cfbe5
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-15 12:26:16 +01:00 |
|
Carlos Andrés
|
948ad3a752
|
Merge branch 'dev' into 7965-unifyProblems
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-15 10:16:25 +00:00 |
|
Javier Segarra
|
84dfdcb79a
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-14 12:43:25 +01:00 |
|
Robert Ferrús
|
277cd80f50
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-14 07:13:52 +00:00 |
|
Javier Segarra
|
9bfc2a01c5
|
perf: refs #7134 sql style
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 23:09:13 +01:00 |
|
Javier Segarra
|
f207222b47
|
Merge branch 'dev' into 7134-supplierBalance
|
2025-01-13 11:56:25 +01:00 |
|
Alex Moreno
|
951376af2f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-13 09:19:03 +01:00 |
|
Robert Ferrús
|
1c30de5eee
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 09:36:09 +00:00 |
|
Robert Ferrús
|
bdaaffbbd7
|
feat: refs #7584 changes request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 10:33:19 +01:00 |
|
Guillermo Bonet
|
886383b82d
|
Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-10 10:01:40 +01:00 |
|
Sergio De la torre
|
1ac75d87ad
|
fix: refs #6861 refs#6861 addPrevOK
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-01-10 08:55:45 +01:00 |
|
Carlos Andrés
|
2d8bda2b56
|
fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-09 15:46:04 +01:00 |
|
Carlos Andrés
|
09b4b2cf1b
|
fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-09 11:52:30 +01:00 |
|
Guillermo Bonet
|
2f0a79da3f
|
Merge branch 'test' into dev
|
2025-01-09 11:34:53 +01:00 |
|
Guillermo Bonet
|
1787cd3102
|
Merge branch 'master' into test
|
2025-01-09 11:34:41 +01:00 |
|
Guillermo Bonet
|
2141d7d95d
|
fix: refs #7912 Major corrections waste_addSales
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 11:29:07 +01:00 |
|
Carlos Andrés
|
638a8e344d
|
fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-09 10:34:49 +01:00 |
|
Carlos Andrés
|
8f99b14510
|
fix: refs #7965 UnifyProblems
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-09 08:43:14 +01:00 |
|
Carlos Andrés
|
71fcce4ed7
|
Merge branch 'dev' into 7965-unifyProblems
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-09 08:13:42 +01:00 |
|
Guillermo Bonet
|
6b39e5c651
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:30:14 +01:00 |
|
Guillermo Bonet
|
15ac9bfd0a
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:30:04 +01:00 |
|
Guillermo Bonet
|
d0d1950e75
|
fix: refs #7912 Changed week num param to to be similar vn.time
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:28:14 +01:00 |
|
Javi Gallego
|
1816b6de67
|
feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables
|
2025-01-08 10:24:18 +01:00 |
|
Robert Ferrús
|
5d337c4def
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 06:34:24 +00:00 |
|
Robert Ferrús
|
94ccdabe89
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 06:23:04 +00:00 |