Changes done in ORG_STRUCTURE SQL joins added version_id and table_no columns...

Changes done in ORG_STRUCTURE SQL joins added version_id and table_no columns with pos_code and pos_code__repto
And in Outer SQL added check on column table_no with ISER.TABLE_NO__HIER and ISER.ITEM_SER 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200386 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/module-resource/scm/Sales Trends/SQL/salesTrendByMonth_data_model.sql

 
-Insert into DATA_MODEL (DATA_MODEL,DESCR,DATA_SOURCE,SOURCE_DET,SOURCE_INPUT,FORMAT,CHG_DATE,CHG_USER,CHG_TERM,VALID_DAYS,SCOPE_NAME,SYNC_DATA_MODEL) values ('SALES_ANALYSIS_BY_MONTH','SALES ANALYSIS DATA','S','
+Delete from DATA_MODEL where DATA_MODEL = 'SALES_ANALYSIS_BY_MONTH';
+
+Insert into DATA_MODEL (DATA_MODEL,DESCR,DATA_SOURCE,SOURCE_DET,SOURCE_INPUT,FORMAT,CHG_DATE,CHG_USER,CHG_TERM,VALID_DAYS,SCOPE_NAME,SYNC_DATA_MODEL) 
+values ('SALES_ANALYSIS_BY_MONTH','SALES ANALYSIS DATA','S','
 select DSS.DOC_DATE as "TRANSACTION DATE",
 DSS.POS_CODE as "LEVEL CODE",
 NVL(DHH.lv4,''NA'') as "LEVEL1 CODE",
@@ -72,12 +75,12 @@ lv3.pos_code lv3,lv3.pos_code__repto lv3_repo,lv3.descr as lv3_descr,
 lv4.pos_code lv4,lv4.pos_code__repto lv4_repo,lv4.descr as lv4_descr,
 lv1.pos_code,lv1.table_no,lv1.version_id,lv1.pool_code
 from org_structure lv1
-left outer join org_structure lv2 on lv1.pos_code__repto=lv2.pos_code 
-left outer join org_structure lv3 on lv2.pos_code__repto=lv3.pos_code
-left outer join org_structure lv4 on lv3.pos_code__repto=lv4.pos_code 
-) DHH ON
-  DHH.POS_CODE = DSS.POS_CODE
+left outer join org_structure lv2 on lv1.pos_code__repto=lv2.pos_code and lv1.table_no=lv2.table_no and lv1.version_id=lv2.version_id 
+left outer join org_structure lv3 on lv2.pos_code__repto=lv3.pos_code and lv2.table_no=lv3.table_no and lv2.version_id=lv3.version_id
+left outer join org_structure lv4 on lv3.pos_code__repto=lv4.pos_code and lv3.table_no=lv4.table_no and lv3.version_id=lv4.version_id 
+) DHH ON DHH.POS_CODE = DSS.POS_CODE
  AND DHH.version_id in (select version_id from version where to_date(sysdate) between eff_from and valid_upto )
+ AND DHH.table_no = nvl( ISER.TABLE_NO__HIER, ISER.ITEM_SER )
  WHERE to_char(DSS.DOC_DATE, ''MM/YYYY'')= ?
  AND I.ITEM_SER >= ?
  AND I.ITEM_SER <= ?