andy/mip
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r6132 from RB-1.0 for #531 (Invalid costs)

Browse Source 
git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@6133 248e525c-4dfb-0310-94bc-949c084e9493
This commit is contained in:
hardya
2008-08-06 11:54:12 +00:00
parent bfdb160ca1
commit 5ece842aa5
1 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Modules/mip_bulk_load.pck
View File

@@ -1185,11 +1185,15 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
,cost_price ,cost_price
,delivery_cost ,delivery_cost
,CASE ,CASE
WHEN valid_from IS NULL THEN WHEN valid_from IS NULL AND valid_to IS NULL THEN
trunc(SYSDATE) trunc(SYSDATE)
ELSE WHEN valid_from IS NULL AND valid_to IS NOT NULL THEN
to_date(valid_from least(trunc(sysdate),to_date(valid_to,'dd/mm/yyyy'))
,'dd/mm/yyyy') WHEN valid_from IS NOT NULL AND valid_to IS NULL THEN
to_date(valid_from
,'dd/mm/yyyy')
ELSE
least(to_date(valid_from, 'dd/mm/yyyy'), to_date(valid_to, 'dd/mm/yyyy'))
END AS valid_from END AS valid_from
,CASE ,CASE
WHEN valid_to IS NULL THEN WHEN valid_to IS NULL THEN
@@ -1238,11 +1242,15 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
,cost_price ,cost_price
,delivery_cost ,delivery_cost
,CASE ,CASE
WHEN valid_from IS NULL THEN WHEN valid_from IS NULL AND valid_to IS NULL THEN
trunc(SYSDATE) trunc(SYSDATE)
ELSE WHEN valid_from IS NULL AND valid_to IS NOT NULL THEN
to_date(valid_from least(trunc(sysdate),to_date(valid_to,'dd/mm/yyyy'))
,'dd/mm/yyyy') WHEN valid_from IS NOT NULL AND valid_to IS NULL THEN
to_date(valid_from
,'dd/mm/yyyy')
ELSE
least(to_date(valid_from, 'dd/mm/yyyy'), to_date(valid_to, 'dd/mm/yyyy'))
END AS valid_from END AS valid_from
,CASE ,CASE
WHEN valid_to IS NULL THEN WHEN valid_to IS NULL THEN
@@ -1291,11 +1299,15 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
,cost_price ,cost_price
,delivery_cost ,delivery_cost
,CASE ,CASE
WHEN valid_from IS NULL THEN WHEN valid_from IS NULL AND valid_to IS NULL THEN
trunc(SYSDATE) trunc(SYSDATE)
ELSE WHEN valid_from IS NULL AND valid_to IS NOT NULL THEN
to_date(valid_from least(trunc(sysdate),to_date(valid_to,'dd/mm/yyyy'))
,'dd/mm/yyyy') WHEN valid_from IS NOT NULL AND valid_to IS NULL THEN
to_date(valid_from
,'dd/mm/yyyy')
ELSE
least(to_date(valid_from, 'dd/mm/yyyy'), to_date(valid_to, 'dd/mm/yyyy'))
END AS valid_from END AS valid_from
,CASE ,CASE
WHEN valid_to IS NULL THEN WHEN valid_to IS NULL THEN
@@ -1344,11 +1356,15 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
,cost_price ,cost_price
,delivery_cost ,delivery_cost
,CASE ,CASE
WHEN valid_from IS NULL THEN WHEN valid_from IS NULL AND valid_to IS NULL THEN
trunc(SYSDATE) trunc(SYSDATE)
ELSE WHEN valid_from IS NULL AND valid_to IS NOT NULL THEN
to_date(valid_from least(trunc(sysdate),to_date(valid_to,'dd/mm/yyyy'))
,'dd/mm/yyyy') WHEN valid_from IS NOT NULL AND valid_to IS NULL THEN
to_date(valid_from
,'dd/mm/yyyy')
ELSE
least(to_date(valid_from, 'dd/mm/yyyy'), to_date(valid_to, 'dd/mm/yyyy'))
END AS valid_from END AS valid_from
,CASE ,CASE
WHEN valid_to IS NULL THEN WHEN valid_to IS NULL THEN
@@ -1452,11 +1468,15 @@ CREATE OR REPLACE PACKAGE BODY mip_bulk_load IS
END AS selling_price END AS selling_price
,'NETW0' || l_network AS regi_code ,'NETW0' || l_network AS regi_code
,CASE ,CASE
WHEN valid_from IS NULL THEN WHEN valid_from IS NULL AND valid_to IS NULL THEN
trunc(SYSDATE) trunc(SYSDATE)
ELSE WHEN valid_from IS NULL AND valid_to IS NOT NULL THEN
to_date(valid_from least(trunc(sysdate),to_date(valid_to,'dd/mm/yyyy'))
,'dd/mm/yyyy') WHEN valid_from IS NOT NULL AND valid_to IS NULL THEN
to_date(valid_from
,'dd/mm/yyyy')
ELSE
least(to_date(valid_from, 'dd/mm/yyyy'), to_date(valid_to, 'dd/mm/yyyy'))
END AS valid_from END AS valid_from
,CASE ,CASE
WHEN valid_to IS NULL THEN WHEN valid_to IS NULL THEN