details: https://code.openbravo.com/erp/devel/pi/rev/3b1867c37521
changeset: 30498:3b1867c37521
user: Nono Carballo <nonofce <at> gmail.com>
date: Wed Oct 19 11:56:35 2016 -0400
summary: Fixes issue 28947: Add HTML output to Process Definition Reports
A new functionality was added to allow HTML output to Process Definition
Reports.
- A new column/field was added to hold HTML Template
- BaseReportActionHandler was reviewed and adapted to allow the new
functionality
- Code dealing with generation of Process Definition Report window was adapted
to
allow the new functionality
diffstat:
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml
| 11 +-
modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml
| 2 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
| 77 +++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
| 28 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
| 60 ++-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 14 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
| 217 +++++++--
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl
| 5 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
| 20 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
| 24 +-
13 files changed, 410 insertions(+), 65 deletions(-)
diffs (truncated from 814 to 300 lines):
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml
---
a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -49,6 +49,14 @@
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
+ <column name="HTML_TEMPLATE" primaryKey="false" required="false"
type="VARCHAR" size="255" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="USE_PDF_AS_HTML_TEMPLATE" primaryKey="false"
required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_REPORT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -62,7 +70,8 @@
<unique-column name="OBUIAPP_PROCESS_ID"/>
</unique>
<check name="OBUIAPP_REPORT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ <check
name="OBUIAPP_REPORT_PDF_AS_HTML_CHK"><![CDATA[USE_PDF_AS_HTML_TEMPLATE IN
('Y', 'N')]]></check>
<check
name="OBUIAPP_REPORT_PDF_AS_XLS_CHK"><![CDATA[USE_PDF_AS_XLS_TEMPLATE IN ('Y',
'N')]]></check>
- <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL
OR XLS_TEMPLATE IS NOT NULL]]></check>
+ <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL
OR XLS_TEMPLATE IS NOT NULL OR HTML_TEMPLATE IS NOT NULL]]></check>
</table>
</database>
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml
---
a/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_REPORT_MOD_TRG.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -55,7 +55,9 @@
COALESCE(:NEW.OBUIAPP_Process_ID , '.') !=
COALESCE(:OLD.OBUIAPP_Process_ID , '.') OR
COALESCE(:NEW.PDF_Template , '.') != COALESCE(:OLD.PDF_Template , '.')
OR
COALESCE(:NEW.XLS_Template , '.') != COALESCE(:OLD.XLS_Template , '.')
OR
+ COALESCE(:NEW.HTML_Template , '.') != COALESCE(:OLD.HTML_Template ,
'.') OR
COALESCE(:NEW.USE_PDF_AS_XLS_TEMPLATE , '.') !=
COALESCE(:OLD.USE_PDF_AS_XLS_TEMPLATE , '.') OR
+ COALESCE(:NEW.USE_PDF_AS_HTML_TEMPLATE , '.') !=
COALESCE(:OLD.USE_PDF_AS_HTML_TEMPLATE , '.') OR
1=2) THEN
RAISE_APPLICATION_ERROR(-20000, '@20532@');
END IF;
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -5870,6 +5870,45 @@
<!--8A70E8C4933E45169F74BC730318D1B5-->
<ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--8A70E8C4933E45169F74BC730318D1B5--></AD_COLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7--><AD_COLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <NAME><![CDATA[Use PDF as HTML
Template]]></NAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <DESCRIPTION><![CDATA[Determines
whether the PDF Template needs to be used to generate the HTML report instead
of defining a specific template for it.]]></DESCRIPTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <HELP><![CDATA[Determines whether the
PDF Template needs to be used to generate the HTML report instead of defining a
specific template for it.]]></HELP>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <POSITION><![CDATA[14]]></POSITION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8BAD159F88D64983917E5D2D4DF400F7--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BAD159F88D64983917E5D2D4DF400F7-->
<ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8BAD159F88D64983917E5D2D4DF400F7--></AD_COLUMN>
+
<!--8BE595E8BE9940578AF409B85AFE02AA--><AD_COLUMN>
<!--8BE595E8BE9940578AF409B85AFE02AA-->
<AD_COLUMN_ID><![CDATA[8BE595E8BE9940578AF409B85AFE02AA]]></AD_COLUMN_ID>
<!--8BE595E8BE9940578AF409B85AFE02AA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8293,6 +8332,44 @@
<!--A1A338DE694D4B849A249AD2C709B36C-->
<ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--A1A338DE694D4B849A249AD2C709B36C--></AD_COLUMN>
+<!--A215112D541C479796B314D93155993F--><AD_COLUMN>
+<!--A215112D541C479796B314D93155993F-->
<AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--A215112D541C479796B314D93155993F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A215112D541C479796B314D93155993F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A215112D541C479796B314D93155993F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A215112D541C479796B314D93155993F--> <NAME><![CDATA[HTML Template]]></NAME>
+<!--A215112D541C479796B314D93155993F--> <DESCRIPTION><![CDATA[JRXML template
to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--A215112D541C479796B314D93155993F--> <HELP><![CDATA[JRXML template to use
for exporting the report to HTML format]]></HELP>
+<!--A215112D541C479796B314D93155993F-->
<COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--A215112D541C479796B314D93155993F-->
<AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
+<!--A215112D541C479796B314D93155993F-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A215112D541C479796B314D93155993F-->
<FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--A215112D541C479796B314D93155993F--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--A215112D541C479796B314D93155993F--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A215112D541C479796B314D93155993F-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A215112D541C479796B314D93155993F-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A215112D541C479796B314D93155993F-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A215112D541C479796B314D93155993F--> <SEQNO><![CDATA[130]]></SEQNO>
+<!--A215112D541C479796B314D93155993F-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A215112D541C479796B314D93155993F-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A215112D541C479796B314D93155993F-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A215112D541C479796B314D93155993F-->
<AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--A215112D541C479796B314D93155993F-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A215112D541C479796B314D93155993F-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A215112D541C479796B314D93155993F-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A215112D541C479796B314D93155993F-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A215112D541C479796B314D93155993F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A215112D541C479796B314D93155993F--> <POSITION><![CDATA[13]]></POSITION>
+<!--A215112D541C479796B314D93155993F-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A215112D541C479796B314D93155993F--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A215112D541C479796B314D93155993F-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A215112D541C479796B314D93155993F-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A215112D541C479796B314D93155993F-->
<ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A215112D541C479796B314D93155993F-->
<ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A215112D541C479796B314D93155993F-->
<ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A215112D541C479796B314D93155993F-->
<ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A215112D541C479796B314D93155993F--></AD_COLUMN>
+
<!--A296915242174A738010EB453701B187--><AD_COLUMN>
<!--A296915242174A738010EB453701B187-->
<AD_COLUMN_ID><![CDATA[A296915242174A738010EB453701B187]]></AD_COLUMN_ID>
<!--A296915242174A738010EB453701B187-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -80,6 +80,20 @@
<!--0E87BDD6E59C4B5FB9273E2580CC76B2--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--0E87BDD6E59C4B5FB9273E2580CC76B2--></AD_ELEMENT>
+<!--0FA9076400FE4EF2BEACC722292144C5--><AD_ELEMENT>
+<!--0FA9076400FE4EF2BEACC722292144C5-->
<AD_ELEMENT_ID><![CDATA[0FA9076400FE4EF2BEACC722292144C5]]></AD_ELEMENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FA9076400FE4EF2BEACC722292144C5-->
<COLUMNNAME><![CDATA[USE_Pdf_As_Html_Template]]></COLUMNNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <NAME><![CDATA[Use PDF as HTML
Template]]></NAME>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <PRINTNAME><![CDATA[Use PDF as HTML
Template]]></PRINTNAME>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <DESCRIPTION><![CDATA[Determines
whether the PDF Template needs to be used to generate the HTML report instead
of defining a specific template for it.]]></DESCRIPTION>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <HELP><![CDATA[Determines whether the
PDF Template needs to be used to generate the HTML report instead of defining a
specific template for it.]]></HELP>
+<!--0FA9076400FE4EF2BEACC722292144C5-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0FA9076400FE4EF2BEACC722292144C5--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--0FA9076400FE4EF2BEACC722292144C5--></AD_ELEMENT>
+
<!--10922048465547F48765035389E22977--><AD_ELEMENT>
<!--10922048465547F48765035389E22977-->
<AD_ELEMENT_ID><![CDATA[10922048465547F48765035389E22977]]></AD_ELEMENT_ID>
<!--10922048465547F48765035389E22977-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -434,6 +448,20 @@
<!--7A18B7D741A349B493D145C80DB54E5E--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--7A18B7D741A349B493D145C80DB54E5E--></AD_ELEMENT>
+<!--7B0DBFCC0E5C429092E23014127C44B8--><AD_ELEMENT>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->
<AD_ELEMENT_ID><![CDATA[7B0DBFCC0E5C429092E23014127C44B8]]></AD_ELEMENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->
<COLUMNNAME><![CDATA[HTML_Template]]></COLUMNNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <NAME><![CDATA[HTML Template]]></NAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <PRINTNAME><![CDATA[HTML
Template]]></PRINTNAME>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <DESCRIPTION><![CDATA[JRXML template
to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <HELP><![CDATA[JRXML template to use
for exporting the report to HTML format]]></HELP>
+<!--7B0DBFCC0E5C429092E23014127C44B8-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7B0DBFCC0E5C429092E23014127C44B8--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--7B0DBFCC0E5C429092E23014127C44B8--></AD_ELEMENT>
+
<!--7F257DE6A0C847A8A121804BC5F9B7A8--><AD_ELEMENT>
<!--7F257DE6A0C847A8A121804BC5F9B7A8-->
<AD_ELEMENT_ID><![CDATA[7F257DE6A0C847A8A121804BC5F9B7A8]]></AD_ELEMENT_ID>
<!--7F257DE6A0C847A8A121804BC5F9B7A8-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -623,7 +623,7 @@
<!--08AEFECA5A607AECE050007F0100529C-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--08AEFECA5A607AECE050007F0100529C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--08AEFECA5A607AECE050007F0100529C-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--08AEFECA5A607AECE050007F0100529C-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--08AEFECA5A607AECE050007F0100529C-->
<STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
<!--08AEFECA5A607AECE050007F0100529C-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--08AEFECA5A607AECE050007F0100529C-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--08AEFECA5A607AECE050007F0100529C--></AD_FIELD>
@@ -5658,6 +5658,35 @@
<!--961A9B93266A41F1BF3BAE222A7E07DB-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--961A9B93266A41F1BF3BAE222A7E07DB--></AD_FIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--><AD_FIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<AD_FIELD_ID><![CDATA[964F43EDD5CC4EA092F49DEFE4C2E040]]></AD_FIELD_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <NAME><![CDATA[HTML Template]]></NAME>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <DESCRIPTION><![CDATA[JRXML template
to use for exporting the report to HTML format]]></DESCRIPTION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <HELP><![CDATA[JRXML template to use
for exporting the report to HTML format]]></HELP>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<AD_COLUMN_ID><![CDATA[A215112D541C479796B314D93155993F]]></AD_COLUMN_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<DISPLAYLOGIC><![CDATA[@USE_Pdf_As_Html_Template@='N']]></DISPLAYLOGIC>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <SEQNO><![CDATA[40]]></SEQNO>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--964F43EDD5CC4EA092F49DEFE4C2E040--></AD_FIELD>
+
<!--96B87B69B9C8458888D81C486932E9A9--><AD_FIELD>
<!--96B87B69B9C8458888D81C486932E9A9-->
<AD_FIELD_ID><![CDATA[96B87B69B9C8458888D81C486932E9A9]]></AD_FIELD_ID>
<!--96B87B69B9C8458888D81C486932E9A9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6787,6 +6816,35 @@
<!--C216C156DB954876BB6F0B830038E599-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--C216C156DB954876BB6F0B830038E599--></AD_FIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A--><AD_FIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<AD_FIELD_ID><![CDATA[C257145471DD451BA2F7E09F7B87B66A]]></AD_FIELD_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <NAME><![CDATA[Use PDF as HTML
Template]]></NAME>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <DESCRIPTION><![CDATA[Determines
whether the PDF Template needs to be used to generate the HTML report instead
of defining a specific template for it.]]></DESCRIPTION>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <HELP><![CDATA[Determines whether the
PDF Template needs to be used to generate the HTML report instead of defining a
specific template for it.]]></HELP>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<AD_TAB_ID><![CDATA[2B7B3CCDC940436F93437445AA7752F3]]></AD_TAB_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<AD_COLUMN_ID><![CDATA[8BAD159F88D64983917E5D2D4DF400F7]]></AD_COLUMN_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<DISPLAYLOGIC><![CDATA[@HTML_Template@='']]></DISPLAYLOGIC>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <SEQNO><![CDATA[50]]></SEQNO>
+<!--C257145471DD451BA2F7E09F7B87B66A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C257145471DD451BA2F7E09F7B87B66A-->
<EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C257145471DD451BA2F7E09F7B87B66A--></AD_FIELD>
+
<!--C2B8716DE89B4A69BD3F0F77667A9938--><AD_FIELD>
<!--C2B8716DE89B4A69BD3F0F77667A9938-->
<AD_FIELD_ID><![CDATA[C2B8716DE89B4A69BD3F0F77667A9938]]></AD_FIELD_ID>
<!--C2B8716DE89B4A69BD3F0F77667A9938-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Oct 19 11:56:35 2016 -0400
@@ -228,6 +228,18 @@
<!--090A37D22ED3AFD5012ED3C5DE60001C-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--090A37D22ED3AFD5012ED3C5DE60001C--></AD_MESSAGE>
+<!--0BB85B43F187432F934B3A7AF6456685--><AD_MESSAGE>
+<!--0BB85B43F187432F934B3A7AF6456685-->
<AD_MESSAGE_ID><![CDATA[0BB85B43F187432F934B3A7AF6456685]]></AD_MESSAGE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BB85B43F187432F934B3A7AF6456685--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BB85B43F187432F934B3A7AF6456685--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BB85B43F187432F934B3A7AF6456685-->
<VALUE><![CDATA[OBUIAPP_HTMLExport]]></VALUE>
+<!--0BB85B43F187432F934B3A7AF6456685--> <MSGTEXT><![CDATA[View]]></MSGTEXT>
+<!--0BB85B43F187432F934B3A7AF6456685--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--0BB85B43F187432F934B3A7AF6456685-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0BB85B43F187432F934B3A7AF6456685-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--0BB85B43F187432F934B3A7AF6456685--></AD_MESSAGE>
+
<!--0BEB24CF954E410EAFE4EF198C38A902--><AD_MESSAGE>
<!--0BEB24CF954E410EAFE4EF198C38A902-->
<AD_MESSAGE_ID><![CDATA[0BEB24CF954E410EAFE4EF198C38A902]]></AD_MESSAGE_ID>
<!--0BEB24CF954E410EAFE4EF198C38A902-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1418,7 +1430,7 @@
<!--A497EC573BCE49F093FFA012620BD082--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A497EC573BCE49F093FFA012620BD082--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A497EC573BCE49F093FFA012620BD082-->
<VALUE><![CDATA[OBUIAPP_REPORT_TMP_CHK]]></VALUE>
-<!--A497EC573BCE49F093FFA012620BD082--> <MSGTEXT><![CDATA[You have to define
at least one of PDF Template or XLS Template fields.]]></MSGTEXT>
+<!--A497EC573BCE49F093FFA012620BD082--> <MSGTEXT><![CDATA[You have to define
at least one of PDF Template or XLS Template or HTML Template
fields.]]></MSGTEXT>
<!--A497EC573BCE49F093FFA012620BD082--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--A497EC573BCE49F093FFA012620BD082-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--A497EC573BCE49F093FFA012620BD082-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
diff -r 8b78e2441a23 -r 3b1867c37521
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
Wed Oct 19 09:28:34 2016 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
Wed Oct 19 11:56:35 2016 -0400
@@ -11,7 +11,7 @@
* under the License.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
