Merge branch 'dev' into 6500-procRefactor8

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -188,11 +188,11 @@ BEGIN
 		FROM tPendingDuedates vp
 			LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
-            LEFT JOIN clientRisk cr ON cr.clientFk = c.id
+			JOIN clientRisk cr ON cr.clientFk = c.id 
+				AND cr.companyFk = vp.companyFk
 			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
 			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
-            LEFT JOIN country co ON co.id = be.countryFk
-                AND cr.companyFk = vp.companyFk;
+			LEFT JOIN country co ON co.id = be.countryFk;
 
 	DROP TEMPORARY TABLE tOpeningBalances;
 	DROP TEMPORARY TABLE tPendingDuedates;

db/routines/vn/procedures/sale_replaceItem.sql

@@ -79,10 +79,6 @@ BEGIN
 		ORDER BY (vQuantity % `grouping`) ASC
 		LIMIT 1;
 
-	IF vNewPrice IS NULL THEN
-		CALL util.throw('price retrieval failed');
-	END IF;
-
 	IF vNewPrice > vOldPrice THEN
 		SET vFinalPrice = vOldPrice;
 		SET vOption = 'substitution';