[OpenbravoERP-commits] devel/pi: issue 23826: New payment should be

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/63efb05b3449
changeset: 21216:63efb05b3449
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Mon Sep 30 11:59:36 2013 +0200
summary:   issue 23826: New payment should be
created when using GL Journal defined as Template

diffstat:

 src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java |  25 +-
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (43 lines):

diff -r cf9005633e4f -r 63efb05b3449 
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java
--- a/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java Fri Sep 
27 22:27:34 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java Mon Sep 
30 11:59:36 2013 +0200
@@ -22,7 +22,6 @@
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -124,18 +123,20 @@
 for (int j = 0; dataLines != null  j  dataLines.length; j++) {
   String strLineSequence = SequenceIdData.getUUID();
   try {
-if (CopyFromGLJournalData.insertGLJournalLine(conn, this, 
strLineSequence,
-vars.getClient(), dataLines[j].adOrgId, vars.getUser(), 
strSequence,
-dataLines[j].line, dataLines[j].isgenerated, 
dataLines[j].description,
-dataLines[j].amtsourcedr, dataLines[j].amtsourcecr, 
dataLines[j].cCurrencyId,
-dataLines[j].currencyratetype, dataLines[j].currencyrate, 
dataLines[j].amtacctdr,
-dataLines[j].amtacctcr, dataLines[j].cUomId, dataLines[j].qty,
-dataLines[j].cValidcombinationId, dataLines[j].user1Id, 
dataLines[j].user2Id,
-dataLines[j].cCampaignId, dataLines[j].cProjectId, 
dataLines[j].cActivityId,
-dataLines[j].cSalesregionId, dataLines[j].mProductId, 
dataLines[j].cBpartnerId,
-dataLines[j].aAssetId, dataLines[j].cCostcenterId, 
dataLines[j].openItems,
+if (CopyFromGLJournalData.insertGLJournalLine(conn, this, 
strLineSequence, vars
+.getClient(), dataLines[j].adOrgId, vars.getUser(), 
strSequence, dataLines[j].line,
+dataLines[j].isgenerated, dataLines[j].description, 
dataLines[j].amtsourcedr,
+dataLines[j].amtsourcecr, dataLines[j].cCurrencyId, 
dataLines[j].currencyratetype,
+dataLines[j].currencyrate, dataLines[j].amtacctdr, 
dataLines[j].amtacctcr,
+dataLines[j].cUomId, dataLines[j].qty, 
dataLines[j].cValidcombinationId,
+dataLines[j].user1Id, dataLines[j].user2Id, 
dataLines[j].cCampaignId,
+dataLines[j].cProjectId, dataLines[j].cActivityId, 
dataLines[j].cSalesregionId,
+dataLines[j].mProductId, dataLines[j].cBpartnerId, 
dataLines[j].aAssetId,
+dataLines[j].cCostcenterId, dataLines[j].openItems,
 dataLines[j].finFinancialAccountId, 
dataLines[j].finPaymentmethodId,
-dataLines[j].cGlitemId, dateFormat.format(new Date()), null) 
== 0)
+dataLines[j].cGlitemId,
+(dataLines[j].paymentdate.isEmpty()) ? 
dataLines[j].paymentdate : data[i].dateacct,
+null) == 0)
   log4j.warn(Save: GLJournalLine record  + j +  not inserted. 
Sequence = 
   + strLineSequence);
   } catch (ServletException ex) {

--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register 
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Related to issue 24834: Transplant to Smartclient to f...

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/50c111e5cff8
changeset: 21217:50c111e5cff8
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Sep 30 12:09:46 2013 +0200
summary:   Related to issue 24834: Transplant to Smartclient to fix the issue
instead of fixing the issue in our sources

diffstat:

 
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
|  28 --
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
 |   2 +-
 2 files changed, 1 insertions(+), 29 deletions(-)

diffs (50 lines):

diff -r 63efb05b3449 -r 50c111e5cff8 
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
--- 
a/modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
   Mon Sep 30 11:59:36 2013 +0200
+++ 
b/modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
   Mon Sep 30 12:09:46 2013 +0200
@@ -197,33 +197,5 @@
   return true;
 }
 return this.Super('evaluateCriterion', arguments);
-  },
-
-  // SC's validateJSONRecord causes fields which value in the DataSource 
response
-  // is null to become in undefined. This method workarounds the problem until 
SC
-  // solves it in isc.DataSource.
-  //   see https://issues.openbravo.com/view.php?id=24834
-  //   http://forums.smartclient.com/showthread.php?p=110346#post110346
-  validateJSONRecord: function (record) {
-var originalNulls = [],
-validatedRecord, fieldNames = this.getFieldNames(),
-i;
-
-// save all fields which value was null in the JSON response
-for (i = 0; i  fieldNames.length; i++) {
-  if (record[fieldNames[i]] === null) {
-originalNulls.push(fieldNames[i]);
-  }
-}
-
-// SC converts nulls in undefined
-validatedRecord = this.Super('validateJSONRecord', arguments);
-
-// let's recover null values
-for (i = 0; i  originalNulls.length; i++) {
-  validatedRecord[originalNulls[i]] = null;
-}
-
-return validatedRecord;
   }
 });
\ No newline at end of file
diff -r 63efb05b3449 -r 50c111e5cff8 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
--- 
a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
Mon Sep 30 11:59:36 2013 +0200
+++ 
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
Mon Sep 30 12:09:46 2013 +0200
@@ -15137,7 +15137,7 @@
 ,isc.A.validateJSONRecord=function isc_DataSource_validateJSONRecord(_1){var 
_2=this.getFieldNames(),_3={};for(var i=0;i_2.length;i++){var 
_5=_2[i],_6=this.getField(_5),_7;if(_6.valueXPath){_7=isc.xml.selectObjects(_1,_6.valueXPath,true)}else{_7=_1[_5]}
 
if(_6.getFieldValue){if(!isc.isA.Function(_6.getFieldValue)){isc.Func.replaceWithMethod(_6,getFieldValue,record,value,field,fieldName)}
 _7=_6.getFieldValue(_1,_7,_6,_5)}
-var _8;if(_7!=_8){var 
_9=isc.DS.get(_6.type);if(_9!(_9.skipJSONValidation)){if(!(isc.isAn.Array(_7))){_7=_9.validateJSONRecord(_7)}else{for(var
 i=0;i_7.length;i++){_7[i]=_9.validateJSONRecord(_7[i])}}}
+var _8;if(_7!==_8){var 
_9=isc.DS.get(_6.type);if(_9!(_9.skipJSONValidation)){if(!(isc.isAn.Array(_7))){_7=_9.validateJSONRecord(_7)}else{for(var
 i=0;i_7.length;i++){_7[i]=_9.validateJSONRecord(_7[i])}}}
 _3[_5]=this.validateFieldValue(_6,_7)}}
 if(this.dropExtraFields)return _3;for(var i=0;i_2.length;i++){var 
_5=_2[i];_1[_5]=_3[_5]}
 return _1}

--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register 
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Backout issue 24139: Available quantity

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/237a498f9e4d
changeset: 21219:237a498f9e4d
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Mon Sep 30 15:36:45 2013 +0200
summary:   Backout issue 24139: Available quantity
wrongly updated when voiding a goods shipment of a reactivated order

diffstat:

 src-db/database/model/functions/M_INOUT_POST.xml |  26 +--
 1 files changed, 6 insertions(+), 20 deletions(-)

diffs (43 lines):

diff -r 73df6c79ca82 -r 237a498f9e4d 
src-db/database/model/functions/M_INOUT_POST.xml
--- a/src-db/database/model/functions/M_INOUT_POST.xml  Mon Sep 30 17:25:31 
2013 +0530
+++ b/src-db/database/model/functions/M_INOUT_POST.xml  Mon Sep 30 15:36:45 
2013 +0200
@@ -47,7 +47,6 @@
   v_Message VARCHAR2(2000):='';
   v_Message_aux VARCHAR2(2000):='';
   v_Record_ID VARCHAR2(32);
-  v_DocStatus VARCHAR2(60);
   v_User VARCHAR2(32);
   v_PUser VARCHAR2(32);
   v_is_included NUMBER:=0;
@@ -603,25 +602,12 @@
   -- stocked product
   IF(Cur_InOutLine.M_Product_ID IS NOT NULL AND v_IsStocked=1) THEN
 -- Update OrderLine (if C-, Qty is negative)
-SELECT DOCSTATUS into v_DocStatus
-FROM C_ORDER
-WHERE C_ORDER_ID = (SELECT C_ORDER_ID
-FROM C_ORDERLINE 
-WHERE 
C_ORDERLINE_ID=Cur_InOutLine.C_OrderLine_ID);
-IF (v_DocStatus = 'DR') THEN
-  UPDATE C_ORDERLINE
-SET QtyDelivered=QtyDelivered + v_QtySO,
-Updated=now(),
-UpdatedBy=v_User
-  WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID;
-ELSE 
-  UPDATE C_ORDERLINE
-SET QtyReserved=QtyReserved - v_QtyPO - v_QtySO,
-QtyDelivered=QtyDelivered + v_QtySO,
-Updated=now(),
-UpdatedBy=v_User
-   WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID;
-END IF;
+UPDATE C_ORDERLINE
+  SET QtyReserved=QtyReserved - v_QtyPO - v_QtySO,
+  QtyDelivered=QtyDelivered + v_QtySO,
+  Updated=now(),
+  UpdatedBy=v_User
+WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID;
 -- Products not stocked
   ELSE
 -- Update OrderLine (if C-, Qty is negative)

--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register 
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Fixes Issue 24837: Sample data monthly update for Sept...

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/f01d485c6cf2
changeset: 21220:f01d485c6cf2
user:  Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at 
openbravo.com
date:  Mon Sep 30 16:49:52 2013 +0530
summary:   Fixes Issue 24837: Sample data monthly update for September

diffstat:

 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml  
 |   1147 +
 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml 
 |629 +
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml
 |344 +-
 referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml   
 | 54 +-
 referencedata/sampledata/F_B_International_Group/AD_USER.xml   
 | 48 +-
 referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml
 |  7 +-
 referencedata/sampledata/F_B_International_Group/A_ASSET.xml   
 |  8 +-
 referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml
 | 76 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICE.xml 
 |   1586 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml 
 |   3231 +
 referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml  
 |   1602 +
 referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml  
 |340 +
 referencedata/sampledata/F_B_International_Group/C_ORDER.xml   
 |708 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml   
 |   3601 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml
 |   1394 +
 referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml
 |192 +
 referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml  
 | 60 +
 referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml 
 |  20351 +-
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml 
 | 42 +
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml 
 |440 +
 referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml
 |640 +-
 referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml 
 |  8 +-
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml   
 |758 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml
 |320 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml  
 | 58 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml   
 |210 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml  
 |900 +-
 
referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml 
|496 +-
 referencedata/sampledata/F_B_International_Group/FIN_RECLINE_TEMP.xml  
 |186 +
 referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml
 | 58 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml
 | 35 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml   
 | 26 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml
 |435 +
 referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml
 | 45 +
 referencedata/sampledata/F_B_International_Group/M_COSTING.xml 
 |590 +-
 referencedata/sampledata/F_B_International_Group/M_INOUT.xml   
 |495 +
 referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml   
 |   1761 +
 referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml
 |399 +
 referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml 
 |798 +
 referencedata/sampledata/F_B_International_Group/M_STOCK_PROPOSED.xml  
 |688 +
 referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml  
 |203 +-
 referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml 
 |147 +-
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml 
 |   1975 +
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml
 |   1185 +
 referencedata/sampledata/F_B_International_Group/OBKMO_WIDGET_INSTANCE.xml 
 |  8 +-
 45 files changed, 46411 insertions(+), 1873 deletions(-)

diffs (truncated from 70505 to 300 lines):

diff -r 237a498f9e4d -r f01d485c6cf2 
referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml
--- a/referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml Mon Sep 
30 15:36:45 2013 +0200
+++ b/referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml Mon Sep 
30 16:49:52 2013 +0530
@@ -1222,6 +1222,23 @@
 /AD_PINSTANCE
 
 AD_PINSTANCE
+  

[OpenbravoERP-commits] devel/main: 7 new changesets

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/34a6241c3e04
changeset: 21212:34a6241c3e04
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Fri Sep 27 13:51:22 2013 +0200
summary:   Fixed 24840: Remove wrong error message from log.
change error shown always on opening Settings tab of MMC windows.
Message is now debug level and text is adjusted.

details:   https://code.openbravo.com/erp/devel/main/rev/a37b6649b7c7
changeset: 21213:a37b6649b7c7
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Fri Sep 27 14:18:34 2013 +0200
summary:   issue 23826: New payment should
be created when using GL Journal defined as Template

details:   https://code.openbravo.com/erp/devel/main/rev/9c7cda930438
changeset: 21214:9c7cda930438
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Sep 27 15:49:39 2013 +0200
summary:   fixed bug 24842: custom query selector raises 
LazyInitializationException

details:   https://code.openbravo.com/erp/devel/main/rev/cf9005633e4f
changeset: 21215:cf9005633e4f
user:  RM packaging bot staff.rm at openbravo.com
date:  Fri Sep 27 22:27:34 2013 +0200
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/63efb05b3449
changeset: 21216:63efb05b3449
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Mon Sep 30 11:59:36 2013 +0200
summary:   issue 23826: New payment should be
created when using GL Journal defined as Template

details:   https://code.openbravo.com/erp/devel/main/rev/50c111e5cff8
changeset: 21217:50c111e5cff8
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Sep 30 12:09:46 2013 +0200
summary:   Related to issue 24834: Transplant to Smartclient to fix the issue
instead of fixing the issue in our sources

details:   https://code.openbravo.com/erp/devel/main/rev/efb12cdf8699
changeset: 21218:efb12cdf8699
user:  RM packaging bot staff.rm at openbravo.com
date:  Mon Sep 30 21:19:48 2013 +0200
summary:   CI: update AD_MODULE to version 21217

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
  |   2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   4 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
  |   2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   8 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
  |   2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
  |   2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
 |   2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
  |   2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |  10 +-
 

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

2013-09-30 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/efb12cdf8699
changeset: 21221:efb12cdf8699
user:  RM packaging bot staff.rm at openbravo.com
date:  Mon Sep 30 21:19:48 2013 +0200
summary:   CI: update AD_MODULE to version 21217

details:   https://code.openbravo.com/erp/devel/pi/rev/4f2785012d36
changeset: 21222:4f2785012d36
user:  RM packaging bot staff.rm at openbravo.com
date:  Mon Sep 30 21:37:06 2013 +0200
summary:   CI: merge back from main

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
|  2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  4 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
|  2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|  2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  8 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
 |  2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
  |  2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
   |  2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|  2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
|  2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|  6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
|  2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
   |  2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |  2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
|  2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
 |  2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   | 10 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  4 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |  2 +-
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
|  2 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |  2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
  |  2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   | 12 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
 |  2 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
   |  2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|  6 +-
 modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml 
|  2 +-