hotFix(ticket): refs #7225 fix advanced and movable #2356

Merged
alexm merged 6 commits from 7225-hotFix_ticket_advanced_movable into master 2024-04-25 05:52:40 +00:00
4 changed files with 17 additions and 6 deletions
Showing only changes of commit 2638b93299 - Show all commits

View File

@ -43,7 +43,7 @@ BEGIN
WHERE sub.amountTaxableBase<>sub2.amountTaxableBase WHERE sub.amountTaxableBase<>sub2.amountTaxableBase
AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase
UNION ALL UNION ALL
SELECT CONCAT('- Factura Duplicada: ', mc.Asiento) SELECT CONCAT('- Factura Duplicada: ', accountingEntryFk)
FROM accountingEntryError FROM accountingEntryError
)sub; )sub;

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 ;

View File

@ -15,7 +15,7 @@ BEGIN
FROM `entry` FROM `entry`
WHERE id = vSelf; WHERE id = vSelf;
IF vIsBooked AND NOT @isModeInventory THEN IF vIsBooked AND NOT IFNULL(@isModeInventory, FALSE) THEN
CALL util.throw('Entry is already booked'); CALL util.throw('Entry is already booked');
END IF; END IF;
END$$ END$$

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,12 +36,15 @@ 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),
NULL NULL
); );
DROP TEMPORARY TABLE tmp.recalcEntryCommision; DROP TEMPORARY TABLE tmp.recalcEntryCommision;
END$$ END$$
DELIMITER ; DELIMITER ;