details: /erp/devel/main/rev/44c9f0919ecc
changeset: 7938:44c9f0919ecc
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Jul 19 09:31:43 2010 +0200
summary: fixed issue 13178: Incorrect setting of PO fields
After modifiying the element trl, the setting for its PO fields was
incorrect, it always used the SO value.
The trigger has been fixed.
details: /erp/devel/main/rev/10a6e520f525
changeset: 7939:10a6e520f525
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Jul 19 18:25:56 2010 +0200
summary: Fixed issue 14002. Modulescripts with outdated classes won't fail.
Changed the classpath of the build.xml files so that the Java classes in the
module folders are loaded first. This fixes a problem which could happen if an
older version of a modulescript class used some method or class which no longer
exists.
details: /erp/devel/main/rev/b435c1c9d98a
changeset: 7940:b435c1c9d98a
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon Jul 19 20:05:08 2010 +0200
summary: Fixes issue 14004: AcctServer do not process accounting processes in
order
details: /erp/devel/main/rev/eaa30574256d
changeset: 7941:eaa30574256d
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Jul 20 13:41:49 2010 +0200
summary: Fixes issue 13654
Added coalesce to avoid unwanted document cancellations
details: /erp/devel/main/rev/60bba5a75909
changeset: 7942:60bba5a75909
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Jul 20 18:24:14 2010 +0200
summary: Fixes issue 0013602: Inhomogeneous behavior of searchers
It has been made all fields case insesitive
details: /erp/devel/main/rev/e5ef80a147fb
changeset: 7943:e5ef80a147fb
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Jul 20 18:25:35 2010 +0200
summary: Merging heads
details: /erp/devel/main/rev/94fcf9a433af
changeset: 7944:94fcf9a433af
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Jul 21 11:28:33 2010 +0200
summary: Fixed 14012: Do commit immediately after insert into ad_session..
.. to prevent a race condition with other requests using i.e. xsql-queries
which otherwise don't see the inserted record early enough.
This happens when using DeepLinking together with any custom AuthManager.
details: /erp/devel/main/rev/edda5328f260
changeset: 7945:edda5328f260
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Jul 21 15:51:48 2010 +0530
summary: Fixes Issue 13912: The process 'Create Lines from' of the Goods
Shipment window shows incorrect data.
details: /erp/devel/main/rev/a48dbfe3a099
changeset: 7946:a48dbfe3a099
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 24 22:54:23 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/eb739d47ff2b
changeset: 7947:eb739d47ff2b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 24 22:54:25 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
.hgsigs | 1 +
.hgtags | 1 +
build.xml | 24 ++++----
src-db/database/build.xml | 8 +-
src-db/database/model/functions/M_INOUT_POST.xml | 41 ++++++++++++++
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml | 42 ++++++++++++++-
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 1 +
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql | 2 +-
src/org/openbravo/erpCommon/security/SessionLogin.java | 2 +-
src/org/openbravo/reference/ui/UIReferenceUtility.java | 7 +-
11 files changed, 107 insertions(+), 26 deletions(-)
diffs (295 lines):
diff -r b5302813e29a -r eb739d47ff2b .hgsigs
--- a/.hgsigs Mon Jul 19 00:19:48 2010 +0200
+++ b/.hgsigs Sat Jul 24 22:54:25 2010 +0200
@@ -20,3 +20,4 @@
9f343a616b2f998c3867661467de5dd9daeb7112 0
iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
9b4bbe8362f54f7212653fddf5bd053183a7ffda 0
iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw
7fe932c5c015da84a972d6945dd0451366bbf325 0
iEYEABECAAYFAkwodmcACgkQCX/oGf+2qkM4jQCgq2n4X0Tzi8EcGqNLhtzjOJ/1YcgAn3Fh9aZRpXmM2zYmMwuecn4UR5tt
+618363224a381737439e0bd4461e2d36c4fd986e 0
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
diff -r b5302813e29a -r eb739d47ff2b .hgtags
--- a/.hgtags Mon Jul 19 00:19:48 2010 +0200
+++ b/.hgtags Sat Jul 24 22:54:25 2010 +0200
@@ -30,3 +30,4 @@
41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17
f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18
34eed7b386965b19e191fbfe03195588cdc75254 2.50MP19
+99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
diff -r b5302813e29a -r eb739d47ff2b build.xml
--- a/build.xml Mon Jul 19 00:19:48 2010 +0200
+++ b/build.xml Sat Jul 24 22:54:25 2010 +0200
@@ -190,6 +190,10 @@
</condition>
<path id="project.class.path">
+ <dirset dir="${base.modules}">
+ <include name="*/build/classes/" />
+ </dirset>
+ <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
<pathelement path="${build}" />
<pathelement path="${base.src}" />
<fileset dir="${base.lib}">
@@ -213,14 +217,14 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
+ </path>
+
+ <!-- This classpath is needed only for the compile.apply.module task-->
+ <path id="apply.module.compile.classpath">
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
</dirset>
<pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
- </path>
-
- <!-- This classpath is needed only for the compile.apply.module task-->
- <path id="apply.module.compile.classpath">
<pathelement path="${build.apply.module}" />
<pathelement path="${base.src}" />
<fileset dir="${base.lib}">
@@ -244,14 +248,14 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
+ </path>
+
+ <!-- This classpath is needed only for the apply.module task-->
+ <path id="apply.module.runtime.classpath">
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
</dirset>
<pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
- </path>
-
- <!-- This classpath is needed only for the apply.module task-->
- <path id="apply.module.runtime.classpath">
<pathelement path="${build.apply.module}" />
<pathelement path="${build}" />
<pathelement path="${base.src}" />
@@ -276,10 +280,6 @@
<fileset dir="${base.modules}">
<include name="*/lib/**" />
</fileset>
- <dirset dir="${base.modules}">
- <include name="*/build/classes/" />
- </dirset>
- <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
</path>
<macrodef name="updatesystemstatus">
diff -r b5302813e29a -r eb739d47ff2b src-db/database/build.xml
--- a/src-db/database/build.xml Mon Jul 19 00:19:48 2010 +0200
+++ b/src-db/database/build.xml Sat Jul 24 22:54:25 2010 +0200
@@ -34,6 +34,10 @@
</condition>
<path id="runtime-classpath">
+ <dirset dir="${base.modules}">
+ <include name="*/build/classes/" />
+ </dirset>
+ <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
<fileset dir="./lib">
<include name="**/*.jar" />
<exclude name="**/dbsourcemanagerlight.jar" />
@@ -42,10 +46,6 @@
<fileset dir="${base.lib}">
<include name="**/*.jar" />
</fileset>
- <dirset dir="${base.modules}">
- <include name="*/build/classes/" />
- </dirset>
- <pathelement path="${basedir}/../../src-util/modulescript/build/classes/"
/>
</path>
<taskdef name="createscript"
classname="org.openbravo.ddlutils.task.CreateXML2SQL">
diff -r b5302813e29a -r eb739d47ff2b
src-db/database/model/functions/M_INOUT_POST.xml
--- a/src-db/database/model/functions/M_INOUT_POST.xml Mon Jul 19 00:19:48
2010 +0200
+++ b/src-db/database/model/functions/M_INOUT_POST.xml Sat Jul 24 22:54:25
2010 +0200
@@ -87,6 +87,7 @@
v_Count NUMBER:=0;
v_Line VARCHAR2(10) ;
v_OrderID_old VARCHAR2(32);
+ Cur_MILines RECORD;
FINISH_PROCESS BOOLEAN:=false;
v_Aux NUMBER;
BEGIN
@@ -503,6 +504,46 @@
END IF;
END IF;
-- Close Shipment
+ --Entry in Match Invoices
+ FOR Cur_MILines IN
+ (SELECT sl.AD_Client_ID,
+ sl.AD_Org_ID,
+ il.C_InvoiceLine_ID,
+ sl.M_InOutLine_ID,
+ sl.M_Product_ID,
+ sl.M_AttributeSetInstance_ID,
+ sl.MovementQty,
+ il.QTYINVOICED,
+ i.DateAcct
+ FROM M_INOUTLINE sl,
+ C_INVOICE i,
+ C_INVOICELINE il
+ WHERE sl.M_InOutLine_ID=il.M_InOutLine_ID
+ AND sl.M_InOut_ID=Cur_InOut.M_InOut_ID
+ AND i.C_INVOICE_ID = il.C_INVOICE_ID
+ )
+ LOOP
+ --Ad_Sequence_Next('M_MatchInv', Cur_MILines.AD_Org_ID,
v_MatchInv_ID) ;
+ -- The min qty. Modified by Ismael Ciordia
+ v_Qty:=Cur_MILines.MovementQty;
+ -- v_ResultStr:='InsertMatchPO ' || v_MatchPO_ID;
+ INSERT
+ INTO M_MATCHINV
+ (
+ M_MATCHINV_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
+ CREATED, CREATEDBY, UPDATED, UPDATEDBY,
+ M_INOUTLINE_ID, C_INVOICELINE_ID, M_PRODUCT_ID, DATETRX,
+ QTY, PROCESSING, PROCESSED, POSTED
+ )
+ VALUES
+ (
+ GET_UUID(), Cur_MILines.AD_Client_ID,
Cur_MILines.AD_Org_ID, 'Y',
+ now(), v_User, now(), v_User,
+ Cur_MILines.M_InOutLine_ID, Cur_MILines.C_InvoiceLine_ID,
Cur_MILines.M_Product_ID, Cur_MILines.DateAcct,
+ v_Qty, 'N', 'Y', 'N'
+ )
+ ;
+ END LOOP;
v_ResultStr:='CloseShipment';
UPDATE M_INOUT
SET Processed='Y',
diff -r b5302813e29a -r eb739d47ff2b
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml
--- a/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml Mon Jul 19
00:19:48 2010 +0200
+++ b/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml Sat Jul 24
22:54:25 2010 +0200
@@ -17,7 +17,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SLU
-* Contributions are Copyright (C) 2001-2008 Openbravo, S.L.U.
+* Contributions are Copyright (C) 2001-2010 Openbravo, S.L.U.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -77,6 +77,46 @@
AND exists (SELECT 1 from ad_module m
where m.ad_module_id=ad_field.ad_module_id
and m.isindevelopment='Y');
+
+ -- Field SO
+ UPDATE AD_Field_Trl
+ SET NAME = coalesce(:NEW.PO_NAME, :new.Name),
+ Description = coalesce(:NEW.PO_Description, :new.Description),
+ HELP = coalesce(:NEW.PO_HELP, :new.Help),
+ IsTranslated = :NEW.IsTranslated
+ WHERE AD_Language = :NEW.AD_Language
+ AND AD_Field_ID IN (
+ SELECT F.AD_Field_ID
+ FROM AD_Field F, AD_Column C, AD_Module M,
+ AD_Tab T, AD_Window w
+ WHERE F.AD_Column_ID = C.AD_Column_ID
+ AND C.AD_Element_ID = :NEW.AD_Element_ID
+ AND F.IsCentrallyMaintained = 'Y'
+ AND M.aD_Module_id = f.ad_module_id
+ and m.AD_Language != :new.AD_Language
+ and f.AD_Tab_ID = T.AD_Tab_ID
+ and w.AD_Window_ID = t.AD_Window_ID
+ and w.IsSoTrx='N');
+
+ UPDATE AD_Field
+ SET NAME = coalesce(:NEW.PO_NAME, :new.Name),
+ Description = coalesce(:NEW.PO_Description, :new.Description),
+ HELP = coalesce(:NEW.PO_HELP, :new.Help)
+ WHERE AD_Field_ID IN (
+ SELECT F.AD_Field_ID
+ FROM AD_Field F, AD_Column C, AD_Module M,
+ AD_Tab T, AD_Window w
+ WHERE F.AD_Column_ID = C.AD_Column_ID
+ AND C.AD_Element_ID = :NEW.AD_Element_ID
+ AND F.IsCentrallyMaintained = 'Y'
+ AND M.aD_Module_id = f.ad_module_id
+ and m.AD_Language = :new.AD_Language
+ and f.AD_Tab_ID = T.AD_Tab_ID
+ and w.AD_Window_ID = t.AD_Window_ID
+ and w.IsSoTrx='N')
+ AND exists (SELECT 1 from ad_module m
+ where m.ad_module_id=ad_field.ad_module_id
+ and m.isindevelopment='Y');
UPDATE AD_Column
SET Name=:new.Name,
diff -r b5302813e29a -r eb739d47ff2b src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Jul 19 00:19:48 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 24 22:54:25 2010 +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.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17946]]></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 b5302813e29a -r eb739d47ff2b
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Mon Jul 19
00:19:48 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Sat Jul 24
22:54:25 2010 +0200
@@ -638,6 +638,7 @@
FROM C_ACCTSCHEMA_PROCESS, AD_ACCTPROCESS
WHERE C_ACCTSCHEMA_PROCESS.AD_ACCTPROCESS_ID =
AD_ACCTPROCESS.AD_ACCTPROCESS_ID
AND C_ACCTSCHEMA_PROCESS.C_ACCTSCHEMA_ID = ?
+ ORDER BY SEQNO
</Sql>
<Parameter name="cAcctschemaId"/>
</SqlMethod>
diff -r b5302813e29a -r eb739d47ff2b
src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql Mon Jul 19
00:19:48 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment_data.xsql Sat Jul 24
22:54:25 2010 +0200
@@ -182,7 +182,7 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT DP.ISMANUAL, DP.ISDIRECTPOSTING
+ SELECT COALESCE(DP.ISMANUAL,'N') AS ISMANUAL,
COALESCE(DP.ISDIRECTPOSTING,'N') AS ISDIRECTPOSTING
FROM C_SETTLEMENT S LEFT JOIN C_DEBT_PAYMENT DP
ON DP.C_SETTLEMENT_GENERATE_ID = S.C_SETTLEMENT_ID
WHERE S.C_SETTLEMENT_ID = ?
diff -r b5302813e29a -r eb739d47ff2b
src/org/openbravo/erpCommon/security/SessionLogin.java
--- a/src/org/openbravo/erpCommon/security/SessionLogin.java Mon Jul 19
00:19:48 2010 +0200
+++ b/src/org/openbravo/erpCommon/security/SessionLogin.java Sat Jul 24
22:54:25 2010 +0200
@@ -135,7 +135,7 @@
session.setLoginStatus(status);
session.setUsername(username);
OBDal.getInstance().save(session);
- OBDal.getInstance().flush();
+ OBDal.getInstance().commitAndClose();
setSessionID(session.getId());
return 1;
} catch (Exception e) {
diff -r b5302813e29a -r eb739d47ff2b
src/org/openbravo/reference/ui/UIReferenceUtility.java
--- a/src/org/openbravo/reference/ui/UIReferenceUtility.java Mon Jul 19
00:19:48 2010 +0200
+++ b/src/org/openbravo/reference/ui/UIReferenceUtility.java Sat Jul 24
22:54:25 2010 +0200
@@ -184,12 +184,9 @@
text.append("<= ");
text.append("TO_NUMBER(?)");
} else if (reference.equals("10") || reference.equals("14") ||
reference.equals("34")) {
- String aux = "";
- if (!columnname.equalsIgnoreCase("Value") &&
!columnname.equalsIgnoreCase("DocumentNo"))
- aux = "C_IGNORE_ACCENT";
- text.append(aux).append("(");
+ text.append("C_IGNORE_ACCENT").append("(");
text.append(tablename).append(".").append(columnname).append(") LIKE ");
- text.append(aux).append("(?)");
+ text.append("C_IGNORE_ACCENT").append("(?)");
} else if (reference.equals("35")) {
text
.append(
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
