details: /erp/erp/devel/pi/rev/99852c33ac07
changeset: 4930:99852c33ac07
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Sep 15 16:06:57 2009 +0200
summary: Changed name of image.load task
details: /erp/erp/devel/pi/rev/96c60873f80a
changeset: 4931:96c60873f80a
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Sep 15 17:08:33 2009 +0200
summary: Fixed issue 10123. Trigger will now correctly prevent lower case
chars from being used in dbprefix.
details: /erp/erp/devel/pi/rev/1668f9c52a92
changeset: 4932:1668f9c52a92
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Sep 15 18:19:36 2009 +0200
summary: [logos] Modified logos servlet so that it works correctly with jrxml
documents. Modified Purchase Order report so that it works with new servlet.
diffstat:
build.xml | 12 +-
src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml | 4 +-
src/build.xml | 2 +-
src/org/openbravo/erpCommon/utility/ShowImageLogo.java | 8 +-
src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 1197
+++++++++---------
5 files changed, 614 insertions(+), 609 deletions(-)
diffs (truncated from 1497 to 300 lines):
diff -r 983cbb91ddd9 -r 1668f9c52a92 build.xml
--- a/build.xml Tue Sep 15 17:54:37 2009 +0200
+++ b/build.xml Tue Sep 15 18:19:36 2009 +0200
@@ -258,7 +258,7 @@
<ant dir="${base.src}" target="smartbuild" inheritAll="true"
inheritRefs="true" />
- <antcall target="image.loading" />
+ <antcall target="image.load" />
<antcall target="build.deploy" />
<!-- only restart tomcat if the restart prop was set to true -->
<condition property="dorestart">
@@ -297,7 +297,7 @@
<target name="compile.complete.deploy">
<antcall target="compile.complete.development" />
<antcall target="compile.complete.war" />
- <antcall target="image.loading" />
+ <antcall target="image.load" />
</target>
<target name="compile.complete.development" depends="init" if="mode.class">
@@ -512,7 +512,7 @@
<antcall inheritall="true" inheritrefs="true" target="apply.module" />
<antcall target="import.sample.data" />
- <antcall target="image.loading" />
+ <antcall target="image.load" />
<!--
<antcall target="validate.database" />
@@ -614,7 +614,7 @@
<echo message="applying modules" />
<antcall inheritall="true" inheritrefs="true" target="apply.module" />
<antcall target="import.sample.data" />
- <antcall target="image.loading" />
+ <antcall target="image.load" />
</target>
@@ -910,7 +910,7 @@
</target>
- <target name="image.loading">
- <ant dir="${base.src}" target="image.loading" inheritAll="true"
inheritRefs="true" />
+ <target name="image.load">
+ <ant dir="${base.src}" target="image.load" inheritAll="true"
inheritRefs="true" />
</target>
</project>
diff -r 983cbb91ddd9 -r 1668f9c52a92
src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml Tue Sep 15
17:54:37 2009 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml Tue Sep 15
18:19:36 2009 +0200
@@ -47,8 +47,8 @@
startsWithLetter := false;
FOR I IN 1..LENGTH(:new.name) LOOP
v_char := substr(:new.name,i,1);
- IF NOT (v_char between 'A' and 'Z'
- or v_char between '0' and '9') THEN
+ IF NOT ((v_char between 'A' and 'Z')
+ or (v_char between '0' and '9')) THEN
RAISE_APPLICATION_ERROR(-20531, '@20531@') ;
END IF;
IF v_char between 'A' and 'Z' THEN
diff -r 983cbb91ddd9 -r 1668f9c52a92 src/build.xml
--- a/src/build.xml Tue Sep 15 17:54:37 2009 +0200
+++ b/src/build.xml Tue Sep 15 18:19:36 2009 +0200
@@ -110,7 +110,7 @@
<validateModules userId="0"
propertiesFile="${base.config}/Openbravo.properties" type="module" />
</target>
- <target name="image.loading">
+ <target name="image.load">
<taskdef name="imageloading"
classname="org.openbravo.erpCommon.utility.ImageToDatabaseLoader">
<classpath refid="project.class.path" />
</taskdef>
diff -r 983cbb91ddd9 -r 1668f9c52a92
src/org/openbravo/erpCommon/utility/ShowImageLogo.java
--- a/src/org/openbravo/erpCommon/utility/ShowImageLogo.java Tue Sep 15
17:54:37 2009 +0200
+++ b/src/org/openbravo/erpCommon/utility/ShowImageLogo.java Tue Sep 15
18:19:36 2009 +0200
@@ -32,6 +32,7 @@
import org.openbravo.dal.service.OBDal;
import org.openbravo.model.ad.system.SystemInformation;
import org.openbravo.model.ad.utility.Image;
+import org.openbravo.model.common.enterprise.Organization;
/**
*
@@ -79,8 +80,11 @@
if (img == null)
img = OBDal.getInstance().get(SystemInformation.class,
"0").getYourCompanyBigImage();
} else if (logo.equals("yourcompanydoc")) {
- img =
OBContext.getOBContext().getCurrentOrganization().getOrganizationInformationList()
- .get(0).getYourCompanyDocumentImage();
+ String orgId = vars.getStringParameter("orgId");
+ if (orgId != null && !orgId.equals("")) {
+ Organization org = OBDal.getInstance().get(Organization.class,
orgId);
+ img =
org.getOrganizationInformationList().get(0).getYourCompanyDocumentImage();
+ }
if (img == null)
img = OBDal.getInstance().get(SystemInformation.class,
"0").getYourCompanyDocumentImage();
} else
diff -r 983cbb91ddd9 -r 1668f9c52a92
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Tue Sep 15 17:54:37
2009 +0200
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml Tue Sep 15 18:19:36
2009 +0200
@@ -1,207 +1,207 @@
-<?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="RptC_OrderPO"
- columnCount="1"
- printOrder="Vertical"
- orientation="Portrait"
- pageWidth="595"
- pageHeight="842"
- columnWidth="483"
- columnSpacing="0"
- leftMargin="56"
- rightMargin="56"
- topMargin="56"
- bottomMargin="56"
- 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="8"
- >
- </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="Report_Data_Label"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
- <style
- name="Report_Data_Field"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="false"
- >
- </style>
- <style
- name="Total_Field"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="GroupHeader_DarkGray"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#555555"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="12"
- isBold="true"
- >
- <box leftPadding="5"></box>
- </style>
- <style
- name="Group_Data_Label"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
- <style
- name="Group_Data_Field"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
- </style>
- <style
- name="Detail_Header"
- isDefault="false"
- mode="Opaque"
- forecolor="#FFFFFF"
- backcolor="#5D5D5D"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="10"
- isBold="true"
- >
- <box leftPadding="5">
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
- <rightPen lineWidth="1.0"
lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
- </style>
- <style
- name="Detail_Line"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="8"
- >
-
- <conditionalStyle>
- <conditionExpression><![CDATA[new
Boolean($V{REPORT_COUNT}.intValue()%2==1)]]></conditionExpression>
- <style
- name="Detail_Line"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- >
- </style>
- </conditionalStyle>
- </style>
- <style
- name="Total_Gray"
- isDefault="false"
- mode="Opaque"
- forecolor="#000000"
- backcolor="#CCCCCC"
- >
- </style>
- <style
- name="Detail_Data_Label"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- fontName="Bitstream Vera Sans"
- fontSize="10"
- isBold="true"
- >
- </style>
- <style
- name="Detail_Data_Field"
- isDefault="false"
- mode="Opaque"
- backcolor="#CCCCCC"
- fontName="Bitstream Vera Sans"
- fontSize="10"
- >
- </style>
- <style
- name="Group_Footer"
- isDefault="false"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- isBold="true"
- >
- </style>
- <style
- name="Report_Footer"
- isDefault="true"
- vAlign="Middle"
- fontName="Bitstream Vera Sans"
- fontSize="11"
- >
- </style>
-
- <parameter name="BASE_WEB" isForPrompting="false"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["/usr/local/src/AppsOpenbravo/web"]]></defaultValueExpression>
- </parameter>
- <parameter name="DOCUMENT_ID" isForPrompting="true"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["'1000012','1000029'"]]></defaultValueExpression>
- </parameter>
- <parameter name="SUBREPORT_DIR" isForPrompting="true"
class="java.lang.String">
- <defaultValueExpression
><![CDATA["/usr/local/src/AppsOpenbravo/src/erpReports/"]]></defaultValueExpression>
- </parameter>
- <parameter name="BASE_DESIGN" isForPrompting="false"
class="java.lang.String"/>
- <parameter name="SUBREP_RptC_OrderPO_Lines" isForPrompting="false"
class="net.sf.jasperreports.engine.JasperReport"/>
- <parameter name="DATEPATTERN" isForPrompting="false"
class="java.lang.String">
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
