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

IDEMPIERE-476 Report Engine related bugs

This commit is contained in:
Carlos Ruiz 2015-04-15 17:55:26 -05:00
parent fe98584345
commit a1f152019d
3 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
migration/i2.1/oracle/201504151752_IDEMPIERE-476.sql Normal file
View File

@ -0,0 +1,35 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-476 Report Engine related bugs
-- 15/04/2015 05:50:45 PM COT
UPDATE AD_Element SET Name='Calculate Maximum (↑)',Updated=TO_DATE('2015-04-15 17:50:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=2207
;
-- 15/04/2015 05:50:45 PM COT
UPDATE AD_Column SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Process_Para SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.', AD_Element_ID=2207 WHERE UPPER(ColumnName)='ISMAXCALC' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Process_Para SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207 AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_InfoColumn SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207 AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Field SET Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=2207) AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_PrintFormatItem SET PrintName='Calc Max', Name='Calculate Maximum (↑)' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=2207)
;
SELECT register_migration_script('201504151752_IDEMPIERE-476.sql') FROM dual
;

34
migration/i2.1/postgresql/201504151752_IDEMPIERE-476.sql Normal file
View File

@ -0,0 +1,34 @@
SET CLIENT_ENCODING TO 'UTF8';
-- IDEMPIERE-476 Report Engine related bugs
-- 15/04/2015 05:50:45 PM COT
UPDATE AD_Element SET Name='Calculate Maximum (↑)',Updated=TO_TIMESTAMP('2015-04-15 17:50:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=2207
;
-- 15/04/2015 05:50:45 PM COT
UPDATE AD_Column SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Process_Para SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.', AD_Element_ID=2207 WHERE UPPER(ColumnName)='ISMAXCALC' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Process_Para SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207 AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_InfoColumn SET ColumnName='IsMaxCalc', Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Element_ID=2207 AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_Field SET Name='Calculate Maximum (↑)', Description='Calculate the maximum amount', Help='Calculate the Maximum (↑) of the data if the field is numeric, otherwise maximum length of the field.' WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=2207) AND IsCentrallyMaintained='Y'
;
-- 15/04/2015 05:50:46 PM COT
UPDATE AD_PrintFormatItem SET PrintName='Calc Max', Name='Calculate Maximum (↑)' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=2207)
;
SELECT register_migration_script('201504151752_IDEMPIERE-476.sql') FROM dual
;

6
org.adempiere.base/src/org/compiere/print/PrintDataFunction.java
View File

@ -137,10 +137,10 @@ public class PrintDataFunction
mean = mean.setScale(4, BigDecimal.ROUND_HALF_UP); mean = mean.setScale(4, BigDecimal.ROUND_HALF_UP);
return mean; return mean;
} }
// Variance = sum of squares - (square of sum / count) // Variance = ( sum of squares - (square of sum / count) ) / count
BigDecimal ss = m_sum.multiply(m_sum); BigDecimal ss = m_sum.multiply(m_sum);
ss = ss.divide(count, 4, BigDecimal.ROUND_HALF_UP); ss = ss.divide(count, 10, BigDecimal.ROUND_HALF_UP);
BigDecimal variance = m_sumSquare.subtract(ss); BigDecimal variance = m_sumSquare.subtract(ss).divide(count, 10, BigDecimal.ROUND_HALF_UP);
if (function == F_VARIANCE) if (function == F_VARIANCE)
{ {
if (variance.scale() > 4) if (variance.scale() > 4)