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

BF 2954479 - Project Phase and Task not set in accounting fact 

Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2954479
This commit is contained in:
phib 2010-02-18 22:08:18 +00:00
parent 1cbd9b01c1
commit 6c16c5beee
5 changed files with 1190 additions and 1106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
base/src/org/compiere/acct/Doc.java
View File

@ -2013,6 +2013,38 @@ public abstract class Doc
return 0;
} // getC_Project_ID
/**
* Get C_ProjectPhase_ID
* @return Project Phase
*/
public int getC_ProjectPhase_ID()
{
int index = p_po.get_ColumnIndex("C_ProjectPhase_ID");
if (index != -1)
{
Integer ii = (Integer)p_po.get_Value(index);
if (ii != null)
return ii.intValue();
}
return 0;
} // getC_ProjectPhase_ID
/**
* Get C_ProjectTask_ID
* @return Project Task
*/
public int getC_ProjectTask_ID()
{
int index = p_po.get_ColumnIndex("C_ProjectTask_ID");
if (index != -1)
{
Integer ii = (Integer)p_po.get_Value(index);
if (ii != null)
return ii.intValue();
}
return 0;
} // getC_ProjectTask_ID
/**
* Get C_SalesRegion_ID
* @return Sales Region

32
base/src/org/compiere/acct/DocLine.java
View File

@ -983,6 +983,38 @@ public class DocLine
return 0;
} // getC_Project_ID
/**
* Get Project Phase
* @return C_ProjectPhase_ID
*/
public int getC_ProjectPhase_ID()
{
int index = p_po.get_ColumnIndex("C_ProjectPhase_ID");
if (index != -1)
{
Integer ii = (Integer)p_po.get_Value(index);
if (ii != null)
return ii.intValue();
}
return 0;
} // getC_ProjectPhase_ID
/**
* Get Project Task
* @return C_ProjectTask_ID
*/
public int getC_ProjectTask_ID()
{
int index = p_po.get_ColumnIndex("C_ProjectTask_ID");
if (index != -1)
{
Integer ii = (Integer)p_po.get_Value(index);
if (ii != null)
return ii.intValue();
}
return 0;
} // getC_ProjectTask_ID
/**
* Get Campaign
* @return C_Campaign_ID

6
base/src/org/compiere/acct/Doc_MatchInv.java
View File

@ -216,6 +216,8 @@ public class Doc_MatchInv extends Doc
pv.setC_Activity_ID(m_invoiceLine.getC_Activity_ID());
pv.setC_Campaign_ID(m_invoiceLine.getC_Campaign_ID());
pv.setC_Project_ID(m_invoiceLine.getC_Project_ID());
pv.setC_ProjectPhase_ID(m_invoiceLine.getC_ProjectPhase_ID());
pv.setC_ProjectTask_ID(m_invoiceLine.getC_ProjectTask_ID());
pv.setC_UOM_ID(m_invoiceLine.getC_UOM_ID());
pv.setUser1_ID(m_invoiceLine.getUser1_ID());
pv.setUser2_ID(m_invoiceLine.getUser2_ID());
@ -251,6 +253,8 @@ public class Doc_MatchInv extends Doc
cr.setC_Activity_ID(m_invoiceLine.getC_Activity_ID());
cr.setC_Campaign_ID(m_invoiceLine.getC_Campaign_ID());
cr.setC_Project_ID(m_invoiceLine.getC_Project_ID());
cr.setC_ProjectPhase_ID(m_invoiceLine.getC_ProjectPhase_ID());
cr.setC_ProjectTask_ID(m_invoiceLine.getC_ProjectTask_ID());
cr.setC_UOM_ID(m_invoiceLine.getC_UOM_ID());
cr.setUser1_ID(m_invoiceLine.getUser1_ID());
cr.setUser2_ID(m_invoiceLine.getUser2_ID());
@ -293,6 +297,8 @@ public class Doc_MatchInv extends Doc
pv.setC_Activity_ID(m_invoiceLine.getC_Activity_ID());
pv.setC_Campaign_ID(m_invoiceLine.getC_Campaign_ID());
pv.setC_Project_ID(m_invoiceLine.getC_Project_ID());
pv.setC_ProjectPhase_ID(m_invoiceLine.getC_ProjectPhase_ID());
pv.setC_ProjectTask_ID(m_invoiceLine.getC_ProjectTask_ID());
pv.setC_UOM_ID(m_invoiceLine.getC_UOM_ID());
pv.setUser1_ID(m_invoiceLine.getUser1_ID());
pv.setUser2_ID(m_invoiceLine.getUser2_ID());

4
base/src/org/compiere/acct/Doc_MatchPO.java
View File

@ -204,6 +204,8 @@ public class Doc_MatchPO extends Doc
cr.setC_Activity_ID(m_oLine.getC_Activity_ID());
cr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
cr.setC_Project_ID(m_oLine.getC_Project_ID());
cr.setC_ProjectPhase_ID(m_oLine.getC_ProjectPhase_ID());
cr.setC_ProjectTask_ID(m_oLine.getC_ProjectTask_ID());
cr.setC_UOM_ID(m_oLine.getC_UOM_ID());
cr.setUser1_ID(m_oLine.getUser1_ID());
cr.setUser2_ID(m_oLine.getUser2_ID());
@ -220,6 +222,8 @@ public class Doc_MatchPO extends Doc
dr.setC_Activity_ID(m_oLine.getC_Activity_ID());
dr.setC_Campaign_ID(m_oLine.getC_Campaign_ID());
dr.setC_Project_ID(m_oLine.getC_Project_ID());
dr.setC_ProjectPhase_ID(m_oLine.getC_ProjectPhase_ID());
dr.setC_ProjectTask_ID(m_oLine.getC_ProjectTask_ID());
dr.setC_UOM_ID(m_oLine.getC_UOM_ID());
dr.setUser1_ID(m_oLine.getUser1_ID());
dr.setUser2_ID(m_oLine.getUser2_ID());

10
base/src/org/compiere/acct/FactLine.java
View File

@ -394,6 +394,14 @@ public final class FactLine extends X_Fact_Acct
setC_Project_ID (m_docLine.getC_Project_ID());
if (getC_Project_ID() == 0)
setC_Project_ID (m_doc.getC_Project_ID());
if (m_docLine != null)
setC_ProjectPhase_ID(m_docLine.getC_ProjectPhase_ID());
if (getC_ProjectPhase_ID() == 0)
setC_ProjectPhase_ID (m_doc.getC_ProjectPhase_ID());
if (m_docLine != null)
setC_ProjectTask_ID(m_docLine.getC_ProjectTask_ID());
if (getC_ProjectTask_ID() == 0)
setC_ProjectTask_ID (m_doc.getC_ProjectTask_ID());
// Campaign
if (m_docLine != null)
setC_Campaign_ID (m_docLine.getC_Campaign_ID());
@ -1092,6 +1100,8 @@ public final class FactLine extends X_Fact_Acct
// Dimensions
setAD_OrgTrx_ID(fact.getAD_OrgTrx_ID());
setC_Project_ID (fact.getC_Project_ID());
setC_ProjectPhase_ID(fact.getC_ProjectPhase_ID());
setC_ProjectTask_ID(fact.getC_ProjectTask_ID());
setC_Activity_ID(fact.getC_Activity_ID());
setC_Campaign_ID(fact.getC_Campaign_ID());
setC_SalesRegion_ID(fact.getC_SalesRegion_ID());