0016184: Balance Sheet and P&L Report can't include titles

diff --git a/src-db/database/model/tables/C_ELEMENTVALUE.xml b/src-db/database/model/tables/C_ELEMENTVALUE.xml --- a/src-db/database/model/tables/C_ELEMENTVALUE.xml +++ b/src-db/database/model/tables/C_ELEMENTVALUE.xml @@ -117,6 +117,10 @@ <default><![CDATA[C]]></default> <onCreateDefault/> </column> + <column name="ISALWAYSSHOWN" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="C_ELEMENTVALUE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -312262,6 +312262,40 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Title Node]]></NAME> + <DESCRIPTION><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION> + <HELP><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></HELP> + <COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[188]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> + <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[42]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[30]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[9F3ADE0CE0734BE2BD059AAEFCF1D51C]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -27721,6 +27721,19 @@  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> </AD_ELEMENT> +<AD_ELEMENT> + <AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME> + <NAME><![CDATA[Title Node]]></NAME> + <PRINTNAME><![CDATA[Title Node]]></PRINTNAME> + <DESCRIPTION><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION> + <HELP><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></HELP> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +</AD_ELEMENT> + <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -221110,6 +221110,31 @@  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[9E96355953DF74BDE040007F01006BC5]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Title Node]]></NAME> + <DESCRIPTION><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></DESCRIPTION> + <HELP><![CDATA[A node flagged as "Title Node", will always be displayed in the report, even if the balance is 0, and the "Show only accounts with value" is flagged.]]></HELP> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[220]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[9EB0289791634210B266BA459E47AC31]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo --- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo +++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo @@ -22,7 +22,7 @@ <fo:simple-page-master master-name="first" page-height="29.7cm" page-width="21cm" margin-top="0.5cm" margin-bottom="0.5cm" margin-left="2cm" margin-right="1cm"> <fo:region-before extent="2.5cm"/> <fo:region-after extent="1cm"/> - <fo:region-body margin-top="2.5cm" margin-bottom="1cm"/> + <fo:region-body margin-top="2.5cm" margin-bottom="2cm"/> </fo:simple-page-master> </fo:layout-master-set> <fo:page-sequence master-reference="first" initial-page-number="xx" id="fieldPageNo"> diff --git a/src/org/openbravo/erpCommon/businessUtility/AccountTree.java b/src/org/openbravo/erpCommon/businessUtility/AccountTree.java --- a/src/org/openbravo/erpCommon/businessUtility/AccountTree.java +++ b/src/org/openbravo/erpCommon/businessUtility/AccountTree.java @@ -664,9 +664,13 @@ r[i].qty = (applySign(new BigDecimal(r[i].qty), r[i].showvaluecond, true)).toPlainString(); r[i].qtyRef = (applySign(new BigDecimal(r[i].qtyRef), r[i].showvaluecond, true)) .toPlainString(); - if (!notEmptyLines - || (new BigDecimal(r[i].qty).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal( - r[i].qtyRef).compareTo(BigDecimal.ZERO) != 0)) { + if ((!notEmptyLines || (new BigDecimal(r[i].qty).compareTo(BigDecimal.ZERO) != 0 || new BigDecimal( + r[i].qtyRef).compareTo(BigDecimal.ZERO) != 0)) + || "Y".equals(r[i].isalwaysshown)) { + if ("Y".equals(r[i].isalwaysshown)) { + r[i].qty = null; + r[i].qtyRef = null; + } vec.addElement(r[i]); } } diff --git a/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql b/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql --- a/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql +++ b/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql @@ -26,7 +26,7 @@ <Sql><![CDATA[ SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo, m.C_ElementValue_ID AS ID, ((CASE ? WHEN 'Y' THEN TO_CHAR(m.Value) || ' - ' ELSE '' END) || m.Name) AS NAME,m.Description, m.IsSummary, m.ACCOUNTSIGN, m.ShowElement, 0 as element_level, 0 as qty, 0 as qty_ref, 0 as qty_operation, 0 as qty_operation_ref, - 0 as QTYCREDIT, 0 as QTYCREDIT_REF, m.ShowValueCond, m.ElementLevel, m.Value, 'N' AS CALCULATED, 'N' AS SVCRESET, 'N' AS SVCRESETREF + 0 as QTYCREDIT, 0 as QTYCREDIT_REF, m.ShowValueCond, m.ElementLevel, m.Value, 'N' AS CALCULATED, 'N' AS SVCRESET, 'N' AS SVCRESETREF, m.isalwaysshown FROM AD_TreeNode tn, C_ElementValue m WHERE tn.IsActive='Y' AND m.isActive='Y' @@ -43,7 +43,7 @@ SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo, m.C_ElementValue_ID AS ID, ((CASE ? WHEN 'Y' THEN TO_CHAR(m.Value) || ' - ' ELSE '' END) || COALESCE(mt.Name, m.Name)) as Name, COALESCE(mt.Description, m.Description) as description ,m.IsSummary, m.ACCOUNTSIGN, m.ShowElement, 0 as element_level, 0 as qty, 0 as qty_ref, 0 as qty_operation, 0 as qty_operation_ref, - m.ShowValueCond, m.ElementLevel, m.Value, 'N' AS CALCULATED, 'N' AS SVCRESET, 'N' AS SVCRESETREF + m.ShowValueCond, m.ElementLevel, m.Value, 'N' AS CALCULATED, 'N' AS SVCRESET, 'N' AS SVCRESETREF, m.isalwaysshown FROM C_ElementValue m left join C_ElementValue_Trl mt on m.C_ElementValue_ID = mt.C_ElementValue_ID and mt.AD_Language = ? , AD_TreeNode tn

Notes
(0034981) dalsasua (reporter) 2011-03-17 11:04	Uploaded patch with fix. Pi is logically frozen.

(0035037) dalsasua (reporter) 2011-03-18 12:45	In order to test: 1.- Configure a P&L structure report as described in http://wiki.openbravo.com/wiki/Balance_sheet_and_PL_structure#Balance_de_situaci.C3.B3n [^] 2.- Launch it once with the "Show only accounts with value" flag active, and other with de-activated 3.- Choose two nodes (one that gives 0 in the report, and other that not), locate then in Account Tree window, and activate the "Title" flag 4.- Run again the reports of point 2. 5.- Check that both reports throw same amounts, but title type node is shown always, and shows no amount.

(0035078) hgbot (developer) 2011-03-21 11:03	Repository: erp/devel/pi Changeset: 43f9be3e6e8718f1dd0c55ac1a8835718f735ff3 Author: David Alsasua <david.alsasua <at> openbravo.com> Date: Thu Mar 17 11:02:46 2011 +0100 URL: http://code.openbravo.com/erp/devel/pi/rev/43f9be3e6e8718f1dd0c55ac1a8835718f735ff3 [^] Fixes issue 16184. Now a new flag Title Node is available in element -> value tab. If flagged, the node is always shown in the b.s.&p.l. reports, with no amount, just as a title node --- M src-db/database/model/tables/C_ELEMENTVALUE.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml M src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo M src/org/openbravo/erpCommon/businessUtility/AccountTree.java M src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql ---

(0035187) hgbot (developer) 2011-03-24 07:36	Repository: erp/devel/pi Changeset: 40ecade4a006fa6bad33a5484a846ad94ea0bc5e Author: David Alsasua <david.alsasua <at> openbravo.com> Date: Wed Mar 23 08:22:42 2011 +0100 URL: http://code.openbravo.com/erp/devel/pi/rev/40ecade4a006fa6bad33a5484a846ad94ea0bc5e [^] Fixes issue 16184. Column should be mandatory --- M src-db/database/model/tables/C_ELEMENTVALUE.xml ---

Issue History
Date Modified	Username	Field	Change
2011-03-09 15:07	dalsasua	New Issue
2011-03-09 15:07	dalsasua	Assigned To	=> dalsasua
2011-03-09 15:07	dalsasua	Modules	=> Core
2011-03-09 15:08	dalsasua	Issue Monitored: networkb
2011-03-17 11:01	dalsasua	Status	new => scheduled
2011-03-17 11:01	dalsasua	fix_in_branch	=> pi
2011-03-17 11:04	dalsasua	File Added: fix16184.diff
2011-03-17 11:04	dalsasua	Note Added: 0034981
2011-03-18 12:45	dalsasua	Note Added: 0035037
2011-03-21 11:03	hgbot	Checkin
2011-03-21 11:03	hgbot	Note Added: 0035078
2011-03-21 11:03	hgbot	Status	scheduled => resolved
2011-03-21 11:03	hgbot	Resolution	open => fixed
2011-03-21 11:03	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/devel/pi/rev/43f9be3e6e8718f1dd0c55ac1a8835718f735ff3 [^]
2011-03-24 07:36	hgbot	Checkin
2011-03-24 07:36	hgbot	Note Added: 0035187
2011-03-24 07:36	hgbot	Fixed in SCM revision	http://code.openbravo.com/erp/devel/pi/rev/43f9be3e6e8718f1dd0c55ac1a8835718f735ff3 [^] => http://code.openbravo.com/erp/devel/pi/rev/40ecade4a006fa6bad33a5484a846ad94ea0bc5e [^]
2011-05-24 10:48	dalsasua	Tag Attached: closingMay2011
2011-05-24 10:55	dalsasua	Status	resolved => closed