#5903 Fix country code

#5903 Fix country code from de_metas_endcustomer_fresh_reports.Docs_Sales_Invoice_Root
metasfresh · Dec 11, 2019 · 85a76f8 · 85a76f8
1 parent dc79597
commit 85a76f8
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 4 deletions.
diff --git a/...esh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Docs_Sales_Invoice_Root.sql b/...esh/de.metas.fresh.base/src/main/sql/postgresql/ddl/functions/Docs_Sales_Invoice_Root.sql
@@ -34,10 +34,9 @@ FROM
 	INNER JOIN C_DocType dt ON i.C_DocType_ID = dt.C_DocType_ID AND dt.isActive = 'Y'
 	LEFT OUTER JOIN C_DocType_Trl dtt ON i.C_DocType_ID = dtt.C_DocType_ID AND dtt.AD_Language = $2 AND dtt.isActive = 'Y'
 
-	LEFT OUTER JOIN AD_OrgInfo orginfo ON orginfo.ad_org_id = i.ad_org_id AND orginfo.isActive = 'Y'
-	LEFT OUTER JOIN C_BPartner_Location org_loc ON orginfo.Orgbp_Location_ID = org_loc.C_BPartner_Location_ID AND org_loc.isActive = 'Y'
-	LEFT OUTER JOIN C_Location org_l ON org_loc.C_Location_ID = org_l.C_Location_ID AND org_l.isActive = 'Y'
-	LEFT OUTER JOIN C_Country c ON org_l.C_Country_ID = c.C_Country_ID AND c.isActive = 'Y'
+	LEFT OUTER JOIN C_BPartner_Location bpl ON bpl.C_BPartner_Location_id = i.C_BPartner_Location_ID 
+	LEFT OUTER JOIN C_Location l ON l.C_Location_ID = bpl.C_Location_ID 
+	LEFT OUTER JOIN C_Country c ON c.C_Country_ID = l.C_Country_ID 
 WHERE
 	i.C_Invoice_ID = $1 AND i.isActive = 'Y'
 $$

diff --git a/...l/system/70-de.metas.fresh/5538650_sys_gh5903_FixCountryCodeInDocs_Sales_Invoice_Root.sql b/...l/system/70-de.metas.fresh/5538650_sys_gh5903_FixCountryCodeInDocs_Sales_Invoice_Root.sql
@@ -0,0 +1,44 @@
+DROP FUNCTION IF EXISTS de_metas_endcustomer_fresh_reports.Docs_Sales_Invoice_Root ( IN Record_ID numeric, IN AD_Language Character Varying (6) );
+CREATE OR REPLACE FUNCTION de_metas_endcustomer_fresh_reports.Docs_Sales_Invoice_Root ( IN Record_ID numeric, IN AD_Language Character Varying (6) )
+RETURNS TABLE 
+	(AD_Org_ID numeric,
+	DocStatus character(2),
+	PrintName character varying(60),
+	countrycode character(2),
+	C_Currency_ID numeric,
+	displayhu text
+	)
+AS
+$$	
+SELECT
+	i.AD_Org_ID,
+	i.DocStatus,
+	dt.PrintName,
+	c.countrycode,
+	i.C_Currency_ID,
+	CASE
+		WHEN
+		EXISTS(
+			SELECT 0
+			FROM C_InvoiceLine il
+			INNER JOIN M_Product p ON il.M_Product_ID = p.M_Product_ID AND p.isActive = 'Y'
+			INNER JOIN M_Product_Category pc ON p.M_Product_Category_ID = pc.M_Product_Category_ID AND pc.isActive = 'Y'
+			WHERE pc.M_Product_Category_ID = getSysConfigAsNumeric('PackingMaterialProductCategoryID', il.AD_Client_ID, il.AD_Org_ID)
+			AND il.C_Invoice_ID = i.C_Invoice_ID AND il.isActive = 'Y'
+		)
+		THEN 'Y'
+		ELSE 'N'
+	END as displayhu
+FROM
+	C_Invoice i
+	INNER JOIN C_DocType dt ON i.C_DocType_ID = dt.C_DocType_ID AND dt.isActive = 'Y'
+	LEFT OUTER JOIN C_DocType_Trl dtt ON i.C_DocType_ID = dtt.C_DocType_ID AND dtt.AD_Language = $2 AND dtt.isActive = 'Y'
+
+	LEFT OUTER JOIN C_BPartner_Location bpl ON bpl.C_BPartner_Location_id = i.C_BPartner_Location_ID 
+	LEFT OUTER JOIN C_Location l ON l.C_Location_ID = bpl.C_Location_ID 
+	LEFT OUTER JOIN C_Country c ON c.C_Country_ID = l.C_Country_ID 
+WHERE
+	i.C_Invoice_ID = $1 AND i.isActive = 'Y'
+$$
+LANGUAGE sql STABLE	
+;