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

Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-04-23 13:57:18 +02:00
parent fbf1b6e1af 8f6303e851
commit 36c8a8db0f
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -24,7 +24,7 @@ node {
FROM_GIT = env.JOB_NAME.startsWith('gitea/') FROM_GIT = env.JOB_NAME.startsWith('gitea/')
RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
RUN_BUILD = PROTECTED_BRANCH && FROM_GIT RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
env.DEBUG = 'strong-remoting:shared-method' // env.DEBUG = 'strong-remoting:shared-method'
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
echo "NODE_NAME: ${env.NODE_NAME}" echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}" echo "WORKSPACE: ${env.WORKSPACE}"

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

@ -19,10 +19,10 @@ BEGIN
AND a.hasWeightVolumetric AND a.hasWeightVolumetric
LIMIT 1; LIMIT 1;
DROP TEMPORARY TABLE IF EXISTS tmp.buysToCheck; DROP TEMPORARY TABLE tmp.buysToCheck;
IF hasVolumetricAgency THEN IF hasVolumetricAgency THEN
CALL util.throw('Some purchase line has an item without size or weight per stem in the volumetric agency.'); CALL util.throw('Item lacks size/weight in purchase line at agency');
END IF; END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

11
db/routines/vn/procedures/entry_updateComission.sql
View File

@ -9,6 +9,14 @@ BEGIN
DECLARE vCurrencyName VARCHAR(25); DECLARE vCurrencyName VARCHAR(25);
DECLARE vComission INT; DECLARE vComission INT;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
ROLLBACK;
RESIGNAL;
END;
START TRANSACTION;
CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision
SELECT e.id SELECT e.id
FROM vn.entry e FROM vn.entry e
@ -28,6 +36,9 @@ BEGIN
WHERE id = vCurrency; WHERE id = vCurrency;
CALL entry_recalc(); CALL entry_recalc();
COMMIT;
SELECT util.notification_send( SELECT util.notification_send(
'entry-update-comission', 'entry-update-comission',
JSON_OBJECT('currencyName', vCurrencyName, 'referenceCurrent', vComission), JSON_OBJECT('currencyName', vCurrencyName, 'referenceCurrent', vComission),