verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge pull request '8030-newPriceComponent' (!3012) from 8030-newPriceComponent into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3012
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
This commit is contained in:
Pako Natek 2024-09-24 10:39:04 +00:00
parent 63a4cb1847 403637dd8c
commit 0822996f20
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/procedures/catalog_componentCalculate.sql
View File

@ -7,7 +7,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`catalog_componentCalc
) )
BEGIN BEGIN
/** /**
* Calcula los componentes de los articulos de tmp.ticketLot * Calcula los componentes de los articulos de la tabla tmp.ticketLot
* *
* @param vZoneFk para calcular el transporte * @param vZoneFk para calcular el transporte
* @param vAddressFk Consignatario * @param vAddressFk Consignatario
@ -134,7 +134,7 @@ BEGIN
tcb.warehouseFk, tcb.warehouseFk,
tcb.itemFk, tcb.itemFk,
c.id, c.id,
(tcb.base * (1 + IFNULL(tpd.ratIncreasing / 100,0))) + IFNULL(tpd.absIncreasing,0) IFNULL(tcb.base * tpd.ratIncreasing / 100,0) + IFNULL(tpd.absIncreasing,0)
FROM tmp.ticketComponentBase tcb FROM tmp.ticketComponentBase tcb
JOIN component c ON c.code = 'bonus' JOIN component c ON c.code = 'bonus'
JOIN tPriceDelta tpd JOIN tPriceDelta tpd