details: /erp/devel/main/rev/38bc1ad2e842 changeset: 8843:38bc1ad2e842 user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com> date: Tue Nov 09 12:32:11 2010 +0530 summary: Fixes Issue 14900: Some fields in \"Progress Report\" are not well displayed
details: /erp/devel/main/rev/1c02108f2842 changeset: 8844:1c02108f2842 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Nov 09 11:29:11 2010 +0000 summary: CI: promote changesets from pi to main diffstat: src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml | 2310 ++++----- 2 files changed, 1146 insertions(+), 1168 deletions(-) diffs (truncated from 2817 to 300 lines): diff -r 3302044cd2d3 -r 1c02108f2842 src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml Mon Nov 08 15:43:00 2010 +0100 +++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Nov 09 11:29:11 2010 +0000 @@ -6,7 +6,7 @@ <!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0--> <NAME><![CDATA[Core]]></NAME> -<!--0--> <VERSION><![CDATA[2.50.18840]]></VERSION> +<!--0--> <VERSION><![CDATA[2.50.18843]]></VERSION> <!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION> <!--0--> <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP> <!--0--> <URL><![CDATA[www.openbravo.com]]></URL> @@ -22,7 +22,7 @@ <!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA> <!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO> -<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL> +<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--0--></AD_MODULE> diff -r 3302044cd2d3 -r 1c02108f2842 src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml --- a/src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml Mon Nov 08 15:43:00 2010 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml Tue Nov 09 11:29:11 2010 +0000 @@ -1,121 +1,122 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="ReportProjectProgress" - columnCount="1" - printOrder="Vertical" - orientation="Portrait" - pageWidth="842" - pageHeight="595" - columnWidth="782" - columnSpacing="0" - leftMargin="30" - rightMargin="30" - topMargin="20" - bottomMargin="20" - whenNoDataType="NoPages" - isTitleNewPage="false" - isSummaryNewPage="false"> - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <style - name="default" - isDefault="false" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="10" - > - </style> - <style - name="Report_Title" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="18" - > - <box leftPadding="5"></box> - </style> - <style - name="Report_Subtitle" - isDefault="false" - forecolor="#555555" - fontName="Bitstream Vera Sans" - fontSize="14" - > - <box leftPadding="5"></box> - </style> - <style - name="Total_Field" - isDefault="false" - mode="Opaque" - forecolor="#000000" - backcolor="#CCCCCC" - vAlign="Middle" - > - <box leftPadding="5"></box> - </style> - <style - name="Detail_Header" - isDefault="false" - mode="Opaque" - forecolor="#FFFFFF" - backcolor="#555555" - vAlign="Middle" - > - <box leftPadding="5"> <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/> - <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/> -</box> - </style> - <style - name="GroupHeader_DarkGray" - isDefault="false" - mode="Opaque" - forecolor="#FFFFFF" - backcolor="#555555" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="14" - > - <box leftPadding="5"></box> - </style> - <style - name="GroupHeader_Gray" - isDefault="false" - mode="Opaque" - backcolor="#999999" - > - </style> - <style - name="Detail_Task" - isDefault="false" - > - - <conditionalStyle> - <conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression> - <style - name="Detail_Task" - isDefault="false" - mode="Opaque" - backcolor="#CCCCCC" - > - </style> - </conditionalStyle> - </style> - <style - name="Total_Gray" - isDefault="false" - mode="Opaque" - forecolor="#000000" - backcolor="#CCCCCC" - > - </style> - - <parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String"/> - <parameter name="REFERENCE_DATE" isForPrompting="false" class="java.lang.String"/> +<?xml version="1.0" encoding="UTF-8" ?> +<!-- Created with iReport - A designer for JasperReports --> +<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> +<jasperReport + name="ReportProjectProgress" + columnCount="1" + printOrder="Vertical" + orientation="Portrait" + pageWidth="850" + pageHeight="595" + columnWidth="782" + columnSpacing="0" + leftMargin="30" + rightMargin="30" + topMargin="20" + bottomMargin="20" + whenNoDataType="NoPages" + isTitleNewPage="false" + isSummaryNewPage="false"> + <property name="ireport.scriptlethandling" value="0" /> + <property name="ireport.encoding" value="UTF-8" /> + <import value="java.util.*" /> + <import value="net.sf.jasperreports.engine.*" /> + <import value="net.sf.jasperreports.engine.data.*" /> + + <style + name="default" + isDefault="false" + vAlign="Middle" + fontName="Bitstream Vera Sans" + fontSize="10" + > + </style> + <style + name="Report_Title" + isDefault="false" + fontName="Bitstream Vera Sans" + fontSize="18" + > + <box leftPadding="5"></box> + </style> + <style + name="Report_Subtitle" + isDefault="false" + forecolor="#555555" + fontName="Bitstream Vera Sans" + fontSize="14" + > + <box leftPadding="5"></box> + </style> + <style + name="Total_Field" + isDefault="false" + mode="Opaque" + forecolor="#000000" + backcolor="#CCCCCC" + vAlign="Middle" + > + <box leftPadding="5"></box> + </style> + <style + name="Detail_Header" + isDefault="false" + mode="Opaque" + forecolor="#FFFFFF" + backcolor="#555555" + vAlign="Middle" + > + <box leftPadding="5"> + <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/> + <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/> + </box> + </style> + <style + name="GroupHeader_DarkGray" + isDefault="false" + mode="Opaque" + forecolor="#FFFFFF" + backcolor="#555555" + vAlign="Middle" + fontName="Bitstream Vera Sans" + fontSize="14" + > + <box leftPadding="5"></box> + </style> + <style + name="GroupHeader_Gray" + isDefault="false" + mode="Opaque" + backcolor="#999999" + > + </style> + <style + name="Detail_Task" + isDefault="false" + > + + <conditionalStyle> + <conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression> + <style + name="Detail_Task" + isDefault="false" + mode="Opaque" + backcolor="#CCCCCC" + > + </style> + </conditionalStyle> + </style> + <style + name="Total_Gray" + isDefault="false" + mode="Opaque" + forecolor="#000000" + backcolor="#CCCCCC" + > + </style> + + <parameter name="REPORT_TITLE" isForPrompting="false" class="java.lang.String"/> + <parameter name="REFERENCE_DATE" isForPrompting="false" class="java.lang.String"/> <queryString><![CDATA[SELECT PR.C_PROJECT_ID AS PROJECTID, PR.NAME AS PROJECTNAME, PR.DESCRIPTION AS PROJECTDESCRIPTION, PR.NOTE AS PROJECTCOMMENTS, REFLISTV.NAME AS PROJECTSTATUS, BPCUSTOMER.NAME AS CUSTOMERNAME, BPRESPONSIBLE.NAME AS PERSONINCHARGE, @@ -142,593 +143,594 @@ AND PR.AD_ORG_ID IN ('1') AND 1=1 - ORDER BY PR.NAME, 1]]></queryString> - - <field name="projectid" class="java.lang.String"/> - <field name="projectname" class="java.lang.String"/> - <field name="projectdescription" class="java.lang.String"/> - <field name="projectcomments" class="java.lang.String"/> - <field name="projectstatus" class="java.lang.String"/> - <field name="customername" class="java.lang.String"/> - <field name="personincharge" class="java.lang.String"/> - <field name="startingdate" class="java.lang.String"/> - <field name="contractdate" class="java.lang.String"/> - <field name="endingdate" class="java.lang.String"/> - <field name="dayselapsed" class="java.lang.String"/> - <field name="projectcontractduration" class="java.lang.String"/> - <field name="daysdelayed" class="java.lang.String"/> - <field name="timeburned" class="java.lang.String"/> - <field name="completionperc" class="java.lang.String"/> - <field name="cumdaysdelayed" class="java.lang.String"/> - <field name="phaseid" class="java.lang.String"/> - <field name="phasename" class="java.lang.String"/> - <field name="phasestartingdate" class="java.lang.String"/> - <field name="phasecontractdate" class="java.lang.String"/> - <field name="phasecontractduration" class="java.lang.String"/> - <field name="phasecomplete" class="java.lang.String"/> - <field name="phaseendingdate" class="java.lang.String"/> - <field name="phasedaysdelayed" class="java.lang.String"/> - <field name="taskid" class="java.lang.String"/> - <field name="taskname" class="java.lang.String"/> - <field name="taskstartingdate" class="java.lang.String"/> - <field name="taskcontractdate" class="java.lang.String"/> - <field name="taskcontractduration" class="java.lang.String"/> ------------------------------------------------------------------------------ The Next 800 Companies to Lead America's Growth: New Video Whitepaper David G. Thomson, author of the best-selling book "Blueprint to a Billion" shares his insights and actions to help propel your business during the next growth cycle. Listen Now! http://p.sf.net/sfu/SAP-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
