[OpenbravoERP-commits] devel/pi: fixed issue 15816: Call action button of Read Only pat...
details: /erp/devel/pi/rev/60e11183dca4
changeset: 10249:60e11183dca4
user: Asier Lostalé asier.lostale at openbravo.com
date: Mon Jan 31 10:07:43 2011 +0100
summary: fixed issue 15816: Call action button of Read Only pattern tabs in
classic mode
diffstat:
src-wad/src/org/openbravo/wad/controls/WADButton.java | 9 +++--
1 files changed, 3 insertions(+), 6 deletions(-)
diffs (33 lines):
diff -r a717f86a7b16 -r 60e11183dca4
src-wad/src/org/openbravo/wad/controls/WADButton.java
--- a/src-wad/src/org/openbravo/wad/controls/WADButton.java Mon Jan 31
03:40:26 2011 +0100
+++ b/src-wad/src/org/openbravo/wad/controls/WADButton.java Mon Jan 31
10:07:43 2011 +0100
@@ -64,6 +64,7 @@
boolean isDisabled = (getData(IsReadOnly).equals(Y)
|| (getData(IsReadOnlyTab).equals(Y)
getData(isReadOnlyDefinedTab).equals(N)) || getData(
IsUpdateable).equals(N));
+
if (isDisabled) {
text.append(return true;);
} else {
@@ -140,9 +141,7 @@
public String toXml() {
StringBuffer text = new StringBuffer();
-boolean isDisabled = (getData(IsReadOnly).equals(Y)
-|| (getData(IsReadOnlyTab).equals(Y)
getData(isReadOnlyDefinedTab).equals(N)) || getData(
-IsUpdateable).equals(N));
+boolean isDisabled = getData(IsReadOnly).equals(Y) ||
getData(IsUpdateable).equals(N);
if (getData(IsParameter).equals(Y)) {
text.append(PARAMETER id=\).append(getData(ColumnName));
@@ -179,9 +178,7 @@
public String toJava() {
-boolean isDisabled = (getData(IsReadOnly).equals(Y)
-|| (getData(IsReadOnlyTab).equals(Y)
getData(isReadOnlyDefinedTab).equals(N)) || getData(
-IsUpdateable).equals(N));
+boolean isDisabled = getData(IsReadOnly).equals(Y) ||
getData(IsUpdateable).equals(N);
String javaCode = ;
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/d3fedbfe5ff9
changeset: 10250:d3fedbfe5ff9
user: rafaeldemiguel rdm at openbravo.com
date: Mon Jan 31 09:46:53 2011 +0100
summary: Fixes issue 15345 15211 : Widget are logically deleted
details: /erp/devel/pi/rev/f73c61dfdc07
changeset: 10251:f73c61dfdc07
user: Gorka Ion Damián gorkaion.damian at openbravo.com
date: Mon Jan 31 11:16:23 2011 +0100
summary: [OBCQL] Open links using new openDirectView function.
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 5 ++
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
| 7 ++-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
| 2 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
| 25 +-
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 11 +---
5 files changed, 16 insertions(+), 34 deletions(-)
diffs (111 lines):
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Mon Jan 31 11:16:23 2011 +0100
@@ -177,8 +177,13 @@
}
static ListWidgetInstance getUserWidgetInstances() {
+return getUserWidgetInstances(true);
+ }
+
+ static ListWidgetInstance getUserWidgetInstances(Boolean isActive) {
OBCriteriaWidgetInstance obc =
OBDal.getInstance().createCriteria(WidgetInstance.class);
obc.setFilterOnReadableClients(false);
+obc.setFilterOnActive(isActive);
obc.add(Expression.eq(WidgetInstance.PROPERTY_CLIENT,
OBDal.getInstance().get(Client.class,
OBContext.getOBContext().getCurrentClient().getId(;
obc.add(Expression.eq(WidgetInstance.PROPERTY_VISIBLEATROLE,
OBDal.getInstance().get(
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Mon Jan 31 11:16:23 2011 +0100
@@ -293,7 +293,12 @@
// Removed widget instance to delete.
for (WidgetInstance widgetInstance : currentWidgetInstances) {
log.debug( removed widget instance: + widgetInstance.getId());
-OBDal.getInstance().remove(widgetInstance);
+if (widgetInstance.getCopiedFrom() != null) {
+ widgetInstance.setActive(Boolean.FALSE);
+ OBDal.getInstance().save(widgetInstance);
+} else {
+ OBDal.getInstance().remove(widgetInstance);
+}
}
hasRemovedInstances = true;
}
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Mon Jan 31 11:16:23 2011 +0100
@@ -241,7 +241,7 @@
private void copyWidgets() {
final ListWidgetInstance userWidgets = new
ArrayListWidgetInstance(MyOBUtils
-.getUserWidgetInstances());
+.getUserWidgetInstances(false));
final User user = OBDal.getInstance().get(User.class,
OBContext.getOBContext().getUser().getId());
final Role role = OBDal.getInstance().get(Role.class,
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Mon Jan 31 11:16:23 2011 +0100
@@ -35,11 +35,8 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
-import org.openbravo.data.Sqlc;
-import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.domain.Reference;
import org.openbravo.model.ad.ui.Tab;
-import org.openbravo.model.ad.ui.WindowTrl;
class QueryListUtils {
private static final Logger log = Logger.getLogger(QueryListUtils.class);
@@ -74,26 +71,8 @@
field.put(OB_TabId, tab.getId());
field.put(OB_WindowId, tab.getWindow().getId());
-
-final String userLanguageId =
OBContext.getOBContext().getLanguage().getId();
-String tabTitle = null;
-
[OpenbravoERP-commits] devel/pi: [process] Show buttons after save
details: /erp/devel/pi/rev/1a7ae8eb7c50
changeset: 10252:1a7ae8eb7c50
user: Asier Lostalé asier.lostale at openbravo.com
date: Mon Jan 31 11:18:15 2011 +0100
summary: [process] Show buttons after save
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r f73c61dfdc07 -r 1a7ae8eb7c50
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Jan 31 11:16:23 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Jan 31 11:18:15 2011 +0100
@@ -670,7 +670,8 @@
var buttons = this.getRightMembers(),
numOfSelRecords = 0,
isNew = this.view.viewForm.isNew,
-hideAllButtons = !isNew (!this.view.viewGrid.getSelectedRecords()
|| this.view.viewGrid.getSelectedRecords().length !== 1),
+hideAllButtons = typeof(isNew)!=='undefined' !isNew
+ (!this.view.isShowingForm
(!this.view.viewGrid.getSelectedRecords() ||
this.view.viewGrid.getSelectedRecords().length !== 1)),
currentValues = this.view.getCurrentValues();
if (this.view.viewGrid.getSelectedRecords()) {
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/43a7f7a132eb changeset: 10253:43a7f7a132eb user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 11:36:20 2011 +0100 summary: CI: update AD_MODULE to version 10249 details: /erp/devel/pi/rev/74c122b4855c changeset: 10254:74c122b4855c user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 11:46:59 2011 +0100 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/web/org.openbravo.client.application/js/ob-toolbar.js | 3 +- 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.myob/src/org/openbravo/client/myob/MyOBUtils.java | 5 ++ modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 7 ++- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 2 +- 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.querylist/src/org/openbravo/client/querylist/QueryListUtils.java | 25 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 11 +--- 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.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.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.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 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- src-db/database/sourcedata/AD_MODULE.xml | 2 +- 37 files changed, 82 insertions(+), 99 deletions(-) diffs (truncated from 793 to 300 lines): diff -r 60e11183dca4 -r 74c122b4855c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 31 10:07:43 2011 +0100 +++
[OpenbravoERP-commits] devel/pi: Fixes relative path when running processes
details: /erp/devel/pi/rev/6e25a1d92550
changeset: 10255:6e25a1d92550
user: Iván Perdomo ivan.perdomo at openbravo.com
date: Mon Jan 31 11:58:55 2011 +0100
summary: Fixes relative path when running processes
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-popup.js
| 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 74c122b4855c -r 6e25a1d92550
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-popup.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-popup.js
Mon Jan 31 11:46:59 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-popup.js
Mon Jan 31 11:58:55 2011 +0100
@@ -40,7 +40,7 @@
urlCharacter = '';
}
if(this.obManualURL !== '') {
- contentsURL = '../../' + this.obManualURL + '?Command=' + this.command;
+ contentsURL = OB.Application.contextUrl + this.obManualURL + '?Command='
+ this.command;
// contentsURL = this.appURL + urlCharacter + 'url=' + this.obManualURL +
'noprefs=trueCommand=' + this.command + 'hideMenu=true';
} else {
contentsURL = this.appURL + urlCharacter + 'Command=' + this.command +
'noprefs=truetabId=' + this.tabId + 'hideMenu=true';
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes favicon location
details: /erp/devel/pi/rev/085f05474277 changeset: 10256:085f05474277 user: Iván Perdomo ivan.perdomo at openbravo.com date: Mon Jan 31 12:40:38 2011 +0100 summary: Fixes favicon location diffstat: src/index.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6e25a1d92550 -r 085f05474277 src/index.jsp --- a/src/index.jsp Mon Jan 31 11:58:55 2011 +0100 +++ b/src/index.jsp Mon Jan 31 12:40:38 2011 +0100 @@ -55,7 +55,7 @@ meta name=author content=Openbravo S.L.U. meta name=keywords content=openbravo meta name=description content=Openbravo S.L.U. -link rel=shortcut icon href=./images/favicon.ico / +link rel=shortcut icon href=./web/images/favicon.ico / link rel=stylesheet type=text/css href=./org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_mode=3.00_skinVersion=3.00/ titleOpenbravo/title script type=text/javascript src=./web/org.openbravo.client.kernel/js/LAB.min.js/script -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 6 new changesets
details: /erp/devel/main/rev/d3fedbfe5ff9 changeset: 10251:d3fedbfe5ff9 user: rafaeldemiguel rdm at openbravo.com date: Mon Jan 31 09:46:53 2011 +0100 summary: Fixes issue 15345 15211 : Widget are logically deleted details: /erp/devel/main/rev/f73c61dfdc07 changeset: 10252:f73c61dfdc07 user: Gorka Ion Damián gorkaion.damian at openbravo.com date: Mon Jan 31 11:16:23 2011 +0100 summary: [OBCQL] Open links using new openDirectView function. details: /erp/devel/main/rev/1a7ae8eb7c50 changeset: 10253:1a7ae8eb7c50 user: Asier Lostalé asier.lostale at openbravo.com date: Mon Jan 31 11:18:15 2011 +0100 summary: [process] Show buttons after save details: /erp/devel/main/rev/74c122b4855c changeset: 10254:74c122b4855c user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 11:46:59 2011 +0100 summary: CI: merge back from main details: /erp/devel/main/rev/6e25a1d92550 changeset: 10255:6e25a1d92550 user: Iván Perdomo ivan.perdomo at openbravo.com date: Mon Jan 31 11:58:55 2011 +0100 summary: Fixes relative path when running processes details: /erp/devel/main/rev/afffa2f6de20 changeset: 10256:afffa2f6de20 user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 13:56:34 2011 +0100 summary: CI: update AD_MODULE to version 10255 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/web/org.openbravo.client.application/js/ob-classic-popup.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js | 3 +- 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.myob/src/org/openbravo/client/myob/MyOBUtils.java | 5 ++ modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java | 7 ++- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 2 +- 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.querylist/src/org/openbravo/client/querylist/QueryListUtils.java | 25 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 11 +--- 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.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.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.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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/afffa2f6de20 changeset: 10260:afffa2f6de20 user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 13:56:34 2011 +0100 summary: CI: update AD_MODULE to version 10255 details: /erp/devel/pi/rev/05026c9660ed changeset: 10261:05026c9660ed user: RM packaging bot staff.rm at openbravo.com date: Mon Jan 31 14:07:27 2011 +0100 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 2 +- 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/ob-action-button.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.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.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.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.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 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src/index.jsp | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.html | 6 +- 35 files changed, 70 insertions(+), 70 deletions(-) diffs (truncated from 732 to 300 lines): diff -r 6e25a1d92550 -r 05026c9660ed modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 31 11:58:55 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 31 14:07:27 2011 +0100 @@ -6,7 +6,7 @@ !--A918E3331C404B889D69AA9BFAFB23AC-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--A918E3331C404B889D69AA9BFAFB23AC--
[OpenbravoERP-commits] devel/pi: [OBUISEL] Fixed auxiliary input and table reference to...
details: /erp/devel/pi/rev/cde1d8da7761 changeset: 10265:cde1d8da7761 user: Gorka Ion Damián gorkaion.damian at openbravo.com date: Mon Jan 31 16:51:06 2011 +0100 summary: [OBUISEL] Fixed auxiliary input and table reference to include search references. diffstat: modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 3 ++- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_REF_TABLE.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (26 lines): diff -r e99270a5c436 -r cde1d8da7761 modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Mon Jan 31 16:44:52 2011 +0100 +++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Mon Jan 31 16:51:06 2011 +0100 @@ -12,7 +12,8 @@ FROM AD_Column WHERE AD_Table_ID = @AD_Table_ID@ AND (AD_Reference_ID = '95E2A8B50A254B2AAE6774B8C2F28120' -OR AD_Reference_ID = '80B1630792EA46F298A3FBF81E77EF9C')) total_fields]]/CODE +OR AD_Reference_ID = '80B1630792EA46F298A3FBF81E77EF9C' +OR AD_Reference_ID = '30')) total_fields]]/CODE !--6AFCF7E4E6334BD591452B5CE42BB17B-- AD_MODULE_ID![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]/AD_MODULE_ID !--6AFCF7E4E6334BD591452B5CE42BB17B--/AD_AUXILIARINPUT diff -r e99270a5c436 -r cde1d8da7761 modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_REF_TABLE.xml --- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_REF_TABLE.xml Mon Jan 31 16:44:52 2011 +0100 +++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_REF_TABLE.xml Mon Jan 31 16:51:06 2011 +0100 @@ -27,7 +27,8 @@ select s.obuisel_selector_id from ad_column c, obuisel_selector s where (c.ad_reference_id = '95E2A8B50A254B2AAE6774B8C2F28120' -or c.ad_reference_id = '80B1630792EA46F298A3FBF81E77EF9C') +or c.ad_reference_id = '80B1630792EA46F298A3FBF81E77EF9C' +or c.ad_reference_id = '30') and c.ad_reference_value_id = s.ad_reference_id and c.ad_table_id =@AD_Table_ID@)]]/WHERECLAUSE !--D30C26E6452843B4BA4F8D71A651EB80-- ORDERBYCLAUSE![CDATA[name]]/ORDERBYCLAUSE -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: Fixes issue 0015585: in account selector, accountin...
details: /erp/stable/2.50/rev/3ed3e1f0f8de changeset: 9168:3ed3e1f0f8de user: Adrián Romero adrianromero at openbravo.com date: Mon Jan 31 18:24:29 2011 +0100 summary: Fixes issue 0015585: in account selector, accounting schema selected is not correct It has been removed the property Is session attribute of the field Accounting Schema because is the cause of the error and it is not needed for any other process diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8993462177de -r 3ed3e1f0f8de src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 28 10:11:23 2011 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jan 31 18:24:29 2011 +0100 @@ -82493,7 +82493,7 @@ !--4973-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED !--4973-- ISSELECTIONCOLUMN![CDATA[N]]/ISSELECTIONCOLUMN !--4973-- AD_ELEMENT_ID![CDATA[181]]/AD_ELEMENT_ID -!--4973-- ISSESSIONATTR![CDATA[Y]]/ISSESSIONATTR +!--4973-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--4973-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--4973-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE !--4973-- DEVELOPMENTSTATUS![CDATA[RE]]/DEVELOPMENTSTATUS -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/7c8a23c0be24
changeset: 10266:7c8a23c0be24
user: Mikel Irurita mikel.irurita at openbravo.com
date: Mon Jan 31 18:22:33 2011 +0100
summary: Do not use APRM API from a core callout
details: /erp/devel/pi/rev/ebf89ddfb647
changeset: 10267:ebf89ddfb647
user: Mikel Irurita mikel.irurita at openbravo.com
date: Mon Jan 31 18:25:06 2011 +0100
summary: [APRM] Possibility to include client/org filters in obcriteria
generic method
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
| 27 -
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
| 11 ++-
2 files changed, 30 insertions(+), 8 deletions(-)
diffs (79 lines):
diff -r cde1d8da7761 -r ebf89ddfb647
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Mon Jan 31 16:51:06 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Mon Jan 31 18:25:06 2011 +0100
@@ -500,15 +500,21 @@
*
* @param clazz
* Class (entity).
+ * @param setFilterClient
+ * If true then only objects from readable clients are returned, if
false then objects
+ * from all clients are returned
+ * @param setFilterOrg
+ * If true then when querying (for example call list()) a filter on
readable
+ * organizations is added to the query, if false then this is not
done
* @param values
* Value. Property, value and operator.
* @return All the records that satisfy the conditions.
*/
- public static T extends BaseOBObject ListT getAllInstances(ClassT
clazz, Value... values) {
+ public static T extends BaseOBObject ListT getAllInstances(ClassT
clazz,
+ boolean setFilterClient, boolean setFilterOrg, Value... values) {
OBCriteriaT obc = OBDal.getInstance().createCriteria(clazz);
-obc.setFilterOnReadableClients(false);
-obc.setFilterOnReadableOrganization(false);
-obc.add(Expression.ne(Client.PROPERTY_ID, 0));
+obc.setFilterOnReadableClients(setFilterClient);
+obc.setFilterOnReadableOrganization(setFilterOrg);
for (Value value : values) {
if (value.getValue() == null ==.equals(value.getOperator())) {
obc.add(Expression.isNull(value.getField()));
@@ -534,6 +540,19 @@
}
/**
+ * Generic OBCriteria with filter on readable clients and organizations
active.
+ *
+ * @param clazz
+ * Class (entity).
+ * @param values
+ * Value. Property, value and operator.
+ * @return All the records that satisfy the conditions.
+ */
+ public static T extends BaseOBObject ListT getAllInstances(ClassT
clazz, Value... values) {
+return getAllInstances(clazz, true, true, values);
+ }
+
+ /**
* Generic OBCriteria.
*
* @param clazz
diff -r cde1d8da7761 -r ebf89ddfb647
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
---
a/src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
Mon Jan 31 16:51:06 2011 +0100
+++
b/src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
Mon Jan 31 18:25:06 2011 +0100
@@ -27,10 +27,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.advpaymentmngt.utility.Value;
+import org.hibernate.criterion.Expression;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.financialmgmt.accounting.coa.AccountingCombination;
@@ -139,8 +139,11 @@
String strAccountingSchemaId) {
FIN_FinancialAccount account =
OBDal.getInstance().get(FIN_FinancialAccount.class,
strfinFinancialAccountId);
-ListFinAccPaymentMethod accountPaymentMethods =
FIN_Utility.getAllInstances(
-FinAccPaymentMethod.class, new
Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, account));
+OBCriteriaFinAccPaymentMethod obc = OBDal.getInstance().createCriteria(
+FinAccPaymentMethod.class);
+obc.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, account));
+ListFinAccPaymentMethod accountPaymentMethods = obc.list();
+
// Configure clearing account for all payment methods upon clearing event
for (FinAccPaymentMethod paymentMethod : accountPaymentMethods) {
paymentMethod.setOUTUponClearingUse(CLE);
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log
[OpenbravoERP-commits] devel/pi: Fixes issue 0015799: in account selector, accounting s...
details: /erp/devel/pi/rev/c9a37dbc3795 changeset: 10268:c9a37dbc3795 user: Adrián Romero adrianromero at openbravo.com date: Mon Jan 31 18:29:04 2011 +0100 summary: Fixes issue 0015799: in account selector, accounting schema selected is not correct It has been removed the property Is session attribute of the field Accounting Schema because is the cause of the error and it is not needed for any other process diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ebf89ddfb647 -r c9a37dbc3795 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Jan 31 18:25:06 2011 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Jan 31 18:29:04 2011 +0100 @@ -82491,7 +82491,7 @@ !--4973-- ISENCRYPTED![CDATA[N]]/ISENCRYPTED !--4973-- ISSELECTIONCOLUMN![CDATA[N]]/ISSELECTIONCOLUMN !--4973-- AD_ELEMENT_ID![CDATA[181]]/AD_ELEMENT_ID -!--4973-- ISSESSIONATTR![CDATA[Y]]/ISSESSIONATTR +!--4973-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--4973-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--4973-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE !--4973-- DEVELOPMENTSTATUS![CDATA[RE]]/DEVELOPMENTSTATUS -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
