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

IDEMPIERE-3496 FACT_ACCT of Invoice didn't contain LocTo, LocFrom dimensions

This commit is contained in:
Carlos Ruiz 2019-01-26 13:46:41 +01:00
parent 926fe806f8
commit 1a6c14220e
1 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java
View File

@ -415,16 +415,6 @@ public class Doc_Invoice extends Doc
serviceAmt = serviceAmt.add(amt); serviceAmt = serviceAmt.add(amt);
} }
} }
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), true); // from Loc
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), false); // to Loc
}
}
// Receivables DR // Receivables DR
int receivables_ID = getValidCombination_ID(Doc.ACCTTYPE_C_Receivable, as); int receivables_ID = getValidCombination_ID(Doc.ACCTTYPE_C_Receivable, as);
@ -446,6 +436,17 @@ public class Doc_Invoice extends Doc
if (serviceAmt.signum() != 0) if (serviceAmt.signum() != 0)
fact.createLine(null, MAccount.get(getCtx(), receivablesServices_ID), fact.createLine(null, MAccount.get(getCtx(), receivablesServices_ID),
getC_Currency_ID(), serviceAmt, null); getC_Currency_ID(), serviceAmt, null);
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), true); // from Loc
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), false); // to Loc
}
}
} }
// ARC // ARC
else if (getDocumentType().equals(DOCTYPE_ARCredit)) else if (getDocumentType().equals(DOCTYPE_ARCredit))
@ -496,16 +497,7 @@ public class Doc_Invoice extends Doc
serviceAmt = serviceAmt.add(amt); serviceAmt = serviceAmt.add(amt);
} }
} }
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), true); // from Loc
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), false); // to Loc
}
}
// Receivables CR // Receivables CR
int receivables_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable, as); int receivables_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable, as);
int receivablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable_Services, as); int receivablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_C_Receivable_Services, as);
@ -526,6 +518,17 @@ public class Doc_Invoice extends Doc
if (serviceAmt.signum() != 0) if (serviceAmt.signum() != 0)
fact.createLine(null, MAccount.get(getCtx(), receivablesServices_ID), fact.createLine(null, MAccount.get(getCtx(), receivablesServices_ID),
getC_Currency_ID(), null, serviceAmt); getC_Currency_ID(), null, serviceAmt);
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), true); // from Loc
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), false); // to Loc
}
}
} }
// ** API // ** API
@ -600,16 +603,6 @@ public class Doc_Invoice extends Doc
line.getDescription(), getTrxName()); line.getDescription(), getTrxName());
} }
} }
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), true); // from Loc
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), false); // to Loc
}
}
// Liability CR // Liability CR
int payables_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability, as); int payables_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability, as);
@ -631,6 +624,18 @@ public class Doc_Invoice extends Doc
if (serviceAmt.signum() != 0) if (serviceAmt.signum() != 0)
fact.createLine(null, MAccount.get(getCtx(), payablesServices_ID), fact.createLine(null, MAccount.get(getCtx(), payablesServices_ID),
getC_Currency_ID(), null, serviceAmt); getC_Currency_ID(), null, serviceAmt);
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), true); // from Loc
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), false); // to Loc
}
}
// //
updateProductPO(as); // Only API updateProductPO(as); // Only API
} }
@ -705,16 +710,7 @@ public class Doc_Invoice extends Doc
line.getDescription(), getTrxName()); line.getDescription(), getTrxName());
} }
} }
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), true); // from Loc
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), false); // to Loc
}
}
// Liability DR // Liability DR
int payables_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability, as); int payables_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability, as);
int payablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability_Services, as); int payablesServices_ID = getValidCombination_ID (Doc.ACCTTYPE_V_Liability_Services, as);
@ -735,6 +731,17 @@ public class Doc_Invoice extends Doc
if (serviceAmt.signum() != 0) if (serviceAmt.signum() != 0)
fact.createLine(null, MAccount.get(getCtx(), payablesServices_ID), fact.createLine(null, MAccount.get(getCtx(), payablesServices_ID),
getC_Currency_ID(), serviceAmt, null); getC_Currency_ID(), serviceAmt, null);
// Set Locations
FactLine[] fLines = fact.getLines();
for (int i = 0; i < fLines.length; i++)
{
if (fLines[i] != null)
{
fLines[i].setLocationFromBPartner(getC_BPartner_Location_ID(), true); // from Loc
fLines[i].setLocationFromOrg(fLines[i].getAD_Org_ID(), false); // to Loc
}
}
} }
else else
{ {