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

Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-03-06 11:06:40 +00:00
parent 276acf04fa 94014dbd48
commit 5ee78a6b8c
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db/routines/vn/procedures/item_getSimilar.sql
View File

@ -1,7 +1,8 @@
DELIMITER $$ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`( CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
vSelf INT, vSelf INT,
vTicketFk INT, vWarehouseFk INT,
vDated DATE,
vShowType BOOL vShowType BOOL
) )
BEGIN BEGIN
@ -10,11 +11,10 @@ BEGIN
* de veces usado y segun sus caracteristicas. * de veces usado y segun sus caracteristicas.
* *
* @param vSelf Id de artículo * @param vSelf Id de artículo
* @param vTicketFk Id de ticket * @param vWarehouseFk Id de almacen
* @param vDated Fecha
* @param vShowType Mostrar tipos * @param vShowType Mostrar tipos
*/ */
DECLARE vWarehouseFk INT;
DECLARE vShipped DATE;
DECLARE vCalcFk INT; DECLARE vCalcFk INT;
DECLARE vTypeFk INT; DECLARE vTypeFk INT;
DECLARE vPriority INT DEFAULT 1; DECLARE vPriority INT DEFAULT 1;
@ -31,11 +31,6 @@ BEGIN
DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci'; DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
SELECT warehouseFk, shipped
INTO vWarehouseFk, vShipped
FROM ticket
WHERE id = vTicketFk;
SELECT typeFk, SELECT typeFk,
tag5, tag5,
value5, value5,
@ -64,7 +59,7 @@ BEGIN
LEFT JOIN tag t ON t.id = it.tagFk LEFT JOIN tag t ON t.id = it.tagFk
WHERE i.id = vSelf; WHERE i.id = vSelf;
CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped); CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
SELECT i.id itemFk, SELECT i.id itemFk,
i.longName, i.longName,

1
loopback/util/validateIban.js
View File

@ -3,7 +3,6 @@ module.exports = function(iban, countryCode) {
if (typeof iban != 'string') return false; if (typeof iban != 'string') return false;
if (countryCode?.toLowerCase() != 'es') return true; if (countryCode?.toLowerCase() != 'es') return true;
iban = iban.toUpperCase();
iban = trim(iban); iban = trim(iban);
iban = iban.replace(/\s/g, ''); iban = iban.replace(/\s/g, '');

1
modules/client/front/billing-data/index.html
View File

@ -33,6 +33,7 @@
<vn-horizontal> <vn-horizontal>
<vn-textfield <vn-textfield
label="IBAN" label="IBAN"
ng-keyup="$ctrl.client.iban = $ctrl.client.iban.toUpperCase()"
ng-model="$ctrl.client.iban" ng-model="$ctrl.client.iban"
rule rule
on-change="$ctrl.autofillBic()" on-change="$ctrl.autofillBic()"