[OpenbravoERP-commits] devel/pi: Fixes issue 27066: Dojo autocompleting changes the dat...

2014-08-28 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/3a731d082a0d
changeset: 24348:3a731d082a0d
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Thu Aug 28 14:52:46 2014 +0200
summary:   Fixes issue 27066: Dojo autocompleting changes the date separator

In the autocompleting process, dojo needs to use the '-' date separator. The 
problem was that after doing the autocompletion it was not respecting the 
original date separator, so if it used '/', this date 01/02/03 would to 
autocompleted to 01-02-2003.

To fix this the date separator is saved before purging the date format.

diffstat:

 web/js/dojo/dojo.js |  13 +++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 9afa505ca5af -r 3a731d082a0d web/js/dojo/dojo.js
--- a/web/js/dojo/dojo.js   Wed Aug 27 14:39:48 2014 +0200
+++ b/web/js/dojo/dojo.js   Thu Aug 28 14:52:46 2014 +0200
@@ -12529,6 +12529,16 @@
 }
 }
 };
+originalDateSeparator=function(_b22){
+var _b23 = dojo.lang.shallowCopy(_b22), _b24;
+_b23=_b23.replace(mm,MM).replace(dd,DD).replace(,);
+_b23=_b23.replace(mm,MM).replace(dd,DD).replace(yy,YY);
+_b23=_b23.replace(%D,%d).replace(%M,%m);
+_b23=_b23.replace(%d,DD).replace(%m,MM).replace(%y,YY).replace(%Y,);
+_b24=_b23.replace(/D/g,).replace(/M/g,).replace(/Y/g,).substr(0,1);
+return _b24;
+};
+var _b30 = originalDateSeparator(_b1c);
 purgeDateFormat=function(_b22){
 _b22=_b22.replace(mm,MM).replace(dd,DD).replace(,);
 _b22=_b22.replace(mm,MM).replace(dd,DD).replace(yy,YY);
@@ -12580,8 +12590,7 @@
 }
 }
 }
-var _b26=_b1c.replace(/D/g,).replace(/M/g,).replace(/Y/g,).substr(0,1);
-var _b27=_b24[1]+_b26+_b24[2]+_b26+_b24[3];
+var _b27=_b24[1]+_b30+_b24[2]+_b30+_b24[3];
 return _b27;
 }else{
 return false;

--
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


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

2014-08-28 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/f42bb1d15c2c
changeset: 24343:f42bb1d15c2c
user:  Atul Gaware atul.gaware at openbravo.com
date:  Wed Aug 27 15:36:34 2014 +0530
summary:   Fixes Issue 27484:Wrong cash vat lines when payment is automatically 
created
Order and Invoice amount are different

details:   https://code.openbravo.com/erp/devel/main/rev/509f0a16132f
changeset: 24344:509f0a16132f
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Wed Aug 27 13:20:08 2014 +0200
summary:   Fixes issue 26989: Enables adding params to the requests in manual 
tree items

To do this, the manual tree item must implement the addParamsToRequest 
function. This function accepts no arguments, and must return an object that 
contains all the params that should be added to the request. This function will 
be invoked each time a datasource request is done.

details:   https://code.openbravo.com/erp/devel/main/rev/87bbcf7c09a4
changeset: 24345:87bbcf7c09a4
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Wed Aug 27 13:51:24 2014 +0200
summary:   Related with issue 26989: Uses function instead of fixed params

details:   https://code.openbravo.com/erp/devel/main/rev/6701e443c05a
changeset: 24346:6701e443c05a
user:  RM packaging bot staff.rm at openbravo.com
date:  Wed Aug 27 17:18:58 2014 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/9afa505ca5af
changeset: 24347:9afa505ca5af
user:  Rafa de Miguel rafael.demiguel at openbravo.com
date:  Wed Aug 27 14:39:48 2014 +0200
summary:   Fixes issue 27489 Fixes issue 27490 Show product characteristics 
hierarchy dropdown in the button of
“Update characteristics” within Product window. AND Display in product form 
view hierarchy of
the characteristics and the description just for one level

details:   https://code.openbravo.com/erp/devel/main/rev/ab00fd374519
changeset: 24348:ab00fd374519
user:  RM packaging bot staff.rm at openbravo.com
date:  Thu Aug 28 16:18:45 2014 +
summary:   CI: update AD_MODULE to version 24347

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
  |4 +-
 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/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
 |4 +
 
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.kernel/src/org/openbravo/client/kernel/reference/CharacteristicsUIDefinition.java
 |   63 +++-
 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 +-
 

[OpenbravoERP-commits] devel/pi: Fixes issue 26457: Date columns not properly displayed...

2014-08-28 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/65b98d7a5bf5
changeset: 24351:65b98d7a5bf5
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Fri Aug 29 01:35:03 2014 +0900
summary:   Fixes issue 26457: Date columns not properly displayed in query/list 
widgets

The problem was that all date columns were being stored internally as DateTime 
column, so they were being treated as such and were being converted to the 
local timezone. As these dates at a time of 00:00:00, if the client whose 
timezone  the timezone of the server, the datetime shown was the previous one.

To fix this, Date columns are not sent as proper dates, instead of as 
DateTimes. This way the date columns will show the same value in all clients, 
regardless of their time zones.

diffstat:

 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
 |  8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r 5c9e097f0c04 -r 65b98d7a5bf5 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
--- 
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Thu Aug 28 16:34:48 2014 +
+++ 
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Fri Aug 29 01:35:03 2014 +0900
@@ -266,13 +266,13 @@
   if (queryAliases[i].equals(column.getDisplayExpression())
   || (!isExport  
queryAliases[i].equals(column.getLinkExpression( {
 Object value = resultList[i];
-if (value instanceof Timestamp) {
+if (domainType instanceof DateDomainType || domainType 
instanceof DateDomainType) {
+value = xmlDateFormat.format(value);
+  }
+else if (value instanceof Timestamp) {
   value = xmlDateTimeFormat.format(value);
   value = JsonUtils.convertToCorrectXSDFormat((String) value);
 }
-if (value instanceof Date) {
-  value = xmlDateFormat.format(value);
-}
 
 if (domainType instanceof BooleanDomainType) {
   if (value instanceof String) {

--
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits