details: https://code.openbravo.com/erp/stable/2.50/rev/b4f60af6dcc5
changeset: 9663:b4f60af6dcc5
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Thu Sep 22 10:37:57 2011 +0200
summary: Fixes issue 18466: Problems with Tax Rates
diffstat:
src-db/database/model/functions/C_GETTAX.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diffs (71 lines):
diff -r 48ff2c5071b4 -r b4f60af6dcc5
src-db/database/model/functions/C_GETTAX.xml
--- a/src-db/database/model/functions/C_GETTAX.xml Wed Sep 21 12:45:26
2011 +0200
+++ b/src-db/database/model/functions/C_GETTAX.xml Thu Sep 22 10:37:57
2011 +0200
@@ -171,13 +171,13 @@
(SELECT t.C_Tax_ID, '' AS billToC_Location_ID, '' AS IsTaxExempt
FROM (SELECT C_Tax_ID, C_Country_ID, C_Region_ID, To_Country_Id,
To_Region_ID, ValidFrom, C_TaxCategory_ID,
- Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType
+ Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType,
c_Tax.ad_org_id,c_Tax.ad_client_id
FROM c_Tax
WHERE c_Tax.isActive = 'Y'
UNION
SELECT tz.C_Tax_ID, tz.From_Country_ID, tz.From_Region_ID,
tz.To_Country_ID,
tz.To_Region_ID, ValidFrom, C_TaxCategory_ID,
- Parent_Tax_Id, C_BP_TaxCategory_ID, ct.SoPoType
+ Parent_Tax_Id, C_BP_TaxCategory_ID, ct.SoPoType,
ct.ad_org_id,ct.ad_client_id
FROM c_Tax_Zone tz,
c_Tax ct
WHERE tz.C_Tax_ID = ct.C_Tax_ID
@@ -194,10 +194,11 @@
AND(t.To_Country_ID = lt.C_Country_ID OR(t.To_Country_ID IS NULL))
AND(t.To_Region_ID = lt.C_Region_ID OR(t.To_Region_ID IS NULL))
AND t.ValidFrom <= p_shipDate
+ AND ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id) <> -1
-- AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR
(v_BPTaxCategory IS NULL))
AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID
= v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then
'S' else 'P' end)))
- ORDER BY t.C_BP_TaxCategory_ID, t.C_Country_ID, t.To_Country_ID,
t.C_Region_ID, t.To_Region_ID, t.ValidFrom DESC
+ ORDER BY ad_isorgincluded(p_org_id,
t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID, t.C_Country_ID,
t.To_Country_ID, t.C_Region_ID, t.To_Region_ID, t.ValidFrom DESC
)
LOOP
v_TaxID := SEL1.C_Tax_ID;
@@ -209,13 +210,13 @@
FROM
(SELECT C_Tax_ID, C_Country_ID, C_Region_ID, To_Country_Id,
To_Region_ID, ValidFrom, C_TaxCategory_ID,
- Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType
+ Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType,
c_Tax.ad_org_id,c_Tax.ad_client_id
FROM c_Tax
WHERE c_Tax.isActive = 'Y'
UNION
SELECT tz.C_Tax_ID, tz.From_Country_ID, tz.From_Region_ID,
tz.To_Country_ID,
tz.To_Region_ID, ValidFrom, C_TaxCategory_ID,
- Parent_Tax_Id, C_BP_TaxCategory_ID, SoPoType
+ Parent_Tax_Id, C_BP_TaxCategory_ID, SoPoType, ct.ad_org_id,
ct.ad_client_id
FROM c_Tax_Zone tz,
c_Tax ct
WHERE tz.C_Tax_ID = ct.C_Tax_ID
@@ -233,10 +234,11 @@
AND t.To_Country_ID IS NULL
AND t.To_Region_ID IS NULL
AND t.ValidFrom <= p_shipDate
+ AND ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id) <> -1
--AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR
(v_BPTaxCategory IS NULL))
AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND
t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then
'S' else 'P' end)))
- ORDER BY t.C_BP_TaxCategory_ID,t.C_Country_ID, t.C_Region_ID,
t.ValidFrom DESC
+ ORDER BY ad_isorgincluded(p_org_id,
t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID,t.C_Country_ID,
t.C_Region_ID, t.ValidFrom DESC
)
LOOP
v_TaxID := SEL2.C_Tax_ID;
@@ -256,7 +258,8 @@
AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND
t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then
'S' else 'P' end)))
AND t.isActive = 'Y'
- ORDER BY t.C_BP_TaxCategory_ID, t.ValidFrom DESC
+ AND ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id) <> -1
+ ORDER BY ad_isorgincluded(p_org_id,
t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID, t.ValidFrom DESC
)
LOOP
v_TaxID := SEL3.C_Tax_ID;
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
