details: https://code.openbravo.com/erp/devel/pi/rev/2db97bde87bf
changeset: 32402:2db97bde87bf
user: Mark <markmm82 <at> gmail.com>
date: Mon Jun 26 15:07:39 2017 -0400
summary: Fixes issue 36272: "End year close" process is grouping by record_id2
The "End year close" process was grouping by record_id2 so it was making more
difficult to understand numbers shown in general ledger report.
To fix it, all references to RECORD_ID2 were removed from
EndYearCloseUtility_data.xsql.
diffstat:
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java |
12 ++--
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql |
26 ++++-----
2 files changed, 18 insertions(+), 20 deletions(-)
diffs (184 lines):
diff -r edc9edec4152 -r 2db97bde87bf
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java
Mon Jul 03 16:00:26 2017 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java
Mon Jun 26 15:07:39 2017 -0400
@@ -210,7 +210,7 @@
.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].cBpartnerId, 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);
@@ -226,7 +226,7 @@
.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].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);
}
@@ -244,7 +244,7 @@
ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr)
.toString(), "0",
ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr)
.subtract(ExpenseAmtCr).toString(), "0", strDivideUpId,
"10", "D",
- account[0].name, account[0].value, account[0].cBpartnerId,
account[0].recordId2,
+ account[0].name, account[0].value, account[0].cBpartnerId,
account[0].mProductId, account[0].aAssetId, strClosingEntry,
account[0].cTaxId,
account[0].cProjectId, account[0].cActivityId,
account[0].user1Id,
account[0].user2Id, account[0].cCampaignId,
account[0].cSalesregionId);
@@ -258,7 +258,7 @@
ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr).subtract(ExpenseAmtCr)
.toString(), "0",
ExpenseAmtDr.add(RevenueAmtDr).subtract(RevenueAmtCr)
.subtract(ExpenseAmtCr).toString(), strDivideUpId, "10",
"D", account2[0].name,
- account2[0].value, account2[0].cBpartnerId,
account2[0].recordId2,
+ account2[0].value, account2[0].cBpartnerId,
account2[0].mProductId, account2[0].aAssetId, strClosingEntry,
account2[0].cTaxId,
account2[0].cProjectId, account2[0].cActivityId,
account2[0].user1Id,
account2[0].user2Id, account2[0].cCampaignId,
account2[0].cSalesregionId);
@@ -274,7 +274,7 @@
ExpenseAmtCr.add(RevenueAmtCr).subtract(RevenueAmtDr).subtract(ExpenseAmtDr)
.toString(), "0",
ExpenseAmtCr.add(RevenueAmtCr).subtract(RevenueAmtDr)
.subtract(ExpenseAmtDr).toString(), strDivideUpId, "10",
"D", account[0].name,
- account[0].value, account[0].cBpartnerId, account[0].recordId2,
+ account[0].value, account[0].cBpartnerId,
account[0].mProductId, account[0].aAssetId, strClosingEntry,
account[0].cTaxId,
account[0].cProjectId, account[0].cActivityId,
account[0].user1Id,
account[0].user2Id, account[0].cCampaignId,
account[0].cSalesregionId);
@@ -289,7 +289,7 @@
.toString(), "0",
ExpenseAmtCr.add(RevenueAmtCr).subtract(RevenueAmtDr)
.subtract(ExpenseAmtDr).toString(), "0", strDivideUpId,
"10", "D",
account2[0].name, account2[0].value, account2[0].cBpartnerId,
- account2[0].recordId2, account2[0].mProductId,
account2[0].aAssetId,
+ account2[0].mProductId, account2[0].aAssetId,
strClosingEntry, account2[0].cTaxId, account2[0].cProjectId,
account2[0].cActivityId, account2[0].user1Id,
account2[0].user2Id,
account2[0].cCampaignId, account2[0].cSalesregionId);
diff -r edc9edec4152 -r 2db97bde87bf
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql
--- a/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql
Mon Jul 03 16:00:26 2017 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility_data.xsql
Mon Jun 26 15:07:39 2017 -0400
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2016 Openbravo SLU
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -29,7 +29,7 @@
<![CDATA[
select ad_org.ad_org_id as id, ad_org.name as name,
'' AS TOTALAMTDR, '' AS TOTALAMTCR, '' AS ACCOUNT_ID, '' as org, ''
as acctvalue, '' as acctdescription, '' as value,
- '' as c_bpartner_id, '' as record_id2, '' as m_product_id, '' as
a_asset_id, '' AS REGCOUNT,
+ '' as c_bpartner_id, '' as m_product_id, '' as a_asset_id, '' AS
REGCOUNT,
'' AS C_TAX_ID, '' AS C_PROJECT_ID, '' AS C_ACTIVITY_ID, '' AS
USER1_ID, '' AS USER2_ID, '' AS C_CAMPAIGN_ID,
'' AS C_SALESREGION_ID, '' AS REG_FACT_ACCT_GROUP_ID, '' AS
CLOSE_FACT_ACCT_GROUP_ID, '' AS DIVIDEUP_FACT_ACCT_GROUP_ID,
'' AS OPEN_FACT_ACCT_GROUP_ID, '' AS AD_ORG_CLOSING_ID
@@ -84,7 +84,7 @@
AMTSOURCECR,AMTACCTDR, AMTACCTCR,
FACT_ACCT_GROUP_ID,SEQNO, FACTACCTTYPE,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_ID,
+ M_PRODUCT_ID, A_ASSET_ID,
DESCRIPTION,C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,
USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID)
VALUES
@@ -96,7 +96,7 @@
TO_NUMBER(?),TO_NUMBER(?),TO_NUMBER(?),
?,TO_NUMBER(?), 'R',
?, ?, ?,
- ?, ?, ?,
+ ?, ?,
?,?,?,?,
?,?,?,?)
]]>
@@ -124,7 +124,6 @@
<Parameter name="acctdescription"/>
<Parameter name="value"/>
<Parameter name="bpartner"/>
- <Parameter name="debtPayment"/>
<Parameter name="product"/>
<Parameter name="asset"/>
<Parameter name="description"/>
@@ -149,7 +148,7 @@
AMTSOURCECR,AMTACCTDR, AMTACCTCR,
FACT_ACCT_GROUP_ID,SEQNO, FACTACCTTYPE,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_ID,DESCRIPTION,
+ M_PRODUCT_ID, A_ASSET_ID, DESCRIPTION,
C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,
USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID)
SELECT get_UUID(), ?, ?,
@@ -162,7 +161,7 @@
(CASE SIGN(SUM(AMTACCTDR)-SUM(AMTACCTCR)) WHEN -1 THEN 0 ELSE
(SUM(AMTACCTDR)-SUM(AMTACCTCR)) END),
?, to_number(?), ?,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_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
@@ -176,7 +175,7 @@
AND AD_ORG_ID = ?
AND C_ACCTSCHEMA_ID = ?
AND (FACTACCTTYPE <>'C' or FACT_ACCT_GROUP_ID = ?)
- GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2,
C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,
+ GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, 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,
C_ACCTSCHEMA_ID
HAVING SUM(AMTACCTDR)-SUM(AMTACCTCR)<>0
order by ACCTVALUE
@@ -214,7 +213,7 @@
AMTSOURCEDR, AMTACCTCR, AMTACCTDR,
FACT_ACCT_GROUP_ID,SEQNO, FACTACCTTYPE,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_ID,DESCRIPTION,
+ M_PRODUCT_ID, A_ASSET_ID, DESCRIPTION,
C_TAX_ID,C_PROJECT_ID,C_ACTIVITY_ID,
USER1_ID,USER2_ID,C_CAMPAIGN_ID,C_SALESREGION_ID)
SELECT get_UUID(), ?, ?,
@@ -227,7 +226,7 @@
(CASE SIGN(SUM(AMTACCTDR)-SUM(AMTACCTCR)) WHEN -1 THEN 0 ELSE
(SUM(AMTACCTDR)-SUM(AMTACCTCR)) END),
?, to_number(?), ?,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_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
@@ -241,7 +240,7 @@
AND AD_ORG_ID = ?
AND C_ACCTSCHEMA_ID = ?
AND (FACTACCTTYPE <>'C' or FACT_ACCT_GROUP_ID = ?)
- GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, RECORD_ID2,
C_BPARTNER_ID, M_PRODUCT_ID, A_ASSET_ID,
+ GROUP BY ACCOUNT_ID, ACCTDESCRIPTION, ACCTVALUE, 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,
C_ACCTSCHEMA_ID
HAVING SUM(AMTACCTDR)-SUM(AMTACCTCR)<>0
order by ACCTVALUE
@@ -396,7 +395,7 @@
AMTSOURCECR,AMTACCTDR, AMTACCTCR,
FACT_ACCT_GROUP_ID,SEQNO, FACTACCTTYPE,
ACCTDESCRIPTION, ACCTVALUE, C_BPARTNER_ID,
- RECORD_ID2, M_PRODUCT_ID, A_ASSET_ID,
+ M_PRODUCT_ID, A_ASSET_ID,
DESCRIPTION,
C_TAX_ID, C_PROJECT_ID, C_ACTIVITY_ID,
USER1_ID, USER2_ID, C_CAMPAIGN_ID,
@@ -410,7 +409,7 @@
TO_NUMBER(?),TO_NUMBER(?),TO_NUMBER(?),
?,TO_NUMBER(?),?,
?,?,?,
- ?, ?, ?,
+ ?, ?,
?,
?,?,?,
?, ?, ?,
@@ -441,7 +440,6 @@
<Parameter name="acctdescription"/>
<Parameter name="value"/>
<Parameter name="bpartner"/>
- <Parameter name="debtPayment"/>
<Parameter name="product"/>
<Parameter name="asset"/>
<Parameter name="description"/>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
