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

IDEMPIERE-5295 Trial Balance Report creates wrong Opening Balance (#1614) 

- Add column T_TrialBalance_UU / IDEMPIERE-5523
This commit is contained in:
Carlos Ruiz 2022-12-23 11:38:54 +01:00 committed by GitHub
parent 7598a39018
commit d074e173d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migration/iD10/oracle/202212231121_IDEMPIERE-5295.sql Normal file
View File

@ -0,0 +1,22 @@
-- IDEMPIERE-5295 Trial Balance Report creates wrong Opening Balance + IDEMPIERE-5523
SELECT register_migration_script('202212231121_IDEMPIERE-5295.sql') FROM dual;
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 23, 2022, 11:21:17 AM CET
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,PrintName,EntityType,AD_Element_UU) VALUES (203776,0,0,'Y',TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,'T_TrialBalance_UU','T_TrialBalance_UU','T_TrialBalance_UU','D','894664e1-e97e-4327-84a7-6df464a387ef')
;
-- Dec 23, 2022, 11:21:18 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsAlwaysUpdateable,AD_Column_UU,IsToolbarButton) VALUES (215730,1.0,'T_TrialBalance_UU',753,'T_TrialBalance_UU',36,'N','N','N','N','N','N',10,0,0,'Y',TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,203776,'Y','N','D','N','ea2b4818-490a-4a29-9795-a1967c3fb31a','N')
;
-- Dec 23, 2022, 11:21:18 AM CET
ALTER TABLE T_TrialBalance ADD T_TrialBalance_UU VARCHAR2(36 CHAR) DEFAULT NULL
;
-- Dec 23, 2022, 11:21:18 AM CET
ALTER TABLE T_TrialBalance ADD CONSTRAINT T_TrialBalance_UU_idx UNIQUE (T_TrialBalance_UU)
;

19
migration/iD10/postgresql/202212231121_IDEMPIERE-5295.sql Normal file
View File

@ -0,0 +1,19 @@
-- IDEMPIERE-5295 Trial Balance Report creates wrong Opening Balance + IDEMPIERE-5523
SELECT register_migration_script('202212231121_IDEMPIERE-5295.sql') FROM dual;
-- Dec 23, 2022, 11:21:17 AM CET
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,PrintName,EntityType,AD_Element_UU) VALUES (203776,0,0,'Y',TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,'T_TrialBalance_UU','T_TrialBalance_UU','T_TrialBalance_UU','D','894664e1-e97e-4327-84a7-6df464a387ef')
;
-- Dec 23, 2022, 11:21:18 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsAlwaysUpdateable,AD_Column_UU,IsToolbarButton) VALUES (215730,1.0,'T_TrialBalance_UU',753,'T_TrialBalance_UU',36,'N','N','N','N','N','N',10,0,0,'Y',TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-12-23 11:21:17','YYYY-MM-DD HH24:MI:SS'),100,203776,'Y','N','D','N','ea2b4818-490a-4a29-9795-a1967c3fb31a','N')
;
-- Dec 23, 2022, 11:21:18 AM CET
ALTER TABLE T_TrialBalance ADD COLUMN T_TrialBalance_UU VARCHAR(36) DEFAULT NULL
;
-- Dec 23, 2022, 11:21:18 AM CET
ALTER TABLE T_TrialBalance ADD CONSTRAINT T_TrialBalance_UU_idx UNIQUE (T_TrialBalance_UU)
;

6
org.adempiere.base/src/org/compiere/report/TrialBalance.java
View File

@ -101,7 +101,7 @@ public class TrialBalance extends SvrProcess
+ " AmtAcctDr, AmtAcctCr, AmtAcctBalance, C_UOM_ID, Qty,"
+ " M_Product_ID, C_BPartner_ID, AD_OrgTrx_ID, C_LocFrom_ID,C_LocTo_ID,"
+ " C_SalesRegion_ID, C_Project_ID, C_Campaign_ID, C_Activity_ID,"
+ " User1_ID, User2_ID, A_Asset_ID, Description, LevelNo)";
+ " User1_ID, User2_ID, A_Asset_ID, Description, LevelNo, T_TrialBalance_UU)";
/**
@ -392,7 +392,7 @@ public class TrialBalance extends SvrProcess
else
sql.append (p_User2_ID);
sql.append(", null, '");
sql.append(Msg.getMsg(getCtx(), "opening.balance") + "', 0 ");
sql.append(Msg.getMsg(getCtx(), "opening.balance") + "', 0, generate_uuid() ");
//
sql.append(" FROM Fact_Acct WHERE AD_Client_ID=").append(getAD_Client_ID())
.append (" AND ").append(m_parameterWhere)
@ -446,7 +446,7 @@ public class TrialBalance extends SvrProcess
// C_SalesRegion_ID, C_Project_ID, C_Campaign_ID, C_Activity_ID,
sql.append ("C_SalesRegion_ID, C_Project_ID, C_Campaign_ID, C_Activity_ID,");
// User1_ID, User2_ID, A_Asset_ID, Description)
sql.append ("User1_ID, User2_ID, A_Asset_ID, Description, 10 ");
sql.append ("User1_ID, User2_ID, A_Asset_ID, Description, 10, generate_uuid() ");
//
sql.append(" FROM Fact_Acct WHERE AD_Client_ID=").append(getAD_Client_ID())
.append (" AND ").append(m_parameterWhere)