[OpenbravoERP-commits] devel/pi: 2 new changesets

[hg]

details:   /erp/devel/pi/rev/fc145c530abb
changeset: 7472:fc145c530abb
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Fri Jun 04 10:30:04 2010 +0200
summary:   Fixes issue 13386: Fixed trigger on AD_PROCESS_REQUEST table
The on delete trigger was checking the word 'Schedule' but in the
table is stored 'SCH' (scheduled) and 'MIS' (misfired).

details:   /erp/devel/pi/rev/869dd4f3577c
changeset: 7473:869dd4f3577c
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Fri Jun 04 10:57:02 2010 +0200
summary:   Fixes issue 13518: Added init() in ProcessBundle instances
The init call is used to initilze ProcessBundle memebers. For a proper
ProcessBundle is required to call it.

diffstat:

 src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml        |  2 +-
 src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml |  2 +-
 src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml     |  2 +-
 src-wad/src/org/openbravo/wad/javasource.javaxml                 |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r dd7e7cea909c -r 869dd4f3577c 
src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml
--- a/src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml Wed Jun 02 
15:29:48 2010 +0530
+++ b/src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml Fri Jun 04 
10:57:02 2010 +0200
@@ -54,7 +54,7 @@
 END IF;
 
 IF (DELETING) THEN
-  IF (:OLD.STATUS = 'Scheduled') THEN
+  IF (:OLD.STATUS = 'SCH' OR :OLD.STATUS = 'MIS') THEN -- Fail on Scheduled or 
Misfired process request
     RAISE_APPLICATION_ERROR(-20000,'@20630@');
   END IF;
 END IF;
diff -r dd7e7cea909c -r 869dd4f3577c 
src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml
--- a/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml  Wed Jun 
02 15:29:48 2010 +0530
+++ b/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml  Fri Jun 
04 10:57:02 2010 +0200
@@ -80,7 +80,7 @@
 <FIELDS_TMP id="sectionActionButtons3">    } else if 
(vars.commandIn("SAVE_BUTTONActionButton<FIELD_TMP 
id="ProcessID3">button</FIELD_TMP>")) {
         <FIELD_TMP id="FieldsLoad3">String strField = 
vars.getStringParameter("inpFields");</FIELD_TMP>
         
-        ProcessBundle pb = new ProcessBundle(strProcessId, vars);
+        ProcessBundle pb = new ProcessBundle(strProcessId, vars).init(this);
         HashMap&lt;String, Object&gt; params= new HashMap&lt;String, 
Object&gt;();
        
         <FIELD_TMP 
id="FieldsLoadParams3">PInstanceProcessData.insertPInstanceParam(this, 
pinstance, )</FIELD_TMP>
diff -r dd7e7cea909c -r 869dd4f3577c 
src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml
--- a/src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml      Wed Jun 
02 15:29:48 2010 +0530
+++ b/src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml      Fri Jun 
04 10:57:02 2010 +0200
@@ -83,7 +83,7 @@
         PInstanceProcessData.insertPInstance(this, pinstance, "<FIELD_TMP 
id="ProcessID3">button</FIELD_TMP>", "0", strProcessing, vars.getUser(), 
vars.getClient(), vars.getOrg());
         <FIELD_TMP 
id="FieldsLoadParams3">PInstanceProcessData.insertPInstanceParam(this, 
pinstance, )</FIELD_TMP>
         <FIELD_TMP id="AdditionalCode3">code</FIELD_TMP>
-        ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, this);
+        ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, 
this).init(this);
         new ProcessRunner(bundle).execute(this);
 
         processButtonHelper(request, response, vars, pinstance);        
diff -r dd7e7cea909c -r 869dd4f3577c 
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml  Wed Jun 02 15:29:48 
2010 +0530
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml  Fri Jun 04 10:57:02 
2010 +0200
@@ -462,7 +462,7 @@
           PInstanceProcessData.insertPInstance(this, pinstance, "<FIELD_TMP 
id="ProcessID3">button</FIELD_TMP>", (("<KEY_TMP 
id="key">PosicionAlmacen</KEY_TMP>".equalsIgnoreCase("AD_Language"))?"0":str<KEY_TMP
 id="key">PosicionAlmacen</KEY_TMP>), strProcessing, vars.getUser(), 
vars.getClient(), vars.getOrg());
           <FIELD_TMP 
id="FieldsLoadParams3">PInstanceProcessData.insertPInstanceParam(this, 
pinstance, )</FIELD_TMP>
           <FIELD_TMP id="AdditionalCode3">code</FIELD_TMP>
-          ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, 
this);
+          ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, 
this).init(this);
           new ProcessRunner(bundle).execute(this);
           
           PInstanceProcessData[] pinstanceData = 
PInstanceProcessData.select(this, pinstance);

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits