details:   /erp/devel/pi/rev/355270aa46dc
changeset: 7006:355270aa46dc
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Apr 08 12:10:57 2010 +0200
summary:   Fixes issue 0012864: While Generating payment Plan...

details:   /erp/devel/pi/rev/4e50d53e793d
changeset: 7007:4e50d53e793d
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Apr 08 17:08:22 2010 +0200
summary:   Fixes bug 0012870: Last calculated date

details:   /erp/devel/pi/rev/606458ba51ee
changeset: 7008:606458ba51ee
user:      Mikel Irurita  <mikel.irurita <at> openbravo.com>
date:      Thu Apr 08 18:56:24 2010 +0200
summary:   Fixes issue 0012898: In Make payment window, in BP selector window 
customer radio is selected by default.

details:   /erp/devel/pi/rev/2a8e45df556f
changeset: 7009:2a8e45df556f
user:      Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date:      Mon Apr 12 18:26:23 2010 +0200
summary:   Merge heads after transplants.

diffstat:

 .hgsigs                                                                     |  
  1 +
 .hgtags                                                                     |  
  1 +
 lib/runtime/ojdbc6.jar                                                      |  
  0 
 src-db/database/lib/dbsourcemanager.jar                                     |  
  0 
 src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml             |  
 10 +++--
 src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml                       |  
  4 +-
 src-db/database/model/triggers/MA_PL_IC_TRG.xml                             |  
  4 +-
 src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml                    |  
  4 +-
 src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml                        |  
  4 +-
 src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml                       |  
  4 +-
 src-db/database/sourcedata/AD_COLUMN.xml                                    |  
  1 +
 src-db/database/sourcedata/AD_MODULE.xml                                    |  
  2 +-
 src-db/database/sourcedata/AD_WINDOW.xml                                    |  
  2 +-
 src-util/buildvalidation/build.xml                                          |  
 13 ++++--
 src-util/modulescript/build.xml                                             |  
 11 ++++--
 src-wad/src/org/openbravo/wad/datasource.xsqlxml                            |  
 17 +++++----
 src-wad/src/org/openbravo/wad/javasource.javaxml                            |  
  2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java      |  
 16 ++------
 src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql |  
 12 -------
 src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml  |  
  2 +-
 20 files changed, 53 insertions(+), 57 deletions(-)

diffs (truncated from 374 to 300 lines):

diff -r 26d7079c342c -r 2a8e45df556f .hgsigs
--- a/.hgsigs   Mon Apr 12 14:12:19 2010 +0530
+++ b/.hgsigs   Mon Apr 12 18:26:23 2010 +0200
@@ -13,3 +13,4 @@
 630f94155c011c18a4bd948239d674953ad729c4 0 
iEYEABECAAYFAkthyKQACgkQCX/oGf+2qkOIwgCcCk4MJcMrnHR9WgEGfRx4HoTYfjsAn26YI0m1bCQSlyqmh+gDusmsqrNA
 4a5dd51c34fbbf64e9f933f9b7d54589ef5fb7b9 0 
iEYEABECAAYFAkuM+1EACgkQCX/oGf+2qkPHfgCdFKV1PxtXcckQ3R3+kJgXnRFAtgkAoM6eWuR1ZA3nRphHH7sX2SGoufA5
 75b887d57378e59138c0362b928a504db568ed9b 0 
iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
+8df12cedf6a200183c73497ae0cefa3fee0a0427 0 
iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
diff -r 26d7079c342c -r 2a8e45df556f .hgtags
--- a/.hgtags   Mon Apr 12 14:12:19 2010 +0530
+++ b/.hgtags   Mon Apr 12 18:26:23 2010 +0200
@@ -23,3 +23,4 @@
 98d31cbff884dd20581e1cafad505ed8f9b33273 2.50MP11
 1a6428c78a5521471084e7b93a42a03a74543495 2.50MP12
 65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
+17a70403b6d39988147a0b8a11bb3a57ed04c373 2.50MP14
diff -r 26d7079c342c -r 2a8e45df556f lib/runtime/ojdbc6.jar
Binary file lib/runtime/ojdbc6.jar has changed
diff -r 26d7079c342c -r 2a8e45df556f src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml
--- a/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml   Mon Apr 
12 14:12:19 2010 +0530
+++ b/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml   Mon Apr 
12 18:26:23 2010 +0200
@@ -44,6 +44,7 @@
 v_BPartner_ID VARCHAR2(32);
 v_DateInvoiced DATE;
 v_TotalLines NUMBER;
+v_PaymentMethod C_INVOICE.FIN_PAYMENTMETHOD_ID%TYPE;
 
 TYPE RECORD IS REF CURSOR;
 Cur_Params RECORD;
@@ -72,10 +73,10 @@
   v_ResultStr:='ReadingInvoice';
   SELECT ad_client_id, ad_org_id, c_doctypetarget_id, IsSOTrx,
       grandtotal, C_PaymentTerm_ID, PaymentRule, C_Currency_ID,
-      C_BPartner_ID, DateInvoiced, totallines
+      C_BPartner_ID, DateInvoiced, totallines, fin_paymentmethod_id
   INTO v_Client_ID, v_Org_ID, v_DocTypeTarget_ID, v_IsSOTrx,
       v_GrandTotal, v_PaymentTerm, v_PaymentRule, v_Currency_ID,
-      v_BPartner_ID, v_DateInvoiced, v_totallines
+      v_BPartner_ID, v_DateInvoiced, v_totallines, v_PaymentMethod
   FROM c_invoice
   WHERE c_invoice_id=p_record_id;
 
@@ -178,7 +179,7 @@
           v_payment_schedule_invoice, v_client_id, v_org_id, 'Y',
           now(), p_user, now(), p_user,
           p_record_id, v_currency_id, null,
-          'to-do',
+          v_PaymentMethod,
           v_scheduledamount, v_planneddate,
           v_scheduledamount
         );
@@ -346,7 +347,8 @@
       SET TOTALPAID = v_PaidAmount,
           OUTSTANDINGAMT = v_OutstandingAmount,
           DUEAMT =  V_DueAmount,
-          DAYSTILLDUE = V_DayStillDue
+          DAYSTILLDUE = V_DayStillDue,
+          LASTCALCULATEDONDATE = now()
       WHERE C_INVOICE_ID = P_RECORD_ID;
     END;
 
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml     Mon Apr 12 
14:12:19 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_EMPLOYEE_TRG.xml     Mon Apr 12 
18:26:23 2010 +0200
@@ -45,7 +45,7 @@
     OR Posted='Y') ;
   IF (v_RO > 0) THEN
     IF (DELETING OR INSERTING) THEN
-      RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (UPDATING) THEN
       IF (:new.AD_CLIENT_ID <> :old.AD_CLIENT_ID
@@ -55,7 +55,7 @@
          OR :new.C_SALARY_CATEGORY_ID <> :old.C_SALARY_CATEGORY_ID
          OR :new.QUANTITY <> :old.QUANTITY
         ) THEN
-        RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
       END IF;
     END IF;
   END IF;
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/triggers/MA_PL_IC_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_IC_TRG.xml   Mon Apr 12 14:12:19 
2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_IC_TRG.xml   Mon Apr 12 18:26:23 
2010 +0200
@@ -45,7 +45,7 @@
     OR Posted='Y') ;
   IF (v_RO > 0) THEN
     IF (DELETING OR INSERTING) THEN
-      RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (UPDATING) THEN
       IF (:new.AD_CLIENT_ID <> :old.AD_CLIENT_ID
@@ -54,7 +54,7 @@
          OR :new.ISACTIVE <> :old.ISACTIVE
          OR :new.MA_INDIRECT_COST_ID <> :old.MA_INDIRECT_COST_ID
         ) THEN
-        RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
       END IF;
     END IF;
   END IF;
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml  Mon Apr 12 
14:12:19 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_INVOICELINE_TRG.xml  Mon Apr 12 
18:26:23 2010 +0200
@@ -45,7 +45,7 @@
     OR Posted='Y') ;
   IF (v_RO > 0) THEN
     IF (DELETING OR INSERTING) THEN
-      RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (UPDATING) THEN
       IF (:new.AD_CLIENT_ID <> :old.AD_CLIENT_ID
@@ -56,7 +56,7 @@
          OR :new.C_INVOICELINE_ID IS NULL
          OR :new.COST <> :old.COST
         ) THEN
-        RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
       END IF;
     END IF;
   END IF;
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml
--- a/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml      Mon Apr 12 
14:12:19 2010 +0530
+++ b/src-db/database/model/triggers/MA_PL_MACHINE_TRG.xml      Mon Apr 12 
18:26:23 2010 +0200
@@ -45,7 +45,7 @@
     OR Posted='Y') ;
   IF (v_RO > 0) THEN
     IF (DELETING OR INSERTING) THEN
-      RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (UPDATING) THEN
       IF (:new.AD_CLIENT_ID <> :old.AD_CLIENT_ID
@@ -55,7 +55,7 @@
          OR :new.MA_MACHINE_ID <> :old.MA_MACHINE_ID
          OR :new.USE <> :old.USE
         ) THEN
-        RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
       END IF;
     END IF;
   END IF;
diff -r 26d7079c342c -r 2a8e45df556f 
src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml
--- a/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml     Mon Apr 12 
14:12:19 2010 +0530
+++ b/src-db/database/model/triggers/MA_TOOLSETUSED_TRG.xml     Mon Apr 12 
18:26:23 2010 +0200
@@ -45,7 +45,7 @@
     OR Posted='Y') ;
   IF (v_RO > 0) THEN
     IF (DELETING OR INSERTING) THEN
-      RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (UPDATING) THEN
       IF (:new.AD_CLIENT_ID <> :old.AD_CLIENT_ID
@@ -55,7 +55,7 @@
          OR :new.MA_TOOLSET_ID <> :old.MA_TOOLSET_ID
          OR :new.USED <> :old.USED
         ) THEN
-        RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
       END IF;
     END IF;
   END IF;
diff -r 26d7079c342c -r 2a8e45df556f src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Mon Apr 12 14:12:19 2010 +0530
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Mon Apr 12 18:26:23 2010 +0200
@@ -276033,6 +276033,7 @@
 <!--7FF2BE0C560641FDE040007F010060C1-->  
<AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
 <!--7FF2BE0C560641FDE040007F010060C1-->  
<AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--7FF2BE0C560641FDE040007F010060C1-->  
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7FF2BE0C560641FDE040007F010060C1-->  
<DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
 <!--7FF2BE0C560641FDE040007F010060C1-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--7FF2BE0C560641FDE040007F010060C1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--7FF2BE0C560641FDE040007F010060C1-->  
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
diff -r 26d7079c342c -r 2a8e45df556f src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml  Mon Apr 12 14:12:19 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml  Mon Apr 12 18:26:23 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.16510]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.16751]]></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>
diff -r 26d7079c342c -r 2a8e45df556f src-db/database/sourcedata/AD_WINDOW.xml
--- a/src-db/database/sourcedata/AD_WINDOW.xml  Mon Apr 12 14:12:19 2010 +0530
+++ b/src-db/database/sourcedata/AD_WINDOW.xml  Mon Apr 12 18:26:23 2010 +0200
@@ -3050,7 +3050,7 @@
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <NAME><![CDATA[Make Payment]]></NAME>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <WINDOWTYPE><![CDATA[T]]></WINDOWTYPE>
-<!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
diff -r 26d7079c342c -r 2a8e45df556f src-util/buildvalidation/build.xml
--- a/src-util/buildvalidation/build.xml        Mon Apr 12 14:12:19 2010 +0530
+++ b/src-util/buildvalidation/build.xml        Mon Apr 12 18:26:23 2010 +0200
@@ -40,14 +40,17 @@
   <condition property="checkCore">
     <equals arg1="${module}" arg2="org.openbravo" />
   </condition>
-
-  <target name="init">
+  
+  <target name="createModuleFolder" unless="checkCore">
+    <mkdir dir="${base.modules}/${module}/build/" />
+    <mkdir dir="${base.modules}/${module}/build/javasqlc" />
+    <mkdir dir="${base.modules}/${module}/build/classes" />
+  </target>
+    
+  <target name="init" depends="createModuleFolder">
     <mkdir dir="${build.validation}" />
     <mkdir dir="${build.validation.sqlc}" />
     <mkdir dir="${build.validation.sqlc}/src" />
-    <mkdir dir="${base.modules}/${module}/build/" />
-    <mkdir dir="${base.modules}/${module}/build/javasqlc" />
-    <mkdir dir="${base.modules}/${module}/build/classes" />
   </target>
 
   <target name="clean">
diff -r 26d7079c342c -r 2a8e45df556f src-util/modulescript/build.xml
--- a/src-util/modulescript/build.xml   Mon Apr 12 14:12:19 2010 +0530
+++ b/src-util/modulescript/build.xml   Mon Apr 12 18:26:23 2010 +0200
@@ -41,13 +41,16 @@
     <equals arg1="${module}" arg2="org.openbravo" />
   </condition>
 
-  <target name="init">
+  <target name="createModuleFolder" unless="checkCore">
+     <mkdir dir="${base.modules}/${module}/build/" />
+     <mkdir dir="${base.modules}/${module}/build/javasqlc" />
+     <mkdir dir="${base.modules}/${module}/build/classes" />
+  </target>
+  
+  <target name="init" depends="createModuleFolder">
     <mkdir dir="${build.module}" />
     <mkdir dir="${build.module.sqlc}" />
     <mkdir dir="${build.module.sqlc}/src" />
-    <mkdir dir="${base.modules}/${module}/build/" />
-    <mkdir dir="${base.modules}/${module}/build/javasqlc" />
-    <mkdir dir="${base.modules}/${module}/build/classes" />
   </target>
 
   <target name="clean">
diff -r 26d7079c342c -r 2a8e45df556f 
src-wad/src/org/openbravo/wad/datasource.xsqlxml
--- a/src-wad/src/org/openbravo/wad/datasource.xsqlxml  Mon Apr 12 14:12:19 
2010 +0530
+++ b/src-wad/src/org/openbravo/wad/datasource.xsqlxml  Mon Apr 12 18:26:23 
2010 +0200
@@ -66,14 +66,14 @@
   <SqlMethod name="select" type="preparedStatement" return="multiple">
     <SqlMethodComment>Select for relation</SqlMethodComment>
     <Sql>&#60;&#33;[CDATA[
-        SELECT <PARAMETER_TMP id="fields">field</PARAMETER_TMP> 
+        SELECT to_char(<PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.Created, ?) as created, 
+        (SELECT NAME FROM AD_USER u WHERE AD_USER_ID = <PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.CreatedBy) as CreatedByR, 
+        to_char(<PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, ?) as 
updated, 
+        to_char(<PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, 
'YYYYMMDDHH24MISS') as Updated_Time_Stamp,  
+        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy, 
+        (SELECT NAME FROM AD_USER u WHERE AD_USER_ID = <PARAMETER_TMP 
id="table">table</PARAMETER_TMP>.UpdatedBy) as UpdatedByR, 
+        <PARAMETER_TMP id="fields">field</PARAMETER_TMP> 
         '' AS TR_BGCOLOR, '' as total_count,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.Created, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.CreatedBy, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.CreatedBy AS 
CreatedByR,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.Updated, 
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy,
-        <PARAMETER_TMP id="table">table</PARAMETER_TMP>.UpdatedBy AS 
UpdatedByR,
         ? AS LANGUAGE, '' AS AD_USER_CLIENT, '' AS AD_ORG_CLIENT
         FROM <PARAMETER_TMP id="table">table</PARAMETER_TMP><PARAMETER_TMP 
id="tables">tables</PARAMETER_TMP>
         WHERE 2=2 <PARAMETER_TMP id="where">tablesWhere</PARAMETER_TMP>
@@ -84,6 +84,9 @@
         ORDER BY 1, 1
 <!--PARAMETER_TMP id="order">tablesOrder</PARAMETER_TMP-->
     ]]&#62;</Sql>
+    <Parameter name="dateTimeFormat"/>
+    <Parameter name="dateTimeFormat"/>
+    <PARAMETER_TMP id="parameterFields">xx</PARAMETER_TMP>
     <PARAMETER_TMP id="hasOrgKey"><Field name="currentAdOrgId" 
value=""/></PARAMETER_TMP>
     <Parameter name="paramLanguage"/>
     <PARAMETER_TMP id="parameters">xx</PARAMETER_TMP>
diff -r 26d7079c342c -r 2a8e45df556f 
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml  Mon Apr 12 14:12:19 
2010 +0530
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml  Mon Apr 12 18:26:23 
2010 +0200
@@ -940,7 +940,7 @@
         if (<PARAMETER_TMP id="paramSearchName">xx</PARAMETER_TMP> &amp;&amp; 
str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.equals("")) {
           buscador = "openSearchWindow('../businessUtility/Buscador.html', 
'BUSCADOR', " + tabId + ", '<PARAMETER_TMP 
id="windowName">Window</PARAMETER_TMP>/<PARAMETER_TMP 
id="class">Almacen</PARAMETER_TMP>_Relation.html', " + windowId + ");";
         } else if (str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.equals("")) {
-          <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[] data1 = 
<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data.select(this, 
vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><FIELDS_TMP id="isTransactional">, 
strParamTransaccional</FIELDS_TMP><FIELDS_TMP id="sectionFilter">, 
strParamFilter</FIELDS_TMP><PARAMETER_TMP id="sectionIsHighVolume2Edit">, 
strParam<PARAMETER_TMP 
id="searchName2Edit">xx</PARAMETER_TMP></PARAMETER_TMP><PARAMETER_TMP 
id="sectionIsHighVolume4">, strParamSessionDate, 
vars.getUser()</PARAMETER_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="org">, Utility.getContext(this, 
vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="parent">, strP<PARENT_TMP 
id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, strOrderByFilter);
+          <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[] data1 = 
<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data.select(this, 
vars.getSessionValue("#AD_SqlDateTimeFormat"), vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><FIELDS_TMP id="isTransactional">, 
strParamTransaccional</FIELDS_TMP><FIELDS_TMP id="sectionFilter">, 
strParamFilter</FIELDS_TMP><PARAMETER_TMP id="sectionIsHighVolume2Edit">, 
strParam<PARAMETER_TMP 
id="searchName2Edit">xx</PARAMETER_TMP></PARAMETER_TMP><PARAMETER_TMP 
id="sectionIsHighVolume4">, strParamSessionDate, 
vars.getUser()</PARAMETER_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="org">, Utility.getContext(this, 
vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP><PARAMETER_TMP id="parent">, strP<PARENT_TMP 
id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, strOrderByFilter);
           data = new <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data[1];
           if (data1!=null &#38;&#38; data1.length!=0) data[0] = data1[0];
         } else </FIELDS_TMP></PARAMETER_TMP>data = <PARAMETER_TMP 
id="class">Almacen</PARAMETER_TMP>Data.selectEdit(this, 
vars.getSessionValue("#AD_SqlDateTimeFormat"), vars.getLanguage()<PARAMETER_TMP 
id="whereClauseParams"></PARAMETER_TMP><PARAMETER_TMP id="parent">, 
strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>, 
str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="client">, 
Utility.getContext(this, vars, "#User_Client", windowId), 
Utility.getContext(this, vars, "#AccessibleOrgTree", windowId, 
accesslevel)</PARAMETER_TMP>);

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to