details: /erp/devel/pi/rev/43f9be3e6e87
changeset: 11300:43f9be3e6e87
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Mar 17 11:02:46 2011 +0100
summary: 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
details: /erp/devel/pi/rev/145749e3f704
changeset: 11301:145749e3f704
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Mar 18 11:33:49 2011 +0100
summary: Fixes issue 16163: Wrong description when accounting Matched Invoices
Issue is in the Accounting Server. By default, description for an entry line is
document number # line information. In the case of the match invoice documents,
there doesn't exist any document number, so a null was shown. I replaced the
null for an empty string for those documents for which the document number
doesn't exist.
If user wants to have the invoice number, or other information, must use the
description text field in acct. schema tables tab
diffstat:
src-db/database/model/tables/C_ELEMENTVALUE.xml | 4 +
src-db/database/sourcedata/AD_COLUMN.xml | 34
++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml | 13 +++
src-db/database/sourcedata/AD_FIELD.xml | 25
+++++++
src/org/openbravo/erpCommon/ad_forms/FactLine.java | 2 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo | 2 +-
src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 10 ++-
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql | 4 +-
8 files changed, 87 insertions(+), 7 deletions(-)
diffs (181 lines):
diff -r 0fca97269ea5 -r 145749e3f704
src-db/database/model/tables/C_ELEMENTVALUE.xml
--- a/src-db/database/model/tables/C_ELEMENTVALUE.xml Mon Mar 21 09:59:15
2011 +0100
+++ b/src-db/database/model/tables/C_ELEMENTVALUE.xml Fri Mar 18 11:33:49
2011 +0100
@@ -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 -r 0fca97269ea5 -r 145749e3f704 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 21 09:59:15 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Mar 18 11:33:49 2011 +0100
@@ -312259,6 +312259,40 @@
<!--9DA88EFA815811C8E040007F01002646-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--9DA88EFA815811C8E040007F01002646--></AD_COLUMN>
+<!--9E96300C46ED4928E040007F01006BD5--><AD_COLUMN>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96300C46ED4928E040007F01006BD5--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96300C46ED4928E040007F01006BD5--> <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>
+<!--9E96300C46ED4928E040007F01006BD5--> <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>
+<!--9E96300C46ED4928E040007F01006BD5-->
<COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_TABLE_ID><![CDATA[188]]></AD_TABLE_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9E96300C46ED4928E040007F01006BD5-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9E96300C46ED4928E040007F01006BD5--> <SEQNO><![CDATA[42]]></SEQNO>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9E96300C46ED4928E040007F01006BD5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96300C46ED4928E040007F01006BD5--> <POSITION><![CDATA[30]]></POSITION>
+<!--9E96300C46ED4928E040007F01006BD5-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9E96300C46ED4928E040007F01006BD5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9E96300C46ED4928E040007F01006BD5-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9E96300C46ED4928E040007F01006BD5--></AD_COLUMN>
+
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C--><AD_COLUMN>
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->
<AD_COLUMN_ID><![CDATA[9F3ADE0CE0734BE2BD059AAEFCF1D51C]]></AD_COLUMN_ID>
<!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 0fca97269ea5 -r 145749e3f704 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Mar 21 09:59:15 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Mar 18 11:33:49 2011 +0100
@@ -27721,6 +27721,19 @@
<!--9D7068CB699374C8E040007F01004A16-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--9D7068CB699374C8E040007F01004A16--></AD_ELEMENT>
+<!--9E96304962F87A34E040007F01006BDB--><AD_ELEMENT>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_ELEMENT_ID><![CDATA[9E96304962F87A34E040007F01006BDB]]></AD_ELEMENT_ID>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96304962F87A34E040007F01006BDB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96304962F87A34E040007F01006BDB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96304962F87A34E040007F01006BDB-->
<COLUMNNAME><![CDATA[Isalwaysshown]]></COLUMNNAME>
+<!--9E96304962F87A34E040007F01006BDB--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96304962F87A34E040007F01006BDB--> <PRINTNAME><![CDATA[Title
Node]]></PRINTNAME>
+<!--9E96304962F87A34E040007F01006BDB--> <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>
+<!--9E96304962F87A34E040007F01006BDB--> <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>
+<!--9E96304962F87A34E040007F01006BDB-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96304962F87A34E040007F01006BDB--></AD_ELEMENT>
+
<!--9F815073C39E4506A1C74BB3667C6B57--><AD_ELEMENT>
<!--9F815073C39E4506A1C74BB3667C6B57-->
<AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
<!--9F815073C39E4506A1C74BB3667C6B57-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 0fca97269ea5 -r 145749e3f704 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 21 09:59:15 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 18 11:33:49 2011 +0100
@@ -221110,6 +221110,31 @@
<!--9DADE14ACAF441DEB4E2B7966FB704B1-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--9DADE14ACAF441DEB4E2B7966FB704B1--></AD_FIELD>
+<!--9E96355953DF74BDE040007F01006BC5--><AD_FIELD>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_FIELD_ID><![CDATA[9E96355953DF74BDE040007F01006BC5]]></AD_FIELD_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E96355953DF74BDE040007F01006BC5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E96355953DF74BDE040007F01006BC5--> <NAME><![CDATA[Title Node]]></NAME>
+<!--9E96355953DF74BDE040007F01006BC5--> <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>
+<!--9E96355953DF74BDE040007F01006BC5--> <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>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9E96355953DF74BDE040007F01006BC5--> <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_COLUMN_ID><![CDATA[9E96300C46ED4928E040007F01006BD5]]></AD_COLUMN_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9E96355953DF74BDE040007F01006BC5-->
<DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E96355953DF74BDE040007F01006BC5--> <SEQNO><![CDATA[220]]></SEQNO>
+<!--9E96355953DF74BDE040007F01006BC5--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E96355953DF74BDE040007F01006BC5-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9E96355953DF74BDE040007F01006BC5-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E96355953DF74BDE040007F01006BC5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E96355953DF74BDE040007F01006BC5-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9E96355953DF74BDE040007F01006BC5-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9E96355953DF74BDE040007F01006BC5--></AD_FIELD>
+
<!--9EB0289791634210B266BA459E47AC31--><AD_FIELD>
<!--9EB0289791634210B266BA459E47AC31-->
<AD_FIELD_ID><![CDATA[9EB0289791634210B266BA459E47AC31]]></AD_FIELD_ID>
<!--9EB0289791634210B266BA459E47AC31-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 0fca97269ea5 -r 145749e3f704
src/org/openbravo/erpCommon/ad_forms/FactLine.java
--- a/src/org/openbravo/erpCommon/ad_forms/FactLine.java Mon Mar 21
09:59:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/FactLine.java Fri Mar 18
11:33:49 2011 +0100
@@ -885,7 +885,7 @@
}
}
if (description.length() == 0) {
- description.append(m_docVO.DocumentNo);
+ description.append((m_docVO.DocumentNo == null) ? "" :
m_docVO.DocumentNo);
if (!strC_Bpartner_ID.equals(""))
description.append(" # ").append(
AcctServerData.selectBpartnerName(connectionProvider,
strC_Bpartner_ID));
diff -r 0fca97269ea5 -r 145749e3f704
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Mon Mar 21 09:59:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
Fri Mar 18 11:33:49 2011 +0100
@@ -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 -r 0fca97269ea5 -r 145749e3f704
src/org/openbravo/erpCommon/businessUtility/AccountTree.java
--- a/src/org/openbravo/erpCommon/businessUtility/AccountTree.java Mon Mar
21 09:59:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/AccountTree.java Fri Mar
18 11:33:49 2011 +0100
@@ -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 -r 0fca97269ea5 -r 145749e3f704
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql
--- a/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql Mon Mar
21 09:59:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql Fri Mar
18 11:33:49 2011 +0100
@@ -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
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
