details: https://code.openbravo.com/erp/stable/2.50/rev/ac7077572bf2
changeset: 9777:ac7077572bf2
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue Jan 10 12:36:48 2012 +0100
summary: Fixes issue 19395: Fiscal Year regularization process do not take
into account all the accounting dimensions
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 43
++++++---
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql | 18
+++-
2 files changed, 41 insertions(+), 20 deletions(-)
diffs (151 lines):
diff -r e06a23c3cbc2 -r ac7077572bf2
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
Tue Jan 10 12:30:25 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
Tue Jan 10 12:36:48 2012 +0100
@@ -89,10 +89,10 @@
CreateRegFactAcctData[] acctSchema =
CreateRegFactAcctData.treeAcctSchema(this, vars
.getClient());
for (int j = 0; j < acctSchema.length; j++) {
- String strRegId = SequenceIdData.getUUID();
- String strCloseId = SequenceIdData.getUUID();
- String strOpenId = SequenceIdData.getUUID();
- String strDivideUpId = SequenceIdData.getUUID();
+ String strRegId = SequenceIdData.getUUID();
+ String strCloseId = SequenceIdData.getUUID();
+ String strOpenId = SequenceIdData.getUUID();
+ String strDivideUpId = SequenceIdData.getUUID();
for (int i = 0; i < dataOrgs.length; i++) {
if (log4j.isDebugEnabled())
log4j.debug("Output: Before buttonReg");
@@ -180,7 +180,9 @@
expense[i].totalamtcr, expense[i].totalamtdr,
expense[i].totalamtcr,
Fact_Acct_Group_ID, Integer.toString((i + 3) * 10),
expense[i].acctdescription,
expense[i].acctvalue, expense[i].cBpartnerId, expense[i].recordId2,
- expense[i].mProductId, expense[i].aAssetId, strRegEntry);
+ expense[i].mProductId, expense[i].aAssetId, strRegEntry,
expense[i].cTaxId,
+ expense[i].cProjectId, expense[i].cActivityId, expense[i].user1Id,
expense[i].user2Id,
+ expense[i].cCampaignId, expense[i].cSalesregionId);
}
for (int j = 0; j < revenue.length; j++) {
BigDecimal totalRevenueAmountDr = new BigDecimal(revenue[j].totalamtdr);
@@ -197,7 +199,10 @@
revenue[j].totalamtcr, revenue[j].totalamtdr,
revenue[j].totalamtcr,
Fact_Acct_Group_ID, Integer.toString((i + j + 3) * 10),
revenue[j].acctdescription,
revenue[j].acctvalue, revenue[j].cBpartnerId, revenue[j].recordId2,
- revenue[j].mProductId, revenue[j].aAssetId, strRegEntry);
+ revenue[j].mProductId, revenue[j].aAssetId, strRegEntry,
revenue[i].cTaxId,
+ revenue[i].cProjectId, revenue[i].cActivityId, revenue[i].user1Id,
revenue[i].user2Id,
+ revenue[i].cCampaignId, revenue[i].cSalesregionId);
+
}
CreateRegFactAcctData[] account =
CreateRegFactAcctData.incomesummary(this, strAcctSchema);
if
(ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr).signum()
> 0) {
@@ -209,7 +214,10 @@
RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr).toString(), "0",
ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr).toString(),
Fact_Acct_Group_ID, "10", account[0].name, account[0].value,
account[0].cBpartnerId,
- account[0].recordId2, account[0].mProductId, account[0].aAssetId,
strRegEntry);
+ account[0].recordId2, account[0].mProductId, account[0].aAssetId,
strRegEntry,
+ account[0].cTaxId, account[0].cProjectId, account[0].cActivityId,
account[0].user1Id,
+ account[0].user2Id, account[0].cCampaignId,
account[0].cSalesregionId);
+
} else if
(ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr)
.signum() < 0) {
Fact_Acct_ID = SequenceIdData.getUUID();
@@ -220,7 +228,10 @@
.subtract(RevenueAmtDr).subtract(ExpenseAmtDr).toString(), "0",
ExpenseAmtCr.add(
RevenueAmtCr).subtract(RevenueAmtDr).subtract(ExpenseAmtDr).toString(), "0",
Fact_Acct_Group_ID, "10", account[0].name, account[0].value,
account[0].cBpartnerId,
- account[0].recordId2, account[0].mProductId, account[0].aAssetId,
strRegEntry);
+ account[0].recordId2, account[0].mProductId, account[0].aAssetId,
strRegEntry,
+ account[0].cTaxId, account[0].cProjectId, account[0].cActivityId,
account[0].user1Id,
+ account[0].user2Id, account[0].cCampaignId,
account[0].cSalesregionId);
+
}
return "Success";
}
@@ -334,10 +345,10 @@
vars.getUser(), strAcctSchema, liability[j].accountId,
CreateRegFactAcctData
.getEndDate(this, strPediodId), strPediodId,
CreateRegFactAcctData.adTableId(this),
"A", CreateRegFactAcctData.cCurrencyId(this, strAcctSchema),
liability[j].totalamtdr,
- liability[j].totalamtcr, liability[j].totalamtdr,
liability[j].totalamtcr,
- Fact_Acct_Group_ID, Integer.toString((i + j + 3) * 10), "C",
- liability[j].acctdescription, liability[j].acctvalue,
liability[j].cBpartnerId,
- liability[j].recordId2, liability[j].mProductId,
liability[j].aAssetId,
+ liability[j].totalamtcr, liability[j].totalamtdr,
liability[j].totalamtcr,
+ Fact_Acct_Group_ID, Integer.toString((i + j + 3) * 10), "C",
+ liability[j].acctdescription, liability[j].acctvalue,
liability[j].cBpartnerId,
+ liability[j].recordId2, liability[j].mProductId,
liability[j].aAssetId,
strClosingEntry, liability[j].cTaxId, liability[j].cProjectId,
liability[j].cActivityId, liability[j].user1Id,
liability[j].user2Id,
liability[j].cCampaignId, liability[j].cSalesregionId);
@@ -375,10 +386,10 @@
vars.getUser(), strAcctSchema, liability[j].accountId,
CreateRegFactAcctData
.getStartDate(this, newPeriod), newPeriod,
CreateRegFactAcctData.adTableId(this),
"A", CreateRegFactAcctData.cCurrencyId(this, strAcctSchema),
liability[j].totalamtcr,
- liability[j].totalamtdr, liability[j].totalamtcr,
liability[j].totalamtdr,
- Fact_Acct_Group_ID2, Integer.toString((i + j + 3) * 10), "O",
- liability[j].acctdescription, liability[j].acctvalue,
liability[j].cBpartnerId,
- liability[j].recordId2, liability[j].mProductId,
liability[j].aAssetId,
+ liability[j].totalamtdr, liability[j].totalamtcr,
liability[j].totalamtdr,
+ Fact_Acct_Group_ID2, Integer.toString((i + j + 3) * 10), "O",
+ liability[j].acctdescription, liability[j].acctvalue,
liability[j].cBpartnerId,
+ liability[j].recordId2, liability[j].mProductId,
liability[j].aAssetId,
strOpeningEntry, liability[0].cTaxId, liability[j].cProjectId,
liability[j].cActivityId, liability[j].user1Id,
liability[j].user2Id,
liability[j].cCampaignId, liability[j].cSalesregionId);
diff -r e06a23c3cbc2 -r ac7077572bf2
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
Tue Jan 10 12:30:25 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
Tue Jan 10 12:36:48 2012 +0100
@@ -54,7 +54,7 @@
<![CDATA[
SELECT (CASE SIGN(SUM(AMTACCTDR)-SUM(AMTACCTCR)) WHEN -1 THEN 0 ELSE
(SUM(AMTACCTDR)-SUM(AMTACCTCR)) END) AS TOTALAMTCR,
(CASE SIGN(SUM(AMTACCTCR)-SUM(AMTACCTDR)) WHEN -1 THEN 0 ELSE
(SUM(AMTACCTCR)-SUM(AMTACCTDR)) END) AS TOTALAMTDR, ACCOUNT_ID,
ACCTDESCRIPTION, ACCTVALUE,
- RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID
+ RECORD_ID2, C_BPARTNER_ID, M_PRODUCT_ID,
A_ASSET_ID,C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
FROM FACT_ACCT
WHERE EXISTS (SELECT 1 FROM C_PERIOD P
WHERE P.C_YEAR_ID = ?
@@ -64,7 +64,8 @@
WHERE C_ELEMENTVALUE.ACCOUNTTYPE = ?)
AND AD_ORG_ID = ?
AND C_ACCTSCHEMA_ID = ?
- GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2,
C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID
+ GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2,
C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,
+
C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID
]]>
</Sql>
<Parameter name="c_year_id"/>
@@ -112,7 +113,8 @@
FACT_ACCT_GROUP_ID,SEQNO, FACTACCTTYPE,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
RECORD_ID2, M_PRODUCT_ID, A_ASSET_ID,
- DESCRIPTION)
+ DESCRIPTION,C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,
+ USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID)
VALUES
( ?,?,?,
'Y',now(),?,now(),?,
@@ -123,7 +125,8 @@
?,TO_NUMBER(?), 'R',
?, ?, ?,
?, ?, ?,
- ?)
+ ?,?,?,?,
+ ?,?,?,?)
]]>
</Sql>
<Parameter name="fact_acct_id"/>
@@ -153,6 +156,13 @@
<Parameter name="product"/>
<Parameter name="asset"/>
<Parameter name="description"/>
+ <Parameter name="c_tax_id"/>
+ <Parameter name="c_project_id"/>
+ <Parameter name="c_activity_id"/>
+ <Parameter name="user1_id"/>
+ <Parameter name="user2_id"/>
+ <Parameter name="c_campaign_id"/>
+ <Parameter name="c_salesregion_id"/>
</SqlMethod>
<SqlMethod name="getEndDate" type="preparedStatement" return="Date">
<SqlMethodComment></SqlMethodComment>
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
