[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: /erp/erp/devel/main/rev/3ac83e6f783e
changeset: 5088:3ac83e6f783e
user: Víctor Martínez Romanos victor.martinez at openbravo.com
date: Thu Oct 15 15:24:16 2009 +0200
summary: Fixed bug 10984: Enterprise Module Management does not display
modules with Org data access level
details: /erp/erp/devel/main/rev/80ce9ce6f5ce
changeset: 5089:80ce9ce6f5ce
user: Antonio Moreno antonio.moreno at openbravo.com
date: Thu Oct 15 16:36:57 2009 +0200
summary: Fixed issue 10986. Invalid rows will be removed after inserting data
for all the modules.
diffstat:
src-db/database/lib/dbsourcemanager.jar |
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 4
++--
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (23 lines):
diff -r 648fb3683fef -r 80ce9ce6f5ce src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 648fb3683fef -r 80ce9ce6f5ce
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql
--- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql
Wed Oct 14 14:47:18 2009 +0200
+++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql
Thu Oct 15 16:36:57 2009 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2008 Openbravo SL
+ * All portions are Copyright (C) 2008-2009 Openbravo SL
* All Rights Reserved.
* Contributor(s): __.
@@ -86,7 +86,7 @@
AND M.ISACTIVE = 'Y'
AND 1=1
AND M.HASREFERENCEDATA = 'Y'
-AND AD_DATASET.ACCESSLEVEL IN ('3','6') AND EXPORTALLOWED = 'Y'
+AND AD_DATASET.ACCESSLEVEL IN ('3','6','1') AND EXPORTALLOWED = 'Y'
AND NOT EXISTS (SELECT 1 FROM AD_CLIENTMODULE CM
WHERE CM.ad_module_id = M.ad_module_id
AND CM.AD_CLIENT_ID = ?)
--
Come build with us! The BlackBerry(R) 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/devconference
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: /erp/erp/devel/main/rev/09b7fe94fb16
changeset: 5080:09b7fe94fb16
user: Eduardo Argal Guibert eduardo.argal at openbravo.com
date: Fri Oct 02 19:53:46 2009 +0200
summary: Fixes bug 0010846: Randomly two account entries...
details: /erp/erp/devel/main/rev/c1061f3afdde
changeset: 5081:c1061f3afdde
user: Eduardo Argal Guibert eduardo.argal at openbravo.com
date: Sat Oct 03 12:40:26 2009 +0200
summary: Fixes posible API break in AcctServer.java
diffstat:
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 21
-
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 4 ++--
2 files changed, 18 insertions(+), 7 deletions(-)
diffs (82 lines):
diff -r 155ef4810a15 -r c1061f3afdde
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Fri Oct 02
11:37:29 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Sat Oct 03
12:40:26 2009 +0200
@@ -501,7 +501,7 @@
if (log4j.isDebugEnabled())
log4j.debug(post + strClave + tablename: + tableName);
try {
- if (AcctServerData.update(con, conn, tableName, strClave) != 1) {
+ if (AcctServerData.update(conn, tableName, strClave) != 1) {
log4j.warn(AcctServer - Post -Cannot lock Document - ignored: +
tableName + _ID=
+ strClave);
return false;
@@ -616,7 +616,7 @@
;
else {
// conn.releaseRollbackConnection(con);
- unlock(conn, con);
+ unlock(conn);
Status = AcctServer.STATUS_Error;
}
}
@@ -625,7 +625,7 @@
// Commit Doc
if (!save(conn, con)) { // contains unlock
// conn.releaseRollbackConnection(con);
-unlock(conn, con);
+unlock(conn);
Status = AcctServer.STATUS_Error;
}
// conn.releaseCommitConnection(con);
@@ -634,7 +634,7 @@
log4j.warn(AcctServer - postCommit + e);
Status = AcctServer.STATUS_Error;
// conn.releaseRollbackConnection(con);
- unlock(conn, con);
+ unlock(conn);
}
return Status;
} // postCommit
@@ -664,9 +664,20 @@
/**
* Unlock Document
*/
+ private void unlock(ConnectionProvider conn) {
+try {
+ AcctServerData.updateUnlock(conn, tableName, Record_ID);
+} catch (ServletException e) {
+ log4j.warn(AcctServer - Document locked: - + e);
+}
+ } // unlock
+
+ /**
+ * Unlock Document
+ */
private void unlock(ConnectionProvider conn, Connection con) {
try {
- AcctServerData.updateUnlock(con, conn, tableName, Record_ID);
+ AcctServerData.updateUnlock(conn, tableName, Record_ID);
} catch (ServletException e) {
log4j.warn(AcctServer - Document locked: - + e);
}
diff -r 155ef4810a15 -r c1061f3afdde
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Fri Oct 02
11:37:29 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Sat Oct 03
12:40:26 2009 +0200
@@ -54,7 +54,7 @@
Parameter name=org/
Parameter name=dateColumn type=replace optional=true after=ORDER
BY a. text=CREATED/
/SqlMethod
- SqlMethod name=update type=preparedStatement connection=true
return=rowCount
+ SqlMethod name=update type=preparedStatement return=rowCount
SqlMethodComment/SqlMethodComment
Sql
![CDATA[
@@ -167,7 +167,7 @@
Parameter name=DateAcct/
Parameter name=DateAcct/
/SqlMethod
- SqlMethod name=updateUnlock type=preparedStatement connection=true
return=rowCount
+ SqlMethod name=updateUnlock type=preparedStatement return=rowCount
SqlMethodComment/SqlMethodComment
Sql
![CDATA[
--
Come build with us! The BlackBerryreg; 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#45;12, 2009. Register now#33;
http://p.sf.net/sfu/devconf
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: /erp/erp/devel/main/rev/967465d91318
changeset: 5074:967465d91318
user: Asier Lostalé asier.lostale at openbravo.com
date: Thu Oct 01 14:31:38 2009 +0200
summary: issue 0009931: Take into account function overload when calcualting
crc in PG
details: /erp/erp/devel/main/rev/d9545222a0c2
changeset: 5075:d9545222a0c2
user: Asier Lostalé asier.lostale at openbravo.com
date: Thu Oct 01 17:48:51 2009 +0200
summary: issue 0009931: dateformat function changes in PG: do not check in
the crc
diffstat:
src-db/database/model/prescript-PostgreSql.sql | 16
1 files changed, 12 insertions(+), 4 deletions(-)
diffs (43 lines):
diff -r 96d6af653344 -r d9545222a0c2
src-db/database/model/prescript-PostgreSql.sql
--- a/src-db/database/model/prescript-PostgreSql.sqlWed Sep 30 21:15:09
2009 +0200
+++ b/src-db/database/model/prescript-PostgreSql.sqlThu Oct 01 17:48:51
2009 +0200
@@ -1368,12 +1368,15 @@
v_md5 = '';
--Checksum for PL functions
for i in (
- select upper(proname) as proname
+ select upper(proname) as proname, pronargs, p.proargtypes
from pg_proc p, pg_namespace n
where pronamespace = n.oid and n.nspname=current_schema()
and p.oid not in (select tgfoid from pg_trigger)
- and p.proname 'temp_findinarray'
- order by 1) loop
+ and p.proname not in ('temp_findinarray', 'ad_db_modified',
'dateformat')
+ order by 1,2,3) loop
+ --note that for overloaded functions more than one line will be obtained
+
+
--name
v_md5 := md5(v_md5||i.proname);
@@ -1381,7 +1384,10 @@
select md5(p.prosrc)
into aux
from pg_proc p
- where UPPER(p.proname) = i.proname;
+ where UPPER(p.proname) = i.proname
+and p.pronargs = i.pronargs
+and p.proargtypes = i.proargtypes;
+
v_md5 := md5(v_md5||aux);
--parameters
@@ -1397,6 +1403,8 @@
AND NOT pg_proc.proisagg
AND pg_catalog.pg_function_is_visible(pg_proc.oid)
AND upper(pg_proc.proname) = i.proname
+ and pg_proc.pronargs = i.pronargs
+ and pg_proc.proargtypes = i.proargtypes
and (pg_proc.proargmodes is not null
or pg_proc.proargnames is not null)
ORDER BY 1,2;
--
Come build with us! The BlackBerryreg; 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#45;12, 2009. Register now#33;
http://p.sf.net/sfu/devconf
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: /erp/erp/devel/main/rev/0444a4cef3ea
changeset: 5068:0444a4cef3ea
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Sep 23 13:06:51 2009 +0200
summary: Fixed issue 10128. When applying industry templates, a full
compile.complete will be done to make sure all modified windows are updated.
details: /erp/erp/devel/main/rev/d9786d201903
changeset: 5069:d9786d201903
user: Stefan Hühner stefan.huehner at openbravo.com
date: Wed Sep 23 13:29:24 2009 +0200
summary: Issue 10128: Fix build failure on oracle by removing extra as keyword
diffstat:
src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 2 +-
src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql | 16
+++-
2 files changed, 12 insertions(+), 6 deletions(-)
diffs (40 lines):
diff -r e13fc21ebf9c -r d9786d201903
src/org/openbravo/erpCommon/ad_process/ApplyModules.java
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.java Tue Sep 22
18:39:13 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.java Wed Sep 23
13:29:24 2009 +0200
@@ -209,7 +209,7 @@
final String unnappliedModules = getUnnapliedModules();
- if (ApplyModulesData.isUpdatingCore(this)) {
+ if (ApplyModulesData.isUpdatingCoreOrTemplate(this)) {
tasks.add(update.database);
tasks.add(core.lib);
tasks.add(wad.lib);
diff -r e13fc21ebf9c -r d9786d201903
src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql Tue Sep
22 18:39:13 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules_data.xsql Wed Sep
23 13:29:24 2009 +0200
@@ -37,13 +37,19 @@
/Sql
/SqlMethod
- SqlMethod name=isUpdatingCore type=preparedStatement return=boolean
+ SqlMethod name=isUpdatingCoreOrTemplate type=preparedStatement
return=boolean
SqlMethodComment/SqlMethodComment
Sql![CDATA[
- SELECT count(*) as NAME
- FROM AD_MODULE
- WHERE STATUS='I'
-AND AD_MODULE_ID = '0'
+ SELECT count(*) as NAME FROM
+((SELECT 1
+FROM AD_MODULE
+WHERE STATUS='I'
+ AND (AD_MODULE_ID = '0' OR TYPE='T'))
+UNION
+(SELECT 1
+FROM AD_MODULE_INSTALL
+WHERE STATUS='I'
+ AND (AD_MODULE_ID = '0' OR TYPE='T'))) q
]]
/Sql
/SqlMethod
--
Come build with us! The BlackBerryreg; 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#45;12, 2009. Register now#33;
http://p.sf.net/sfu/devconf
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: /erp/erp/devel/main/rev/4cbeb2ff7ed3
changeset: 4818:4cbeb2ff7ed3
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Fri Aug 21 12:17:03 2009 +0200
summary: Fixes cyclone merge reintegration
details: /erp/erp/devel/main/rev/d6c627e21222
changeset: 4819:d6c627e21222
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Fri Aug 21 12:57:46 2009 +0200
summary: Reapply changset ff1b6f04b442
diffstat:
src-core/src/org/openbravo/base/VariablesBase.java| 79
+++-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 2 +-
2 files changed, 79 insertions(+), 2 deletions(-)
diffs (115 lines):
diff -r 879929fa5af6 -r d6c627e21222
src-core/src/org/openbravo/base/VariablesBase.java
--- a/src-core/src/org/openbravo/base/VariablesBase.javaFri Aug 21
10:27:31 2009 +0200
+++ b/src-core/src/org/openbravo/base/VariablesBase.javaFri Aug 21
12:57:46 2009 +0200
@@ -678,7 +678,8 @@
if (!NumberFilter.instance.accept(newValue)) {
log4j.error(Input: + parameter + not accepted by filter: +
NumberFilter.instance);
- throw new ServletException(Input: + parameter + is not an accepted
input);
+ throw new ServletException(Input: + parameter + with value +
newValue
+ + is not an accepted input);
}
return newValue;
@@ -1125,6 +1126,35 @@
}
/**
+ * Checks if a certain parameter is defined in the variables base.
+ *
+ * @param parameter
+ * the parameter to check
+ * @return true if a value is present, false otherwise
+ */
+ public boolean hasParameter(String parameter) {
+Object value;
+try {
+ if (isMultipart) {
+value = getMultiParameters(parameter);
+ } else {
+value = httpRequest.getParameterValues(parameter);
+ }
+} catch (Exception e) {
+ return false;
+}
+return value != null;
+ }
+
+ /**
+ * @return the parameter names of the request object
+ */
+ @SuppressWarnings(unchecked)
+ public EnumerationString getParameterNames() {
+return httpRequest.getParameterNames();
+ }
+
+ /**
* Retrieves the set of string values for the parameter with the specified
name as passed to the
* servlet by the HTTP POST method. String returned is in the form
('value1', 'value2',...) and
* can be used within SQL statements as part of the 'WHERE columnName IN'
filter which is the main
@@ -1216,6 +1246,53 @@
}
/**
+ * Retrieves the set of string values for the parameter with the specified
name as passed to the
+ * servlet by the HTTP POST/GET method. The parameter must be a multi-valued
parameter. If the
+ * parameter is not set then a String[0] is returned.
+ *
+ * @param parameter
+ * Name of the parameter to be retrieved
+ * @param required
+ * If true, an exception is thrown if the parameter is not among
the data submitted to
+ * the servlet.
+ * @param requestFilter
+ * filter used to validate the input against list of allowed inputs
+ * @return returns a String array with the values present in the request, if
the parameter has no
+ * value then String[0] is returned.
+ * @throws ServletException
+ */
+ public String[] getMultiValueStringParameter(String parameter, boolean
required,
+ RequestFilter requestFilter) throws ServletException {
+String[] auxStr = null;
+try {
+ if (isMultipart)
+auxStr = getMultiParameters(parameter);
+ else
+auxStr = httpRequest.getParameterValues(parameter);
+} catch (Exception e) {
+ if (!(required)) {
+return new String[0];
+ }
+}
+
+if (auxStr == null || auxStr.length == 0) {
+ if (required) {
+throw new ServletException(Request IN parameter required: +
parameter);
+ } else {
+return new String[0];
+ }
+}
+
+auxStr = FormatUtilities.sanitizeInput(auxStr);
+filterRequest(requestFilter, auxStr);
+
+if (log4j.isDebugEnabled())
+ log4j.debug(Request IN parameter: + parameter + :... +
auxStr.toString());
+
+return auxStr;
+ }
+
+ /**
* Retrieve a value specified by the sessionAttribute parameter from the
session variables. If not
* found, an empty string is returned.
*
diff -r 879929fa5af6 -r d6c627e21222
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Fri Aug 21
10:27:31 2009 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Fri Aug 21
12:57:46 2009 +0200
@@ -159,7 +159,7 @@
: strPriceStd.replace(\, )), strQty,
dataOrder[0].mPricelistId,
dataOrder[0].id);
priceActual = new BigDecimal(strPriceActual);
-resultado.append(new Array(\inppriceactual\, \ + strPriceActual +
\),);
+resultado.append(new Array(\inppriceactual\, + strPriceActual +
),);
}
}
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/d3221f9f137d
changeset: 3898:d3221f9f137d
user: Antonio Moreno antonio.moreno at openbravo.com
date: Tue May 05 11:55:02 2009 +0200
summary: Fixed issue 8898. Now full update.database will be executed when a
template is being applied, or an industry template depends on a module which is
being applied.
details: http://code.openbravo.com/erp/devel/main/rev/f3a95e88176e
changeset: 3899:f3a95e88176e
user: Ainhoa Pagola ainhoa.pagola at openbravo.com
date: Tue May 05 12:01:00 2009 +0200
summary: Fixes bug 0008897: Column type in Application dictionary different
to Database column type - AD_Pinstance - UUID
diffstat:
src-db/database/lib/dbsourcemanager.jar |
src-db/database/sourcedata/AD_COLUMN.xml | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diffs (truncated from 12534 to 300 lines):
diff --git a/src-db/database/lib/dbsourcemanager.jar
b/src-db/database/lib/dbsourcemanager.jar
index
78a95e1bcad81ef9b740a1307995519051789d2c..1d58c6aecdae0b08090eeb23b2a54feeb0aac0d6
GIT binary patch
literal 699660
zc$}ox1#le8vnkay$zql~vkv23nvffhs+bae#4l*$eon...@evfuf+h9hx_lib2j#m
zOm$W=l4xzRYqlYcEu=2gG0c9{ObtRE8+tA-ws$12oPCO6+tliwdom...@if2+cp
z1pHAQM~h)}_;cm|r=kC8|5H^~P)@zR9S^yR_tDOVq8X=j(!$VnvQyEV!B?5ae;Z~
z}l*#)sa?0w=cx8bodttqgc...@c+gjh*p8so...@m3#v_0yzpjwx5ykD}7Y-WiWY=
ztgLkqF2{4!E2Be4t|*8%%JfTvdmLbG{W=+uGfptt3#(l=YRI_Pp|$DV7%Cdna-
zzt({Nw}zpEp|OSO|E3u5e-5=r=p38jjM~Ljq~3izWxQm(8k5o$W2p-tKR}1b+cG
z...@w78egbx}=dar#E$#mXMEutvV|zO{QQD{ySrF{{nAoZ(?fm|HDoP8$%Z}dnen!
zfs*_a)X?Ma$Cb;2#js)T}_;g4...@f^k+#l+~_f5!?FQzs+Ozab$1Cjv7|CsQL!
zCzHS7ApIu}3ui|g6QjRjp!gSOS?ZFWMt_4cSHG)V_|f...@wdjbx98nud~b8f%Bh{
z_-_$-{yo7zPKCXbp|Q1jp9GLwSf...@b5of71|WLx;bei+?o4+4CRV0p~9mTnwG9
z{{{y5E0~j^owLn9ExdpAqyIYp4GihuFnb46J0mAUx4C!vHl;r{~w|W{$GRsVLbi@
z`42{+{XdW{rp_*Z1Hk@2bdT+|F4Dozw(H+KH=x^FCZXf5+EQ5f4(_bTRywJJ6fB
zm|WtoJFT-lFNixWtU}*Ic3P1muSW{|0H9VGUc=$JvGyJ1E3}tD1!(Gsx90OUvswH
z...@g(wzQ-1i=e_1;%B|ZaK0Yxg)GqA}e^B#6-AoQ5m}#YJRQu*P6CPv(p?I{7
z?46qAcPOI5(JRSFekRloBnpZ8q)@gXV-X6A!7$l(tbz1t!ie`!esy...@}s03k4
z...@iywsv}*n%5hgz9+l}dwc~p0mp$9x#it#ixt8pRlKhB*w86C_?$V$pUJew!O$e)
zN0(hbha3PDIn$YL1T(#$(-_DAxBSGY-IXq%SA!)$oEsOtRaJ{MPa5e`-%jnITj
zt^Gmk6{2yS=HySyjz#Ts|ZJ+;B8JclAd3ic7}$`In6+#(x??on+HNLammPQNJO
zX4=5vV$OvRiZYzo3kq1X(v9#RWQtgM3lj`Uk#lp1Ce0K%VS09fPkG6rk!xxmIE
zMN2Ta36DMFXNPwopeGqX;1p-qSggeu~R^CGHjqe`3q*~mke(f9|-}2zXml+u(
zLt!#6*j*+i2Xe~e(PEH{MT;FHW5N8cxLSv!{8S1Kzyp_pHj6O+{=Vj^hXq-!UP+
zBrR2feDelCaD6Z5N4G}^h6XW``4E4Jt=sZjqFLb*qo^7O*`T(+57oFkk)_C7$rn
z?kRByk?bkT3q0^u^`wWAkEIvt2Y_ob?E1~i{P?4-^)vh{`Z$dPS4x-mu;k+-##~c
z;=EsrZtFZWS?;c1sskmvzldv3u!t!ykmmal6qv*78...@tpn0ptjli?)xZ_^+%
zk#?mjuq6=jHAi?g(0N`F6^3QR%1m)qV_g(=xZc~E$e3Qajf-;%9kPkv_1uVdX
z$rK1%1_M;SrV$y^IucU#hJ}Io?E!_q(pX-QdJegu$96b0mO42R_k(U++0e#0|D9r
zrwMw$YnS=dcnNJ;=jR%SFdJwFEkR*PcnNg9Qd1ncWzpVldjmLEXA-LFkq1
zgd#k7xsqy...@6jb)lf%i91;2gG(lt2?92;;4v?M*ZSFT+|d|`Alob5hYg8r*GpwM
zjqpJ)6ieoYesU^HpO#EN(n...@$=x0d(=sp...@*fl(rOvn%rF%hD%AUn^RJ;#I
zu%xf-qsm...@olut?k3ih$gy)R!=MVBQuu2XKhKLrxSRSGFc^pq_!wbRGaWtujE
zp}t_Jh%hJBC{sZiy#u%v3+ie(tuXKe3WcVs$tveVsByYv9wo^*u9GZT9Yik
zX#ouV0uqxzn...@5sepho%oo1nafxu=k*gstxzqozlszm#z#(!=oRwiq{0h66uYR
z-ms(@JAgWoAn2$o;JNJt$018Vx096a...@5ry0tjca?}--x6dm+r=...@`+kd
zUl}{ccvG!JRIs9taE%`F6C^g=mSOViGRnj}NFcjOOb3xHit$O)WT!vkG^(FmB-
zo1dgl$j_FXjBZLQYwWoX7)@B}is%5EaDGpV#Kv3{GeJU1zd(r...@fn7-wbuXM*
z_uS7Yq#uxAbj9UtNsEg$hTA}}(j4$0(4Piw{DdMIr2u^h(iE|hCAubt(X=Xx*7?Ya
zUmm4b!;k...@bqzb~`U3WAXR#BAKp0%Mcc8aw_1K*1vB2h?Ku7I!cPAvI*?XBMmo
zkVlEY4Q_;;!EW4v+el...@am%^azwtw09_da9znzffkpko8gr(VfHLzVUz;_B#Y
zeiY+gup|L08KcbniMk`)1Ez)z(*`apzfg?r...@v*isto(}L72m~Ij4-qOf)iQ6}
zt8yEpTkdmEVNBFXMu{)Ne6v6DD=w__(azDGIy!hg8lEzAEcwCK}U;M{}d$^V(^
zrs5%?PHqPXXn5p4h!!_^0548rx+6p+s$OKn1LN#yH5PuO%s%n9AHV7q$Wi8#`_A
zTmU3}Lo4mJ7H6+4-=g8g$+EK6p2m2N27yvL|R1xO8F$5IW0SC)^T7AS~jS7PDs;
zjxL#vG4qozULvok}WCNHOct3E!%r-+0A|#Zy$DSFV-*k6_ZW0{gMTt)md;^mr8^#
z_yqgQWg_qU%6N|kGu9%HPOQZ-?vbjmj*SKB)UjD`d;mbZQkX0UNM9T7aZr!r
zq{~isxW4gyOgggG_E{COgf#;;p4eM4NrxHLTTtdQ;tsbf%em=mHIp2telr5%G
zxqU!3n!~Py^H2R-XgUTn^iekzyy!ay`%^it0qt`ga...@shuhr~fuy44f...@~
zb~2;1M%(?...@ba7;#q-ca...@*+$tj^i%nztj0k?...@^*=ixwdsyxhhtz7`)W=4OmO
zM{SX=e@JIcvl*F^7WJ+ApX%-*em#^UF$AMhV7Xp8+^%hS4VzD}*O54TZf1Ebl
zB7UK`4no)%)_xf#5;A8xa4}%n{2}e9fbS*7U(|hNB%%_FRaYtk0i4qZa);v5sk{
zVWi...@l`sh=$3+e)N*{QDEe3X1Aa_Z`LFA0bL7p8|3~k9UqtrKh{crVt(0Wnmj%
zmPzV~`;8qg...@vkqtbe+xn`kbf!vbrxd_k$d~)4_eaeOQJw|w)9wAfu=R8ANj}2
zSm*gGKes7V{WM|E7+VTwkK7#5oxhuum6g...@yy7#lqivat*m;0E$5HQvO~we`
z*J^7jGKr`LCeewQii)~kqYxhx)`VM}_JpK$kcyD$bordV120eo0GJEQRy5$%|z$
zT1XL%smhZq?+!KeUIOH!B8w}KIUZSID=rW?mVz!r!iR^o^pRiI$1-=`$VSeG
z2Lzq0({OW%B+qR0_-WYi9n;=e_v1syed1ves*y+ft...@syk!tvtxz-pyoj0x!-?^
zdT$bTLw|0@AjJvgjb=y^K!6;?q;(;?=^F~XmQX{B1zH)QD)$;RhgM7rkzw...@p
z}R`9g9b%-(INR|XR7kf6?S-X`6E%;nF5iYB^!a?W!+{-%DkoiXIMJio22EKkec
zsN~yN)$n-SXgYHZawDRwI{1*=k({tfE~2dM18#y`Xew%$uOEhx~p#74Gl)fRNW%
zYr%P+9z_GnBf?jgYR%2yMe2oIPvkq(}#Hfh!CxWCToVyOWmBVGhHwY#2=T-XrT7
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/577de6bd6dd5 changeset: 3545:577de6bd6dd5 user: Iván Perdomo ivan.perdomo at openbravo.com date: Wed Apr 08 15:25:45 2009 +0200 summary: Fixes issue 8496: The read only logic must use single-quotes when comparing strings details: http://code.openbravo.com/erp/devel/main/rev/f544940c086d changeset: 3546:f544940c086d user: Asier Lostalé asier.lostale at openbravo.com date: Wed Apr 08 16:43:13 2009 +0200 summary: fixed bug 0008498: while creating a new volume discount BP's are wrongly added from the old volume discount to the new one. diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 20 ++-- src-db/database/sourcedata/AD_TAB.xml| 11 ++- 2 files changed, 20 insertions(+), 11 deletions(-) diffs (170 lines): diff -r a148b4e27b4c -r f544940c086d src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Apr 09 09:32:39 2009 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Apr 08 16:43:13 2009 +0200 @@ -21894,7 +21894,7 @@ !--1410-- ISPARENT![CDATA[N]]/ISPARENT !--1410-- ISMANDATORY![CDATA[Y]]/ISMANDATORY !--1410-- ISUPDATEABLE![CDATA[Y]]/ISUPDATEABLE -!--1410-- READONLYLOGIC![cda...@producttype@=R | @productt...@=e | @productt...@=o]]/READONLYLOGIC +!--1410-- READONLYLOGIC![cda...@producttype@='R' | @productt...@='E' | @productt...@='O']]/READONLYLOGIC !--1410-- ISIDENTIFIER![CDATA[Y]]/ISIDENTIFIER !--1410-- SEQNO![CDATA[1]]/SEQNO !--1410-- ISTRANSLATED![CDATA[Y]]/ISTRANSLATED @@ -21926,7 +21926,7 @@ !--1411-- ISPARENT![CDATA[N]]/ISPARENT !--1411-- ISMANDATORY![CDATA[N]]/ISMANDATORY !--1411-- ISUPDATEABLE![CDATA[Y]]/ISUPDATEABLE -!--1411-- READONLYLOGIC![cda...@producttype@=R | @productt...@=e | @productt...@=o]]/READONLYLOGIC +!--1411-- READONLYLOGIC![cda...@producttype@='R' | @productt...@='E' | @productt...@='O']]/READONLYLOGIC !--1411-- ISIDENTIFIER![CDATA[N]]/ISIDENTIFIER !--1411-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--1411-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED @@ -25170,7 +25170,7 @@ !--1760-- ISPARENT![CDATA[N]]/ISPARENT !--1760-- ISMANDATORY![CDATA[Y]]/ISMANDATORY !--1760-- ISUPDATEABLE![CDATA[Y]]/ISUPDATEABLE -!--1760-- READONLYLOGIC![cda...@producttype@=R | @productt...@=e | @productt...@=o]]/READONLYLOGIC +!--1760-- READONLYLOGIC![cda...@producttype@='R' | @productt...@='E' | @productt...@='O']]/READONLYLOGIC !--1760-- ISIDENTIFIER![CDATA[N]]/ISIDENTIFIER !--1760-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--1760-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED @@ -25202,7 +25202,7 @@ !--1761-- ISPARENT![CDATA[N]]/ISPARENT !--1761-- ISMANDATORY![CDATA[Y]]/ISMANDATORY !--1761-- ISUPDATEABLE![CDATA[Y]]/ISUPDATEABLE -!--1761-- READONLYLOGIC![cda...@producttype@=R | @productt...@=e | @productt...@=o]]/READONLYLOGIC +!--1761-- READONLYLOGIC![cda...@producttype@='R' | @productt...@='E' | @productt...@='O']]/READONLYLOGIC !--1761-- ISIDENTIFIER![CDATA[N]]/ISIDENTIFIER !--1761-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--1761-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED @@ -27701,8 +27701,8 @@ !--2011-- ISACTIVE![CDATA[Y]]/ISACTIVE !--2011-- NAME![CDATA[Search Key]]/NAME !--2011-- DESCRIPTION![CDATA[A fast method for finding a particular record.]]/DESCRIPTION -!--2011-- HELP![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the Document Sequence window. The sequence naming convention follows a rule DocumentNo_TableName, where TableName is the actual name of the database table (e.g. C_Order). - +!--2011-- HELP![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the Document Sequence window. The sequence naming convention follows a rule DocumentNo_TableName, where TableName is the actual name of the database table (e.g. C_Order). + Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]/HELP !--2011-- COLUMNNAME![CDATA[Value]]/COLUMNNAME !--2011-- AD_TABLE_ID![CDATA[208]]/AD_TABLE_ID @@ -27712,7 +27712,7 @@ !--2011-- ISPARENT![CDATA[N]]/ISPARENT !--2011-- ISMANDATORY![CDATA[Y]]/ISMANDATORY !--2011-- ISUPDATEABLE![CDATA[Y]]/ISUPDATEABLE -!--2011-- READONLYLOGIC![cda...@producttype@=R | @productt...@=e | @productt...@=o]]/READONLYLOGIC +!--2011-- READONLYLOGIC![cda...@producttype@='R' | @productt...@='E' | @productt...@='O']]/READONLYLOGIC !--2011-- ISIDENTIFIER![CDATA[N]]/ISIDENTIFIER !--2011-- ISTRANSLATED![CDATA[N]]/ISTRANSLATED !--2011-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED @@ -27743,7 +27743,7 @@ !--2012-- ISPARENT![CDATA[N]]/ISPARENT !--2012-- ISMANDATORY![CDATA[Y]]/ISMANDATORY !--2012--
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/2f1ae9fa0db3 changeset: 3554:2f1ae9fa0db3 user: Juan Pablo Aroztegi juanpablo.aroztegi at openbravo.com date: Tue Apr 14 17:50:40 2009 +0200 summary: Update AD_MODULE version details: http://code.openbravo.com/erp/devel/main/rev/c93be69a78a4 changeset: 3555:c93be69a78a4 user: Juan Pablo Aroztegi juanpablo.aroztegi at openbravo.com date: Tue Apr 14 17:50:44 2009 +0200 summary: Added tag 2.50 for changeset 2f1ae9fa0db3 diffstat: .hgtags | 1 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (18 lines): diff -r f121c0cb660b -r c93be69a78a4 .hgtags --- a/.hgtags Tue Apr 14 15:37:55 2009 + +++ b/.hgtags Tue Apr 14 17:50:44 2009 +0200 @@ -1,1 +1,2 @@ bcc34be9b9cd957277a0fe80b1f3d7dbbc7e8a1d 2.50beta +2f1ae9fa0db3719f226b4e385b10338ae86bc327 2.50 diff -r f121c0cb660b -r c93be69a78a4 src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 14 15:37:55 2009 + +++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 14 17:50:44 2009 +0200 @@ -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.10440]]/VERSION +!--0-- VERSION![CDATA[2.50.13553]]/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-- TYPE![CDATA[M]]/TYPE -- This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/6361a469876e
changeset: 3524:6361a469876e
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Thu Apr 02 14:09:09 2009 +0200
summary: Fixes issue 8402: Now javascript validation and autosave is
triggered in some cases
details: http://code.openbravo.com/erp/devel/main/rev/76bd2a58e42d
changeset: 3525:76bd2a58e42d
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Thu Apr 02 15:05:34 2009 +0200
summary: Changed the javascript validation calls. Related to issue 8369
diffstat:
src-wad/src/org/openbravo/wad/javasource.javaxml| 11 -
src/org/openbravo/erpCommon/businessUtility/WindowTabs.java | 32
++-
src/org/openbravo/erpCommon/utility/ToolBar.java| 7 ++-
src/org/openbravo/erpCommon/utility/UsedByLink.java | 5 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html | 8 +---
web/js/utils.js | 6 +--
6 files changed, 49 insertions(+), 20 deletions(-)
diffs (187 lines):
diff -r 10a8e9eff4d6 -r 76bd2a58e42d
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml Fri Apr 03 00:30:48
2009 -0400
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml Thu Apr 02 15:05:34
2009 +0200
@@ -915,7 +915,7 @@
xmlDocument.setParameter(toolbar, toolbar.toString());
try {
- WindowTabs tabs = new WindowTabs(this, vars, tabId, windowId);
+ WindowTabs tabs = new WindowTabs(this, vars, tabId, windowId, true,
(strCommand.equalsIgnoreCase(NEW)));
xmlDocument.setParameter(parentTabContainer, tabs.parentTabs());
xmlDocument.setParameter(mainTabContainer, tabs.mainTabs());
// if (!strKEY_TMP id=keyPosicionAlmacen/KEY_TMP.equals())
xmlDocument.setParameter(childTabContainer, tabs.childTabs(false));
@@ -945,7 +945,8 @@
xmlDocument.setParameter(changed, );
xmlDocument.setParameter(language, defaultLang=\ + vars.getLanguage()
+ \;);
xmlDocument.setParameter(theme, vars.getTheme());
-xmlDocument.setParameter(mappingName,
UtilityData.selectObjectMapping(this, tabId));
+final String strMappingName = UtilityData.selectObjectMapping(this, tabId);
+xmlDocument.setParameter(mappingName, strMappingName);
xmlDocument.setParameter(confirmOnChanges,
Utility.getJSConfirmOnChanges(vars, windowId));
//xmlDocument.setParameter(buttonReference, Utility.messageBD(this,
Reference, vars.getLanguage()));
@@ -994,7 +995,11 @@
xmlDocument.setParameter(failedAutosave, jsFunction);
}
}
-
+
+if (strCommand.equalsIgnoreCase(NEW)) {
+ vars.removeSessionValue(strMappingName + |hash);
+}
+
response.setContentType(text/html; charset=UTF-8);
PrintWriter out = response.getWriter();
out.println(xmlDocument.print());
diff -r 10a8e9eff4d6 -r 76bd2a58e42d
src/org/openbravo/erpCommon/businessUtility/WindowTabs.java
--- a/src/org/openbravo/erpCommon/businessUtility/WindowTabs.java Fri Apr
03 00:30:48 2009 -0400
+++ b/src/org/openbravo/erpCommon/businessUtility/WindowTabs.java Thu Apr
02 15:05:34 2009 +0200
@@ -44,6 +44,7 @@
private String action = ;
private int level = 0;
boolean editView = true;
+ boolean newRecord = false;
private HashtableString, StackWindowTabsData tabs = new
HashtableString, StackWindowTabsData();
private StackWindowTabsData breadcrumb = new StackWindowTabsData();
@@ -67,6 +68,13 @@
}
public WindowTabs(ConnectionProvider _conn, VariablesSecureApp _vars, String
_tabId,
+ String _windowId, boolean _editView, boolean _newRecord) throws
Exception {
+this(_conn, _vars, _tabId, _windowId);
+this.editView = _editView;
+this.newRecord = _newRecord;
+ }
+
+ public WindowTabs(ConnectionProvider _conn, VariablesSecureApp _vars, String
_tabId,
String _windowId) throws Exception {
if (_conn == null || _vars == null || _tabId == null || _tabId.equals()
|| _windowId == null
|| _windowId.equals())
@@ -616,9 +624,27 @@
private String getUrlCommand(String _tabId, String _tabName, int _level) {
final StringBuffer text = new StringBuffer();
if (!_tabId.equals(this.TabID) this.level + 1 = _level) {
- text.append(logClick(null);submitCommandForm(').append(
- ((this.level _level) ? DEFAULT : TAB)).append(', );
- text.append((editView) ? isUserChanges : false).append(, null, ');
+ if (this.newRecord this.level _level) {
+// Log user click when is NEW record and clicking a child tab
+text.append(logClick(null););
+ }
+ text.append(submitCommandForm(').append(((this.level _level) ?
DEFAULT : TAB))
+ .append(', );
+
+ if (this.editView) {
+if (this.newRecord) {
+ if (this.level = _level) {
+text.append(false); // Don't validate when click parent or
sibling tab
+ } else {
+
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/53076318b676 changeset: 3533:53076318b676 user: Asier Lostalé asier.lostale at openbravo.com date: Fri Apr 03 15:08:46 2009 +0200 summary: fixed bug 0008418: Switching from Grid to Edit mode in Languages shows the wrong one details: http://code.openbravo.com/erp/devel/main/rev/ff85893b50fe changeset: 3534:ff85893b50fe user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Fri Apr 03 16:50:35 2009 +0200 summary: Fixes bug 0008302: Cannot unprocess a tax payment diffstat: src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 20 ++-- src-wad/src/org/openbravo/wad/Wad.java| 2 +- src/org/openbravo/erpCommon/utility/TableSQLData.java | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diffs (82 lines): diff -r c51ac510f7d3 -r ff85893b50fe src-db/database/model/functions/C_TAXPAYMENT_POST.xml --- a/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Apr 03 18:53:22 2009 -0400 +++ b/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Apr 03 16:50:35 2009 +0200 @@ -134,12 +134,12 @@ v_paymentrule := 'T'; v_currencyratetype := 'S'; - + select c_calendar_id into v_calendar_ID from ad_clientinfo where ad_client_id = v_client_id; - - select c_period_id into v_period_id + + select c_period_id into v_period_id from c_period where enddate = (select max(enddate) from c_period where enddate =v_date and exists (select 1 from c_year where c_calendar_id = v_calendar_ID @@ -160,7 +160,7 @@ into v_gl_journalid, v_gl_journalbatchid, v_settlementid from c_taxpayment tp inner join gl_journal glj on tp.gl_journal_id=glj.gl_journal_id - inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journal_id + inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journalbatch_id where tp.C_TAXPAYMENT_ID = v_record_id; update gl_journal set docaction='RE' where gl_journal_id=v_gl_journalid; @@ -260,19 +260,19 @@ v_totalcredit := v_totalcredit+v_debit; end loop; - - select count(*) + + select count(*) into v_TRTcountY from c_taxregister_type tt where tt.issotrx='Y'; - - select count(*) + + select count(*) into v_TRTcountN from c_taxregister_type tt where tt.issotrx='N'; - + if v_TRTcountY=0 or v_TRTcountN=0 then RAISE_APPLICATION_ERROR(-20100, '@TwoRegisterTypesNeeded@'); end if; - + select case when tt.issotrx='Y' then max(glitem_debit_acct) else max(glitem_credit_acct) end, max(tt.c_glitem_id) into v_glitem_acct, v_glitem_id from c_taxregister_type tt diff -r c51ac510f7d3 -r ff85893b50fe src-wad/src/org/openbravo/wad/Wad.java --- a/src-wad/src/org/openbravo/wad/Wad.javaFri Apr 03 18:53:22 2009 -0400 +++ b/src-wad/src/org/openbravo/wad/Wad.javaFri Apr 03 16:50:35 2009 +0200 @@ -3468,7 +3468,7 @@ org/openbravo/wad/Template_Relation, discard).createXmlDocument(); xmlDocument.setParameter(form, tabName + _Edition.html); xmlDocument.setParameter(tab, tabNamePresentation); -if (strTable.equals(111)) +if (strTab.equals(445)) keyColumnName = AD_Language; xmlDocument.setParameter(key, inp + Sqlc.TransformaNombreColumna(keyColumnName)); xmlDocument.setParameter(keyId, keyColumnName); diff -r c51ac510f7d3 -r ff85893b50fe src/org/openbravo/erpCommon/utility/TableSQLData.java --- a/src/org/openbravo/erpCommon/utility/TableSQLData.java Fri Apr 03 18:53:22 2009 -0400 +++ b/src/org/openbravo/erpCommon/utility/TableSQLData.java Fri Apr 03 16:50:35 2009 +0200 @@ -2063,10 +2063,9 @@ dataAux.setData(isidentifier, (prop.getProperty(IsIdentifier).equals(Y) ? true : false)); -boolean isKey = (!getTableName().equals(AD_Language) +boolean isKey = (!getTabID().equals(445) prop.getProperty(ColumnName).equals(getKeyColumn()) !cloneRecord) -|| (getTableName().equals(AD_Language) prop.getProperty(ColumnName).equals( -AD_Language)); +|| (getTabID().equals(445) prop.getProperty(ColumnName).equals(AD_Language)); dataAux.setData(iskey, isKey ? true : false); dataAux.setData(isvisible, ((prop.getProperty(IsDisplayed).equals(Y) prop -- ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/ab81bc82f31d
changeset: 3515:ab81bc82f31d
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Mar 31 14:41:51 2009 +0200
summary: fixed bug 0008365: Completing requisition not possible, no permission
details: http://code.openbravo.com/erp/devel/main/rev/078ab7f80dd1
changeset: 3516:078ab7f80dd1
user: Juan Pablo Aroztegi juanpablo.aroztegi at openbravo.com
date: Tue Mar 31 16:23:50 2009 +0200
summary: Merge from pi
diffstat:
.hgtags | 1 +
config/Openbravo.properties.template | 2 +-
src-db/database/model/functions/M_INOUT_CREATE.xml| 6 ++-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33
src/org/openbravo/erpCommon/ad_actionButton/DocAction.xml | 4 +-
5 files changed, 42 insertions(+), 4 deletions(-)
diffs (121 lines):
diff -r 559b875daf9d -r 078ab7f80dd1 .hgtags
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/.hgtags Tue Mar 31 16:23:50 2009 +0200
@@ -0,0 +1,1 @@
+bcc34be9b9cd957277a0fe80b1f3d7dbbc7e8a1d 2.50beta
diff -r 559b875daf9d -r 078ab7f80dd1 config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Tue Mar 31 13:05:59 2009 +0200
+++ b/config/Openbravo.properties.template Tue Mar 31 16:23:50 2009 +0200
@@ -118,4 +118,4 @@
# Validation #
##
-validate.model=true
\ No newline at end of file
+validate.model=true
diff -r 559b875daf9d -r 078ab7f80dd1
src-db/database/model/functions/M_INOUT_CREATE.xml
--- a/src-db/database/model/functions/M_INOUT_CREATE.xmlTue Mar 31
13:05:59 2009 +0200
+++ b/src-db/database/model/functions/M_INOUT_CREATE.xmlTue Mar 31
16:23:50 2009 +0200
@@ -77,6 +77,7 @@
v_order_partial_count NUMBER:= 0;
v_Record_ID VARCHAR2(32):=NULL;
v_Selection VARCHAR2(1):='N';
+v_hasPartial BOOLEAN := false;
-- Orders to process - one per warehouse
Cur_Order RECORD;
-- Order Lines per Warehouse
@@ -490,11 +491,13 @@
DBMS_OUTPUT.PUT_LINE('Not enough stocked products,
delivery type Line');
v_lines := v_lines - v_lines_per_orderline;
v_resultlinesstr := COALESCE(v_resultlinesstr, '')
|| 'br@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ':
@notenoughstockdeliveryrulel...@.' ;
+ v_hasPartial := true;
DELETE FROM M_INOUTLINE
WHERE M_INOUT_ID = v_documentno
AND C_ORDERLINE_ID = ol.C_ORDERLINE_ID;
ELSE
v_resultlinesstr := COALESCE(v_resultlinesstr, '')
|| 'br@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ':
@notEnoughStockPartial@' || '.' ;
+ v_hasPartial := true;
END IF;
END IF;
-- Copy Ad-hoc lines, Comments OR Service Items
@@ -546,7 +549,7 @@
DELETE FROM M_INOUT
WHERE M_INOUT_ID = p_InOut_ID;
result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo ||
': ' || '@shipmenter...@.' || v_resultlinesstr;
- ELSIF (v_resultlinesstr IS NOT NULL OR v_resultlinesstr != '') THEN
+ ELSIF (v_hasPartial) THEN
v_order_partial_count := v_order_partial_count +1;
result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || '
@InoutDocumentno@ ' || v_DocumentNo || ': @shipmentpart...@.' ||
v_resultlinesstr;
ELSE
@@ -561,6 +564,7 @@
END IF;
result_String := '';
v_resultlinesstr := '';
+ v_hasPartial := false;
IF(NOT Next_Order) THEN
IF(v_lines=0) THEN
DBMS_OUTPUT.PUT_LINE('v_lines!' || v_lines) ;
diff -r 559b875daf9d -r 078ab7f80dd1
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 31 13:05:59
2009 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 31 16:23:50
2009 +0200
@@ -22131,6 +22131,39 @@
!--27B5251AA1F411DD8EAED3B037B9C016--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
!--27B5251AA1F411DD8EAED3B037B9C016--/AD_TEXTINTERFACES
+!--28180A84124411DE9AAA000C2901CB3B--AD_TEXTINTERFACES
+!--28180A84124411DE9AAA000C2901CB3B--
AD_TEXTINTERFACES_ID![CDATA[28180A84124411DE9AAA000C2901CB3B]]/AD_TEXTINTERFACES_ID
+!--28180A84124411DE9AAA000C2901CB3B--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--28180A84124411DE9AAA000C2901CB3B-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--28180A84124411DE9AAA000C2901CB3B-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--28180A84124411DE9AAA000C2901CB3B-- TEXT![CDATA[AEAT]]/TEXT
+!--28180A84124411DE9AAA000C2901CB3B--
FILENAME![CDATA[/org/openbravo/erpCommon/ad_reports/GenerateModel347.html]]/FILENAME
+!--28180A84124411DE9AAA000C2901CB3B--
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/80db7ceb5855 changeset: 3260:80db7ceb5855 user: Juan Pablo Aroztegi juanpablo.aroztegi at openbravo.com date: Thu Mar 12 16:23:48 2009 +0100 summary: Backed out changeset dfed4d676853 details: http://code.openbravo.com/erp/devel/main/rev/2f94f50c4f3d changeset: 3261:2f94f50c4f3d user: Asier Lostalé asier.lostale at openbravo.com date: Thu Mar 12 12:37:31 2009 +0100 summary: fixed bug 0008091: Translation modules do not load translations diffstat: src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dfed4d676853 -r 2f94f50c4f3d src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql --- a/src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql Thu Mar 12 12:25:40 2009 + +++ b/src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql Thu Mar 12 12:37:31 2009 +0100 @@ -27,7 +27,7 @@ SELECT M.JAVAPACKAGE, M.NAME, M.AD_LANGUAGE, L.ISSYSTEMLANGUAGE, '' as DS_NAME, '' AS AD_MODULE_ID FROM AD_MODULE M LEFT JOIN AD_LANGUAGE L ON L.AD_LANGUAGE = M.AD_LANGUAGE - WHERE (STATUS = 'I' OR STATUS ='P') + WHERE (STATUS = 'I' OR STATUS = 'P') AND ISTRANSLATIONMODULE = 'Y' ]]/Sql /SqlMethod -- Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/0d059ca39904
changeset: 3256:0d059ca39904
user: Eduardo Argal Guibert eduardo.argal at openbravo.com
date: Wed Mar 11 17:02:47 2009 +0100
summary: Fixes bug 0008072: Data access level is wrong for tables C_Region
and C_Doctype
details: http://code.openbravo.com/erp/devel/main/rev/c2672f812c6b
changeset: 3257:c2672f812c6b
user: Eduardo Argal Guibert eduardo.argal at openbravo.com
date: Wed Mar 11 18:30:09 2009 +0100
summary: Fixes bug 0008075: Enabled Martin check, sampledata has been fixed
for inconsistencies regarding data access level.
diffstat:
src-db/database/sourcedata/AD_TABLE.xml | 4 ++--
src/org/openbravo/base/validation/AccessLevelChecker.java | 14 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diffs (55 lines):
diff -r 4394cf107eac -r c2672f812c6b src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Wed Mar 11 10:16:34 2009 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml Wed Mar 11 18:30:09 2009 +0100
@@ -948,7 +948,7 @@
!--164-- TABLENAME![CDATA[C_Region]]/TABLENAME
!--164-- CLASSNAME![CDATA[Region]]/CLASSNAME
!--164-- ISVIEW![CDATA[N]]/ISVIEW
-!--164-- ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL
+!--164-- ACCESSLEVEL![CDATA[6]]/ACCESSLEVEL
!--164-- AD_WINDOW_ID![CDATA[122]]/AD_WINDOW_ID
!--164-- ISSECURITYENABLED![CDATA[N]]/ISSECURITYENABLED
!--164-- ISDELETEABLE![CDATA[Y]]/ISDELETEABLE
@@ -1487,7 +1487,7 @@
!--217-- TABLENAME![CDATA[C_DocType]]/TABLENAME
!--217-- CLASSNAME![CDATA[DocumentType]]/CLASSNAME
!--217-- ISVIEW![CDATA[N]]/ISVIEW
-!--217-- ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL
+!--217-- ACCESSLEVEL![CDATA[7]]/ACCESSLEVEL
!--217-- AD_WINDOW_ID![CDATA[135]]/AD_WINDOW_ID
!--217-- ISSECURITYENABLED![CDATA[N]]/ISSECURITYENABLED
!--217-- ISDELETEABLE![CDATA[Y]]/ISDELETEABLE
diff -r 4394cf107eac -r c2672f812c6b
src/org/openbravo/base/validation/AccessLevelChecker.java
--- a/src/org/openbravo/base/validation/AccessLevelChecker.java Wed Mar 11
10:16:34 2009 +0100
+++ b/src/org/openbravo/base/validation/AccessLevelChecker.java Wed Mar 11
18:30:09 2009 +0100
@@ -4,15 +4,15 @@
* Version 1.0 (the License), being the Mozilla Public License
* Version 1.1 with a permitted attribution clause; you may not use this
* file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
+ * the License at http://www.openbravo.com/legal/license.html
* Software distributed under the License is distributed on an AS IS
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2008 Openbravo SL
- * All Rights Reserved.
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SL
+ * All portions are Copyright (C) 2008 Openbravo SL
+ * All Rights Reserved.
* Contributor(s): __.
*/
@@ -85,7 +85,7 @@
public static final AccessLevelChecker CLIENT_ORGANIZATION = new
AccessLevelChecker() {
@Override
public void checkAccessLevel(String entity, String clientId, String orgId)
{
- // failOnZeroClient(entity, clientId);
+ failOnZeroClient(entity, clientId);
}
};
--
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] erp/devel/main: 2 new changesets
details: http://code.openbravo.com/erp/devel/main/rev/35d3cb4c25c1
changeset: 3249:35d3cb4c25c1
user: Phil Heenan phillip.heenan at openbravo.com
date: Wed Mar 04 19:54:01 2009 +0100
summary: Fixed 7920. Modified query input to use a shortened version of the
file path. Updated translation handling for manual forms to ensure translations
are returned. Implemented translation for sub reports passed through the
PrintController.
details: http://code.openbravo.com/erp/devel/main/rev/ac6d3962082a
changeset: 3250:ac6d3962082a
user: Phil Heenan phillip.heenan at openbravo.com
date: Fri Mar 06 15:33:21 2009 +0100
summary: Fix the translation process for forms and manually created reports
that do not pass through Jasper Reports. Iterate over the DataValue in the
XMLEngine and check for instances of CharacterComponent in either the headers
or footers of sections in the report.
diffstat:
7 files changed, 93 insertions(+), 17 deletions(-)
src-core/src/org/openbravo/uiTranslation/TranslationHandler.java | 19 ++-
src-core/src/org/openbravo/xmlEngine/XmlDocument.java|6 +
src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 57
++
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java |4
src/org/openbravo/erpCommon/ad_process/JasperProcess.java|2
src/org/openbravo/erpCommon/utility/Utility.java |4
src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 18 +--
diffs (264 lines):
diff -r e256c35b5b16 -r ac6d3962082a
src-core/src/org/openbravo/uiTranslation/TranslationHandler.java
--- a/src-core/src/org/openbravo/uiTranslation/TranslationHandler.java Mon Mar
09 10:35:42 2009 +0100
+++ b/src-core/src/org/openbravo/uiTranslation/TranslationHandler.java Fri Mar
06 15:33:21 2009 +0100
@@ -29,6 +29,7 @@
private String language = ;
private String tabId = ;
private String fileName = ;
+ private String baseDesignPath = ;
private String reportString = ;
private String documentTypeId = ;
@@ -109,8 +110,9 @@
}
}
- public void prepareFile(String reportName, String lang, File file) {
-setFileName(reportName);
+ public void prepareFile(String reportName, String lang, File file, String
baseDesignPath1) {
+setFileName(reportName.replaceAll(//, /));
+setBaseDesignPath(baseDesignPath1);
setLanguage(lang);
generateTranslations();
createInputStream(file);
@@ -195,7 +197,13 @@
} else if (tabId != null !tabId.equals()) {
setTabLabels();
} else if (fileName != null !fileName.equals()) {
- formLabels = TranslationUtils.processFormLabels(conn, fileName,
language);
+ String textFileName = fileName.replace(baseDesignPath, );
+ if (textFileName.contains(?)) {
+String suffix = textFileName.substring(textFileName.lastIndexOf(.));
+String prefix = textFileName.substring(0, textFileName.indexOf(?));
+textFileName = prefix + suffix;
+ }
+ formLabels = TranslationUtils.processFormLabels(conn, textFileName,
language);
}
}
@@ -231,4 +239,9 @@
}
}
+ private void setBaseDesignPath(String baseDesignPath1) {
+if (baseDesignPath1 != null)
+ this.baseDesignPath = baseDesignPath1.replaceAll(//, /);
+ }
+
}
diff -r e256c35b5b16 -r ac6d3962082a
src-core/src/org/openbravo/xmlEngine/XmlDocument.java
--- a/src-core/src/org/openbravo/xmlEngine/XmlDocument.java Mon Mar 09
10:35:42 2009 +0100
+++ b/src-core/src/org/openbravo/xmlEngine/XmlDocument.java Fri Mar 06
15:33:21 2009 +0100
@@ -261,6 +261,12 @@
+ hasParameterValue.get(language).strValue);
handler.setLanguage(hasParameterValue.get(language).strValue
.replace(defaultLang=, ).replace(\, ));
+} else if (hasParameterValue.get(paramLanguage) != null
+ hasParameterValue.get(paramLanguage).strValue != null) {
+ log4jXmlDocument.debug(print(strBlank) - language:
+ + hasParameterValue.get(paramLanguage).strValue);
+
handler.setLanguage(hasParameterValue.get(paramLanguage).strValue.replace(
+ defaultLang=, ).replace(\, ));
}
log4jXmlDocument.debug(before running generateTranslations.);
handler.generateTranslations();
diff -r e256c35b5b16 -r ac6d3962082a
src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java
--- a/src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java Mon Mar 09
10:35:42 2009 +0100
+++ b/src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java Fri Mar 06
15:33:21 2009 +0100
@@ -13,6 +13,7 @@
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Vector;
import org.apache.log4j.Logger;
@@ -49,6 +50,7 @@
if (textMap != null) {
if (xmlComponentValue.print() != null
!xmlComponentValue.print().startsWith()
!xmlComponentValue.print().equals()) {
+ boolean isTranslated =
