midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge bug fixes from release to trunk 

merge 12146, 12147

Revision: 12146
Fix [1568777] Consolidated invoice: tax line number should be higher
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=1568777

Revision: 12147
Fix [2844734] Default tree breaks "Accounting Dimensions" window
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2844734

Regards,
Tony Snook
This commit is contained in:
tspc 2010-04-26 08:28:15 +00:00
parent d37f31ad22
commit 947a2d3afc
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/org/compiere/grid/GridController.java
View File

@ -644,7 +644,7 @@ public class GridController extends CPanel
else if (keyColumnName.equals("CM_Media_ID"))
treeName = "AD_TreeCMM_ID";
}
int AD_Tree_ID = Env.getContextAsInt (Env.getCtx(), m_WindowNo, treeName);
int AD_Tree_ID = Env.getContextAsInt (Env.getCtx(), m_WindowNo, treeName, true);
log.config(keyColumnName + " -> " + treeName + " = " + AD_Tree_ID);
if (AD_Tree_ID == 0)
AD_Tree_ID = MTree.getDefaultAD_Tree_ID (

7
db/ddlutils/oracle/views/C_INVOICE_LINETAX_V.sql
View File

@ -96,7 +96,7 @@ UNION -- empty line
SELECT AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,
'en_US', C_Invoice_ID, null,
null, null, null, null,
9998, null,
999998, null,
null, null, null,
null,
null, null, null, null, null, null,
@ -108,7 +108,7 @@ UNION -- tax lines
SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.Updated, it.UpdatedBy,
'en_US', it.C_Invoice_ID, null,
it.C_Tax_ID, null, null, t.TaxIndicator,
9999, null,
999999, null,
null, null, null,
t.Name,
null, null, null, null, null, null,
@ -119,4 +119,5 @@ SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.
null, null, null, null, null, null, null, null,
null, null, null, null, null
FROM C_InvoiceTax it
INNER JOIN C_Tax t ON (it.C_Tax_ID=t.C_Tax_ID);
INNER JOIN C_Tax t ON (it.C_Tax_ID=t.C_Tax_ID);

7
db/ddlutils/oracle/views/C_INVOICE_LINETAX_VT.sql
View File

@ -99,7 +99,7 @@ UNION -- empty line
SELECT i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.CreatedBy, i.Updated, i.UpdatedBy,
AD_Language, i.C_Invoice_ID, null,
null, null, null, null,
9998, null,
999998, null,
null, null, null,
null,
null, null, null, null, null, null,
@ -112,7 +112,7 @@ UNION -- tax lines
SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.Updated, it.UpdatedBy,
t.AD_Language, it.C_Invoice_ID, null,
it.C_Tax_ID, null, null, t.TaxIndicator,
9999, null,
999999, null,
null, null, null,
t.Name,
null, null, null, null, null, null,
@ -123,4 +123,5 @@ SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.
null, null, null, null, null, null, null, null,
null,null,null,null,null
FROM C_InvoiceTax it
INNER JOIN C_Tax_Trl t ON (it.C_Tax_ID=t.C_Tax_ID);
INNER JOIN C_Tax_Trl t ON (it.C_Tax_ID=t.C_Tax_ID);

6
db/ddlutils/postgresql/views/C_INVOICE_LINETAX_V.sql
View File

@ -96,7 +96,7 @@ UNION -- empty line
SELECT AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,
'en_US', C_Invoice_ID, null,
null, null, null, null,
9998, null,
999998, null,
null, null, null,
null,
null, null, null, null, null, null,
@ -108,7 +108,7 @@ UNION -- tax lines
SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.Updated, it.UpdatedBy,
'en_US', it.C_Invoice_ID, null,
it.C_Tax_ID, null, null, t.TaxIndicator,
9999, null,
999999, null,
null, null, null,
t.Name,
null, null, null, null, null, null,
@ -121,5 +121,3 @@ SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.
FROM C_InvoiceTax it
INNER JOIN C_Tax t ON (it.C_Tax_ID=t.C_Tax_ID);

6
db/ddlutils/postgresql/views/C_INVOICE_LINETAX_VT.sql
View File

@ -99,7 +99,7 @@ UNION -- empty line
SELECT i.AD_Client_ID, i.AD_Org_ID, i.IsActive, i.Created, i.CreatedBy, i.Updated, i.UpdatedBy,
AD_Language, i.C_Invoice_ID, null,
null, null, null, null,
9998, null,
999998, null,
null, null, null,
null,
null, null, null, null, null, null,
@ -112,7 +112,7 @@ UNION -- tax lines
SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.Updated, it.UpdatedBy,
t.AD_Language, it.C_Invoice_ID, null,
it.C_Tax_ID, null, null, t.TaxIndicator,
9999, null,
999999, null,
null, null, null,
t.Name,
null, null, null, null, null, null,
@ -125,5 +125,3 @@ SELECT it.AD_Client_ID, it.AD_Org_ID, it.IsActive, it.Created, it.CreatedBy, it.
FROM C_InvoiceTax it
INNER JOIN C_Tax_Trl t ON (it.C_Tax_ID=t.C_Tax_ID);